aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-05-09 22:21:33 -0400
committerRalph Amissah <ralph@amissah.com>2013-05-09 22:21:33 -0400
commit879a4e6cbe97721bbc6cd18b324524159b4807ef (patch)
treefd9cde1516e36545626ed06dee71edc4342b84d2
parentv4: cgi script for sample search form, minor fixes (diff)
v5 dev branch opened (starts as copy of v4 stable branch); v3 branch closedsisu_4.1.0
* 5.0.0 dev opened * 4.1.0 stable * 3.* branch gone
l---------CHANGELOGS/CHANGELOG_v51
-rw-r--r--bin/sisu26
l---------bin/sisu5 (renamed from bin/sisu3)0
l---------conf/sisu/skin/dir/skin_sisu.rb1
-rw-r--r--conf/sisu/skin/doc/skin_gnu.rb89
-rw-r--r--conf/sisu/skin/doc/skin_sisu.rb88
-rw-r--r--conf/sisu/skin/doc/skin_sisu_manual.rb99
l---------conf/sisu/skin/site/skin_sisu.rb1
l---------conf/sisu/v5/sisurc.yml (renamed from conf/sisu/v3/sisurc.yml)0
-rw-r--r--data/doc/sisu/CHANGELOG_v33
-rw-r--r--data/doc/sisu/CHANGELOG_v46
-rw-r--r--data/doc/sisu/CHANGELOG_v536
-rw-r--r--data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png (renamed from data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png)bin242735 -> 242735 bytes
-rw-r--r--data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png (renamed from data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png)bin187827 -> 187827 bytes
-rw-r--r--data/doc/sisu/markup-samples/samples/_sisu/sisu_document_make (renamed from data/doc/sisu/markup-samples/v4/samples/_sisu/sisu_document_make)0
-rw-r--r--data/doc/sisu/markup-samples/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst (renamed from data/doc/sisu/markup-samples/v4/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst)0
-rw-r--r--data/doc/sisu/markup-samples/samples/sisu_output_overview.ssi (renamed from data/doc/sisu/markup-samples/v3/samples/sisu_output_overview.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png)bin33396 -> 33396 bytes
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/image/ruby_logo.png (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/ruby_logo.png)bin8634 -> 8634 bytes
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/image/sisu.png (renamed from data/doc/sisu/markup-samples/v3/samples/_sisu/image/sisu.png)bin3260 -> 3260 bytes
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/image/tux.png (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/tux.png)bin6297 -> 6297 bytes
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_lng.yml (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/_sisu/sisu_document_make (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/sisu_document_make)0
l---------data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml)0
l---------data/doc/sisu/markup-samples/sisu_manual/_sisu/v5/sisurc.yml (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu.ssm (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu.ssm)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_config.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_config.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_content_directories.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_css.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_css.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_description.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_description.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_download.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_examples.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_examples.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_faq.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_filetypes.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_filetypes.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help_sources.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_homepages.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_homepages.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_how.ssi (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/sisu_how.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_howto.sst)10
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_installation.ssi (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/sisu_installation.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/sisu_interesting_to_whom.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_introduction.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_introduction.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_manual.ssm (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_manual.ssm)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_markup_syntax_history.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup_syntax_history.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_output_overview.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_output_overview.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_postgresql.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_postgresql.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_quickstart.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_remote.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_remote.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_search.ssm (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search.ssm)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_search_cgi.ssi (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_cgi.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_search_intro.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_intro.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_short_feature_summary.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_short_feature_summary.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_sql.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sql.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_sqlite.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sqlite.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_synopsis.ssi (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_synopsis.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_syntax_highlighting.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_syntax_highlighting.sst)10
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_webrick.sst (renamed from data/doc/sisu/markup-samples/v4/sisu_manual/sisu_webrick.sst)0
-rw-r--r--data/doc/sisu/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi (renamed from data/doc/sisu/markup-samples/v3/sisu_manual/sisu_work_needed_and_wishlist.ssi)0
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.pngbin37629 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/b_doc.pngbin274 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Copyleft.pngbin668 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Euro.pngbin514 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/debian_home.pngbin7746 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/levitating_gnu.pngbin66279 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/image/philosophical_gnu.pngbin2695 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/dir/skin_sisu.rb99
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_gnu.rb88
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_rms2.rb105
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/site/skin_sisu.rb99
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/list.yml27
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/promo.yml215
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_countries.yml481
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_country.yml735
-rw-r--r--data/doc/sisu/markup-samples/v3/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst2549
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.home.pngbin3260 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.pngbin3260 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/list.yml30
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/promo.yml166
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu.ssm102
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_commands.sst437
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_config.ssi59
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_content_directories.ssi270
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_css.ssi42
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_description.sst561
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_download.ssi135
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_examples.ssi30
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_faq.sst219
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_filetypes.sst171
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help.sst114
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help_sources.sst127
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_homepages.ssi66
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_howto.sst1416
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_introduction.sst74
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_manual.ssm117
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup.sst1275
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup_syntax_history.sst256
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_output_overview.sst161
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_postgresql.sst99
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_quickstart.sst275
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_remote.sst107
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search.ssm54
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_intro.ssi37
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_short_feature_summary.ssi81
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_skin.sst106
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sql.ssi51
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sqlite.sst99
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_synopsis.ssi48
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_syntax_highlighting.sst174
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/sisu_webrick.sst93
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.pngbin37629 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/b_doc.pngbin274 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Copyleft.pngbin668 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Euro.pngbin514 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/debian_home.pngbin7746 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.pngbin242735 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.pngbin187827 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/levitating_gnu.pngbin66279 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/philosophical_gnu.pngbin2695 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/_sisu/image/sisu.pngbin3260 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/samples/sisu_output_overview.ssi61
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.pngbin33396 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/ruby_logo.pngbin8634 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.home.pngbin3260 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.pngbin3260 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/tux.pngbin6297 -> 0 bytes
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml133
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml133
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml133
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/sisu_how.ssi26
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/sisu_installation.ssi368
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/sisu_interesting_to_whom.ssi32
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_cgi.ssi75
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/sisu_work_needed_and_wishlist.ssi59
-rw-r--r--data/doc/sisu/sisu_user_txt/configuration_sisurc.txt6
-rw-r--r--data/doc/sisu/sisu_user_txt/configuration_skin.txt15
-rw-r--r--data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi (renamed from data/sisu/v3/conf/cgi-bin/sisu_search_pgsql.cgi)0
-rw-r--r--data/sisu/conf/cgi-bin/sisu_search_sqlite.cgi (renamed from data/sisu/v3/conf/cgi-bin/sisu_search_sqlite.cgi)0
-rw-r--r--data/sisu/conf/completion/README (renamed from data/sisu/v3/conf/completion/README)0
-rw-r--r--data/sisu/conf/completion/_sisu (renamed from data/sisu/v3/conf/completion/_sisu)0
-rw-r--r--data/sisu/conf/convert/kdissert_to_sisu (renamed from data/sisu/v3/conf/convert/kdissert_to_sisu)0
-rw-r--r--data/sisu/conf/convert/modify.rb (renamed from data/sisu/v3/conf/convert/modify.rb)0
-rw-r--r--data/sisu/conf/convert/sisu_convert (renamed from data/sisu/v3/conf/convert/sisu_convert)0
-rw-r--r--data/sisu/conf/convert/wvHtml.xml (renamed from data/sisu/v3/conf/convert/wvHtml.xml)0
-rw-r--r--data/sisu/conf/convert/wvSiSU.xml (renamed from data/sisu/v3/conf/convert/wvSiSU.xml)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/README (renamed from data/sisu/v3/conf/editor-syntax-etc/README)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf (renamed from data/sisu/v3/conf/editor-syntax-etc/diakonos/diakonos.conf)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/emacs/README (renamed from data/sisu/v3/conf/editor-syntax-etc/emacs/README)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el (renamed from data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/gedit/sisu.lang (renamed from data/sisu/v3/conf/editor-syntax-etc/gedit/sisu.lang)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/kate/sisu.xml (renamed from data/sisu/v3/conf/editor-syntax-etc/kate/sisu.xml)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/nano/nanorc (renamed from data/sisu/v3/conf/editor-syntax-etc/nano/nanorc)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats (renamed from data/sisu/v3/conf/editor-syntax-etc/nedit/sisu_nedit.pats)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/8.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/frugal.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/filetype.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/filetype.vim)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim (renamed from data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu.vim)2
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/templates/ssi.tpl (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssi.tpl)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/templates/ssm.tpl (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssm.tpl)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/templates/sst.tpl (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/templates/sst.tpl)0
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml (renamed from data/sisu/v3/conf/editor-syntax-etc/vim/vim-sisu.yaml)0
-rw-r--r--data/sisu/conf/lighttpd/lighttpd.cfg.sisu (renamed from data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu)0
-rw-r--r--data/sisu/conf/lighttpd/lighttpd.cfg.sisu_www (renamed from data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu_www)0
-rw-r--r--data/sisu/conf/ruby/irbrc (renamed from data/sisu/v3/conf/ruby/irbrc)0
-rw-r--r--data/sisu/image/DebTuxRubySiSU.pngbin23032 -> 0 bytes
-rw-r--r--data/sisu/image/arrow_next_blue.pngbin1302 -> 0 bytes
-rw-r--r--data/sisu/image/arrow_prev_blue.pngbin1348 -> 0 bytes
-rw-r--r--data/sisu/image/arrow_up_blue.pngbin1320 -> 0 bytes
-rw-r--r--data/sisu/image/c_Copyleft.pngbin668 -> 0 bytes
-rw-r--r--data/sisu/image/c_Euro.pngbin514 -> 0 bytes
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el368
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim66
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim66
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim66
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim66
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim261
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim281
-rw-r--r--data/sisu/v3/v/version.yml5
-rw-r--r--data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi904
-rw-r--r--data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi901
-rw-r--r--data/sisu/v4/conf/completion/README7
-rw-r--r--data/sisu/v4/conf/completion/_sisu64
-rw-r--r--data/sisu/v4/conf/convert/kdissert_to_sisu161
-rw-r--r--data/sisu/v4/conf/convert/modify.rb376
-rw-r--r--data/sisu/v4/conf/convert/sisu_convert519
-rw-r--r--data/sisu/v4/conf/convert/wvHtml.xml388
-rw-r--r--data/sisu/v4/conf/convert/wvSiSU.xml360
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/README90
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/diakonos/diakonos.conf1159
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/emacs/README5
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang128
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml178
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/nano/nanorc221
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/nedit/sisu_nedit.pats79
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim65
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim69
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim66
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim75
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/filetype.vim8
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim185
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu_next.vim281
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssi.tpl40
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssm.tpl40
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/templates/sst.tpl40
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/vim-sisu.yaml7
-rw-r--r--data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu115
-rw-r--r--data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www115
-rw-r--r--data/sisu/v4/conf/ruby/irbrc19
-rw-r--r--data/sisu/v5/v/version.yml5
-rw-r--r--lib/sisu/v3/defaults.rb2196
-rw-r--r--lib/sisu/v5/air.rb (renamed from lib/sisu/v3/air.rb)2
-rw-r--r--lib/sisu/v5/author_format.rb (renamed from lib/sisu/v3/author_format.rb)2
-rw-r--r--lib/sisu/v5/cgi.rb (renamed from lib/sisu/v3/cgi.rb)10
-rw-r--r--lib/sisu/v5/cgi_pgsql.rb (renamed from lib/sisu/v3/cgi_pgsql.rb)61
-rw-r--r--lib/sisu/v5/cgi_sql_common.rb (renamed from lib/sisu/v3/cgi_sql_common.rb)59
-rw-r--r--lib/sisu/v5/cgi_sqlite.rb (renamed from lib/sisu/v3/cgi_sqlite.rb)11
-rw-r--r--lib/sisu/v5/composite.rb (renamed from lib/sisu/v3/composite.rb)32
-rw-r--r--lib/sisu/v5/concordance.rb (renamed from lib/sisu/v3/concordance.rb)14
-rw-r--r--lib/sisu/v5/conf.rb (renamed from lib/sisu/v3/conf.rb)2
-rw-r--r--lib/sisu/v5/constants.rb (renamed from lib/sisu/v3/constants.rb)45
-rw-r--r--lib/sisu/v5/css.rb (renamed from lib/sisu/v3/css.rb)21
-rw-r--r--lib/sisu/v5/dal.rb (renamed from lib/sisu/v3/dal.rb)16
-rw-r--r--lib/sisu/v5/dal_character_check.rb (renamed from lib/sisu/v3/dal_character_check.rb)2
-rw-r--r--lib/sisu/v5/dal_doc_objects.rb (renamed from lib/sisu/v3/dal_doc_objects.rb)2
-rw-r--r--lib/sisu/v5/dal_doc_str.rb (renamed from lib/sisu/v3/dal_doc_str.rb)5
-rw-r--r--lib/sisu/v5/dal_endnotes.rb (renamed from lib/sisu/v3/dal_endnotes.rb)2
-rw-r--r--lib/sisu/v5/dal_expand_insertions.rb (renamed from lib/sisu/v3/dal_expand_insertions.rb)2
-rw-r--r--lib/sisu/v5/dal_hash_digest.rb (renamed from lib/sisu/v3/dal_hash_digest.rb)2
-rw-r--r--lib/sisu/v5/dal_idx.rb (renamed from lib/sisu/v3/dal_idx.rb)13
-rw-r--r--lib/sisu/v5/dal_images.rb (renamed from lib/sisu/v3/dal_images.rb)2
-rw-r--r--lib/sisu/v5/dal_metadata.rb (renamed from lib/sisu/v3/dal_metadata.rb)2
-rw-r--r--lib/sisu/v5/dal_numbering.rb (renamed from lib/sisu/v3/dal_numbering.rb)6
-rw-r--r--lib/sisu/v5/dal_substitutions_and_insertions.rb (renamed from lib/sisu/v3/dal_substitutions_and_insertions.rb)11
-rw-r--r--lib/sisu/v5/dal_syntax.rb (renamed from lib/sisu/v3/dal_syntax.rb)64
-rw-r--r--lib/sisu/v5/db_columns.rb (renamed from lib/sisu/v3/db_columns.rb)368
-rw-r--r--lib/sisu/v5/db_create.rb (renamed from lib/sisu/v3/db_create.rb)46
-rw-r--r--lib/sisu/v5/db_dbi.rb (renamed from lib/sisu/v3/db_dbi.rb)2
-rw-r--r--lib/sisu/v5/db_drop.rb (renamed from lib/sisu/v3/db_drop.rb)2
-rw-r--r--lib/sisu/v5/db_import.rb (renamed from lib/sisu/v3/db_import.rb)3
-rw-r--r--lib/sisu/v5/db_indexes.rb (renamed from lib/sisu/v3/db_indexes.rb)2
-rw-r--r--lib/sisu/v5/db_load_tuple.rb (renamed from lib/sisu/v3/db_load_tuple.rb)38
-rw-r--r--lib/sisu/v5/db_remove.rb (renamed from lib/sisu/v3/db_remove.rb)2
-rw-r--r--lib/sisu/v5/db_select.rb (renamed from lib/sisu/v3/db_select.rb)2
-rw-r--r--lib/sisu/v5/db_sqltxt.rb (renamed from lib/sisu/v3/db_sqltxt.rb)2
-rw-r--r--lib/sisu/v5/db_tests.rb (renamed from lib/sisu/v3/db_tests.rb)2
-rw-r--r--lib/sisu/v5/dbi.rb (renamed from lib/sisu/v3/dbi.rb)2
-rw-r--r--lib/sisu/v5/dbi_discrete.rb (renamed from lib/sisu/v3/dbi_discrete.rb)2
-rw-r--r--lib/sisu/v5/defaults.rb1212
-rw-r--r--lib/sisu/v5/digests.rb (renamed from lib/sisu/v3/digests.rb)7
-rw-r--r--lib/sisu/v5/embedded.rb (renamed from lib/sisu/v3/embedded.rb)2
-rw-r--r--lib/sisu/v5/epub.rb (renamed from lib/sisu/v3/epub.rb)128
-rw-r--r--lib/sisu/v5/epub_concordance.rb (renamed from lib/sisu/v3/epub_concordance.rb)17
-rw-r--r--lib/sisu/v5/epub_format.rb (renamed from lib/sisu/v3/epub_format.rb)294
-rw-r--r--lib/sisu/v5/epub_segments.rb (renamed from lib/sisu/v3/epub_segments.rb)10
-rw-r--r--lib/sisu/v5/epub_tune.rb (renamed from lib/sisu/v3/epub_tune.rb)17
-rw-r--r--lib/sisu/v5/errors.rb (renamed from lib/sisu/v3/errors.rb)2
-rw-r--r--lib/sisu/v5/git.rb (renamed from lib/sisu/v3/git.rb)52
-rw-r--r--lib/sisu/v5/harvest.rb (renamed from lib/sisu/v3/harvest.rb)2
-rw-r--r--lib/sisu/v5/harvest_authors.rb (renamed from lib/sisu/v3/harvest_authors.rb)34
-rw-r--r--lib/sisu/v5/harvest_topics.rb (renamed from lib/sisu/v3/harvest_topics.rb)27
-rw-r--r--lib/sisu/v5/help.rb (renamed from lib/sisu/v3/help.rb)320
-rw-r--r--lib/sisu/v5/html.rb (renamed from lib/sisu/v3/html.rb)122
-rw-r--r--lib/sisu/v5/html_format.rb (renamed from lib/sisu/v3/html_format.rb)137
-rw-r--r--lib/sisu/v5/html_minitoc.rb (renamed from lib/sisu/v3/html_minitoc.rb)2
-rw-r--r--lib/sisu/v5/html_promo.rb (renamed from lib/sisu/v3/html_promo.rb)10
-rw-r--r--lib/sisu/v5/html_scroll.rb (renamed from lib/sisu/v3/html_scroll.rb)6
-rw-r--r--lib/sisu/v5/html_segments.rb (renamed from lib/sisu/v3/html_segments.rb)6
-rw-r--r--lib/sisu/v5/html_table.rb (renamed from lib/sisu/v3/html_table.rb)2
-rw-r--r--lib/sisu/v5/html_tune.rb (renamed from lib/sisu/v3/html_tune.rb)6
-rw-r--r--lib/sisu/v5/hub.rb (renamed from lib/sisu/v3/hub.rb)206
-rw-r--r--lib/sisu/v5/i18n.rb (renamed from lib/sisu/v3/i18n.rb)2
-rw-r--r--lib/sisu/v5/manifest.rb (renamed from lib/sisu/v3/manifest.rb)421
-rw-r--r--lib/sisu/v5/manpage.rb (renamed from lib/sisu/v3/manpage.rb)57
-rw-r--r--lib/sisu/v5/manpage_format.rb (renamed from lib/sisu/v3/manpage_format.rb)4
-rw-r--r--lib/sisu/v5/odf.rb (renamed from lib/sisu/v3/odf.rb)17
-rw-r--r--lib/sisu/v5/odf_format.rb (renamed from lib/sisu/v3/odf_format.rb)11
-rw-r--r--lib/sisu/v5/options.rb (renamed from lib/sisu/v3/options.rb)367
-rw-r--r--lib/sisu/v5/param.rb (renamed from lib/sisu/v3/param.rb)591
-rw-r--r--lib/sisu/v5/param_identify_markup.rb (renamed from lib/sisu/v3/param_identify_markup.rb)2
-rw-r--r--lib/sisu/v5/param_make.rb646
-rw-r--r--lib/sisu/v5/particulars.rb (renamed from lib/sisu/v3/particulars.rb)12
-rw-r--r--lib/sisu/v5/plaintext.rb (renamed from lib/sisu/v3/plaintext.rb)13
-rw-r--r--lib/sisu/v5/plaintext_format.rb (renamed from lib/sisu/v3/plaintext_format.rb)4
-rw-r--r--lib/sisu/v5/po4a.rb (renamed from lib/sisu/v3/po4a.rb)37
-rw-r--r--lib/sisu/v5/po4a_set.rb (renamed from lib/sisu/v3/po4a_set.rb)3
-rw-r--r--lib/sisu/v5/prog_text_translation.rb (renamed from lib/sisu/v3/prog_text_translation.rb)2
-rw-r--r--lib/sisu/v5/qrcode.rb (renamed from lib/sisu/v3/qrcode.rb)119
-rw-r--r--lib/sisu/v5/relaxng.rb (renamed from lib/sisu/v3/relaxng.rb)5
-rw-r--r--lib/sisu/v5/remote.rb (renamed from lib/sisu/v3/remote.rb)18
-rw-r--r--lib/sisu/v5/response.rb (renamed from lib/sisu/v3/response.rb)2
-rw-r--r--lib/sisu/v5/rexml.rb (renamed from lib/sisu/v3/rexml.rb)2
-rw-r--r--lib/sisu/v5/screen_text_color.rb (renamed from lib/sisu/v3/screen_text_color.rb)16
-rw-r--r--lib/sisu/v5/share_src.rb (renamed from lib/sisu/v3/share_src.rb)13
-rw-r--r--lib/sisu/v5/share_src_kdissert.rb (renamed from lib/sisu/v3/share_src_kdissert.rb)2
-rw-r--r--lib/sisu/v5/shared_html.rb (renamed from lib/sisu/v3/shared_html.rb)2
-rw-r--r--lib/sisu/v5/shared_html_lite.rb (renamed from lib/sisu/v3/shared_html_lite.rb)6
-rw-r--r--lib/sisu/v5/shared_images.rb (renamed from lib/sisu/v3/shared_images.rb)38
-rw-r--r--lib/sisu/v5/shared_markup_alt.rb (renamed from lib/sisu/v3/shared_markup_alt.rb)2
-rw-r--r--lib/sisu/v5/shared_metadata.rb (renamed from lib/sisu/v3/shared_metadata.rb)247
-rw-r--r--lib/sisu/v5/shared_sem.rb (renamed from lib/sisu/v3/shared_sem.rb)2
-rw-r--r--lib/sisu/v5/shared_sisupod_source.rb (renamed from lib/sisu/v3/shared_sisupod_source.rb)103
-rw-r--r--lib/sisu/v5/shared_txt.rb (renamed from lib/sisu/v3/shared_txt.rb)3
-rw-r--r--lib/sisu/v5/shared_xhtml.rb (renamed from lib/sisu/v3/shared_xhtml.rb)2
-rw-r--r--lib/sisu/v5/shared_xml.rb (renamed from lib/sisu/v3/shared_xml.rb)95
-rw-r--r--lib/sisu/v5/sisupod_make.rb (renamed from lib/sisu/v3/sisupod_make.rb)22
-rw-r--r--lib/sisu/v5/sitemaps.rb (renamed from lib/sisu/v3/sitemaps.rb)2
-rw-r--r--lib/sisu/v5/spell.rb (renamed from lib/sisu/v3/spell.rb)2
-rw-r--r--lib/sisu/v5/sst_convert_markup.rb (renamed from lib/sisu/v3/sst_convert_markup.rb)2
-rw-r--r--lib/sisu/v5/sst_do_inline_footnotes.rb (renamed from lib/sisu/v3/sst_do_inline_footnotes.rb)4
-rw-r--r--lib/sisu/v5/sst_from_xml.rb (renamed from lib/sisu/v3/sst_from_xml.rb)2
-rw-r--r--lib/sisu/v5/sst_identify_markup.rb (renamed from lib/sisu/v3/sst_identify_markup.rb)2
-rw-r--r--lib/sisu/v5/sst_to_s_xml_sax.rb (renamed from lib/sisu/v3/sst_to_s_xml_sax.rb)4
-rw-r--r--lib/sisu/v5/sysenv.rb (renamed from lib/sisu/v3/sysenv.rb)1295
-rw-r--r--lib/sisu/v5/termsheet.rb (renamed from lib/sisu/v3/termsheet.rb)2
-rw-r--r--lib/sisu/v5/texinfo.rb (renamed from lib/sisu/v3/texinfo.rb)6
-rw-r--r--lib/sisu/v5/texinfo_format.rb (renamed from lib/sisu/v3/texinfo_format.rb)50
-rw-r--r--lib/sisu/v5/texpdf.rb (renamed from lib/sisu/v3/texpdf.rb)347
-rw-r--r--lib/sisu/v5/texpdf_format.rb (renamed from lib/sisu/v3/texpdf_format.rb)129
-rw-r--r--lib/sisu/v5/update.rb (renamed from lib/sisu/v3/update.rb)2
-rw-r--r--lib/sisu/v5/urls.rb (renamed from lib/sisu/v3/urls.rb)26
-rw-r--r--lib/sisu/v5/utils.rb (renamed from lib/sisu/v3/utils.rb)18
-rw-r--r--lib/sisu/v5/webrick.rb (renamed from lib/sisu/v3/webrick.rb)2
-rw-r--r--lib/sisu/v5/wikispeak.rb (renamed from lib/sisu/v3/wikispeak.rb)8
-rw-r--r--lib/sisu/v5/xhtml.rb (renamed from lib/sisu/v3/xhtml.rb)6
-rw-r--r--lib/sisu/v5/xhtml_table.rb (renamed from lib/sisu/v3/xhtml_table.rb)4
-rw-r--r--lib/sisu/v5/xml.rb (renamed from lib/sisu/v3/xml.rb)6
-rw-r--r--lib/sisu/v5/xml_dom.rb (renamed from lib/sisu/v3/xml_dom.rb)6
-rw-r--r--lib/sisu/v5/xml_fictionbook.rb (renamed from lib/sisu/v3/xml_fictionbook.rb)2
-rw-r--r--lib/sisu/v5/xml_format.rb (renamed from lib/sisu/v3/xml_format.rb)58
-rw-r--r--lib/sisu/v5/xml_md_oai_pmh_dc.rb (renamed from lib/sisu/v3/xml_md_oai_pmh_dc.rb)85
-rw-r--r--lib/sisu/v5/xml_scaffold.rb (renamed from lib/sisu/v3/xml_scaffold.rb)2
-rw-r--r--lib/sisu/v5/xml_tables.rb (renamed from lib/sisu/v3/xml_tables.rb)8
-rw-r--r--lib/sisu/v5/zap.rb (renamed from lib/sisu/v3/zap.rb)25
l---------man/man1/sisu5.1 (renamed from man/man1/sisu3.1)0
350 files changed, 5250 insertions, 26163 deletions
diff --git a/CHANGELOGS/CHANGELOG_v5 b/CHANGELOGS/CHANGELOG_v5
new file mode 120000
index 00000000..30f3d12f
--- /dev/null
+++ b/CHANGELOGS/CHANGELOG_v5
@@ -0,0 +1 @@
+../data/doc/sisu/CHANGELOG_v5 \ No newline at end of file
diff --git a/bin/sisu b/bin/sisu
index ee4e1369..4914890c 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -54,29 +54,29 @@ WOK
$KCODE='u' if RUBY_VERSION < '1.9'
argv=$*
SiSU_called_from_directory=Dir.pwd
- if $0 !~/\bsisu[34]$/
+ if $0 !~/\bsisu[45]$/
SiSU_version_dir=case argv.inspect
- when /"(?:--v3)"/
- check_sisu_stable_ruby_version?
- 'v3'
when /"(?:--v4)"/
check_sisu_stable_ruby_version?
'v4'
+ when /"(?:--v5)"/
+ check_sisu_stable_ruby_version?
+ 'v5'
when /"(?:--dev)"/
check_sisu_dev_ruby_version?
- 'v4'
+ 'v5'
else
check_sisu_stable_ruby_version?
'v4'
end
else
SiSU_version_dir=case $0
- when /\bsisu3$/
- check_sisu_stable_ruby_version?
- 'v3'
when /\bsisu4$/
check_sisu_stable_ruby_version?
'v4'
+ when /\bsisu5$/
+ check_sisu_stable_ruby_version?
+ 'v5'
else
check_sisu_stable_ruby_version?
'v4'
@@ -84,18 +84,18 @@ WOK
end
#% $0 File.expand_path($0)
e=Config::CONFIG
- SiSU_path_base=if $0 =~ /^#{e['bindir']}\/sisu[34]?$/
+ SiSU_path_base=if $0 =~ /^#{e['bindir']}\/sisu[45]?$/
nil
- elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \
- && File.expand_path($0) =~/bin\/sisu[34]?$/ \
+ elsif $0 !~ /^#{e['bindir']}\/sisu[45]?$/ \
+ && File.expand_path($0) =~/bin\/sisu[45]?$/ \
&& FileTest.file?($0)
- File.expand_path($0).sub(/\/bin\/sisu[34]?$/,'')
+ File.expand_path($0).sub(/\/bin\/sisu[45]?$/,'')
else
nil
end
SiSU_lib="sisu/#{SiSU_version_dir}"
sisu_path_specified_lib_=SiSU_path_base \
- ? File.expand_path($0).sub(/bin\/sisu[34]?$/,'lib')
+ ? File.expand_path($0).sub(/bin\/sisu[45]?$/,'lib')
: nil
SiSU_path_specified_Version_=SiSU_path_base \
? "#{SiSU_path_base}/data/sisu/#{SiSU_version_dir}/v/version.yml"
diff --git a/bin/sisu3 b/bin/sisu5
index b4999d51..b4999d51 120000
--- a/bin/sisu3
+++ b/bin/sisu5
diff --git a/conf/sisu/skin/dir/skin_sisu.rb b/conf/sisu/skin/dir/skin_sisu.rb
deleted file mode 120000
index 77ee1e13..00000000
--- a/conf/sisu/skin/dir/skin_sisu.rb
+++ /dev/null
@@ -1 +0,0 @@
-../doc/skin_sisu.rb \ No newline at end of file
diff --git a/conf/sisu/skin/doc/skin_gnu.rb b/conf/sisu/skin/doc/skin_gnu.rb
deleted file mode 100644
index 3fbaedf8..00000000
--- a/conf/sisu/skin/doc/skin_gnu.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# encoding: utf-8
-=begin
- * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph Amissah
- * http://www.sisudoc.org/
- * http://www.jus.uio.no/sisu
- * Description: Free Software Foundation, Gnu sisu skin
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- #% widget
- def widget_promo
- # ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
- end
- #% home
- def home_index
- end
- def home_toc
- end
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_home
- 'http://www.fsf.org'
- end
- def url_site # used in pdf header
- 'http://www.fsf.org'
- end
- def url_txt # text to go with url usually stripped url
- 'www.fsf.org'
- end
- def url_home_url
- '../index.html'
- end
- # color
- def color_band1
- '"#000070"'
- end
- #% txt
- def txt_hp
- 'Free Software Foundation'
- end
- def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
- #"www.jus.uio.no/sisu/"
- 'Free Software Foundation'
- end
- #% icon
- def icon_home_button
- 'philosophical_gnu.png'
- end
- def icon_home_banner
- icion_home_button
- end
- #% banner
- def banner_home_button
- %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.fsf.org}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Free Software Foundation}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
-__END__
diff --git a/conf/sisu/skin/doc/skin_sisu.rb b/conf/sisu/skin/doc/skin_sisu.rb
deleted file mode 100644
index fbe95681..00000000
--- a/conf/sisu/skin/doc/skin_sisu.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# encoding: utf-8
-=begin
- * Name: SiSU information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph@Amissah.com
- * http://www.sisudoc.org/
- * http://www.jus.uio.no/sisu
- * Description: Document skin for SiSU descriptive pages, ...
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- def widget_search
- true
- end
- def widget_promo
- #['sisu','ruby','sisu_search_libre','ruby','open_society']
- end
- #def ocn_display_off
- # false
- #end
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- def url_home
- 'http://www.jus.uio.no/sisu/'
- end
- def url_site # used in pdf header
- 'http://www.jus.uio.no/sisu'
- end
- def url_txt # text to go with url usually stripped url
- 'www.jus.uio.no/sisu/'
- end
- def url_home_url
- '../index.html'
- end
- #def url_root_http
- #root server path info, used in document information
- #end
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- def text_hp
- '&nbsp;SiSU'
- end
- def text_home
- 'SiSU'
- end
- def icon_home_button
- 'sisu.png'
- end
- def icon_home_banner
- icon_home_button
- end
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Ralph Amissah}"
- end
- def owner_chapter
- 'Document owner details'
- end
- end
-end
-__END__
diff --git a/conf/sisu/skin/doc/skin_sisu_manual.rb b/conf/sisu/skin/doc/skin_sisu_manual.rb
deleted file mode 100644
index e5278a83..00000000
--- a/conf/sisu/skin/doc/skin_sisu_manual.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# encoding: utf-8
-=begin
- * Name: SiSU information Structuring Universe - Structured information, Serialized Units
- * Author: ralph@amissah.com
- * http://www.sisudoc.org/
- * http://www.jus.uio.no/sisu
- * Description: Document skin for SiSU descriptive pages, ...
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- #% widget
- def widget_search
- true
- end
- def widget_promo
- ['search_sisu','sisu_manual','sisu']
- #['search_sisu','sisu_manual','sisu','ruby_logo']
- #['sisu_manual_search','sisu_manual']
- #['sisu','ruby','sisu_search_libre','ruby','open_society']
- end
- #def ocn_display_off
- # false
- #end
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_home
- 'http://www.jus.uio.no/sisu/'
- end
- def url_site # used in pdf header
- 'http://www.jus.uio.no/sisu'
- end
- def url_txt # text to go with url usually stripped url
- 'www.jus.uio.no/sisu/'
- end
- def url_home_url
- '../index.html'
- end
- #def url_root_http
- #root server path info, used in document information
- #end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% text
- def text_hp
- '&nbsp;SiSU'
- end
- def text_home
- 'SiSU'
- end
- #% icon
- def icon_home_button
- 'sisu.png'
- end
- def icon_home_banner
- icon_home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Ralph Amissah}"
- end
- def owner_chapter
- 'Document owner details'
- end
- end
-end
-__END__
-puts "#{__LINE__} #{__FILE__}"
diff --git a/conf/sisu/skin/site/skin_sisu.rb b/conf/sisu/skin/site/skin_sisu.rb
deleted file mode 120000
index 77ee1e13..00000000
--- a/conf/sisu/skin/site/skin_sisu.rb
+++ /dev/null
@@ -1 +0,0 @@
-../doc/skin_sisu.rb \ No newline at end of file
diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v5/sisurc.yml
index e492f789..e492f789 120000
--- a/conf/sisu/v3/sisurc.yml
+++ b/conf/sisu/v5/sisurc.yml
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index a02f6cb2..d4c7a6da 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -1,6 +1,7 @@
%% SiSU version 3
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
<http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v3;hb=HEAD>
+v3 branch closed with opening of v5 from >= 4.1
v3 branch is legacy: v4 branch supersedes & replaces it
v3 branch supersedes & replaces v2 branch
v3 introduces alternative (configurable) output structures
@@ -16,7 +17,7 @@ v1 branch is removed; it is available in sisu =< 2.7
%% Legacy Branch, Reference
- Version 3 to be closed on opening of version 4.1.* branch
+ Version 3 to be closed on opening of version 4.1.* & v5 branch
Version 3 introduced output directory structures nad filenames more
compatible with mobile devices and other non-web use and more
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index ada24fdd..411a82f2 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -3,12 +3,14 @@
<http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v4;hb=HEAD>
* debian/changelog
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
+v5 development branch
v4 stable branch supersedes & replaces v3 branch
initial goals:
* remove/retire "skins"; replace some functionality with headers and/or yml
file (consider header like syntax for document and site appearance info)
* bin/sisu $0 make possible to run sisu command on/within project dir tree
* bin/sisu $*, hub, make possible to specify dir path for markup files
+v3 branch is removed; it is available in sisu < 4.1.0
v2 branch is removed; it is available in sisu =< 3.3.2
* homepage at: <http://www.jus.uio.no/sisu>
@@ -28,6 +30,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.0.orig.tar.xz
sisu_4.1.0.orig.tar.xz
sisu_4.1.0-1.dsc
+* v4:
+ * v5 opened
+ * v3 closed
+
* v4: defaults, sysenv, simplify default home page (by default is not used)
* v4: cgi script for sample search form, minor fixes
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
new file mode 100644
index 00000000..b90f7c46
--- /dev/null
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -0,0 +1,36 @@
+%% SiSU version 5
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v5;hb=HEAD>
+* debian/changelog
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
+v5 development branch, opened to insulate stable v4
+v4 stable branch supersedes & replaces v3 branch
+ initial goals:
+ * remove/retire "skins"; replace some functionality with headers and/or yml
+ file (consider header like syntax for document and site appearance info)
+ * bin/sisu $0 make possible to run sisu command on/within project dir tree
+ * bin/sisu $*, hub, make possible to specify dir path for markup files
+v3 branch is removed; it is available in sisu < 4.1.0
+v2 branch is removed; it is available in sisu =< 3.3.2
+
+* homepage at: <http://www.jus.uio.no/sisu>
+* <http://www.jus.uio.no/sisu/SiSU/download>
+* <http://www.jus.uio.no/sisu/SiSU/changelog>
+* <http://sisudoc.org/sisu/sisu_manual>
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+
+%% Reverse Chronological:
+
+%% 5.0.0.orig.tar.xz (2013-05-08:18/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.0-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.0.orig.tar.xz
+ sisu_5.0.0.orig.tar.xz
+ sisu_5.0.0-1.dsc
+
+* v5: opened
+ * v3 closed
+
+v5 opened
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png b/data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png
index 679c22a5..679c22a5 100644
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png
+++ b/data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png b/data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png
index 9ed7b355..9ed7b355 100644
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png
+++ b/data/doc/sisu/markup-samples/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/samples/_sisu/sisu_document_make
index 85e583e1..85e583e1 100644
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/samples/_sisu/sisu_document_make
diff --git a/data/doc/sisu/markup-samples/v4/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst b/data/doc/sisu/markup-samples/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
index c99cb10e..c99cb10e 100644
--- a/data/doc/sisu/markup-samples/v4/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
+++ b/data/doc/sisu/markup-samples/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
diff --git a/data/doc/sisu/markup-samples/v3/samples/sisu_output_overview.ssi b/data/doc/sisu/markup-samples/samples/sisu_output_overview.ssi
index e2c90529..e2c90529 100644
--- a/data/doc/sisu/markup-samples/v3/samples/sisu_output_overview.ssi
+++ b/data/doc/sisu/markup-samples/samples/sisu_output_overview.ssi
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
index ce5b8830..ce5b8830 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/ruby_logo.png b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/ruby_logo.png
index 829e2458..829e2458 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/ruby_logo.png
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/ruby_logo.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/sisu.png b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/sisu.png
index b449fa6b..b449fa6b 100644
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/sisu.png
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/sisu.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/tux.png
index 15fd152b..15fd152b 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/tux.png
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/image/tux.png
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
index 34d4a662..34d4a662 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
index 57440498..57440498 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_lng.yml
index c9da8898..c9da8898 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_lng.yml
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisu_document_make
index 72706d10..72706d10 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisu_document_make
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml
index e492f789..e492f789 120000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v5/sisurc.yml
index e492f789..e492f789 120000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v5/sisurc.yml
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu.ssm b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm
index 79703fef..79703fef 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
index 1c5c1cec..1c5c1cec 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_commands.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_config.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_config.ssi
index 3c29f995..3c29f995 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_config.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_config.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi
index 182b176d..182b176d 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_content_directories.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_content_directories.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_css.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_css.ssi
index 7ffc654b..7ffc654b 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_css.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_css.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_description.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_description.sst
index 9f8fdcd8..9f8fdcd8 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_description.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_description.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_download.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi
index 96c97985..96c97985 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_download.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_examples.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_examples.ssi
index cf9df9d5..cf9df9d5 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_examples.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_examples.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_faq.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst
index 966cea5f..966cea5f 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_faq.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_faq.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_filetypes.sst
index d36acac0..d36acac0 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_filetypes.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_filetypes.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst
index ce6627b7..ce6627b7 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_help.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst
index bee5ed78..bee5ed78 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_help_sources.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_help_sources.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_homepages.ssi
index 3d8d95d5..3d8d95d5 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_homepages.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_homepages.ssi
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_how.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_how.ssi
index 3372bcd4..3372bcd4 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_how.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_how.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_howto.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst
index dab3e8a4..4a23bdfe 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_howto.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_howto.sst
@@ -255,25 +255,25 @@ Sample provided, on untarring the source tarball:
_1 conf/sisu/v4/sisurc.yml
-_1 conf/sisu/v3/sisurc.yml
+_1 conf/sisu/v5/sisurc.yml
and on installation under:
_1 /etc/sisu/v4/sisurc.yml
-_1 /etc/sisu/v3/sisurc.yml
+_1 /etc/sisu/v5/sisurc.yml
The following paths are searched:
-_1 ./_sisu/v4/sisurc.yml or ./_sisu/v3/sisurc.yml
+_1 ./_sisu/v4/sisurc.yml or ./_sisu/v5/sisurc.yml
_1 ./_sisu/sisurc.yml
-_1 ~/.sisu/v4/sisurc.yml or ~/.sisu/v3/sisurc.yml
+_1 ~/.sisu/v4/sisurc.yml or ~/.sisu/v5/sisurc.yml
_1 ~/.sisu/sisurc.yml
-_1 /etc/sisu/v4/sisurc.yml /etc/sisu/v3/sisurc.yml
+_1 /etc/sisu/v4/sisurc.yml /etc/sisu/v5/sisurc.yml
_1 /etc/sisu/sisurc.yml
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_installation.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_installation.ssi
index f908bb6e..f908bb6e 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_installation.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_installation.ssi
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
index 750c46ea..750c46ea 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_interesting_to_whom.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_interesting_to_whom.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_introduction.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_introduction.sst
index 8978ace6..8978ace6 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_introduction.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_introduction.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_manual.ssm b/data/doc/sisu/markup-samples/sisu_manual/sisu_manual.ssm
index 90e8a323..90e8a323 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_manual.ssm
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
index 92b7f430..92b7f430 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup_syntax_history.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup_syntax_history.sst
index c6da0a14..c6da0a14 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_markup_syntax_history.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup_syntax_history.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_output_overview.sst
index 332f4aae..332f4aae 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_output_overview.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_output_overview.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_postgresql.sst
index 574e307c..574e307c 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_postgresql.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_postgresql.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst
index ae95f528..ae95f528 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_quickstart.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_quickstart.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_remote.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_remote.sst
index 959fbcf6..959fbcf6 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_remote.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_remote.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search.ssm b/data/doc/sisu/markup-samples/sisu_manual/sisu_search.ssm
index 9c40a8bf..9c40a8bf 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_search.ssm
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_search_cgi.ssi
index 03eef9ff..03eef9ff 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_cgi.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_search_cgi.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_search_intro.ssi
index d5da379f..d5da379f 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_intro.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_search_intro.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
index 294644af..294644af 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_short_feature_summary.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_short_feature_summary.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sql.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_sql.ssi
index 6e54275b..6e54275b 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sql.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_sql.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_sqlite.sst
index a73ae16c..a73ae16c 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_sqlite.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_sqlite.sst
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_synopsis.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_synopsis.ssi
index 98e5d4f3..98e5d4f3 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_synopsis.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_synopsis.ssi
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
index 12a70fb8..ef881aae 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_syntax_highlighting.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_syntax_highlighting.sst
@@ -29,13 +29,9 @@
The directory:
-_1 ./data/sisu/v4/conf/editor-syntax-etc/
+_1 ./data/sisu/conf/editor-syntax-etc/
-_1 ./data/sisu/v3/conf/editor-syntax-etc/
-
-_1 /usr/share/sisu/v4/conf/editor-syntax-etc
-
-_1 /usr/share/sisu/v3/conf/editor-syntax-etc
+_1 /usr/share/sisu/conf/editor-syntax-etc
contains rudimentary sisu syntax highlighting files for:
@@ -131,7 +127,7 @@ _1 files: sisu-mode.el
_1 to file ~/.emacs add the following 2 lines:
-_2 (add-to-list 'load-path "/usr/share/sisu/v4/conf/editor-syntax-etc/emacs")
+_2 (add-to-list 'load-path "/usr/share/sisu/conf/editor-syntax-etc/emacs")
_2 (require 'sisu-mode.el)
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_webrick.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_webrick.sst
index 6e56e53a..6e56e53a 100644
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_webrick.sst
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_webrick.sst
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index 20e774ac..20e774ac 100644
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
deleted file mode 100644
index 0f3f4a16..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/b_doc.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/b_doc.png
deleted file mode 100644
index 13ca8ebe..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/b_doc.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Copyleft.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Copyleft.png
deleted file mode 100644
index 5b3865b8..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Copyleft.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Euro.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Euro.png
deleted file mode 100644
index 8e5c13a9..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/c_Euro.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/debian_home.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/debian_home.png
deleted file mode 100644
index cee42aa0..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/debian_home.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/levitating_gnu.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/levitating_gnu.png
deleted file mode 100644
index 9a25319a..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/levitating_gnu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/philosophical_gnu.png b/data/doc/sisu/markup-samples/v3/samples/_sisu/image/philosophical_gnu.png
deleted file mode 100644
index ebd239ef..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/image/philosophical_gnu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/dir/skin_sisu.rb
deleted file mode 100644
index bd2e2a53..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/dir/skin_sisu.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# coding: utf-8
-=begin
- * Name: SiSU information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph@Amissah.com
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ...
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- #% widget
- def widget_search
- true
- end
- def widget_promo
-#put s "#{__LINE__} #{__FILE__}"
- #['sisu','ruby','sisu_search_libre','ruby','open_society']
- end
- #% path
- def path_root
-#puts "#{__LINE__} #{__FILE__}"
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
-#puts "#{__LINE__} #{__FILE__}"
- '../'
- end
- #% url
- def url_home
-#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu/'
- end
- def url_site # used in pdf header
-#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu'
- end
- def url_txt # text to go with url usually stripped url
-#puts "#{__LINE__} #{__FILE__}"
- 'www.jus.uio.no/sisu/'
- end
- def url_home_url
-#puts "#{__LINE__} #{__FILE__}"
- '../index.html'
- end
- #def url_root_http
- #root server path info, used in document information
- #end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% text
- def text_hp
- '&nbsp;SiSU'
- end
- def text_home
- 'SiSU'
- end
- #% icon
- def icon_home_button
- 'sisu.png'
- end
- def icon_home_banner
- icon_home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Ralph Amissah}"
- end
- def owner_chapter
- 'Document owner details'
- end
- end
-end
-__END__
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_gnu.rb
deleted file mode 100644
index 8ac38227..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_gnu.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# coding: utf-8
-=begin
- * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph Amissah
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Free Software Foundation, Gnu sisu skin
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- #% widget
- def widget_promo
- # ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
- end
- #% home
- def home_index
- end
- def home_toc
- end
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_home
- 'http://www.fsf.org'
- end
- def url_site # used in pdf header
- 'http://www.fsf.org'
- end
- def url_txt # text to go with url usually stripped url
- 'www.fsf.org'
- end
- def url_home_url
- '../index.html'
- end
- # color
- def color_band1
- '"#000070"'
- end
- #% txt
- def txt_hp
- 'Free Software Foundation'
- end
- def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
- #"www.jus.uio.no/sisu/"
- 'Free Software Foundation'
- end
- #% icon
- def icon_home_button
- 'philosophical_gnu.png'
- end
- def icon_home_banner
- icion_home_button
- end
- #% banner
- def banner_home_button
- %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.fsf.org}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Free Software Foundation}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_rms2.rb b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_rms2.rb
deleted file mode 100644
index 546b1cf4..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/doc/skin_rms2.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# coding: utf-8
-=begin
- * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph Amissah
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin used for Free as in Freedom
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require "#{SiSU_lib}/defaults"
- class Skin
- #% promo
- def promo_promo
- ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
- end
- ##% home
- #def home_index
- #end
- #def home_toc
- #end
- ##% path
- #def path_root # the only parameter that cannot be changed here
- # './sisu/'
- #end
- #def path_rel
- # '../'
- #end
- #% url
- def url_home
- 'http://www.fsf.org'
- end
- def url_site # used in pdf header
- 'http://www.fsf.org'
- end
- def url_txt # text to go with url usually stripped url
- 'www.fsf.org'
- end
- def url_home_url
- '../index.html'
- end
- #def url_root_http
- #root server path info, used in document information
- #end
- #% color
- def color_band1
- '"#cccccc"'
- #'"#000070"'
- end
- #% txt
- def txt_hp
- 'Free as in Freedom'
- end
- def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
- #"www.jus.uio.no/sisu/"
- 'Free as in Freedom'
- end
- #% icon
- def icon_home_button
- end
- def icon_home_banner
- icon_home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff">
- <p class="tiny_left"><a href="#{url_site}/" target="_top">Free as in Freedom</a></p>
- <p class="tiny_left"><a href="#{url_site}/" target="_top">Richard Stallman and the Free Software Revolution</a></p>
- <p class="tiny_left"><a href="http://en.wikipedia.org/wiki/Sam_Williams_(American_journalist)" target="_top">Sam Williams</a></p>
- <p class="tiny_left"><a href="http://en.wikipedia.org/wiki/Richard_M._Stallman" target="_top">Richard M. Stallman</a></p>
- #{table_close}}
- end
- def banner_home_guide
- end
- #% credits
- def insert_levitating_gnu #used locally this skin only
- %{<center><a href="http://www.fsf.org/"><img border="0" height="133" width="135" src="#{url_path_image_base}/levitating_gnu.png" alt="RMS/FSF - Levitating Gnu --&gt;" /></a></center>}
- end
- def credits_splash
- %{<center><table summary="credits" align="center"bgcolor="#ffffff"><tr><td><font color="#666666">#{insert_levitating_gnu}</font></center></td></tr></table></center>}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.gnu.org}"
- end
- def home
- "\\href{#{@vz.url_site}/}{GNU - Free Software Foundation}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/site/skin_sisu.rb
deleted file mode 100644
index bd2e2a53..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/site/skin_sisu.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# coding: utf-8
-=begin
- * Name: SiSU information Structuring Universe - Structured information, Serialized Units
- * Author: Ralph@Amissah.com
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ...
- * License: Same as SiSU see http://www.jus.uio.no/sisu
- * Notes: Site default appearance variables set in defaults.rb
- Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
-=end
-module SiSU_Viz
- require SiSU_lib + '/defaults'
- class Skin
- #% widget
- def widget_search
- true
- end
- def widget_promo
-#put s "#{__LINE__} #{__FILE__}"
- #['sisu','ruby','sisu_search_libre','ruby','open_society']
- end
- #% path
- def path_root
-#puts "#{__LINE__} #{__FILE__}"
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
-#puts "#{__LINE__} #{__FILE__}"
- '../'
- end
- #% url
- def url_home
-#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu/'
- end
- def url_site # used in pdf header
-#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu'
- end
- def url_txt # text to go with url usually stripped url
-#puts "#{__LINE__} #{__FILE__}"
- 'www.jus.uio.no/sisu/'
- end
- def url_home_url
-#puts "#{__LINE__} #{__FILE__}"
- '../index.html'
- end
- #def url_root_http
- #root server path info, used in document information
- #end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% text
- def text_hp
- '&nbsp;SiSU'
- end
- def text_home
- 'SiSU'
- end
- #% icon
- def icon_home_button
- 'sisu.png'
- end
- def icon_home_banner
- icon_home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></center></td><td width="20%">&nbsp;#{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Ralph Amissah}"
- end
- def owner_chapter
- 'Document owner details'
- end
- end
-end
-__END__
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/list.yml b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/list.yml
deleted file mode 100644
index 388ef360..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/list.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-sisu:
- site:
- - sisu
-open_society:
- site:
- - vs
- - twon
- - fc
- - content
- - di
- - faif
- - twobits
- - ffa
- - catb
- - littlebrother
-sisu_icon:
- site:
- - sisu_icon
-fsf:
- site:
- - fsf
-gpl:
- site:
- - gpl
-sisu_search_libre:
- search:
- - sisu_books_libre_sisusearch
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/promo.yml b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/promo.yml
deleted file mode 100644
index 8fc37137..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/promo.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-# Author: ralph@amissah.com
-site:
- sisu_icon:
- url: SiSU
- image: sisu.png
- blurb: ~
- sisu:
- title: SiSU
- url: index.html
- blurb: ~
- links:
- -
- title: What does SiSU do? Summary
- url: SiSU/1.html#summary
- -
- title: SiSU Book Samples and Markup Examples
- url: SiSU/examples.html
- -
- title: Manual
- url: http://sisudoc.org/sisu/sisu_manual/
- -
- title: Markup
- url: http://sisudoc.org/sisu/sisu_markup/
- -
- title: Commands
- url: http://sisudoc.org/sisu/sisu_commands/
- -
- title: SiSU Download
- url: SiSU/download.html
- -
- title: SiSU Changelog
- url: SiSU/changelog.html
- blurb: ~
- -
- title: output by Author
- url: sisu_site_metadata/harvest_authors.html
- -
- title: output by Topic
- url: sisu_site_metadata/harvest_topics.html
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/SiSU
- blurb: ~
- -
- title: Freshmeat
- url: http://freshmeat.net/projects/sisu/
- -
- title: Ruby Application Archive
- url: http://raa.ruby-lang.org/project/sisu/
- vs:
- title: Viral Spiral
- subtitle: How the Commoners Built a Digital Republic of Their Own
- author: David Bollier
- year: 2009
- url: viral_spiral.david_bollier
- links:
- -
- title: Source Wiki
- url: http://viralspiral.cc/
- twon:
- title: The Wealth of Networks
- subtitle: How Social Production Transforms Markets and Freedom
- author: Yochai Benkler
- year: 2006
- url: the_wealth_of_networks.yochai_benkler
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/The_Wealth_of_Networks
- -
- title: Source Wiki
- url: http://www.benkler.org/wealth_of_networks/index.php/Main_Page
- fc:
- title: Free Culture
- subtitle: How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
- author: Lawrence Lessig
- year: 2004
- url: free_culture.lawrence_lessig
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_Culture_%28book%29
- -
- title: Creative Commons
- url: http://creativecommons.org/
- -
- title: Source
- url: http://www.free-culture.cc/
- di:
- title: Democratizing Innovation
- author: Eric von Hippel
- year: 2005
- url: democratizing_innovation.eric_von_hippel
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Democratizing_Innovation
- -
- title: Source
- url: http://web.mit.edu/evhippel/www/democ1.htm
- faif:
- title: Free As In Freedom
- subtitle: Richard Stallman's Crusade for Free Software
- author: Sam Williams
- year: 2002
- url: free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
- -
- title: Source
- url: http://faifzilla.org/
- -
- title: FSF
- url: http://www.fsf.org/
- -
- title: FSF Wikipedia
- url: http://en.wikipedia.org/wiki/Free_Software_Foundation
- -
- title: GPL
- url: http://www.gnu.org/copyleft/gpl.html
- -
- title: GPL Wikipedia
- url: http://en.wikipedia.org/wiki/GNU_General_Public_License
- twobits:
- title: Two Bits
- subtitle: The Cultural Significance of Free Software
- author: Christopher Kelty
- year: 2008
- url: two_bits.christopher_kelty
- links:
- -
- title: Home
- url: http://twobits.net
- ffa:
- title: Free For All
- subtitle: How Linux and the Free Software Movement Undercut the High Tech Titans
- author: Peter Wayner
- year: 2002
- url: free_for_all.peter_wayner
- links:
- -
- title: Source
- url: http://www.wayner.org/books/ffa/
- catb:
- title: The Cathedral & the Bazaar
- subtitle: Musings on Linux and Open Source by an Accidental Revolutionary
- author: Erik S. Raymond
- year: 1999
- url: the_cathedral_and_the_bazaar.eric_s_raymond
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Cathedral_and_the_bazaar
- -
- title: Source
- url: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/
- fsf:
- title: Free Software Foundation
- subtitle: FSF
- url: http://www.fsf.org/
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_Software_Foundation
- -
- title: GPL
- subtitle: GNU General Public License
- url: http://www.gnu.org/copyleft/gpl.html
- gpl:
- title: GNU General Public License
- subtitle: GPL
- url: http://www.gnu.org/copyleft/gpl.html
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/GNU_General_Public_License
- -
- title: GPL 3
- url: http://gplv3.fsf.org/
- -
- title: Software License List
- url: http://www.fsf.org/licensing/licenses/
- content:
- title: CONTENT
- subtitle: Selected Essays on Technology, Creativity, Copyright and the Future of the Future
- author: Cory Doctorow
- year: 2008
- url: content.cory_doctorow
- links:
- -
- title: Home
- url: http://craphound.com/content
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Cory_Doctorow
- littlebrother:
- title: Little Brother
- author: Cory Doctorow
- year: 2008
- url: little_brother.cory_doctorow
- links:
- -
- title: Home
- url: http://craphound.com/littlebrother
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
-search:
- sisu_books_libre_sisusearch:
- type: sisusearch
- action: http://search.sisudoc.org
- target: _top
- db: sisu
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_countries.yml b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_countries.yml
deleted file mode 100644
index 274e19fa..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_countries.yml
+++ /dev/null
@@ -1,481 +0,0 @@
-# arch-tag: yaml country list
-# Author: Ralph@Amissah.com
-# License: Same as SiSU see http://www.jus.uio.no/sisu
-id: AF
- name: Afghanistan
-id: AL
- name: Albania
-id: DZ
- name: Algeria
-id: AS
- name: American Samoa
-id: AD
- name: Andorra
-id: AO
- name: Angola
-id: AI
- name: Anguilla
-id: AQ
- name: Antarctica
-id: AG
- name: Antigua and Barbuda
-id: AR
- name: Argentina
-id: AM
- name: Armenia
-id: AW
- name: Aruba
-id: AU
- name: Australia
-id: AT
- name: Austria
-id: AZ
- name: Azerbaijan
-id: BS
- name: Bahamas
-id: BH
- name: Bahrain
-id: BD
- name: Bangladesh
-id: BB
- name: Barbados
-id: BY
- name: Belarus
-id: BE
- name: Belgium
-id: BZ
- name: Belize
-id: BJ
- name: Benin
-id: BM
- name: Bermuda
-id: BT
- name: Bhutan
-id: BO
- name: Bolivia
-id: BA
- name: Bosnia and Herzegovina
-id: BW
- name: Botswana
-id: BV
- name: Bouvet Island
-id: BR
- name: Brazil
-id: IO
- name: British Indian Ocean Territory
-id: BN
- name: Brunei Darussalam
-id: BG
- name: Bulgaria
-id: BF
- name: Burkina Faso
-id: BI
- name: Burundi
-id: KH
- name: Cambodia
-id: CM
- name: Cameroon
-id: CA
- name: Canada
-id: CV
- name: Cape Verde
-id: KY
- name: Cayman Islands
-id: CF
- name: Central African Republic
-id: TD
- name: Chad
-id: CL
- name: Chile
-id: CN
- name: China
-id: CX
- name: Christmas Island
-id: CC
- name: Cocos (Keeling) Islands
-id: CO
- name: Colombia
-id: KM
- name: Comoros
-id: CG
- name: Congo
-id: CK
- name: Cook Islands
-id: CR
- name: Costa Rica
-id: HR
- name: Croatia (Hrvatska)
-id: CU
- name: Cuba
-id: CY
- name: Cyprus
-id: CZ
- name: Czech Republic
-id: CS
- name: Czechoslovakia
-id: DK
- name: Denmark
-id: DJ
- name: Djibouti
-id: DM
- name: Dominica
-id: DO
- name: Dominican Republic
-id: TP
- name: East Timor
-id: EC
- name: Ecuador
-id: EG
- name: Egypt
-id: SV
- name: El Salvador
-id: GQ
- name: Equatorial Guinea
-id: ER
- name: Eritrea
-id: EE
- name: Estonia
-id: ET
- name: Ethiopia
-id: FK
- name: Falkland Islands (Malvinas)
-id: FO
- name: Faroe Islands
-id: FJ
- name: Fiji
-id: FI
- name: Finland
-id: FR
- name: France
-id: FX
- name: France, Metroplitan
-id: GF
- name: French Guiana
-id: PF
- name: French Polynesia
-id: TF
- name: French Southern Territories
-id: GA
- name: Gabon
-id: GM
- name: Gambia
-id: GE
- name: Georgia
-id: DE
- name: Germany
-id: GH
- name: Ghana
-id: GI
- name: Gibraltar
-id: GB
- name: Great Britain (UK)
-id: GR
- name: Greece
-id: GL
- name: Greenland
-id: GD
- name: Grenada
-id: GP
- name: Guadeloupe
-id: GU
- name: Guam
-id: GT
- name: Guatemala
-id: GN
- name: Guinea
-id: GW
- name: Guinea-Bissau
-id: GY
- name: Guyana
-id: HT
- name: Haiti
-id: HM
- name: Heard and McDonald Islands
-id: HN
- name: Honduras
-id: HK
- name: Hong Kong
-id: HU
- name: Hungary
-id: IS
- name: Iceland
-id: IN
- name: India
-id: ID
- name: Indonesia
-id: IR
- name: Iran
-id: IQ
- name: Iraq
-id: IE
- name: Ireland
-id: IL
- name: Israel
-id: IT
- name: Italy
-id: CI
- name: Ivory Coast
-id: JM
- name: Jamaica
-id: JP
- name: Japan
-id: JO
- name: Jordan
-id: KZ
- name: Kazakhstan
-id: KE
- name: Kenya
-id: KI
- name: Kiribati
-id: KP
- name: Korea (North)
-id: KR
- name: Korea (South)
-id: KW
- name: Kuwait
-id: KG
- name: Kyrgyzstan
-id: LA
- name: Laos
-id: LV
- name: Latvia
-id: LB
- name: Lebanon
-id: LS
- name: Lesotho
-id: LR
- name: Liberia
-id: LY
- name: Libya
-id: LI
- name: Liechtenstein
-id: LT
- name: Lithuania
-id: LU
- name: Luxembourg
-id: MO
- name: Macau
-id: ME
- name: Macedonia
-id: MG
- name: Madagascar
-id: MW
- name: Malawi
-id: MY
- name: Malaysia
-id: MV
- name: Maldives
-id: ML
- name: Mali
-id: MT
- name: Malta
-id: MB
- name: Marshall Islands
-id: MQ
- name: Martinique
-id: MR
- name: Mauritania
-id: MU
- name: Mauritius
-id: YT
- name: Mayotte
-id: MX
- name: Mexico
-id: FM
- name: Micronesia
-id: MD
- name: Moldova
-id: MC
- name: Monaco
-id: MN
- name: Mongolia
-id: MS
- name: Montserrat
-id: MA
- name: Morocco
-id: MZ
- name: Mozambique
-id: MM
- name: Myanmar
-id: NA
- name: Namibia
-id: NR
- name: Nauru
-id: NP
- name: Nepal
-id: NL
- name: Netherlands
-id: AN
- name: Netherlands Antilles
-id: NT
- name: Neutral Zone
-id: NC
- name: New Caledonia
-id: NZ
- name: New Zealand (Aotearoa)
-id: NI
- name: Nicaragua
-id: NE
- name: Niger
-id: NG
- name: Nigeria
-id: NU
- name: Niue
-id: NF
- name: Norfolk Island
-id: MP
- name: Northern Mariana Islands
-id: NO
- name: Norway
-id: OM
- name: Oman
-id: 00
- name: Other
-id: PK
- name: Pakistan
-id: PW
- name: Palau
-id: PA
- name: Panama
-id: PG
- name: Papua New Guinea
-id: PY
- name: Paraguay
-id: PE
- name: Peru
-id: PH
- name: Philippines
-id: PN
- name: Pitcairn
-id: PL
- name: Poland
-id: PT
- name: Portugal
-id: PR
- name: Puerto Rico
-id: QA
- name: Qatar
-id: RE
- name: Reunion
-id: RO
- name: Romania
-id: RU
- name: Russian Federation
-id: RW
- name: Rwanda
-id: GS
- name: S. Georgia and S. Sandwich Isls.
-id: KN
- name: Saint Kitts and Nevis
-id: LC
- name: Saint Lucia
-id: VC
- name: Saint Vincent and the Grenadines
-id: WS
- name: Samoa
-id: SM
- name: San Marino
-id: ST
- name: Sao Tome and Principe
-id: SA
- name: Saudi Arabia
-id: SN
- name: Senegal
-id: SC
- name: Seychelles
-id: SL
- name: Sierra Leone
-id: SG
- name: Singapore
-id: SK
- name: Slovak Republic
-id: SI
- name: Slovenia
-id: SB
- name: Solomon Islands
-id: SO
- name: Somalia
-id: ZA
- name: South Africa
-id: ES
- name: Spain
-id: LK
- name: Sri Lanka
-id: SH
- name: St. Helena
-id: PM
- name: St. Pierre and Miquelon
-id: SD
- name: Sudan
-id: SR
- name: Suriname
-id: SJ
- name: Svalbard and Jan Mayen Islands
-id: SZ
- name: Swaziland
-id: SE
- name: Sweden
-id: CH
- name: Switzerland
-id: SY
- name: Syria
-id: TW
- name: Taiwan
-id: TJ
- name: Tajikistan
-id: TZ
- name: Tanzania
-id: TH
- name: Thailand
-id: TG
- name: Togo
-id: TK
- name: Tokelau
-id: TO
- name: Tonga
-id: TT
- name: Trinidad and Tobago
-id: TN
- name: Tunisia
-id: TR
- name: Turkey
-id: TM
- name: Turkmenistan
-id: TC
- name: Turks and Caicos Islands
-id: TV
- name: Tuvalu
-id: UM
- name: US Minor Outlying Islands
-id: SU
- name: USSR (former)
-id: UG
- name: Uganda
-id: UA
- name: Ukraine
-id: AE
- name: United Arab Emirates
-id: UK
- name: United Kingdom
-id: US
- name: United States
-id: UY
- name: Uruguay
-id: UZ
- name: Uzbekistan
-id: VU
- name: Vanuatu
-id: VA
- name: Vatican City State (Holy See)
-id: VE
- name: Venezuela
-id: VN
- name: Viet Nam
-id: VG
- name: Virgin Islands (British)
-id: VI
- name: Virgin Islands (U.S.)
-id: WF
- name: Wallis and Futuna Islands
-id: EH
- name: Western Sahara
diff --git a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_country.yml b/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_country.yml
deleted file mode 100644
index dc835465..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/_sisu/skin/yml/skin_country.yml
+++ /dev/null
@@ -1,735 +0,0 @@
-# arch-tag: yaml country list array
-# Author: Ralph@Amissah.com
-# License: Same as SiSU see http://www.jus.uio.no/sisu
--
- - AF
- - Afghanistan
--
- - AL
- - Albania
--
- - DZ
- - Algeria
--
- - AS
- - American Samoa
--
- - AD
- - Andorra
--
- - AO
- - Angola
--
- - AI
- - Anguilla
--
- - AQ
- - Antarctica
--
- - AG
- - Antigua and Barbuda
--
- - AR
- - Argentina
--
- - AM
- - Armenia
--
- - AW
- - Aruba
--
- - AU
- - Australia
--
- - AT
- - Austria
--
- - AZ
- - Azerbaijan
--
- - BS
- - Bahamas
--
- - BH
- - Bahrain
--
- - BD
- - Bangladesh
--
- - BB
- - Barbados
--
- - BY
- - Belarus
--
- - BE
- - Belgium
--
- - BZ
- - Belize
--
- - BJ
- - Benin
--
- - BM
- - Bermuda
--
- - BT
- - Bhutan
--
- - BO
- - Bolivia
--
- - BA
- - Bosnia and Herzegovina
--
- - BW
- - Botswana
--
- - BV
- - Bouvet Island
--
- - BR
- - Brazil
--
- - IO
- - British Indian Ocean Territory
--
- - BN
- - Brunei Darussalam
--
- - BG
- - Bulgaria
--
- - BF
- - Burkina Faso
--
- - BI
- - Burundi
--
- - KH
- - Cambodia
--
- - CM
- - Cameroon
--
- - CA
- - Canada
--
- - CV
- - Cape Verde
--
- - KY
- - Cayman Islands
--
- - CF
- - Central African Republic
--
- - TD
- - Chad
--
- - CL
- - Chile
--
- - CN
- - China
--
- - CX
- - Christmas Island
--
- - CC
- - Cocos (Keeling) Islands
--
- - CO
- - Colombia
--
- - KM
- - Comoros
--
- - CG
- - Congo
--
- - CK
- - Cook Islands
--
- - CR
- - Costa Rica
--
- - HR
- - Croatia (Hrvatska)
--
- - CU
- - Cuba
--
- - CY
- - Cyprus
--
- - CZ
- - Czech Republic
--
- - CS
- - Czechoslovakia (former)
--
- - DK
- - Denmark
--
- - DJ
- - Djibouti
--
- - DM
- - Dominica
--
- - DO
- - Dominican Republic
--
- - TP
- - East Timor
--
- - EC
- - Ecuador
--
- - EG
- - Egypt
--
- - SV
- - El Salvador
--
- - GQ
- - Equatorial Guinea
--
- - ER
- - Eritrea
--
- - EE
- - Estonia
--
- - ET
- - Ethiopia
--
- - FK
- - Falkland Islands (Malvinas)
--
- - FO
- - Faroe Islands
--
- - FJ
- - Fiji
--
- - FI
- - Finland
--
- - FR
- - France
--
- - FX
- - France, Metropolitan
--
- - GF
- - French Guiana
--
- - PF
- - French Polynesia
--
- - TF
- - French Southern Territories
--
- - GA
- - Gabon
--
- - GM
- - Gambia
--
- - GE
- - Georgia
--
- - DE
- - Germany
--
- - GH
- - Ghana
--
- - GI
- - Gibraltar
--
- - GB
- - Great Britain (UK)
--
- - GR
- - Greece
--
- - GL
- - Greenland
--
- - GD
- - Grenada
--
- - GP
- - Guadeloupe
--
- - GU
- - Guam
--
- - GT
- - Guatemala
--
- - GN
- - Guinea
--
- - GW
- - Guinea-Bissau
--
- - GY
- - Guyana
--
- - HT
- - Haiti
--
- - HM
- - Heard and McDonald Islands
--
- - HN
- - Honduras
--
- - HK
- - Hong Kong
--
- - HU
- - Hungary
--
- - IS
- - Iceland
--
- - IN
- - India
--
- - ID
- - Indonesia
--
- - IR
- - Iran
--
- - IQ
- - Iraq
--
- - IE
- - Ireland
--
- - IL
- - Israel
--
- - IT
- - Italy
--
- - CI
- - Ivory Coast
--
- - JM
- - Jamaica
--
- - JP
- - Japan
--
- - JO
- - Jordan
--
- - KZ
- - Kazakhstan
--
- - KE
- - Kenya
--
- - KI
- - Kiribati
--
- - KP
- - Korea (North)
--
- - KR
- - Korea (South)
--
- - KW
- - Kuwait
--
- - KG
- - Kyrgyzstan
--
- - LA
- - Laos
--
- - LV
- - Latvia
--
- - LB
- - Lebanon
--
- - LS
- - Lesotho
--
- - LR
- - Liberia
--
- - LY
- - Libya
--
- - LI
- - Liechtenstein
--
- - LT
- - Lithuania
--
- - LU
- - Luxembourg
--
- - MO
- - Macau
--
- - ME
- - Macedonia
--
- - MG
- - Madagascar
--
- - MW
- - Malawi
--
- - MY
- - Malaysia
--
- - MV
- - Maldives
--
- - ML
- - Mali
--
- - MT
- - Malta
--
- - MB
- - Marshall Islands
--
- - MQ
- - Martinique
--
- - MR
- - Mauritania
--
- - MU
- - Mauritius
--
- - YT
- - Mayotte
--
- - MX
- - Mexico
--
- - FM
- - Micronesia
--
- - MD
- - Moldova
--
- - MC
- - Monaco
--
- - MN
- - Mongolia
--
- - MS
- - Montserrat
--
- - MA
- - Morocco
--
- - MZ
- - Mozambique
--
- - MM
- - Myanmar
--
- - NA
- - Namibia
--
- - NR
- - Nauru
--
- - NP
- - Nepal
--
- - NL
- - Netherlands
--
- - AN
- - Netherlands Antilles
--
- - NT
- - Neutral Zone
--
- - NC
- - New Caledonia
--
- - NZ
- - New Zealand (Aotearoa)
--
- - NI
- - Nicaragua
--
- - NE
- - Niger
--
- - NG
- - Nigeria
--
- - NU
- - Niue
--
- - NF
- - Norfolk Island
--
- - MP
- - Northern Mariana Islands
--
- - 'NO'
- - Norway
--
- - OM
- - Oman
--
- - '00'
- - Other
--
- - PK
- - Pakistan
--
- - PW
- - Palau
--
- - PA
- - Panama
--
- - PG
- - Papua New Guinea
--
- - PY
- - Paraguay
--
- - PE
- - Peru
--
- - PH
- - Philippines
--
- - PN
- - Pitcairn
--
- - PL
- - Poland
--
- - PT
- - Portugal
--
- - PR
- - Puerto Rico
--
- - QA
- - Qatar
--
- - RE
- - Reunion
--
- - RO
- - Romania
--
- - RU
- - Russian Federation
--
- - RW
- - Rwanda
--
- - GS
- - S. Georgia and S. Sandwich Isls.
--
- - KN
- - Saint Kitts and Nevis
--
- - LC
- - Saint Lucia
--
- - VC
- - Saint Vincent and the Grenadines
--
- - WS
- - Samoa
--
- - SM
- - San Marino
--
- - ST
- - Sao Tome and Principe
--
- - SA
- - Saudi Arabia
--
- - SN
- - Senegal
--
- - SC
- - Seychelles
--
- - SL
- - Sierra Leone
--
- - SG
- - Singapore
--
- - SK
- - Slovak Republic
--
- - SI
- - Slovenia
--
- - SB
- - Solomon Islands
--
- - SO
- - Somalia
--
- - ZA
- - South Africa
--
- - ES
- - Spain
--
- - LK
- - Sri Lanka
--
- - SH
- - St. Helena
--
- - PM
- - St. Pierre and Miquelon
--
- - SD
- - Sudan
--
- - SR
- - Suriname
--
- - SJ
- - Svalbard and Jan Mayen Islands
--
- - SZ
- - Swaziland
--
- - SE
- - Sweden
--
- - CH
- - Switzerland
--
- - SY
- - Syria
--
- - TW
- - Taiwan
--
- - TJ
- - Tajikistan
--
- - TZ
- - Tanzania
--
- - TH
- - Thailand
--
- - TG
- - Togo
--
- - TK
- - Tokelau
--
- - TO
- - Tonga
--
- - TT
- - Trinidad and Tobago
--
- - TN
- - Tunisia
--
- - TR
- - Turkey
--
- - TM
- - Turkmenistan
--
- - TC
- - Turks and Caicos Islands
--
- - TV
- - Tuvalu
--
- - UM
- - US Minor Outlying Islands
--
- - SU
- - USSR (former)
--
- - UG
- - Uganda
--
- - UA
- - Ukraine
--
- - AE
- - United Arab Emirates
--
- - UK
- - United Kingdom
--
- - US
- - United States
--
- - UY
- - Uruguay
--
- - UZ
- - Uzbekistan
--
- - VU
- - Vanuatu
--
- - VA
- - Vatican City State (Holy See)
--
- - VE
- - Venezuela
--
- - VN
- - Viet Nam
--
- - VG
- - Virgin Islands (British)
--
- - VI
- - Virgin Islands (U.S.)
--
- - WF
- - Wallis and Futuna Islands
--
- - EH
- - Western Sahara
--
- - YE
- - Yemen
--
- - YU
- - Yugoslavia
--
- - ZR
- - Zaire
--
- - ZM
- - Zambia
--
- - ZW
- - Zimbabwe
diff --git a/data/doc/sisu/markup-samples/v3/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst b/data/doc/sisu/markup-samples/v3/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
deleted file mode 100644
index 4b040a75..00000000
--- a/data/doc/sisu/markup-samples/v3/samples/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst
+++ /dev/null
@@ -1,2549 +0,0 @@
-% SiSU 2.0
-
-@title: Free as in Freedom (2.0)
- :subtitle: Richard Stallman and the Free Software Revolution
-
-@creator:
- :author: Williams, Sam; Stallman, Richard M.
-
-@date:
- :published: 2010
-
-@rights:
- :copyright: Copyright (C) Sam Williams 2002; Copyright 2010 Richard M. Stallman
- :license: Published under the GNU Free Documentation License. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License."
-
-@classify:
- :topic_register: SiSU markup sample:book:biography;book:biography;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;programming
-
-@links:
- { Home and Source }http://faifzilla.org/
- { @ Wikipedia }http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
- { @ Amazon.com }http://www.amazon.com/gp/product/0596002874
- { @ Barnes & Noble }http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0596002874
- { SiSU }http://sisudoc.org/
- { sources / git }http://sources.sisudoc.org/
-
-@make:
- :breaks: new=:A,:B,:C,1
- :skin: skin_rms2
-
-% http://static.fsf.org/nosvn/faif-2.0.pdf
-% http://www.scribd.com/doc/55232810/Free-as-in-Freedom-Richard-Stallman
-
-:A~ @title, Sam Williams, Second Edition Revisions by Richard M. Stallman
-
-1~pre2 [Publisher Information] -#
-
-This is /{Free as in Freedom 2.0: Richard Stallman and the Free Soft-ware Revolution}/ , a revision of /{Free as in Freedom: Richard Stallman’s Crusade for Free Software}/. -#
-
-Copyright c 2002, 2010 Sam Williams \\ Copyright c 2010 Richard M. Stallman -#
-
-Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation;with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNUFree Documentation License." -#
-
-Published by the Free Software Foundation \\
-51 Franklin St., Fifth Floor \\
-Boston, MA 02110-1335 \\
-USA -#
-
-ISBN: 9780983159216 -#
-
-The cover photograph of Richard Stallman is by Peter Hinely. The PDP-10 photograph in Chapter 7 is by Rodney Brooks. The photo-graph of St. IGNUcius in Chapter 8 is by Stian Eikeland -#
-
-1~ Foreword by Richard M. Stallman
-
-I have aimed to make this edition combine the advantages of my knowledge and Williams' interviews and outside viewpoint. The reader can judge to what extent I have achieved this.
-
-I read the published text of the English edition for the first time in 2009 when I was asked to assist in making a French translation of /{Free as in Freedom}/. It called for more than small changes.
-
-Many facts needed correction, but deeper changes were also needed. Williams, a non-programmer, blurred fundamental technical and legal distinctions, such as that between modifying an existing program's code, on the one hand, and implementing some of its ideas in a new program, on the other. Thus, the first edition said that both Gosmacs and GNU Emacs were developed by modifying the original PDP-10 Emacs, which in fact neither one was. Likewise, it mistakenly described Linux as a "version of Minix." SCO later made the same false claim in its infamous lawsuit against IBM, and both Torvalds and Tanenbaum rebutted it.
-
-The first edition over dramatized many events by projecting spurious emotions into them. For instance, it said that I "all but shunned" Linux in 1992, and then made a "a dramatic about-face" by deciding in 1993 to sponsor Debian GNU/Linux. Both my interest in 1993 and my lack of interest in 1992 were pragmatic means to pursue the same end: to complete the GNU system. The launch of the GNU Hurd kernel in 1990 was also a pragmatic move directed at that same end.
-
-For all these reasons, many statements in the original edition were mistaken or incoherent. It was necessary to correct them, but not straightforward to do so with integrity short of a total rewrite, which was undesirable for other reasons. Using explicit notes for the corrections was suggested, but in most chapters the amount of change made explicit notes prohibitive. Some errors were too pervasive or too in-grained to be corrected by notes. Inline or footnotes for the rest would have overwhelmed the text in some places and made the text hard to read; footnotes would have been skipped by readers tired of looking down for them. I have therefore made corrections directly in the text.
-
-However, I have not tried to check all the facts and quotations that are outside my knowledge; most of those I have simply carried forward on Williams' authority.
-
-Williams' version contained many quotations that are critical of me. I have preserved all these, adding rebuttals when appropriate.I have not deleted any quotation, except in chapter 11where I have deleted some that were about open source and did not pertain to my life or work. Likewise I have preserved (and sometimes commented on) most of Williams' own interpretations that criticized me, when they did not represent misunderstanding of facts or technology, but I have freely corrected inaccurate assertions about my work and my thoughts and feelings. I have preserved his personal impressions when presented as such, and "I" in the text of this edition always refers to Williams except in notes labeled "RMS:".
-
-In this edition, the complete system that combines GNU and Linux is always "GNU/Linux," and "Linux" by itself always refers to Torvalds' kernel, except in quotations where the other usage is marked with "[sic]". \\ See http://www.gnu.org/gnu/gnu-linux-faq.html for more explanation of why it is erroneous and unfair to call the whole system "Linux."
-
-I would like to thank John Sullivan for his many useful criticisms and suggestions.
-
-1~ Preface by Sam Williams
-
-This summer marks the 10th anniversary of the email exchange that set in motion the writing of /{Free as in Freedom: Richard Stallman's Crusade for Free Software}/ and, by extension, the work prefaced here, /{Richard Stallman and the Free Software Revolution}/.
-
-Needless to say, a lot has changed over the intervening decade.
-
-Originally conceived in an era of American triumphalism, the book's main storyline - about one man's Jeremiah-like efforts to enlighten fellow software developers as to the ethical, if not economic, shortsightedness of a commercial system bent on turning the free range intellectual culture that gave birth to computer science into a rude agglomeration of proprietary gated communities - seems almost nostalgic, a return to the days when the techno-capitalist system seemed to be working just fine, barring the criticism of a few outlying skeptics.
-
-Now that doubting the system has become almost a common virtue,it helps to look at what narrative threads, if any, remained consistent over the last ten years.
-
-While I don't follow the software industry as closely as I once did, one thing that leaps out now, even more than it did then, is the ease with which ordinary consumers have proven willing to cede vast swaths of private information and personal user liberty in exchange for riding a top the coolest technology "platform" or the latest networking trend.
-
-A few years ago, I might have dubbed this the "iPod Effect," a shorthand salute to Apple co-founder Steve Jobs' unrivaled success in getting both the music industry and digital music listeners to put aside years of doubt and mutual animosity to rally around a single, sexy device - the Apple iPod - and its restrictive licensing regime, iTunes. Were I pitching the story to a magazine or newspaper nowadays, I'd probably have to call it the "iPad Effect" or maybe the "Kindle Effect" both in an attempt to keep up with the evolving brand names and to acknowledge parallel, tectonic shifts in the realm of daily journalism and electronic book publishing.
-
-Lest I appear to be gratuitously plugging the above-mentioned brand names, RMS suggests that I offer equal time to a pair of websites that can spell out their many disadvantages, especially in the realm of software liberty. I have agreed to this suggestion in the spirit of equal time. The web sites he recommends are DefectiveByDesign.org and BadVista.org.
-
-Regardless of title, the notion of corporate brand as sole guarantor of software quality in a swiftly changing world remains a hard one to dislodge, even at a time when most corporate brands are trading at or near historic lows.
-
-Ten years ago, it wasn't hard to find yourself at a technology conference listening in on a conversation (or subjected to direct tutelage) in which some old-timer, Richard Stallman included, offered a compelling vision of an alternate possibility. It was the job of these old-timers, I ultimately realized, to make sure we newbies in the journalism game recognized that the tools we prided ourselves in finally knowing how to use - Microsoft Word, PowerPoint, Internet Explorer, just to name a few popular offerings from a single oft-cited vendor - were but a pale shadow of towering edifice the original architects of the personal computer set out to build.
-
-Nowadays, it's almost as if the opposite situation is at hand. The edifice is now a sprawling ecosystem, a jungle teeming with ideas but offering only a few stable niches for sustainable growth. While one can still find plenty of hackers willing to grumble about, say, Vista's on going structural flaws, Apple's dictatorial oversight of the iPhoneApp Store or Google's shifting definition of the word "evil" - each year brings with it a fresh crop of "digital native" consumers willing to trust corporate guidance in this Hobbesian realm. Maybe that's because many of the problems that once made using your desktop computer such a teeth-grinding experience have largely been paved over with the help of free software.
-
-Whatever. As consumer software reliability has improved, the race to stay one step ahead of consumer taste has put application developers in an even tighter embrace with moneyed interests. I'm not saying that the hacker ethos no longer exists or that it has even weakened in any noticeable way. I'm just saying that I doubt the programmer who generated the Facebook algorithm that rewrites the "info" pages so that each keyword points to a sponsored page, with an 80-percent semantic error rate to boot, spends much time in his new Porsche grousing about what the program really could have achieved if only the "suits" hadn't gotten in the way.
-
-True, millions of people now run mostly free software on their computers with many running free software exclusively. From an ordinary consumer perspective, however, terms like "software" and "computer" have become increasingly distant. Many 2010-era cell phones could give a 2000-era laptop a run for its money in the functionality department. And yet, when it comes time to make a cell phone purchase, how many users lend any thought to the computer or software operating system making that functionality possible? The vast majority of modern phone users base their purchasing decisions almost entirely on the number of applications offered, the robustness of the network and, most important of all, the monthly service plan. Getting a consumer in this situation to view his or her software purchase through the lens of personal liberty, as opposed to personal convenience, is becoming, if not more difficult, certainly a more complex endeavor.
-
-Given this form of pessimistic introduction, why should anyone want go on and read this book?
-
-I can offer two major reasons.
-
-The first reason is a personal one. As noted in the Epilogue of /{Free as in Freedom}/, Richard and I parted on less than cordial terms shortly before the publication of that book. The fault, in large part, was mine. Having worked with Richard to make sure that my biographical sketch didn't run afoul of free software principles - an effort that, I'm proud to say, made /{Free as in Freedom}/ one of the first works to employ the GNU Free Documentation License (GFDL) as a copyright mechanism - I abruptly ended the cooperative relationship when it came time to edit the work and incorporate Richard' lengthy list of error corrections and requests for clarification.
-
-Though able to duck behind my own principles of authorial independence and journalistic objectivity, I have since come to lament not begging the book's publisher - O'Reilly and Associates - for additional time. Because O'Reilly had already granted my one major stipulation - the GFDL - and had already put up with a heavy stream of last-minute changes on my part, however, I was hesitant to push my luck.
-
-In the years immediately following the publication of /{Free as in Freedom}/, I was able to justify my decision by noting that the GFDL, just like the GNU General Public License in the software realm, makes it possible for any reader to modify the book and resell it as a competitive work. As Ernest Hemingway once put it, "the first draft of anything is shit." If Stallman or others within the hacker community saw /{Free as in Freedom}/ as a first draft at best, well, at least I had spared them the time and labor of generating their own first draft.
-
-Now that Richard has indeed delivered what amounts to a significant rewrite, I can only but remain true to my younger self and endorse the effort. Indeed, I salute it. My only remaining hope is that, seeing as how Richard's work doesn't show any sign of slowing, additional documentation gets added to the mix.
-
-Before moving on to the next reason, I should note that one of the pleasant by-products of this book is a re-opening of email communication channels between Richard and myself. The resulting communication has reacquainted me with the razor-sharp Stallman writing style.
-
-An illustrative and perhaps amusing anecdote for anyone out there who has wrangled with Richard in text: In the course of discussing the passage in which I observe and document the process of Richard losing his cool amid the rush hour traffic of Kihei, Maui, a passage that served as the basis for Chapter 7 ("A Brief Journey through Hacker Hell") in the original book, I acknowledged a common complaint among the book's reviewers - namely, that the episode seemed out of place, a fragment of magazine-style profile interrupting a book-length biography. I told Richard that he could discard the episode for that reason alone but noted that my decision to include it was based on two justifications. First, it offered a glimpse of the Stallman temper, something I'd been warned about but had yet to experience in a first hand manner. Second, I felt the overall scene possessed a certain metaphorical value. Hence the chapter title. Stallman, to my surprise, agreed on both counts. His concern lay more in the two off-key words. At one point I quote him accusing the lead driver of our two-vehicle caravan with "deliberately" leading us down a dead-end street, an accusation that, if true, suggested a level of malice outside the bounds of the actual situation. Without the benefit of a recorded transcript - I only had a notebook at the time, I allowed that it was likely I'd mishandled Stallman's actual wording and had made it more hurtful than originally intended.
-
-On a separate issue, meanwhile, Stallman questioned his quoted use of the word "fucking." Again, I didn't have the moment on tape, but I wrote back that I distinctly recalled an impressive display of profanity, a reminder of Richard's New York roots, and was willing to stand by that memory.
-
-An email response from Richard, received the next day, restated the critique in a way that forced me to go back and re-read the first message. As it turned out, Stallman wasn't so much objecting to the "fuck" as the "-ing" portion of the quote.
-
-"Part of the reason I doubt [the words] is that they involve using fucking as an adverb," Stallman wrote. "I have never spoken that way. So I am sure the words are somewhat altered."
-
-"Touch'e".
-
-The second reason a person should feel compelled to read this book cycles back to the opening theme of this preface - how different a future we face in 2010 compared to the one we were still squinting our eyes to see back in 2000. I ll be honest: Like many Americans (and non-Americans), my world view was altered by the events of September 11, 2001, so much so that it wasn't much longer after the publication of /{Free as in Freedom}/ that my attention drifted sharply away from the free software movement and Stallman's efforts to keep it on course. While I have managed to follow the broad trends and major issues, the day-to-day drama surrounding software standards, software copyrights and software patents has become something I largely skip over - the Internet news equivalent of the Water Board notes in the local daily newspaper, in other words.
-
-[RMS: The September 2001 attacks, not mentioned later in the book, deserve brief comment here. Far from "changing everything," as many proclaim, the attacks have, in fact, changed very little in the U.S.: There are still scoundrels in power who hate our freedoms. The only major difference is that they can now cite "terrorists" as an excuse for laws to take them away. See the political notes on stallman.org for more about this.]
-
-This is a lamentable development in large part because, ten years in, I finally see the maturing 21st century in what I believe to be a clear light. Again, if this were a pitch letter to some editor, I'd call it "The Process Century."
-
-By that I mean I we stand at a rare point in history where, all cynicism aside, the power to change the world really does delegate down to the ordinary citizen's level. The catch, of course, is that the same power that belongs to you also belongs to everyone else. Wherein past eras one might have secured change simply by winning the sympathies of a few well-placed insiders, today's reformer must bring into alignment an entire vector field of competitive ideas and interests. In short, being an effective reformer nowadays requires more than just titanic stamina and a willingness to cry out in the wilderness for a decade or more, it requires knowing how to articulate durable, scalable ideas, how to beat the system at its own game.
-
-On all counts, I would argue that Richard M. Stallman, while maybe not the archetype, is at the very least an ur-type of the successful reformer just described.
-
-While some might lament a future in which every problem seems to take a few decades of committee meetings and sub-committee hearings just to reach the correction stage, I, for one, see the alternative - a future so responsive to individual or small group action that some self-appointed actor finally decides to put that responsiveness to the test- as too chilling to contemplate.
-
-In short, if you are the type of person who, like me, hopes to seethe 21st century follow a less bloody course than the 20th century, the Water Board - in its many frustrating guises - is where that battle is currently being fought. As hinted by the Virgil-inspired epigraph introducing the book's first chapter, I've always held out hope that this book might in some way become a sort of epic poem for the Internet Age. Built around a heroic but flawed central figure, its authorial stamp should be allowed to blur with age.
-
-On that note, I would like to end this preface the same way I always end this preface - with a request for changes and contributions from any reader wishing to improve the text. Appendix B - GNU Free Documentation License offers a guide on your rights as a reader to submit changes, make corrections, or even create your own spin-off version of the book. If you prefer to simply run the changes through Richard or myself, you can find the pertinent contact information on the Free Software Foundation web site. In the meantime, good luck and enjoy the book!
-
-group{
-
-Sam Williams
-Staten Island,
-USA
-
-}group
-
-1~ Chapter 1 - For Want of a Printer
-
-code{
-
-I fear the Greeks. Even when they bring gifts.
- ---Virgil
- The Aeneid
-
-}code
-
-The new printer was jammed, again.
-
-Richard M. Stallman, a staff software programmer at the Massachusetts Institute of Technology's Artificial Intelligence Laboratory (AI Lab), discovered the malfunction the hard way. An hour after sending off a 50-page file to the office laser printer, Stallman, 27, broke off a productive work session to retrieve his documents. Upon arrival, he found only four pages in the printer's tray. To make matters even more frustrating, the four pages belonged to another user, meaning that Stallman's print job and the unfinished portion of somebody else's print job were still trapped somewhere within the electrical plumbing of the lab's computer network.
-={AI Lab (Artificial Intelligence Laboratory);MIT Massachusetts Institute of Technology}
-
-Waiting for machines is an occupational hazard when you're a software programmer, so Stallman took his frustration with a grain of salt. Still, the difference between waiting for a machine and waiting on a machine is a sizable one. It wasn't the first time he'd been forced to stand over the printer, watching pages print out one by one. As a person who spent the bulk of his days and nights improving the efficiency of machines and the software programs that controlled them, Stallman felt a natural urge to open up the machine, look at the guts, and seek out the root of the problem.
-
-Unfortunately, Stallman's skills as a computer programmer did not extend to the mechanical-engineering realm. As freshly printed documents poured out of the machine, Stallman had a chance to reflect on other ways to circumvent the printing jam problem.
-
-How long ago had it been that the staff members at the AI Lab had welcomed the new printer with open arms? Stallman wondered. The machine had been a donation from the Xerox Corporation. A cutting edge prototype, it was a modified version of a fast Xerox photocopier. Only instead of making copies, it relied on software data piped in over a computer network to turn that data into professional-looking documents. Created by engineers at the world-famous Xerox Palo Alto Research Facility, it was, quite simply, an early taste of the desktop-printing revolution that would seize the rest of the computing industry by the end of the decade.
-={Xerox Corporation+10:Palo Alto Research Center}
-
-Driven by an instinctual urge to play with the best new equipment, programmers at the AI Lab promptly integrated the new machine into the lab's sophisticated computing infrastructure. The results had been immediately pleasing. Unlike the lab's old printer, the new Xerox machine was fast. Pages came flying out at a rate of one per second, turning a 20-minute print job into a 2-minute print job. The new machine was also more precise. Circles came out looking like circles, not ovals. Straight lines came out looking like straight lines, not low-amplitude sine waves.
-
-It was, for all intents and purposes, a gift too good to refuse.
-
-Once the machine was in use, its flaws began to surface. Chief among the drawbacks was the machine's susceptibility to paper jams. Engineering-minded programmers quickly understood the reason behind the flaw. As a photocopier, the machine generally required the direct oversight of a human operator. Figuring that these human operators would always be on hand to fix a paper jam, if it occurred, Xerox engineers had devoted their time and energies to eliminating other pesky problems. In engineering terms, user diligence was built into the system.
-
-In modifying the machine for printer use, Xerox engineers had changed the user-machine relationship in a subtle but profound way. Instead of making the machine subservient to an individual human operator, they made it subservient to an entire networked population of human operators. Instead of standing directly over the machine, a human user on one end of the network sent his print command through an extended bucket brigade of machines, expecting the desired content to arrive at the targeted destination and in proper form. It wasn't until he finally went to check up on the final output that he realized how little of it had really been printed.
-
-Stallman was hardly the only AI Lab denizen to notice the problem, but he also thought of a remedy. Years before, for the lab's previous printer, Stallman had solved a similar problem by modifying the software program that regulated the printer, on a small PDP-11machine, as well as the Incompatible Timesharing System that ran on the main PDP-10 computer. Stallman couldn't eliminate paper jams, but he could insert software code that made the PDP-11 check the printer periodically, and report jams back to the PDP-10. Stallman also inserted code on the PDP-10 to notify every user with a waiting print job that the printer was jammed. The notice was simple, something along the lines of "The printer is jammed, please fix it," and because it went out to the people with the most pressing need to fix the problem, chances were that one of them would fix it forthwith.
-={PDP-10 computer;PDP-11 computer}
-
-As fixes go, Stallman's was oblique but elegant. It didn't fix the mechanical side of the problem, but it did the next best thing by closing the information loop between user and machine. Thanks to a few additional lines of software code, AI Lab employees could eliminate the 10 or 15 minutes wasted each week in running back and forth to check on the printer. In programming terms, Stallman's fix took advantage of the amplified intelligence of the overall network.
-
-"If you got that message, you couldn't assume somebody else would fix it," says Stallman, recalling the logic. "You had to go to the printer. A minute or two after the printer got in trouble, the two or three people who got messages arrive to fix the machine. Of those two or three people, one of them, at least, would usually know how to fix the problem."
-
-Such clever fixes were a trademark of the AI Lab and its indigenous population of programmers. Indeed, the best programmers at the AI Lab disdained the term programmer, preferring the more slangy occupational title of hacker instead. The job title covered a host of activities - everything from creative mirth making to the improvement of existing software and computer systems. Implicit within the title, however, was the old-fashioned notion of Yankee ingenuity. For a hacker, writing a software program that worked was only the beginning. A hacker would try to display his cleverness (and impress other hackers) by tackling an additional challenge: to make the program particularly fast, small, powerful, elegant, or somehow impressive in a clever way.~{ For more on the term "hacker," see Appendix A - Hack, Hackers, and Hacking. }~
-
-Companies like Xerox made it a policy to donate their products(and software) to places where hackers typically congregated. If hackers used these products, they might go to work for the company later on. In the 60s and early 70s, they also sometimes developed programs that were useful for the manufacturer to distribute to other customers.
-={hackers:philosophy of donating software+7;software:companies donating;source code:Xerox Corporation publishing+32}
-
-When Stallman noticed the jamming tendency in the Xerox laser printer, he thought of applying the old fix or "hack" to this printer. In the course of looking up the Xerox laser-printer software, however, Stallman made a troubling discovery. The printer didn't have any software, at least nothing Stallman or a fellow programmer could read. Until then, most companies had made it a form of courtesy to publish source-code files-readable text files that documented the individual software commands that told a machine what to do. Xerox, in this instance, had provided software files only in compiled, or binary, form. If programmers looked at the files, all they would see was an endless stream of ones and zeroes - gibberish.
-={Xerox Corporation:source code, publishing+31;text file source code, publishing;binary files}
-
-There are programs, called "disassemblers," to convert the ones and zeroes into low-level machine instructions, but figuring out what those instructions actually "do" is a long and hard task, known as "reverse engineering." To reverse engineer this program could have taken more time than five years' worth of jammed printouts. Stallman wasn't desperate enough for that, so he put the problem aside.
-
-Xerox's unfriendly policy contrasted blatantly with the usual practices of the hacker community. For instance, to develop the program for the PDP-11 that ran the old printer, and the program for another PDP-11 that handled display terminals, the AI Lab needed a cross-assembler program to build PDP-11 programs on the PDP-10 main computer. The lab's hackers could have written one, but Stallman, a Harvard student, found such a program at Harvard's computer lab. That program was written to run on the same kind of computer, the PDP-10, albeit with a different operating system. Stallman never knew who had written the program, since the source code did not say. But he brought a copy back to the AI Lab. He then altered the source code to make it run on the AI Lab's Incompatible Timesharing System (ITS). With no muss and little fuss, the AI Lab got the program it needed for its software infrastructure. Stallman even added a few features not found in the original version, making the program more powerful. "We wound up using it for several years," Stallman says.
-={Harvard University:computer labs+2;AI Lab (Artificial Intelligence Laboratory):borrowing source code for}
-
-From the perspective of a 1970s-era programmer, the transaction was the software equivalent of a neighbor stopping by to borrow a power tool or a cup of sugar from a neighbor. The only difference was that in borrowing a copy of the software for the AI Lab, Stallman had done nothing to deprive anyone else of the use of the program. If anything, other hackers gained in the process, because Stallman had introduced additional features that other hackers were welcome to borrow back. For instance, Stallman recalls a programmer at the private engineering firm, Bolt, Beranek & Newman, borrowing the program. He made it run on Twenex and added a few additional features, which Stallman eventually reintegrated into the AI Lab's own source-code archive. The two programmers decided to maintain a common version together, which had the code to run either on ITSor on Twenex at the user's choice.
-={Bolt, Beranek & Newman engineering firm}
-
-"A program would develop the way a city develops," says Stallman, recalling the software infrastructure of the AI Lab. "Parts would get replaced and rebuilt. New things would get added on. But you could always look at a certain part and say, 'Hmm, by the style, I see this part was written back in the early 60s and this part was written in themid-1970s.'"
-
-Through this simple system of intellectual accretion, hackers at the AI Lab and other places built up robust creations. Not every programmer participating in this culture described himself as a hacker, but most shared the sentiments of Richard M. Stallman. If a program or software fix was good enough to solve your problems, it was good enough to solve somebody else's problems. Why not share it out of a simple desire for good karma?
-
-This system of cooperation was being undermined by commercial secrecy and greed, leading to peculiar combinations of secrecy and co-operation. For instance, computer scientists at UC Berkeley had built up a powerful operating system called BSD, based on the Unix system they had obtained from AT&T. Berkeley made BSD available for the cost of copying a tape, but would only give these tapes to schools that could present a $50,000 source license obtained from AT&T. The Berkeley hackers continued to share as much as AT&T let them, but they had not perceived a conflict between the two practices.
-={AT&T;Multics operating system;UC Berkeley:building Unix;Unix operating system;BSD}
-
-Likewise, Stallman was annoyed that Xerox had not provided the source-code files, but not yet angry. He never thought of asking Xerox for a copy. "They had already given us the laser printer," Stallman says. "I could not say they owed us something more. Besides, I took for granted that the absence of source code reflected an intentional decision, and that asking them to change it would be futile."
-
-Good news eventually arrived: word had it that a scientist at the computer-science department at Carnegie Mellon University had a copy of the laser printer source code.
-={Carnegie Mellon University+17}
-
-The association with Carnegie Mellon did not augur well. In 1979, Brian Reid, a doctoral student there, had shocked the community by refusing to share his text-formatting program, dubbed Scribe. This text formatter was the first to have mark-up commands oriented to-wards the desired semantics (such as "emphasize this word" or "this paragraph is a quotation") rather than low-level formatting details("put this word in italics" or "narrow the margins for this paragraph"). Instead Reid sold Scribe to a Pittsburgh-area software company called Unilogic. His graduate-student career ending, Reid says he simply was looking for a way to unload the program on a set of developers that would take pains to keep it from slipping into the public domain.(Why one would consider such an outcome particularly undesirable is not clear.) To sweeten the deal, Reid also agreed to insert a set of time-dependent functions - "time bombs" in software-programmer parlance - that deactivated freely copied versions of the program after a 90-day expiration date. To avoid deactivation, users paid the software company, which then issued a code that defused the internal time-bomb anti-feature.
-={Unilogic software company+1;time bombs, in software;Scribe text-formatting program+1;anti-feature}
-
-For Stallman, this was a betrayal of the programmer ethos, pure and simple. Instead of honoring the notion of share-and-share alike, Reid had inserted a way for companies to compel programmers to pay for information access. But he didn't think deeply about the question, since he didn't use Scribe much.
-
-Unilogic gave the AI Lab a gratis copy to use, but did not remove or mention the time bomb. It worked, for a while; then one day a user reported that Scribe had stopped working. System hacker Howard Cannon spent hours debugging the binary until he found the time-bomb and patched it out. Cannon was incensed, and wasn't shy about telling the other hackers how mad he was that Unilogic had wasted his time with an intentional bug.
-
-Stallman had a Lab-related reason, a few months later, to visit the Carnegie Mellon campus. During that visit, he made a point of looking for the person reported to have the printer software source code. By good fortune, the man was in his office.
-
-In true engineer-to-engineer fashion, the conversation was cordial but blunt. After briefly introducing himself as a visitor from MIT, Stallman requested a copy of the laser-printer source code that he wanted to modify. To his chagrin, the researcher refused.
-
-"He told me that he had promised not to give me a copy," Stallman says.
-
-Memory is a funny thing. Twenty years after the fact, Stallman's mental history tape is blank in places. Not only does he not remember the motivating reason for the trip or even the time of year during which he took it, he also has no recollection of who was on the other end of the conversation. According to Reid, the person most likely to have fielded Stallman's request is Robert Sproull, a former Xerox PARC researcher and current director of Sun Laboratories, a research division of the computer-technology conglomerate Sun Microsystems. During the 1970s, Sproull had been the primary developer of the laser-printer software in question while at Xerox PARC. Around 1980, Sproull took a faculty research position at Carnegie Mellon where he continued his laser-printer work amid other projects.
-={Xerox Corporation:PARC|Palo Alto Research Center;Sproull, Robert (Xerox PARC researcher);Sun Laboratories}
-
-When asked directly about the request, however, Sproull draws a blank. "I can't make a factual comment," writes Sproull via email. "I have absolutely no recollection of the incident."
-
-"The code that Stallman was asking for was leading-edge, state-of-the-art code that Sproull had written in the year or so before going to Carnegie Mellon," recalls Reid. If so, that might indicate a mis-understanding that occurred, since Stallman wanted the source for the program that MIT had used for quite some time, not some newer version. But the question of which version never arose in the brief conversation.
-
-In talking to audiences, Stallman has made repeated reference to the incident, noting that the man's unwillingness to hand over the source code stemmed from a nondisclosure agreement, a contractual agreement between him and the Xerox Corporation giving the signatory access to the software source code in exchange for a promise of secrecy. Now a standard item of business in the software industry, the nondisclosure agreement, or NDA, was a novel development at the time, a reflection of both the commercial value of the laser printer to Xerox and the information needed to run it. "Xerox was at the time trying to make a commercial product out of the laser printer," recalls Reid. "They would have been insane to give away the source code."
-={NDAs (nondisclosure agreements): for source code+13;nondisclosure agreements (NDAs):for source code+13}
-
-For Stallman, however, the NDA was something else entirely. It was a refusal on the part of some CMU researcher to participate in a society that, until then, had encouraged software programmers to regard programs as communal resources. Like a peasant whose centuries-old irrigation ditch had grown suddenly dry, Stallman had followed the ditch to its source only to find a brand-spanking-new hydroelectric dam bearing the Xerox logo.
-
-For Stallman, the realization that Xerox had compelled a fellow programmer to participate in this newfangled system of compelled secrecy took a while to sink in. In the first moment, he could only seethe refusal in a personal context. "I was so angry I couldn't think of a way to express it. So I just turned away and walked out without another word," Stallman recalls. "I might have slammed the door. Who knows? All I remember is wanting to get out of there. I went to his office expecting him to cooperate, so I had not thought about how I would respond if he refused. When he did, I was stunned speechless as well as disappointed and angry."
-
-Twenty years after the fact, the anger still lingers, and Stallman presents the event as one that made him confront an ethical issue, though not the only such event on his path. Within the next few months, a series of events would befall both Stallman and the AI Lab hacker community that would make 30 seconds worth of tension in a remote Carnegie Mellon office seem trivial by comparison. Nevertheless, when it comes time to sort out the events that would transform Stallman from a lone hacker, instinctively suspicious of centralized authority, to a crusading activist applying traditional notions of liberty, equality, and fraternity to the world of software development, Stallman singles out the Carnegie Mellon encounter for special attention.
-
-"It was my first encounter with a nondisclosure agreement, and it immediately taught me that nondisclosure agreements have victims," says Stallman, firmly. "In this case I was the victim. [My lab and I]were victims."
-
-Stallman later explained, "If he had refused me his cooperation for personal reasons, it would not have raised any larger issue. I might have considered him a jerk, but no more. The fact that his refusal was impersonal, that he had promised in advance to be uncooperative, not just to me but to anyone whatsoever, made this a larger issue."
-
-Although previous events had raised Stallman's ire, he says it wasn't until his Carnegie Mellon encounter that he realized the events were beginning to intrude on a culture he had long considered sacrosanct. He said, "I already had an idea that software should be shared, but I wasn't sure how to think about that. My thoughts weren't clear and organized to the point where I could express them in a concise fashion to the rest of the world. After this experience, I started to recognize what the issue was, and how big it was."
-
-As an elite programmer at one of the world's elite institutions, Stallman had been perfectly willing to ignore the compromises and bargains of his fellow programmers just so long as they didn't interfere with his own work. Until the arrival of the Xerox laser printer, Stallman had been content to look down on the machines and programs other computer users grimly tolerated.
-
-Now that the laser printer had insinuated itself within the AI Lab's network, however, something had changed. The machine worked fine, barring the paper jams, but the ability to modify software according to personal taste or community need had been taken away. From the viewpoint of the software industry, the printer software represented a change in business tactics. Software had become such a valuable asset that companies no longer accepted the need to publicize source code, especially when publication meant giving potential competitors a chance to duplicate something cheaply. From Stallman's viewpoint, the printer was a Trojan Horse. After a decade of failure, software that users could not change and redistribute - future hackers would use the term "proprietary" software - had gained a foothold inside the AI Lab through the sneakiest of methods. It had come disguised as a gift.
-={proprietary software}
-
-That Xerox had offered some programmers access to additional gifts in exchange for secrecy was also galling, but Stallman takes pains to note that, if presented with such a quid pro quo bargain at a younger age, he just might have taken the Xerox Corporation up on its offer. The anger of the Carnegie Mellon encounter, however, had a firming effect on Stallman's own moral lassitude. Not only did it give him the necessary anger to view such future offers with suspicion, it also forced him to turn the situation around: what if a fellow hacker dropped into Stallman's office someday and it suddenly became Stallman's job to refuse the hacker's request for source code?
-
-"When somebody invited me to betray all my colleagues in that way, I remembered how angry I was when somebody else had done that to me and my whole lab," Stallman says. "So I said, 'Thank you very much for offering me this nice software package, but I can't accept it on the conditions that you're asking for, so I'm going to do without it.'"
-
-It was a lesson Stallman would carry with him through the tumultuous years of the 1980s, a decade during which many of his MIT colleagues would depart the AI Lab and sign nondisclosure agreements of their own. They may have told themselves that this was a necessary evil so they could work on the best projects. For Stallman, however, the NDA called the moral legitimacy of the project into question. What good is a technically exciting project if it is meant to be withheld from the community?
-
-As Stallman would quickly learn, refusing such offers involved more than personal sacrifice. It involved segregating himself from fellow hackers who, though sharing a similar distaste for secrecy, tended to express that distaste in a more morally flexible fashion. Refusing another's request for source code, Stallman decided, was not only a betrayal of the scientific mission that had nurtured software development since the end of World War II, it was a violation of the Golden Rule, the baseline moral dictate to do unto others as you would have them do unto you.
-
-Hence the importance of the laser printer and the encounter that resulted from it. Without it, Stallman says, his life might have followed a more ordinary path, one balancing the material comforts of a commercial programmer with the ultimate frustration of a life spent writing invisible software code. There would have been no sense of clarity, no urgency to address a problem others weren't addressing. Most importantly, there would have been no righteous anger, an emotion that, as we soon shall see, has propelled Stallman's career as surely as any political ideology or ethical belief.
-
-"From that day forward, I decided this was something I could never participate in," says Stallman, alluding to the practice of trading personal liberty for the sake of convenience - Stallman's description of the NDA bargain - as well as the overall culture that encouraged such ethically suspect deal-making in the first place. "I decided never to make other people victims as I had been a victim."
-
-1~ Chapter 2 - 2001: A Hacker's Odyssey
-
-The New York University computer-science department sits inside Warren Weaver Hall, a fortress-like building located two blocks east of Washington Square Park. Industrial-strength air-conditioning vents create a surrounding moat of hot air, discouraging loiterers and solicitors alike. Visitors who breach the moat encounter another formidable barrier, a security check-in counter immediately inside the building's single entryway.
-={Warren Weaver Hall+2;New York University computer science department+44}
-
-Beyond the security checkpoint, the atmosphere relaxes somewhat. Still, numerous signs scattered throughout the first floor preach the dangers of unsecured doors and propped-open fire exits. Taken as a whole, the signs offer a reminder: even in the relatively tranquil confines of pre-September 11, 2001, New York, one can never be too careful or too suspicious.
-
-The signs offer an interesting thematic counterpoint to the growing number of visitors gathering in the hall's interior atrium. A few look like NYU students. Most look like shaggy-haired concert-goers milling outside a music hall in anticipation of the main act. For one brief morning, the masses have taken over Warren Weaver Hall, leaving the nearby security attendant with nothing better to do but watch Ricki Lake on TV and shrug her shoulders toward the nearby auditorium whenever visitors ask about "the speech."
-
-Once inside the auditorium, a visitor finds the person who has forced this temporary shutdown of building security procedures. The person is Richard M. Stallman, founder of the GNU Project, original president of the Free Software Foundation, winner of the 1990 MacArthur Fellowship, winner of the Association of Computing Machinery's Grace Murray Hopper Award (also in 1990), co-recipient of the Takeda Foundation's 2001 Takeda Award for Social/Economic Betterment, and former AI Lab hacker. As announced over a host of hacker-related web sites, including the GNU Project's own http://www.gnu.org site, Stallman is in Manhattan, his former hometown, to deliver a much anticipated speech in rebuttal to the Microsoft Corporation's recent campaign against the GNU General Public License.
-={Free Software Foundation (FSF)+1;FSF (Free Software Foundation);GNU General Public License+1;GNU Project:web site for;GPL+1;MacArthur Fellowship Program;Microsoft Corporation+8}
-
-The subject of Stallman's speech is the history and future of the free software movement. The location is significant. Less than a month before, Microsoft senior vice president Craig Mundie appeared at the nearby NYU Stern School of Business, delivering a speech blasting the GNU General Public License, or GNU GPL, a legal device originally conceived by Stallman 16 years before. Built to counteract the growing wave of software secrecy overtaking the computer industry - a wave first noticed by Stallman during his 1980 troubles with the Xerox laser printer - the GPL has evolved into a central tool of the free software community. In simplest terms, the GPL establishes a form of communal ownership - what today's legal scholars now call the "digital commons" - through the legal weight of copyright. The GPL makes this irrevocable; once an author gives code to the community in this way, that code can't be made proprietary by anyone else. Derivative versions must carry the same copyright license, if they use a substantial amount of the original source code. For this reason, critics of the GPL have taken to calling it a "viral" license, suggesting inaccurately that it spreads itself to every software program it touches.~{ Actually, the GPL's powers are not quite that potent: just putting your code in the same computer with a GPL-covered program does not put your code under the GPL. "To compare something to a virus is very harsh," says Stallman. "A spider plant is a more accurate comparison; it goes to another place if you actively take a cutting." For more information on the GNU General Public License, \\ visit http://www.gnu.org/copyleft/gpl.html. }~
-={Mundie, Craig+2;NYU Stern School of Business;Stern School of Business (NYU)}
-
-In an information economy increasingly dependent on software and increasingly beholden to software standards, the GPL has become the proverbial "big stick." Even companies that once derided it as "software socialism" have come around to recognize the benefits. Linux, the kernel developed by Finnish college student Linus Torvalds in 1991, is licensed under the GPL, as are most parts of the GNU system: GNU Emacs, the GNU Debugger, the GNU C Compiler, etc. Together, these tools form the components of the free software GNU/Linux operating system, developed, nurtured, and owned by the worldwide hacker community. Instead of viewing this community as a threat, high-tech companies like IBM, Hewlett Packard, and Sun Microsystems have come to rely upon it, selling software applications and services built to ride atop the ever-growing free software infrastructure.~{ Although these applications run on GNU/Linux, it does not follow that they are themselves free software. On the contrary, most of them applications are proprietary software, and respect your freedom no more than Windows does. They may contribute to the success of GNU/Linux, but they don't contribute to the goal of freedom for which it exists. }~
-={C Compiler (GNU);GNU Debugger (GDB);GDB (GNU Debugger);Debugger;Emacs text editor;GNU Emacs;GNU C Compiler (GCC)+9;GCC (GNU C Compiler);Hewlett Packard:free software community and;IBM:free software community and;Linux;Torvalds, Linus;Sun Microsystems: free software community and}
-
-They've also come to rely upon it as a strategic weapon in the hacker community's perennial war against Microsoft, the Redmond, Washington-based company that has dominated the PC-software marketplace since the late 1980s. As owner of the popular Windows operating system, Microsoft stands to lose the most in an industry-wide shift to the GPL license. Each program in the Windows colossus is covered by copyrights and contracts (End User License Agreements, or EULAs) asserting the proprietary status of the executable, as well as the underlying source code that users can't get anyway. Incorporating code protected by the "viral" GPL into one of these programs is forbidden; to comply with the GPL's requirements, Microsoft would be legally required to make that whole program free software. Rival companies could then copy, modify, and sell improved versions of it, taking away the basis of Microsoft's lock over the users.
-={Windows (Microsoft):source code and;open source:software development, approach to;Redmond (Washington)}
-
-Hence the company's growing concern over the GPL's rate of adoption. Hence the recent Mundie speech blasting the GPL and the "open source" approach to software development and sales. (Microsoft does not even acknowledge the term "free software," preferring to use its attacks to direct attention towards the apolitical "open source" camp described in chapter 11, and away from the free software movement.) And hence Stallman's decision to deliver a public rebuttal to that speech on the same campus here today.
-
-20 years is a long time in the software industry. Consider this: in 1980, when Richard Stallman was cursing the AI Lab's Xerox laser printer, Microsoft, which dominates the worldwide software industry, was still a privately held startup. IBM, the company then regarded as the most powerful force in the computer hardware industry, had yet to introduce its first personal computer, thereby igniting the current low-cost PC market. Many of the technologies we now take for granted - the World Wide Web, satellite television, 32-bit video-game consoles - didn't even exist. The same goes for many of the companies that now fill the upper echelons of the corporate establishment, companies like AOL, Sun Microsystems, Amazon.com, Compaq, and Dell. The list goes on and on.
-={Amazon.com;AOL (America OnLine);Compaq computers;Dell computers;PCs (personal computers);personal computers (PCs)}
-
-Among those who value progress above freedom, the fact that the high-technology marketplace has come so far in such little time is cited both for and against the GNU GPL. Some argue in favor of the GPL, pointing to the short lifespan of most computer hardware platforms. Facing the risk of buying an obsolete product, consumers tend to flock to companies with the best long-term survival. As a result, the software marketplace has become a winner-take-all arena.~{ See Shubha Ghosh, "Revealing the Microsoft Windows Source Code," Gi-galaw.com (January, 2000), \\ http://www.gigalaw.com/. }~ The proprietary software environment, they say, leads to monopoly abuse and stagnation. Strong companies suck all the oxygen out of the marketplace for rival competitors and innovative startups. Others argue just the opposite. Selling software is just as risky, if not more risky, than buying software, they say. Without the legal guarantees provided by proprietary software licenses, not to mention the economic prospects of a privately owned "killer app" (i.e., a break-through technology that launches an entirely new market),~{ Killer apps don't have to be proprietary. Still, I think the reader gets the point: the software marketplace is like the lottery. The bigger the potential pay-off, the more people want to participate. For a good summary of the killer-app phenomenon, see Philip Ben-David, "Whatever Happened to the 'Killer App'?", e-Commerce News (December 7, 2000), \\ http://www.ecommercetimes.com/story/5893.html. }~ companies lose the incentive to participate. Once again, the market stagnates and innovation declines. As Mundie himself noted in his May 3rd address on the same campus, the GPL's "viral" nature "poses a threat" to any company that relies on the uniqueness of its software as a competitive asset. Added Mundie:
-={Mundie, Craig+3}
-
-_1 It also fundamentally undermines the independent commercial software sector because it effectively makes it impossible to distribute software on a basis where recipients pay for the product rather than just the cost of distribution.~{ See Craig Mundie, "The Commercial Software Model," senior vice president, Microsoft Corp., excerpted from an online transcript of Mundie's May 3, 2001, speech to the New York University Stern School of Business, \\ http://www.microsoft.com/presspass/exec/craig/05-03sharedsource.asp. }~
-
-The mutual success of GNU/Linux and Windows over the last 10years suggests that both sides on this question are sometimes right. However, free software activists such as Stallman think this is a side issue. The real question, they say, isn't whether free or proprietary software will succeed more, it's which one is more ethical.
-
-Nevertheless, the battle for momentum is an important one in the software industry. Even powerful vendors such as Microsoft rely on the support of third-party software developers whose tools, programs, and computer games make an underlying software platform such as Windows more attractive to the mainstream consumer. Citing the rapid evolution of the technology marketplace over the last 20 years, not to mention his own company's impressive track record during that period, Mundie advised listeners to not get too carried away by the free software movement's recent momentum:
-={GNU Project:Linux and, mutual success of;Linux:GNU Project and;third-party software developers supporting Microsoft}
-
-_1 Two decades of experience have shown that an economic model that protects intellectual property and a business model that recoups research and development costs can create impressive economic benefits and distribute them very broadly.~{ /{Ibid.}/ }~
-
-Such admonitions serve as the backdrop for Stallman's speech today. Less than a month after their utterance, Stallman stands with his back to one of the chalk boards at the front of the room, edgy to begin.
-
-If the last two decades have brought dramatic changes to the software marketplace, they have brought even more dramatic changes to Stallman himself. Gone is the skinny, clean-shaven hacker who once spent his entire days communing with his beloved PDP-10. In his place stands a heavy-set middle-aged man with long hair and rabbinical beard, a man who now spends the bulk of his time writing and answering email, haranguing fellow programmers, and giving speeches like the one today. Dressed in an aqua-colored T-shirt and brown polyester pants, Stallman looks like a desert hermit who just stepped out of a Salvation Army dressing room.
-
-The crowd is filled with visitors who share Stallman's fashion and grooming tastes. Many come bearing laptop computers and cellular modems, all the better to record and transmit Stallman's words to a waiting Internet audience. The gender ratio is roughly 15 males to 1 female, and 1 of the 7 or 8 females in the room comes in bearing a stuffed penguin, the official Linux mascot, while another carries a stuffed teddy bear.
-
-Agitated, Stallman leaves his post at the front of the room and takes a seat in a front-row chair, tapping commands into an already-opened laptop. For the next 10 minutes Stallman is oblivious to the growing number of students, professors, and fans circulating in front of him at the foot of the auditorium stage.
-
-Before the speech can begin, the baroque rituals of academic formality must be observed. Stallman's appearance merits not one but two introductions. Mike Uretsky, co-director of the Stern School's Center for Advanced Technology, provides the first.
-={Uretsky, Mike+5}
-
-"The role of a university is to foster debate and to have interesting discussions," Uretsky says. "This particular presentation, this seminar falls right into that mold. I find the discussion of open source particularly interesting."
-
-Before Uretsky can get another sentence out, Stallman is on his feet waving him down like a stranded motorist.
-
-"I do free software," Stallman says to rising laughter. "Open source is a different movement.
-
-"The laughter gives way to applause. The room is stocked with Stallman partisans, people who know of his reputation for verbal exactitude, not to mention his much publicized 1998 falling out with the open source software proponents. Most have come to anticipate such outbursts the same way radio fans once waited for Jack Benny's trademark, "Now cut that out!" phrase during each radio program.
-
-Uretsky hastily finishes his introduction and cedes the stage to Edmond Schonberg, a professor in the NYU computer-science department. As a computer programmer and GNU Project contributor, Schonberg knows which linguistic land mines to avoid. He deftly summarizes Stallman's career from the perspective of a modern-day programmer.
-={Schonberg, Ed.+2}
-
-"Richard is the perfect example of somebody who, by acting locally, started thinking globally [about] problems concerning the un-availability of source code," says Schonberg. "He has developed a coherent philosophy that has forced all of us to reexamine our ideas of how software is produced, of what intellectual property means, and of what the software community actually represents."~{ If this were to be said today, Stallman would object to the term "intellectual property" as carrying bias and confusion. \\ See http://www.gnu.org/philosophy/not-ipr.html. }~
-
-Schonberg welcomes Stallman to more applause. Stallman takes a moment to shut off his laptop, rises out of his chair, and takes the stage.
-
-At first, Stallman's address seems more Catskills comedy routine than political speech. "I'd like to thank Microsoft for providing me the opportunity to be on this platform," Stallman wisecracks. "For the past few weeks, I have felt like an author whose book was fortuitously banned somewhere."
-
-For the uninitiated, Stallman dives into a quick free software warm-up analogy. He likens a software program to a cooking recipe. Both provide useful step-by-step instructions on how to complete a desired task and can be easily modified if a user has special desires or circumstances. "You don't have to follow a recipe exactly," Stallman notes. "You can leave out some ingredients. Add some mushrooms, 'cause you like mushrooms. Put in less salt because your doctor said you should cut down on salt - whatever."
-
-Most importantly, Stallman says, software programs and recipes are both easy to share. In giving a recipe to a dinner guest, a cook loses little more than time and the cost of the paper the recipe was written on. Software programs require even less, usually a few mouse-clicks and a modicum of electricity. In both instances, however, the person giving the information gains two things: increased friendship and the ability to borrow interesting recipes in return.
-
-"Imagine what it would be like if recipes were packaged inside black boxes," Stallman says, shifting gears. "You couldn't see what ingredients they're using, let alone change them, and imagine if you made a copy for a friend. They would call you a pirate and try to put you in prison for years. That world would create tremendous outrage from all the people who are used to sharing recipes. But that is exactly what the world of proprietary software is like. A world in which common decency towards other people is prohibited or prevented."
-
-With this introductory analogy out of the way, Stallman launches into a retelling of the Xerox laser-printer episode. Like the recipe analogy, the laser-printer story is a useful rhetorical device. With its parable-like structure, it dramatizes just how quickly things can change in the software world. Drawing listeners back to an era before Amazon.com one-click shopping, Microsoft Windows, and Oracle databases, it asks the listener to examine the notion of software ownership free of its current corporate logos.
-
-Stallman delivers the story with all the polish and practice of a local district attorney conducting a closing argument. When he gets to the part about the Carnegie Mellon professor refusing to lend him a copy of the printer source code, Stallman pauses.
-
-"He had betrayed us," Stallman says. "But he didn't just do it to us. Chances are he did it to you."
-
-On the word "you," Stallman points his index finger accusingly at an unsuspecting member of the audience. The targeted audience member's eyebrows flinch slightly, but Stallman's own eyes have moved on. Slowly and deliberately, Stallman picks out a second listener to nervous titters from the crowd. "And I think, mostly likely, he did it to you, too," he says, pointing at an audience member three rows behind the first.
-
-By the time Stallman has a third audience member picked out, the titters have given away to general laughter. The gesture seems a bit staged, because it is. Still, when it comes time to wrap up the Xerox laser-printer story, Stallman does so with a showman's flourish. "He probably did it to most of the people here in this room - except a few, maybe, who weren't born yet in 1980," Stallman says, drawing more laughs. "[That's] because he had promised to refuse to cooperate with just about the entire population of the planet Earth."
-
-Stallman lets the comment sink in for a half-beat. "He had signed a nondisclosure agreement," Stallman adds.
-
-Richard Matthew Stallman's rise from frustrated academic to political leader over the last 20 years speaks to many things. It speaks to Stallman's stubborn nature and prodigious will. It speaks to the clearly articulated vision and values of the free software movement Stallman helped build. It speaks to the high-quality software programs Stallman has built, programs that have cemented Stallman's reputation as a programming legend. It speaks to the growing momentum of the GPL, a legal innovation that many Stallman observers see as his most momentous accomplishment.
-
-Most importantly, it speaks to the changing nature of political power in a world increasingly beholden to computer technology and the software programs that power that technology.
-
-Maybe that's why, even at a time when most high-technology stars are on the wane, Stallman's star has grown. Since launching the GNU Project in 1984,~{ The acronym GNU stands for "GNU's not Unix." In another portion of the May 29, 2001, NYU speech, Stallman summed up the acronym's origin: \\ We hackers always look for a funny or naughty name for a program, because naming a program is half the fun of writing the program. We also had a tradition of recursive acronyms, to say that the program that you're writing is similar to some existing program... I looked for a recursive acronym for Something Is Not UNIX. And I tried all 26 letters and discovered that none of them was a word. I decided to make it a contraction. That way I could have a three-letter acronym, for Something's Not UNIX. And I tried letters, and I came across the word "GNU." That was it. \\ Although a fan of puns, Stallman recommends that software users pronounce the "g" at the beginning of the acronym (i.e., "gah-new").Not only does this avoid confusion with the word "gnu," the name of the African antelope, Connochaetes gnou, it also avoids confusion with the adjective "new." "We've been working on it for 17 years now, so it is not exactly new any more," Stallman says. \\ Source: author notes and online transcript of "Free Software: Freedom and Cooperation," Richard Stallman's May 29, 2001, speech at New York University, \\ http://www.gnu.org/events/rms-nyu-2001-transcript.txt. }~ Stallman has been at turns ignored, satirized, vilified, and attacked-both from within and without the free software movement. Through it all, the GNU Project has managed to meet its milestones, albeit with a few notorious delays, and stay relevant in a software marketplace several orders of magnitude more complex than the one it entered 18 years ago. So too has the free software ideology, an ideology meticulously groomed by Stallman himself.
-
-To understand the reasons behind this currency, it helps to examine Richard Stallman both in his own words and in the words of the people who have collaborated and battled with him along the way. The Richard Stallman character sketch is not a complicated one. If any person exemplifies the old adage "what you see is what you get," it's Stallman.
-
-"I think if you want to understand Richard Stallman the human being, you really need to see all of the parts as a consistent whole," advises Eben Moglen, legal counsel to the Free Software Foundation and professor of law at Columbia University Law School. "All those personal eccentricities that lots of people see as obstacles to getting to know Stallman really 'are' Stallman: Richard's strong sense of personal frustration, his enormous sense of principled ethical commitment, his inability to compromise, especially on issues he considers fundamental. These are all the very reasons Richard did what he did when he did."
-={Columbia University;Moglen, Eben+2}
-
-Explaining how a journey that started with a laser printer would eventually lead to a sparring match with the world's richest corporation is no easy task. It requires a thoughtful examination of the forces that have made software ownership so important in today's society. It also requires a thoughtful examination of a man who, like many political leaders before him, understands the malleability of human memory. It requires an ability to interpret the myths and politically laden codewords that have built up around Stallman over time. Finally, it requires an understanding of Stallman's genius as a programmer and his failures and successes in translating that genius to other pursuits.
-
-When it comes to offering his own summary of the journey, Stallman acknowledges the fusion of personality and principle observed by Moglen. "Stubbornness is my strong suit," he says. "Most people who attempt to do anything of any great difficulty eventually get discouraged and give up. I never gave up."
-
-He also credits blind chance. Had it not been for that run-in over the Xerox laser printer, had it not been for the personal and political conflicts that closed out his career as an MIT employee, had it not been for a half dozen other timely factors, Stallman finds it very easy to picture his life following a different career path. That being said, Stallman gives thanks to the forces and circumstances that put him in the position to make a difference.
-
-"I had just the right skills," says Stallman, summing up his decision for launching the GNU Project to the audience. "Nobody was there but me, so I felt like, 'I'm elected. I have to work on this. If not me, who?'"
-
-1~ Chapter 3 - A Portrait of the Hacker as a Young Man
-={Stallman, Richard M.:childhood+61}
-
-Richard Stallman's mother, Alice Lippman, still remembers the moment she realized her son had a special gift.
-={Lippman, Alice+60}
-
-"I think it was when he was eight," Lippman recalls.
-
-The year was 1961, and Lippman, a recently divorced single mother, was whiling away a weekend afternoon within the family's tiny one-bedroom apartment on Manhattan's Upper West Side. Leafing throug ha copy of Scientific American, Lippman came upon her favorite section, the Martin Gardner-authored column titled "Mathematical Games." A substitute art teacher at the time, Lippman enjoyed Gardner's column for the brain-teasers it provided. With her son already ensconced in a book on the nearby sofa, Lippman decided to take a crack at solving the week's feature puzzle.
-
-"I wasn't the best person when it came to solving the puzzles," she admits. "But as an artist, I found they really helped me work through conceptual barriers."
-
-Lippman says her attempt to solve the puzzle met an immediate brick wall. About to throw the magazine down in disgust, Lippman was surprised by a gentle tug on her shirt sleeve.
-
-"It was Richard," she recalls, "He wanted to know if I needed any help."
-
-Looking back and forth, between the puzzle and her son, Lippman says she initially regarded the offer with skepticism. "I asked Richard if he'd read the magazine," she says. "He told me that, yes, he had and what's more he'd already solved the puzzle. The next thing I know, he starts explaining to me how to solve it."
-
-Hearing the logic of her son's approach, Lippman's skepticism quickly gave way to incredulity. "I mean, I always knew he was a bright boy," she says, "but this was the first time I'd seen anything that suggested how advanced he really was."
-
-Thirty years after the fact, Lippman punctuates the memory with a laugh. "To tell you the truth, I don't think I ever figured out how to solve that puzzle," she says. "All I remember is being amazed he knew the answer."
-
-Seated at the dining-room table of her second Manhattan apartment - the same spacious three-bedroom complex she and her son moved to following her 1967 marriage to Maurice Lippman, now deceased - Alice Lippman exudes a Jewish mother's mixture of pride and bemusement when recalling her son's early years. The nearby dining-room credenza offers an eight-by-ten photo of Stallman glowering in full beard and doctoral robes. The image dwarfs accompanying photos of Lippman's nieces and nephews, but before a visitor can make too much of it, Lippman makes sure to balance its prominent placement with an ironic wisecrack."
-={Lippman, Maurice}
-
-Richard insisted I have it after he received his honorary doctorate at the University of Glasgow," says Lippman. "He said to me, 'Guess what, mom? It's the first graduation I ever attended.'"~{ One of the major background sources for this chapter was the interview "Richard Stallman: High School Misfit, Symbol of Free Software, MacArthur-Certified Genius" by Michael Gross, author of the 1999 book Talking About My Generation , a collection of interviews with notable personalities from the so-called "Baby Boom" generation. Although Stallman did not make it into the book, Gross published the interview as an online supplement to the book's web site. The URL for the interview has changed several times since I first came across it. According to various readers who have gone searching for it, you can now find the interview at \\ http://www.mgross.com/MoreThgsChng/interviews/stallman1.html. }~
-={University of Glasgow}
-
-Such comments reflect the sense of humor that comes with raising a child prodigy. Make no mistake, for every story Lippman hears and reads about her son's stubbornness and unusual behavior, she can deliver at least a dozen in return.
-
-"He used to be so conservative," she says, throwing up her hands in mock exasperation. "We used to have the worst arguments right here at this table. I was part of the first group of public city school teachers that struck to form a union, and Richard was very angry with me. He saw unions as corrupt. He was also very opposed to social security. He thought people could make much more money investing it on their own. Who knew that within 10 years he would become so idealistic? All I remember is his stepsister coming to me and saying, 'What is he going to be when he grows up? A fascist?'"~{ RMS: I don't remember telling her this. All I can say is I strongly disagree with those views now. When I was in my teens, I lacked compassion for the difficulties most people encounter in life; my problems were different. I did not appreciate how the wealthy will reduce most people to poverty unless we organize at all levels to stop them. I did not understand how hard it is for most people to resist social pressure to do foolish things, such as spend all their money instead of saving, since I hardly even noticed the pressure myself. In addition, unions in the 60s, when they were very powerful, were sometimes arrogant or corrupt. But they are much weaker today, and the result is that economic growth, when it occurs, benefits mainly the rich. }~
-
-As a single parent for nearly a decade - she and Richard's father, Daniel Stallman, were married in 1948, divorced in 1958, and split custody of their son afterwards - Lippman can attest to her son's aversion to authority. She can also attest to her son's lust for knowledge. It was during the times when the two forces intertwined, Lippman says, that she and her son experienced their biggest battles.
-={Stallman, Daniel}
-
-"It was like he never wanted to eat," says Lippman, recalling the behavior pattern that set in around age eight and didn't let up until her son's high-school graduation in 1970. "I'd call him for dinner, and he'd never hear me. I'd have to call him 9 or 10 times just to get his attention. He was totally immersed."
-
-Stallman, for his part, remembers things in a similar fashion, albeit with a political twist.
-
-"I enjoyed reading," he says. "If I wanted to read, and my mother told me to go to the kitchen and eat or go to sleep, I wasn't going to listen. I saw no reason why I couldn't read. No reason why she should be able to tell me what to do, period. Essentially, what I had read about, ideas such as democracy and individual freedom, I applied to myself. I didn't see any reason to exclude children from these principles."
-
-The belief in individual freedom over arbitrary authority extended to school as well. Two years ahead of his classmates by age 11, Stallman endured all the usual frustrations of a gifted public-school student. It wasn't long after the puzzle incident that his mother attended the first in what would become a long string of parent-teacher conferences.
-
-"He absolutely refused to write papers," says Lippman, recalling an early controversy. "I think the last paper he wrote before his senior year in high school was an essay on the history of the number system in the west for a fourth-grade teacher." To be required to choose a specific topic when there was nothing he actually wanted to write about was almost impossible for Stallman, and painful enough to make him go to great lengths to avoid such situations.
-
-Gifted in anything that required analytical thinking, Stallman gravitated toward math and science at the expense of his other studies. What some teachers saw as single-mindedness, however, Lippman saw as impatience. Math and science offered simply too much opportunity to learn, especially in comparison to subjects and pursuits for which her son seemed less naturally inclined. Around age 10 or 11, when the boys in Stallman's class began playing a regular game of touch football, she remembers her son coming home in a rage. "He wanted to play so badly, but he just didn't have the coordination skills," Lippman recalls. "It made him so angry."
-
-The anger eventually drove her son to focus on math and science all the more. Even in the realm of science, however, her son's impatience could be problematic. Poring through calculus textbooks by age seven, Stallman saw little need to dumb down his discourse for adults. Sometime, during his middle-school years, Lippman hired a student from nearby Columbia University to play big brother to her son. The student left the family's apartment after the first session and never came back. "I think what Richard was talking about went over his head," Lippman speculates.
-
-Another favorite maternal memory dates back to the early 1960s, shortly after the puzzle incident. Around age seven, two years after the divorce and relocation from Queens, Richard took up the hobby of launching model rockets in nearby Riverside Drive Park. What started as aimless fun soon took on an earnest edge as her son began recording the data from each launch. Like the interest in mathematical games,the pursuit drew little attention until one day, just before a major NASA launch, Lippman checked in on her son to see if he wanted to watch.
-
-"He was fuming," Lippman says. "All he could say to me was, 'But I'm not published yet.' Apparently he had something that he really wanted to show NASA." Stallman doesn't remember the incident, but thinks it more likely that he was anguished because he didn't have anything to show.
-
-Such anecdotes offer early evidence of the intensity that would become Stallman's chief trademark throughout life. When other kids came to the table, Stallman stayed in his room and read. When other kids played Johnny Unit as, Stallman played spaceman. "I was weird," Stallman says, summing up his early years succinctly in a 1999 interview. "After a certain age, the only friends I had were teachers."~{ /{Ibid.}/ }~ Stallman was not ashamed of his weird characteristics, distinguishing them from the social ineptness that he did regard as a failing. However, both contributed together to his social exclusion.
-
-Although it meant courting more run-ins at school, Lippman decided to indulge her son's passion. By age 12, Richard was attending science camps during the summer and private school during the school year. When a teacher recommended her son enroll in the Columbia Science Honors Program, a post-Sputnik program designed for gifted middle- and high-school students in New York City, Stallman added to his extracurriculars and was soon commuting uptown to the Columbia University campus on Saturdays.
-={Columbia University;Science Honors Program (Columbia)+2}
-
-Dan Chess, a fellow classmate in the Columbia Science Honors Program, recalls Richard Stallman seeming a bit weird even among the students who shared a similar lust for math and science. "We were all geeks and nerds, but he was unusually poorly adjusted," recalls Chess, now a mathematics professor at Hunter College. "He was also smart as shit. I've known a lot of smart people, but I think he was the smartest person I've ever known."
-={Chess, Dan;Hunter College}
-
-Seth Breidbart, a fellow Columbia Science Honors Program alumnus, offers bolstering testimony. A computer programmer who has kept in touch with Stallman thanks to a shared passion for science fiction and science-fiction conventions, he recalls the 15-year-old, buzz-cut-wearing Stallman as "scary," especially to a fellow 15-year-old.
-={Breidbart, Seth+1}
-
-"It's hard to describe," Breidbart says. "It wasn't like he was unapproachable. He was just very intense. [He was] very knowledgeable but also very hardheaded in some ways."
-
-Such descriptions give rise to speculation: are judgment-laden adjectives like "intense" and "hardheaded" simply a way to describe traits that today might be categorized under juvenile behavioral disorder? A December, 2001, /{Wired}/ magazine article titled "The Geek Syndrome" paints the portrait of several scientifically gifted children diagnosed with high-functioning autism or Asperger Syndrome. In many ways, the parental recollections recorded in the /{Wired}/ article are eerily similar to the ones offered by Lippman. Stallman also speculates about this. In the interview for a 2000 profile for the /{Toronto Star}/, Stallman said he wondered if he were "borderline autistic." The article inaccurately cited the speculation as a certainty.~{ See Judy Steed, Toronto Star, BUSINESS, (October 9, 2000): C03. His vision of free software and social cooperation stands in stark contrast to the isolated nature of his private life. A Glenn Gould-like eccentric, the Canadian pianist was similarly brilliant, articulate, and lonely. Stallman considers himself afflicted, to some degree, by autism: a condition that, he says, makes it difficult for him to interact with people. }~
-={Asperger Syndrome+1;autism+5;Geek Syndrome, The (Silberman)+1;Wired magazine;Toronto Star;Silberman, Steve+1;Stallman, Richard M.:behavioral disorders+1}
-
-Such speculation benefits from the fast and loose nature of most so-called "behavioral disorders" nowadays, of course. As Steve Silberman, author of "The Geek Syndrome," notes, American psychiatrists have only recently come to accept Asperger Syndrome as a valid umbrella term covering a wide set of behavioral traits. The traits range from poor motor skills and poor socialization to high intelligence and an almost obsessive affinity for numbers, computers, and ordered systems.~{ See Steve Silberman, "The Geek Syndrome," Wired (December, 2001), \\ http://www.wired.com/wired/archive/9.12/aspergers_pr.html. }~
-={Stallman, Richard M.:childhood, behavioral disorders}
-
-"It's possible I could have had something like that," Stallman says. "On the other hand, one of the aspects of that syndrome is difficulty following rhythms. I can dance. In fact, I love following the most complicated rhythms. It's not clear cut enough to know." Another possibility is that Stallman had a "shadow syndrome" which goes someway in the direction of Asperger's syndrome but without going beyond the limits of normality.~{ See John Ratey and Catherine Johnson, "Shadow Syndromes." }~
-
-Chess, for one, rejects such attempts at back-diagnosis. "I never thought of him [as] having that sort of thing," he says. "He was just very unsocialized, but then, we all were."
-={Chess, Dan}
-
-Lippman, on the other hand, entertains the possibility. She recalls a few stories from her son's infancy, however, that provide fodder for speculation. A prominent symptom of autism is an over-sensitivity to noises and colors, and Lippman recalls two anecdotes that stand out in this regard. "When Richard was an infant, we'd take him to the beach," she says. "He would start screaming two or three blocks before we reached the surf. It wasn't until the third time that we figured out what was going on: the sound of the surf was hurting his ears." She also recalls a similar screaming reaction in relation to color: "My mother had bright red hair, and every time she'd stoop down to pick him up, he'd let out a wail."
-
-In recent years, Lippman says she has taken to reading books about autism and believes that such episodes were more than coincidental. "I do feel that Richard had some of the qualities of an autistic child," she says. "I regret that so little was known about autism back then."
-
-Over time, however, Lippman says her son learned to adjust. By age seven, she says, her son had become fond of standing at the front window of subway trains, mapping out and memorizing the labyrinthian system of railroad tracks underneath the city. It was a hobby that relied on an ability to accommodate the loud noises that accompanied each train ride. "Only the initial noise seemed to bother him," says Lippman. "It was as if he got shocked by the sound but his nerves learned how to make the adjustment."
-
-For the most part, Lippman recalls her son exhibiting the excitement, energy, and social skills of any normal boy. It wasn't until after a series of traumatic events battered the Stallman household, she says, that her son became introverted and emotionally distant.
-
-The first traumatic event was the divorce of Alice and Daniel Stallman, Richard's father. Although Lippman says both she and her ex-husband tried to prepare their son for the blow, she says the blow was devastating nonetheless. "He sort of didn't pay attention when we first told him what was happening," Lippman recalls. "But the reality smacked him in the face when he and I moved into a new apartment. The first thing he said was, 'Where's Dad's furniture?'"
-={divorce of Alice and Daniel Stallman;Stallman, Daniel}
-
-For the next decade, Stallman would spend his weekdays at his mother's apartment in Manhattan and his weekends at his father's home in Queens. The shuttling back and forth gave him a chance to study a pair of contrasting parenting styles that, to this day, leaves Stallman firmly opposed to the idea of raising children himself. Speaking about his father, a World War II vet who died in early 2001, Stallman balances respect with anger. On one hand, there is the man whose moral commitment led him to learn French just so he could be more helpful to Allies when they'd finally fight the Nazis in France. On the other hand, there was the parent who always knew how to craft a put-down for cruel effect.~{ Regrettably, I did not get a chance to interview Daniel Stallman for this book. During the early research for this book, Stallman informed me that his father suffered from Alzheimer's. When I resumed research in late 2001, I learned, sadly, that Daniel Stallman had died earlier in the year. }~
-
-"My father had a horrible temper," Stallman says. "He never screamed, but he always found a way to criticize you in a cold, designed-to-crush way."
-
-As for life in his mother's apartment, Stallman is less equivocal. "That was war," he says. "I used to say in my misery, 'I want to go home,' meaning to the nonexistent place that I'll never have."
-
-For the first few years after the divorce, Stallman found the tranquility that eluded him in the home of his paternal grandparents. One died when he was 8, and the other when he was 10. For Stallman, the loss was devastating. "I used to go and visit and feel I was in a loving, gentle environment," Stallman recalls. "It was the only place I ever found one, until I went away to college."
-
-Lippman lists the death of Richard's paternal grandparents as the second traumatic event. "It really upset him," she says. He was very close to both his grandparents. Before they died, he was very outgoing, almost a leader-of-the-pack type with the other kids. After they died, he became much more emotionally withdrawn.
-
-From Stallman's perspective, the emotional withdrawal was merely an attempt to deal with the agony of adolescence. Labeling his teenage years a "pure horror," Stallman says he often felt like a deaf person amid a crowd of chattering music listeners.
-
-"I often had the feeling that I couldn't understand what other people were saying," says Stallman, recalling his sense of exclusion. "I could understand the words, but something was going on underneath the conversations that I didn't understand. I couldn't understand why people were interested in the things other people said."
-
-For all the agony it produced, adolescence would have an encouraging effect on Stallman's sense of individuality. At a time when most of his classmates were growing their hair out, Stallman preferred to keep his short. At a time when the whole teenage world was listening to rock and roll, Stallman preferred classical music. A devoted fan of science fiction, /{Mad}/ magazine, and late-night TV, Stallman came to have a distinctly off-the-wall personality that met with the incomprehension of parents and peers alike.
-
-"Oh, the puns," says Lippman, still exasperated by the memory of her son's teenage personality. "There wasn't a thing you could say at the dinner table that he couldn't throw back at you as a pun."
-
-Outside the home, Stallman saved the jokes for the adults who tended to indulge his gifted nature. One of the first was a summer-camp counselor who lent Stallman a manual for the IBM 7094 computer during his 8th or 9th year. To a pre teenager fascinated with numbers and science, the gift was a godsend.~{ Stallman, an atheist, would probably quibble with this description. Suffice it to say, it was something Stallman welcomed. See Gross (1999): "As soon as I heard about computers, I wanted to see one and play with one." }~ Soon, Stallman was writing out programs on paper in the instructions of the 7094. There was no computer around to run them on, and he had no real applications to use one for, but he yearned to write a program - any program whatsoever. He asked the counselor for arbitrary suggestions of something to code.
-={IBM 7094 computer+1}
-
-With the first personal computer still a decade away, Stallman would be forced to wait a few years before getting access to his first computer. His chance finally came during his senior year of high school. The IBM New York Scientific Center, a now-defunct research facility in downtown Manhattan, offered Stallman the chance to try to write his first real program. His fancy was to write a pre-processor for the programming language PL/I, designed to add the tensor algebra summation convention as a feature to the language. "I first wrote it in PL/I, then started over in assembler language when the compiled PL/I program was too big to fit in the computer," he recalls.
-={assembler language;IBM:New York Scientific Center;IBM New York Scientific Center;PL/I programming language;Stallman, Richard M.:childhood, first computer program}
-
-For the summer after high-school graduation, the New York Scientific Center hired him. Tasked with writing a numerical analysis program in Fortran, he finished that in a few weeks, acquiring such a distaste for the Fortran language that he vowed never to write any-thing in it again. Then he spent the rest of the summer writing a text-editor in APL.
-
-Simultaneously, Stallman had held a laboratory-assistant position in the biology department at Rockefeller University. Although he was already moving toward a career in math or physics, Stallman's analytical mind impressed the lab director enough that a few years after Stallman departed for college, Lippman received an unexpected phone call. "It was the professor at Rockefeller," Lippman says. "He wanted to know how Richard was doing. He was surprised to learn that he was working in computers. He'd always thought Richard had a great future ahead of him as a biologist."
-={Rockefeller University}
-
-Stallman's analytical skills impressed faculty members at Columbia as well, even when Stallman himself became a target of their ire. "Typically once or twice an hour [Stallman] would catch some mistake in the lecture," says Breidbart. "And he was not shy about letting the professors know it immediately. It got him a lot of respect but not much popularity."
-
-Hearing Breidbart's anecdote retold elicits a wry smile from Stallman. "I may have been a bit of a jerk sometimes," he admits. "But I found kindred spirits among teachers, because they, too, liked to learn. Kids, for the most part, didn't. At least not in the same way."
-={Breidbart, Seth}
-
-Hanging out with the advanced kids on Saturday nevertheless encouraged Stallman to think more about the merits of increased socialization. With college fast approaching, Stallman, like many in his Columbia Science Honors Program, had narrowed his list of desired schools down to two choices: Harvard and MIT. Hearing of her son's desire to move on to the Ivy League, Lippman became concerned. As a 15-year-old high-school junior, Stallman was still having run-ins with teachers and administrators. Only the year before, he had pulled straight A's in American History, Chemistry, French, and Algebra, but a glaring F in English reflected the ongoing boycott of writing assignments. Such miscues might draw a knowing chuckle at MIT, but at Harvard, they were a red flag.
-={Harvard University+7;MIT Massachusetts Institute of Technology}
-
-During her son's junior year, Lippman says she scheduled an appointment with a therapist. The therapist expressed instant concern over Stallman's unwillingness to write papers and his run-ins with teachers. Her son certainly had the intellectual wherewithal to succeed at Harvard, but did he have the patience to sit through college classes that required a term paper? The therapist suggested a trial run. If Stallman could make it through a full year in New York City public schools, including an English class that required term papers, he could probably make it at Harvard. Following the completion of his junior year, Stallman promptly enrolled in public summer school downtown and began making up the mandatory humanities classes he had shunned earlier in his high-school career.
-={Louis D. Brandeis High School+3}
-
-By fall, Stallman was back within the mainstream population of New York City high-school students, at Louis D. Brandeis High School on on West 84th Street. It wasn't easy sitting through classes that seemed remedial in comparison with his Saturday studies at Columbia, but Lippman recalls proudly her son's ability to toe the line.
-
-"He was forced to kowtow to a certain degree, but he did it," Lippman says. "I only got called in once, which was a bit of a miracle. It was the calculus teacher complaining that Richard was interrupting his lesson. I asked how he was interrupting. He said Richard was always accusing the teacher of using a false proof. I said, 'Well, is he right?' The teacher said, 'Yeah, but I can't tell that to the class. They wouldn't understand.'"
-
-By the end of his first semester at Brandeis High, things were falling into place. A 96 in English wiped away much of the stigma of the 60 earned 2 years before. For good measure, Stallman backed it up with top marks in American History, Advanced Placement Calculus, and Microbiology. The crowning touch was a perfect 100 in Physics. Though still a social outcast, Stallman finished his 10 months at Brandeis as the fourth-ranked student in a class of 789.
-
-Outside the classroom, Stallman pursued his studies with even more diligence, rushing off to fulfill his laboratory-assistant duties at Rockefeller University during the week and dodging the Vietnam protesters on his way to Saturday school at Columbia. It was there, while the rest of the Science Honors Program students sat around discussing their college choices, that Stallman finally took a moment to participate in the preclass bull session.
-
-Recalls Breidbart, "Most of the students were going to Harvard and MIT, of course, but you had a few going to other Ivy League schools. As the conversation circled the room, it became apparent that Richard hadn't said anything yet. I don't know who it was, but somebody got up the courage to ask him what he planned to do."
-={Breidbart, Seth+1}
-
-Thirty years later, Breidbart remembers the moment clearly. As soon as Stallman broke the news that he, too, would be attending Harvard University in the fall, an awkward silence filled the room. Almost as if on cue, the corners of Stallman's mouth slowly turned upward into a self-satisfied smile. Says Breidbart, "It was his silent way of saying, 'That's right. You haven't got rid of me yet.'"
-
-1~ Chapter 4 - Impeach God
-
-Although their relationship was fraught with tension, Richard Stallman would inherit one noteworthy trait from his mother: a passion for progressive politics.
-
-It was an inherited trait that would take several decades to emerge, however. For the first few years of his life, Stallman lived in what he now admits was a "political vacuum."~{ See Michael Gross, "Richard Stallman: High School Misfit, Symbol of Free Software, Mac Arthur-certified Genius" (1999). }~ Like most Americans during the Eisenhower age, the Stallman family spent the Fifties trying to recapture the normalcy lost during the wartime years of the 1940s.
-
-"Richard's father and I were Democrats but happy enough to leave it at that," says Lippman, recalling the family's years in Queens. "We didn't get involved much in local or national politics."
-={Lippman, Alice:political identity of+11}
-
-That all began to change, however, in the late 1950s when Alice divorced Daniel Stallman. The move back to Manhattan represented more than a change of address; it represented a new, independent identity and a jarring loss of tranquility.
-={Stallman, Daniel}
-
-"I think my first taste of political activism came when I went to the Queens public library and discovered there was only a single book on divorce in the whole library," recalls Lippman. "It was very controlled by the Catholic church, at least in Elmhurst, where we lived. I think that was the first inkling I had of the forces that quietly control our lives."
-={Elmhurst (New York);Queens public library}
-
-Returning to her childhood neighborhood, Manhattan's Upper West Side, Lippman was shocked by the changes that had taken place since her departure to Hunter College a decade and a half before. The sky-rocketing demand for post-war housing had turned the neighborhood into a political battleground. On one side stood the pro-development city-hall politicians and businessmen hoping to rebuild many of the neighborhood's blocks to accommodate the growing number of white-collar workers moving into the city. On the other side stood the poor Irish and Puerto Rican tenants who had found an affordable haven in the neighborhood.
-={Hunter College}
-
-At first, Lippman didn't know which side to choose. As a new resident, she felt the need for new housing. As a single mother with minimal income, however, she shared the poorer tenants' concern over the growing number of development projects catering mainly to wealthy residents. Indignant, Lippman began looking for ways to combat the political machine that was attempting to turn her neighborhood into a clone of the Upper East Side.
-
-Lippman says her first visit to the local Democratic party headquarters came in 1958. Looking for a day-care center to take care of her son while she worked, she had been appalled by the conditions encountered at one of the city-owned centers that catered to low-income residents. "All I remember is the stench of rotten milk, the dark hallways, the paucity of supplies. I had been a teacher in private nursery schools. The contrast was so great. We took one look at that room and left. That stirred me up."
-={Democratic party+3}
-
-The visit to the party headquarters proved disappointing, however. Describing it as "the proverbial smoke-filled room," Lippman says she became aware for the first time that corruption within the party might actually be the reason behind the city's thinly disguised hostility toward poor residents. Instead of going back to the headquarters, Lippman decided to join up with one of the many clubs aimed at reforming the Democratic party and ousting the last vestiges of the Tammany Hall machine. Dubbed the Woodrow Wilson/FDR Reform Democratic Club, Lippman and her club began showing up at planning and city-council meetings, demanding a greater say.
-={Woodrow Wilson/FDR Reform Democratic Club;Tammany Hall+1}
-
-"Our primary goal was to fight Tammany Hall, Carmine DeSapio and his henchman,"~{ Carmine DeSapio holds the dubious distinction of being the first Italian-American boss of Tammany Hall, the New York City political machine. For more information on DeSapio and the politics of post-war New York, see John Davenport, "Skinning the Tiger: Carmine DeSapio and the End of the Tammany Era," New York Affairs (1975): 3:1. }~ says Lippman. "I was the representative to the city council and was very much involved in creating a viable urban-renewal plan that went beyond simply adding more luxury housing to the neighborhood."
-={DeSapio, Carmine}
-
-Such involvement would blossom into greater political activity during the 1960s. By 1965, Lippman had become an "outspoken" supporter for political candidates like William Fitts Ryan, a Democrat elected to Congress with the help of reform clubs and one of the first U.S. representatives to speak out against the Vietnam War.
-={Vietnam War+10;Ryan, William Fitts}
-
-It wasn't long before Lippman, too, was an outspoken opponent of U.S. involvement in Indochina. "I was against the Vietnam War from the time Kennedy sent troops," she says. "I had read the stories by reporters and journalists sent to cover the early stages of the conflict. I really believed their forecast that it would become a quagmire."
-={Indochina}
-
-Such opposition permeated the Stallman-Lippman household. In 1967, Lippman remarried. Her new husband, Maurice Lippman, a major in the Air National Guard, resigned his commission to demonstrate his opposition to the war. Lippman's stepson, Andrew Lippman, was at MIT and temporarily eligible for a student deferment. Still, the threat of induction should that deferment disappear, as it eventually did, made the risk of U.S. escalation all the more immediate. Finally, there was Richard who, though younger, faced the prospect of being drafted as the war lasted into the 1970s.
-={Lippman, Andrew;Lippman, Maurice;MIT Massachusetts Institute of Technology}
-
-"Vietnam was a major issue in our household," says Lippman. "We talked about it constantly: what would we do if the war continued, what steps Richard or his stepbrother would take if they got drafted. We were all opposed to the war and the draft. We really thought it was immoral."
-
-For Stallman, the Vietnam War elicited a complex mixture of emotions: confusion, horror, and, ultimately, a profound sense of political impotence. As a kid who could barely cope in the mild authoritarian universe of private school, Stallman experienced a shiver whenever the thought of Army boot camp presented itself. He did not think he could get through it and emerge sane.
-={draft (Vietnam War)+6}
-
-"I was devastated by the fear, but I couldn't imagine what to do and didn't have the guts to go demonstrate," recalls Stallman, whose March 16th birthday earned him a low number in the dreaded draft lottery. This did not affect him immediately, since he had a college deferment, one of the last before the U.S. stopped granting them; but it would affect him in a few years. "I couldn't envision moving to Canada or Sweden. The idea of getting up by myself and moving somewhere. How could I do that? I didn't know how to live by myself. I wasn't the kind of person who felt confident in approaching things like that."
-
-Stallman says he was impressed by the family members who did speak out. Recalling a sticker, printed and distributed by his father, likening the My Lai massacre to similar Nazi atrocities in World War II, he says he was "excited" by his father's gesture of outrage. "I admired him for doing it," Stallman says. "But I didn't imagine that I could do anything. I was afraid that the juggernaut of the draft was going to destroy me."
-
-However, Stallman says he was turned off by the tone and direction of much of that movement. Like other members of the Science Honors Program, he saw the weekend demonstrations at Columbia as little more than a distracting spectacle.~{ Chess, another Columbia Science Honors Program alum, describes the protests as "background noise." "We were all political," he says, "but the SHP was important. We would never have skipped it for a demonstration." }~ Ultimately, Stallman says, the irrational forces driving the anti-war movement became indistinguishable from the irrational forces driving the rest of youth culture. Instead of worshiping the Beatles, girls in Stallman's age group were suddenly worshiping firebrands like Abbie Hoffman and Jerry Rubin. To a kid already struggling to comprehend his teenage peers, slogans like "make love not war" had a taunting quality. Stallman did not want to make war, at least not in Southeast Asia, but nobody was inviting him to make love either.
-={Beatles;Hoffman, Abbie;Rubin, Jerry;Science Honors Program (Columbia)}
-
-"I didn't like the counter culture much," Stallman recalls. "I didn't like the music. I didn't like the drugs. I was scared of the drugs. I especially didn't like the anti-intellectualism, and I didn't like the prejudice against technology. After all, I loved a computer. And I didn't like the mindless anti-Americanism that I often encountered. There were people whose thinking was so simplistic that if they disapproved of the conduct of the U.S. in the Vietnam War, they had to support the North Vietnamese. They couldn't imagine a more complicated position, I guess."
-
-Such comments underline a trait that would become the key to Stallman's own political maturation. For Stallman, political confidence was directly proportionate to personal confidence. By 1970, Stallman had become confident in few things outside the realm of math and science. Nevertheless, confidence in math gave him enough of a foundation to examine the extremes of the anti-war movement in purely logical terms. Doing so, Stallman found the logic wanting. Although opposed to the war in Vietnam, Stallman saw no reason to disavow war as a means for defending liberty or correcting injustice.
-
-In the 1980s, a more confident Stallman decided to make up for his past inactivity by participating in mass rallies for abortion rights in Washington DC. "I became dissatisfied with my earlier self for failing in my duty to protest the Vietnam War," he explains.
-
-In 1970, Stallman left behind the nightly dinnertime conversations about politics and the Vietnam War as he departed for Harvard. Looking back, Stallman describes the transition from his mother's Manhattan apartment to life in a Cambridge dorm as an "escape." At Harvard, he could go to his room and have peace whenever he wanted it. Peers who watched Stallman make the transition, however, saw little to suggest a liberating experience.
-={Harvard University+22}
-
-"He seemed pretty miserable for the first while at Harvard," recalls Dan Chess, a classmate in the Science Honors Program who also matriculated at Harvard. "You could tell that human interaction was really difficult for him, and there was no way of avoiding it at Harvard. Harvard was an intensely social kind of place."
-={Chess, Dan;Science Honors Program (Columbia)+1}
-
-To ease the transition, Stallman fell back on his strengths: math and science. Like most members of the Science Honors Program, Stallman breezed through the qualifying exam for Math 55, the legendary "boot camp" class for freshman mathematics "concentrators" at Harvard. Within the class, members of the Science Honors Program formed a durable unit. "We were the math mafia," says Chess with a laugh. "Harvard was nothing, at least compared with the SHP."
-={Math 55 (Harvard University)+9}
-
-To earn the right to boast, however, Stallman, Chess, and the other SHP alumni had to get through Math 55. Promising four years worth of math in two semesters, the course favored only the truly devout. "It was an amazing class," says David Harbater, a former "math mafia" member and now a professor of mathematics at the University of Pennsylvania. "It's probably safe to say there has never been a class for beginning college students that was that intense and that advanced. The phrase I say to people just to get it across is that, among other things, by the second semester we were discussing the differential geometry of Banach manifolds. That's usually when their eyes bug out, because most people don't start talking about Banach manifolds until their second year of graduate school."
-={Harbater, David+2;University of Pennsylvania}
-
-Starting with 75 students, the class quickly melted down to 20by the end of the second semester. Of that 20, says Harbater, "only 10 really knew what they were doing." Of that 10, 8 would go on to become future mathematics professors, 1 would go on to teach physics.
-
-"The other one," emphasizes Harbater, "was Richard Stallman." Seth Breidbart, a fellow Math 55 classmate, remembers Stallman distinguishing himself from his peers even then.
-={Breidbart, Seth+14}
-
-"He was a stickler in some very strange ways," says Breidbart. There is a standard technique in math which everybody does wrong. It's an abuse of notation where you have to define a function for something and what you do is you define a function and then you prove that it's well defined. Except the first time he did and presented it, he defined a relation and proved that it's a function. It's the exact same proof, but he used the correct terminology, which no one else did. That's just the way he was."
-
-It was in Math 55 that Richard Stallman began to cultivate a reputation for brilliance. Breidbart agrees, but Chess, whose competitive streak refused to yield, says the realization that Stallman might be the best mathematician in the class didn't set in until the next year. "It was during a class on Real Analysis," says Chess, now a math professor at Hunter College. "I actually remember in a proof about complex valued measures that Richard came up with an idea that was basically a metaphor from the calculus of variations. It was the first time I ever saw somebody solve a problem in a brilliantly original way."
-={Hunter College}
-
-For Chess, it was a troubling moment. Like a bird flying into a clear glass window, it would take a while to realize that some levels of insight were simply off limits.
-
-"That's the thing about mathematics," says Chess. "You don't have to be a first-rank mathematician to recognize first-rate mathematical talent. I could tell I was up there, but I could also tell I wasn't at the first rank. If Richard had chosen to be a mathematician, he would have been a first-rank mathematician."~{ Stallman doubts this, however. "One of the reasons I moved from math and physics to programming is that I never learned how to discover anything new in the former two. I only learned to study what others had done. In programming, I could do something useful every day." }~
-
-For Stallman, success in the classroom was balanced by the same lack of success in the social arena. Even as other members of the math mafia gathered to take on the Math 55 problem sets, Stallman preferred to work alone. The same went for living arrangements. On the housing application for Harvard, Stallman clearly spelled out his preferences. "I said I preferred an invisible, inaudible, intangible roommate," he says. In a rare stroke of bureaucratic foresight, Harvard's housing office accepted the request, giving Stallman a one-room single for his freshman year.
-
-Breidbart, the only math-mafia member to share a dorm with Stallman that freshman year, says Stallman slowly but surely learned how to interact with other students. He recalls how other dorm mates, impressed by Stallman's logical acumen, began welcoming his input whenever an intellectual debate broke out in the dining club or dorm commons."
-
-We had the usual bull sessions about solving the world's problems or what would be the result of something," recalls Breidbart. "Say somebody discovers an immortality serum. What do you do? What are the political results? If you give it to everybody, the world gets overcrowded and everybody dies. If you limit it, if you say everyone who's alive now can have it but their children can't, then you end up with an underclass of people without it. Richard was just better able than most to see the unforeseen circumstances of any decision."
-
-Stallman remembers the discussions vividly. "I was always in favor of immortality," he says. "How else would we be able to see what the world is like 200 years from now?" Curious, he began asking various acquaintances whether they would want immortality if offered it. "I was shocked that most people regarded immortality as a bad thing." Many said that death was good because there was no use living a decrepit life, and that aging was good because it got people prepared for death, without recognizing the circularity of the combination.
-
-Although perceived as a first-rank mathematician and first-rate in-formal debater, Stallman shied away from clear-cut competitive events that might have sealed his brilliant reputation. Near the end of fresh-man year at Harvard, Breidbart recalls how Stallman conspicuously ducked the Putnam exam, a prestigious test open to math students throughout the U.S. and Canada. In addition to giving students ac hance to measure their knowledge in relation to their peers, the Putnam served as a chief recruiting tool for academic math departments. According to campus legend, the top scorer automatically qualified for a graduate fellowship at any school of his choice, including Harvard.
-={Putnam exam+1}
-
-Like Math 55, the Putnam was a brutal test of merit. A six-hour exam in two parts, it seemed explicitly designed to separate the wheat from the chaff. Breidbart, a veteran of both the Science Honors
-
-Program and Math 55, describes it as easily the most difficult test he ever took. "Just to give you an idea of how difficult it was," says Breidbart, "the top score was a 120, and my score the first year was in the 30s. That score was still good enough to place me 101st in the country."
-
-Surprised that Stallman, the best student in the class, had skipped the test, Breidbart says he and a fellow classmate cornered him in the dining common and demanded an explanation. "He said he was afraid of not doing well," Breidbart recalls.
-
-Breidbart and the friend quickly wrote down a few problems from memory and gave them to Stallman. "He solved all of them," Breidbart says, " leading me to conclude that by not doing well, he either meant coming in second or getting something wrong."
-
-Stallman remembers the episode a bit differently. "I remember that they did bring me the questions and it's possible that I solved one of them, but I'm pretty sure I didn't solve them all," he says. Nevertheless, Stallman agrees with Breidbart's recollection that fear was the primary reason for not taking the test. Despite a demonstrated willingness to point out the intellectual weaknesses of his peers and professors in the classroom, Stallman hated and feared the notion of head-to-head competition - so why not just avoid it?
-
-"It's the same reason I never liked chess," says Stallman. "Whenever I'd play, I would become so consumed by the fear of making a single mistake and losing that I would start making stupid mistakes very early in the game. The fear became a self-fulfilling prophecy." He avoided the problem by not playing chess.
-
-Whether such fears ultimately prompted Stallman to shy away from a mathematical career is a moot issue. By the end of his freshman year at Harvard, Stallman had other interests pulling him away from the field. Computer programming, a latent fascination throughout Stallman's high-school years, was becoming a full-fledged passion. Where other math students sought occasional refuge in art and history classes, Stallman sought it in the computer-science laboratory.
-
-For Stallman, the first taste of real computer programming at the IBM New York Scientific Center had triggered a desire to learn more. "Toward the end of my first year at Harvard school, I started to have enough courage to go visit computer labs and see what they had. I'd ask them if they had extra copies of any manuals that I could read." Taking the manuals home, Stallman would examine the machine specifications to learn about the range of different computer designs.
-
-One day, near the end of his freshman year, Stallman heard about a special laboratory near MIT. The laboratory was located on the ninth floor of a building in Tech Square, the mostly-commercial office park MIT had built across the street from the campus. According to the rumors, the lab itself was dedicated to the cutting-edge science of artificial intelligence and boasted the cutting-edge machines and software to match.
-={artificial intelligence;MIT Massachusetts Institute of Technology:first visit to+2}
-
-Intrigued, Stallman decided to pay a visit.
-
-The trip was short, about 2 miles on foot, 10 minutes by train, but as Stallman would soon find out, MIT and Harvard can feel like opposite poles of the same planet. With its maze-like tangle of inter-connected office buildings, the Institute's campus offered an aestheticy in to Harvard's spacious colonial-village yang. Of the two, the maze of MIT was much more Stallman's style. The same could be said for the student body, a geeky collection of ex-high school misfits known more for its predilection for pranks than its politically powerful alumni.
-
-The yin-yang relationship extended to the AI Lab as well. Unlike Harvard computer labs, there was no grad-student gatekeeper, no clipboard waiting list for terminal access, no atmosphere of "look but don't touch." Instead, Stallman found only a collection of open terminals and robotic arms, presumably the artifacts of some AI experiment. When he encountered a lab employee, he asked if the lab had any spare manuals it could loan to an inquisitive student. "They had some, but a lot of things weren't documented," Stallman recalls. "They were hackers, after all," he adds wryly, referring to hackers' tendency to move on to a new project without documenting the last one.
-={AI Lab (Artificial Intelligence Laboratory)+40}
-
-Stallman left with something even better than a manual: A job. His first project was to write a PDP-11 simulator that would run on a PDP-10. He came back to the AI Lab the next week, grabbing an available terminal, and began writing the code.
-
-Looking back, Stallman sees nothing unusual in the AI Lab's willingness to accept an unproven outsider at first glance. "That's the way it was back then," he says. "That's the way it still is now. I'll hire somebody when I meet him if I see he's good. Why wait? Stuffy people who insist on putting bureaucracy into everything really miss the point. If a person is good, he shouldn't have to go through a long, detailed hiring process; he should be sitting at a computer writing code."
-
-To get a taste of "bureaucratic and stuffy," Stallman need only visit the computer labs at Harvard. There, access to the terminals was doled out according to academic rank. As an undergrad, Stallman sometimes had to wait for hours. The waiting wasn't difficult, but it was frustrating. Waiting for a public terminal, knowing all the while that a half dozen equally usable machines were sitting idle inside professors' locked offices, seemed the height of irrational waste. Although Stallman continued to pay the occasional visit to the Harvard computer labs, he preferred the more egalitarian policies of the AI Lab. "It was a breath of fresh air," he says. "At the AI Lab, people seemed more concerned about work than status."
-={Harvard University:computer labs}
-
-Stallman quickly learned that the AI Lab's first-come, first-served policy owed much to the efforts of a vigilant few. Many were holdovers from the days of Project MAC, the Department of Defense-funded re-search program that had given birth to the first time-share operating systems. A few were already legends in the computing world. There was Richard Greenblatt, the lab's in-house Lisp expert and author of MacHack, the computer chess program that had once humbled AI critic Hubert Dreyfus. There was Gerald Sussman, original author of the robotic block-stacking program HACKER. And there was Bill Gosper, the in-house math whiz already in the midst of an 18-month hacking bender triggered by the philosophical implications of the computer game LIFE.~{ See Steven Levy, Hackers (Penguin USA [paperback], 1984): 144. Levy devotes about five pages to describing Gosper's fascination with LIFE, a math-based software game first created by British mathematician John Conway. I heartily recommend this book as a supplement, perhaps even a prerequisite, to this one. }~
-={Dreyfus, Hubert;Gosper, Bill;Greenblat, Richard;LIFE mathematical game;LISP programming language;MacHack;Project MAC;Sussman, Gerald+2}
-
-Members of the tight-knit group called themselves "hackers." Overtime, they extended the "hacker" description to Stallman as well. In the process of doing so, they inculcated Stallman in the ethical traditions of the "hacker ethic." In their fascination with exploring the limits of what they could make a computer do, hackers might sit at a terminal for 36 hours straight if fascinated with a challenge. Most importantly, they demanded access to the computer (when no one else was using it) and the most useful information about it. Hackers spoke openly about changing the world through software, and Stallman learned the instinctual hacker disdain for any obstacle that prevented a hacker from fulfilling this noble cause. Chief among these obstacles were poor software, academic bureaucracy, and selfish behavior.
-={ethics of hacking;hackers+7:ethics of}
-
-Stallman also learned the lore, stories of how hackers, when presented with an obstacle, had circumvented it in creative ways. This included various ways that hackers had opened professors' offices to "liberate" sequestered terminals. Unlike their pampered Harvard counterparts, MIT faculty members knew better than to treat the AI Lab's limited stock of terminals as private property. If a faculty member made the mistake of locking away a terminal for the night, hackers were quick to make the terminal accessible again - and to remonstrate with the professor for having mistreated the community. Some hackers did this by picking locks ("lock hacking"), some by removing ceiling tiles and climbing over the wall. On the 9th floor, with its false floor for the computers' cables, some spelunked under it. "I was actually shown a cart with a heavy cylinder of metal on it that had been used to break down the door of one professor's office,"~{ Gerald Sussman, an MIT faculty member and hacker whose work at the AI Lab predates Stallman's, disputes this story. According to Sussman, the hackers never broke any doors to retrieve terminals. }~ Stallman says.
-={AI Lab (Artificial Intelligence Laboratory):lock hacking at+31}
-
-The hackers' insistence served a useful purpose by preventing the professors from egotistically obstructing the lab's work. The hackers did not disregard people's particular needs, but insisted that these be met in ways that didn't obstruct everyone else. For instance, professors occasionally said they had something in their offices which had to be protected from theft. The hackers responded, "No one will object if you lock your office, although that's not very friendly, as long as you don't lock away the lab's terminal in it."
-
-Although the academic people greatly outnumbered the hackers in the AI Lab, the hacker ethic prevailed. The hackers were the lab staff and students who had designed and built parts of the computers, and written nearly all the software that users used. They kept everything working, too. Their work was essential, and they refused to be downtrodden. They worked on personal pet projects as well as features users had asked for, but sometimes the pet projects revolved around improving the machines and software even further. Like teenage hot-rodders, most hackers viewed tinkering with machines as its own form of entertainment.
-
-Nowhere was this tinkering impulse better reflected than in the operating system that powered the lab's central PDP-10 computer. Dubbed ITS, short for the Incompatible Time Sharing system, the operating system incorporated the hacking ethic into its very design. Hackers had built it as a protest to Project MAC's original operating system, the Compatible Time Sharing System, CTSS, and named it accordingly. At the time, hackers felt the CTSS design too restrictive, limiting programmers' power to modify and improve the program's own internal architecture if needed. According to one legend passed down by hackers, the decision to build ITS had political overtones as well. Unlike CTSS, which had been designed for the IBM 7094, ITS was built specifically for the PDP-6. In letting hackers write the system themselves, AI Lab administrators guaranteed that only hackers would feel comfortable using the PDP-6. In the feudal world of academic research, the gambit worked. Although the PDP-6 was co-owned in conjunction with other departments, AI researchers soon had it to themselves. Using ITS and the PDP-6 as a foundation, the Lab had been able to declare independence from Project MAC shortly before Stallman's arrival.~{ Ibid. }~
-={Compatible Time Sharing System (CTSS);CTSS (Compatible Time Sharing System);IBM 7094 computer;Incompatible Timesharing System (ITS)+5;PDP-6 computer+1;Project MAC:Incompatible Time Sharing system and}
-
-By 1971, ITS had moved to the newer but compatible PDP-10, leaving the PDP-6 for special stand-alone uses. The AI PDP-10 had a very large memory for 1971, equivalent to a little over a megabyte;in the late 70s it was doubled. Project MAC had bought two other PDP-10s; all were located on the 9th floor, and they all ran ITS. The hardware-inclined hackers designed and built a major hardware addition for these PDP-10s, implementing paged virtual memory, a feature lacking in the standard PDP-10.~{ I apologize for the whirlwind summary of ITS' genesis, an operating system many hackers still regard as the epitome of the hacker ethos. For more information on the program's political significance, see Simson Garfinkel, Architects of the Information Society: Thirty-Five Years of the Laboratory for Computer Science at MIT (MIT Press, 1999). }~
-
-As an apprentice hacker, Stallman quickly became enamored with ITS. Although forbidding to some non-hackers, ITS boasted features most commercial operating systems wouldn't offer for years (or even to this day), features such as multitasking, applying the debugger immediately to any running program, and full-screen editing capability.
-
-"ITS had a very elegant internal mechanism for one program to examine another," says Stallman, recalling the program. "You could examine all sorts of status about another program in a very clean, well-specified way." This was convenient not only for debugging, but also for programs to start, stop or control other programs.
-
-Another favorite feature would allow the one program to freeze an-other program's job cleanly, between instructions. In other operating systems, comparable operations might stop the program in the middle of a system call, with internal status that the user could not see and that had no well-defined meaning. In ITS, this feature made sure that monitoring the step-by-step operation of a program was reliable and consistent.
-
-"If you said, 'Stop the job,' it would always be stopped in user mode. It would be stopped between two user-mode instructions, and everything about the job would be consistent for that point," Stallman says. "If you said, 'Resume the job,' it would continue properly. Not only that, but if you were to change the (explicitly visible) status of the job and continue it, and later change it back, everything would be consistent. There was no hidden status anywhere."
-
-Starting in September 1971, hacking at the AI Lab had become a regular part of Stallman's weekly school schedule. From Sunday through Friday, Stallman was at Harvard. As soon as Friday afternoon arrived, however, he was on the subway, heading down to MIT for the weekend. Stallman usually made sure to arrive well before the ritual food run. Joining five or six other hackers in their nightly quest for Chinese food, he would jump inside a beat-up car and head across the Harvard Bridge into nearby Boston. For the next hour or so, he and his hacker colleagues would discuss everything from ITS to the internal logic of the Chinese language and pictograph system. Following dinner, the group would return to MIT and hack code until dawn, or perhaps go to Chinatown again at 3 a.m.
-
-Stallman might stay up all morning hacking, or might sleep Saturday morning on a couch. On waking he would hack some more, have another Chinese dinner, then go back to Harvard. Sometimes he would stay through Sunday as well. These Chinese dinners were not only delicious; they also provided sustenance lacking in the Harvard dining halls, where on the average only one meal a day included anything he could stomach. (Breakfast did not enter the count, since he didn't like most breakfast foods and was normally asleep at that hour.)
-
-For the geeky outcast who rarely associated with his high-school peers, it was a heady experience to be hanging out with people who shared the same predilection for computers, science fiction, and Chinese food. "I remember many sunrises seen from a car coming back from Chinatown," Stallman would recall nostalgically, 15 years after the fact in a speech at the Swedish Royal Technical Institute. "It was actually a very beautiful thing to see a sunrise, 'cause that's such a calm time of day. It's a wonderful time of day to get ready to go to bed. It's so nice to walk home with the light just brightening and the birds starting to chirp; you can get a real feeling of gentle satisfaction, of tranquility about the work that you have done that night."~{ See Richard Stallman, "RMS lecture at KTH (Sweden)," (October 30, 1986), \\ http://www.gnu.org/philosophy/stallman-kth.html. }~
-={Swedish Royal Technical Institute}
-
-The more Stallman hung out with the hackers, the more he adopted the hacker world view. Already committed to the notion of personal liberty, Stallman began to infuse his actions with a sense of communal duty. When others violated the communal code, Stallman was quick to speak out. Within a year of his first visit, Stallman was the one opening locked offices to recover the sequestered terminals that belonged to the lab community as a whole. In true hacker fashion, Stallman also sought to make his own personal contribution to the art. One of the most artful door-opening tricks, commonly attributed to Greenblatt, involved bending a stiff wire into several right angles and attaching a strip of tape to one end. Sliding the wire under the door, a hacker could twist and rotate the wire so that the tape touched the inside doorknob. Provided the tape stuck, a hacker could turn the doorknob by pulling the handle formed from the outside end of the wire.
-={Greenblat, Richard:lock-hacking and}
-
-When Stallman tried the trick, he found it hard to execute. Getting the tape to stick wasn't always easy, and twisting the wire in a way that turned the doorknob was similarly difficult. Stallman thought about another method: sliding away ceiling tiles to climb over the wall. This always worked, if there was a desk to jump down onto, but it generally covered the hacker in itchy fiberglass. Was there a way to correct that flaw? Stallman considered an alternative approach. What if, instead of slipping a wire under the door, a hacker slid away two ceiling panels and reached over the wall with a wire?
-
-Stallman took it upon himself to try it out. Instead of using a wire, Stallman draped out a long U-shaped loop of magnetic tape with a short U of adhesive tape attached sticky-side-up at the base. Reaching across over the door jamb, he dangled the tape until it looped under the inside doorknob. Lifting the tape until the adhesive stuck, he then pulled on one end of the tape, thus turning the doorknob. Sure enough, the door opened. Stallman had added a new twist to the art of getting into a locked room.
-
-"Sometimes you had to kick the door after you turned the doorknob," says Stallman, recalling a slight imperfection of the new method. "It took a little bit of balance to pull it off while standing on a chair on a desk."
-
-Such activities reflected a growing willingness on Stallman's part to speak and act out in defense of political beliefs. The AI Lab's spirit of direct action had proved inspirational enough for Stallman to breakout of the timid impotence of his teenage years. Opening up an office to free a terminal wasn't the same as taking part in a protest march, but it was effective in a way that most protests weren't: it solved the problem at hand.
-
-By the time of his last years at Harvard, Stallman was beginning to apply the whimsical and irreverent lessons of the AI Lab back at school .
-
-"Did he tell you about the snake?" his mother asks at one point during an interview. "He and his dorm mates put a snake up for student election. Apparently it got a considerable number of votes.
-
-"The snake was a candidate for election within Currier House, Stallman's dorm, not the campus-wide student council. Stallman does re-member the snake attracting a fair number of votes, thanks in large part to the fact that both the snake and its owner both shared the same last name. "People may have voted for it because they thought they were voting for the owner," Stallman says. "Campaign posters said that the snake was 'slithering for' the office. We also said it was an 'at large' candidate, since it had climbed into the wall through the ventilating unit a few weeks before and nobody knew where it was."
-
-Stallman and friends also "nominated" the house master's 3-year-old son. "His platform was mandatory retirement at age seven," Stallman recalls. Such pranks paled in comparison to the fake-candidate pranks on the MIT campus, however. One of the most successful fake-candidate pranks was a cat named Woodstock, which actually managed to outdraw most of the human candidates in a campus-wide election. "They never announced how many votes Woodstock got, and they treated those votes as spoiled ballots," Stallman recalls. "But the large number of spoiled ballots in that election suggested that Woodstock had actually won. A couple of years later, Woodstock was suspiciously run over by a car. Nobody knows if the driver was working for the MIT administration." Stallman says he had nothing to do with Woodstock's candidacy, "but I admired it."~{ In an email shortly after this book went into its final edit cycle, Stallman says he drew political inspiration from the Harvard campus as well. "In my first year of Harvard, in a Chinese History class, I read the story of the first revolt against the Qin dynasty," he says. (That's the one whose cruel founder burnt all the books and was buried with the terra cotta warriors.) "The story is not reliable history, but it was very moving." }~
-
-At the AI Lab, Stallman's political activities had a sharper-edged tone. During the 1970s, hackers faced the constant challenge of faculty members and administrators pulling an end-run around ITS and its hacker-friendly design. ITS allowed anyone to sit down at a console and do anything at all, even order the system to shut down in five minutes. If someone ordered a shutdown with no good reason, some other user canceled it. In the mid-1970s some faculty members (usually those who had formed their attitudes elsewhere) began calling for a file security system to limit access to their data. Other operating systems had such features, so those faculty members had become accustomed to living under security, and to the feeling that it was protecting them from something dangerous. But the AI Lab, through the insistence of Stallman and other hackers, remained a security-free zone.
-={Incompatible Timesharing System (ITS)+1}
-
-Stallman presented both ethical and practical arguments against adding security. On the ethical side, Stallman appealed to the AI Lab community's traditions of intellectual openness and trust. On the practical side, he pointed to the internal structure of ITS, which was built to foster hacking and cooperation rather than to keep every user under control. Any attempt to reverse that design would require a major overhaul. To make it even more difficult, he used up the last empty field in each file's descriptor for a feature to record which user had most recently changed the file. This feature left no place to store file security information, but it was so useful that nobody could seriously propose to remove it.
-={security (computer), opposition to}
-
-"The hackers who wrote the Incompatible Timesharing System decided that file protection was usually used by a self-styled system manager to get power over everyone else," Stallman would later explain. "They didn't want anyone to be able to get power over them that way, so they didn't implement that kind of a feature. The result was, that whenever something in the system was broken, you could always fix it" (since access control did not stand in your way).~{ See Richard Stallman (1986). }~
-
-Through such vigilance, hackers managed to keep the AI Lab's machines security-free. In one group at the nearby MIT Laboratory for Computer Sciences, however, security-minded faculty members won the day. The DM group installed its first password system in 1977. Once again, Stallman took it upon himself to correct what he saw as ethical laxity. Gaining access to the software code that controlled the password system, Stallman wrote a program to decrypt the encrypted passwords that the system recorded. Then he started an email campaign, asking users to choose the null string as their passwords. If the user had chosen "starfish," for example, the email message looked something like this:
-={password-based systems, hacking into+5}
-
-_1 I see you chose the password "starfish". I suggest that you switch to the password "carriage return", which is what I use. It's easier to type, and also opposes the idea of passwords and security.
-
-The users who chose "carriage return" - that is, users who simply pressed the Enter or Return button, entering a blank string instead of a unique password - left their accounts accessible to the world at large, just as all accounts had been, not long before. That was the point: by refusing to lock the shiny new locks on their accounts, they ridiculed the idea of having locks. They knew that the weak security implemented on that machine would not exclude any real intruders, and that this did not matter, because there was no reason to be concerned about intruders, and that no one wanted to intrude anyway, only to visit.
-
-Stallman, speaking in an interview for the 1984 book /{Hackers}/, proudly noted that one-fifth of the LCS staff accepted this argument and employed the null-string password.~{ See Steven Levy, Hackers (Penguin USA [paperback], 1984): 417. }~
-={Hackers (Levy)}
-
-Stallman's null-string campaign, and his resistance to security in general, would ultimately be defeated. By the early 1980s, even the AI Lab's machines were sporting password security systems. Even so, it represented a major milestone in terms of Stallman's personal and political maturation. Seen in the context of Stallman's later career, it represents a significant step in the development of the timid teenager, afraid to speak out even on issues of life-threatening importance, into the adult activist who would soon turn needling and cajoling into a full-time occupation.
-
-In voicing his opposition to computer security, Stallman drew on many of the key ideas that had shaped his early life: hunger for knowledge, distaste for authority, and frustration over prejudice and secret rules that rendered some people outcasts. He would also draw on the ethical concepts that would shape his adult life: responsibility to the community, trust, and the hacker spirit of direct action. Expressed in software-computing terms, the null string represents the 1.0 version of the Richard Stallman political world view - incomplete in a few places but, for the most part, fully mature.
-={computer security, opposition to}
-
-Looking back, Stallman hesitates to impart too much significance to an event so early in his hacking career. "In that early stage there were a lot of people who shared my feelings," he says. "The large number of people who adopted the null string as their password was a sign that many people agreed that it was the proper thing to do. I was simply inclined to be an activist about it."
-
-Stallman does credit the AI Lab for awakening that activist spirit, however. As a teenager, Stallman had observed political events with little idea as to how he could do or say anything of importance. As a young adult, Stallman was speaking out on matters in which he felt supremely confident, matters such as software design, responsibility to the community, and individual freedom. "I joined this community which had a way of life which involved respecting each other's freedom," he says. "It didn't take me long to figure out that that was a good thing. It took me longer to come to the conclusion that this was a moral issue."
-
-Hacking at the AI Lab wasn't the only activity helping to boost Stallman's esteem. At the start of his junior year at Harvard, Stallman began participating in a recreational international folk dance group which had just been started in Currier House. He was not going to try it, considering himself incapable of dancing, but a friend pointed out, "You don't know you can't if you haven't tried." To his amazement, he was good at it and enjoyed it. What started as an experiment became another passion alongside hacking and studying; also, occasionally, away to meet women, though it didn't lead to a date during his college career. While dancing, Stallman no longer felt like the awkward, un-coordinated 10-year-old whose attempts to play football had ended in frustration. He felt confident, agile, and alive. In the early 80s, Stallman went further and joined the MIT Folk Dance Performing Group. Dancing for audiences, dressed in an imitation of the traditional garb of a Balkan peasant, he found being in front of an audience fun, and discovered an aptitude for being on stage which later helped him in public speaking.
-={folk dancing;Stallman, Richard M.:folk dancing}
-
-Although the dancing and hacking did little to improve Stallman's social standing, they helped him overcome the sense of exclusion that had clouded his pre-Harvard life. In 1977, attending a science-fiction convention for the first time, he came across Nancy the Button maker, who makes calligraphic buttons saying whatever you wish. Excited, Stallman ordered a button with the words "Impeach God" emblazoned on it.
-
-For Stallman, the "Impeach God" message worked on many levels. An atheist since early childhood, Stallman first saw it as an attempt to start a "second front" in the ongoing debate on religion. "Back then everybody was arguing about whether a god existed," Stallman recalls. "'Impeach God' approached the subject from a completely different viewpoint. If a god was so powerful as to create the world and yet did nothing to correct the problems in it, why would we ever want to worship such a god? Wouldn't it be more just to put it on trial?"
-
-At the same time, "Impeach God" was a reference to the Watergate scandal of the 1970s, in effect comparing a tyrannical deity to Nixon. Watergate affected Stallman deeply. As a child, Stallman had grown up resenting authority. Now, as an adult, his mistrust had been solidified by the culture of the AI Lab hacker community. To the hackers, Watergate was merely a Shakespearean rendition of the daily power struggles that made life such a hassle for those without privilege. It was an out sized parable for what happened when people traded liberty and openness for security and convenience.
-
-Buoyed by growing confidence, Stallman wore the button proudly. People curious enough to ask him about it received a well-prepared spiel. "My name is Jehovah," Stallman would say. "I have a secret plan to end injustice and suffering, but due to heavenly security reasons I can't tell you the workings of my plan. I see the big picture and you don't, and you know I'm good because I told you so. So put your faith in me and obey me without question. If you don't obey, that means you're evil, so I'll put you on my enemies list and throw you in a pit where the Infernal Revenue Service will audit your taxes every year for all eternity."
-
-Those who interpreted the spiel as a parody of the Watergate hearings only got half the message. For Stallman, the other half of the message was something only his fellow hackers seemed to be hearing. One hundred years after Lord Acton warned about absolute power corrupting absolutely, Americans seemed to have forgotten the first part of Acton's truism: power, itself, corrupts. Rather than point out the numerous examples of petty corruption, Stallman felt content voicing his outrage toward an entire system that trusted power in the first place.
-
-"I figured, why stop with the small fry," says Stallman, recalling the button and its message. "If we went after Nixon, why not go after Mr. Big? The way I see it, any being that has power and abuses it deserves to have that power taken away."
-
-1~ Chapter 5 - Puddle of Freedom
-
-[RMS: In this chapter, I have corrected statements about facts, including facts about my thoughts and feelings, and removed some gratuitous hostility in descriptions of events. I have preserved Williams' statements of his own impressions, except where noted.]
-
-Ask anyone who's spent more than a minute in Richard Stallman's presence, and you'll get the same recollection: forget the long hair. Forget the quirky demeanor. The first thing you notice is the gaze. One look into Stallman's green eyes, and you know you're in the presence of a true believer.
-
-To call the Stallman gaze intense is an understatement. Stallman's eyes don't just look at you; they look through you. Even when your own eyes momentarily shift away out of simple primate politeness, Stallman's eyes remain locked-in, sizzling away at the side of your head like twin photon beams.
-
-Maybe that's why most writers, when describing Stallman, tend to go for the religious angle. In a 1998 Salon.com article titled "The Saint of Free Software," Andrew Leonard describes Stallman's green eyes as "radiating the power of an Old Testament prophet."1~{ See Andrew Leonard, "The Saint of Free Software," Salon.com (August 1998), \\ http://www.salon.com/21st/feature/1998/08/cov_31feature.html. }~ A 1999 Wired magazine article describes the Stallman beard as "Rasputin-like,"~{ See Leander Kahney, "Linux's Forgotten Man," Wired News (March 5, 1999), \\ http://www.wired.com/news/print/0,1294,18291,00.html. }~ while a London Guardian profile describes the Stallman smile as the smile of "a disciple seeing Jesus."~{ See "Programmer on moral high ground; Free software is a moral issue for Richard Stallman believes in freedom and free software," London Guardian (November 6, 1999), \\ http://www.guardian.co.uk/uk/1999/nov/06/andrewbrown. \\ These are just a small sampling of the religious comparisons. To date, the most extreme comparison has to go to Linus Torvalds, who, in his autobiography - see Linus Torvalds and David Diamond, Just For Fun: The Story of an Accidental Revolutionary (HarperCollins Publishers, Inc., 2001): 58 - writes, "Richard Stallman is the God of Free Software." Honorable mention goes to Larry Lessig, who, in a footnote description of Stallman in his book - see Larry Lessig, The Future of Ideas (Random House, 2001): 270 - likens Stallman to Moses:... \\ as with Moses, it was another leader, Linus Torvalds, who finally carried the movement into the promised land by facilitating the development of the final part of the OS puzzle. Like Moses, too, Stallman is both respected and reviled by allies within the movement. He is[an] unforgiving, and hence for many inspiring, leader of a critically important aspect of modern culture. I have deep respect for the principle and commitment of this extraordinary individual, though I also have great respect for those who are courageous enough to question his thinking and then sustain his wrath. \\ In a final interview with Stallman, I asked him his thoughts about the religious comparisons. "Some people do compare me with an Old Testament prophet, and the reason is Old Testament prophets said certain social practices were wrong. They wouldn't compromise on moral issues. They couldn't be bought off, and they were usually treated with contempt." }~
-={Wired magazine;Leonard, Andrew;London Guardian;Salon.com}
-
-Such analogies serve a purpose, but they ultimately fall short. That's because they fail to take into account the vulnerable side of the Stallman persona. Watch the Stallman gaze for an extended period of time, and you will begin to notice a subtle change. What appears at first to be an attempt to intimidate or hypnotize reveals itself upon second and third viewing as a frustrated attempt to build and maintain contact. If his personality has a touch or "shadow" of autism or Asperger's Syndrome, a possibility that Stallman has entertained from time to time, his eyes certainly confirm the diagnosis. Even at their most high-beam level of intensity, they have a tendency to grow cloudy and distant, like the eyes of a wounded animal preparing to give up the ghost.
-={Asperger Syndrome;autism}
-
-My own first encounter with the legendary Stallman gaze dates back to the March, 1999, LinuxWorld Convention and Expo in San Jose, California. Billed as a "coming out party" for the "Linux" software community, the convention also stands out as the event that reintroduced Stallman to the technology media. Determined to push for his proper share of credit, Stallman used the event to instruct spectators and reporters alike on the history of the GNU Project and the project's overt political objectives.
-={GNU Project:GNOME 1.0+1;Linux+6;LinuxWorld+8}
-
-As a reporter sent to cover the event, I received my own Stallman tutorial during a press conference announcing the release of GNOME 1.0, a free software graphic user interface. Unwittingly, I push an entire bank of hot buttons when I throw out my very first question to Stallman himself: "Do you think GNOME's maturity will affect the commercial popularity of the Linux operating system?"
-={GNOME 1.0}
-
-"I ask that you please stop calling the operating system Linux," Stallman responds, eyes immediately zeroing in on mine. "The Linux kernel is just a small part of the operating system. Many of the software programs that make up the operating system you call Linux were not developed by Linus Torvalds at all. They were created by GNU Project volunteers, putting in their own personal time so that users might have a free operating system like the one we have today. To not acknowledge the contribution of those programmers is both impolite and a misrepresentation of history. That's why I ask that when you refer to the operating system, please call it by its proper name, GNU/Linux."
-={GNU Project:Linux and|kernel;Torvalds, Linus+3}
-
-Taking the words down in my reporter's notebook, I notice an eerie silence in the crowded room. When I finally look up, I find Stallman's unblinking eyes waiting for me. Timidly, a second reporter throws out a question, making sure to use the term "GNU/Linux" instead of Linux. Miguel de Icaza, leader of the GNOME project, fields the question. It isn't until halfway through de Icaza's answer, however, that Stallman's eyes finally unlock from mine. As soon as they do, a mild shiver rolls down my back. When Stallman starts lecturing another reporter over a perceived error in diction, I feel a guilty tinge of relief. At least he isn't looking at me, I tell myself.
-={de Icaza, Miguel;GNU/Linux}
-
-For Stallman, such face-to-face moments would serve their purpose. By the end of the first LinuxWorld show, most reporters know better than to use the term "Linux" in his presence, and Wired.com is running a story comparing Stallman to a pre-Stalinist revolutionary erased from the history books by hackers and entrepreneurs eager to downplay the GNU Project's overly political objectives.~{ See Leander Kahney (1999). }~ Other articles follow, and while few reporters call the operating system GNU/Linux in print, most are quick to credit Stallman for launching the drive to build a free software operating system 15 years before.
-
-I won't meet Stallman again for another 17 months. During the interim, Stallman will revisit Silicon Valley once more for the August, 1999 LinuxWorld show. Although not invited to speak, Stallman does manage to deliver the event's best line. Accepting the show's Linus Torvalds Award for Community Service - an award named after Linux creator Linus Torvalds - on behalf of the Free Software Foundation, Stallman wisecracks, "Giving the Linus Torvalds Award to the Free Software Foundation is a bit like giving the Han Solo Award to the Rebel Alliance."
-
-This time around, however, the comments fail to make much of a media dent. Midway through the week, Red Hat, Inc., a prominent GNU/Linux vendor, goes public. The news merely confirms what many reporters such as myself already suspect: "Linux" has become a Wall Street buzzword, much like "e-commerce" and "dot-com" before it. With the stock market approaching the Y2K rollover like a hyperbola approaching its vertical asymptote, all talk of free software or open source as a political phenomenon falls by the wayside.
-={Red Hat Inc.:going public}
-
-Maybe that's why, when LinuxWorld follows up its first two shows with a third LinuxWorld show in August, 2000, Stallman is conspicuously absent.
-
-My second encounter with Stallman and his trademark gaze comes shortly after that third LinuxWorld show. Hearing that Stallman is going to be in Silicon Valley, I set up a lunch interview in Palo Alto, California. The meeting place seems ironic, not only because of his absence from the show but also because of the overall backdrop. Outside of Redmond, Washington, few cities offer a more direct testament to the economic value of proprietary software. Curious to see how Stallman, a man who has spent the better part of his life railing against our culture's predilection toward greed and selfishness, is coping in a city where even garage-sized bungalows run in the half-million-dollar price range, I make the drive down from Oakland.
-={Redmond (Washington);Palo Alto (California);Silicon Valley+1}
-
-I follow the directions Stallman has given me, until I reach the headquarters of Art.net, a nonprofit "virtual artists collective." Located in a hedge-shrouded house in the northern corner of the city, the Art.net headquarters are refreshingly run-down. Suddenly, the idea of Stallman lurking in the heart of Silicon Valley doesn't seem so strange after all.
-={Art.net}
-
-I find Stallman sitting in a darkened room, tapping away on his gray laptop computer. He looks up as soon as I enter the room, giving me a full blast of his 200-watt gaze. When he offers a soothing "Hello," I offer a return greeting. Before the words come out, however, his eyes have already shifted back to the laptop screen.
-
-"I'm just finishing an article on the spirit of hacking," Stallman says, fingers still tapping. "Take a look."
-
-I take a look. The room is dimly lit, and the text appears as greenish-white letters on a black background, a reversal of the color scheme used by most desktop word-processing programs, so it takes my eyes a moment to adjust. When they do, I find myself reading Stallman's account of a recent meal at a Korean restaurant. Before the meal, Stallman makes an interesting discovery: the person setting the table has left six chopsticks instead of the usual two in front of Stallman's place setting. Where most restaurant goers would have ignored the redundant pairs, Stallman takes it as challenge: find away to use all six chopsticks at once. Like many software hacks, the successful solution is both clever and silly at the same time. Hence Stallman's decision to use it as an illustration.
-
-As I read the story, I feel Stallman watching me intently. I look over to notice a proud but child-like half smile on his face. When I praise the essay, my comment barely merits a raised eyebrow.
-
-"I'll be ready to go in a moment," he says.
-
-Stallman goes back to tapping away at his laptop. The laptop is gray and boxy, not like the sleek, modern laptops that seemed to be a programmer favorite at the recent LinuxWorld show. Above the keyboard rides a smaller, lighter keyboard, a testament to Stallman's aging hands. During the mid 1990s, the pain in Stallman's hands became so unbearable that he had to hire a typist. Today, Stallman relies on a keyboard whose keys require less pressure than a typical computer keyboard.
-
-Stallman has a tendency to block out all external stimuli while working. Watching his eyes lock onto the screen and his fingers dance, one quickly gets the sense of two old friends locked in deep conversation.
-
-The session ends with a few loud keystrokes and the slow disassembly of the laptop.
-
-"Ready for lunch?" Stallman asks.
-
-We walk to my car. Pleading a sore ankle, Stallman limps along slowly. Stallman blames the injury on a tendon in his left foot. The injury is three years old and has gotten so bad that Stallman, a huge fan of folk dancing, has been forced to give up all dancing activities."I love folk dancing intensely," Stallman laments. "Not being able to dance has been a tragedy for me."
-={folk dancing;Stallman, Richard M.:folk dancing}
-
-Stallman's body bears witness to the tragedy. Lack of exercise has left Stallman with swollen cheeks and a pot belly that was much less visible the year before. You can tell the weight gain has been dramatic, because when Stallman walks, he arches his back like a pregnant woman trying to accommodate an unfamiliar load.
-
-The walk is further slowed by Stallman's willingness to stop and smell the roses, literally. Spotting a particularly beautiful blossom, he strokes the innermost petals against his nose, takes a deep sniff, and steps back with a contented sigh.
-
-"Mmm, rhinophytophilia," he says, rubbing his back.~{ At the time, I thought Stallman was referring to the flower's scientific name. Months later, I would learn that rhino phytophilia was in fact a humorous reference to the activity - i.e., Stallman's sticking his nose into a flower and enjoying the moment - presenting it as the kinky practice of nasal sex with plants. For another humorous Stallman flower incident, \\ visit: http://www.stallman.org/articles/texas.html. }~
-
-The drive to the restaurant takes less than three minutes. Upon recommendation from Tim Ney, former executive director of the Free Software Foundation, I have let Stallman choose the restaurant. While some reporters zero in on Stallman's monk-like lifestyle, the truth is, Stallman is a committed epicure when it comes to food. One of the fringe benefits of being a traveling missionary for the free software cause is the ability to sample delicious food from around the world. "Visit almost any major city in the world, and chances are Richard knows the best restaurant in town," says Ney. "Richard also takes great pride in knowing what's on the menu and ordering for the entire table." (If they are willing, that is.)
-={Ney, Tim}
-
-For today's meal, Stallman has chosen a Cantonese-style dim sum restaurant two blocks off University Avenue, Palo Alto's main drag. The choice is partially inspired by Stallman's recent visit to China, including a stop in Hong Kong, in addition to Stallman's personal aversion to spicier Hunanese and Szechuan cuisine. "I'm not a big fan of spicy," Stallman admits.
-
-We arrive a few minutes after 11 a.m. and find ourselves already subject to a 20-minute wait. Given the hacker aversion to lost time, I hold my breath momentarily, fearing an outburst. Stallman, contrary to expectations, takes the news in stride.
-
-"It's too bad we couldn't have found somebody else to join us," he tells me. "It's always more fun to eat with a group of people."
-
-During the wait, Stallman practices a few dance steps. His moves are tentative but skilled. We discuss current events. Stallman says his only regret about not attending LinuxWorld was missing out on a press conference announcing the launch of the GNOME Foundation. Backed by Sun Microsystems and IBM, the foundation is in many ways a vindication for Stallman, who has long championed that free software and free-market economics need not be mutually exclusive. Nevertheless, Stallman remains dissatisfied by the message that came out.
-
-"The way it was presented, the companies were talking about Linux with no mention of the GNU Project at all," Stallman says.
-={GNU Project:Linux and;Linux:GNU Project and}
-
-Such disappointments merely contrast the warm response coming from overseas, especially Asia, Stallman notes. A quick glance at the Stallman 2000 travel itinerary bespeaks the growing popularity of the free software message. Between recent visits to India, China, and Brazil, Stallman has spent 12 of the last 115 days on United States soil. His travels have given him an opportunity to see how the free software concept translates into different languages of cultures.
-
-"In India many people are interested in free software, because they see it as a way to build their computing infrastructure without spending a lot of money," Stallman says. "In China, the concept has been much slower to catch on. Comparing free software to free speech is harder to do when you don't have any free speech. Still, the level of interest in free software during my last visit was profound."
-
-The conversation shifts to Napster, the San Mateo, California software company, which has become something of a media cause c'el'ebre in recent months. The company markets a controversial software tool that lets music fans browse and copy the music files of other music fans. Thanks to the magnifying powers of the Internet, this so-called "peer-to-peer" program has evolved into a de facto online jukebox, giving ordinary music fans a way to listen to MP3 music files over the computer without paying a royalty or fee, much to record companies' chagrin.
-={Napster+4;San Mateo (California)+2}
-
-Although based on proprietary software, the Napster system draws inspiration from the long-held Stallman contention that once a work enters the digital realm - in other words, once making a copy is less a matter of duplicating sounds or duplicating atoms and more a matter of duplicating information - the natural human impulse to share a work becomes harder to restrict. Rather than impose additional restrictions, Napster execs have decided to take advantage of the impulse. Giving music listeners a central place to trade music files, the company has gambled on its ability to steer the resulting user traffic toward other commercial opportunities.
-
-The sudden success of the Napster model has put the fear in traditional record companies, with good reason. Just days before my Palo Alto meeting with Stallman, U.S. District Court Judge Marilyn Patel granted a request filed by the Recording Industry Association of America for an injunction against the file-sharing service. The in-junction was subsequently suspended by the U.S. Ninth District Court of Appeals, but by early 2001, the Court of Appeals, too, would find the San Mateo-based company in breach of copyright law,~{ See Cecily Barnes and Scott Ard, "Court Grants Stay of Napster Injunction," News.com (July 28, 2000), \\ http://news.cnet.com/news/0-1005-200-2376465.html. }~ a decision RIAA spokesperson Hillary Rosen would later proclaim a "clear victory for the creative content community and the legitimate online marketplace."~{ See "A Clear Victory for Recording Industry in Napster Case," RIAA press release (February 12, 2001), \\ http://www.riaa.com/PR_story.cfm?id=372. }~
-
-For hackers such as Stallman, the Napster business model is troublesome in different ways. The company's eagerness to appropriate time-worn hacker principles such as file sharing and communal information ownership, while at the same time selling a service based on proprietary software, sends a distressing mixed message. As a person who already has a hard enough time getting his own carefully articulated message into the media stream, Stallman is understandably reticent when it comes to speaking out about the company. Still, Stallman does admit to learning a thing or two from the social side of the Napster phenomenon.
-
-"Before Napster, I thought it might be [sufficient] for people to privately redistribute works of entertainment," Stallman says. "The number of people who find Napster useful, however, tells me that the right to redistribute copies not only on a neighbor-to-neighbor basis, but to the public at large, is essential and therefore may not be taken away."
-
-No sooner does Stallman say this than the door to the restaurant swings open and we are invited back inside by the host. Within a few seconds, we are seated in a side corner of the restaurant next to a large mirrored wall.
-
-The restaurant's menu doubles as an order form, and Stallman is quickly checking off boxes before the host has even brought water to the table. "Deep-fried shrimp roll wrapped in bean-curd skin," Stallman reads. "Bean-curd skin. It offers such an interesting texture. I think we should get it."
-
-This comment leads to an impromptu discussion of Chinese food and Stallman's recent visit to China. "The food in China is utterly exquisite," Stallman says, his voice gaining an edge of emotion for the first time this morning. "So many different things that I've never seen in the U.S., local things made from local mushrooms and local vegetables. It got to the point where I started keeping a journal just to keep track of every wonderful meal."
-
-The conversation segues into a discussion of Korean cuisine. During the same June, 2000, Asian tour, Stallman paid a visit to South Korea. His arrival ignited a mini-firestorm in the local media thanks to a Korean software conference attended by Microsoft founder and chairman Bill Gates that same week. Next to getting his photo above Gates's photo on the front page of the top Seoul newspaper, Stallman says the best thing about the trip was the food. "I had a bowl of naeng myun, which is cold noodles," says Stallman. "These were a very interesting feeling noodle. Most places don't use quite the same kind of noodles for your naeng myun, so I can say with complete certainty that this was the most exquisite naeng myun I ever had."
-={Gates, Bill;South Korea}
-
-The term "exquisite" is high praise coming from Stallman. I know this, because a few moments after listening to Stallman rhapsodize about naeng myun, I feel his laser-beam eyes singeing the top of my right shoulder.
-
-"There is the most exquisite woman sitting just behind you," Stallman says.
-
-I turn to look, catching a glimpse of a woman's back. The woman is young, somewhere in her mid-20s, and is wearing a white sequined dress. She and her male lunch companion are in the final stages of paying the check. When both get up from the table to leave the restaurant, I can tell without looking, because Stallman's eyes suddenly dim in intensity.
-
-"Oh, no," he says. "They're gone. And to think, I'll probably never even get to see her again."
-
-After a brief sigh, Stallman recovers. The moment gives me a chance to discuss Stallman's reputation vis-'a-vis the fairer sex. The reputation is a bit contradictory at times. A number of hackers report Stallman's predilection for greeting females with a kiss on the back of the hand.~{ See Mae Ling Mak, "A Mae Ling Story" (December 17, 1998), \\ http://crackmonkey.org/pipermail/crackmonkey/1998-December/001777.html. So far, Mak is the only person I've found willing to speak on the record in regard to this practice, although I've heard this from a few other female sources. Mak, despite expressing initial revulsion at it, later managed to put aside her misgivings and dance with Stallman at a 1999 LinuxWorld show. }~ A May 26, 2000 Salon.com article, meanwhile, portrays Stallman as a bit of a hacker lothario. Documenting the free software-free love connection, reporter Annalee Newitz presents Stallman as rejecting traditional family values, telling her, "I believe in love, but not monogamy."~{ See Annalee Newitz, "If Code is Free Why Not Me?", Salon.com (May 26,2000), \\ http://www.salon.com/tech/feature/2000/05/26/free_love/print.html. }~
-={Newitz, Annalee;Salon.com}
-
-Stallman lets his menu drop a little when I bring this up. "Well, most men seem to want sex and seem to have a rather contemptuous attitude towards women," he says. "Even women they're involved with. I can't understand it at all."
-
-I mention a passage from the 1999 book /{Open Sources}/ in which Stallman confesses to wanting to name the GNU kernel after a girl-friend at the time. The girlfriend's name was Alix, a name that fit perfectly with the Unix developer convention of putting an "x" at the end names of operating systems and kernels - e.g., "Linux." Alix was a Unix system administrator, and had suggested to her friends, "Someone should name a kernel after me." So Stallman decided to name the GNU kernel "Alix" as a surprise for her. The kernel's main developer renamed the kernel "Hurd," but retained the name "Alix" for part of it. One of Alix's friends noticed this part in a source snapshot and told her, and she was touched. A later redesign of the Hurd eliminated that part.~{ See Richard Stallman, "The GNU Operating System and the Free Software Movement," Open Sources (O'Reilly & Associates, Inc., 1999): 65. [RMS: Williams interpreted this vignette as suggesting that I am a hopeless romantic, and that my efforts were meant to impress some as-yet-unidentified woman. No MIT hacker would believe this, since we learned quite young that most women wouldn't notice us, let alone love us, for our programming. We programmed because it was fascinating. Meanwhile, these events were only possible because I had a thoroughly identified girlfriend at the time. If I was a romantic, at the time I was neither a hopeless romantic nor a hopeful romantic, but rather temporarily a successful one. On the strength of that naive interpretation, Williams went on to compare meto Don Quijote. For completeness' sake, here's a somewhat inarticulate quote from the first edition: "I wasn't really trying to be romantic. It was more of a teasing thing. I mean, it was romantic, but it was also teasing, you know? It would have been a delightful surprise."] }~
-={HURD kernel;Open Sources (DiBona, et al)}
-
-For the first time all morning, Stallman smiles. I bring up the hand kissing. "Yes, I do do that," Stallman says. "I've found it's a way of offering some affection that a lot of women will enjoy. It's a chance to give some affection and to be appreciated for it."
-
-Affection is a thread that runs clear through Richard Stallman's life, and he is painfully candid about it when questions arise. "There really hasn't been much affection in my life, except in my mind," he says. Still, the discussion quickly grows awkward. After a few one-word replies, Stallman finally lifts up his menu, cutting off the inquiry.
-
-"Would you like some shu mai?" he asks.
-
-When the food comes out, the conversation slaloms between the arriving courses. We discuss the oft-noted hacker affection for Chinese food, the weekly dinner runs into Boston's Chinatown district during Stallman's days as a staff programmer at the AI Lab, and the underlying logic of the Chinese language and its associated writing system. Each thrust on my part elicits a well-informed parry on Stallman's part.
-
-"I heard some people speaking Shanghainese the last time I was in China," Stallman says. "It was interesting to hear. It sounded quite different [from Mandarin]. I had them tell me some cognate words in Mandarin and Shanghainese. In some cases you can see the resemblance, but one question I was wondering about was whether tones would be similar. They're not. That's interesting to me, because there's a theory that the tones evolved from additional syllables that got lost and replaced. Their effect survives in the tone. If that's true, and I've seen claims that that happened within historic times, the dialects must have diverged before the loss of these final syllables."
-
-The first dish, a plate of pan-fried turnip cakes, has arrived. Both Stallman and I take a moment to carve up the large rectangular cakes, which smell like boiled cabbage but taste like potato latkes fried in bacon.
-
-I decide to bring up the outcast issue again, wondering if Stallman's teenage years conditioned him to take unpopular stands, most notably his uphill battle since 1994 to get computer users and the media to replace the popular term "Linux" with "GNU/Linux."
-
-"I believe [being an outcast] did help me [to avoid bowing to popular views]," Stallman says, chewing on a dumpling. "I have never understood what peer pressure does to other people. I think the reason is that I was so hopelessly rejected that for me, there wasn't anything to gain by trying to follow any of the fads. It wouldn't have made any difference. I'd still be just as rejected, so I didn't try."
-
-Stallman points to his taste in music as a key example of his contrarian tendencies. As a teenager, when most of his high school classmates were listening to Motown and acid rock, Stallman preferred classical music. The memory leads to a rare humorous episode from Stallman's middle-school years. Following the Beatles' 1964 appearance on the Ed Sullivan Show, most of Stallman's classmates rushed out to purchase the latest Beatles albums and singles. Right then and there, Stallman says, he made a decision to boycott the Fab Four.
-={Beatles+2;music+4}
-
-"I liked some of the pre-Beatles popular music," Stallman says. "But I didn't like the Beatles. I especially disliked the wild way people reacted to them. It was like: who was going to have a Beatles assembly to adulate the Beatles the most?"
-
-When his Beatles boycott failed to take hold, Stallman looked for other ways to point out the herd-mentality of his peers. Stallman says he briefly considered putting together a rock band himself dedicated to satirizing the Liverpool group.
-
-"I wanted to call it Tokyo Rose and the Japanese Beetles."
-
-Given his current love for international folk music, I ask Stallman if he had a similar affinity for Bob Dylan and the other folk musicians of the early 1960s. Stallman shakes his head. "I did like Peter, Paul and Mary," he says. "That reminds me of a great filk."
-={Dylan, Bob;Peter, Paul and Mary}
-
-When I ask for a definition of "filk," Stallman explains that the term is used in science fiction fandom to refer to the writing of new lyrics for songs. (In recent decades, some filkers write melodies too.) Classic filks include "On Top of Spaghetti," a rewrite of "On Top of Old Smokey," and "Yoda," filk-master "Weird" Al Yankovic's Star Wars-oriented rendition of the Kinks tune, "Lola."
-
-Stallman asks me if I would be interested in hearing the filk. As soon as I say yes, Stallman's voice begins singing in an unexpectedly clear tone, using the tune of "Blowin' in the Wind":
-
-poem{
-
- How much wood could a woodchuck chuck,
- f a woodchuck could chuck wood?
- How many poles could a polak lock,
- If a polak could lock poles?
- How many knees could a negro grow,
- If a negro could grow knees?
- The answer, my dear,
- is stick it in your ear.
- The answer is, stick it in your ear...
-
-}poem
-
-The singing ends, and Stallman's lips curl into another child-like half smile. I glance around at the nearby tables. The Asian families enjoying their Sunday lunch pay little attention to the bearded alto in their midst.~{ For Stallman's own filks, \\ visit http://www.stallman.org/doggerel.html . To hear Stallman singing "The Free Software Song," \\ visit http://www.gnu.org/music/free-software-song.html. }~ After a few moments of hesitation, I finally smile too.
-
-"Do you want that last cornball?" Stallman asks, eyes twinkling. Before I can screw up the punch line, Stallman grabs the corn-encrusted dumpling with his two chopsticks and lifts it proudly. "Maybe I'm the one who should get the cornball," he says.
-
-The food gone, our conversation assumes the dynamics of a normal interview. Stallman reclines in his chair and cradles a cup of tea in his hands. We resume talking about Napster and its relation to the free software movement. Should the principles of free software be extended to similar arenas such as music publishing? I ask.
-
-"It's a mistake to transfer answers from one thing to another," says Stallman, contrasting songs with software programs. "The right approach is to look at each type of work and see what conclusion you get."
-
-When it comes to copyrighted works, Stallman says he divides the world into three categories. The first category involves "functional" works - e.g., software programs, dictionaries, and textbooks. The second category involves works that might best be described as "testimonial" - e.g., scientific papers and historical documents. Such works serve a purpose that would be undermined if subsequent readers or authors were free to modify the work at will. It also includes works of personal expression - e.g., diaries, journals, and autobiographies. To modify such documents would be to alter a person's recollections or point of view, which Stallman considers ethically unjustifiable. The third category includes works of art and entertainment.
-={copyrighted works, categories of}
-
-Of the three categories, the first should give users the unlimited right to make modified versions, while the second and third should regulate that right according to the will of the original author. Regardless of category, however, the freedom to copy and redistribute non-commercially should remain unabridged at all times, Stallman insists. If that means giving Internet users the right to generate a hundred copies of an article, image, song, or book and then email the copies to a hundred strangers, so be it. "It's clear that private occasional redistribution must be permitted, because only a police state can stop that," Stallman says. "It's antisocial to come between people and their friends. Napster has convinced me that we also need to permit, must permit, even noncommercial redistribution to the public for the fun of it. Because so many people want to do that and find it so useful."
-={Napster}
-
-When I ask whether the courts would accept such a permissive outlook, Stallman cuts me off.
-
-"That's the wrong question," he says. "I mean now you've changed the subject entirely from one of ethics to one of interpreting laws. And those are two totally different questions in the same field. It's useless to jump from one to the other. How the courts would interpret the existing laws is mainly in a harsh way, because that's the way these laws have been bought by publishers."
-
-The comment provides an insight into Stallman's political philosophy: just because the legal system currently backs up businesses' ability to treat copyright as the software equivalent of land title doesn't mean computer users have to play the game according to those rules. Freedom is an ethical issue, not a legal issue. "I'm looking beyond what the existing laws are to what they should be," Stallman says. "I'm not trying to draft legislation. I'm thinking about what should the law do? I consider the law prohibiting the sharing of copies with your friend the moral equivalent of Jim Crow. It does not deserve respect."
-
-The invocation of Jim Crow prompts another question. How much influence or inspiration does Stallman draw from past political leaders? Like the civil-rights movement of the 1950s and 1960s, his attempt to drive social change is based on an appeal to timeless values: freedom, justice, and fair play.
-
-Stallman divides his attention between my analogy and a particularly tangled strand of hair. When I stretch the analogy to the point where I'm comparing Stallman with Dr. Martin Luther King, Jr., Stallman, after breaking off a split end and popping it into his mouth, cuts me off.
-
-"I'm not in his league, but I do play the same game," he says, chewing.
-
-I suggest Malcolm X as another point of comparison. Like the former Nation of Islam spokesperson, Stallman has built up a reputation for courting controversy, alienating potential allies, and preaching a message favoring self-sufficiency over cultural integration.
-
-Chewing on another split end, Stallman rejects the comparison. "My message is closer to King's message," he says. "It's a universal message. It's a message of firm condemnation of certain practices that mistreat others. It's not a message of hatred for anyone. And it's not aimed at a narrow group of people. I invite anyone to value freedom and to have freedom."
-
-Many criticize Stallman for rejecting handy political alliances; some psychologize this and describe it as a character trait. In the case of his well-publicized distaste for the term "open source," the unwillingness to participate in recent coalition-building projects seems understand-able. As a man who has spent the last two decades stumping on the behalf of free software, Stallman's political capital is deeply invested in the term. Still, comments such as the "Han Solo" comparison at the 1999 LinuxWorld have only reinforced Stallman's reputation, amongst those who believe virtue consists of following the crowd, as a disgruntled mossback unwilling to roll with political or marketing trends.
-
-"I admire and respect Richard for all the work he's done," says Red Hat president Robert Young, summing up Stallman's paradoxical political conduct. "My only critique is that sometimes Richard treats his friends worse than his enemies."
-={Young, Robert;Red Hat Inc.}
-
-[RMS: The term "friends" only partly fits people such as Young, and companies such as Red Hat. It applies to some of what they did, and do: for instance, Red Hat contributes to development of free software, including some GNU programs. But Red Hat does other things that work against the free software movement's goals - for instance, its versions of GNU/Linux contain non-free software. Turning from deeds to words, referring to the whole system as "Linux" is unfriendly treatment of the GNU Project, and promoting "open source" instead of "free software" rejects our values. I could work with Young and Red Hat when we were going in the same direction, but that was not often enough to make them possible allies.]
-
-Stallman's reluctance to ally the free software movement with other political causes is not due to lack of interest in them. Visit his offices at MIT, and you instantly find a clearinghouse of left-leaning news articles covering civil-rights abuses around the globe. Visit his personal web site, stallman.org, and you'll find attacks on the Digital Millennium Copyright Act, the War on Drugs, and the World Trade Organization. Stallman explains, "We have to be careful of entering the free software movement into alliances with other political causes that substantial numbers of free software supporters might not agree with. For instance, we avoid linking the free software movement with any political party because we do not want to drive away the supporters and elected officials of other parties."
-={Digital Millennium Copyright Act;War on Drugs;World Trade Organization}
-
-Given his activist tendencies, I ask, why hasn't Stallman sought a larger voice? Why hasn't he used his visibility in the hacker world as a platform to boost his political voice? [RMS: But I do - when I see a good opportunity. That's why I started stallman.org. ]
-
-Stallman lets his tangled hair drop and contemplates the question for a moment. [RMS: My quoted response doesn't fit that question. It does fit a different question, "Why do you focus on free software rather than on the other causes you believe in?" I suspect the question I was asked was more like that one.]
-
-"I hesitate to exaggerate the importance of this little puddle of freedom," he says. "Because the more well-known and conventional areas of working for freedom and a better society are tremendously important. I wouldn't say that free software is as important as they are. It's the responsibility I undertook, because it dropped in my lap and I saw a way I could do something about it. But, for example, to end police brutality, to end the war on drugs, to end the kinds of racism we still have, to help everyone have a comfortable life, to protect the rights of people who do abortions, to protect us from theocracy, these are tremendously important issues, far more important than what I do. I just wish I knew how to do something about them."
-
-Once again, Stallman presents his political activity as a function of personal confidence. Given the amount of time it has taken him to develop and hone the free software movement's core tenets, Stallman is hesitant to believe he can advance the other causes he supports.
-
-"I wish I knew how to make a major difference on those bigger issues, because I would be tremendously proud if I could, but they're very hard and lots of people who are probably better than I am have been working on them and have gotten only so far," he says. "But as I see it, while other people were defending against these big visible threats, I saw another threat that was unguarded. And so I went to defend against that threat. It may not be as big a threat, but I was the only one there [to oppose it]."
-
-Chewing a final split end, Stallman suggests paying the check. Be-fore the waiter can take it away, however, Stallman pulls out a white-colored dollar bill and throws it on the pile. The bill looks so clearly counterfeit, I can't help but pick it up and read it. Sure enough, it did not come from the US Mint. Instead of bearing the image of a George Washington or Abe Lincoln, the bill's front side bears the image of a cartoon pig. Instead of the United States of America, the banner above the pig reads, "Untied Status of Avarice." The bill is for zero dollars,~{ RMS: Williams was mistaken to call this bill "counterfeit." It is legal tender, worth zero dollars for payment of any debt. Any U.S. government office will convert it into zero dollars' worth of gold. }~ and when the waiter picks up the money, Stallman makes sure to tug on his sleeve.
-
-"I added an extra zero to your tip," Stallman says, yet another half smile creeping across his lips.
-
-The waiter, uncomprehending or fooled by the look of the bill, smiles and scurries away.
-
-"I think that means we're free to go," Stallman says.
-
-1~ Chapter 6 - The Emacs Commune
-={Emacs Commune+52;Stallman, Richard M.:AI Lab, as a programmer+18;Stallman, Richard M.:Emacs Commune and+52}
-
-The AI Lab of the 1970s was by all accounts a special place. Cutting-edge projects and top-flight researchers gave it an esteemed position in the world of computer science. The internal hacker culture and its anarchic policies lent a rebellious mystique as well. Only later, when many of the lab's scientists and software superstars had departed, would hackers fully realize the unique and ephemeral world they had once inhabited.
-
-"It was a bit like the Garden of Eden," says Stallman, summing up the lab and its software-sharing ethos in a 1998 /{Forbes}/ article. "It hadn't occurred to us not to cooperate."~{ See Josh McHugh, "For the Love of Hacking," Forbes (August 10, 1998), \\ http://www.forbes.com/forbes/1998/0810/6203094a.html. }~
-
-Such mythological descriptions, while extreme, underline an important fact. The ninth floor of 545 Tech Square was more than a workplace for many. For hackers such as Stallman, it was home.
-
-The word "home" is a weighted term in the Stallman lexicon. In a pointed swipe at his parents, Stallman, to this day, refuses to acknowledge any home before Currier House, the dorm he lived in during his days at Harvard. He has also been known to describe leaving that home in tragicomic terms. Once, while describing his years at Harvard, Stallman said his only regret was getting kicked out. It wasn't until I asked Stallman what precipitated his ouster, that I realized I had walked into a classic Stallman setup line.
-={Currier House (Harvard University)}
-
-"At Harvard they have this policy where if you pass too many classes they ask you to leave," Stallman says.
-
-With no dorm and no desire to return to New York, Stallman followed a path blazed by Greenblatt, Gosper, Sussman, and the many other hackers before him. Enrolling at MIT as a grad student, Stallman rented a room in an apartment in nearby Cambridge but soon viewed the AI Lab itself as his de facto home. In a 1986 speech, Stallman recalled his memories of the AI Lab during this period:
-={Gosper, Bill;Greenblat, Richard;Sussman, Gerald}
-
-_1 I may have done a little bit more living at the lab than most people, because every year or two for some reason or other I'd have no apartment and I would spend a few months living at the lab. And I've always found it very comfortable, as well as nice and cool in the summer. But it was not at all uncommon to find people falling asleep at the lab, again because of their enthusiasm; you stay up as long as you possibly can hacking, because you just don't want to stop. And then when you're completely exhausted, you climb over to the nearest soft horizontal surface. A very informal atmosphere.~{ See Stallman (1986). }~
-
-The lab's home-like atmosphere could be a problem at times. What some saw as a dorm, others viewed as an electronic opium den. In the 1976 book /{Computer Power and Human Reason}/, MIT researcher Joseph Weizenbaum offered a withering critique of the "computer bum," Weizenbaum's term for the hackers who populated computer rooms such as the AI Lab. "Their rumpled clothes, their unwashed hair and unshaved faces, and their uncombed hair all testify that they are oblivious to their bodies and to the world in which they move," Weizenbaum wrote. "[Computer bums] exist, at least when so engaged, only through and for the computers."~{ See Joseph Weizenbaum, Computer Power and Human Reason: From Judgment to Calculation (W. H. Freeman, 1976): 116. }~
-={computer bums;Computer Power and Human Reason (Weizenbaum);Weizenbaum, Joseph+1}
-
-Almost a quarter century after its publication, Stallman still bristles when hearing Weizenbaum's "computer bum" description, discussing it in the present tense as if Weizenbaum himself was still in the room. "He wants people to be just professionals, doing it for the money and wanting to get away from it and forget about it as soon as possible," Stallman says. "What he sees as a normal state of affairs, I see as a tragedy."
-
-Hacker life, however, was not without tragedy. Stallman characterizes his transition from weekend hacker to full-time AI Lab denizen as a series of painful misfortunes that could only be eased through the euphoria of hacking. As Stallman himself has said, the first misfortune was his graduation from Harvard. Eager to continue his studies in physics, Stallman enrolled as a graduate student at MIT. The choice of schools was a natural one. Not only did it give Stallman the chance to follow the footsteps of great MIT alumni: William Shockley ('36), Richard P. Feynman ('39), and Murray Gell-Mann ('51), it also put him two miles closer to the AI Lab and its new PDP-10 computer. "My attention was going toward programming, but I still thought, well, maybe I can do both," Stallman says.
-={Feynman, Richard;Gell-Mann, Murray;Harvard University:graduation from;Shockley, William}
-
-Toiling in the fields of graduate-level science by day and programming in the monastic confines of the AI Lab by night, Stallman tried to achieve a perfect balance. The fulcrum of this geek teeter-totter was his weekly outing with the Folk-Dance Club, his one social outlet that guaranteed at least a modicum of interaction with the opposite sex. Near the end of that first year at MIT, however, disaster struck. A knee injury forced Stallman to stop dancing. At first, Stallman viewed the injury as a temporary problem; he went to dancing and chatted with friends while listening to the music he loved. By the end of the summer, when the knee still ached and classes reconvened, Stallman began to worry. "My knee wasn't getting any better," Stallman recalls," which meant I had to expect to be unable to dance, permanently. I was heartbroken."
-
-With no dorm and no dancing, Stallman's social universe imploded. Dancing was the only situation in which he had found success in meeting women and occasionally even dating them. No more dancing ever was painful enough, but it also meant, it seemed, no more dates ever.
-
-"I felt basically that I'd lost all my energy," Stallman recalls. "I'd lost my energy to do anything but what was most immediately tempting. The energy to do something else was gone. I was in total despair."
-
-Stallman retreated from the world even further, focusing entirely on his work at the AI Lab. By October, 1975, he dropped out of MIT and out of physics, never to return to studies. Software hacking, once a hobby, had become his calling.
-
-Looking back on that period, Stallman sees the transition from full-time student to full-time hacker as inevitable. Sooner or later, he believes, the siren's call of computer hacking would have overpowered his interest in other professional pursuits. "With physics and math, I could never figure out a way to contribute," says Stallman, recalling his struggles prior to the knee injury. "I would have been proud to advance either one of those fields, but I could never see a way to do that. I didn't know where to start. With software, I saw right away how to write things that would run and be useful. The pleasure of that knowledge led me to want to do it more."
-
-Stallman wasn't the first to equate hacking with pleasure. Many of the hackers who staffed the AI Lab boasted similar, incomplete academic resumes. *** Most had come in pursuing degrees in math or electrical engineering only to surrender their academic careers and professional ambitions to the sheer exhilaration that came with solving problems never before addressed. Like St. Thomas Aquinas, the scholastic known for working so long on his theological summae that he sometimes achieved spiritual visions, hackers reached transcendent internal states through sheer mental focus and physical exhaustion. Although Stallman shunned drugs, like most hackers, he enjoyed the "high" that came near the end of a 20-hour coding bender.
-={Thomas Aquinas, saint}
-
-Perhaps the most enjoyable emotion, however, was the sense of personal fulfillment. When it came to hacking, Stallman was a natural. A childhood's worth of late-night study sessions gave him the ability to work long hours with little sleep. As a social outcast since age 10, he had little difficulty working alone. And as a mathematician with a built-in gift for logic and foresight, Stallman possessed the ability to circumvent design barriers that left most hackers spinning their wheels.
-
-"He was special," recalls Gerald Sussman, an AI Lab faculty member and (since 1985) board member of the Free Software Foundation. Describing Stallman as a "clear thinker and a clear designer," Sussman invited Stallman to join him in AI research projects in 1973 and 1975, both aimed at making AI programs that could analyze circuits the way human engineers do it. The project required an expert's command of Lisp, a programming language built specifically for AI applications, as well as understanding (supplied by Sussman) of how a human might approach the same task. The 1975 project pioneered an AI technique called dependency-directed backtracking or truth maintenance, which consists of positing tentative assumptions, noticing if they lead to contradictions, and reconsidering the pertinent assumptions if that occurs.
-={LISP programming language;Sussman, Gerald}
-
-When he wasn't working on official projects such as these, Stallman devoted his time to pet projects. It was in a hacker's best interest to improve the lab's software infrastructure, and one of Stallman's biggest pet projects during this period was the lab's editor program TECO.
-={TECO editor program+23}
-
-The story of Stallman's work on TECO during the 1970s is inextricably linked with Stallman's later leadership of the free software movement. It is also a significant stage in the history of computer evolution, so much so that a brief recapitulation of that evolution is necessary. During the 1950s and 1960s, when computers were first appearing at universities, computer programming was an incredibly abstract pursuit. To communicate with the machine, programmers created a series of punch cards, with each card representing an individual software command. Programmers would then hand the cards over to a central system administrator who would then insert them, one by one, into the machine, waiting for the machine to spit out a new set of punch cards, which the programmer would then decipher as output. This process, known as "batch processing," was cumbersome and time consuming. It was also prone to abuses of authority. One of the motivating factors behind hackers' inbred aversion to centralization was the power held by early system operators in dictating which jobs held top priority.
-={batch processing;Free Software Foundation (FSF):TECO text-editor and;punch cards, for batch processing}
-
-In 1962, computer scientists and hackers involved in MIT's Project MAC, an early forerunner of the AI Lab, took steps to alleviate this frustration. Time-sharing, originally known as "time stealing," made it possible for multiple programs to take advantage of a machine's operational capabilities. Teletype interfaces also made it possible to communicate with a machine not through a series of punched holes but through actual text. A programmer typed in commands and read the line-by-line output generated by the machine.
-={Project MAC;teletype interfaces vs. batch processing+3}
-
-During the late 1960s, interface design made additional leaps. In a famous 1968 lecture, Doug Engelbart, a scientist then working at the Stanford Research Institute, unveiled a prototype of the modern graphical interface. Rigging up a television set to the computer and adding a pointer device which Engelbart dubbed a "mouse," the scientist created a system even more interactive than the time-sharing system developed at MIT. Treating the video display like a high-speed printer, Engelbart's system gave a user the ability to move the cursor around the screen and see the cursor position updated by the computer in real time. The user suddenly had the ability to position text anywhere on the screen.
-={Engelbart, Doug;graphial interfaces;mice, as video pointers;Stanford Research Institute}
-
-Such innovations would take another two decades to make their way into the commercial marketplace. Still, by the 1970s, video screens had started to replace teletypes as display terminals, creating the potential for full-screen - as opposed to line-by-line - editing capabilities.
-={display terminals, replacing teletypes;video screens}
-
-One of the first programs to take advantage of this full-screen capability was the MIT AI Lab's TECO. Short for Text Editor and COrrector, the program had been upgraded by hackers from an old teletype line editor for the lab's PDP-6 machine.~{ According to the Jargon File, TECO's name originally stood for Tape Editor and Corrector. \\ See http://www.catb.org/jargon/html/T/TECO.html. }~
-
-TECO was a substantial improvement over old editors, but it still had its drawbacks. To create and edit a document, a programmer had to enter a series of commands specifying each edit. It was an abstract process. Unlike modern word processors, which update text with each keystroke, TECO demanded that the user enter an extended series of editing instructions followed by an "end of command string" sequence just to change the text. Over time, a hacker grew proficient enough to make large changes elegantly in one command string, but as Stallman himself would later point out, the process required "a mental skill like that of blindfold chess."~{ See Richard Stallman, "EMACS: The Extensible, Customizable, Display Editor," AI Lab Memo (1979). An updated HTML version of this memo, from which I am quoting, is available at \\ http://www.gnu.org/software/emacs/emacs-paper.html. }~
-
-To facilitate the process, AI Lab hackers had built a system that displayed both the text and the command string on a split screen. Despite this innovative hack, editing with TECO still required skill and planning.
-
-TECO wasn't the only full-screen editor floating around the computer world at this time. During a visit to the Stanford Artificial Intelligence Lab in 1976, Stallman encountered an edit program named E. The program contained an internal feature, which allowed a user to update display text after each command keystroke. In the language of 1970s programming, E was one of the first rudimentary WYSIWYG editors. Short for "what you see is what you get," WYSIWYG meant that a user could manipulate the file by moving through the displayed text, as opposed to working through a back-end editor program."~{ See Richard Stallman, "Emacs the Full Screen Editor" (1987), \\ http://www.lysator.liu.se/history/garb/txt/87-1-emacs.txt. }~
-={E edit program;Stanford Artificial Intelligence Laboratory}
-
-Impressed by the hack, Stallman looked for ways to expand TECO's functionality in similar fashion upon his return to MIT. He found a TECO feature called Control-R, written by Carl Mikkelson and named after the two-key combination that triggered it. Mikkelson's hack switched TECO from its usual abstract command-execution mode to a more intuitive keystroke-by-keystroke mode. The only flaws were that it used just five lines of the screen and was too inefficient for real use. Stallman reimplemented the feature to use the whole screen efficiently, then extended it in a subtle but significant way. He made it possible to attach TECO command strings, or "macros," to keystrokes. Advanced TECO users already saved macros in files; Stallman's hack made it possible to call them up fast. The result was a user-programmable WYSIWYG editor. "That was the real breakthrough," says Guy Steele, a fellow AI Lab hacker at the time.~{ Ibid. }~
-={macro modes, adding to TECO+11;Steele, Guy+13}
-
-By Stallman's own recollection, the macro hack touched off an explosion of further innovation. "Everybody and his brother was writing his own collection of redefined screen-editor commands, a command for everything he typically liked to do," Stallman would later recall. "People would pass them around and improve them, making them more powerful and more general. The collections of redefinitions gradually became system programs in their own right."~{ Ibid. }~
-
-So many people found the macro innovations useful and had incorporated it into their own TECO programs that the TECO editor had become secondary to the macro mania it inspired. "We started to categorize it mentally as a programming language rather than as an editor," Stallman says. Users were experiencing their own pleasure tweaking the software and trading new ideas.~{ Ibid. }~
-
-Two years after the explosion, the rate of innovation began to exhibit inconvenient side effects. The explosive growth had provided an exciting validation of the collaborative hacker approach, but it had also led to incompatibility. "We had a Tower of Babel effect," says Guy Steele.
-
-The effect threatened to kill the spirit that had created it, Steele says. Hackers had designed ITS to facilitate programmers' ability to share knowledge and improve each other's work. That meant being able to sit down at another programmer's desk, open up a programmer's work and make comments and modifications directly within the software. "Sometimes the easiest way to show somebody how to program or debug something was simply to sit down at the terminal and do it for them," explains Steele.
-
-The macro feature, after its second year, began to foil this capability. In their eagerness to embrace the new full-screen capabilities, hackers had customized their versions of TECO to the point where a hacker sitting down at another hacker's terminal usually had to spend the first hour just figuring out what macro commands did what.
-
-Frustrated, Steele took it upon himself to solve the problem. He gathered together the four different macro packages and began assembling a chart documenting the most useful macro commands. In the course of implementing the design specified by the chart, Steele say she attracted Stallman's attention.
-
-"He started looking over my shoulder, asking me what I was doing," recalls Steele.
-
-For Steele, a soft-spoken hacker who interacted with Stallman infrequently, the memory still sticks out. Looking over another hacker's shoulder while he worked was a common activity at the AI Lab. Stallman, the TECO maintainer at the lab, deemed Steele's work "interesting" and quickly set off to complete it.
-
-"As I like to say, I did the first 0.001 percent of the implementation, and Stallman did the rest," says Steele with a laugh.
-
-The project's new name, Emacs, came courtesy of Stallman. Short for "editing macros," it signified the evolutionary transcendence that had taken place during the macros explosion two years before. It also took advantage of a gap in the software programming lexicon. Noting a lack of programs on ITS starting with the letter "E," Stallman chose Emacs, making it natural to reference the program with a single letter. Once again, the hacker lust for efficiency had left its mark.~{ Ibid. }~
-={Emacs text editor+11;GNU Emacs+11}
-
-Of course, not everyone switched to Emacs, or not immediately. Users were free to continue maintaining and running their own TECO-based editors as before. But most found it preferable to switch to Emacs, especially since Emacs was designed to make it easy to replace or add some parts while using others unchanged.
-
-"On the one hand, we were trying to make a uniform command set again; on the other hand, we wanted to keep it open ended, because the programmability was important," recalls Steele.
-
-Stallman now faced another conundrum: if users made changes but didn't communicate those changes back to the rest of the community, the Tower of Babel effect would simply emerge in other places. Falling back on the hacker doctrine of sharing innovation, Stallman embedded a statement within the source code that set the terms of use. Users were free to modify and redistribute the code on the condition that they gave back all the extensions they made. Stallman called this "joining the Emacs Commune." Just as TECO had become more than a simple editor, Emacs had become more than a simple software program. To Stallman, it was a social contract. In a 1981 memo documenting the project, Stallman spelled out the contract terms. "EMACS," he wrote, "was distributed on a basis of communal sharing, which means that all improvements must be given back to me to be incorporated and distributed."~{ See Stallman (1979): #SEC34. }~
-={Emacs Commune}
-
-The original Emacs ran only on the PDP-10 computer, but soon users of other computers wanted an Emacs to edit with. The explosive innovation continued throughout the decade, resulting in a host of Emacs-like programs with varying degrees of cross-compatibility. The Emacs Commune's rules did not apply to them, since their code was separate. A few cited their relation to Stallman's original Emacs with humorously recursive names: Sine (Sine is not Emacs), Eine (Eine isnot Emacs), and Zwei (Zwei was Eine initially). A true Emacs had to provide user-programmability like the original; editors with similar keyword commands but without the user-programmability were called "ersatz Emacs." One example was Mince (Mince is Not Complete Emacs).
-={Eine (Eine is not Emacs) text editor;Zwei (Zwei was Eine initially) text editor;Sine (Sine is not Emacs) text editor}
-
-While Stallman was developing Emacs in the AI Lab, there were other, unsettling developments elsewhere in the hacker community. Brian Reid's 1979 decision to embed "time bombs" in Scribe, making it possible for Unilogic to limit unpaid user access to the software, was a dark omen to Stallman. "He considered it the most Nazi thing he ever saw in his life," recalls Reid. Despite going on to later Internet fame as the co-creator of the Usenet /{alt}/ hierarchy, Reid says he still has yet to live down that 1979 decision, at least in Stallman's eyes. "He said that all software should be free and the prospect of charging money for software was a crime against humanity."~{ In a 1996 interview with online magazine MEME , Stallman cited Scribe's sale as irksome, but declined to mention Reid by name. "The problem was nobody censured or punished this student for what he did," Stallman said. "The result was other people got tempted to follow his example." See MEME 2.04, \\ http://memex.org/meme2-04.html. }~
-={Reid, Brian+1;Unilogic software company;time bombs, in software;Scribe text-formatting program}
-
-Although Stallman had been powerless to head off Reid's sale, he did possess the ability to curtail other forms of behavior deemed contrary to the hacker ethos. As central source-code maintainer for the original Emacs, Stallman began to wield his power for political effect. During his final stages of conflict with the administrators at the Laboratory for Computer Science over password systems, Stallman initiated a software "strike," refusing to send lab members the latest version of Emacs until they rejected the security system on the lab's computers.~{ See Steven Levy, Hackers (Penguin USA [paperback], 1984): 419. }~ This was more gesture than sanction, since nothing could stop them from installing it themselves. But it got the point across: putting passwords on an ITS system would lead to condemnation and reaction.
-={security (computer), opposition to;strike, at the Laboratory for Computer Science}
-
-"A lot of people were angry with me, saying I was trying to hold them hostage or blackmail them, which in a sense I was," Stallman would later tell author Steven Levy. "I was engaging in violence against them because I thought they were engaging in violence to everyone at large."~{ Ibid. }~
-
-Over time, Emacs became a sales tool for the hacker ethic. The flexibility Stallman had built into the software not only encouraged collaboration, it demanded it. Users who didn't keep abreast of the latest developments in Emacs evolution or didn't contribute their contributions back to Stallman ran the risk of missing out on the latest breakthroughs. And the breakthroughs were many. Twenty years later, users of GNU Emacs (a second implementation started in 1984)have modified it for so many different uses - using it as a spreadsheet, calculator, database, and web browser - that later Emacs developers adopted an overflowing sink to represent its versatile functionality. "That's the idea that we wanted to convey," says Stallman. "The amount of stuff it has contained within it is both wonderful and awful at the same time."
-
-Stallman's AI Lab contemporaries are more charitable. Hal Abelson, an MIT grad student who worked with Sussman during the 1970sand would later assist Stallman as a charter board member of the FreeSoftware Foundation, describes Emacs as "an absolutely brilliant creation." In giving programmers a way to add new software libraries and features without messing up the system, Abelson says, Stallman paved the way for future large-scale collaborative software projects. "Its structure was robust enough that you'd have people all over the world who were loosely collaborating [and] contributing to it," Abelson says. "I don't know if that had been done before."~{ In writing this chapter, I've elected to focus more on the social significance of Emacs than the software significance. To read more about the software side, I recommend Stallman's 1979 memo. I particularly recommend the section titled "Research Through Development of Installed Tools" (#SEC27). Not only is it accessible to the nontechnical reader, it also sheds light on how closely inter-twined Stallman's political philosophies are with his software-design philosophies. A sample excerpt follows:EMACS could not have been reached by a process of careful design, because such processes arrive only at goals which are visible at the outset, and whose desirability is established on the bottom line at the outset. Neither I nor anyone else visualized an extensible editor until I had made one, nor appreciated its value until he had experienced it. EMACS exists because I felt free to make individually useful small improvements on a path whose end was not in sight. }~
-={Abelson, Hal}
-
-Guy Steele expresses similar admiration. Currently a research scientist for Sun Microsystems, he remembers Stallman primarily as a "brilliant programmer with the ability to generate large quantities of relatively bug-free code." Although their personalities didn't exactly mesh, Steele and Stallman collaborated long enough for Steele to get a glimpse of Stallman's intense coding style. He recalls a notable episode in the late 1970s when the two programmers banded together to write the editor's "pretty print" feature. Originally conceived by Steele, pretty print was another keystroke-triggered feature that reformatted Emacs' source code so that it was both more readable and took up less space, further bolstering the program's WYSIWYG qualities. The feature was strategic enough to attract Stallman's active interest, and it wasn't long before Steele wrote that he and Stallman were planning an improved version.
-={Steele, Guy+3;Sun Microsystems}
-
-"We sat down one morning," recalls Steele. "I was at the keyboard, and he was at my elbow," says Steele. "He was perfectly willing to let me type, but he was also telling me what to type.
-
-The programming session lasted 10 hours. Throughout that entire time, Steele says, neither he nor Stallman took a break or made any small talk. By the end of the session, they had managed to hack the pretty print source code to just under 100 lines. "My fingers were on the keyboard the whole time," Steele recalls, "but it felt like both of our ideas were flowing onto the screen. He told me what to type, and I typed it."
-
-The length of the session revealed itself when Steele finally left the AI Lab. Standing outside the building at 545 Tech Square, he was surprised to find himself surrounded by nighttime darkness. Asa programmer, Steele was used to marathon coding sessions. Still, something about this session was different. Working with Stallman had forced Steele to block out all external stimuli and focus his entire mental energies on the task at hand. Looking back, Steele says he found the Stallman mind-meld both exhilarating and scary at the same time. "My first thought afterward was [that] it was a great experience, very intense, and that I never wanted to do it again in my life."
-
-1~ Chapter 7 - A Stark Moral Choice
-={Stallman, Richard M.:GNU Project+72}
-
-On September 27, 1983, computer programmers logging on to the Usenet newsgroup net.unix-wizards encountered an unusual message. Posted in the small hours of the morning, 12:30 a.m. to be exact, and signed by rms@mit-oz, the message's subject line was terse but attention-grabbing. "New UNIX implementation," it read. Instead of introducing a newly released version of Unix, however, the message's opening paragraph issued a call to arms:
-={GNU Project:new UNIX implementation;net.unix-wizards newsgroup}
-
-_1 Starting this Thanksgiving I am going to write a complete Unix-compatible software system called GNU (for Gnu's Not Unix), and give it away free to everyone who can use it. Contributions of time, money, programs and equipment are greatly needed.~{ See Richard Stallman, "Initial GNU Announcement" (September 1983). }~
-={Unix operating system:GNU system and}
-
-To an experienced Unix developer, the message was a mixture of idealism and hubris. Not only did the author pledge to rebuild the already mature Unix operating system from the ground up, he also proposed to improve it in places. The new GNU system, the author predicted, would carry all the usual components - a text editor, a shell program to run Unix-compatible applications, a compiler, "and a few other things."~{ Ibid. }~ It would also contain many enticing features that other Unix systems didn't yet offer: a graphic user interface based on the Lisp programming language, a crash-proof file system, and networking protocols built according to MIT's internal networking system.
-={LISP programming language:GNU system and}
-
-"GNU will be able to run Unix programs, but will not be identical to Unix," the author wrote. "We will make all improvements that are convenient, based on our experience with other operating systems."
-
-Anticipating a skeptical response on some readers' part, the author made sure to follow up his operating-system outline with a brief biographical sketch titled, "Who am I?":
-
-_1 I am Richard Stallman, inventor of the original much-imitated EMACS editor, now at the Artificial Intelligence Lab at MIT. I have worked extensively on compilers, editors, debuggers, command interpreters, the Incompatible Timesharing System and the Lisp Machine operating system. I pioneered terminal-independent display support in ITS. In addition I have implemented one crash proof file system and two window systems for Lisp machines.~{ Ibid. }~
-
-As fate would have it, Stallman's fanciful GNU Project missed its Thanksgiving launch date. By January, 1984, however, Stallman made good on his promise and fully immersed himself in the world of Unix software development. For a software architect raised on ITS, it was like designing suburban shopping malls instead of Moorish palaces. Even so, building a Unix-like operating system had its hidden advantages. ITS had been powerful, but it also possessed an Achilles' heel: MIT hackers had written it specifically to run on the powerful DEC-built PDP-10 computer. When AI Lab administrators elected to phase out the lab's PDP-10 machine in the early 1980s, the operating system that hackers once likened to a vibrant city became an instant ghost town. Unix, on the other hand, was designed for portability, which made it immune to such dangers. Originally developed by junior scientists at AT&T, the program had slipped out under corporate-management radar, finding a happy home in the cash-strapped world of academic computer systems. With fewer resources than their MIT brethren, Unix developers had customized the software to ride atop a motley assortment of hardware systems, primarily the 16-bit PDP-11 - a machine considered fit for only small tasks by most AI Lab hackers - but later also 32-bit mainframes such as the VAX 11/780. By 1983, a few companies, most notably Sun Microsystems, were developing a more powerful generation of desktop computers, dubbed "workstations," to take advantage of that increasingly ubiquitous operating system on machines comparable in power to the much older PDP-10.
-={AT&T;Incompatible Timesharing System (ITS)+5;VAX 11/780;PDP-10 computer;PDP-11 computer;Sun Microsystems:developing workstations}
-
-To facilitate portability, the developers of Unix had put an extra layer of abstraction between the software and the machine. Rather than writing it in the instructions of a specific machine type - as the AI Lab hackers had done with ITS and the PDP-10 - Unix developers wrote in a high-level language, called C. Focusing more on the inter-locking interfaces and specifications that held the operating system's many subcomponents together, rather than the actual components themselves, they created a system that could be quickly modified to run on any machine. If a user disliked a certain component, the interface specifications made it possible to pull out an individual subcomponent and either fix it or replace it with something better. Simply put, the Unix approach promoted flexibility and economy, hence its rapid adoption.~{ See Marshall Kirk McKusick, "Twenty Years of Berkeley Unix," Open Sources (O'Reilly & Associates, Inc., 1999): 38. }~
-={abstraction:designing Unix;Unix operating system:adoption through flexibility}
-
-Stallman's decision to start developing the GNU system was triggered by the end of the ITS system that the AI Lab hackers had nurtured for so long. The demise of ITS, and the AI Lab hacker community which had sustained it, had been a traumatic blow to Stallman. If the Xerox laser printer episode had taught him to recognize the in- justice of proprietary software, the community's death forced him to choose between surrendering to proprietary software and opposing it.
-={AI Lab (Artificial Intelligence Laboratory):ITS demise+3}
-
-Like the software code that composed it, the roots of ITS' demise stretched way back. By 1980, most of the lab's hackers were working on developing the Lisp Machine and its operating system.
-
-Created by artificial-intelligence research pioneer John McCarthy, a MIT artificial-intelligence researcher during the late 1950s, Lisp is an elegant language, well-suited for writing complex programs to operate on data with irregular structure. The language's name is a shortened version of LISt Processing. Following McCarthy's departure to the Stanford Artificial Intelligence Laboratory, MIT hackers refined the language into a local dialect dubbed MACLISP. The "MAC" stood for Project MAC, the DARPA-funded research project that gave birth to the AI Lab and the Laboratory for Computer Science. Led by AI Labarch-hacker Richard Greenblatt, the AI Lab hackers during the late 1970s designed a computer specialized for running Lisp efficiently and conveniently, the Lisp Machine, then developed an entire Lisp-based operating system for it.
-
-By 1980, two rival groups of hackers had formed two companies to manufacture and sell copies of the Lisp Machine. Greenblatt started Lisp Machines Incorporated. He planned to avoid outside investment and make a "hacker company." Most of the hackers joined Symbolics, a conventional startup. In 1982 they entirely ceased to work at MIT.
-
-With few hackers left to mind the shop, programs and machines took longer to fix - or were not fixed at all. Even worse, Stallman says, the lab began to undergo a "demographic change." The hackers who had once formed a vocal minority within the AI Lab were almost gone while "the professors and the students who didn't really love the [PDP-10] were just as numerous as before."~{ See Richard Stallman (1986). }~
-={PDP-10 computer+4}
-
-In 1982, the AI Lab received the replacement for its main computer, the PDP-10, which was over 12 years old. Digital's current model, the Dec system 20, was compatible for user programs but would have re-quired a drastic rewrite or "port" of ITS if hackers wanted to continue running the same operating system. Fearful that the lab had lost its critical mass of in-house programming talent, AI Lab faculty members pressed for Twenex, a commercial operating system developed by Digital. Outnumbered, the hackers had no choice but to comply.
-
-"Without hackers to maintain the system, [faculty members] said,'We're going to have a disaster; we must have commercial software,'" Stallman would recall a few years later. "They said, 'We can expect the company to maintain it.' It proved that they were utterly wrong, but that's what they did."~{ Ibid. }~
-
-At first, hackers viewed the Twenex system as yet another authoritarian symbol begging to be subverted. The system's name itself was a protest. Officially dubbed TOPS-20 by DEC, it was named as a successor to TOPS-10, a proprietary operating system DEC distributed for the PDP-10. But TOPS-20 was not based on TOPS-10. It was derived from the Tenex system which Bolt Beranek Newmanhad developed for the PDP-10.~{ Multiple sources: see Richard Stallman interview, Gerald Sussman email, and Jargon File 3.0.0 at \\ http://catb.org/jargon/html/T/TWENEX.html. }~ Stallman, the hacker who coined the Twenex term, says he came up with the name as a way to avoid using the TOPS-20 name. "The system was far from tops, so there was noway I was going to call it that," Stallman recalls. "So I decided to insert a 'w' in the Tenex name and call it Twenex."
-={DEC (Digital Equipment Corporation);TOPS-20 operating system+1;KL-10 mainframe+11;Twenex operating systems+4}
-
-{free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png 302x203 "PDP-1 processor with KL-10 (a PDP-10 similar to that of the AI Lab), Stanford Artificial Intelligence Laboratory, 1979." }http://en.wikipedia.org/wiki/Richard_stallman
-
-The machine that ran the Twenex/TOPS-20 system had its own derisive nickname: Oz. According to one hacker legend, the machine got its nickname because it required a smaller PDP-11 machine to power its terminal. One hacker, upon viewing the KL-10-PDP-11setup for the first time, likened it to the wizard's bombastic on screen introduction in the Wizard of Oz. "I am the great and powerful Oz," the hacker intoned. "Pay no attention to the PDP-11 behind that console."~{ See http://www.as.cmu.edu/~geek/humor/See_Figure_1.txt. }~
-={Oz+8;PDP-11 computer}
-
-If hackers laughed when they first encountered the KL-10, their laughter quickly died when they encountered Twenex. Not only did Twenex boast built-in security, but the system's software engineers had designed the tools and applications with the security system in mind. What once had been a cat-and-mouse game over passwords in the case of the Laboratory for Computer Science's security system, now became an out-and-out battle over system management. System administrators argued that without security, the Oz system was more prone to accidental crashes. Hackers argued that crashes could be better prevented by overhauling the source code. Unfortunately, the number of hackers with the time and inclination to perform this sort of overhaul had dwindled to the point that the system-administrator argument prevailed.
-={security (computer), opposition to:Twenex operating systems and}
-
-The initial policy was that any lab member could have the "wheel privilege" to bypass security restrictions. But anyone who had the "wheel privilege" could take it away from anyone else, who would then be powerless to restore it. This state of affairs tempted a small group of hackers to try to seize total control by canceling the "wheel privilege" for all but themselves.
-
-Cadging passwords, and applying the debugger during startup, Stallman successfully foiled these attempts. After the second foiled" /{coup d'état}/," Stallman issued an alert to all the AI Lab personnel.~{ See Richard Stallman (1986). }~
-
-"There has been another attempt to seize power," Stallman wrote. "So far, the aristocratic forces have been defeated." To protect his identity, Stallman signed the message "Radio Free OZ."
-
-The disguise was a thin one at best. By 1982, Stallman's aversion to passwords and secrecy had become so well known that users outside the AI Laboratory were using his account from around the ARPAnet - the research-funded computer network that would serve as a foundation for today's Internet. One such "tourist" during the early 1980s was Don Hopkins, a California programmer who learned through the hacking grapevine that all an outsider needed to do to gain access to MIT's vaunted ITS system was to log in under the initials RMS and enter the same three-letter monogram when the system requested a password.
-={ARPAnet+2;Hopkins, Don}
-
-"I'm eternally grateful that MIT let me and many other people use their computers for free," says Hopkins. "It meant a lot to many people."
-
-This so-called "tourist" policy, which had been openly tolerated by MIT management during the ITS years,~{ See "MIT AI Lab Tourist Policy," \\ http://www.art.net/~hopkins/Don/text/tourist-policy.html. }~ fell by the wayside when Oz became the lab's primary link to the ARPAnet. At first, Stallman continued his policy of repeating his login ID as a password so outside users could have access through his account. Over time, however, Oz's fragility prompted administrators to bar outsiders who, through sheer accident or malicious intent, might bring down the system. When those same administrators eventually demanded that Stall-man stop publishing his password, Stallman, citing personal ethics, instead ceased using the Oz system altogether.~{ See Richard Stallman (1986). }~
-
-"[When] passwords first appeared at the MIT AI Lab I [decided] to follow my belief that there should be no passwords," Stallman would later say. "Because I don't believe that it's really desirable to have security on a computer, I shouldn't be willing to help uphold the security regime."~{ Ibid. }~
-
-Stallman's refusal to bow before the great and powerful Oz symbolized the growing tension between hackers and AI Lab management during the early 1980s. This tension paled in comparison to the conflict that raged within the hacker community itself. By the time the Dec system 20 arrived, the hacker community was divided into two camps, LMI and Symbolics.
-={Symbolics+15;LISP programming language+1}
-
-Symbolics, with its outside investment, recruited various AI Lab hackers and set some of them working on improving parts of the Lisp Machine operating system outside the auspices of the AI Lab. By the end of 1980, the company had hired 14 AI Lab staffers as part-time consultants to develop its version of the Lisp Machine. The remaining few, apart from Stallman, worked for LMI.~{ See Steve Levy, Hackers, page 423. }~ Stallman, preferring the unpressured life at the AI Lab and not wishing to take a side, chose to join neither company.
-={AI Lab (Artificial Intelligence Laboratory):Symbolics and+10}
-
-At first, the other hackers continued spending some of their time at MIT, and contributed to MIT's Lisp Machine operating system. Both LMI and Symbolics had licensed this code from MIT. The license required them to return their changes to MIT, but did not require them to let MIT redistribute these changes. However, through 1981 they adhered to a gentleman's agreement to permit that, so all their system improvements were included in the MIT version and thus shared with all Lisp Machine users. This situation allowed those still at MIT to remain neutral.
-
-On March 16, 1982, a date Stallman remembers well because it was his birthday, Symbolics executives ended the gentleman's agreement. The motive was to attack LMI. LMI had fewer hackers, and fewer staff in general, so the Symbolics executives thought that LMI was getting the main benefit of sharing the system improvements. By ending the sharing of system code, they hoped to wipe out LMI. So they decided to enforce the letter of the license. Instead of contributing their improvements to the MIT version of the system, which LMI could use, they provided MIT with a copy of the Symbolics version of the system for users at MIT to run. Anyone using it would provide the service of testing only to Symbolics, and if he made improvements, most likely they too would only be useful for Symbolics.
-
-As the person responsible (with help from Greenblatt for the first couple of months) for keeping up the lab's Lisp Machine system, Stallman was incensed. The Symbolics hackers had left the system code with hundreds of half-made changes that caused errors. Viewing this announcement as an "ultimatum," he retaliated by disconnecting Symbolics' microwave communications link to the laboratory. He then vowed never to work on a Symbolics machine, and pledged to continue the development of MIT's system so as to defend LMI from Symbolics. "The way I saw it, the AI Lab was a neutral country, like Belgium in World War II," Stallman says. "If Germany invades Belgium, Belgium declares war on Germany and sides with Britain and France."
-% ={DARPA;Greenblat, Richard;LISP programming language:operating system for+4;MACLISP language;McCarthy, John;Project MAC;Stanford Artificial Intelligence Laboratory}
-
-When Symbolics executives noticed that their latest features were still appearing in the MIT Lisp Machine system and, by extension, the LMI Lisp machine, they were not pleased. Stallman knew what copyright law required, and was rewriting the features from scratch.He took advantage of the opportunity to read the source code Symbolics supplied to MIT, so as to understand the problems and fixes, and then made sure to write his changes in a totally different way. But the Symbolics executives didn't believe this. They installed a "spy" program on Stallman's computer terminal looking for evidence against him. However, when they took their case to MIT administration, around the start of 1983, they had little evidence to present: a dozen places in the sources where both versions had been changed and appeared similar.
-={Brain Makers: Genius, Ego, and Greed in the Quest for Machines that Think, The Newquist;Newquist, Harvey}
-
-When the AI Lab administrators showed Stallman Symbolics' supposed evidence, he refuted it, showing that the similarities were actually held over from before the fork. Then he turned the logic around:if, after the thousands of lines he had written, Symbolics could produce no better evidence than this, it demonstrated that Stallman's diligent efforts to avoid copying were effective. The AI Lab approved Stallman's work, which he continued till the end of 1983.~{ The Brain Makers by H. P. Newquist says inaccurately that the AI Lab told Stallman to stay away from the Lisp Machine project. }~
-
-Stallman did make a change in his practices, though. "Just to be ultra safe, I no longer read their source code [for new features and major changes]. I used only the documentation and wrote the code from that." For the biggest new features, rather than wait for Symbolics to release documentation, he designed them on his own; later, when the Symbolics documentation appeared, he added compatibility with Symbolics' interface for the feature. Then he read Symbolics' source code changes to find minor bugs they had fixed, and fixed each of them differently.
-
-The experience solidified Stallman's resolve. As Stallman designed replacements for Symbolics' new features, he also enlisted members of the AI Lab to keep using the MIT system, so as to provide a continuous stream of bug reports. MIT continued giving LMI direct access to the changes. "I was going to punish Symbolics if it was the last thing I did," Stallman says. Such statements are revealing. Not only do they shed light on Stallman's non pacifist nature, they also reflect the intense level of emotion triggered by the conflict.
-
-The level of despair owed much to what Stallman viewed as the "destruction" of his "home" - i.e., the demise of the AI Lab's close-knit hacker subculture. In a later email interview with Levy, Stall-man would liken himself to the historical figure Ishi, the last surviving member of the Yahi, a Pacific Northwest tribe wiped out during the Indian wars of the 1860s and 1870s. The analogy casts Stallman's survival in epic, almost mythical, terms.~{ Steven Levy in Hackers had this period in mind when he described Stallman as the "last of the true hackers," but his intended meaning was not what you might think. Levy used the term "true hackers" to distinguish the MIT hacker community from two other hacker communities described later in the book, to which he gave other names. When this community had dissolved, leaving only Stallman, he therefore became the last of the "true hackers." Levy did not mean that nobody else was truly a hacker, but people tend to interpret his words that way, especially those who see them without reading the explanations in Levy's book. Stallman has never described himself using those words of Levy's. }~ The hackers who worked for Symbolics saw it differently. Instead of seeing Symbolics as an ex-terminating force, many of Stallman's colleagues saw it as a belated bid for relevance. In commercializing the Lisp Machine, the company pushed hacker principles of engineer-driven software design out of the ivory-tower confines of the AI Lab and into the corporate market place where manager-driven design principles held sway. Rather than viewing Stallman as a holdout, many hackers saw him as the representative of an obsolete practice.
-={Ishi;Yahi}
-
-Personal hostilities also affected the situation. Even before Symbolics hired away most of the AI Lab's hacker staff, Stallman says many of the hackers who later joined Symbolics were shunning him. "I was no longer getting invited to go to Chinatown," Stallman recalls. "The custom started by Greenblatt was that if you went out to dinner, you went around or sent a message asking anybody at the lab if they also wanted to go. Sometime around 1980-1981, I stopped getting asked. They were not only not inviting me, but one person later confessed that he had been pressured to lie to me to keep their going away to dinner without me a secret."
-={Greenblat, Richard}
-
-Although Stallman felt hurt by this petty form of ostracism, there was nothing to be done about it. The Symbolics ultimatum changed the matter from a personal rejection to a broader injustice. When Symbolics excluded its source changes from redistribution, as a means to defeat its rival, Stallman determined to thwart Symbolics' goal. By holing up in his MIT offices and writing equivalents for each new software feature and fix, he gave users of the MIT system, including LMI customers, access to the same features as Symbolics users.
-
-It also guaranteed Stallman's legendary status within the hacker community. Already renowned for his work with Emacs, Stallman's ability to match the output of an entire team of Symbolics programmers - a team that included more than a few legendary hackers itself - still stands as one of the major human accomplishments of the Information Age, or of any age for that matter. Dubbing it a "master hack" and Stallman himself a "virtual John Henry of computer code," author Steven Levy notes that many of his Symbolics-employed rivals had no choice but to pay their idealistic former comrade grudging respect. Levy quotes Bill Gosper, a hacker who eventually went to work for Symbolics in the company's Palo Alto office, expressing amazement over Stallman's output during this period:
-={Gosper, Bill}
-
-_1 I can see something Stallman wrote, and I might decide it was bad (probably not, but somebody could convince me it was bad), and I would still say, "But wait a minute - Stallman doesn't have anybody to argue with all night over there. He's working alone! It's incredible anyone could do this alone!"~{ See Steven Levy, Hackers (Penguin USA [paperback], 1984): 426 }~
-
-For Stallman, the months spent playing catch up with Symbolics evoke a mixture of pride and profound sadness. As a dyed-in-the-wool liberal whose father had served in World War II, Stallman is no pacifist. In many ways, the Symbolics war offered the rite of passage toward which Stallman had been careening ever since joining the AI Lab staff a decade before. At the same time, however, it coincided with the traumatic destruction of the AI Lab hacker culture that had nurtured Stallman since his teenage years. One day, while taking a break from writing code, Stallman experienced a traumatic moment passing through the lab's equipment room. There, Stallman encountered the hulking, unused frame of the PDP-10 machine. Startled by the dormant lights, lights that once actively blinked out a silent code indicating the status of the internal program, Stallman says the emotional impact was not unlike coming across a beloved family member's well-preserved corpse.
-={PDP-10 computer}
-
-"I started crying right there in the machine room," he says. "Seeing the machine there, dead, with nobody left to fix it, it all drove home how completely my community had been destroyed."
-
-Stallman would have little opportunity to mourn. The Lisp Ma-chine, despite all the furor it invoked and all the labor that had gone into making it, was merely a sideshow to the large battles in the technology marketplace. The relentless pace of computer miniaturization was bringing in newer, more powerful microprocessors that would soon incorporate the machine's hardware and software capabilities like a modern metropolis swallowing up an ancient desert village.
-
-Riding atop this microprocessor wave were hundreds - thousands- of proprietary software programs, each protected by a patchwork of user licenses and nondisclosure agreements that made it impossible for hackers to review or share source code. The licenses were crude and ill-fitting, but by 1983 they had become strong enough to satisfy the courts and scare away would-be interlopers. Software, once a form of garnish most hardware companies gave away to make their expensive computer systems more flavorful, was quickly becoming the main dish. In their increasing hunger for new games and features, users were putting aside the traditional demand to review the recipe after every meal.
-
-Nowhere was this state of affairs more evident than in the realm of personal computer systems. Companies such as Apple Computer and Commodore were minting fresh millionaires selling machines with built-in operating systems. Unaware of the hacker culture and its distaste for binary-only software, many of these users saw little need to protest when these companies failed to attach the accompanying source-code files. A few anarchic adherents of the hacker ethic helped propel that ethic into this new marketplace, but for the most part, the marketplace rewarded the programmers speedy enough to write new programs and savvy enough to write End User License Agreements to lock them up tight.
-={Apple Computers; Commodore computers;software+10}
-
-One of the most notorious of these programmers was Bill Gates, a Harvard dropout two years Stallman's junior. Although Stallman didn't know it at the time, seven years before sending out his message to the net.unix-wizards newsgroup, Gates, a budding entrepreneur and general partner with the Albuquerque-based software firm Micro-Soft, later spelled as Microsoft, had sent out his own open letter to the software-developer community. Written in response to the PC users copying Micro-Soft's software programs, Gates' "Open Letter to Hobbyists" had excoriated the notion of communal software development.
-={Gates, Bill+2;Micro-Soft;net.unix-wizards newsgroup;Open Letter to Hobbyists (Gates)+1}
-
-"Who can afford to do professional work for nothing?" asked Gates. "What hobbyist can put three man-years into programming, finding all bugs, documenting his product, and distributing it for free?"~{ See Bill Gates, "An Open Letter to Hobbyists" (February 3, 1976). To view an online copy of this letter, \\ go to http://en.wikipedia.org/wiki/Open_Letter_to_Hobbyists. }~
-
-Although few hackers at the AI Lab saw the missive, Gates' 1976 letter nevertheless represented the changing attitude toward software both among commercial software companies and commercial software developers. Why treat software as a zero-cost commodity when the market said otherwise? As the 1970s gave way to the 1980s, selling software became more than a way to recoup costs; it became a political statement. At a time when the Reagan Administration was rushing to dismantle many of the federal regulations and spending programs that had been built up during the half century following the Great Depression, more than a few software programmers saw the hacker ethic as anticompetitive and, by extension, un-American. At best, it was a throwback to the anti-corporate attitudes of the late 1960s and early 1970s. Like a Wall Street banker discovering an old tie-dyed shirt hiding between French-cuffed shirts and double-breasted suits, many computer programmers treated the hacker ethic as an embarrassing reminder of an idealistic age.
-
-For a man who had spent the entire 1960s as a throwback to the 1950s, Stallman didn't mind living out of step with his peers. As a programmer used to working with the best machines and the best software, however, Stallman faced what he could only describe as a "stark moral choice": either swallow his ethical objection for "proprietary" software - the term Stallman and his fellow hackers used to describe any program that carried copyright terms or an end-user license that restricted copying and modification - or dedicate his life to building an alternate, non-proprietary system of software programs. After his two-year battle with Symbolics, Stallman felt confident enough to undertake the latter option. "I suppose I could have stopped working
-={proprietary software+3}
-
-on computers altogether," Stallman says. "I had no special skills, but I'm sure I could have become a waiter. Not at a fancy restaurant, probably, but I could've been a waiter somewhere."
-
-Being a waiter - i.e., dropping out of programming altogether -would have meant completely giving up an activity, computer programming, that had given him so much pleasure. Looking back on his life since moving to Cambridge, Stallman finds it easy to identify lengthy periods when software programming provided the only pleasure. Rather than drop out, Stallman decided to stick it out.
-
-An Atheist, Stallman rejects notions such as fate, karma, or a divine calling in life. Nevertheless, he does feel that the decision to shun proprietary software and build an operating system to help others do the same was a natural one. After all, it was Stallman's own personal combination of stubbornness, foresight, and coding virtuosity that led him to consider a fork in the road most others didn't know existed. In his article, "The GNU Project," Stallman affirms agreement with the ideals encapsulated in the words of the Jewish sage Hillel:
-={Hillel+1;Open Sources (DiBona, et al)+1}
-
-% ### group --> ? compare earlier version
-
-_1 If I am not for myself, who will be for me? If I am only for myself, what am I? If not now, when?~{ See http://www.gnu.org/gnu/the-gnu-project.html. Stallman adds his own footnote to this statement, writing, "As an Atheist, I don't follow any religious leaders, but I sometimes find I admire something one of them has said. }~
-
-Speaking to audiences, Stallman avoids the religious route and ex-presses the decision in pragmatic terms. "I asked myself: what could I, an operating-system developer, do to improve the situation? It wasn't until I examined the question for a while that I realized an operating-system developer was exactly what was needed to solve the problem."
-
-Once he recognized that, Stallman says, everything else "fell into place." In 1983, MIT was acquiring second-generation Lisp Machines from Symbolics, on which the MIT Lisp Machine system could not possibly run. Once most of the MIT machines were replaced, he would be unable to continue maintaining that system effectively for lack of users' bug reports. He would have to stop. But he also wanted to stop. The MIT Lisp Machine system was not free software: even though users could get the source code, they could not redistribute it freely. Meanwhile, the goal of continuing the MIT system had already been achieved: LMI had survived and was developing software on its own.
-
-Stallman didn't want to spend his whole life punishing those who had destroyed his old community. He wanted to build a new one. He decided to denounce software that would require him to compromise his ethical beliefs, and devote his life to the creation of programs that would make it easier for him and others to escape from it. Pledging to build a free software operating system "or die trying - of old age, of course," Stallman quips, he resigned from the MIT staff in January, 1984, to build GNU.
-
-The resignation distanced Stallman's work from the legal auspices of MIT. Still, Stallman had enough friends and allies within the AI Lab to continue using the facilities, and later his own office. He also had the ability to secure outside consulting gigs to underwrite the early stages of the GNU Project. In resigning from MIT, however, Stallman negated any debate about conflict of interest or Institute ownership of the software. The man whose early adulthood fear of social isolation had driven him deeper and deeper into the AI Lab's embrace was now building a legal firewall between himself and that environment.
-={GNU Project}
-
-For the first few months, Stallman operated in isolation from the Unix community as well. Although his announcement to the net.unix-wizards group had attracted sympathetic responses, few volunteers signed on to join the crusade in its early stages.
-={net.unix-wizards newsgroup}
-
-"The community reaction was pretty much uniform," recalls Rich Morin, leader of a Unix user group at the time. "People said, 'Oh, that's a great idea. Show us your code. Show us it can be done.'"
-
-Aware that the job was enormous, Stallman decided to try to reuse existing free software wherever possible. So he began looking for existing free programs and tools that could be converted into GNU programs and tools. One of the first candidates was a compiler named VUCK, which converted programs written in the popular C programming language into machine-runnable code. Translated from the Dutch, the program's acronym stood for the Free University Compiler Kit. Optimistic, Stallman asked the program's author if the program was free. When the author informed him that the words "Free University" were a reference to the Vrije Universiteit in Amsterdam, and that the program was not free, Stallman was chagrined.
-
-"He responded derisively, stating that the university was free but the compiler was not," recalls Stallman. He had not only refused to help - he suggested Stallman drop his plan to develop GNU, and instead write some add-ons to boost sales of VUCK, in return for a share of the profits. "I therefore decided that my first program for the GNU Project would be a multi-language, multi-platform compiler."
-19~{ See Richard Stallman, "The GNU Operating System and the Free Software Movement," Open Sources (O'Reilly & Associates, Inc., 1999): 65. }~
-
-Instead of VUCK, Stallman found the Pastel compiler ("off-color Pascal"), written by programmers at Lawrence Livermore National Lab. According to what they said when they gave him a copy, the compiler was free to copy and modify. Unfortunately, the program was unsuitable for the job, because its memory requirements were enormous. It parsed the entire input file in core memory, then retained all the internal data until it finished compiling the file. On mainframe systems this design had been forgivable. On Unix systems it was a crippling barrier, since even 32-bit machines that ran Unix were often unable to provide so much memory to a program. Stallman made substantial progress at first, building a C-compatible front end to the compiler and testing it on the larger Vax, whose system could handle large memory spaces. When he tried porting the system to the 68010, and investigated why it crashed, he discovered the memory size problem, and concluded he would have to build a totally new compiler from scratch. Stallman eventually did this, producing the GNU C Compiler or GCC. But it was not clear in 1984 what to do about the compiler, so he decided to let those plans gel while turning his attention to other parts of GNU.
-={C programming language:VUCK compiler for;VUCK compiler}
-
-In September of 1984, thus, Stallman began development of a GNU version of Emacs, the replacement for the program he had been supervising for a decade. Within the Unix community, the two native editor programs were vi, written by Sun Microsystems co-founder Bill Joy, and ed, written by Bell Labs scientist (and Unix co-creator) Ken Thompson. Both were useful and popular, but neither offered the endlessly expandable nature of Emacs.
-={Bell Labs;Emacs text editor:rewriting for Unix+2;GNU Emacs:rewriting for Unix+2;Joy, Bill;vi text editor;Thompson, Ken}
-
-Looking back, Stallman says he didn't view the decision in strategic terms. "I wanted an Emacs, and I had a good opportunity to develop one."
-
-Once again, Stallman had found existing code with which he hoped to save time. In writing a Unix version of Emacs, Stallman was soon following the footsteps of Carnegie Mellon graduate student James Gosling, author of a C-based version dubbed Gosling Emacs or Gosmacs. Gosling's version of Emacs included an interpreter for a simplified offshoot of the Lisp language, called Mocklisp. Although Gosling had put Gosmacs under copyright and had sold the rights to UniPress, a privately held software company, Stallman received the assurances of a fellow developer who had participated in early Gosmacs development. According to the developer, Gosling, while a Ph.D. student at Carnegie Mellon, had given him permission by email to distribute his own version of Gosmacs in exchange for his contribution to the code.
-={Carnegie Mellon University;Gosling, James+3;GOSMACS (Gosling Emacs);interpreters for LISP+1;LISP programming language:EMACS and+1;MOCKLISP language;UniPress software company+1}
-
-At first Stallman thought he would change only the user-level commands, to implement full compatibility with the original PDP-10Emacs. However, when he found how weak Mocklisp was in comparison with real Lisp, he felt compelled to replace it with a true Lisp system. This made it natural to rewrite most of the higher-level code of Gosmacs in a completely different way, taking advantage of the greater power and flexible data structures of Lisp. By mid-1985, in GNU Emacs as released on the Internet, only a few files still had code remaining from Gosmacs.
-
-Then UniPress caught wind of Stallman's project, and denied that the other developer had received permission to distribute his own version of Gosmacs. He could not find a copy of the old email to defend his claim. Stallman eliminated this problem by writing replacements for the few modules that remained from Gosmacs.
-
-Nevertheless, the notion of developers selling off software rights - indeed, the very notion of developers having such powers to sell in the first place - rankled Stallman. In a 1986 speech at the Swedish Royal Technical Institute, Stallman cited the UniPress incident as yet another example of the dangers associated with proprietary software.
-={proprietary software:Emacs and+4;Swedish Royal Technical Institute}
-
-"Sometimes I think that perhaps one of the best things I could do with my life is find a gigantic pile of proprietary software that was a trade secret, and start handing out copies on a street corner so it wouldn't be a trade secret any more," said Stallman. "Perhaps that would be a much more efficient way for me to give people new free software than actually writing it myself; but everyone is too cowardly to even take it."~{ See Richard Stallman (1986). }~
-
-Despite the stress it generated, the dispute over Gosling's code would assist both Stallman and the free software movement in the longterm. It would force Stallman to address the weaknesses of the Emacs Commune and the informal trust system that had allowed problematic offshoots to emerge. It would also force Stallman to sharpen the free software movement's political objectives. Following the release of GNU Emacs in 1985, Stallman issued /{The GNU Manifesto}/, an expansion of the original announcement posted in September, 1983. Stallman included within the document a lengthy section devoted to the many arguments used by commercial and academic programmers to justify the proliferation of proprietary software programs. One argument, "Don't programmers deserve a reward for their creativity," earned a response encapsulating Stallman's anger over the recent Gosling Emacs episode:
-={Emacs Commune:proprietary software and;Emacs text editor;GNU Emacs;GNU Manifesto}
-
-"If anything deserves a reward, it is social contribution," Stallman wrote. "Creativity can be a social contribution, but only in so far [ sic ] as society is free to use the results. If programmers deserve to be rewarded for creating innovative programs, by the same token they deserve to be punished if they restrict the use of these programs."~{ See Richard Stallman, The GNU Manifesto (1985), \\ http://www.gnu.org/gnu/ manifesto.html. }~
-
-With the release of GNU Emacs, the GNU Project finally had code to show. It also had the burdens of any software-based enterprise. As more and more Unix developers began playing with the software, money, gifts, and requests for tapes began to pour in. To address the business side of the GNU Project, Stallman drafted a few of his colleagues and formed the Free Software Foundation (FSF), a non-profit organization dedicated to speeding the GNU Project towards its goal. With Stallman as president and various friends and hacker allies as board members, the FSF helped provide a corporate face for the GNU Project.
-={Free Software Foundation (FSF):GNU Project and;GNU Project:Emacs, release of}
-
-Robert Chassell, a programmer then working at Lisp Machines, Inc., became one of five charter board members at the Free Software Foundation following a dinner conversation with Stallman. Chassell also served as the organization's treasurer, a role that started small but quickly grew.
-={Chassell, Robert+6;LISP Machines Inc. (LMI);LMI (LISP Machines Inc.)}
-
-"I think in '85 our total expenses and revenue were something in the order of $23,000, give or take," Chassell recalls. "Richard had his office, and we borrowed space. I put all the stuff, especially the tapes, under my desk. It wasn't until sometime later LMI loaned us some space where we could store tapes and things of that sort."
-
-In addition to providing a face, the Free Software Foundation provided a center of gravity for other disenchanted programmers. The Unix market that had seemed so collegial even at the time of Stallman's initial GNU announcement was becoming increasingly competitive. In an attempt to tighten their hold on customers, companies were starting to deny users access to Unix source code, a trend that only speeded the number of inquiries into ongoing GNU software projects.
-
-The Unix wizards who once regarded Stallman as a noisy kook were now beginning to see him as a software prophet or a software Cassandra, according as they felt hope or despair over escaping the problem she identified.
-
-"A lot of people don't realize, until they've had it happen to them, how frustrating it can be to spend a few years working on a software program only to have it taken away," says Chassell, summarizing the feelings and opinions of the correspondents writing in to the FSF during the early years. "After that happens a couple of times, you start to say to yourself, 'Hey, wait a minute.'"
-
-For Chassell, the decision to participate in the Free Software Foundation came down to his own personal feelings of loss. Prior to LMI, Chassell had been working for hire, writing an introductory book on Unix for Cadmus, Inc., a Cambridge-area software company. When Cadmus folded, taking the rights to the book down with it, Chassell says he attempted to buy the rights back with no success.
-
-"As far as I know, that book is still sitting on a shelf somewhere, unusable, uncopyable, just taken out of the system," Chassell says. "It was quite a good introduction if I may say so myself. It would have taken maybe three or four months to convert [the book] into a perfectly usable introduction to GNU/Linux today. The whole experience, aside from what I have in my memory, was lost."
-
-Forced to watch his work sink into the mire while his erstwhile employer struggled through bankruptcy, Chassell says he felt a hint of the anger that drove Stallman to fits of apoplexy. "The main clarity, for me, was the sense that if you want to have a decent life, you don't want to have bits of it closed off," Chassell says. "This whole idea of having the freedom to go in and to fix something and modify it, whatever it may be, it really makes a difference. It makes one think happily that after you've lived a few years that what you've done is worthwhile. Because otherwise it just gets taken away and thrown out or abandoned or, at the very least, you no longer have any relation to it. It's like losing a bit of your life."
-
-1~ Chapter 8 - St. Ignucius
-={Ignucius, (St.);St. Ignucius}
-
-The Maui High Performance Computing Center is located in a single-story building in the dusty red hills just above the town of Kihei. Framed by million-dollar views and the multi-million dollar real estate of the Silversword Golf Course, the center seems like the ultimate scientific boondoggle. Far from the boxy, sterile confines of Tech Square or even the sprawling research metropolises of Argonne, Illinois and Los Alamos, New Mexico, the MHPCC seems like the kind of place where scientists spend more time on their tans than their post-doctoral research projects.
-={Argonne (Illinois);Los Alamos (New Mexico);Maui High Performance Computing Center (MHPCC);MHPCC (Maui High Performance Computing Center)}
-
-The image is only half true. Although researchers at the MHPCC do take advantage of the local recreational opportunities, they also take their work seriously. According to { Top500.org }http://top500.org, a web site that tracks the most powerful supercomputers in the world, the IBMSP Power3 supercomputer housed within the MHPCC clocks in at 837 billion floating-point operations per second, making it one of 25most powerful computers in the world. Co-owned and operated by the University of Hawaii and the U.S. Air Force, the machine divides its computer cycles between the number crunching tasks associated with military logistics and high-temperature physics research.
-={IBM SP Power3 supercomputer;U.S Air Force;University of Hawaii;Top500.org}
-
-Simply put, the MHPCC is a unique place, a place where the brainy culture of science and engineering and the laid-back culture of the Hawaiian islands coexist in peaceful equilibrium. A slogan on the lab's 2000 web site sums it up: "Computing in paradise."
-
-It's not exactly the kind of place you'd expect to find Richard Stallman, a man who, when taking in the beautiful view of the nearby Maui Channel through the picture windows of a staffer's office, mutters a terse critique: "Too much sun." Still, as an emissary from one computing paradise to another, Stallman has a message to deliver, even if it means subjecting his hacker eyes to painful solar glare.
-
-The conference room is already full by the time I arrive to catch Stallman's speech. The gender breakdown is a little better than at the New York speech, 85% male, 15% female, but not by much. About half of the audience members wear khaki pants and logo-encrusted golf shirts. The other half seems to have gone native. Dressed in the gaudy flower-print shirts so popular in this corner of the world, their faces area deep shade of ochre. The only residual indication of geek status are the gadgets: Nokia cell phones, Palm Pilots, and Sony VAIO laptops.
-
-Needless to say, Stallman, who stands in front of the room dressed in plain blue T-shirt, brown polyester slacks, and white socks, sticks out like a sore thumb. The fluorescent lights of the conference room help bring out the unhealthy color of his sun-starved skin.~{ RMS: The idea that skin can be "sun-starved" or that paleness is "unhealthy"is dangerous misinformation; staying out of the sun can't hurt you as long as you have enough Vitamin D. What damages the skin, and can even kill you, is excessive exposure to sunlight. }~ His beard and hair are enough to trigger beads of sweat on even the coolest Hawaiian neck. Short of having the words "mainlander" tattooed on his forehead, Stallman couldn't look more alien if he tried. [RMS: Is there something bad about looking different from others?]
-
-As Stallman putters around the front of the room, a few audience members wearing T-shirts with the logo of the Maui FreeBSD Users Group (MFUG) race to set up camera and audio equipment. FreeBSD, a free software offshoot of the Berkeley Software Distribution, the venerable 1970s academic version of Unix, is technically a competitor to the GNU/Linux operating system. Still, in the hacking world, Stallman speeches are documented with a fervor reminiscent of the Grateful Dead and its legendary army of amateur archivists. As the local free software heads, it's up to the MFUG members to make sure fellow programmers in Hamburg, Mumbai, and Novosibirsk don't miss out on the latest pearls of RMS wisdom.
-={Berkely Software Distribution (BSD);BSD (Berkely Software Distribution);Grateful Dead, The+1;Maui FreeBSD Users Group}
-
-The analogy to the Grateful Dead is apt. Often, when describing the business opportunities inherent within the free software model, Stallman has held up the Grateful Dead as an example. In refusing to restrict fans' ability to record live concerts, the Grateful Dead became more than a rock group. They became the center of a tribal community dedicated to Grateful Dead music. Over time, that tribal community became so large and so devoted that the band shunned record contracts and supported itself solely through musical tours and live appearances. In 1994, the band's last year as a touring act, the Grateful Dead drew $52 million in gate receipts alone.~{ See "Grateful Dead Time Capsule: 1985-1995 North American Tour Grosses," \\ http://www.dead101.com/1197.htm. }~
-
-While few software companies have been able to match that success, the tribal aspect of the free software community is one reason many in the latter half of the 1990s started to accept the notion that publishing software source code might be a good thing. Hoping to build their own loyal followings, companies such as IBM, Sun Microsystems, and Hewlett Packard have come to accept the letter, if not the spirit, of the Stallman free software message. Describing the GPL as the information-technology industry's /{Magna Carta}/, ZDNet software columnist Evan Leibovitch sees the growing affection for all things GNU as more than just a trend. "This societal shift is letting users take back control of their futures," Leibovitch writes. "Just as the /{Magna Carta}/ gave rights to British subjects, the GPL enforces consumer rights and freedoms on behalf of the users of computer software."~{ See Evan Leibovitch, "Who's Afraid of Big Bad Wolves," /{ZDNet}/ Tech Update (December 15, 2000), \\ http://www.zdnet.com/news/whos-afraid-of-the-big-bad-wolves/298394. }~
-={Hewlett Packard;IBM;Sun Microsystems}
-
-The tribal aspect of the free software community also helps explain why 40-odd programmers, who might otherwise be working on physics projects or surfing the Web for windsurfing buoy reports, have packed into a conference room to hear Stallman speak.
-
-Unlike the New York speech, Stallman gets no introduction. He also offers no self-introduction. When the FreeBSD people finally get their equipment up and running, Stallman simply steps forward, starts speaking, and steamrolls over every other voice in the room.
-={FreeBSD}
-
-"Most of the time when people consider the question of what rules society should have for using software, the people considering it are from software companies, and they consider the question from a self-serving perspective," says Stallman, opening his speech. "What rules can we impose on everybody else so they have to pay us lots of money? I had the good fortune in the 1970s to be part of a community of programmers who shared software. And because of this I always like to look at the same issue from a different direction to ask: what kind of rules make possible a good society that is good for the people who are in it? And therefore I reach completely different answers."
-
-Once again, Stallman quickly segues into the parable of the Xerox laser printer, taking a moment to deliver the same dramatic finger-pointing gestures to the crowd. He also devotes a minute or two to the GNU/Linux name.
-
-"Some people say to me, 'Why make such a fuss about getting credit for this system? After all, the important thing is the job is done, not whether you get recognition for it.' Well, this would be wise advice if it were true. But the job wasn't to build an operating system; the job is to spread freedom to the users of computers. And to do that we have to make it possible to do everything with computers in freedom."~{ For narrative purposes, I have hesitated to go in-depth when describing Stallman's full definition of software "freedom." The GNU Project web site lists four fundamental components: \\ _* The freedom to run the program as you wish, for any purpose (freedom 0). \\ _* The freedom to study the program's source code, and change it so that the program does what you wish (freedom 1). \\ _* The freedom to redistribute copies of the program so you can help your neighbor (freedom 2). \\ _* The freedom to distribute copies of your modified versions, so that the whole community can benefit from them (freedom 3). For more information, please visit "The Free Software Definition" at \\ http://www.gnu.org/philosophy/free-sw.html. }~
-
-Adds Stallman, "There's a lot more work to do."
-
-For some in the audience, this is old material. For others, it's a little arcane. When a member of the golf-shirt contingent starts dozing off, Stallman stops the speech and asks somebody to wake the person up.
-
-"Somebody once said my voice was so soothing, he asked if I was some kind of healer," says Stallman, drawing a quick laugh from the crowd. "I guess that probably means I can help you drift gently into a blissful, relaxing sleep. And some of you might need that. I guess I shouldn't object if you do. If you need to sleep, by all means do."
-
-The speech ends with a brief discussion of software patents, a growing issue of concern both within the software industry and within the free software community. Like Napster, software patents reflect the awkward nature of applying laws and concepts written for the physical world to the frictionless universe of information technology.
-
-Copyright law and patent law work differently, and have totally different effects in the software field. The copyright on a program controls the copying and adaptation of that program's code, and it belongs to the program's developer. But copyright does not cover ideas. In other words, a developer is free, under copyright, to implement in his own code features and commands he has seen in existing programs. Those aspects are ideas, not expression, and thus outside the scope of copyright law.
-
-It is likewise lawful - though hard work - to decode how a binary program works, and then implement the same ideas and algorithms indifferent code. This practice is known as "reverse engineering."
-
-Software patents work differently. According to the U.S. Patent Office, companies and individuals can obtain patents for computing ideas that are innovative (or, at least, unknown to the Patent Office). In theory, this allows the patent-holder to trade off disclosure of the technique for a specific monopoly lasting a minimum of 20 years after the patent filing. In practice, the disclosure is of limited value to the public, since the operation of the program is often self-evident, and could in any case be determined by reverse engineering. Unlike copyright, a patent gives its holder the power to forbid the independent development of software programs which use the patented idea.
-={U.S. Patent Office}
-
-In the software industry, where 20 years can cover the entire life cycle of a marketplace, patents take on a strategic weight. Where companies such as Microsoft and Apple once battled over copyright and the "look and feel" of various technologies, today's Internet companies use patents as a way to stake out individual applications and business models, the most notorious example being Amazon.com's 2000 attempt to patent the company's "one-click" on line shopping process. For most companies, however, software patents have become a defensive tool, with cross-licensing deals balancing one set of corporate patents against another in a tense form of corporate detente. Still, in a few notable cases of computer encryption and graphic imaging algorithms, software vendors have successfully stifled rival developments. For instance, some font-rendering features are missing from free soft-ware because of patent threats from Apple.
-
-For Stallman, the software-patent issue dramatizes the need for eternal hacker vigilance. It also underlines the importance of stressing the political benefits of free software programs over the competitive benefits. Stallman says competitive performance and price, two areas where free software operating systems such as GNU/Linux and FreeBSD already hold a distinct advantage over their proprietary counterparts, are side issues compared to the large issues of user and developer freedom.
-={FreeBSD+2}
-
-This position is controversial within the community: open source advocates emphasize the utilitarian advantages of free software over the political advantages. Rather than stress the political significance of free software programs, open source advocates have chosen to stress the engineering integrity of the hacker development model. Citing the power of peer review, the open source argument paints programs such as GNU/Linux or FreeBSD as better built, better inspected and, by extension, more trustworthy to the average user.
-
-That's not to say the term "open source" doesn't have its political implications. For open source advocates, the term open source serves two purposes. First, it eliminates the confusion associated with the word "free," a word many businesses interpret as meaning "zero cost." Second, it allows companies to examine the free software phenomenon on a technological, rather than ethical, basis. Eric Raymond, co-founder of the Open Source Initiative and one of the leading hackers to endorse the term, explained his refusal to follow Stallman's political path in a 1999 essay, titled "Shut Up and Show Them the Code":
-={OSI (Open Source Initiative);Open Source Initiative (OSI);Raymond, Eric;Shut Up and Show Them the Code (Raymond)+1}
-
-_1 RMS's rhetoric is very seductive to the kind of people we are. We hackers are thinkers and idealists who readily resonate with appeals to "principle" and "freedom" and "rights." Even when we disagree with bits of his program, we want RMS's rhetorical style to work; we think it ought to work; we tend to be puzzled and disbelieving when it fails on the 95% of people who aren't wired like we are.~{ See Eric Raymond, "Shut Up and Show Them the Code," online essay, (June28, 1999), \\ http://www.catb.org/~esr/writings/shut-up-and-show-them.html. }~
-
-Included among that 95%, Raymond writes, are the bulk of business managers, investors, and non-hacker computer users who, through sheer weight of numbers, tend to decide the overall direction of the commercial software marketplace. Without a way to win these people over, Raymond argues, programmers are doomed to pursue their ideology on the periphery of society:
-
-_1 When RMS insists that we talk about "computer users' rights," he's issuing a dangerously attractive invitation to us to repeat old failures. It's one we should reject - not because his principles are wrong, but because that kind of language, applied to software, simply does not persuade anybody but us. In fact, it confuses and repels most people outside our culture.~{ Ibid. }~
-
-Stallman, however, rejects Raymond's premises:
-
-_1 Raymond's attempt to explain our failure is misleading because we have not failed. Our goal is large, and we have a long way to go, but we have also come a long way.
-
-_1 Raymond's pessimistic assertion about the values of non-hackers is an exaggeration. Many non-hackers are more concerned with the political issues we focus on than with the technical advantages that open source emphasizes. This often includes political leaders too, though not in all countries.
-
-_1 It was the ethical ideals of free software, not "better software," which persuaded the presidents of Ecuador and Brazil to move government agencies to free software. They are not geeks, but they understand freedom.
-
-But the principal flaw in the open source argument, according to Stallman, is that it leads to weaker conclusions. It convinces many users to run some programs which are free, but does not offer the many reason to migrate entirely to free software. This partially gives them freedom, but does not teach them to recognize it and value it as such, so they remain likely to let it drop and lose it. For instance, what happens when the improvement of free software is blocked by a patent?
-
-Most open source advocates are equally, if not more, vociferous as Stallman when it comes to opposing software patents. So too are most proprietary software developers, since patents threaten their projects too. However, pointing to software patents' tendency to put areas of software functionality off limits, Stallman contrasts what the free software idea and the open source idea imply about such cases.
-
-"It's not because we don't have the talent to make better software," says Stallman. "It's because we don't have the right. Somebody has prohibited us from serving the public. So what's going to happen when users encounter these gaps in free software? Well, if they have been persuaded by the open source movement that these freedoms are good because they lead to more-powerful reliable software, they're likely to say, 'You didn't deliver what you promised. This software's not more powerful. It's missing this feature. You lied to me.' But if they have come to agree with the free software movement, that the freedom is important in itself, then they will say, 'How dare those people stop me from having this feature and my freedom too.' And with that kind of response, we may survive the hits that we're going to take as these patents explode."
-
-Watching Stallman deliver his political message in person, it is hard to see anything confusing or repellent. Stallman's appearance may seem off-putting, but his message is logical. When an audience member asks if, in shunning proprietary software, free software proponents lose the ability to keep up with the latest technological advancements, Stallman answers the question in terms of his own personal beliefs. "I think that freedom is more important than mere technical advance," he says. "I would always choose a less advanced free program rather than a more advanced non free program, because I won't give up my freedom for something like that [advance]. My rule is, if I can't share it with you, I won't take it."
-
-In the minds of those who assume ethics means religion, such answers reinforce the quasi-religious nature of the Stallman message. However, unlike a Jew keeping kosher or a Mormon refusing to drink alcohol, Stallman is not obeying a commandment, but simply refusing to cede his freedom. His speech explains the practical requisites for doing so: a proprietary program takes away your freedom, so if you want freedom, you need to reject the program.
-
-Stallman paints his decision to use free software in place of proprietary in the color of a personal belief he hopes others will come to share. As software evangelists go, Stallman avoids forcing those beliefs down listeners' throats. Then again, a listener rarely leaves a Stallman speech not knowing where the true path to software righteousness lies.
-
-As if to drive home this message, Stallman punctuates his speech with an unusual ritual. Pulling a black robe out of a plastic grocery bag, Stallman puts it on. Then he pulls out a reflective brown computer disk and places it on his head. The crowd lets out a startled laugh.
-
-"I am St. IGNUcius of the Church of Emacs," says Stallman, raising his right hand in mock-blessing. "I bless your computer, my child."
-={Ignucius, (St.);St. Ignucius}
-
-The laughter turns into full-blown applause after a few seconds. As audience members clap, the computer disk on Stallman's head catches the glare of an overhead light, eliciting a perfect halo effect. In the blink of an eye, Stallman resembles a Russian religious icon.
-
-{free_as_in_freedom_2_02_rms_st_ignucius.png 254x240 "Stallman dressed as St. IGNUcius. The photo was taken by Stian Eikeland in Bergen, Norway on February 19, 2009." }http://en.wikipedia.org/wiki/Richard_stallman
-
-"Emacs was initially a text editor," says Stallman, explaining the getup. "Eventually it became a way of life for many and a religion for some. We call this religion the Church of Emacs."
-={Church of Emacs+8;Emacs text editor+11;GNU Emacs+11}
-
-The skit is a lighthearted moment of self-parody, a humorous return-jab at the many people who might see Stallman's form of software asceticism as religious fanaticism in disguise. It is also the sound of the other shoe dropping - loudly. It's as if, in donning his robe and halo, Stallman is finally letting listeners off the hook, saying, "It's OK to laugh. I know I'm weird." [RMS: To laugh at someone for being weird is boorish, and it is not my intention to excuse that. But I hope people will laugh at my St. IGNUcius comedy routine.]
-
-Discussing the St. IGNUcius persona afterward, Stallman says he first came up with it in 1996, long after the creation of Emacs but well before the emergence of the "open source" term and the struggle for hacker-community leadership that precipitated it. At the time, Stallman says, he wanted a way to "poke fun at himself," to remind listeners that, though stubborn, Stallman was not the fanatic some made him out to be. It was only later, Stallman adds, that others seized the persona as a convenient way to play up his reputation as software ideologue, as Eric Raymond did in an 1999 interview with the Linux.com web site:
-={linux.com;Raymond, Eric:St. Ignucius and+2}
-
-_1 When I say RMS calibrates what he does, I'm not belittling or accusing him of insincerity. I'm saying that like all good communicators he's got a theatrical streak. Sometimes it's conscious - have you ever seen him in his St. IGNUcius drag, blessing software with a disk platter on his head? Mostly it's unconscious; he's just learned the degree of irritating stimulus that works, that holds attention without (usually) freaking people out.~{ See "Guest Interview: Eric S. Raymond," /{Linux.com}/ (May 18, 1999), \\ http://www.linux.com/interviews/19990518/8/. }~
-
-Stallman takes issue with the Raymond analysis. "It's simply my way of making fun of myself," he says. "The fact that others see it as anything more than that is a reflection of their agenda, not mine."
-
-That said, Stallman does admit to being a ham. "Are you kidding?" he says at one point. "I love being the center of attention." To facilitate that process, Stallman says he once enrolled in Toastmasters, an organization that helps members bolster their public-speaking skills and one Stallman recommends highly to others. He possesses a stage presence that would be the envy of most theatrical performers and feels a link to vaudevillians of years past. A few days after the Maui High Performance Computing Center speech, I allude to the 1999 LinuxWorld performance and ask Stallman if he has a Groucho Marx complex - i.e., the unwillingness to belong to any club that would have him as a member.~{ RMS: Williams misinterprets Groucho's famous remark by treating it as psychological. It was intended as a jab at the overt antisemitism of many clubs, which was why they would refuse him as a member. I did not understand this either until my mother explained it to me. Williams and I grew up when bigotry had gone underground, and there was no need to veil criticism of bigotry in humor as Groucho did. }~ Stallman's response is immediate: "No, but I admire Groucho Marx in a lot of ways and certainly have been in some things I say inspired by him. But then I've also been inspired in some ways by Harpo."
-={Marx, Groucho+1}
-
-The Groucho Marx influence is certainly evident in Stallman's lifelong fondness for punning. Then again, punning and wordplay are common hacker traits. Perhaps the most Groucho-like aspect of Stallman's personality, however, is the deadpan manner in which the puns are delivered. Most come so stealthily - without even the hint of a raised eyebrow or upturned smile - you almost have to wonder if Stal-man's laughing at his audience more than the audience is laughing at him.
-
-Watching members of the Maui High Performance Computer Center laugh at the St. IGNUcius parody, such concerns evaporate. While not exactly a standup act, Stallman certainly possesses the chops to keep a roomful of engineers in stitches. "To be a saint in the Church of Emacs does not require celibacy, but it does require making a commitment to living a life of moral purity," he tells the Maui audience. "You must exorcise the evil proprietary operating systems from all your computers, and then install a wholly [holy] free operating system. And then you must install only free software on top of that. If you make this commitment and live by it, then you too will be a saint in the Church of Emacs, and you too may have a halo."
-
-The St. IGNUcius skit ends with a brief inside joke. On most Unix systems and Unix-related offshoots, the primary competitor program to Emacs is vi, pronounced vee-eye, a text-editing program developed by former UC Berkeley student and current Sun Microsystems chief scientist, Bill Joy. Before doffing his "halo," Stallman pokes fun at the rival program. "People sometimes ask me if it is a sin in the Church of Emacs to use vi," he says. "Using a free version of vi is not a sin;it is a penance. So happy hacking."~{ The service of the Church of Emacs has developed further since 2001. Users can now join the Church by reciting the Confession of the Faith: "There is no system but GNU, and Linux is one of its kernels." Stallman sometimes mentions the religious ceremony known as the Foobar Mitzvah, the Great Schism between various rival versions of Emacs, and the cult of the Virgin of Emacs (which refers to any person that has not yet learned to use Emacs). In addition, "vi vi vi" has been identified as the Editor of the Beast. }~
-={Joy, Bill;vi text editor:as an Emacs competitor;UC Berkeley;Sun Microsystems}
-
-After a brief question-and-answer session, audience members gather around Stallman. A few ask for autographs. "I'll sign this," says Stallman, holding up one woman's print out of the GNU General Public License, "but only if you promise me to use the term GNU/Linux instead of Linux" (when referring to the system), "and tell all your friends to do likewise."
-={GNU General Public License;GPL}
-
-The comment merely confirms a private observation. Unlike other stage performers and political figures, Stallman has no "off" mode. Aside from the St. IGNUcius character, the ideologue you see on stage is the ideologue you meet backstage. Later that evening, during a dinner conversation in which a programmer mentions his affinity for "open source" programs, Stallman, between bites, upbraids his table-mate: "You mean free software. That's the proper way to refer to it."
-
-During the question-and-answer session, Stallman admits to playing the pedagogue at times. "There are many people who say, 'Well, first let's invite people to join the community, and then let's teach them about freedom.' And that could be a reasonable strategy, but what we have is almost everybody's inviting people to join the community, and hardly anybody's teaching them about freedom once they come in."
-
-The result, Stallman says, is something akin to a third-world city. "You have millions of people moving in and building shantytowns, but nobody's working on step two: getting them out of those shantytowns. If you think talking about software freedom is a good strategy, please join in doing step two. There are plenty working on step one. We need more people working on step two."
-
-Working on "step two" means driving home the issue that freedom, not acceptance, is the root issue of the free software movement. Those who hope to reform the proprietary software industry from the inside are on a fool's errand. "Change from the inside is risky," Stallman stays. "Unless you're working at the level of a Gorbachev, you're going to be neutralized."
-
-Hands pop up. Stallman points to a member of the golf shirt-wearing contingent. "Without patents, how would you suggest dealing with commercial espionage?"
-
-"Well, those two questions have nothing to do with each other, really," says Stallman.
-
-"But I mean if someone wants to steal another company's piece of software."
-
-Stallman's recoils as if hit by a poisonous spray. "Wait a second," Stallman says. "Steal? I'm sorry, there's so much prejudice in that statement that the only thing I can say is that I reject that prejudice." Then he turns to the substance of the question. "Companies that develop non-free software and other things keep lots and lots of trade secrets, and so that's not really likely to change. In the old days -even in the 1980s - for the most part programmers were not aware that there were even software patents and were paying no attention to them. What happened was that people published the interesting ideas, and if they were not in the free software movement, they kept secret the little details. And now they patent those broad ideas and keep secret the little details. So as far as what you're describing, patents really make no difference to it one way or another."
-
-"But if it doesn't affect their publication," a new audience member jumps in, his voice trailing off almost as soon as he starts speaking.
-
-"But it does," Stallman says. "Their publication is telling you that this is an idea that's off limits to the rest of the community for 20 years. And what the hell good is that? Besides, they've written it in such a hard way to read, both to obfuscate the idea and to make the patent as broad as possible, that it's basically useless looking at the published information [in the patent] to learn anything anyway. The only reason to look at patents is to see the bad news of what you can't do."
-
-The audience falls silent. The speech, which began at 3:15, is now nearing the 5:00 whistle, and most listeners are already squirming in their seats, antsy to get a jump start on the weekend. Sensing the fatigue, Stallman glances around the room and hastily shuts things down. "So it looks like we're done," he says, following the observation with an auctioneer's "going, going, gone" to flush out any last-minute questioners. When nobody throws their hand up, Stallman signs off with a traditional exit line.
-
-"Happy hacking," he says.
-
-1~ Chapter 9 - The GNU General Public License
-={GNU General Public License+82;GPL+82;Stallman, Richard M.:childhood:GNU General Public License+82}
-
-By the spring of 1985, Richard Stallman had produced the GNU Project's first useful result - a Lisp-based version of Emacs for Unix-like operating systems. To make it available to others as free software, he had to develop the way to release it - in effect, the follow-on for the Emacs Commune.
-={Emacs Commune+7;Emacs text editor:Lisp-based free software version;GNU Emacs:List-based free software version}
-
-The tension between the freedom to modify and authorial privilege had been building before Gosmacs. The Copyright Act of 1976 had overhauled U.S. copyright law, extending the legal coverage of copyright to software programs. According to Section 102(b) of the Act, individuals and companies could copyright the "expression" of a software program but not the "actual processes or methods embodied in the program."~{ See Hal Abelson, Mike Fischer, and Joanne Costello, "Software and Copyright Law," updated version (1997), \\ http://groups.csail.mit.edu/mac/classes/6.805/articles/int-prop/software-copyright.html. }~
-={Copyright Act of 1976;copyright laws;GOSMACS (Gosling Emacs);software:copyright laws on}
-
-Translated, this treated a program much like an algebra textbook:its author can claim copyright on the text but not on the mathematical ideas of algebra or the pedagogical technique employed to explain it. Thus, regardless of what Stallman said about using the code of the original Emacs, other programmers were legally entitled to write their own implementations of the ideas and commands of Emacs, and they did. Gosmacs was one of 30-odd imitations of the original Emacs developed for various computer systems.
-
-The Emacs Commune applied only to the code of the original Emacs program written by Stallman himself. Even if it had been legally enforced, it would not have applied to separately developed imitations such as Gosmacs. Making Gosmacs non-free was unethical according to the ethical ideas of the free software movement, because(as proprietary software) it did not respect its users' freedom, but this issue had nothing to do with where the ideas in Gosmacs came from.
-
-Under copyright, programmers who wanted to copy code from an existing program (even with changes) had to obtain permission from the original developer. The new law applied copyright even in the absence of copyright notices - though hackers generally did not know this - and the copyright notices too began appearing.
-
-Stallman saw these notices as the flags of an invading, occupying army. Rare was the program that didn't borrow source code from past programs, and yet, with a single stroke of the president's pen, the U.S. government had given programmers and companies the legal power to forbid such reuse. Copyright also injected a dose of formality into what had otherwise been an informal system. Simply put, disputes that had once been settled hacker-to-hacker were now to be settled lawyer-to-lawyer. In such a system, companies, not hackers, held the automatic advantage. Some saw placing one's name in a copyright notice as taking responsibility for the quality of the code, but the copyright notice usually has a company's name, and there are other ways for individuals to say what code they wrote.
-={source code:copy rights for}
-
-However, Stallman also noticed, in the years leading up to the GNU Project, that copyright allowed an author to grant permission for certain activities covered by copyright, and place conditions on them too. "I had seen email messages with copyright notices plus simple 'verbatim copying permitted' licenses," he recalls. "Those definitely were [an] inspiration." These licenses carried the condition not to remove the license. Stallman's idea was to take this a few steps further. For example, a permission notice could allow users to redistribute even modified versions, with the condition that these versions carry the same permission.
-
-Thus Stallman concluded that use of copyright was not necessarily unethical. What was bad about software copyright was the way it was typically used, and designed to be used: to deny the user essential freedoms. Most authors imagined no other way to use it. But copyright could be used in a different way: to make a program free and assure its continued freedom.
-
-By GNU Emacs 16, in early 1985, Stallman drafted a copyright-based license that gave users the right to make and distribute copies. It also gave users the right to make and distribute modified versions, but only under the same license. They could not exercise the unlimited power of copyright over those modified versions, so they could not make their versions proprietary as Gosmacs was. And they had to make the source code available. Those conditions closed the legal gap that would otherwise allow restricted, non-free versions of GNU Emacs to emerge.
-={Emacs text editor:copyrights and|GNU Emacs License and;GNU Emacs:copyrights and|GNU Emacs License and;GOSMACS (Gosling Emacs):copyrights and;licenses+15}
-
-Although helpful in codifying the social contract of the Emacs Commune, the early GNU Emacs license remained too "informal" for its purpose, Stallman says. Soon after forming the Free Software Foundation he began working on a more airtight version, consulting with the other directors and with the attorneys who had helped to set it up.
-
-Mark Fischer, a Boston copyright attorney who initially provided Stallman's legal advice, recalls discussing the license with Stallman during this period. "Richard had very strong views about how it should work," Fischer says, "He had two principles. The first was to make the software absolutely as open as possible." (By the time he said this, Fischer seems to have been influenced by open source supporters; Stallman never sought to make software "open.") "The second was to encourage others to adopt the same licensing practices." The requirements in the license were designed for the second goal.
-={Fischer, Mark+2}
-
-The revolutionary nature of this final condition would take a while to sink in. At the time, Fischer says, he simply viewed the GNU Emacs license as a simple trade. It put a price tag on GNU Emacs' use. Instead of money, Stallman was charging users access to their own later modifications. That said, Fischer does remember the license terms as unique.
-
-"I think asking other people to accept the price was, if not unique, highly unusual at that time," he says.
-
-In fashioning the GNU Emacs license, Stallman made one major change to the informal tenets of the old Emacs Commune. Where he had once demanded that Commune members send him all the changes they wrote, Stallman now demanded only that they pass along source code and freedom whenever they chose to redistribute the program. In other words, programmers who simply modified Emacs for private use no longer needed to send the source-code changes back to Stallman. In a rare alteration of free software doctrine, Stallman slashed the "price tag" for free software. Users could innovate without Stallman looking over their shoulders, and distribute their versions only when they wished, just so long as all copies came with permission for their possessors to develop and redistribute them further.
-
-Stallman says this change was fueled by his own dissatisfaction with the Big Brother aspect of the original Emacs Commune social contract. As much as he had found it useful for everyone to send him their changes, he came to feel that requiring this was unjust. "It was wrong to require people to publish all changes," says Stallman.
-
-"It was wrong to require them to be sent to one privileged developer. That kind of centralization and privilege for one was not consistent with a society in which all had equal rights."
-
-The GNU Emacs General Public License made its debut on a version of GNU Emacs in 1985. Following the release, Stallman welcomed input from the general hacker community on how to improve the license's language. One hacker to take up the offer was future software activist John Gilmore, then working as a consultant to Sun Microsystems. As part of his consulting work, Gilmore had ported Emacs over to SunOS, the company's in-house version of Unix. In the process of doing so, Gilmore had published the changed version under the GNU Emacs license. Instead of viewing the license as a liability, Gilmore saw it as clear and concise expression of the hacker ethos. "Up until then, most licenses were very informal," Gilmore recalls.
-={Gilmore, John+6;SunOS:porting Emacs to;Sun Microsystems}
-
-As an example of this informality, Gilmore cites the mid-1980s copyright license of trn, a news reader program written by Larry Wall, a hacker who could go onto later fame as the creator of both the Unix "patch" utility and the Perl scripting language. In the hope of striking a balance between common hacker courtesy and an author's right to dictate the means of commercial publication, Wall used the program's accompanying copyright notice as an editorial sounding board.
-={Wall, Larry+1;patches, inserting into source code;Perl programming language;source code:patches}
-
-_1 Copyright (c) 1985, Larry Wall \\ You may copy the trn kit in whole or in part as long as you don't try to make money off it, or pretend that you wrote it.~{ See Trn Kit README, \\ http://stuff.mit.edu/afs/sipb/project/trn/src/trn-3.6/README. }~
-
-Such statements, while reflective of the hacker ethic, also reflected the difficulty of translating the loose, informal nature of that ethic into the rigid, legal language of copyright. In writing the GNU Emacs license, Stallman had done more than close up the escape hatch that permitted proprietary offshoots. He had expressed the hacker ethic in a manner understandable to both lawyer and hacker alike.
-
-It wasn't long, Gilmore says, before other hackers began discussing ways to "port" the GNU Emacs license over to their own programs. Prompted by a conversation on Usenet, Gilmore sent an email to Stallman in November, 1986, suggesting modification:
-
-_1 You should probably remove "EMACS" from the license and replace it with "SOFTWARE" or something. Soon, we hope, Emacs will not be the biggest part of the GNU system, and the license applies to all of it.~{ See John Gilmore, quoted from email to author. }~
-
-Gilmore wasn't the only person suggesting a more general approach. By the end of 1986, Stallman himself was at work with GNU Project's next major milestone, the source-code debugger GDB. To release this, he had to modify the GNU Emacs license so it applied to GDB instead of GNU Emacs. It was not a big job, but it was an opening for possible errors. In 1989, Stallman figured out how to remove the specific references to Emacs, and express the connection between the program code and the license solely in the program's source files. This way, any developer could apply the license to his program without changing the license. The GNU General Public License, GNU GPL for short, was born. The GNU Project soon made it the official license of all existing GNU programs.
-={GNU Debugger (GDB)+1;GDB (GNU Debugger);Debugger+1}
-
-In publishing the GPL, Stallman followed the software convention of using decimal numbers to indicate versions with minor changes and whole numbers to indicate versions with major changes. The first version, in 1989, was labeled Version 1.0. The license contained a preamble spelling out its political intentions:
-
-_1 The General Public License is designed to make sure that you have the freedom to give away or sell copies of free software, that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-_1 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.~{ See Richard Stallman, et al., "GNU General Public License: Version 1,"(February, 1989), \\ http://www.gnu.org/licenses/old-licenses/gpl-1.0.html. }~
-
-As hacks go, the GPL stands as one of Stallman's best. It created a system of communal ownership within the normally proprietary confines of copyright law. More importantly, it demonstrated the intellectual similarity between legal code and software code. Implicit within the GPL's preamble was a profound message: instead of viewing copyright law with suspicion, hackers should view it as a dangerous system that could be hacked.
-% ={Emacs Commune+1}
-
-"The GPL developed much like any piece of free software with a large community discussing its structure, its respect or the opposite in their observation, needs for tweaking and even to compromise it mildly for greater acceptance," says Jerry Cohen, another attorney who advised Stallman after Fischer departed. "The process worked very well and GPL in its several versions has gone from widespread skeptical and at times hostile response to widespread acceptance."
-
-In a 1986 interview with /{BYTE}/ magazine, Stallman summed up the GPL in colorful terms. In addition to proclaiming hacker values, Stallman said, readers should also "see it as a form of intellectual ju-jitsu, using the legal system that software hoarders have set up against them."~{ See David Betz and Jon Edwards, "Richard Stallman discusses his public-domain [ sic ] Unix-compatible software system with BYTE editors," BYTE (July, 1986). (Reprinted on the GNU Project web site: \\ http://www.gnu.org/gnu/byte-interview.html .) \\ This interview offers an interesting, not to mention candid, glimpse at Stallman's political attitudes during the earliest days of the GNU Project. It is also helpful in tracing the evolution of Stallman's rhetoric. \\ Describing the purpose of the GPL, Stallman says, "I'm trying to change the way people approach knowledge and information in general. I think that to try to own knowledge, to try to control whether people are allowed to use it, or to try to stop other people from sharing it, is sabotage." \\ Contrast this with a statement to the author in August 2000: "I urge you not to use the term 'intellectual property' in your thinking. It will lead you to misunderstand things, because that term generalizes about copyrights, patents, and trademarks. And those things are so different in their effects that it is entirely foolish to try to talk about them at once. If you hear somebody saying something' about intellectual property,' without [putting it in] quotes, then he's not thinking very clearly and you shouldn't join." \\ [RMS: The contrast it shows is that I've learned to be more cautious in generalizing. I probably wouldn't talk about "owning knowledge" today, since it's a very broad concept. But "owning knowledge" is not the same generalization as "intellectual property," and the difference between those three laws is crucial to understanding any legal issue about owning knowledge. Patents are direct monopolies over using specific knowledge; that really is one form of "owning knowledge." Copyrights are one of the methods used to stop the sharing of works that embody or explain knowledge, which is a very different thing. Meanwhile, trademarks have very little to do with the subject of knowledge.] }~ Years later, Stallman would describe the GPL's creation in less hostile terms. "I was thinking about issues that were in a sense ethical and in a sense political and in a sense legal," he says. "I had to try to do what could be sustained by the legal system that we're in. In spirit the job was that of legislating the basis for a new society, but since I wasn't a government, I couldn't actually change any laws. I had to try to do this by building on top of the existing legal system, which had not been designed for anything like this."
-={Byte magazine}
-
-About the time Stallman was pondering the ethical, political, and legal issues associated with free software, a California hacker named Don Hopkins mailed him a manual for the 68000 microprocessor. Hopkins, a Unix hacker and fellow science-fiction buff, had borrowed the manual from Stallman a while earlier. As a display of gratitude, Hopkins decorated the return envelope with a number of stickers obtained at a local science-fiction convention. One sticker in particular caught Stallman's eye. It read, "Copyleft (L), All Rights Reversed." Stallman, inspired by the sticker, nicknamed the legal technique employed in the GNU Emacs license (and later in the GNU GPL) "Copyleft," jocularly symbolized by a backwards "C" in a circle. Over time, the nickname would become general Free Software Foundation terminology for any copyright license "making a program free software and requiring all modified and extended versions of the program to be free software as well."
-={copyleft;Hopkins, Don}
-
-The German sociologist Max Weber once proposed that all great religions are built upon the "routinization" or "institutionalization" of charisma. Every successful religion, Weber argued, converts the charisma or message of the original religious leader into a social, political, and ethical apparatus more easily translatable across cultures and time.
-={Weber, Max}
-
-While not religious per se, the GNU GPL certainly qualifies as an interesting example of this "routinization" process at work in the modern, decentralized world of software development. Since its unveiling, programmers and companies who have otherwise expressed little loyalty or allegiance to Stallman have willingly accepted the GPL bargain at face value. Thousands have also accepted the GPL as a preemptive protective mechanism for their own software programs. Even those who reject the GPL conditions as too limiting still credit it as influential.
-
-One hacker falling into this latter group was Keith Bostic, a University of California employee at the time of the GPL 1.0 release. Bostic's department, the Computer Systems Research Group (SRG), had been involved in Unix development since the late 1970s and was responsible for many key parts of Unix, including the TCP/IP networking protocol, the cornerstone of modern Internet communications. By the late 1980s, AT&T, the original owner of the Unix software, began to focus on commercializing Unix and began looking to the Berkeley Software Distribution, or BSD, the academic version of Unix developed by Bostic and his Berkeley peers, as a key source of commercial technology.
-={AT&T+1;Berkely Software Distribution (BSD)+6;Bostic, Keith+5;BSD (Berkely Software Distribution)+6;Computer Systems Research Group;University of California+4;TCP/IP}
-
-The code written by Bostic and friends was off limits to nearly everyone, because it was intermixed with proprietary AT&T code. Berkeley distributions were therefore available only to institutions that already had a Unix source license from AT&T. As AT&T raised its license fees, this arrangement, which had at first seemed innocuous (to those who thought only of academia) became increasingly burdensome even there. To use Berkeley's code in GNU, Stallman would have to convince Berkeley to separate it from AT&T's code and release it as free software. In 1984 or 1985 he met with the leaders of the BSD effort, pointing out that AT&T was not a charity and that for a university to donate its work (in effect) to AT&T was not proper. He asked them to separate out their code and release it as free software.
-={licenses:AT&T UNIX source code and+2}
-
-Hired in 1986, Bostic had taken on the personal project of porting the latest version of BSD to the PDP-11 computer. It was during this period, Bostic says, that he came into close interaction with Stallman during Stallman's occasional forays out to the west coast. "I remember vividly arguing copyright with Stallman while he sat at borrowed workstations at CSRG," says Bostic. "We'd go to dinner afterward and continue arguing about copyright over dinner."
-={PDP-11 computer}
-
-The arguments eventually took hold, although not in the way Stallman would have preferred. In June, 1989, Berkeley had separated its networking code from the rest of the AT&T-owned operating system and began distributing it under a copyright-based free license. The license terms were liberal. All a licensee had to do was give credit to the university in advertisements touting derivative programs.~{ The University of California's "obnoxious advertising clause" would later prove to be a problem. Looking for a permissive alternative to the GPL, some hackers used the original BSD license, replacing "University of California" with their own names or the names of their institutions. The result: free software systems using many of these programs would have to cite dozens of names in advertisements. In 1999, after a few years of lobbying on Stallman's part, the University of California agreed to drop this clause. See "The BSD License Problem" at \\ http://www.gnu.org/philosophy/bsd.html. }~ In contrast to the GPL, this license permitted proprietary offshoots. One problem limited the use of the BSD Networking release: it wasn't a complete operating system, just the network-related parts of one. While the code would be a major contribution to any free operating system, it could only be run at that time in conjunction with other, proprietary-licensed code.
-={AT&T+1}
-
-Over the next few years, Bostic and other University of California employees worked to replace the missing components and turn BSD into a complete, freely redistributable operating system. Although delayed by a legal challenge from Unix Systems Laboratories - the AT&T spin-off that retained ownership of the Unix code - the effort would finally bear fruit in the early 1990s. Even before then, however, many of the Berkeley network utilities would make their way into Stallman's GNU system.
-
-"I think it's highly unlikely that we ever would have gone as strongly as we did without the GNU influence," says Bostic, looking back. "It was clearly something where they were pushing hard and we liked the idea."
-
-By the end of the 1980s, the GPL was beginning to exert a gravitational effect on the free software community. A program didn't have to carry the GPL to qualify as free software - witness the case of the BSD network utilities - but putting a program under the GPL sent a definite message. "I think the very existence of the GPL inspired people to think through whether they were making free software, and how they would license it," says Bruce Perens, creator of Electric Fence, a popular Unix utility, and future leader of the Debian GNU/Linux development team. A few years after the release of the GPL, Perens says he decided to discard Electric Fence's homegrown license in favor of Stallman's lawyer-vetted copyright. "It was actually pretty easy to do," Perens recalls.
-={Perens, Bruce}
-
-Rich Morin, the programmer who had viewed Stallman's initial GNU announcement with a degree of skepticism, recalls being impressed by the software that began to gather under the GPL umbrella. As the leader of a SunOS user group, one of Morin's primary duties during the 1980s had been to send out distribution tapes containing the best freeware or free software utilities. The job often mandated calling up original program authors to verify whether their programs were copyrighted or whether they had been consigned to the public domain. Around 1989, Morin says, he began to notice that the best software programs typically fell under the GPL license. "As a software distributor, as soon as I saw the word GPL, I knew I was home free,"recalls Morin.
-={SunOS}
-
-To compensate for the prior hassles that went into compiling distribution tapes to the Sun User Group, Morin had charged recipients a convenience fee. Now, with programs moving over to the GPL, Morin was suddenly getting his tapes put together in half the time, turning a tidy profit in the process. Sensing a commercial opportunity, Morin rechristened his hobby as a business: Prime Time Freeware.
-={Sun User Group}
-
-Such commercial exploitation was completely consistent with the free software agenda. "When we speak of free software, we are referring to freedom, not price," advised Stallman in the GPL's preamble. By the late 1980s, Stallman had refined it to a more simple mnemonic: "Don't think free as in free beer; think free as in free speech."
-
-For the most part, businesses ignored Stallman's entreaties. Still, for a few entrepreneurs, the freedom associated with free software was the same freedom associated with free markets. Take software ownership out of the commercial equation, and you had a situation where even the smallest software company was free to compete against the IBMs and DECs of the world.
-
-One of the first entrepreneurs to grasp this concept was Michael Tiemann, a software programmer and graduate student at Stanford University. During the 1980s, Tiemann had followed the GNU Project like an aspiring jazz musician following a favorite artist. It wasn't until the release of the GNU C Compiler, or GCC, in 1987, however, that he began to grasp the full potential of free software. Dubbing GCC a "bombshell," Tiemann says the program's own existence underlined Stallman's determination as a programmer.
-={C Compiler (GNU)+9;GNU C Compiler (GCC)+9;GCC (GNU C Compiler)+9;Tiemann, Michael+8;Stanford University}
-
-"Just as every writer dreams of writing the great American novel, every programmer back in the 1980s talked about writing the great American compiler," Tiemman recalls. "Suddenly Stallman had done it. It was very humbling."
-
-"You talk about single points of failure, GCC was it," echoes Bostic. "Nobody had a compiler back then, until GCC came along."
-
-Rather than compete with Stallman, Tiemann decided to build on top of his work. The original version of GCC weighed in at 110,000 lines of code, but Tiemann recalls the program as surprisingly easy to understand. So easy in fact that Tiemann says it took less than five days to master and another week to port the software to a new hardware platform, National Semiconductor's 32032 microchip. Over the next year, Tiemann began playing around with the source code, creating the first "native" or direct compiler for the C++ programming language, by extending GCC to handle C++ as well as C. (The existing, proprietary implementation of the C++ language worked by converting the code to the C language, then feeding the result to a C compiler.) One day, while delivering a lecture on the program at Bell Labs, Tiemann ran into some AT&T developers struggling to pull off the same thing.
-={C+ programming language}
-
-"There were about 40 or 50 people in the room, and I asked how many people were working on the native code compiler," Tiemann recalls. "My host said the information was confidential but added that if I took a look around the room I might get a good general idea."
-
-It wasn't long after, Tiemann says, that the light bulb went off in his head. "I had been working on that project for six months," Tiemann says. I just thought to myself, whether it's me or the code, this is a level of efficiency that the free market should be ready to reward."
-
-Tiemann found added inspiration in the /{GNU Manifesto}/: while excoriating the greed of proprietary software vendors, it also encourages companies, as long as they respect users freedom, to use and redistribute free software in their commercial activities. By removing the power of monopoly from the commercial software question, the GPL makes it possible for even small companies to compete on the basis of service, which extends from simple tech support to training to extending free programs for specific clients' needs.
-={GNU Manifesto}
-
-In a 1999 essay, Tiemann recalls the impact of Stallman's /{Manifesto}/. "It read like a socialist polemic, but I saw something different. I saw a business plan in disguise."~{ See Michael Tiemann, "Future of Cygnus Solutions: An Entrepreneur's Account," Open Sources (O'Reilly & Associates, Inc., 1999): 139, \\ http://www.oreilly.com/catalog/opensources/book/tiemans.html. }~
-
-This business plan was not new; Stallman supported himself in the late 80s by doing this on a small scale. But Tiemann intended to take it to a new level. Teaming up with John Gilmore and David Vinayak Wallace, Tiemann launched a software consulting service dedicated to customizing GNU programs. Dubbed Cygnus Support (informally, "Cygnus" was a recursive acronym for "Cygnus, Your GNU Support"), the company signed its first development contract in February, 1990. By the end of the year, the company had $725,000 worth of support and development contracts.
-={Gilmore, John}
-
-The complete GNU operating system Stallman envisioned required more than software development tools. In the 1990s, GNU also developed a command line interpreter or "shell," which was an extended replacement for the Bourne Shell (written by FSF employee Brian Fox, and christened by Stallman the Bourne Again Shell, or BASH), as well as the PostScript interpreter Ghostscript, the documentation browser platform Texinfo, the C Library which C programs need in order to run and talk to the system's kernel, the spreadsheet Oleo ("better for you than the more expensive spreadsheet"), and even a fairly good chess game. However, programmers were typically most interested in the GNU programming tools.
-
-GNU Emacs, GDB, and GCC were the "big three" of developer-oriented tools, but they weren't the only ones developed by the GNU Project in the 80s. By 1990, GNU had also generated GNU versions of the build-controller Make, the parser-generator YACC (rechristened Bison), and awk (rechristened gawk); as well as dozens more. Like GCC, GNU programs were usually designed to run on multiple systems, not just a single vendor's platform. In the process of making programs more flexible, Stallman and his collaborators often made them more useful as well.
-
-Recalling the GNU universalist approach, Prime Time Freeware's Morin points to a useless but vitally important software package called GNU Hello, which serves as an example to show programmers how to properly package a program for GNU. "It's the hello world program which is five lines of C, packaged up as if it were a GNU distribution," Morin says. "And so it's got the Texinfo stuff and the configure stuff. It's got all the other software engineering goo that the GNU Project has come up with to allow packages to port to all these different environments smoothly. That's tremendously important work, and it affects not only all of [Stallman's] software, but also all of the other GNU Project software."
-
-According to Stallman, improving technically on the components of Unix was secondary to replacing them with free software. "With each piece I may or may not find a way to improve it," said Stallman to /{BYTE}/. "To some extent I am getting the benefit of reimplementation, which makes many systems much better. To some extent it's because I have been in the field a long time and worked on many other systems. I therefore have many ideas [which I learned from them] to bring to bear."~{ See Richard Stallman, BYTE (1986). }~
-={Byte magazine}
-
-Nevertheless, as GNU tools made their mark in the late 1980s, Stallman's AI Lab-honed reputation for design fastidiousness soon became legendary throughout the entire software-development community.
-
-Jeremy Allison, a Sun user during the late 1980s and programmer destined to run his own free software project, Samba, in the 1990s, recalls that reputation with a laugh. During the late 1980s, Allison began using Emacs. Inspired by the program's community-development model, Allison says he sent in a snippet of source code only to have it rejected by Stallman.
-={Allison, Jeramy+1}
-
-"It was like the /{Onion}/ headline," Allison says. "'Child's prayers to God answered: No.'"
-={Onion, The}
-
-As the GNU Project moved from success to success in creation of user-level programs and libraries, it postponed development of the kernel, the central "traffic cop" program that controls other programs' access to the processor and all machine resources.
-
-As with several other major system components, Stallman sought a head-start on kernel development by looking for an existing program to adapt. A review of GNU Project "GNUs letters" of the late 1980s reveals that this approach, like the initial attempt to build GCC out of Pastel, had its problems. A January, 1987 GNUs letter reported the GNU Project's intention to overhaul TRIX, a kernel developed at MIT. However, Stallman never actually tried to do this, since he was working on GCC at the time; later he concluded that TRIX would require too much change to be a good starting point. By February of 1988, according to a newsletter published that month, the GNU Project had shifted its kernel plans to Mach, a lightweight "micro-kernel" developed at Carnegie Mellon. Mach was not then free software, but its developers privately said they would liberate it; when this occurred, in 1990, GNU Project kernel development could really commence.~{ See "Hurd History," \\ http://www.gnu.org/software/hurd/history.html. }~
-
-The delays in kernel development were just one of many concerns weighing on Stallman during this period. In 1989, Lotus Development Corporation filed suit against rival software companies, Paperback Software International and Borland, for copying menu commands from Lotus' popular 1-2-3 Spreadsheet program. Lotus' suit, coupled with the Apple-Microsoft "look and feel" battle, endangered the future of the GNU system. Although neither suit directly attacked the GNU Project, both threatened the right to develop software compatible with existing programs, as many GNU programs were. These lawsuits could impose a chilling effect on the entire culture of software development. Determined to do something, Stallman and a few professors put an ad in /{The Tech}/ (the MIT student newspaper) blasting the lawsuits and calling for a boycott of both Lotus and Apple. He then followed up the ad by helping to organize a group to protest the corporations filing the suit. Calling itself the League for Programming Freedom, the group held protests outside the offices of Lotus, Inc.
-={Apple Computers;Lotus Development Corp.;Microsoft Corporation:Apple Computer lawsuit;Paperback Software International}
-
-The protests were notable.~{ According to a League for Programming Freedom press release at \\ http://progfree.org/Links/prep.ai.mit.edu/demo.final.release, the protests were no-table for featuring the first hexadecimal protest chant: \\ 1-2-3-4, toss the lawyers out the door \\ 5-6-7-8, innovate don't litigate \\ 9-A-B-C, 1-2-3 is not for me \\ D-E-F-O, look and feel have got to go }~
-
-They document the evolving nature of the software industry. Applications had quietly replaced operating systems as the primary corporate battleground. In its unfinished quest to build a free software operating system, the GNU Project seemed hopelessly behind the times to those whose primary values were fashion and success. Indeed, the very fact that Stallman had felt it necessary to put together an entirely new group dedicated to battling the "look and feel" lawsuits led some observers to think that the FSF was obsolete.
-
-However, Stallman had a strategic reason to start a separate organization to fight the imposition of new monopolies on software development: so that proprietary software developers would join it too. Extending copyright to cover interfaces would threaten many proprietary software developers as well as many free software developers. These proprietary developers were unlikely to endorse the Free Soft-ware Foundation, but there was, intentionally, nothing in the League for Programming Freedom to drive them away. For the same reason, Stallman handed over leadership of LPF to others as soon as it was feasible.
-
-In 1990, the John D. and Catherine T. MacArthur Foundation certified Stallman's genius status when it granted Stallman a Mac Arthur fellowship, the so-called "genius grant," amounting in this case to$240,000 over 5 years. Although the Foundation does not state a reason for its grants, this one was seen as an award for launching the GNU Project and giving voice to the free software philosophy. The grant relieved a number of short-term concerns for Stallman. For instance, it enabled him to cease the consulting work through which he had obtained his income in the 80s and devote more time to the free software cause.
-
-The award also made it possible for Stallman to register normally to vote. In 1985 a fire in the house where Stallman lived left him without an official domicile. It also covered most of his books with ash, and cleaning these "dirty books" did not yield satisfying results. From that time he lived as a "squatter" at 545 Technology Square, and had to vote as a "homeless person."~{ See Reuven Lerner, "Stallman wins $240,000 MacArthur award," MIT, The Tech (July 18, 1990), \\ http://the-tech.mit.edu/V110/N30/rms.30n.html. }~ "[The Cambridge Election Commission] didn't want to accept that as my address," Stallman would later recall. "A newspaper article about the MacArthur grant said that, and then they let me register."~{ See Michael Gross, "Richard Stallman: High School Misfit, Symbol of Free Software, Mac Arthur-certified Genius" (1999). }~
-
-Most importantly, the MacArthur fellowship gave Stallman press attention and speaking invitations, which he used to spread the word about GNU, free software, and dangers such as "look and feel" lawsuits and software patents.
-
-Interestingly, the GNU system's completion would stem from one of these trips. In April 1991, Stallman paid a visit to the Polytechnic University in Helsinki, Finland. Among the audience members was 21-year-old Linus Torvalds, who was just beginning to develop the Linux kernel - the free software kernel destined to fill the GNU system's main remaining gap.
-={Helsinki, Finland+3;Polytechnic University (Finland);Torvalds, Linus+16}
-
-A student at the nearby University of Helsinki at the time, Torvalds regarded Stallman with bemusement. "I saw, for the first time in my life, the stereotypical long-haired, bearded hacker type," recalls Torvalds in his 2001 autobiography /{Just for Fun}/. "We don't have much of them in Helsinki."~{ See Linus Torvalds and David Diamond, Just For Fun: The Story of an Accidental Revolutionary (Harper Collins Publishers, Inc., 2001): 58-59. Although presumably accurate in regard to Torvalds' life, what the book says about Stallman is sometimes wrong. For instance, it says that Stallman "wants to make everything open source," and that he "complains about other people not using the GPL." In fact, Stallman advocates free software, not open source. He urges authors to choose the GNU GPL, in most circumstances, but says that all free software licenses are ethical. }~
-
-While not exactly attuned to the "socio political" side of the Stallman agenda, Torvalds nevertheless appreciated one aspect of the agenda's underlying logic: no programmer writes error-free code. Even when users have no wish to adapt a program to their specific preferences, any program can use improvement. By sharing software, hackers put a program's improvement ahead of individual motivations such as greed or ego protection.
-
-Like many programmers of his generation, Torvalds had cut his teeth not on mainframe computers like the IBM 7094, but on a motley assortment of home-built computer systems. As a university student, Torvalds had made the step up from PC programming to Unix, using the university's MicroVAX. This ladder-like progression had given Torvalds a different perspective on the barriers to machine access. For Stallman, the chief barriers were bureaucracy and privilege. For Torvalds, the chief barriers were geography and the harsh Helsinki winter. Forced to trek across the University of Helsinki just to log in to his Unix account, Torvalds quickly began looking for a way to log in from the warm confines of his off-campus apartment.
-={IBM 7094 computer;MicroVAX+1}
-
-Torvalds was using Minix, a lightweight non-free system developed as an instructional example by Dutch university professor Andrew Tanenbaum.~{ It was non-free in 1991. Minix is free software now. }~ It included the non-free Free University Compiler Kit, plus utilities of the sort that Tanenbaum had contemptuously invited Stallman in 1983 to write.~{ Tanenbaum describes Minix as an "operating system" in his book, Operating System Design and Implementation , but what the book discusses is only the part of the system that corresponds to the kernel of Unix. There are two customary usages of the term "operating system," and one of them is what is called the "kernel" in Unix terminology. But that's not the only terminological complication in the subject. That part of Minix consists of a microkernel plus servers that run on it, a design of the same kind as the GNU Hurd plus Mach. The microkernel plus servers are comparable to the kernel of Unix. But when that book says "the kernel," it refers to the microkernel only. See Andrew Tanenbaum, Operating System Design and Implementation , 1987. }~
-={Minix operating system+2;Unix operating system:Minix and;Tanenbaum, Andrew}
-
-Minix fit within the memory confines of Torvalds' 386 PC, but it was intended more to be studied than used. The Minix system also lacked the facility of terminal emulation, which would mimic a typical display terminal and thus enable Torvalds to log in to the MicroVAX from home.
-
-Early in 1991, Torvalds began writing a terminal emulation program. He used Minix to develop his emulator, but the emulator didn't run on Minix; it was a stand-alone program. Then he gave it features to access disk files in Minix's file system. Around then, Torvalds referred to his evolving work as the "GNU/Emacs of terminal emulation programs."~{ See Linus Torvalds and David Diamond, Just For Fun: The Story of an Accidental Revolutionary (Harper Collins Publishers, Inc., 2001): 78. }~
-
-Since Minix lacked many important features. Torvalds began extending his terminal emulator into a kernel comparable to that of Minix, except that it was monolithic. Feeling ambitious, he solicited a Minix newsgroup for copies of the POSIX standards, the specifications for a Unix-compatible kernel.~{ POSIX was subsequently extended to include specifications for many command-line features, but that did not exist in 1991. }~ A few weeks later, having put his kernel together with some GNU programs and adapted them to work with it, Torvalds was posting a message reminiscent of Stallman's original 1983 GNU posting:
-
-_1 Hello everybody out there using minix-
-
-_1 I'm doing a (free) operating system (just a hobby, won't be big and professional like gnu) for 386 (486) AT clones. This has been brewing since April, and is starting to get ready. I'd like any feedback on things people like/dislike in minix, as my OS resembles it somewhat (same physical layout of the file-system (due to practical reasons) among other things). I've currently ported bash (1.08) and gcc(1.40)...~{ Ibid, p. 85. }~
-
-The posting drew a smattering of responses and within a month, Torvalds had posted a 0.01 version of his kernel - i.e., the earliest possible version fit for outside review - on an Internet FTP site. In the course of doing so, Torvalds had to come up with a name for the new kernel. On his own PC hard drive, Torvalds had saved the program as Linux, a name that paid its respects to the software convention of giving each Unix variant a name that ended with the letter X. Deeming the name too "egotistical," Torvalds changed it to Freax, only to have the FTP site manager change it back.
-={Freax}
-
-Torvalds said he was writing a free operating system, and his comparing it with GNU shows he meant a complete system. However, what he actually wrote was a kernel, pure and simple. Torvalds had no need to write more than the kernel because, as he knew, the other needed components were already available, thanks to the developers of GNU and other free software projects. Since the GNU Project wanted to use them all in the GNU system, it had perforce made them work together. While Torvalds continued developing the kernel, he (and later his collaborators) made those programs work with it too.
-
-Initially, Linux was not free software: the license it carried did not qualify as free, because it did not allow commercial distribution. Torvalds was worried that some company would swoop in and take Linux away from him. However, as the growing GNU/Linux combination gained popularity, Torvalds saw that sale of copies would be useful for the community, and began to feel less worried about a possible takeover.~{ Ibid, p. 94-95. }~ This led him to reconsider the licensing of Linux.
-
-Neither compiling Linux with GCC nor running GCC with Linux required him legally to release Linux under the GNU GPL, but Torvalds' use of GCC implied for him a certain obligation to let other users borrow back. As Torvalds would later put it: "I had hoisted myself up on the shoulders of giants."~{ Ibid, p. 95-97. }~ Not surprisingly, he began to think about what would happen when other people looked to him for similar support. A decade after the decision, Torvalds echoes the Free Software Foundation's Robert Chassell when he sums up his thoughts at the time:
-={C Compiler (GNU):Linux development and+3;GNU C Compiler (GCC):Linux development and;GCC (GNU C Compiler):Linux development and}}
-
-_1 You put six months of your life into this thing and you want to make it available and you want to get something out of it, but you don't want people to take advantage of it. I wanted people to be able to see [Linux], and to make changes and improvements to their hearts' content. But I also wanted to make sure that what I got out of it was to see what they were doing. I wanted to always have access to the sources so that if they made improvements, I could make those improvements myself.~{ See Linus Torvalds and David Diamond, Just For Fun: The Story of an Accidental Revolutionary (Harper Collins Publishers, Inc., 2001): 94-95. }~
-
-When it was time to release the 0.12 version of Linux, the first to operate fully with GCC, Torvalds decided to throw his lot in with the free software movement. He discarded the old license of Linux and replaced it with the GPL. Within three years, Linux developers were offering release 1.0 of Linux, the kernel; it worked smoothly with the almost complete GNU system, composed of programs from the GNU Project and elsewhere. In effect, they had completed the GNU operating system by adding Linux to it. The resulting system was basically GNU plus Linux. Torvalds and friends, however, referred to it confusingly as "Linux."
-
-By 1994, the amalgamated system had earned enough respect in the hacker world to make some observers from the business world wonder if Torvalds hadn't given away the farm by switching to the GPL in the project's initial months. In the first issue of /{Linux Journal}/, publisher Robert Young sat down with Torvalds for an interview. When Young asked the Finnish programmer if he felt regret at giving up private ownership of the Linux source code, Torvalds said no. "Even with 20/20 hindsight," Torvalds said, he considered the GPL "one of the very best design decisions" made during the early stages of the Linux project.~{ See Robert Young, "Interview with Linus, the Author of Linux," Linux Journal (March 1, 1994), \\ http://www.linuxjournal.com/article/2736. }~
-={Young, Robert}
-
-That the decision had been made with zero appeal or deference to Stallman and the Free Software Foundation speaks to the GPL's growing portability. Although it would take a couple of years to be recognized by Stallman, the explosiveness of Linux development conjured flashbacks of Emacs. This time around, however, the innovation triggering the explosion wasn't a software hack like Control-R but the novelty of running a Unix-like system on the PC architecture. The motives may have been different, but the end result certainly fit the ethical specifications: a fully functional operating system composed entirely of free software.
-={Control-R (^R)}
-
-As his initial email message to the comp.os.minix newsgroup indicates, it would take a few months before Torvalds saw Linux as anything more than a holdover until the GNU developers delivered on the Hurd kernel. As far as Torvalds was concerned, he was simply the latest in a long line of kids taking apart and reassembling things just for fun. Nevertheless, when summing up the runaway success of a project that could have just as easily spent the rest of its days on an abandoned computer hard drive, Torvalds credits his younger self for having the wisdom to give up control and accept the GPL bargain. "I may not have seen the light," writes Torvalds, reflecting on Stallman's 1991 Polytechnic University speech and his subsequent decision to switch to the GPL. "But I guess something from his speech sunk in."~{ See Linus Torvalds and David Diamond, Just For Fun: The Story of an Accidental Revolutionary (Harper Collins Publishers, Inc., 2001): 59. }~
-={HURD kernel}
-
-1~ Chapter 10 - GNU/Linux
-={GNU/Linux+45;Linux+45;Stallman, Richard M.:GNU Linux+46}
-
-By 1993, the free software movement was at a crossroads. To the optimistically inclined, all signs pointed toward success for the hacker culture. /{Wired}/ magazine, a funky, new publication offering stories on data encryption, Usenet, and software freedom, was flying off magazine racks. The Internet, once a slang term used only by hackers and research scientists, had found its way into mainstream lexicon. Even President Clinton was using it. The personal computer, once a hobbyist's toy, had grown to full-scale respectability, giving a whole new generation of computer users access to hacker-built software. And while the GNU Project had not yet reached its goal of a fully intact, free GNU operating system, users could already run the GNU/Linux variant.
-={Internet+3;Wired magazine;PCs (personal computers)+2;personal computers (PCs)+2}
-
-Any way you sliced it, the news was good, or so it seemed. After a decade of struggle, hackers and hacker values were finally gaining acceptance in mainstream society. People were getting it.
-
-Or were they? To the pessimistically inclined, each sign of acceptance carried its own troubling countersign. Sure, being a hacker was suddenly cool, but was cool good for a community that thrived on alienation? Sure, the White House was saying nice things about the Internet, even going so far as to register its own domain name, white-house.gov, *** but it was also meeting with the companies, censorship advocates, and law-enforcement officials looking to tame the Internet's Wild West culture. Sure, PCs were more powerful, but in commoditizing the PC marketplace with its chips, Intel had created a situation in which proprietary software vendors now held the power. For every new user won over to the free software cause via GNU/Linux, hundreds, perhaps thousands, were booting up Microsoft Windows for the first time. GNU/Linux had only rudimentary graphical interfaces, so it was hardly user-friendly. In 1993, only an expert could use it. The GNU Project's first attempt to develop a graphical desktop had been abortive.
-={Intel}
-
-Then there was the political situation. Copyrighting of user interfaces was still a real threat - the courts had not yet rejected the idea. Meanwhile, patents on software algorithms and features were a growing danger that threatened to spread to other countries.
-
-Finally, there was the curious nature of GNU/Linux itself. Unrestricted by legal disputes (such as BSD faced), GNU/Linux's high-speed evolution had been so unplanned, its success so accidental, that programmers closest to the software code itself didn't know what to make of it. More compilation album than unified project, it was comprised of a hacker medley of greatest hits: everything from GCC, GDB, and glibc (the GNU Project's newly developed C Library) toX (a Unix-based graphic user interface developed by MIT's Laboratory for Computer Science) to BSD-developed tools such as BIND (the Berkeley Internet Naming Daemon, which lets users substitute easy-to-remember Internet domain names for numeric IP addresses) and TCP/IP. In addition, it contained the Linux kernel - itself designed as a replacement for Minix. Rather than developing a new operating system, Torvalds and his rapidly expanding Linux development team had plugged their work into this matrix. As Torvalds himself would later translate it when describing the secret of his success: "I'm basically a very lazy person who likes to take credit for things other people actually do."~{ Torvalds has offered this quote in many different settings. To date, however, the quote's most notable appearance is in the Eric Raymond essay, "The Cathedral and the Bazaar" (May, 1997), \\ http://www.catb.org/~esr/writings/cathedral-bazaar/. }~
-={BIND (Berkely Internet Naming Daemon);Berkely Internet Naming Daemon (BIND);C programming language:glibc;GNU Debugger (GDB):Linux and;GDB (GNU Debugger): Linux and;glibc (GNU C Library);GNU C Library (glibc);kernel (Linux);X graphic user interface;Laboratory for Computer Science:X, developing;Minix operating system:kernel, used for Linux;TCP/IP;Torvalds, Linus:Minix, reworking for Linux+2}
-
-Such laziness, while admirable from an efficiency perspective, was troubling from a political perspective. For one thing, it underlined the lack of an ideological agenda on Torvalds' part. Unlike the GNU developers, Torvalds hadn't built his kernel out of a desire to give his fellow hackers freedom; he'd built it to have something he himself could play with. So what exactly was the combined system, and which philosophy would people associate it with? Was it a manifestation of the free software philosophy first articulated by Stallman in the /{GNU Manifesto}/? Or was it simply an amalgamation of nifty software tools that any user, similarly motivated, could assemble on his own home system?
-={GNU Manifesto}
-
-By late 1993, a growing number of GNU/Linux users had begun to lean toward the latter definition and began brewing private variations on the theme. They began to develop various "distributions" of GNU/Linux and distribute them, sometimes gratis, sometimes for a price. The results were spotty at best.
-
-"This was back before Red Hat and the other commercial distributions," remembers Ian Murdock, then a computer science student at Purdue University. "You'd flip through Unix magazines and find all these business card-sized ads proclaiming 'Linux.' Most of the companies were fly-by-night operations that saw nothing wrong with slipping a little of their own [proprietary] source code into the mix."
-={Murdock, Ian+38;Red Hat Inc.;Purdue University}
-
-Murdock, a Unix programmer, remembers being "swept away" by GNU/Linux when he first downloaded and installed it on his home PC system. "It was just a lot of fun," he says. "It made me want to get involved." The explosion of poorly built distributions began to dampen his early enthusiasm, however. Deciding that the best way to get involved was to build a version free of additives, Murdock set about putting a list of the best free software tools available with the intention of folding them into his own distribution. "I wanted something that would live up to the Linux name," Murdock says.
-
-In a bid to "stir up some interest," Murdock posted his intentions on the Internet, including Usenet's comp.os.linux newsgroup. One of the first responding email messages was from rms@ai.mit.edu. As a hacker, Murdock instantly recognized the address. It was Richard M. Stallman, founder of the GNU Project and a man Murdock knew even back then as "the hacker of hackers." Seeing the address in his mail queue, Murdock was puzzled. Why on Earth would Stallman, a person leading his own operating-system project, care about Murdock's gripes over "Linux" distributions?
-
-Murdock opened the message.
-
-"He said the Free Software Foundation was starting to look closely at Linux and that the FSF was interested in possibly doing a Linux [sic] system, too. Basically, it looked to Stallman like our goals were in line with their philosophy."
-={Free Software Foundation (FSF):Linux and+3}
-
-Not to over dramatize, the message represented a change in strategy on Stallman's part. Until 1993, Stallman had been content to keep his nose out of Linux affairs. After first hearing of the new kernel, Stallman asked a friend to check its suitability. Recalls Stallman, "Here ported back that the software was modeled after System V, which was the inferior version of Unix. He also told me it wasn't portable."
-={System V}
-
-The friend's report was correct. Built to run on 386-based machines, Linux was firmly rooted to its low-cost hardware platform. What the friend failed to report, however, was the sizable advantage Linux enjoyed as the only free kernel in the marketplace. In other words, while Stallman spent the next year and a half listening to progress reports from the Hurd developer, reporting rather slow progress, Torvalds was winning over the programmers who would later uproot and replant Linux and GNU onto new platforms.
-
-By 1993, the GNU Project's failure to deliver a working kernel was leading to problems both within the GNU Project and in the free software movement at large. A March, 1993, /{Wired}/ magazine article by Simson Garfinkel described the GNU Project as "bogged down" despite the success of the project's many tools.~{ See Simson Garfinkel, "Is Stallman Stalled?" /{Wired}/ (March, 1993). }~ Those within the project and its nonprofit adjunct, the Free Software Foundation, remember the mood as being even worse than Garfinkel's article let on. "It was very clear, at least to me at the time, that there was a window of opportunity to introduce a new operating system," says Chassell. "And once that window was closed, people would become less interested. Which is in fact exactly what happened."~{ Chassell's concern about there being a 36-month "window" for a new operating system is not unique to the GNU Project. During the early 1990s, free software versions of the Berkeley Software Distribution were held up by Unix System Laboratories' lawsuit restricting the release of BSD-derived software. While many users consider BSD offshoots such as FreeBSD and OpenBSD to be demonstrably superior to GNU/Linux both in terms of performance and security, the number of FreeBSD and OpenBSD users remains a fraction of the total GNU/Linux user population. To view a sample analysis of the relative success of GNU/Linux in relation to other free software operating systems, see the essay by New Zealand hacker, Liam Greenwood, "Why is Linux Successful" (1999), \\ http://www.freebsddiary.org/linux.php. }~
-={Garfinkel, Simson;GNU Project:kernel;Wired magazine:GNU Project and}
-
-Much has been made about the GNU Project's struggles during the 1990-1993 period. While some place the blame on Stallman for those struggles, Eric Raymond, an old friend of Stallman's who supported the GNU Project lukewarmly, says the problem was largely institutional. "The FSF got arrogant," Raymond says. "They moved away from the goal of doing a production-ready operating system to doing operating-system research." Even worse, "They thought nothing outside the FSF could affect them."
-={HURD kernel+4;Raymond, Eric}
-
-Murdock adopts a more charitable view. "I think part of the problem is they were a little too ambitious and they threw good money after bad," he says. "Micro-kernels in the late 80s and early 90s were a hot topic. Unfortunately, that was about the time that the GNU Project started to design their kernel. They ended up with a lot of baggage and it would have taken a lot of backpedaling to lose it."
-
-Stallman responds, "Although the emotions Raymond cites come from his imagination, he's right about one cause of the Hurd's delay:the Hurd developer several times redesigned and rewrote large parts of the code based on what he had learned, rather than trying to make the Hurd run as soon as possible. It was good design practice, but it wasn't the right practice for our goal: to get something working ASAP."
-
-Stallman cites other issues that also caused delay. The Lotus and Apple lawsuits claimed much of his attention; this, coupled with hand problems that prevented him from typing for three years, mostly excluded Stallman from programming. Stallman also cites poor communication between various portions of the GNU Project. "We had to do a lot of work to get the debugging environment to work," he recalls." And the people maintaining GDB at the time were not that cooperative." They had given priority to supporting the existing platforms of GDB's current users, rather than to the overall goal of a complete GNU system.
-
-Most fundamentally, however, Stallman says he and the Hurd developers underestimated the difficulty of developing the Unix kernel facilities on top of the Mach microkernel. "I figured, OK, the [Mach]part that has to talk to the machine has already been debugged," Stallman says, recalling the Hurd team's troubles in a 2000 speech. "With that head start, we should be able to get it done faster. But instead, it turned out that debugging these asynchronous multi-threaded programs was really hard. There were timing bugs that would clobber the files, and that's no fun. The end result was that it took many, many years to produce a test version."~{ See Maui High Performance Computing Center Speech. In subsequent emails, I asked Stallman what exactly he meant by the term "timing bugs." Stallman said "timing errors" was a better way to summarize the problem and offered an elucidating technical information of how a timing error can hamper an operating system's performance: \\ "Timing errors" occur in an asynchronous system where jobs done in parallel can theoretically occur in any order, and one particular order leads to problems. \\ Imagine that program A does X, and program B does Y, where both X and Y are short routines that examine and update the same data structure. Nearly always the computer will do X before Y, or do Y before X, and then there will be no problem. On rare occasions, by chance, the scheduler will let program A run until it is in the middle of X, and then run B which will do Y. Thus, Y will be done while Xis half-done. Since they are updating the same data structure, they will interfere. For instance, perhaps X has already examined the data structure, and it won't notice that there was a change. There will be an unreproducible failure, unreproducible because it depends on chance factors (when the scheduler decides to run which program and how long). \\ The way to prevent such a failure is to use a lock to make sure X and Y can't run at the same time. Programmers writing asynchronous systems know about the general need for locks, but sometimes they overlook the need for a lock in a specific place or on a specific data structure. Then the program has a timing error. }~
-
-Over time, the growing success of GNU together with Linux made it clear that the GNU Project should get on the train that was leaving and not wait for the Hurd. Besides, there were weaknesses in the community surrounding GNU/Linux. Sure, Linux had been licensed under the GPL, but as Murdock himself had noted, the desire to treat GNU/Linux as a purely free software operating system was far from unanimous. By late 1993, the total GNU/Linux user population had grown from a dozen or so enthusiasts to somewhere between 20,000 and 100,000.~{ GNU/Linux user-population numbers are sketchy at best, which is why I've provided such a broad range. The 100,000 total comes from the Red Hat "Milestones" site, \\ http://www.redhat.com/about/corporate/milestones.html. }~ What had once been a hobby was now a marketplace ripe for exploitation, and some developers had no objection to exploiting it with non-free software. Like Winston Churchill watching Soviet troops sweep into Berlin, Stallman felt an understandable set of mixed emotions when it came time to celebrate the GNU/Linux "victory."~{ I wrote this Winston Churchill analogy before Stallman himself sent me his own unsolicited comment on Churchill: \\ World War II and the determination needed to win it was a very strong memory as I was growing up. Statements such as Churchill's, "We will fight them in the landing zones, we will fight them on the beaches... we will never surrender," have always resonated for me. }~
-
-Although late to the party, Stallman still had clout. As soon as the FSF announced that it would lend its money and moral support to Murdock's software project, other offers of support began rolling in. Murdock dubbed the new project Debian - a compression of his and his wife, Deborah's, names - and within a few weeks was rolling out the first distribution. "[Richard's support] catapulted Debian almost overnight from this interesting little project to something people within the community had to pay attention to," Murdock says.
-={Debian+19}
-
-In January of 1994, Murdock issued the
-/{Debian Manifesto}/. Written in the spirit of Stallman's /{GNU Manifesto}/ from a decade before, it explained the importance of working closely with the Free Software Foundation. Murdock wrote:
-={Debian Manifesto+3;Free Software Foundation (FSF):Debian Manifesto and;GNU Manifesto:Debian Manifesto and}
-
-_1 The Free Software Foundation plays an extremely important role in the future of Debian. By the simple fact that they will be distributing it, a message is sent to the world that Linux [sic] is not a commercial product and that it never should be, but that this does not mean that Linux will never be able to compete commercially. For those of you who disagree, I challenge you to rationalize the success of GNU Emacs and GCC, which are not commercial software but which have had quite an impact on the commercial market regardless of that fact.
-
-_1 The time has come to concentrate on the future of Linux[sic] rather than on the destructive goal of enriching one-self at the expense of the entire Linux community and its future. The development and distribution of Debian may not be the answer to the problems that I have outlined in the /{Manifesto}/, but I hope that it will at least attract enough attention to these problems to allow them to be solved.~{ See Ian Murdock, /{A Brief History of Debian}/, (January 6, 1994): Appendix A, "The Debian Manifesto," \\ http://www.debian.org/doc/manuals/project-history/ap-manifesto.en.html. }~
-
-Shortly after the /{Manifesto's}/ release, the Free Software Foundation made its first major request. Stallman wanted Murdock to call its distribution "GNU/Linux." At first, Stallman proposed the term "Lignux" - combining the names Linux and GNU - but the initial reaction was very negative, and this convinced Stallman to go with the longer but less criticized GNU/Linux.
-={Lignux (Linux with GNU)}
-
-Some dismissed Stallman's attempt to add the "GNU" prefix as a belated quest for credit, never mind whether it was due, but Murdock saw it differently. Looking back, Murdock saw it as an attempt to counteract the growing tension between the GNU Project's developers and those who adapted GNU programs to use with the Linux kernel. "There was a split emerging," Murdock recalls. "Richard was concerned."
-={C programming language:glibc+3;glibc (GNU C Library)+3;GNU C Library (glibc)+3}
-
-By 1990, each GNU program had a designated maintainer-in-charge. Some GNU programs could run on many different systems, and users often contributed changes to port them to another system. Often these users knew only that one system, and did not consider how to keep the code clean for other systems. To add support for the new system while keeping the code comprehensible, so it could be maintained reliably for all systems, then required rewriting much of the changes. The maintainer-in-charge had the responsibility to critique the changes and tell their user-authors how to redo parts of the port. Generally they were eager to do this so that their changes would be integrated into the standard version. Then the maintainer-in-charge would edit in there worked changes, and take care of them in future maintenance. For some GNU programs, this had happened dozens of times for dozens of different systems.
-
-The programmers who adapted various GNU programs to work with the kernel Linux followed this common path: they considered only their own platform. But when the maintainers-in-charge asked them to help clean up their changes for future maintenance, several of them were not interested. They did not care about doing the correct thing, or about facilitating future maintenance of the GNU packages they had adapted. They cared only about their own versions and were inclined to maintain them as forks.
-
-In the hacker world, forks are an interesting issue. Although the hacker ethic permits a programmer to do anything he wants with a given program's source code, it is considered correct behavior to offer to work with the original developer to maintain a joint version. Hackers usually find it useful, as well as proper, to pour their improvements into the program's principal version. A free software license gives every hacker the right to fork a program, and sometimes it is necessary, but doing so without need or cause is considered somewhat rude.
-={forks (code)+3;tree (source code)}
-
-As leader of the GNU Project, Stallman had already experienced the negative effects of a software fork in 1991. Says Stallman, "Lucid hired several people to write improvements to GNU Emacs, meant to be contributions to it; but the developers did not inform me about the project. Instead they designed several new features on their own. As you might expect, I agreed with some of their decisions and disagreed with others. They asked me to incorporate all their code, but when I said I wanted to use about half of it, they declined to help me adapt that half to work on its own. I had to do it on my own." The fork had given birth to a parallel version, Lucid Emacs, and hard feelings all around.~{ Jamie Zawinski, a former Lucid programmer who would go on to head the Mozilla development team, has a web site that documents the Lucid/GNU Emacs fork, titled, "The Lemacs/FSFmacs Schism.", at \\ http://www.jwz.org/doc/lemacs.html. Stallman's response to those accusations is in \\ http://stallman.org/articles/xemacs.origin. }~
-={Emacs text editor:Lucid software company and;GNU Emacs:Lucid software company and;Lucid software company}
-
-Now programmers had forked several of the principal GNU packages at once. At first, Stallman says he considered the forks to be a product of impatience. In contrast to the fast and informal dynamics of the Linux team, GNU source-code maintainers tended to be slower and more circumspect in making changes that might affect a program's long-term viability. They also were unafraid of harshly critiquing other people's code. Over time, however, Stallman began to sense that there was an underlying lack of awareness of the GNU Project and its objectives when reading Linux developers' emails.
-
-"We discovered that the people who considered themselves 'Linux users' didn't care about the GNU Project," Stallman says. "They said, 'Why should I bother doing these things? I don't care about the GNU Project. It [the program]'s working for me. It's working for us Linux users, and nothing else matters to us.' And that was quite surprising, given that people were essentially using a variant of the GNU system, and they cared so little. They cared less than anybody else about GNU." Fooled by their own practice of calling the combination "Linux," they did not realize that their system was more GNU than Linux.
-
-For the sake of unity, Stallman asked the maintainers-in-charge to do the work which normally the change authors should have done. In most cases this was feasible, but not in glibc. Short for GNU C Library, glibc is the package that all programs use to make "system calls" directed at the kernel, in this case Linux. User programs on a Unix-like system communicate with the kernel only through the C library.
-
-The changes to make glibc work as a communication channel between Linux and all the other programs in the system were major and ad-hoc, written without attention to their effect on other platforms. For the glibc maintainer-in-charge, the task of cleaning them up was daunting. Instead the Free Software Foundation paid him to spend most of a year reimplementing these changes from scratch, to make glibc version 6 work "straight out of the box" in GNU/Linux.
-
-Murdock says this was the precipitating cause that motivated Stallman to insist on adding the GNU prefix when Debian rolled out its software distribution. "The fork has since converged. Still, at the time, there was a concern that if the Linux community saw itself as a different thing as the GNU community, it might be a force for disunity."
-
-While some viewed it as politically grasping to describe the combination of GNU and Linux as a "variant" of GNU, Murdock, already sympathetic to the free software cause, saw Stallman's request to call Debian's version GNU/Linux as reasonable. "It was more for unity than for credit," he says.
-
-Requests of a more technical nature quickly followed. Although Murdock had been accommodating on political issues, he struck a firmer pose when it came to the design and development model of the actual software. What had begun as a show of solidarity soon became a running disagreement.
-
-"I can tell you that I've had my share of disagreements with him," says Murdock with a laugh. "In all honesty Richard can be a fairly difficult person to work with." The principal disagreement was over debugging. Stallman wanted to include debugging information in all executable programs, to enable users to immediately investigate any bugs they might encounter. Murdock thought this would make the system files too big and interfere with distribution. Neither was willing to change his mind.
-
-In 1996, Murdock, following his graduation from Purdue, decided to hand over the reins of the growing Debian project. He had already been ceding management duties to Bruce Perens, the hacker best known for his work on Electric Fence, a Unix utility released under the GPL. Perens, like Murdock, was a Unix programmer who had become enamored of GNU/Linux as soon as the operating system's Unix-like abilities became manifest. Like Murdock, Perens sympathized with the political agenda of Stallman and the Free Software Foundation, albeit from afar.
-={Electric Fence Unix utility; Perens, Bruce+3}
-
-"I remember after Stallman had already come out with the /{GNU Manifesto}/, GNU Emacs, and GCC, I read an article that said he was working as a consultant for Intel," says Perens, recalling his first brush with Stallman in the late 1980s. "I wrote him asking how he could be advocating free software on the one hand and working for Intel on the other. He wrote back saying, 'I work as a consultant to produce free-software.' He was perfectly polite about it, and I thought his answer made perfect sense."
-
-As a prominent Debian developer, however, Perens regarded Murdock's design battles with Stallman with dismay. Upon assuming leadership of the development team, Perens says he made the command decision to distance Debian from the Free Software Foundation. "I decided we did not want Richard's style of micro-management," he says.
-
-According to Perens, Stallman was taken aback by the decision but had the wisdom to roll with it. "He gave it some time to cool off and sent a message that we really needed a relationship. He requested that we call it GNU/Linux and left it at that. I decided that was fine. I made the decision unilaterally. Everybody breathed a sigh of relief."
-
-Over time, Debian would develop a reputation as the hacker's version of GNU/Linux, alongside Slackware, another popular distribution founded during the same 1993-1994 period. However, Slackware contained some non-free programs, and Debian after its separation from GNU began distributing non-free programs too.~{ Debian Buzz in June 1996 contained non-free Netscape 3.01 in its Contrib section. }~ Despite labeling them as "non-free" and saying that they were "not officially part of Debian," proposing these programs to the user implied a kind of endorsement for them. As the GNU Project became aware of these policies, it came to recognize that neither Slackware nor Debian was a GNU/Linux distro it could recommend to the public.
-={Gilmore, John; Young, Robert+2;Red Hat Inc.;Teimann, Michael;Slackware}
-
-Outside the realm of hacker-oriented systems, however, GNU/Linux was picking up steam in the commercial Unix marketplace. In North Carolina, a Unix company billing itself as Red Hat was revamping its business to focus on GNU/Linux. The chief executive officer was Robert Young, the former /{Linux Journal}/ editor who in 1994 had put the question to Linus Torvalds, asking whether he had any regrets about putting the kernel under the GPL. To Young, Torvalds' response had a "profound" impact on his own view toward GNU/Linux. Instead of looking for a way to corner the GNU/Linux market via traditional software tactics, Young began to consider what might happen if a company adopted the same approach as Debian - i.e., building an operating system completely out of free software parts. Cygnus Solutions, the company founded by Michael Tiemann and John Gilmore in 1990, was already demonstrating the ability to sell free software based on quality and customizability. What if Red Hat took the same approach with GNU/Linux?
-
-"In the western scientific tradition we stand on the shoulders of giants," says Young, echoing both Torvalds and Sir Isaac Newton before him. "In business, this translates to not having to reinvent wheels as we go along. The beauty of [the GPL] model is you put your code into the public domain.~{ Young uses the term "public domain" loosely here. Strictly speaking, it means "not copyrighted." Code released under the GNU GPL cannot be in the public domain, since it must be copyrighted in order for the GNU GPL to apply. }~ If you're an independent software vendor and you're trying to build some application and you need a modem-dialer, well, why reinvent modem dialers? You can just steal PPP off of Red Hat [GNU/]Linux and use that as the core of your modem-dialing tool. If you need a graphic tool set, you don't have to write your own graphic library. Just download GTK. Suddenly you have the ability to reuse the best of what went before. And suddenly your focus as an application vendor is less on software management and more on writing the applications specific to your customer's needs." However, Young was no free software activist, and readily included non-free programs in Red Hat's GNU/Linux system.
-
-Young wasn't the only software executive intrigued by the business efficiencies of free software. By late 1996, most Unix companies were starting to wake up and smell the brewing source code. The GNU/Linux sector was still a good year or two away from full commercial breakout mode, but those close enough to the hacker community could feel it: something big was happening. The Intel 386 chip, the Internet, and the World Wide Web had hit the marketplace like a set of monster waves; free software seemed like the largest wave yet.
-
-For Ian Murdock, the wave seemed both a fitting tribute and a fitting punishment for the man who had spent so much time giving the free software movement an identity. Like many Linux aficionados, Murdock had seen the original postings. He'd seen Torvalds' original admonition that Linux was "just a hobby." He'd also seen Torvalds' admission to Minix creator Andrew Tanenbaum: "If the GNU kernel had been ready last spring, I'd not have bothered to even start my project."~{ This quote is taken from the much publicized Torvalds-Tanenbaum "flame war" following the initial release of Linux. In the process of defending his choice of a non-portable monolithic kernel design, Torvalds says he started working on Linux as a way to learn more about his new 386 PC. "If the GNU kernel had been ready last spring, I'd not have bothered to even start my project." See Chris DiBona et al., /{Open Sources}/ (O'Reilly & Associates, Inc., 1999): 224. }~ Like many, Murdock knew that some opportunities had been missed. He also knew the excitement of watching new opportunities come seeping out of the very fabric of the Internet.
-={Tanenbaum, Andrew}
-
-"Being involved with Linux in those early days was fun," recalls Murdock. "At the same time, it was something to do, something to pass the time. If you go back and read those old [comp.os.minix]exchanges, you'll see the sentiment: this is something we can play with until the Hurd is ready. People were anxious. It's funny, but in a lot of ways, I suspect that Linux would never have happened if the Hurd had come along more quickly."
-
-By the end of 1996, however, such "what if" questions were already moot, because Torvalds' kernel had gained a critical mass of users. The 36-month window had closed, meaning that even if the GNU Project had rolled out its Hurd kernel, chances were slim anybody outside the hard-core hacker community would have noticed. Linux, by filling the GNU system's last gap, had achieved the GNU Project's goal of producing a Unix-like free software operating system. However, most of the users did not recognize what had happened: they thought the whole system was Linux, and that Torvalds had done it all. Most of them installed distributions that came with non-free software; with Torvalds as their ethical guide, they saw no principled reason to reject it. Still, a precarious freedom was available for those that appreciated it.
-={HURD kernel}
-
-1~ Chapter 11 - Open Source
-={GNU Project:open source movement and+59;open source+59;Stallman, Richard M.:open source and+59}
-
-[RMS: In this chapter only, I have deleted some quotations. The material deleted was about open source and didn't relate to my life or my work.]
-
-In November, 1995, Peter Salus, a member of the Free Software Foundation and author of the 1994 book, /{A Quarter Century of Unix}/, issued a call for papers to members of the GNU Project's "system-discuss" mailing list. Salus, the conference's scheduled chairman, wanted to tip off fellow hackers about the upcoming Conference on Freely Redistributable Software in Cambridge, Massachusetts. Slated for February, 1996, and sponsored by the Free Software Foundation, the event promised to be the first engineering conference solely dedicated to free software and, in a show of unity with other free software programmers, welcomed papers on "any aspect of GNU, Linux, NetBSD, 386BSD, FreeBSD, Perl, Tcl/tk, and other tools for which the code is accessible and redistributable." Salus wrote:
-={Free Software Foundation (FSF);FSF (Free Software Foundation);FreeBSD;Conference on Freely Redistributable Software+1;Linux;NetBSD;Perl programming language;386BSD;Salus, Peter+4}
-
-_1 Over the past 15 years, free and low-cost software has become ubiquitous. This conference will bring together implementers of several different types of freely redistributable software and publishers of such software (on various media). There will be tutorials and refereed papers, as well as keynotes by Linus Torvalds and Richard Stallman.~{ See Peter Salus, "FYI-Conference on Freely Redistributable Software, 2/2, Cambridge" (1995) (archived by Terry Winograd), \\ http://bat8.inria.fr/~lang/hotlist/free/licence/fsf96/call-for-papers.html. }~
-
-Among the recipients of Salus' email was conference committee member Eric S. Raymond. Although not the leader of a project or company like the various other members of the list, Raymond had built a tidy reputation within the hacker community for some software projects and as editor of /{The New Hacker's Dictionary}/, a greatly enlarged version of /{The Hacker's Dictionary}/ published a decade earlier by Guy Steele.
-={New Hacker Dictionary, The;Raymond, Eric:open source and+56}
-
-For Raymond, the 1996 conference was a welcome event. Although he did not thoroughly support the free software movement's ideas, he had contributed to some GNU programs, in particular to GNU Emacs. Those contributions stopped in 1992, when Raymond demanded authority to make changes in the official GNU version of GNU Emacs without discussing them with Stallman, who was directly in charge of Emacs development. Stallman rejected the demand, and Raymond accused Stallman of "micro-management." "Richard kicked up a fuss about my making unauthorized modifications when I was cleaning up the Emacs LISP libraries," Raymond recalls. "It frustrated me so much that I decided I didn't want to work with him anymore."
-
-Despite the falling out, Raymond remained active in the free software community. So much so that when Salus suggested a conference pairing Stallman and Torvalds as keynote speakers, Raymond eagerly seconded the idea. With Stallman representing the older, wiser contingent of ITS/Unix hackers and Torvalds representing the younger, more energetic crop of Linux hackers, the pairing indicated a symbolic show of unity that could only be beneficial, especially to ambitious younger (i.e., below 40) hackers such as Raymond. "I sort of had afoot in both camps," Raymond says.
-
-By the time of the conference, the tension between those two camps had become palpable. Both groups had one thing in common, though:the conference was their first chance to meet the Finnish /{wunderkind}/ in the flesh. Surprisingly, Torvalds proved himself to be a charming, affable speaker. Possessing only a slight Swedish accent, Torvalds surprised audience members with his quick, self-effacing wit.~{ Although Linus Torvalds is Finnish, his mother tongue is Swedish. "The Rampantly Unofficial Linus FAQ" at \\ http://catb.org/~esr/faqs/linus/ offers a brief explanation:Finland has a significant (about 6%) Swedish-speaking minority population. They call themselves finlands svensk or finlands svenskar and consider themselves Finns; many of their families have lived in Finland for centuries. Swedish is one of Finland's two official languages. }~
-
-Even more surprising, says Raymond, was Torvalds' equal willingness to take potshots at other prominent hackers, including the most prominent hacker of all, Richard Stallman. By the end of the conference, Torvalds' half-hacker, half-slacker manner was winning over older and younger conference-goers alike.
-
-"It was a pivotal moment," recalls Raymond. "Before 1996, Richard was the only credible claimant to being the ideological leader of the entire culture. People who dissented didn't do so in public. The person who broke that taboo was Torvalds."
-
-The ultimate breach of taboo would come near the end of the show. During a discussion on the growing market dominance of Microsoft Windows or some similar topic, Torvalds admitted to being a fan of Microsoft's PowerPoint slideshow software program. From the perspective of old-line software purists, it was like bragging about one's slaves at an abolitionist conference. From the perspective of Torvalds and his growing band of followers, it was simply common sense. Why shun convenient proprietary software programs just to make a point? They didn't agree with the point anyway. When freedom requires a sacrifice, those who don't care about freedom see the sacrifice as self-denial, rather than as a way to obtain something important. Being a hacker wasn't about self-denial, it was about getting the job done, and "the job," for them, was defined in practical terms.
-={Windows (Microsoft);Microsoft Corporation+3;PowerPoint (Microsoft)+3;proprietary software:Torvalds, Linus and;Torvalds, Linus:PowerPoint and+3}
-
-"That was a pretty shocking thing to say," Raymond remembers. "Then again, he was able to do that, because by 1995 and 1996, he was rapidly acquiring clout."
-
-Stallman, for his part, doesn't remember any tension at the 1996conference; he probably wasn't present when Torvalds made that statement. But he does remember later feeling the sting of Torvalds' celebrated "cheekiness." "There was a thing in the Linux documentation which says print out the GNU coding standards and then tear them up," says Stallman, recalling one example. "When you look closely, what he disagreed with was the least important part of it, the recommendation for how to indent C code."
-
-"OK, so he disagrees with some of our conventions. That's fine, bu the picked a singularly nasty way of saying so. He could have just said,'Here's the way I think you should indent your code.' Fine. There should be no hostility there."
-
-For Raymond, the warm reception other hackers gave to Torvalds' comments confirmed a suspicion: the dividing line separating Linux developers from GNU developers was largely generational. Many Linux hackers, like Torvalds, had grown up in a world of proprietary software. They had begun contributing to free software without perceiving any injustice in non-free software. For most of them, nothing was at stake beyond convenience. Unless a program was technically inferior, they saw little reason to reject it on licensing issues alone. Some day hackers might develop a free software alternative to PowerPoint. Until then, why criticize PowerPoint or Microsoft; why not use it?
-
-This was an example of the growing dispute, within the free software community, between those who valued freedom as such, and those who mainly valued powerful, reliable software. Stallman referred to the two camps as political parties within the community, calling the former the "freedom party." The supporters of the other camp did not try to name it, so Stallman disparagingly called it the "bandwagon party" or the "success party," because many of them presented "more users" as the primary goal.
-
-In the decade since launching the GNU Project, Stallman had built up a fearsome reputation as a programmer. He had also built up a reputation for intransigence both in terms of software design and people management. This was partly true, but the reputation provided a convenient excuse that anyone could cite if Stallman did not do as he wished. The reputation has been augmented by mistaken guesses.
-
-For example, shortly before the 1996 conference, the Free Software Foundation experienced a full-scale staff defection. Brian Youmans, a current FSF staffer hired by Salus in the wake of the resignations, recalls the scene: "At one point, Peter [Salus] was the only staff member working in the office." The previous staff were unhappy with the executive director; as Bryt Bradley told her friends in December, 1995:
-
-_1 [name omitted] (the Executive Director of the FSF) decided to come back from Medical/Political Leave last week. The office staff (Gena Bean, Mike Drain, and myself) decided we could not work with her as our supervisor because of the many mistakes she had made in her job tasks prior to her taking a leave. Also, there had been numerous instances where individuals were threatened with inappropriate firing and there were many instances of what we felt were verbal abuse from her to ALL members of the office staff. We requested (many times) that she not come back as our supervisor, but stated that we were willing to work with her as a co-worker. Our requests were ignored. We quit.
-
-The executive director in question then gave Stallman an ultimatum: give her total autonomy in the office or she would quit. Stallman, as president of the FSF, declined to give her total control over its activities, so she resigned, and he recruited in Peter Salus to replace her.
-
-When Raymond, an outsider, learned that these people had left the FSF, he presumed Stallman was at fault. This provided confirmation for his theory that Stallman's personality was the cause of any and all problems in the GNU Project.
-
-Raymond had another theory: recent delays such as the Hurd and recent troubles such as the Lucid-Emacs schism reflected problems normally associated with software project management, not software code development.
-
-Shortly after the Freely Redistributable Software Conference, Raymond began working on his own pet software project, a mail utility called "fetchmail." Taking a cue from Torvalds, Raymond issued his program with a tacked-on promise to update the source code as early and as often as possible. When users began sending in bug reports and feature suggestions, Raymond, at first anticipating a tangled mess, found the resulting software surprisingly sturdy. Analyzing the success of the Torvalds approach, Raymond issued a quick analysis: using the Internet as his "petri dish" and the harsh scrutiny of the hacker community as a form of natural selection, Torvalds had created an evolutionary model free of central planning.
-={fetchmail;FreeBSD;Conference on Freely Redistributable Software;Internet}
-
-What's more, Raymond decided, Torvalds had found a way around Brooks' Law. First articulated by Fred P. Brooks, manager of IBM's OS/360 project and author of the 1975 book, /{The Mythical Man-Month}/, Brooks' Law held that adding developers to a project only resulted in further project delays. Believing as most hackers that software, like soup, benefits from a limited number of cooks, Raymond sensed something revolutionary at work. In inviting more and more cooks into the kitchen, Torvalds had actually found a way to make the resulting software /{better}/.~{ Brooks' Law is the shorthand summary of the following quote taken from Brooks' book:Since software construction is inherently a systems effort - an exercise in complex interrelationships - communication effort is great, and it quickly dominates the decrease in individual task time brought about by partitioning. Adding more men then lengthens, not shortens, the schedule. See Fred P. Brooks, The Mythical Man-Month (Addison Wesley Publishing, 1995). }~
-={Brooks, Fred P.;Mythical Man-Month, The (Brooks)}
-
-Raymond put his observations on paper. He crafted them into a speech, which he promptly delivered before a group of friends and neighbors in Chester County, Pennsylvania. Dubbed "The Cathedral and the Bazaar," the speech contrasted the "Bazaar" style originated by Torvalds with the "Cathedral" style generally used by everyone else.
-={Cathedral and the Bazaar, The (Raymond)+10;Linux Kongress+6}
-
-Raymond says the response was enthusiastic, but not nearly as enthusiastic as the one he received during the 1997 Linux Kongress, a gathering of GNU/Linux users in Germany the next spring.
-
-"At the Kongress, they gave me a standing ovation at the end of the speech," Raymond recalls. "I took that as significant for two reasons. For one thing, it meant they were excited by what they were hearing. For another thing, it meant they were excited even after hearing the speech delivered through a language barrier."
-
-Eventually, Raymond would convert the speech into a paper, also titled "The Cathedral and the Bazaar." The paper drew its name from Raymond's central analogy. Previously, programs were "cathedrals," impressive, centrally planned monuments built to stand the test of time. Linux, on the other hand, was more like "a great babbling bazaar," a software program developed through the loose decentralizing dynamics of the Internet.
-
-Raymond's paper associated the Cathedral style, which he and Stallman and many others had used, specifically with the GNU Project and Stallman, thus casting the contrast between development models as a comparison between Stallman and Torvalds. Where Stallman was his chosen example of the classic cathedral architect - i.e., a programming "wizard" who could disappear for 18 months and return with something like the GNU C Compiler - Torvalds was more like a genial dinner-party host. In letting others lead the Linux design discussion and stepping in only when the entire table needed a referee, Torvalds had created a development model very much reflective of his own laid-back personality. From Torvalds' perspective, the most important managerial task was not imposing control but keeping the ideas flowing.
-
-Summarized Raymond, "I think Linus's cleverest and most consequential hack was not the construction of the Linux kernel itself, but rather his invention of the Linux development model."~{ See Eric Raymond, "The Cathedral and the Bazaar" (1997). }~
-
-If the paper's description of these two styles of development was perceptive, its association of the Cathedral model specifically with Stallman (rather than all the others who had used it, including Raymond himself) was sheer calumny. In fact, the developers of some GNU packages including the GNU Hurd had read about and adopted Torvalds' methods before Raymond tried them, though without analyzing them further and publicly championing them as Raymond's paper did. Thousands of hackers, reading Raymond's article, must have been led to a negative attitude towards GNU by this smear.
-
-In summarizing the secrets of Torvalds' managerial success, Raymond attracted the attention of other members of the free software community for whom freedom was not a priority. They sought to interest business in the use and development of free software, and to do so, decided to cast the issue in terms of the values that appeal to business: powerful, reliable, cheap, advanced. Raymond became the best-known proponent of these ideas, and they reached the management of Netscape, whose proprietary browser was losing market share to Microsoft's equally proprietary Internet Explorer. Intrigued by a speech by Raymond, Netscape executives took the message back to corporate headquarters. A few months later, in January, 1998, the company announced its plan to publish the source code of its flagship Navigator web browser in the hopes of enlisting hacker support in future development.
-={Netscape+8;source code:Netscape+4}
-
-% ={Monterey (California);O'Reilly, Tim;O'Reilly & Associates}
-% ={Apache web server;BIND (Berkely Internet Naming Daemon);Berkely Internet Naming Daemon (BIND);Wall, Larry;Perl programming language;Python programming language;sendmail Unix mail program}
-% ={Mountain View (California);Netscape+8}
-
-When Netscape CEO Jim Barksdale cited Raymond's "Cathedral and the Bazaar" essay as a major influence upon the company's decision, the company instantly elevated Raymond to the level of hacker celebrity. He invited a few people including Larry Augustin, founder of VA Research which sold workstations with the GNU/Linux operating system pre-installed; Tim O'Reilly, founder of the publisher O'Reilly& Associates; and Christine Peterson, president of the Foresight Institute, a Silicon Valley think tank specializing in nano technology, to talk. "The meeting's agenda boiled down to one item: how to take advantage of Netscape's decision so that other companies might follow suit?"
-={Augustin, Larry;Foresight Institute;VA Research;Peterson, Christine+4;Barksdale, Jim}
-
-Raymond doesn't recall the conversation that took place, but he does remember the first complaint addressed. Despite the best efforts of Stallman and other hackers to remind people that the word "free" in free software stood for freedom and not price, the message still wasn't getting through. Most business executives, upon hearing the term for the first time, interpreted the word as synonymous with "zero cost," tuning out any follow-up messages in short order. Until hackers found a way to get past this misunderstanding, the free software movement faced an uphill climb, even after Netscape.
-
-Peterson, whose organization had taken an active interest in advancing the free software cause, offered an alternative: "open source."
-
-Looking back, Peterson says she came up with the "open source" term while discussing Netscape's decision with a friend in the public relations industry. She doesn't remember where she came upon the term or if she borrowed it from another field, but she does remember her friend disliking the term.~{ See Malcolm Maclachlan, "Profit Motive Splits Open Source Movement," Tech-Web News (August 26, 1998), \\ http://www.techweb.com/article/showArticle?articleID=29102344. }~
-
-At the meeting, Peterson says, the response was dramatically different. "I was hesitant about suggesting it," Peterson recalls. "I had no standing with the group, so started using it casually, not highlighting it as a new term." To Peterson's surprise, the term caught on. By the end of the meeting, most of the attendees, including Raymond, seemed pleased by it.
-
-Raymond says he didn't publicly use the term "open source" as a substitute for "free software" until a day or two after the Mozilla launch party, when O'Reilly had scheduled a meeting to talk about free-software. Calling his meeting "the Freeware Summit," O'Reilly says he wanted to direct media and community attention to the other deserving projects that had also encouraged Netscape to release Mozilla. "All these guys had so much in common, and I was surprised they didn't all know each other," says O'Reilly. "I also wanted to let the world know just how great an impact the free software culture had already made. People were missing out on a large part of the free-software tradition."
-={Freeware Summit;O'Reilly, Tim:open source and+8}
-
-In putting together the invite list, however, O'Reilly made a decision that would have long-term political consequences. He decided to limit the list to west-coast developers such as Wall, Eric Allman, creator of send mail, and Paul Vixie, creator of BIND. There were exceptions, of course: Pennsylvania-resident Raymond, who was already in town thanks to the Mozilla launch, earned an quick invite. So did Virginia-resident Guido van Rossum, creator of Python. "Frank Willison, my editor in chief and champion of Python within the company, invited him without first checking in with me," O'Reilly recalls. "I was happy to have him there, but when I started, it really was just a local gathering."
-={van Rossum, Guido;Python programming language;BIND (Berkely Internet Naming Daemon);Berkely Internet Naming Daemon (BIND);Wall, Larry;Perl programming language;Python programming language;sendmail Unix mail program}
-
-For some observers, the unwillingness to include Stallman's name on the list qualified as a snub. "I decided not to go to the event because of it," says Perens, remembering the summit. Raymond, who did go, says he argued for Stallman's inclusion to no avail. The snub rumor gained additional strength from the fact that O'Reilly, the event's host, had feuded publicly with Stallman over the issue of software-manual copyrights. Prior to the meeting, Stallman had argued that free software manuals should be as freely copyable and modifiable as free software programs. O'Reilly, meanwhile, argued that a value-added market for non-free books increased the utility of free software by making it more accessible to a wider community. The two had also disputed the title of the event, with Stallman insisting on "Free Software" rather than "Freeware." The latter term most often refers to programs which are available gratis, but which are not free software because their source code is not released.
-
-Looking back, O'Reilly doesn't see the decision to leave Stallman's name off the invite list as a snub. "At that time, I had never met Richard in person, but in our email interactions, he'd been inflexible and unwilling to engage in dialogue. I wanted to make sure the GNU tradition was represented at the meeting, so I invited John Gilmore and Michael Tiemann, whom I knew personally, and whom I knew were passionate about the value of the GPL but seemed more willing to engage in a frank back-and-forth about the strengths and weaknesses of the various free software projects and traditions. Given all the later brouhaha, I do wish I'd invited Richard as well, but I certainly don't think that my failure to do so should be interpreted as a lack of respect for the GNU Project or for Richard personally."
-={Gilmore, John;Tiemann, Michael+7}
-
-Snub or no snub, both O'Reilly and Raymond say the term "open-source" won over just enough summit-goers to qualify as a success. The attendees shared ideas and experiences and brainstormed on how to improve free software's image. Of key concern was how to point out the successes of free software, particularly in the realm of Internet infrastructure, as opposed to playing up the GNU/Linux challenge to Microsoft Windows. But like the earlier meeting at VA, the discussion soon turned to the problems associated with the term "free software." O'Reilly, the summit host, remembers a comment from Torvalds, a summit attendee.
-
-"Linus had just moved to Silicon Valley at that point, and he explained how only recently that he had learned that the word 'free' had two meanings - free as in 'libre' and free as in 'gratis' - in English."
-
-Michael Tiemann, founder of Cygnus, proposed an alternative to the troublesome "free software" term: sourceware. "Nobody got too excited about it," O'Reilly recalls. "That's when Eric threw out the term 'open source.'"
-
-Although the term appealed to some, support for a change in offcial terminology was far from unanimous. At the end of the one-day conference, attendees put the three terms - free software, open source, or sourceware - to a vote. According to O'Reilly, 9 out of the 15 attendees voted for "open source." Although some still quibbled with the term, all attendees agreed to use it in future discussions with the press. "We wanted to go out with a solidarity message," O'Reilly says.
-
-The term didn't take long to enter the national lexicon. Shortly after the summit, O'Reilly shepherded summit attendees to a press conference attended by reporters from the /{New York Times}/, the /{Wall Street Journal}/, and other prominent publications. Within a few months, Torvalds' face was appearing on the cover of /{Forbes}/ magazine, with the faces of Stallman, Perl creator Larry Wall, and Apache team leader Brian Behlendorf featured in the interior spread. Open source was open for business.
-={Wall, Larry}
-
-For summit attendees such as Tiemann, the solidarity message was the most important thing. Although his company had achieved a fair amount of success selling free software tools and services, he sensed the difficulty other programmers and entrepreneurs faced.
-
-"There's no question that the use of the word free was confusing in a lot of situations," Tiemann says. "Open source positioned itself as being business friendly and business sensible. Free software positioned itself as morally righteous. For better or worse we figured it was more advantageous to align with the open source crowd.
-
-Raymond called Stallman after the meeting to tell him about the new term "open source" and ask if he would use it. Raymond says Stallman briefly considered adopting the term, only to discard it. "I know because I had direct personal conversations about it," Raymond says.
-
-Stallman's immediate response was, "I'll have to think about it." The following day he had concluded that the values of Raymond and O'Reilly would surely dominate the future discourse of "open source," and that the best way to keep the ideas of the free software movement in public view was to stick to its traditional term.
-
-Later in 1998, Stallman announced his position: "open source," while helpful in communicating the technical advantages of free software also encouraged speakers to soft-pedal the issue of software freedom. It avoided the unintended meaning of "gratis software" and the intended meaning of "freedom-respecting software" equally. As a means for conveying the latter meaning, it was therefore no use. In effect, Raymond and O'Reilly had given a name to the non-idealistic political party in the community, the one Stallman did not agree with.
-
-In addition, Stallman thought that the ideas of "open source" led people to put too much emphasis on winning the support of business. While such support in itself wasn't necessarily bad in itself, he expected that being too desperate for it would lead to harmful compromises. "Negotiation 101 would teach you that if you are desperate to get someone's agreement, you are asking for a bad deal," he says. "You need to be prepared to say no." Summing up his position at the 1999 LinuxWorld Convention and Expo, an event billed by Torvalds himself as a "coming out party" for the "Linux" community, Stallman implored his fellow hackers to resist the lure of easy compromise.
-={LinuxWorld Conventions+2}
-
-"Because we've shown how much we can do, we don't have to be desperate to work with companies or compromise our goals," Stallman said during a panel discussion. "Let them offer and we'll accept. We don't have to change what we're doing to get them to help us. You can take a single step towards a goal, then another and then more and more and you'll actually reach your goal. Or, you can take a half measure that means you don't ever take another step, and you'll never get there."
-
-Even before the LinuxWorld show, however, Stallman was showing an increased willingness to alienate open source supporters. A few months after the Freeware Summit, O'Reilly hosted its second annual Perl Conference. This time around, Stallman was in attendance. During a panel discussion lauding IBM's decision to employ the free software Apache web server in its commercial offerings, Stallman, taking advantage of an audience microphone, made a sharp denunciation of panelist John Ousterhout, creator of the Tcl scripting language. Stallman branded Ousterhout a "parasite" on the free software community for marketing a proprietary version of Tcl via Ousterhout's startup company, Scriptics. Ousterhout had stated that Scriptics would contribute only the barest minimum of its improvements to the free version of Tcl, meaning it would in effect use that small contribution to win community approval for much a larger amount of non-free software development. Stallman rejected this position and denounced Scriptics' plans. "I don't think Scriptics is necessary for the continued existenceof Tcl," Stallman said to hisses from the fellow audience members.~{ Ibid. }~
-={Apache web server;IBM:Apache web server and;Ousterhout, John;Tcl scripting language+1;Scriptics}
-
-"It was a pretty ugly scene," recalls Prime Time Freeware's Rich Morin. "John's done some pretty respectable things: Tcl, Tk, Sprite. He's a real contributor." Despite his sympathies for Stallman and Stallman's position, Morin felt empathy for those troubled by Stallman's discordant words.
-={Morin, Rich+1;Prime Time Freeware;Sprite}
-
-Stallman will not apologize. "Criticizing proprietary software isn't ugly - proprietary software is ugly. Ousterhout had indeed made real contributions in the past, but the point is that Scriptics was going to be nearly 100% a proprietary software company. In that conference, standing up for freedom meant disagreeing with nearly everyone. Speaking from the audience, I could only say a few sentences. The only way to raise the issue so it would not be immediately forgotten was to put it in strong terms."
-
-"If people rebuke me for 'making a scene' when I state a serious criticism of someone's conduct, while calling Torvalds 'cheeky' for saying nastier things about trivial matters, that seems like a double standard to me."
-
-Stallman's controversial criticism of Ousterhout momentarily alienated a potential sympathizer, Bruce Perens. In 1998, Eric Raymond proposed launching the Open Source Initiative, or OSI, an organization that would police the use of the term "open source" and provide a definition for companies interested in making their own programs. Raymond recruited Perens to draft the definition.~{ See Bruce Perens et al., "The Open Source Definition," The Open Source Initiative (1998), \\ http://www.opensource.org/docs/definition.html. }~
-={OSI (Open Source Initiative);Open Source Initiative (OSI);Perens, Bruce+1}
-
-Perens would later resign from the OSI, expressing regret that the organization had set itself up in opposition to Stallman and the FSF. Still, looking back on the need for a free software definition outside the Free Software Foundation's auspices, Perens understands why other hackers might still feel the need for distance. "I really like and admire Richard," says Perens. "I do think Richard would do his job better if Richard had more balance. That includes going away from free-software for a couple of months."
-
-Stallman's energies would do little to counteract the public-relations momentum of open source proponents. In August of 1998, when chip-maker Intel purchased a stake in GNU/Linux vendor Red Hat, an accompanying /{New York Times}/ article described the company as the product of a movement "known alternatively as free software and opensource."~{ See Amy Harmon, "For Sale: Free Operating System," New York Times (September 28, 1998), \\ http://www.nytimes.com/library/tech/98/09/biztech/articles/28linux.html. }~ Six months later, a John Markoff article on Apple Computerwas proclaiming the company's adoption of the "open source" Apache server in the article headline.~{ See John Markoff, "Apple Adopts 'Open Source' for its Server Computers," New York Times (March 17, 1999), \\ http://www.nytimes.com/library/tech/99/03/biztech/articles/17apple.html. }~
-={Apache web server;Apple Computers:open source software and;Intel;Markoff, John;Red Hat Inc.:success of+1}
-
-Such momentum would coincide with the growing momentum of companies that actively embraced the "open source" term. By August of 1999, Red Hat, a company that now eagerly billed itself as "opensource," was selling shares on Nasdaq. In December, VA Linux -formerly VA Research - was floating its own IPO to historic effect. Opening at $30 per share, the company's stock price exploded past the $300 mark in initial trading only to settle back down to the $239 level. Shareholders lucky enough to get in at the bottom and stay until the end experienced a 698% increase in paper wealth, a Nasdaq record. Eric Raymond, as a board member, owned shares worth $36 million. However, these high prices were temporary; they tumbled when the dot-com boom ended.
-={VA Linux+1;VA Research}
-
-The open source proponents' message was simple: all you need, to sell the free software concept, is to make it business-friendly. They saw Stallman and the free software movement as fighting the market;they sought instead to leverage it. Instead of playing the role of high-school outcasts, they had played the game of celebrity, magnifying their power in the process.
-
-These methods won great success for open source, but not for the ideals of free software. What they had done to "spread the message" was to omit the most important part of it: the idea of freedom as an ethical issue. The effects of this omission are visible today: as of 2009, nearly all GNU/Linux distributions include proprietary programs, Torvalds' version of Linux contains proprietary firmware programs, and the company formerly called VA Linux bases its business on proprietary software. Over half of all the world's web servers run some version of Apache, and the usual version of Apache is free software, but many of those sites run a proprietary modified version distributed by IBM.
-
-"On his worst days Richard believes that Linus Torvalds and I conspired to hijack his revolution," Raymond says. "Richard's rejection of the term open source and his deliberate creation of an ideological fissure in my view comes from an odd mix of idealism and territoriality. There are people out there who think it's all Richard's personal ego. I don't believe that. It's more that he so personally associates himself with the free software idea that he sees any threat to that as a threat to himself."
-
-Stallman responds, "Raymond misrepresents my views: I don't think Torvalds 'conspired' with anyone, since being sneaky is not his way. However, Raymond's nasty conduct is visible in those statements themselves. Rather than respond to my views (even as he claims they are) on their merits, he proposes psychological interpretations for them. He attributes the harshest interpretation to unnamed others, then 'defends' me by proposing a slightly less derogatory one. He has often 'defended' me this way."
-
-Ironically, the success of open source and open source advocates such as Raymond would not diminish Stallman's role as a leader - but it would lead many to misunderstand what he is a leader of. Since the free software movement lacks the corporate and media recognition of open source, most users of GNU/Linux do not hear that it exists, let alone what its views are. They have heard the ideas and values of opensource, and they never imagine that Stallman might have different ones. Thus he receives messages thanking him for his advocacy of "open source," and explains in response that he has never been a supporter of that, using the occasion to inform the sender about free-software.
-
-Some writers recognize the term "free software" by using the term "FLOSS," which stands for "Free/Libre and Open Source Software." However, they often say there is a single "FLOSS" movement, which is like saying that the U.S. has a "Liberal/Conservative" movement, and the views they usually associate with this supposed single movement are the open source views they have heard.
-
-Despite all these obstacles, the free software movement does make its ideas heard sometimes, and continues to grow in absolute terms. By sticking to its guns, and presenting its ideas in contrast to those of open source, it gains ground. "One of Stallman's primary character traits is the fact he doesn't budge," says Ian Murdock. "He'll wait up to a decade for people to come around to his point of view if that's what it takes."
-
-Murdock, for one, finds that un-budgeable nature both refreshing and valuable. Stallman may no longer be the solitary leader of the free software movement, but he is still the polestar of the free software community. "You always know that he's going to be consistent in his views," Murdock says. "Most people aren't like that. Whether you agree with him or not, you really have to respect that."
-
-1~ Chapter 12 - A Brief Journey through Hacker Hell
-
-[RMS: In this chapter my only change is to add a few notes labeled like this one.]
-
-Richard Stallman stares, unblinking, through the windshield of a rental car, waiting for the light to change as we make our way through downtown Kihei.
-={Kihei (Hawaii)+15}
-
-The two of us are headed to the nearby town of Pa'ia, where we are scheduled to meet up with some software programmers and their wives for dinner in about an hour or so.
-={Pa'ia (Hawaii)+2}
-
-It's about two hours after Stallman's speech at the Maui High Performance Center, and Kihei, a town that seemed so inviting before the speech, now seems profoundly uncooperative. Like most beach cities, Kihei is a one-dimensional exercise in suburban sprawl. Driving down its main drag, with its endless succession of burger stands, realty agencies, and bikini shops, it's hard not to feel like a steel-coated morsel passing through the alimentary canal of a giant commercial tapeworm. The feeling is exacerbated by the lack of side roads. With nowhere to go but forward, traffic moves in spring-like lurches. 200 yards ahead, a light turns green. By the time we are moving, the light is yellow again.
-
-For Stallman, a lifetime resident of the east coast, the prospect of spending the better part of a sunny Hawaiian afternoon trapped in slow traffic is enough to trigger an embolism. [RMS: Since I was driving, I was also losing time to answer my email, and that's a real pain since I can barely keep up anyway.] Even worse is the knowledge that, with just a few quick right turns a quarter mile back, this whole situation easily could have been avoided. Unfortunately, we are at the mercy of the driver ahead of us, a programmer from the lab who knows the way and who has decided to take us to Pa'ia via the scenic route instead of via the nearby Pilani Highway.
-
-"This is terrible," says Stallman between frustrated sighs. "Why didn't we take the other route?"
-
-Again, the light a quarter mile ahead of us turns green. Again, we creep forward a few more car lengths. This process continues for another 10 minutes, until we finally reach a major crossroad promising access to the adjacent highway.
-
-The driver ahead of us ignores it and continues through the intersection.
-
-"Why isn't he turning?" moans Stallman, throwing up his hands in frustration. "Can you believe this?"
-
-I decide not to answer either. I find the fact that I am sitting in a car with Stallman in the driver seat, in Maui no less, unbelievable enough. Until two hours ago, I didn't even know Stallman knew how to drive. Now, listening to Yo-Yo Ma's cello playing the mournful bass notes of "Appalachian Journey" on the car stereo and watching the sunset pass by on our left, I do my best to fade into the upholstery.
-
-When the next opportunity to turn finally comes up, Stallman hits his right turn signal in an attempt to cue the driver ahead of us. No such luck. Once again, we creep slowly through the intersection, coming to a stop a good 200 yards before the next light. By now, Stallman is livid.
-
-"It's like he's deliberately ignoring us," he says, gesturing and pantomiming like an air craft carrier landing-signals officer in a futile attempt to catch our guide's eye. The guide appears unfazed, and for the next five minutes all we see is a small portion of his head in the rear-view mirror.
-
-I look out Stallman's window. Nearby Kahoolawe and Lanai Islands provide an ideal frame for the setting sun. It's a breathtaking view, the kind that makes moments like this a bit more bearable if you're a Hawaiian native, I suppose. I try to direct Stallman's attention to it, but Stallman, by now obsessed by the inattentiveness of the driver ahead of us, blows me off.
-={Lanai Islands (Hawaii)}
-
-When the driver passes through another green light, completely ignoring a "Pilani Highway Next Right," I grit my teeth. I remember an early warning relayed to me by BSD programmer Keith Bostic. "Stallman does not suffer fools gladly," Bostic warned me. "If somebody says or does something stupid, he'll look them in the eye and say, 'That's stupid.'"
-={Bostic, Keith}
-
-Looking at the oblivious driver ahead of us, I realize that it's the stupidity, not the inconvenience, that's killing Stallman right now.
-
-"It's as if he picked this route with absolutely no thought on how to get there efficiently," Stallman says.
-
-The word "efficiently" hangs in the air like a bad odor. Few things irritate the hacker mind more than inefficiency. It was the inefficiency of checking the Xerox laser printer two or three times a day that triggered Stallman's initial inquiry into the printer source code. It was the inefficiency of rewriting software tools hijacked by commercial software vendors that led Stallman to battle Symbolics and to launch the GNU Project. If, as Jean Paul Sartre once opined, hell is other people, hacker hell is duplicating other people's stupid mistakes, and it's no exaggeration to say that Stallman's entire life has been an attempt to save mankind from these fiery depths.
-={Sartre, Jean Paul}
-
-This hell metaphor becomes all the more apparent as we take in the slowly passing scenery. With its multitude of shops, parking lots, and poorly timed street lights, Kihei seems less like a city and more like a poorly designed software program writ large. Instead of rerouting traffic and distributing vehicles through side streets and expressways, city planners have elected to run everything through a single main drag. From a hacker perspective, sitting in a car amidst all this mess is like listening to a CD rendition of nails on a chalkboard at full volume.
-
-"Imperfect systems infuriate hackers," observes Steven Levy, another warning I should have listened to before climbing into the car with Stallman. "This is one reason why hackers generally hate driving cars - the system of randomly programmed red lights and oddly laid out one-way streets causes delays which are so goddamn /{unnecessary}/ [Levy's emphasis] that the impulse is to rearrange signs, open up traffic-light control boxes . . . re-design the entire system."~{ See Steven Levy, /{Hackers}/ (Penguin USA [paperback], 1984): 40. }~
-
-More frustrating, however, is the duplicity of our trusted guide. Instead of searching out a clever shortcut - as any true hacker would do on instinct - the driver ahead of us has instead chosen to play along with the city planners' game. Like Virgil in Dante's /{Inferno}/, our guide is determined to give us the full guided tour of this hacker hell whether we want it or not.
-
-Before I can make this observation to Stallman, the driver finally hits his right turn signal. Stallman's hunched shoulders relax slightly, and for a moment the air of tension within the car dissipates. The tension comes back, however, as the driver in front of us slows down. "Construction Ahead" signs line both sides of the street, and even though the Pilani Highway lies less than a quarter mile off in the distance, the two-lane road between us and the highway is blocked by a dormant bulldozer and two large mounds of dirt.
-
-It takes Stallman a few seconds to register what's going on as our guide begins executing a clumsy five-point U-turn in front of us. When he catches a glimpse of the bulldozer and the "No Through Access" signs just beyond, Stallman finally boils over.
-
-"Why, why, why?" he whines, throwing his head back. "You should have known the road was blocked. You should have known this way wouldn't work. You did this deliberately." [RMS: I meant that he chose the slow road deliberately. As explained below, I think these quotes are not exact.]
-
-The driver finishes the turn and passes us on the way back toward the main drag. As he does so, he shakes his head and gives us an apologetic shrug. Coupled with a toothy grin, the driver's gesture reveals a touch of mainlander frustration but is tempered with a protective dose of islander fatalism. Coming through the sealed windows of our rental car, it spells out a succinct message: "Hey, it's Maui; what are you gonna do?"
-
-Stallman can take it no longer.
-
-"Don't you fucking smile!" he shouts, fogging up the glass as he does so. "It's your fucking fault. This all could have been so much easier if we had just done it my way." [RMS: These quotes appear to be inaccurate, because I don't use "fucking" as an adverb. This was not an interview, so Williams would not have had a tape recorder running. I'm sure things happened overall as described, but these quotations probably reflect his understanding rather than my words.]
-
-Stallman accents the words "my way" by gripping the steering wheel and pulling himself towards it twice. The image of Stallman's lurching frame is like that of a child throwing a temper tantrum in a car seat, an image further underlined by the tone of Stallman's voice. Halfway between anger and anguish, Stallman seems to be on the verge of tears.
-
-Fortunately, the tears do not arrive. Like a summer cloudburst, the tantrum ends almost as soon as it begins. After a few whiny gasps, Stallman shifts the car into reverse and begins executing his own U-turn. By the time we are back on the main drag, his face is as impassive as it was when we left the hotel 30 minutes earlier.
-
-It takes less than five minutes to reach the next cross-street. This one offers easy highway access, and within seconds, we are soon speeding off toward Pa'ia at a relaxing rate of speed. The sun that once loomed bright and yellow over Stallman's left shoulder is now burning a cool orange-red in our rear-view mirror. It lends its color to the gauntlet wili wili trees flying past us on both sides of the highway.
-={Pa'ia (Hawaii)}
-
-For the next 20 minutes, the only sound in our vehicle, aside from the ambient hum of the car's engine and tires, is the sound of a cello and a violin trio playing the mournful strains of an Appalachian folktune.
-
-1~ Chapter 13 - Continuing the Fight
-
-For Richard Stallman, time may not heal all wounds, but it does provide a convenient ally.
-
-Four years after "The Cathedral and the Bazaar," Stallman still chafes over the Raymond critique. He also grumbles over Linus Torvalds' elevation to the role of world's most famous hacker. He recalls a popular T-shirt that began showing at Linux tradeshows around 1999. Designed to mimic the original promotional poster for Star Wars, the shirt depicted Torvalds brandishing a light-saber like Luke Skywalker, while Stallman's face rides atop R2D2. The shirt still grates on Stallman's nerves not only because it depicts him as Torvalds' sidekick, but also because it elevates Torvalds to the leadership role in the free-software community, a role even Torvalds himself is loath to accept. "It's ironic," says Stallman mournfully. "Picking up that sword is exactly what Linus refuses to do. He gets everybody focusing on him as the symbol of the movement, and then he won't fight. What good is it?"
-={Cathedral and the Bazaar, The (Raymond);Luke Skywalker;R2D2;Torvalds, Linus+1;Star Wars}
-
-Then again, it is that same unwillingness to "pick up the sword," on Torvalds' part, that has left the door open for Stallman to bolster his reputation as the hacker community's ethical arbiter. Despite his grievances, Stallman has to admit that the last few years have been quite good, both to himself and to his organization. Relegated to the periphery by the ironic success of the GNU/Linux system because users thought of it as "Linux," Stallman has nonetheless successfully recaptured the initiative. His speaking schedule between January 2000and December 2001 included stops on six continents and visits to countries where the notion of software freedom carries heavy overtones -China and India, for example.
-
-Outside the bully pulpit, Stallman has taken advantage of the leverage of the GNU General Public License (GPL), of which he remains the steward. During the summer of 2000, while the air was rapidly leaking out of the 1999 Linux IPO bubble, Stallman and the Free Software Foundation scored two major victories. In July, 2000, Troll tech, a Norwegian software company and developer of Qt, a graphical interface library that ran on the GNU/Linux operating system, announced it was licensing its software under the GPL. A few weeks later, Sun Microsystems, a company that, until then, had been warily trying to ride the open source bandwagon without actually contributing its code, finally relented and announced that it, too, was dual licensing its new OpenOffice~{ Sun was compelled by a trademark complaint to use the clumsy name "OpenOffice.org." }~ application suite under the Lesser GNU Public License(LGPL) and the Sun Industry Standards Source License (SISSL).
-={Free Software Foundation (FSF):QT graphic tools and;GNU General Public License:QT graphics tools and;Lesser GNU Public License (LGPL);OpenOffice application suite+4;Qt+1;Troll Tech+1;SISSL (Sun Industry Standards Source Licence);Sun Industry Standards Source License (SISSL);Sun Microsystems:OpenOffice application suite}
-
-In the case of Trolltech, this victory was the result of a protracted effort by the GNU Project. The non-freeness of Qt was a serious problem for the free software community because KDE, a free graphical desktop environment that was becoming popular, depended on it. Qt was non-free software but Trolltech had invited free software projects(such as KDE) to use it gratis. Although KDE itself was free software, users that insisted on freedom couldn't run it, since they had to reject Qt. Stallman recognized that many users would want a graphical desktop on GNU/Linux, and most would not value freedom enough to reject the temptation of KDE, with Qt hiding within. The danger was that GNU/Linux would become a motor for the installation of KDE, and therefore also of non-free Qt. This would undermine the freedom which was the purpose of GNU.
-
-To deal with this danger, Stallman recruited people to launch two parallel counter projects. One was GNOME, the GNU free graphical desktop environment. The other was Harmony, a compatible free replacement for Qt. If GNOME succeeded, KDE would not be necessary; if Harmony succeeded, KDE would not need Qt. Either way, users would be able to have a graphical desktop on GNU/Linux without non-free Qt.
-
-In 1999, these two efforts were making good progress, and the management of Trolltech were starting to feel the pressure. So Trolltech released Qt under its own free software license, the QPL. The QPL qualified as a free license, but Stallman pointed out the drawback of incompatibility with the GPL: in general, combining GPL-covered code with Qt in one program was impossible without violating one license or the other. Eventually the Trolltech management recognized that the GPL would serve their purposes equally well, and released Qt with dual licensing: the same Qt code, in parallel, was available under the GNU GPL and under the QPL. After three years, this was victory.
-
-Once Qt was free, the motive for developing Harmony (which wasn't complete enough for actual use) had disappeared, and the developers abandoned it. GNOME had acquired substantial momentum, so its development continued, and it remains the main GNU graphical desktop.
-
-Sun desired to play according to the Free Software Foundation's conditions. At the 1999 O'Reilly Open Source Conference, Sun Microsystems co-founder and chief scientist Bill Joy defended his company's "community source" license, essentially a watered-down compromise letting users copy and modify Sun-owned software but not sell copies of said software without negotiating a royalty agreement with Sun. (With this restriction, the license did not qualify as free, nor for that matter as open source.) A year after Joy's speech, Sun Microsystems vice president Marco Boerries was appearing on the same stage spelling out the company's new licensing compromise in the case of OpenOffice, an office-application suite designed specifically for the GNU/Linux operating system.
-={Boerries, Marco+2;community source, license of Sun Microsystems;Joy, Bill;O'Reilly & Associates:Open Source Conferences}
-
-"I can spell it out in three letters," said Boerries. "GPL."
-
-At the time, Boerries said his company's decision had little to do with Stallman and more to do with the momentum of GPL-protected programs. "What basically happened was the recognition that different products attracted different communities, and the license you use depends on what type of community you want to attract," said Boerries. "With [OpenOffice], it was clear we had the highest correlation with the GPL community."~{ Marco Boerries, interview with author (July, 2000). }~ Alas, this victory was incomplete, since OpenOffice recommends the use of non-free plug-ins.
-
-Such comments point out the under-recognized strength of the GPL and, indirectly, the political genius of the man who played the largest role in creating it. "There isn't a lawyer on earth who would have drafted the GPL the way it is," says Eben Moglen, Columbia University law professor and Free Software Foundation general counsel. "But it works. And it works because of Richard's philosophy of design."
-={Columbia University;Moglen, Eben+35}
-
-A former professional programmer, Moglen traces his pro bono work with Stallman back to 1990 when Stallman requested Moglen's legal assistance on a private affair. Moglen, then working with encryption expert Phillip Zimmerman during Zimmerman's legal battles with the federal government, says he was honored by the request.~{ For more information on Zimmerman's legal travails, read Steven Levy's /{Crypto}/, p. 287-288. In the original book version of /{Free as in Freedom}/, I reported that Moglen helped defend Zimmerman against the National Security Agency. According to Levy's account, Zimmerman was investigated by the U.S. Attorney's office and U.S. Customs, not the NSA. }~
-={Zimmerman, Phillip;National Security Administration}
-
-"I told him I used Emacs every day of my life, and it would take an awful lot of lawyering on my part to pay off the debt."
-
-Since then, Moglen, perhaps more than any other individual, has had the best chance to observe the crossover of Stallman's hacker philosophies into the legal realm. Moglen says Stallman's approach to legal code and his approach to software code are largely the same. "I have to say, as a lawyer, the idea that what you should do with a legal document is to take out all the bugs doesn't make much sense," Moglen says. "There is uncertainty in every legal process, and what most lawyers want to do is to capture the benefits of uncertainty for their client. Richard's goal is the complete opposite. His goal is to remove uncertainty, which is inherently impossible. It is inherently impossible to draft one license to control all circumstances in all legal systems all over the world. But if you were to go at it, you would have to go at it his way. And the resulting elegance, the resulting simplicity in design almost achieves what it has to achieve. And from there a little lawyering will carry you quite far."
-
-As the person charged with pushing the Stallman agenda, Moglen understands the frustration of would-be allies. "Richard is a man who does not want to compromise over matters that he thinks of as fundamental," Moglen says, "and he does not take easily the twisting of words or even just the seeking of artful ambiguity, which human society often requires from a lot of people."
-
-In addition to helping the Free Software Foundation, Moglen has provided legal aid to other copyright defendants, such as Dmitry Sklyarov, and distributors of the DVD decryption program deCSS.
-={Sklyarov, Dmitri+1}
-
-Sklyarov had written and released a program to break digital copy-protection on Adobe e-Books, in Russia where there was no law against it, as an employee of a Russian company. He was then arrested while visiting the US to give a scientific paper about his work. Stallman eagerly participated in protests condemning Adobe for having Sklyarov arrested, and the Free Software Foundation denounced the Digital Millennium Copyright Act as "censorship of software," but it could not intervene in favor of Sklyarov's program because that was non-free. Thus, Moglen worked for Sklyarov's defense through the Electronic Frontier Foundation. The FSF avoided involvement in the distribution of deCSS, since that was illegal, but Stallman condemned the U.S. government for prohibiting deCSS, and Moglen worked as direct counsel for the defendants.
-={Electronic Frontier Foundation}
-
-Following the FSF's decision not to involve itself in those cases, Moglen has learned to appreciate the value of Stallman's stubbornness. "There have been times over the years where I've gone to Richard and said, 'We have to do this. We have to do that. Here's the strategic situation. Here's the next move. Here's what he have to do.' And Richard's response has always been, 'We don't have to do anything.'Just wait. What needs doing will get done."
-
-"And you know what?" Moglen adds. "Generally, he's been right."
-
-Such comments disavow Stallman's own self-assessment: "I'm not good at playing games," Stallman says, addressing the many unseen critics who see him as a shrewd strategist. "I'm not good at looking ahead and anticipating what somebody else might do. My approach has always been to focus on the foundation [of ideas], to say 'Let's make the foundation as strong as we can make it.'"
-
-The GPL's expanding popularity and continuing gravitational strength are the best tributes to the foundation laid by Stallman and his GNU colleagues. While Stallman was never the sole person in the world releasing free software, he nevertheless can take sole credit for building the free software movement's ethical framework. Whether or not other modern programmers feel comfortable working inside that framework is immaterial. The fact that they even have a choice at all is Stallman's greatest legacy.
-
-Discussing Stallman's legacy at this point seems a bit premature. Stallman, 48 at the time of this writing, still has a few years left to add to or subtract from that legacy. Still, the momentum of the free software movement makes it tempting to examine Stallman's life outside the day-to-day battles of the software industry and within a more august, historical setting.
-
-To his credit, Stallman refuses all opportunities to speculate about this. "I've never been able to work out detailed plans of what the future was going to be like," says Stallman, offering his own premature epitaph. "I just said 'I'm going to fight. Who knows where I'll get?'"
-
-There's no question that in picking his fights, Stallman has alienated the very people who might otherwise have been his greatest champions, had he been willing to fight for their views instead of his own. It is also a testament to his forthright, ethical nature that many of Stallman's erstwhile political opponents still manage to put in a few good words for him when pressed. The tension between Stallman the ideologue and Stallman the hacker genius, however, leads a biographer to wonder: how will people view Stallman when Stallman's own personality is no longer there to get in the way?
-
-In early drafts of this book, I dubbed this question the "100 year" question. Hoping to stimulate an objective view of Stallman and his work, I asked various software-industry luminaries to take themselves out of the current time-frame and put themselves in a position of a historian looking back on the free software movement 100 years in the future. From the current vantage point, it is easy to see similarities between Stallman and past Americans who, while somewhat marginal during their lifetime, have attained heightened historical importance in relation to their age. Easy comparisons include Henry David Thoreau, transcendentalist philosopher and author of /{Civil Disobedience}/, and John Muir, founder of the Sierra Club and progenitor of the modern environmental movement. It is also easy to see similarities in men like William Jennings Bryan, a.k.a. "The Great Commoner," leader of the populist movement, enemy of monopolies, and a man who, though powerful, seems to have faded into historical insignificance.
-={Bryan, Willliam Jennings;Muir, John;On Civil Disobedience (Thoreau);Thoreau, Henry David;Sierra Club}
-
-Although not the first person to view software as public property, Stallman is guaranteed a footnote in future history books thanks to the GPL. Given that fact, it seems worthwhile to step back and examine Richard Stallman's legacy outside the current time frame. Will the GPL still be something software programmers use in the year 2102, or will it have long since fallen by the wayside? Will the term "free-software" seem as politically quaint as "free silver" does today, or will it seem eerily prescient in light of later political events?
-
-Predicting the future is risky sport. Stallman refuses, saying that asking what people will think in 100 years presumes we have no influence over it. The question he prefers is, "What should we do to make a better future?" But most people, when presented with the predictive question, seemed eager to bite.
-
-"One hundred years from now, Richard and a couple of other people are going to deserve more than a footnote," says Moglen. "They're going to be viewed as the main line of the story."
-
-The "couple of other people" Moglen nominates for future textbook chapters include John Gilmore, who beyond contributing in various ways to free software has founded the Electronic Frontier Foundation, and Theodor Holm Nelson, a.k.a. Ted Nelson, author of the 1982book, /{Literary Machines}/. Moglen says Stallman, Nelson, and Gilmore each stand out in historically significant, non-overlapping ways. He credits Nelson, commonly considered to have coined the term "hypertext," for identifying the predicament of information ownership in the digital age. Gilmore and Stallman, meanwhile, earn notable credit for identifying the negative political effects of information control and building organizations - the Electronic Frontier Foundation in the case of Gilmore and the Free Software Foundation in the case of Stallman - to counteract those effects. Of the two, however, Moglen sees Stallman's activities as more personal and less political in nature.
-={Electronic Frontier Foundation;Gilmore, John;Nelson, Theodor Holm+2;Nelson, Ted+2}
-
-"Richard was unique in that the ethical implications of un-free software were particularly clear to him at an early moment," says Moglen. "This has a lot to do with Richard's personality, which lots of people will, when writing about him, try to depict as epiphenomenal or even a drawback in Richard Stallman's own life work."
-
-Gilmore, who describes his inclusion between the erratic Nelson and the irascible Stallman as something of a "mixed honor," nevertheless seconds the Moglen argument. Writes Gilmore:
-
-_1 My guess is that Stallman's writings will stand up as well as Thomas Jefferson's have; he's a pretty clear writer and also clear on his principles... Whether Richard will be as influential as Jefferson will depend on whether the abstractions we call "civil rights" end up more important a hundred years from now than the abstractions that we call "software" or "technically imposed restrictions."
-={Jefferson, Thomas}
-
-Another element of the Stallman legacy not to be overlooked, Gilmore writes, is the collaborative software-development model pioneered by the GNU Project. Although flawed at times, the model has nevertheless evolved into a standard within the software-development industry. All told, Gilmore says, this collaborative software-development model may end up being even more influential than the GNU Project, the GPL License, or any particular software program developed by Stallman:
-
-_1 Before the Internet, it was quite hard to collaborate over distance on software, even among teams that know and trust each other. Richard pioneered collaborative development of software, particularly by disorganized volunteers who seldom meet each other. Richard didn't build any of the basic tools for doing this (the TCP protocol, email lists, diff and patch, tar files, RCS or CVS or remote-CVS), but he used the ones that were available to form social groups of programmers who could effectively collaborate.
-
-Stallman thinks that evaluation, though positive, misses the point. "It emphasizes development methods over freedom, which reflects the values of open source rather than free software. If that is how future users look back on the GNU Project, I fear it will lead to a world in which developers maintain users in bondage, and let them aid development occasionally as a reward, but never take the chains off them."
-
-Lawrence Lessig, Stanford law professor and author of the 2001 book, /{The Future of Ideas}/, is similarly bullish. Like many legal scholars, Lessig sees the GPL as a major bulwark of the current so-called "digital commons," the vast agglomeration of community-owned software programs, network and telecommunication standards that have triggered the Internet's exponential growth over the last three decades. Rather than connect Stallman with other Internet pioneers, men such as Vannevar Bush, Vinton Cerf, and J. C. R. Licklider who convinced others to see computer technology on a wider scale, Lessig sees Stallman's impact as more personal, introspective, and, ultimately, unique:
-={Future of Ideas, The (Lessig)}
-
-_1 [Stallman] changed the debate from "is" to "ought." He made people see how much was at stake, and he built a device to carry these ideals forward... That said, I don't quite know how to place him in the context of Cerf or Licklider. The innovation is different. It is not just about a certain kind of code, or enabling the Internet. [It's] much more about getting people to see the value in a certain kind of Internet. I don't think there is anyone else in that class, before or after.
-
-Not everybody sees the Stallman legacy as set in stone, of course. Eric Raymond, the open source proponent who feels that Stallman's leadership role has diminished significantly since 1996, sees mixed signals when looking into the 2102 crystal ball:
-
-_1 I think Stallman's artifacts (GPL, Emacs, GCC) will be seen as revolutionary works, as foundation-stones of the information world. I think history will be less kind to some of the theories from which RMS operated, and not kind at all to his personal tendency towards territorial, cult-leader behavior.
-
-As for Stallman himself, he, too, sees mixed signals:
-
-_1 What history says about the GNU Project, twenty years from now, will depend on who wins the battle of freedom to use public knowledge. If we lose, we will be just a footnote. If we win, it is uncertain whether people will know the role of the GNU operating system - if they think the system is "Linux," they will build a false picture of what happened and why.
-
-_1 But even if we win, what history people learn a hundred years from now is likely to depend on who dominates politically.
-
-Searching for his own 19th-century historical analogy, Stallman summons the figure of John Brown, the militant abolitionist regarded as a hero on one side of the Mason Dixon line and a madman on the other.
-
-John Brown's slave revolt never got going, but during his subsequent trial he effectively roused national demand for abolition. During the Civil War, John Brown was a hero; 100 years after, and for much of the 1900s, history textbooks taught that he was crazy. During the era of legal segregation, while bigotry was shameless, the U.S. partly accepted the story that the South wanted to tell about itself, and history textbooks said many untrue things about the Civil War and related events.
-
-Such comparisons document both the self-perceived peripheral nature of Stallman's current work and the binary nature of his current reputation. It's hard to see Stallman's reputation falling to the same level of infamy as Brown's did during the post-Reconstruction period. Stallman, despite his occasional war-like analogies, has done little to inspire violence. Still, it is easy to envision a future in which Stallman's ideas wind up on the ash-heap.~{ RMS: Sam Williams' further words here, "In fashioning the free software cause not not as a mass movement but as a collection of private battles against the forces of proprietary temptation," do not fit the facts. Ever since the first announcement of the GNU Project, I have asked the public to support the cause. The free software movement aims to be a mass movement, and the only question is whether it has enough supporters to qualify as "mass." As of 2009, the Free Software Foundation has some 3000 members that pay the hefty dues, and over 20,000 subscribers to its monthly e-mail newsletter. }~
-
-Then again, it is that very will that may someday prove to be Stallman's greatest lasting legacy. Moglen, a close observer over the last decade, warns those who mistake the Stallman personality as counter-productive or epiphenomenal to the "artifacts" of Stallman's life. Without that personality, Moglen says, there would be precious few artifacts to discuss. Says Moglen, a former Supreme Court clerk:
-
-_1 Look, the greatest man I ever worked for was Thurgood Marshall. I knew what made him a great man. I knew why he had been able to change the world in his possible way. I would be going out on a limb a little bit if I were to make a comparison, because they could not be more different: Thurgood Marshall was a man in society, representing an outcast society to the society that enclosed it, but still a man in society. His skill was social skills. But he was all of a piece, too. Different as they were in every other respect, the person I now most compare him to in that sense - of a piece, compact, made of the substance that makes stars, all the way through - is Stallman.
-={Marshall, Thurgood}
-
-In an effort to drive that image home, Moglen reflects on a shared moment in the spring of 2000. The success of the VA Linux IPO was still resonating in the business media, and a half dozen issues related to free software were swimming through the news. Surrounded by a swirling hurricane of issues and stories each begging for comment, Moglen recalls sitting down for lunch with Stallman and feeling like a castaway dropped into the eye of the storm. For the next hour, he says, the conversation calmly revolved around a single topic: strengthening the GPL.
-={VA Linux}
-
-"We were sitting there talking about what we were going to do about some problems in Eastern Europe and what we were going to do when the problem of the ownership of content began to threaten free software," Moglen recalls. "As we were talking, I briefly thought about how we must have looked to people passing by. Here we are, these two little bearded anarchists, plotting and planning the next steps. And, of course, Richard is plucking the knots from his hair and dropping them in the soup and behaving in his usual way. Anybody listening in on our conversation would have thought we were crazy, but I knew: I knew the revolution's right here at this table. This is what's making it happen. And this man is the person making it happen."
-
-Moglen says that moment, more than any other, drove home the elemental simplicity of the Stallman style.
-
-"It was funny," recalls Moglen. "I said to him, 'Richard, you know, you and I are the two guys who didn't make any money out of this revolution.' And then I paid for the lunch, because I knew he didn't have the money to pay for it."~{ RMS: I never refuse to let people treat me to a meal, since my pride is not based on picking up the check. But I surely did have the money to pay for lunch. My income, which comes from around half the speeches I give, is much less than a law professor's salary, but I'm not poor. }~
-
-1~ Epilogue from Sam Williams: Crushing Loneliness
-
-[RMS: Because this chapter is so personally from Sam Williams, I have indicated all changes to the text with square brackets or ellipses, and I have made such changes only to clear up technical or legal points,and to remove passages that I found to be hostile and devoid of information. I have also added notes labeled 'RMS:' to respond to certain points. Williams has also changed the text of this chapter; changes made by Williams are not explicitly indicated.]
-
-Writing the biography of a living person is a bit like producing a play. The drama in front of the curtain often pales in comparison to the drama backstage.
-
-In /{The Autobiography of Malcolm X}/, Alex Haley gives readers a rare glimpse of that backstage drama. Stepping out of the ghostwriter role, Haley delivers the book's epilogue in his own voice. The epilogue explains how a freelance reporter originally dismissed as a "tool" and"spy" by the Nation of Islam spokesperson managed to work through personal and political barriers to get Malcolm X's life story on paper.
-={Autobiography of Malcolm X, The (Haley)+1;Haley, Alex}
-
-While I hesitate to compare this book with /{The Autobiography of Malcolm X}/, I do owe a debt of gratitude to Haley for his candid epilogue. Over the last 12 months, it has served as a sort of instruction manual on how to deal with a biographical subject who has built an entire career on being disagreeable. [RMS: I have built my career on saying no to things others accept without much question, but if I sometimes seem or am disagreeable, it is not through specific intention.] From the outset, I envisioned closing this biography with a similar epilogue, both as an homage to Haley and as a way to let readers know how this book came to be.
-
-The story behind this story starts in an Oakland apartment, winding its way through the various locales mentioned in the book - Silicon Valley, Maui, Boston, and Cambridge. Ultimately, however, it is a tale of two cities: New York, New York, the book-publishing capital of the world, and Sebastopol, California, the book-publishing capital of Sonoma County.
-
-The story starts in April, 2000. At the time, I was writing stories for the ill-fated web site BeOpen.com. One of my first assignments was a phone interview with Richard M. Stallman. The interview went well, so well that Slashdot (http://www.slashdot.org), the popular "news for nerds" site owned by VA Software, Inc. (formerly VA LinuxSystems and before that, VA Research), gave it a link in its daily list of feature stories. Within hours, the web servers at BeOpen were heating up as readers clicked over to the site.
-={BeOpen.com+3;VA Linux;VA Research;VA Software, Inc.;Slashdot}
-
-For all intents and purposes, the story should have ended there. Three months after the interview, while attending the O'Reilly Open Source Conference in Monterey, California, I received the following email message from Tracy Pattison, foreign-rights manager at a large New York publishing house:
-={Monterey (California);O'Reilly & Associates:Open Source Conferences;Pattison, Tracy}
-
-% poem or group what follows ?
-
-poem{
-
-To: sam@BeOpen.com
-
-Subject: RMS Interview Date: Mon, 10 Jul 2000 15:56:37 - 0400
-
-Dear Mr. Williams,
-
-I read your interview with Richard Stallman on BeOpen
-with great interest. I've been intrigued by RMS and his
-work for some time now and was delighted to find your
-piece which I really think you did a great job of capturing
-some of the spirit of what Stallman is trying to do with
-GNU-Linux and the Free Software Foundation.
-
-What I'd love to do, however, is read more - and I don't
-think I'm alone. Do you think there is more information
-and/or sources out there to expand and update your
-interview and adapt it into more of a profile of Stallman?
-Perhaps including some more anecdotal information about
-his personality and background that might really interest
-and enlighten readers outside the more hardcore
-programming scene?
-
-}poem
-
-Tracy ended the email with a request that I give her a call to discuss the idea further. I did just that. Tracy told me her company was launching a new electronic book line, and it wanted stories that appealed to an early-adopter audience. The e-book format was 30,000words, about 100 pages, and she had pitched her bosses on the idea of profiling a major figure in the hacker community. Her bosses liked the idea, and in the process of searching for interesting people to profile,she had come across my BeOpen interview with Stallman. Hence her email to me.
-
-That's when Tracy asked me: would I be willing to expand the interview into a full-length feature profile?
-
-My answer was instant: yes. Before accepting it, Tracy suggested I put together a story proposal she could show her superiors. Two days later, I sent her a polished proposal. A week later, Tracy sent me a follow up email. Her bosses had given it the green light.
-
-I have to admit, getting Stallman to participate in an e-book project was an afterthought on my part. As a reporter who covered the open source beat, I knew Stallman was a stickler. I'd already received a half dozen emails at that point upbraiding me for the use of "Linux" instead of "GNU/Linux."
-
-Then again, I also knew Stallman was looking for ways to get his message out to the general public. Perhaps if I presented the project to him that way, he would be more receptive. If not, I could always rely upon the copious amounts of documents, interviews, and recorded online conversations Stallman had left lying around the Internet and do an unauthorized biography.
-
-During my research, I came across an essay titled "Freedom - Or Copyright?" Written by Stallman and published in the June, 2000,edition of the MIT /{Technology Review}/, the essay blasted e-books for an assortment of software sins. Not only did readers have to use proprietary software programs to read them, Stallman lamented, but the methods used to prevent unauthorized copying were overly harsh. Instead of downloading a transferable HTML or PDF file, readers downloaded an encrypted file. In essence, purchasing an e-book meant purchasing a nontransferable key to unscramble the encrypted content. Any attempt to open a book's content without an authorized key constituted a criminal violation of the Digital Millennium Copyright Act, the 1998 law designed to bolster copyright enforcement on the Internet. Similar penalties held for readers who converted a book's content into an open file format, even if their only intention was to read the book on a different computer in their home. Unlike a normal book, the reader no longer held the right to lend, copy, or resell an e-book. They only had the right to read it on an authorized machine, warned Stallman:
-={Digital Millennium Copyright Act}
-
-_1 We still have the same old freedoms in using paper books.But if e-books replace printed books, that exception will do little good. With "electronic ink," which makes it possible to download new text onto an apparently printed piece of paper, even newspapers could become ephemeral. Imagine:no more used book stores; no more lending a book to your friend; no more borrowing one from the public library - no more "leaks" that might give someone a chance to read without paying. (And judging from the ads for Microsoft Reader, no more anonymous purchasing of books either.)This is the world publishers have in mind for us.~{ See "Freedom - Or Copyright?" (May, 2000), \\ http://www.technologyreview.com/articles/stallman0500.asp. }~
-
-Needless to say, the essay caused some concern. Neither Tracy nor I had discussed the software her company would use nor had we discussed the type of copyright [license] that would govern the e-book's usage. I mentioned the /{Technology Review}/ article and asked if she could give me information on her company's e-book policies. Tracy promised to get back to me.
-
-Eager to get started, I decided to call Stallman anyway and mention the book idea to him. When I did, he expressed immediate interest and immediate concern. "Did you read my essay on e-books?" he asked.
-
-When I told him, yes, I had read the essay and was waiting to hear back from the publisher, Stallman laid out two conditions: he didn't want to lend support to an e-book licensing mechanism he fundamentally opposed, and he didn't want to come off as lending support. "I don't want to participate in anything that makes me look like a hypocrite," he said.
-
-For Stallman, the software issue was secondary to the copyright issue. He said he was willing to ignore whatever software the publisher or its third-party vendors employed just so long as the company specified within the copyright that readers were free to make and distribute verbatim copies of the e-book's content. Stallman pointed to Stephen King's /{The Plant}/ as a possible model. In June, 2000, King announced on his official web site that he was self-publishing /{The Plant}/ in serial form. According to the announcement, the book's total cost would be $13, spread out over a series of $1 installments. As long as at least 75% of the readers paid for each chapter, King promised to continue releasing new installments. By August, the plan seemed to be working, as King had published the first two chapters with a third on the way.
-={King, Stephen;open source+4;Plant, The (King)}
-
-"I'd be willing to accept something like that," Stallman said. "As long as it also permitted verbatim copying." [RMS: As I recall, I also raised the issue of encryption; the text two paragraphs further down confirms this. I would not have agreed to publish the book in a way that /{required}/ a non-free program to read it.]
-
-I forwarded the information to Tracy. Feeling confident that she and I might be able to work out an equitable arrangement, I called up Stallman and set up the first interview for the book. Stallman agreed to the interview without making a second inquiry into the status issue. Shortly after the first interview, I raced to set up a second interview (this one in Kihei), squeezing it in before Stallman headed off on a 14-day vacation to Tahiti. [RMS: That was not a pure vacation; I gave a speech there too.]
-={Kihei (Hawaii)}
-
-It was during Stallman's vacation that the bad news came from Tracy. Her company's legal department didn't want to adjust its [license] notice on the e-books. Readers who wanted to make their books transferable would [first have to crack the encryption code, to be able to convert the book to a free, public format such as HTML. This would be illegal and they might face criminal penalties.]
-
-With two fresh interviews under my belt, I didn't see any way to write the book without resorting to the new material. I quickly set up a trip to New York to meet with my agent and with Tracy to see if there was a compromise solution.
-
-When I flew to New York, I met my agent, Henning Guttman. It was our first face-to-face meeting, and Henning seemed pessimistic about our chances of forcing a compromise, at least on the publisher's end. The large, established publishing houses already viewed the e-book format with enough suspicion and weren't in the mood to experiment with copyright language that made it easier for readers to avoid payment. As an agent who specialized in technology books, however,Henning was intrigued by the novel nature of my predicament. I told him about the two interviews I'd already gathered and the promise not to publish the book in a way that made Stallman "look like a hypocrite." Agreeing that I was in an ethical bind, Henning suggested we make that our negotiating point.
-={Guttman, Henning}
-
-Barring that, Henning said, we could always take the carrot-and-stick approach. The carrot would be the publicity that came with publishing an e-book that honored the hacker community's internal ethics. The stick would be the risks associated with publishing an e-book that didn't. Nine months before Dmitry Sklyarov became an Internet /{cause célèbre}/, we knew it was only a matter of time before an enterprising programmer revealed how to hack e-books. We also knew that a major publishing house releasing an [encrypted] e-book on Richard M. Stallman was the software equivalent of putting "Steal This E-Book" on the cover.
-={Sklyarov, Dmitri}
-
-After my meeting with Henning, I called Stallman. Hoping to make the carrot more enticing, I discussed a number of potential compromises. What if the publisher released the book's content under a[dual] license, something similar to what Sun Microsystems had done with Open Office, the free software desktop applications suite? The publisher could then release DRM-restricted~{ RMS: Williams wrote "commercial" here, but that is a misnomer, since it means "connected with business." All these versions would be commercial if a company published them. }~ versions of the e-book under [its usual] format, taking advantage of all the bells and whistles that went with the e-book software, while releasing the copyable version under a less aesthetically pleasing HTML format.
-
-Stallman told me he didn't mind the [dual-license] idea, but he did dislike the idea of making the freely copyable version inferior to the restricted version. Besides, he said [on second thought, this case was different precisely because he had] a way to control the outcome. He could refuse to cooperate.
-
-[RMS: The question was whether it would be wrong for me to agree to the restricted version. I can endorse the free version of Sun's Open Office, because it is free software and much better than nothing,while at the same time I reject the non-free version. There is no self- contradiction here, because Sun didn't need or ask my approval for the non-free version; I was not responsible for its existence. In this case, if I had said yes to the non-freely-copyable version, the onus would fall on me.]
-
-I made a few more suggestions with little effect. About the only thing I could get out of Stallman was a concession [RMS: i.e., a further compromise] that the e-book's [license] restrict all forms of file sharing to "noncommercial redistribution."
-
-Before I signed off, Stallman suggested I tell the publisher that I'd promised Stallman that the work would be [freely sharable]. I told Stallman I couldn't agree to that statement [RMS: though it was true,since he had accepted my conditions at the outset] but that I did view the book as unfinishable without his cooperation. Seemingly satisfied,Stallman hung up with his usual sign-off line: "Happy hacking."
-
-Henning and I met with Tracy the next day. Tracy said her company was willing to publish copyable excerpts in a unencrypted format but would limit the excerpts to 500 words. Henning informed her that this wouldn't be enough for me to get around my ethical obligation to Stallman. Tracy mentioned her own company's contractual obligation to online vendors such as Amazon.com. Even if the company decided to open up its e-book content this one time, it faced the risk of its partners calling it a breach of contract. Barring a change of heart in the executive suite or on the part of Stallman, the decision was up tome. I could use the interviews and go against my earlier agreement with Stallman, or I could plead journalistic ethics and back out of the verbal agreement to do the book.
-={Amazon.com}
-
-Following the meeting, my agent and I relocated to a pub on Third Ave. I used his cell phone to call Stallman, leaving a message when nobody answered. Henning left for a moment, giving me time to collect my thoughts. When he returned, he was holding up the cell phone.
-
-"It's Stallman," Henning said.
-
-The conversation got off badly from the start. I relayed Tracy's comment about the publisher's contractual obligations.
-
-"So," Stallman said bluntly. "Why should I give a damn about their contractual obligations?"
-
-Because asking a major publishing house to risk a legal battle with its vendors over a 30,000-word e-book is a tall order, I suggested. [RMS: His unstated premise was that I couldn't possibly refuse this deal for mere principle.]
-
-"Don't you see?" Stallman said. "That's exactly why I'm doing this. I want a signal victory. I want them to make a choice between freedom and business as usual."
-
-As the words "signal victory" echoed in my head, I felt my attention wander momentarily to the passing foot traffic on the sidewalk. Coming into the bar, I had been pleased to notice that the location was less than half a block away from the street corner memorialized in the 1976 Ramones song, "53rd and 3rd," a song I always enjoyed playing in my days as a musician. Like the perpetually frustrated street hustler depicted in that song, I could feel things falling apart as quickly as they had come together. The irony was palpable. After weeks of gleefully recording other people's laments, I found myself in the position of trying to pull off the rarest of feats: a Richard Stallman compromise. When I continued hemming and hawing, pleading the publisher's position and revealing my growing sympathy for it,Stallman, like an animal smelling blood, attacked.
-
-"So that's it? You're just going to screw me? You're just going to bend to their will?"
-
-[RMS: The quotations show that Williams' interpretation of this conversation was totally wrong. He compares me to a predator, but I was only saying no to the deal he was badgering me to accept.I had already made several compromises, some described above; I just refused to compromise my principles entirely away. I often do this; people who aren't satisfied say I "refused to compromise at all, "but that is an exaggeration; \\ see http://www.gnu.org/philosophy/compromise.html. Then I feared he was going to disregard the conditions he had previously agreed to, and publish the book with DRM despite my refusal. What I smelled was not his "blood" but possible betrayal.]
-
-I brought up the issue of a dual-copyright again.
-
-"You mean license," Stallman said curtly.
-
-"Yeah, license. Copyright. Whatever," I said, feeling suddenly like a wounded tuna trailing a rich plume of plasma in the water.
-
-"Aw, why didn't you just fucking do what I told you to do!" he shouted. [RMS: I think this quotation was garbled, both because using "fucking" as an adverb was never part of my speech pattern, and because the words do not fit the circumstances. The words he quotes are a rebuke to a disobedient subordinate. I felt he had an ethical obligation, but he was not my subordinate, and I would not have spoken to him as one. Using notes rather than a recorder, he could not reliably retain the exact words.]
-
-I must have been arguing on behalf of the publisher to the very end, because in my notes I managed to save a final Stallman chestnut: "I don't care. What they're doing is evil. I can't support evil. Goodbye." [RMS: It sounds like I had concluded that he would never take no for an answer, and the only way to end the conversation without accepting his proposition was to hang up on him.]
-
-As soon as I put the phone down, my agent slid a freshly poured Guinness to me. "I figured you might need this," he said with a laugh. "I could see you shaking there towards the end."
-
-I was indeed shaking. The shaking wouldn't stop until the Guinness was more than halfway gone. It felt weird, hearing myself characterized as an emissary of "evil." [RMS: My words as quoted criticize the publisher, not Williams personally. If he took it personally, perhaps that indicates he was starting to take ethical responsibility for the deal he had pressed me to accept.] It felt weirder still, knowing that three months before, I was sitting in an Oakland apartment trying to come up with my next story idea. Now, I was sitting in a part of the world I'd only known through rock songs, taking meetings with publishing executives and drinking beer with an agent I'd never even laid eyes on until the day before. It was all too surreal, like watching my life reflected back as a movie montage.
-
-About that time, my internal absurdity meter kicked in. The initial shaking gave way to convulsions of laughter. To my agent, I must have looked like a another fragile author undergoing an untimely emotional breakdown. To me, I was just starting to appreciate the cynical beauty of my situation. Deal or no deal, I already had the makings of a pretty good story. It was only a matter of finding a place to tell it. When my laughing convulsions finally subsided, I held up my drink in a toast.
-
-"Welcome to the front lines, my friend," I said, clinking pints with my agent. "Might as well enjoy it."
-
-If this story really were a play, here's where it would take a momentary, romantic interlude. Disheartened by the tense nature of our meeting, Tracy invited Henning and me to go out for drinks with her and some of her coworkers. We left the bar on Third Ave., headed down to the East Village, and caught up with Tracy and her friends.
-
-Once there, I spoke with Tracy, careful to avoid shop talk. Our conversation was pleasant, relaxed. Before parting, we agreed to meet the next night. Once again, the conversation was pleasant, so pleasant that the Stallman e-book became almost a distant memory.
-
-When I got back to Oakland, I called around to various journalist friends and acquaintances. I recounted my predicament. Most upbraided me for giving up too much ground to Stallman in the pre-interview negotiation. [RMS: Those who have read the whole book know that I would never have dropped the conditions.] A former j-school professor suggested I ignore Stallman's "hypocrite" comment and just write the story. Reporters who knew of Stallman's media-savviness ex-pressed sympathy but uniformly offered the same response: it's your call.
-
-I decided to put the book on the back burner. Even with the interviews, I wasn't making much progress. Besides, it gave me a chance to speak with Tracy without running things past Henning first.By Christmas we had traded visits: she flying out to the west coast once, me flying out to New York a second time. The day before New Year's Eve, I proposed. Deciding which coast to live on, I picked New York. By February, I packed up my laptop computer and all my research notes related to the Stallman biography, and we winged our way to JFK Airport. Tracy and I were married on May 11. So much for failed book deals.
-
-During the summer, I began to contemplate turning my interview notes into a magazine article. Ethically, I felt in the clear doing so,since the original interview terms said nothing about traditional print media. To be honest, I also felt a bit more comfortable writing about Stallman after eight months of radio silence. Since our telephone conversation in September, I'd only received two emails from Stallman.Both chastised me for using "Linux" instead of "GNU/Linux" in a pair of articles for the web magazine /{Upside Today}/. Aside from that, I had enjoyed the silence. In June, about a week after the New York University speech, I took a crack at writing a 5,000-word magazine-length story about Stallman. This time, the words flowed. The distance had helped restore my lost sense of emotional perspective, I suppose.
-={Upside Today web magazine}
-
-In July, a full year after the original email from Tracy, I got a call from Henning. He told me that O'Reilly & Associates, a publishing house out of Sebastopol, California, was interested in the running the Stallman story as a biography. [RMS: I have a vague memory that I suggested contacting O'Reilly, but I can't be sure after all these years.] The news pleased me. Of all the publishing houses in the world, O'Reilly, the same company that had published Eric Raymond's /{The Cathedral and the Bazaar}/, seemed the most sensitive to the issues that had killed the earlier e-book. As a reporter, I had relied heavily on the O'Reilly book /{Open Sources}/ as a historical reference. I also knew that various chapters of the book, including a chapter written by Stallman, had been published with [license] notices that permitted redistribution. Such knowledge would come in handy if the issue of electronic publication ever came up again.
-={Cathedral and the Bazaar, The (Raymond);O'Reilly & Associates;Open Sources (DiBona, et al)+2;Raymond, Eric}
-
-Sure enough, the issue did come up. I learned through Henning that O'Reilly intended to publish the biography both as a book and as part of its new Safari Tech Books Online subscription service. The Safari user license would involve special restrictions,~{ See "Safari Tech Books Online; Subscriber Agreement: Terms of Service" \\ http://my.safaribooksonline.com/termsofservice. As of December, 2009, the see-books require non-free reader software, so people should refuse to use them. }~ Henning warned, but O'Reilly was willing to allow for a copyright that permitted users to copy and share the book's text regardless of medium. Basically, as author, I had the choice between two licenses: the Open Publication License or the GNU Free Documentation License.
-={Open Publication License (OPL)+8;OPL (Open Publication License)+8;Safari Tech Books Online subscription service}
-
-I checked out the contents and background of each license. The Open Publication License (OPL)~{ See "The Open Publication License: Draft v1.0" (June 8, 1999), \\ http://opencontent.org/openpub/. }~ gives readers the right to reproduce and distribute a work, in whole or in part, in any medium "physical or electronic," provided the copied work retains the Open Publication License. It also permits modification of a work, provided certain conditions are met. Finally, the Open Publication License includes a number of options, which, if selected by the author, can limit the creation of "substantively modified" versions or book-form derivatives without prior author approval.
-
-The GNU Free Documentation License (GFDL), meanwhile, permits the copying and distribution of a document in any medium, provided the resulting work carries the same license.~{ See "The GNU Free Documentation License: Version 1.3" (November, 2008), \\ http://www.gnu.org/copyleft/fdl.html. }~
-={GFDL (GNU Free Documentation License)+1;GNU Free Documentation License (GFDL)+1}
-
-It also permits the modification of a document provided certain conditions. Unlike the OPL, however, it does not give authors the option to restrict certain modifications. It also does not give authors the right to reject modifications that might result in a competitive book product. It does require certain forms of front - and back-cover information if a party other than the copyright holder wishes to publish more than 100 copies of a protected work, however.
-
-In the course of researching the licenses, I also made sure to visit the GNU Project web page titled "Various Licenses and Comments About Them."~{ See http://www.gnu.org/philosophy/license-list.html. }~
-
-On that page, I found a Stallman critique of the Open Publication License. Stallman's critique related to the creation of modified works and the ability of an author to select either one of the OPL's options to restrict modification. If an author didn't want to select either option, it was better to use the GFDL instead, Stallman noted, since it minimized the risk of the non-selected options popping up in modified versions of a document.
-
-The importance of modification in both licenses was a reflection of their original purpose - namely, to give software-manual owners a chance to improve their manuals and publicize those improvements to the rest of the community. Since my book wasn't a manual, I had little concern about the modification clause in either license. My only concern was giving users the freedom to exchange copies of the book or make copies of the content, the same freedom they would have enjoyed if they purchased a hardcover book. Deeming either license suitable for this purpose, I signed the O'Reilly contract when it came to me.
-
-Still, the notion of unrestricted modification intrigued me. In my early negotiations with Tracy, I had pitched the merits of a GPL-style license for the e-book's content. At worst, I said, the license would guarantee a lot of positive publicity for the e-book. At best, it would encourage readers to participate in the book-writing process. As an author, I was willing to let other people amend my work just so long as my name always got top billing. Besides, it might even be interesting to watch the book evolve. I pictured later editions looking much like online versions of the /{Talmud}/, my original text in a central column surrounded by illuminating, third-party commentary in the margins.
-
-My idea drew inspiration from Project Xanadu (http://www.xanadu.com), the legendary software concept originally conceived by Ted Nelson in 1960. During the O'Reilly Open Source Conference in 1999, I had seen the first demonstration of the project's [free] offshoot Udanax and had been wowed by the result. In one demonstration sequence, Udanax displayed a parent document and a derivative work in a similar two-column, plain-text format. With a click of the button, the program introduced lines linking each sentence in the parent to its conceptual offshoot in the derivative. An e-book biography of Richard M. Stallman didn't have to be Udanax-enabled, but given such technological possibilities, why not give users a chance to play around?~{ Anybody willing to "port" this book over to Udanax, the free software version of Xanadu, will receive enthusiastic support from me. To find out more about this intriguing technology, \\ visit http://www.udanax.com. }~
-={Nelson, Ted;O'Reilly & Associates:Open Source Conferences;Project Xanadu;Udanax}
-
-When Laurie Petrycki, my editor at O'Reilly, gave me a choice be-tween the OPL or the GFDL, I indulged the fantasy once again. By September of 2001, the month I signed the contract, e-books had become almost a dead topic. Many publishing houses, Tracy's included,were shutting down their e-book imprints for lack of interest. I had to wonder. If these companies had treated e-books not as a form of publication but as a form of community building, would those imprints have survived?
-={GFDL (GNU Free Documentation License)+1;GNU Free Documentation License (GFDL)+1;Petrycki, Laurie}
-
-After I signed the contract, I notified Stallman that the book project was back on. I mentioned the choice O'Reilly was giving me between the Open Publication License and the GNU Free Documentation License. I told him I was leaning toward the OPL, if only for the fact I saw no reason to give O'Reilly's competitors a chance to print the same book under a different cover. Stallman wrote back, arguing in favor of the GFDL, noting that O'Reilly had already used it several times in the past. Despite the events of the past year, I suggested a deal. I would choose the GFDL if it gave me the possibility to do more interviews and if Stallman agreed to help O'Reilly publicize the book. Stallman agreed to participate in more interviews but said that his participation in publicity-related events would depend on the content of the book. Viewing this as only fair, I set up an interview for December 17, 2001 in Cambridge.
-
-I set up the interview to coincide with a business trip my wife Tracy was taking to Boston. Two days before leaving, Tracy suggested I invite Stallman out to dinner.
-
-"After all," she said, "he is the one who brought us together."I sent an email to Stallman, who promptly sent a return email accepting the offer. When I drove up to Boston the next day, I met Tracy at her hotel and hopped the T to head over to MIT. When we got to Tech Square, I found Stallman in the middle of a conversation just as we knocked on the door.
-
-"I hope you don't mind," he said, pulling the door open far enough so that Tracy and I could just barely hear Stallman's conversational counterpart. It was a youngish woman, mid-20s I'd say, named Sarah.
-
-"I took the liberty of inviting somebody else to have dinner with us," Stallman said, matter-of-factly, giving me the same catlike smile he gave me back in that Palo Alto restaurant.
-
-To be honest, I wasn't too surprised. The news that Stallman had a new female friend had reached me a few weeks before, courtesy of Stallman's mother. "In fact, they both went to Japan last month when Richard went over to accept the Takeda Award," Lippman told me at the time.~{ Alas, I didn't find out about the Takeda Foundation's decision to award Stallman, along with Linus Torvalds and Ken Sakamura, with its first-ever award for"Techno-Entrepreneurial Achievement for Social/Economic Well-Being" until after Stallman had made the trip to Japan to accept the award. For more information about the award and its accompanying $1 million prize, visit the Takeda site, \\ http://www.takeda-foundation.jp. }~
-={Takeda Awards}
-
-On the way over to the restaurant, I learned the circumstances of Sarah and Richard's first meeting. Interestingly, the circumstances were very familiar. Working on her own fictional book, Sarah said she heard about Stallman and what an interesting character he was. She promptly decided to create a character in her book on Stallman and,in the interests of researching the character, set up an interview with Stallman. Things quickly went from there. The two had been dating since the beginning of 2001, she said.
-
-"I really admired the way Richard built up an entire political movement to address an issue of profound personal concern," Sarah said,explaining her attraction to Stallman.
-
-My wife immediately threw back the question: "What was the issue?" "Crushing loneliness." During dinner, I let the women do the talking and spent most of the time trying to detect clues as to whether the last 12 months had softened Stallman in any significant way. I didn't see anything to suggest they had. Although more flirtatious than I remembered,Stallman retained the same general level of prickliness. At one point,my wife uttered an emphatic "God forbid" only to receive a typical Stallman rebuke.
-
-"I hate to break it to you, but there is no God," Stallman said.[RMS: I must have been too deadpan. He could justly accuse me of being a wise guy, but not of rebuking.]
-
-Afterwards, when the dinner was complete and Sarah had departed, Stallman seemed to let his guard down a little. As we walked to a nearby bookstore, he admitted that the last 12 months had dramatically changed his outlook on life. "I thought I was going to be alone forever," he said. "I'm glad I was wrong."
-
-Before parting, Stallman handed me his "pleasure card," a business card listing Stallman's address, phone number, and favorite pastimes("sharing good books, good food and exotic music and dance") so that I might set up a final interview.
-
-The next day, over another meal of dim sum, Stallman seemed even more lovestruck than the night before. Recalling his debates with Currier House dorm maters over the benefits and drawbacks of an immortality serum, Stallman expressed hope that scientists might some day come up with the key to immortality. "Now that I'm finally starting to have happiness in my life, I want to have [a longer life]," he said.
-
-When I mentioned Sarah's "crushing loneliness" comment, Stallman failed to see a connection between loneliness on a physical or spiritual level and loneliness on a hacker level. "The impulse to share code is about friendship but friendship at a much lower level," he said. Later, however, when the subject came up again, Stallman did admit that loneliness, or the fear of perpetual loneliness [RMS: at the hacker-to-hacker, community level, that is], had played a major role in fueling his determination during the earliest days of the GNU Project.
-
-"My fascination with computers was not a consequence of anything else," he said. "I wouldn't have been less fascinated with computers if I had been popular and all the women flocked to me. However, it's certainly true the experience of feeling I didn't have a home, finding one and losing it, finding another and having it destroyed, affected me deeply. The one I lost was the dorm. The one that was destroyed was the AI Lab. The precariousness of not having any kind of home or community was very powerful. It made me want to fight to get it back."
-
-After the interview, I couldn't help but feel a certain sense of emotional symmetry. Hearing Sarah describe what attracted her to Stallman and hearing Stallman himself describe the emotions that prompted him to take up the free software cause, I was reminded of my own reasons for writing this book. Since July, 2000, I have learned to appreciate both the seductive and the repellent sides of the Richard Stallman persona. Like Eben Moglen before me, I feel that dismissing that persona as epiphenomenal or distracting in relation to the overall free software movement would be a grievous mistake. In many ways the two are so mutually defining as to be indistinguishable.
-
-[RMS: Williams objectifies his reactions, both positive and negative, as parts of me, but they are functions also of his own attitudes about appearance, conformity, and business success.]
-
-While I'm sure not every reader feels the same level of affinity for Stallman...I'm sure most will agree [that] few individuals offer as singular a human portrait as Richard M. Stallman. It is my sincere hope that, with this initial portrait complete and with the help of the GFDL, others will feel a similar urge to add their own perspective to that portrait.
-
-Endnotes
-
-1~ Appendix A - Hack, Hackers and Hacking
-={hackers+18}
-
-To understand the full meaning of the word "hacker," it helps to examine the word's etymology over the years.
-
-/{The New Hacker Dictionary}/, an online compendium of software-programmer jargon, officially lists nine different connotations of the word "hack" and a similar number for "hacker." Then again, the same publication also includes an accompanying essay that quotes Phil Agre, an MIT hacker who warns readers not to be fooled by the word's perceived flexibility. "Hack has only one meaning," argues Agre. "An extremely subtle and profound one which defies articulation." Richard Stallman tries to articulate it with the phrase, "Playful cleverness."
-={Agre, Phil;New Hacker Dictionary, The}
-
-Regardless of the width or narrowness of the definition, most modern hackers trace the word back to MIT, where the term bubbled upas popular item of student jargon in the early 1950s. In 1990 the MIT Museum put together a journal documenting the hacking phenomenon.According to the journal, students who attended the institute during the fifties used the word "hack" the way a modern student might use the word "goof." Hanging a jalopy out a dormitory window was a "hack," but anything harsh or malicious - e.g., egging a rival dorm's windows or defacing a campus statue - fell outside the bounds. Implicit within the definition of "hack" was a spirit of harmless, creative fun.
-={MIT Museum}
-
-This spirit would inspire the word's gerund form: "hacking." A 1950s student who spent the better part of the afternoon talking on the phone or dismantling a radio might describe the activity as "hacking." Again, a modern speaker would substitute the verb form of "goof" -"goofing" or "goofing off" - to describe the same activity.
-
-As the 1950s progressed, the word "hack" acquired a sharper, more rebellious edge. The MIT of the 1950s was overly competitive, and hacking emerged as both a reaction to and extension of that competitive culture. Goofs and pranks suddenly became a way to blow off steam, thumb one's nose at campus administration, and indulge creative thinking and behavior stifled by the Institute's rigorous undergraduate curriculum. With its myriad hallways and underground steam tunnels, the Institute offered plenty of exploration opportunities for the student undaunted by locked doors and "No Trespassing"signs. Students began to refer to their off-limits explorations as "tunnel hacking." Above ground, the campus phone system offered similar opportunities. Through casual experimentation and due diligence, students learned how to perform humorous tricks. Drawing inspiration from the more traditional pursuit of tunnel hacking, students quickly dubbed this new activity "phone hacking."
-
-The combined emphasis on creative play and restriction-free exploration would serve as the basis for the future mutations of the hacking term. The first self-described computer hackers of the 1960s MIT campus originated from a late 1950s student group called the Tech Model Railroad Club. A tight clique within the club was the Signals and Power (S&P) Committee - the group behind the railroad club's electrical circuitry system. The system was a sophisticated assortment of relays and switches similar to the kind that controlled the local cam-pus phone system. To control it, a member of the group simply dialed in commands via a connected phone and watched the trains do his bidding.
-={Tech Model Railroad Club;S&P (Signals and Power) Committee+2;Signals and Power (S&P) Committee+2}
-
-The nascent electrical engineers responsible for building and maintaining this system saw their activity as similar in spirit to phone hacking. Adopting the hacking term, they began refining it even further. From the S&P hacker point of view, using one less relay to operate a particular stretch of track meant having one more relay for future play. Hacking subtly shifted from a synonym for idle play to a synonym for idle play that improved the overall performance or efficiency of the club's railroad system at the same time. Soon S&P committee members proudly referred to the entire activity of improving and reshaping the track's underlying circuitry as "hacking" and to the people who did it as "hackers."
-
-Given their affinity for sophisticated electronics - not to mention the traditional MIT-student disregard for closed doors and "No Trespassing" signs - it didn't take long before the hackers caught wind of a new machine on campus. Dubbed the TX-0, the machine was one of the first commercially marketed computers. By the end of the 1950s, the entire S&P clique had migrated en masse over to the TX-0 control room, bringing the spirit of creative play with them.The wide-open realm of computer programming would encourage yet another mutation in etymology. "To hack" no longer meant soldering unusual looking circuits, but cobbling together software programs with little regard to "official" methods or software-writing procedures. It also meant improving the efficiency and speed of already-existing pro-grams that tended to hog up machine resources. True to the word's roots, it also meant writing programs that served no other purpose than to amuse or entertain.
-={TX-0 computer}
-
-A classic example of this expanded hacking definition is the game Spacewar, the first computer-based video game. Developed by MIT hackers in the early 1960s, Spacewar had all the traditional hacking definitions: it was goofy and random, serving little useful purpose other than providing a nightly distraction for the dozen or so hackers who delighted in playing it. From a software perspective, however,it was a monumental testament to innovation of programming skill.It was also completely free. Because hackers had built it for fun,they saw no reason to guard their creation, sharing it extensively with other programmers. By the end of the 1960s, Spacewar had become a diversion for programmers around the world, if they had the (then rather rare) graphical displays.
-
-This notion of collective innovation and communal software ownership distanced the act of computer hacking in the 1960s from the tunnel hacking and phone hacking of the 1950s. The latter pursuits tended to be solo or small-group activities. Tunnel and phone hackers relied heavily on campus lore, but the off-limits nature of their activity discouraged the open circulation of new discoveries. Computer hackers, on the other hand, did their work amid a scientific field biased toward collaboration and the rewarding of innovation. Hackers and "official" computer scientists weren't always the best of allies, but in the rapid evolution of the field, the two species of computer programmer evolved a cooperative - some might say symbiotic - relationship.
-
-Hackers had little respect for bureaucrats' rules. They regarded computer security systems that obstructed access to the machine as just another bug, to be worked around or fixed if possible. Thus,breaking security (but not for malicious purposes) was a recognized aspect of hacking in 1970, useful for practical jokes (the victim might say, "I think someone's hacking me") as well as for gaining access to the computer. But it was not central to the idea of hacking. Where there was a security obstacle, hackers were proud to display their wits in surmounting it; however, given the choice, as at the MIT AI Lab,they chose to have no obstacle and do other kinds of hacking. Where there is no security, nobody needs to break it.
-
-It is a testament to the original computer hackers' prodigious skill that later programmers, including Richard M. Stallman, aspired to wear the same hacker mantle. By the mid to late 1970s, the term"hacker" had acquired elite connotations. In a general sense, a computer hacker was any person who wrote software code for the sake of writing software code. In the particular sense, however, it was a testament to programming skill. Like the term "artist," the meaning carried tribal overtones. To describe a fellow programmer as a hacker was a sign of respect. To describe oneself as a hacker was a sign of immense personal confidence. Either way, the original looseness of the computer-hacker appellation diminished as computers became more common.
-
-As the definition tightened, "computer" hacking acquired additional semantic overtones. The hackers at the MIT AI Lab shared many other characteristics, including love of Chinese food, disgust for tobacco smoke, and avoidance of alcohol, tobacco and other addictive drugs. These characteristics became part of some people's under-standing of what it meant to be a hacker, and the community exerted an influence on newcomers even though it did not demand conformity. However, these cultural associations disappeared with the AI Lab hacker community. Today, most hackers resemble the surrounding society on these points.
-
-As the hackers at elite institutions such as MIT, Stanford, and Carnegie Mellon conversed about hacks they admired, they also considered the ethics of their activity, and began to speak openly of a "hacker ethic": the yet-unwritten rules that governed a hacker's day-to-day behavior. In the 1984 book /{Hackers}/, author Steven Levy, after much research and consultation, codified the hacker ethic as five core hacker tenets.
-={Hackers (Levy)+1}
-
-In the 1980s, computer use expanded greatly, and so did security breaking. Mostly it was done by insiders with criminal intent, who were generally not hackers at all. However, occasionally the police and administrators, who defined disobedience as evil, traced a computer "intrusion" back to a hacker whose idea of ethics was "Don't hurt people." Journalists published articles in which "hacking" meant breaking security, and usually endorsed the administrators' view of the matter. Although books like /{Hackers}/ did much to document the original spirit of exploration that gave rise to the hacking culture, for most newspaper reporters and readers the term "computer hacker"became a synonym for "electronic burglar."
-
-By the late 1980s, many U.S. teenagers had access to computers.Some were alienated from society; inspired by journalists' distorted picture of "hacking," they expressed their resentment by breaking computer security much as other alienated teens might have done it by breaking windows. They began to call themselves "hackers," but they never learned the MIT hackers' principle against malicious behavior.As younger programmers began employing their computer skills to harmful ends - creating and disseminating computer viruses, breaking into computer systems for mischief, deliberately causing computers to crash - the term "hacker" acquired a punk, nihilistic edge which attracted more people with similar attitudes.
-
-Hackers have railed against this perceived mis-usage of their self-designator for nearly two decades. Stallman, not one to take things lying down, coined the term "cracking" for "security breaking" so that people could more easily avoid calling it "hacking." But the distinction between hacking and cracking is often misunderstood. These two descriptive terms are not meant to be exclusive. It's not that "Hacking is here, and cracking is there, and never the twain shall meet." Hacking and cracking are different attributes of activities, just as "young"and "tall" are different attributes of persons.
-
-Most hacking does not involve security, so it is not cracking. Most cracking is done for profit or malice and not in a playful spirit, so it is not hacking. Once in a while a single act may qualify as cracking and as hacking, but that is not the usual case. The hacker spirit includes irreverence for rules, but most hacks do not break rules. Cracking is by definition disobedience, but it is not necessarily malicious or harmful. The computer security field distinguishes between "black hat"and "white hat" crackers - i.e., crackers who turn toward destructive,malicious ends versus those who probe security in order to fix it.
-
-The hacker's central principle not to be malicious remains the primary cultural link between the notion of hacking in the early 21st century and hacking in the 1950s. It is important to note that, as the idea of computer hacking has evolved over the last four decades,the original notion of hacking - i.e., performing pranks or exploring underground tunnels - remains intact. In the fall of 2000, the MIT Museum paid tribute to the Institute's age-old hacking tradition with a dedicated exhibit, the Hall of Hacks. The exhibit includes a number of photographs dating back to the 1920s, including one involving amock police cruiser. In 1993, students paid homage to the original MIT notion of hacking by placing the same police cruiser, lights flashing, atop the Institute's main dome. The cruiser's vanity license plate read IHTFP, a popular MIT acronym with many meanings. The most noteworthy version, itself dating back to the pressure-filled world of MIT student life in the 1950s, is "I hate this fucking place." In 1990,however, the Museum used the acronym as a basis for a journal on the history of hacks. Titled /{The Journal of the Institute for Hacks,Tomfoolery, and Pranks}/, it offers an adept summary of the hacking.
-={Hall of Hacks}
-
-"In the culture of hacking, an elegant, simple creation is as highly valued as it is in pure science," writes /{Boston Globe}/ reporter Randolph Ryan in a 1993 article attached to the police car exhibit. "A Hack differs from the ordinary college prank in that the event usually requires careful planning, engineering and finesse, and has an under-lying wit and inventiveness," Ryan writes. "The unwritten rule holds that a hack should be good-natured, non-destructive and safe. In fact,hackers sometimes assist in dismantling their own handiwork."
-={Boston Globe;Ryan, Randolph}
-
-The urge to confine the culture of computer hacking within the same ethical boundaries is well-meaning but impossible. Although most software hacks aspire to the same spirit of elegance and simplicity,the software medium offers less chance for reversibility. Dismantling a police cruiser is easy compared with dismantling an idea, especially an idea whose time has come.
-
-Once a vague item of obscure student jargon, the word "hacker" has become a linguistic billiard ball, subject to political spin and ethical nuances. Perhaps this is why so many hackers and journalists enjoy using it. We cannot predict how people will use the word in the future.We can, however, decide how we will use it ourselves. Using the term "cracking" rather than "hacking," when you mean "security breaking,"shows respect for Stallman and all the hackers mentioned in this book,and helps preserve something which all computer users have benefited from: the hacker spirit.
-={crackers}
-
-1~ Appendix B - GNU Free Documentation License
-={GFDL (GNU Free Documentation License)+64;GNU Free Documentation License (GFDL)+64}
-
-Version 1.3, 3 November 2008
-
-Copyright © 2000, 2001, 2002, 2007, 2008 Free Software Foundation
-
-http://fsf.org/
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-2~ Preamble
-
-The purpose of this License is to make a manual, textbook, or other functional and useful document "free" in the sense of freedom:to assure everyone the effective freedom to copy and redistribute it,with or without modifying it, either commercially or non-commercially.Secondarily, this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense.It complements the GNU General Public License, which is a copyleft license designed for free software.
-
-We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the software does. But this License is not limited to software manuals;it can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference.
-
-2~ 1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium,that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. Such a notice grants a world-wide, royalty-free license, unlimited in duration, to use that work under the conditions stated herein. The "!{Document}!", below,refers to any such manual or work. Any member of the public is a licensee, and is addressed as "!{you}!". You accept the license if you copy, modify or distribute the work in a way requiring permission under copyright law.
-
-A "!{Modified Version}!" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language.
-
-A "!{Secondary Section}!" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly within that overall subject. (Thus, if the Document is in part a textbook of mathematics, a Secondary Section may not explain any mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial,philosophical, ethical or political position regarding them.
-
-The "!{Invariant Sections}!" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. If a section does not fit the above definition of Secondary then it is not allowed to be designated as Invariant. The Document may contain zero Invariant Sections. If the Document does not identify any Invariant Sections then there are none.
-
-The "!{Cover Texts}!" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. A Front-Cover Text may be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "!{Transparent}!" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, that is suitable for revising the document straight forwardly with generic text editors or (for images composed of pixels) generic paint programs or (for drawings) some widely available drawing editor, and that is suitable for input to text formatters or for automatic translation to a variety of formats suitable for input to text formatters. A copy made in an otherwise Transparent file format whose markup, or absence of markup, has been arranged to thwart or discourage subsequent modification by readers is not Transparent. An image format is not Transparent if used for any substantial amount of text. A copy that is not "Transparent" is called "!{Opaque}!".
-
-Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple HTML, PostScript or PDF designed for human modification. Examples of transparent image formats include PNG, XCF and JPG. Opaque formats include proprietary formats that can be read and edited only by proprietary word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the machine-generated HTML, PostScript or PDF produced by some word processors for output purposes only.
-
-The "!{Title Page}!" means, for a printed book, the title page itself,plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text.
-
-The "!{publisher}!" means any person or entity that distributes copies of the Document to the public.
-
-A section "!{Entitled XYZ}!" means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a specific section name mentioned below, such as"!{Acknowledgements}!", "!{Dedications}!", "!{Endorsements}!", or "!{History}!".)
-
-To "!{Preserve the Title}!" of such a section when you modify the Document means that it remains a section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which states that this License applies to the Document. These Warranty Disclaimers are considered to be included by reference in this License, but only as regards disclaiming warranties: any other implication that these Warranty Disclaimers may have is void and has no effect on the meaning of this License.
-
-2~ 2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either commercially or non-commercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced in all copies, and that you add no other conditions whatsoever to those of this License. You may not use technical measures to obstruct or control the reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above,and you may publicly display copies.
-
-
-2~ 3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have printed covers) of the Document, numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present the full title with all words of the title equally prominent and visible. You may add other material on the covers in addition. Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages.
-
-If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a computer-network location from which the general network-using public has access to download using public-standard network protocols a complete Transparent copy of the Document, free of added material. If you use the latter option, you must take reasonably prudent steps, when you begin distribution of Opaque copies in quantity, to ensure that this Transparent copy will remain thus accessible at the stated location until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public.
-
-It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document.
-
-2~ 4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the same title as a previous version if the original publisher of that version gives permission.
-
-B. List on the Title Page, as authors, one or more persons or entities responsible for authorship of the modifications in the Modified Version, together with at least five of the principal authors of the Document (all of its principal authors, if it has fewer than five), unless they release you from this requirement.
-
-C. State on the Title page the name of the publisher of the Modified Version, as the publisher.
-
-D. Preserve all the copyright notices of the Document.
-
-E. Add an appropriate copyright notice for your modifications adjacent to the other copyright notices.
-
-F. Include, immediately after the copyright notices, a license notice giving the public permission to use the Modified Version under the terms of this License, in the form shown in the Addendum below.
-
-G. Preserve in that license notice the full lists of Invariant Sections and required Cover Texts given in the Document's license notice.
-
-H. Include an unaltered copy of this License.
-
-I. Preserve the section Entitled "History", Preserve its Title, and add to it an item stating at least the title, year, new authors,and publisher of the Modified Version as given on the Title Page.If there is no section Entitled "History" in the Document, create one stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the previous sentence.
-
-J. Preserve the network location, if any, given in the Document for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions it was based on. These may be placed in the "History" section. You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission.
-
-K. For any section Entitled "Acknowledgements" or "Dedications",Preserve the Title of the section, and preserve in the section all the substance and tone of each of the contributor acknowledgements and/or dedications given therein.
-
-
-L. Preserve all the Invariant Sections of the Document, unaltered in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles.
-
-M. Delete any section Entitled "Endorsements". Such a section may not be included in the Modified Version.
-
-N. Do not re-title any existing section to be Entitled "Endorsements"or to conflict in title with any Invariant Section.
-
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various parties-for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text may be added by (or through arrangements made by) any one entity. If the Document already includes a cover text for the same cover, previously added by you or by arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version.
-
-2~ 5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section unique by adding at the end of it, in parentheses, the name of the original author or publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History" in the various original documents, forming one section Entitled "History"; likewise combine any sections Entitled "Acknowledgements", and any sections Entitled "Dedications". You must delete all sections Entitled "Endorsements".
-
-2~ 6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document.
-
-2~ 7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, is called an "aggregate" if the copyright resulting from the compilation is not used to limit the legal rights of the compilation's users beyond what the individual works permit.When the Document is included in an aggregate, this License does not apply to the other works in the aggregate which are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one half of the entire aggregate, the Document's Cover Texts may be placed on covers that bracket the Document within the aggregate, or the electronic equivalent of covers if the Document is in electronic form.Otherwise they must appear on printed covers that bracket the whole aggregate.
-
-2~ 8. TRANSLATION
-
-Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4.Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a translation of this License,and all the license notices in the Document, and any Warranty Disclaimers, provided that you also include the original English version of this License and the original versions of those notices and disclaimers.In case of a disagreement between the translation and the original version of this License or a notice or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements","Dedications", or "History", the requirement (section 4) to Preserve its Title (section 1) will typically require changing the actual title.
-
-2~ 9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, or distribute it is void, and will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, receipt of a copy of some or all of the same material does not give you any rights to use it.
-
-2~ 10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. \\ See http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License "or any later version" applies to it, you have the option of following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published(not as a draft) by the Free Software Foundation. If the Document specifies that a proxy can decide which future versions of this License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Document.
-
-2~ 11. RELICENSING
-
-"Massive Multi-author Collaboration Site" (or "MMC Site") means any World Wide Web server that publishes copyrightable works and also provides prominent facilities for anybody to edit those works. A public wiki that anybody can edit is an example of such a server. A"Massive Multi-author Collaboration" (or "MMC") contained in the site means any set of copyrightable works thus published on the MMC site.
-
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 license published by Creative Commons Corporation, a not-for-profit corporation with a principal place of business in San Francisco,California, as well as future copyleft versions of that license published by that same organization.
-
-"Incorporate" means to publish or republish a Document, in whole or in part, as part of another Document.An MMC is "eligible for relicensing" if it is licensed under this License, and if all works that were first published under this License somewhere other than this MMC, and subsequently incorporated in whole or in part into the MMC, (1) had no cover texts or invariant sections, and (2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site under CC-BY-SA on the same site at any time before August 1, 2009, provided the MMC is eligible for relicensing.
-
-2~ ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page:
-
-_1 Copyright © YEAR YOUR NAME. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, replace the "with ... Texts." line with this:
-
-_1 with the Invariant Sections being LIST THEIR TITLES,with the Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other combination of the three, merge those two alternatives to suit the situation.
-
-If your document contains nontrivial examples of program code,we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software.
-
-1~ Colophon
-
-The front and back covers of this book were designed and produced by Rob Myers using Inkscape, the free software vector graphics program. Jeanne Rasata also contributed to the cover design.
-
-The typsetting was done by John Sullivan at the Free Software Foundation using LATEX, GNU Emacs, Evince, and the GNU Image Manipulation Program (GIMP). The primary font is 10-point Computer Modern.
-
-Digital versions of the book, including the LATEX source code, are available at http://www.fsf.org/faif. Improvements are welcome,and can be sent to sales@gnu.org.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.home.png b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.home.png
deleted file mode 100644
index b449fa6b..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.home.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.png
deleted file mode 100644
index b449fa6b..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/image/sisu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/list.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/list.yml
deleted file mode 100644
index 0d4235ab..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/list.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-sisu_manual:
- site:
- - sisu_manual
-sisu:
- site:
- - sisu
-open_society:
- site:
- - twon
- - fc
- - faif
- - twobits
- - ffa
- - catb
- - littlebrother
-sisu_icon:
- site:
- - sisu_icon
-ruby:
- site:
- - ruby_logo
-fsf:
- site:
- - fsf
-gpl:
- site:
- - gpl
-sisu_search_libre:
- search:
- - sisu_books_libre_sisusearch
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/promo.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/promo.yml
deleted file mode 100644
index 2971ff81..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/skin/yml/promo.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-# Author: ralph@amissah.com
-search:
- sisu_books_libre_sisusearch:
- type: sisusearch
- db: sisu
-site:
- sisu_icon:
- url: SiSU
- image: sisu.png
- blurb: ~
- sisu:
- title: SiSU
- url: index.html
- blurb: ~
- links:
- -
- title: What does SiSU do? Summary
- url: SiSU/1.html#summary
- -
- title: SiSU Book Samples and Markup Examples
- url: SiSU/examples.html
- -
- title: SiSU Download
- url: SiSU/download.html
- -
- title: SiSU Changelog
- url: SiSU/changelog.html
- blurb: ~
- -
- title: output by Author
- url: sisu_site_metadata/harvest_authors.html
- -
- title: output by Topic
- url: sisu_site_metadata/harvest_topics.html
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/SiSU
- blurb: ~
- -
- title: Freshmeat
- url: http://freshmeat.net/projects/sisu/
- -
- title: Ruby Application Archive
- url: http://raa.ruby-lang.org/project/sisu/
- twon:
- title: The Wealth of Networks
- subtitle: How Social Production Transforms Markets and Freedom
- author: Yochai Benkler
- year: 2006
- url: the_wealth_of_networks.yochai_benkler
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/The_Wealth_of_Networks
- -
- title: Source Wiki
- url: http://www.benkler.org/wealth_of_networks/index.php/Main_Page
- fc:
- title: Free Culture
- subtitle: How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
- author: Lawrence Lessig
- year: 2004
- url: free_culture.lawrence_lessig
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_Culture_%28book%29
- -
- title: Creative Commons
- url: http://creativecommons.org/
- -
- title: Source
- url: http://www.free-culture.cc/
- faif:
- title: Free As In Freedom
- subtitle: Richard Stallman's Crusade for Free Software
- author: Sam Williams
- year: 2002
- url: free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_as_in_Freedom:_Richard_Stallman%27s_Crusade_for_Free_Software
- -
- title: Source
- url: http://faifzilla.org/
- -
- title: FSF
- url: http://www.fsf.org/
- -
- title: FSF Wikipedia
- url: http://en.wikipedia.org/wiki/Free_Software_Foundation
- -
- title: GPL
- url: http://www.gnu.org/copyleft/gpl.html
- -
- title: GPL Wikipedia
- url: http://en.wikipedia.org/wiki/GNU_General_Public_License
- twobits:
- title: Two Bits
- subtitle: The Cultural Significance of Free Software
- author: Christopher Kelty
- year: 2008
- url: two_bits.christopher_kelty
- links:
- -
- title: Home
- url: http://twobits.net
- ffa:
- title: Free For All
- subtitle: How Linux and the Free Software Movement Undercut the High Tech Titans
- author: Peter Wayner
- year: 2002
- url: free_for_all.peter_wayner
- links:
- -
- title: Source
- url: http://www.wayner.org/books/ffa/
- catb:
- title: The Cathedral & the Bazaar
- subtitle: Musings on Linux and Open Source by an Accidental Revolutionary
- author: Erik S. Raymond
- year: 1999
- url: the_cathedral_and_the_bazaar.eric_s_raymond
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Cathedral_and_the_bazaar
- -
- title: Source
- url: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/
- fsf:
- title: Free Software Foundation
- subtitle: FSF
- url: http://www.fsf.org/
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/Free_Software_Foundation
- -
- title: GPL
- subtitle: GNU General Public License
- url: http://www.gnu.org/copyleft/gpl.html
- gpl:
- title: GNU General Public License
- subtitle: GPL
- url: http://www.gnu.org/copyleft/gpl.html
- links:
- -
- title: Wikipedia entry
- url: http://en.wikipedia.org/wiki/GNU_General_Public_License
- -
- title: GPL 3
- url: http://gplv3.fsf.org/
- -
- title: Software License List
- url: http://www.fsf.org/licensing/licenses/
- littlebrother:
- title: Little Brother
- author: Cory Doctorow
- year: 2008
- url: little_brother.cory_doctorow
- links:
- -
- title: Home
- url: http://craphound.com/littlebrother
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu.ssm b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu.ssm
deleted file mode 100644
index 666b2575..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu.ssm
+++ /dev/null
@@ -1,102 +0,0 @@
-% SiSU master 2.0
-
-@title: SiSU
- :subtitle: Manual
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2008-05-22
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-09-18
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2012
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual;electronic documents:SiSU:manual
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search; synopsis=sisu [-abCcDdeFGghIikLMmNnoPpQqRrSsTtUuVvWwXxYyZ_0-9] [filename/wildcard] . sisu [-Ddcv] [instruction] [filename/wildcard] . sisu [-CcFLSVvW] . sisu [operations] . sisu --v3 [operations] . sisu --v2 [operations] . sisu2 [operations]
-
-:A~ @title @creator
-
-:B~ What is SiSU?
-
-% << sisu_synopsis.ssi
-
-<< sisu_introduction.sst
-
-% :B~? SiSU Commands
-
-<< sisu_commands.sst
-
-<< sisu_help.sst
-
-% :B~? SiSU Markup
-
-<< sisu_markup.sst
-
-<< sisu_filetypes.sst
-
-% :B~? SiSU Configuration and Skins
-
-<< sisu_config.ssi
-
-<< sisu_skin.sst
-
-<< sisu_css.ssi
-
-<< sisu_content_directories.ssi
-
-<< sisu_homepages.ssi
-
-% :B~? SiSU Output and Markup Examples
-
-<< sisu_examples.ssi
-
-<< sisu_search_intro.ssi
-
-<< sisu_sql.ssi
-
-<< sisu_postgresql.sst
-
-<< sisu_sqlite.sst
-
-<< sisu_search_cgi.ssi
-
-<< sisu_webrick.sst
-
-<< sisu_remote.sst
-
-<< sisu_quickstart.sst
-
-<< sisu_syntax_highlighting.sst
-
-<< sisu_how.ssi
-
-<< sisu_short_feature_summary.ssi
-
-<< sisu_help_sources.sst
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_commands.sst
deleted file mode 100644
index 17f1c22a..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_commands.sst
+++ /dev/null
@@ -1,437 +0,0 @@
-% SiSU 3.0
-
-@title: SiSU
- :subtitle: Commands
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2012-05-25
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2012
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:commands;SiSU:manual:commands;electronic documents:SiSU:manual:commands;SiSU:document:commands;SiSU:document:commands
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Commands
-
-1~commands Commands Summary
-
-2~ Description
-
-SiSU is a document publishing system, that from a simple single marked-up document, produces multiple output formats including: plaintext, HTML, XHTML, XML, EPUB, ODT (OpenDocument (ODF) text), LaTeX, PDF, info, and SQL (PostgreSQL and SQLite), which share text object numbers ("object citation numbering") and the same document structure information. For more see: http://sisudoc.org or http://www.jus.uio.no/sisu
-
-% 2~ Summary of man page
-
-% This man page covers a number of subjects in brief, including: document processing command flags; document markup (basic markup and headers); configuration files; directory structure; skins; document naming; interactive help and other information.
-
-2~ Document Processing Command Flags
-
-!_ -a [filename/wildcard] \\
-produces plaintext with Unix linefeeds and without markup, (object numbers are omitted), has footnotes at end of each paragraph that contains them [ -A for equivalent dos (linefeed) output file] [see -e for endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes at the end of each paragraph --unix for unix linefeed (default) --msdos for msdos linefeed)
-
-!_ -b [filename/wildcard] \\
-see --xhtml
-
-!_ --by-* \\
-see --output-by-*
-
-!_ -C \\
-configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they already exist unless modifier is used). -C --init-site configure/initialise site more extensive than -C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if this modifier is used.
-
-!_ -CC \\
-see --configure
-
-!_ -c [filename/wildcard] \\
-see --color-toggle
-
-!_ --color-toggle [filename/wildcard] \\
-screen toggle ansi screen colour on or off depending on default set (unless -c flag is used: if sisurc colour default is set to 'true', output to screen will be with colour, if sisurc colour default is set to 'false' or is undefined screen output will be without colour). Alias -c
-
-!_ --configure \\
-configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they already exist unless modifier is used). The equivalent of: -C --init-site configure/initialise site, more extensive than -C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if -CC is used.
-
-!_ --concordance [filename/wildcard] \\
-produces concordance (wordmap) a rudimentary index of all the words in a document. (Concordance files are not generated for documents of over 260,000 words unless this limit is increased in the file sisurc.yml). Alias -w
-
-!_ -D [instruction] [filename] \\
-see --pg
-
-!_ -d [--db-[database type (sqlite|pg)]] --[instruction] [filename] \\
-see --sqlite
-
-!_ --dal [filename/wildcard/url] \\
-assumed for most other flags, creates new intermediate files for processing (document abstraction) that is used in all subsequent processing of other output. This step is assumed for most processing flags. To skip it see -n. Alias -m
-
-!_ --delete [filename/wildcard] \\
-see --zap
-
-!_ --dump[=directory_path] [filename/wildcard] \\
-places output in directory specified, if none is specified in the current directory (pwd). Compare --redirect
-
-!_ -e [filename/wildcard] \\
-see --epub
-
-!_ --epub [filename/wildcard] \\
-produces an epub document, [sisu version >=2 ] (filename.epub). Alias -e
-
-!_ --exc-* \\
-exclude output feature, overrides configuration settings
- --exc-ocn, (exclude object citation numbering, (switches off object citation numbering), affects html (seg, scroll), epub, xhtml, xml, pdf);
- --exc-toc, (exclude table of contents, affects html (scroll), epub, pdf);
- --exc-links-to-manifest, --exc-manifest-links, (exclude links to manifest, affects html (seg, scroll));
- --exc-search-form, (exclude search form, affects html (seg, scroll), manifest);
- --exc-minitoc, (exclude mini table of contents, affects html (seg), concordance, manifest);
- --exc-manifest-minitoc, (exclude mini table of contents, affects manifest);
- --exc-html-minitoc, (exclude mini table of contents, affects html (seg), concordance);
- --exc-html-navigation, (exclude navigation, affects html (seg));
- --exc-html-navigation-bar, (exclude navigation bar, affects html (seg));
- --exc-html-search-form, (exclude search form, affects html (seg, scroll));
- --exc-html-right-pane, (exclude right pane/column, affects html (seg, scroll));
- --exc-html-top-band, (exclude top band, affects html (seg, scroll), concordance (minitoc forced on to provide seg navigation));
- --exc-segsubtoc (exclude sub table of contents, affects html (seg), epub);
-see also --inc-*
-
-!_ -F [--webserv=webrick] \\
-see --sample-search-form
-
-!_ -f [optional string part of filename] \\
-see --find
-
-!_ --find [optional string part of filename] \\
-without match string, glob all .sst .ssm files in directory (including language subdirectories). With match string, find files that match given string in directory (including language subdirectories). Alias -f, --glob, -G
-
-!_ -G [optional string part of filename] \\
-see --find
-
-!_ -g [filename/wildcard] \\
-see --git
-
-!_ --git [filename/wildcard] \\
-produces or updates markup source file structure in a git repo (experimental and subject to change). Alias -g
-
-!_ --glob [optional string part of filename] \\
-see --find
-
-!_ -h [filename/wildcard] \\
-see --html
-
-!_ --harvest *.ss[tm] \\
-makes two lists of sisu output based on the sisu markup documents in a directory: list of author and authors works (year and titles), and; list by topic with titles and author. Makes use of header metadata fields (author, title, date, topic_register). Can be used with maintenance (-M) and remote placement (-R) flags.
-
-!_ --help [topic] \\
-provides help on the selected topic, where topics (keywords) include: list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, tables, example, customise, skin, (dir)ectories, path, (lang)uage, db, install, setup, (conf)igure, convert, termsheet, search, sql, features, license.
-
-!_ --html [filename/wildcard] \\
-produces html output, segmented text with table of contents (toc.html and index.html) and the document in a single file (scroll.html). Alias -h
-
-!_ -I [filename/wildcard] \\
-see --texinfo
-
-!_ -i [filename/wildcard] \\
-see --manpage
-
-!_ --inc-* \\
-include output feature, overrides configuration settings, (usually the default if none set), has precedence over --exc-* (exclude output feature). Some detail provided under --exc-*,
-see --exc-*
-
-!_ -j [filename/wildcard] \\
-copies images associated with a file for use by html, xhtml & xml outputs (automatically invoked by --dump & redirect).
-
-!_ --keep-processing-files [filename/wildcard/url] \\
-see --maintenance
-
-!_ -L \\
-prints license information.
-
-!_ -M [filename/wildcard/url] \\
-see --maintenance
-
-!_ -m [filename/wildcard/url] \\
-see --dal (document abstraction level/layer)
-
-!_ --machine [filename/wildcard/url] \\
-see --dal (document abstraction level/layer)
-
-!_ --maintenance [filename/wildcard/url] \\
-maintenance mode, interim processing files are preserved and their locations indicated. (also see -V). Aliases -M and --keep-processing-files.
-
-!_ --manpage [filename/wildcard] \\
-produces man page of file, not suitable for all outputs. Alias -i
-
-!_ -N [filename/wildcard/url] \\
-document digest or document content certificate ( DCC ) as md5 digest tree of the document: the digest for the document, and digests for each object contained within the document (together with information on software versions that produced it) (digest.txt). -NV for verbose digest output to screen.
-
-!_ -n [filename/wildcard/url] \\
-skip the creation of intermediate processing files (document abstraction) if they already exist, this skips the equivalent of -m which is otherwise assumed by most processing flags.
-
-!_ --no-* \\
-see --exc-*
-
-!_ -o [filename/wildcard/url] \\
-see --odt
-
-!_ --odf [filename/wildcard/url] \\
-see --odt
-
-!_ --odt [filename/wildcard/url] \\
-output basic document in opendocument file format (opendocument.odt). Alias -o
-
-!_ --output-by-* \\
-select output directory structure from 3 alternatives:
---output-by-language, (language directory (based on language code) with filetype (html, epub, pdf etc.) subdirectories);
---output-by-filetype, (filetype directories with language code as part of filename);
---output-by-filename, (filename directories with language code as part of filename).
-This is configurable. Alias --by-*
-
-!_ -P [language_directory/filename language_directory] \\
-see --po4a
-
-!_ -p [filename/wildcard] \\
-see --pdf
-
-!_ --pdf [filename/wildcard] \\
-produces LaTeX pdf (portrait.pdf & landscape.pdf). Default paper size is set in config file, or document header, or provided with additional command line parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and 'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Alias -p
-
-!_ --pg [instruction] [filename] \\
-database PostgreSQL ( --pgsql may be used instead) possible instructions, include: --createdb; --create; --dropall; --import [filename]; --update [filename]; --remove [filename]; see database section below. Alias -D
-
-!_ --po [language_directory/filename language_directory] \\
-see --po4a
-
-!_ --po4a [language_directory/filename language_directory] \\
-produces .pot and po files for the file in the languages specified by the language directory. SiSU markup is placed in subdirectories named with the language code, e.g. en/ fr/ es/. The sisu config file must set the output directory structure to multilingual. v3, experimental
-
-!_ -Q [filename/wildcard] \\
-see --qrcode
-
-!_ -q [filename/wildcard] \\
-see --quiet
-
-!_ --qrcode [filename/wildcard] \\
-generate QR code image of metadata (used in manifest). v3 only.
-
-!_ --quiet [filename/wildcard] \\
-quiet less output to screen.
-
-!_ -R [filename/wildcard] \\
-see --rsync
-
-!_ -r [filename/wildcard] \\
-see --scp
-
-!_ --redirect[=directory_path] [filename/wildcard] \\
-places output in subdirectory under specified directory, subdirectory uses the filename (without the suffix). If no output directory is specified places the subdirectory under the current directory (pwd). Compare --dump
-
-!_ --rsync [filename/wildcard] \\
-copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync different if -R is used with other flags from if used alone. Alone the rsync --delete parameter is sent, useful for cleaning the remote directory (when -R is used together with other flags, it is not). Also see --scp. Alias -R
-
-!_ -S \\
-see --sisupod
-
-!_ -S [filename/wildcard] \\
-see --sisupod
-
-!_ -s [filename/wildcard] \\
-see --source
-
-!_ --sample-search-form [--webserv=webrick] \\
-generate examples of (naive) cgi search form for SQLite and PgSQL depends on your already having used sisu to populate an SQLite and/or PgSQL database, (the SQLite version scans the output directories for existing sisu_sqlite databases, so it is first necessary to create them, before generating the search form) see -d -D and the database section below. If the optional parameter --webserv=webrick is passed, the cgi examples created will be set up to use the default port set for use by the webrick server, (otherwise the port is left blank and the system setting used, usually 80). The samples are dumped in the present work directory which must be writable, (with screen instructions given that they be copied to the cgi-bin directory). Alias -F
-
-!_ --scp [filename/wildcard] \\
-copies sisu output files to remote host using scp. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Also see --rsync. Alias -r
-
-!_ --sqlite --[instruction] [filename] \\
-database type set to SQLite, this produces one of two possible databases, without additional database related instructions it produces a discreet SQLite file for the document processed; with additional instructions it produces a common SQLite database of all processed documents that (come from the same document preparation directory and as a result) share the same output directory base path (possible instructions include: --createdb; --create; --dropall; --import [filename]; --update [filename]; --remove [filename]); see database section below. Alias -d
-
-!_ --sisupod \\
-produces a sisupod a zipped sisu directory of markup files including sisu markup source files and the directories local configuration file, images and skins. Note: this only includes the configuration files or skins contained in ./_sisu not those in ~/.sisu -S [filename/wildcard] option. Note: (this option is tested only with zsh). Alias -S
-
-!_ --sisupod [filename/wildcard] \\
-produces a zipped file of the prepared document specified along with associated images, by default named sisupod.zip they may alternatively be named with the filename extension .ssp This provides a quick way of gathering the relevant parts of a sisu document which can then for example be emailed. A sisupod includes sisu markup source file, (along with associated documents if a master file, or available in multilingual versions), together with related images and skin. SiSU commands can be run directly against a sisupod contained in a local directory, or provided as a url on a remote site. As there is a security issue with skins provided by other users, they are not applied unless the flag --trust or --trusted is added to the command instruction, it is recommended that file that are not your own are treated as untrusted. The directory structure of the unzipped file is understood by sisu, and sisu commands can be run within it. Note: if you wish to send multiple files, it quickly becomes more space efficient to zip the sisu markup directory, rather than the individual files for sending). See the -S option without [filename/wildcard]. Alias -S
-
-!_ --source [filename/wildcard] \\
-copies sisu markup file to output directory. Alias -s
-
-!_ -T [filename/wildcard (*.termsheet.rb)] \\
-standard form document builder, preprocessing feature
-
-!_ -t [filename/wildcard] \\
-see --txt
-
-!_ --texinfo [filename/wildcard] \\
-produces texinfo and info file, (view with pinfo). Alias -I
-
-!_ --txt [filename/wildcard] \\
-produces plaintext with Unix linefeeds and without markup, (object numbers are omitted), has footnotes at end of each paragraph that contains them [ -A for equivalent dos (linefeed) output file] [see -e for endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes at the end of each paragraph --unix for unix linefeed (default) --msdos for msdos linefeed). Alias -t
-
-!_ -U [filename/wildcard] \\
-see --urls
-
-!_ -u [filename/wildcard] \\
-provides url mapping of output files for the flags requested for processing, also see -U
-
-!_ --urls [filename/wildcard] \\
-prints url output list/map for the available processing flags options and resulting files that could be requested, (can be used to get a list of processing options in relation to a file, together with information on the output that would be produced), -u provides url output mapping for those flags requested for processing. The default assumes sisu_webrick is running and provides webrick url mappings where appropriate, but these can be switched to file system paths in sisurc.yml. Alias -U
-
-!_ -V \\
-on its own, provides SiSU version and environment information (sisu --help env)
-
-!_ -V [filename/wildcard] \\
-even more verbose than the -v flag.
-
-!_ -v \\
-on its own, provides SiSU version information
-
-!_ -v [filename/wildcard] \\
-see --verbose
-
-!_ --v2 [filename/wildcard] \\
-invokes the sisu v2 document parser/generator. This is the default and is normally omitted.
-
-!_ --v3 [filename/wildcard] \\
-invokes the sisu v3 document parser/generator. Currently under development and incomplete, v3 requires >= ruby1.9.2p180. You may run sisu3 instead.
-
-!_ --verbose [filename/wildcard] \\
-provides verbose output of what is being generated, where output is placed (and error messages if any), as with -u flag provides a url mapping of files created for each of the processing flag requests. Alias -v
-
-!_ -W \\
-see --webrick
-
-!_ -w [filename/wildcard] \\
-see --concordance
-
-!_ --webrick \\
-starts ruby's webrick webserver points at sisu output directories, the default port is set to 8081 and can be changed in the resource configuration files. [tip: the webrick server requires link suffixes, so html output should be created using the -h option rather than -H ; also, note -F webrick ]. Alias -W
-
-!_ --wordmap [filename/wildcard] \\
-see --concordance
-
-!_ --xhtml [filename/wildcard] \\
-produces xhtml/XML output for browser viewing (sax parsing). Alias -b
-
-!_ --xml-dom [filename/wildcard] \\
-produces XML output with deep document structure, in the nature of dom. Alias -X
-
-!_ --xml-sax [filename/wildcard] \\
-produces XML output shallow structure (sax parsing). Alias -x
-
-!_ -X [filename/wildcard] \\
-see --xml-dom
-
-!_ -x [filename/wildcard] \\
-see --xml-sax
-
-!_ -Y [filename/wildcard] \\
-produces a short sitemap entry for the document, based on html output and the sisu_manifest. --sitemaps generates/updates the sitemap index of existing sitemaps. (Experimental, [g,y,m announcement this week])
-
-!_ -y [filename/wildcard] \\
-produces an html summary of output generated (hyperlinked to content) and document specific metadata (sisu_manifest.html). This step is assumed for most processing flags.
-
-!_ -Z [filename/wildcard] \\
-see --zap
-
-!_ --zap [filename/wildcard] \\
-Zap, if used with other processing flags deletes output files of the type about to be processed, prior to processing. If -Z is used as the lone processing related flag (or in conjunction with a combination of -[mMvVq]), will remove the related document output directory. Alias -Z
-
-1~command_modifiers command line modifiers
-
-!_ --no-ocn \\
-[with --html --pdf or --epub] switches off object citation numbering. Produce output without identifying numbers in margins of html or LaTeX/pdf output.
-
-!_ --no-annotate \\
-strips output text of editor endnotes~[* square brackets ]~ denoted by asterisk or dagger/plus sign
-
-!_ --no-asterisk \\
-strips output text of editor endnotes~[* square brackets ]~ denoted by asterisk sign
-
-!_ --no-dagger \\
-strips output text of editor endnotes~[+ square brackets ]~ denoted by dagger/plus sign
-
-1~commands_database database commands
-
-dbi - database interface
-
--D or --pgsql set for PostgreSQL -d or --sqlite default set for SQLite -d is modifiable with --db=[database type (PgSQL or SQLite)]
-
-!_ --pg -v --createall \\
-initial step, creates required relations (tables, indexes) in existing PostgreSQL database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi) [ -dv --createall SQLite equivalent] it may be necessary to run sisu -Dv --createdb initially NOTE: at the present time for PostgreSQL it may be necessary to manually create the database. The command would be 'createdb [database name]' where database name would be SiSU_[present working directory name (without path)]. Please use only alphanumerics and underscores.
-
-!_ --pg -v --import \\
-[filename/wildcard] imports data specified to PostgreSQL db (rb.dbi) [ -dv --import SQLite equivalent]
-
-!_ --pg -v --update \\
-[filename/wildcard] updates/imports specified data to PostgreSQL db (rb.dbi) [ -dv --update SQLite equivalent]
-
-!_ --pg --remove \\
-[filename/wildcard] removes specified data to PostgreSQL db (rb.dbi) [ -d --remove SQLite equivalent]
-
-!_ --pg --dropall \\
-kills data" and drops (PostgreSQL or SQLite) db, tables & indexes [ -d --dropall SQLite equivalent]
-
-The -v is for verbose output.
-
-1~command_shorcuts Shortcuts, Shorthand for multiple flags
-
-!_ --update [filename/wildcard] \\
-Checks existing file output and runs the flags required to update this output. This means that if only html and pdf output was requested on previous runs, only the -hp files will be applied, and only these will be generated this time, together with the summary. This can be very convenient, if you offer different outputs of different files, and just want to do the same again.
-
-!_ -0 to -5 [filename or wildcard] \\
-Default shorthand mappings (for v3, note that the defaults can be changed/configured in the sisurc.yml file):
-
-!_ -0 \\
--NQhewpotbxXyYv [this is the default action run when no options are give, i.e. on 'sisu [filename]']
-
-!_ -1 \\
--Qhewpoty
-
-!_ -2 \\
--NQhewpotbxXy
-
-!_ -3 \\
--NQhewpotbxXyY
-
-!_ -4 \\
--NQhewpotbxXDyY --update
-
-!_ -5 \\
--NQhewpotbxXDyYv --update
-
-add -v for verbose mode and -c to toggle color state, e.g. sisu -2vc [filename or wildcard]
-
-consider -u for appended url info or -v for verbose output
-
-2~ Command Line with Flags - Batch Processing
-
-In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" or "sisu -h *.{sst,ssm}" to produce html version of all documents.
-
-Running sisu (alone without any flags, filenames or wildcards) brings up the interactive help, as does any sisu command that is not recognised. Enter to escape.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_config.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_config.ssi
deleted file mode 100644
index 853580b3..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_config.ssi
+++ /dev/null
@@ -1,59 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Configuration
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? Configuration
-
-:B~? Configure Environment
-
-1~config Configuration
-
-2~ Determining the Current Configuration
-
-Information on the current configuration of SiSU should be available with the help command:
-
-_1 sisu -v
-
-which is an alias for:
-
-_1 sisu --help env
-
-Either of these should be executed from within a directory that contains sisu markup source documents.
-
-2~ Configuration files (config.yml)
-
-SiSU configration parameters are adjusted in the configuration file, which can be used to override the defaults set. This includes such things as which directory interim processing should be done in and where the generated output should be placed.
-
-The SiSU configuration file is a yaml file, which means indentation is significant.
-
-SiSU resource configuration is determined by looking at the following files if they exist:
-
-_1 ./_sisu/sisurc.yml
-
-_1 ~/.sisu/sisurc.yml
-
-_1 /etc/sisu/sisurc.yml
-
-The search is in the order listed, and the first one found is used.
-
-In the absence of instructions in any of these it falls back to the internal program defaults.
-
-Configuration determines the output and processing directories and the database access details.
-
-If SiSU is installed a sample sisurc.yml may be found in /etc/sisu/sisurc.yml
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_content_directories.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_content_directories.ssi
deleted file mode 100644
index 514e0439..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_content_directories.ssi
+++ /dev/null
@@ -1,270 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Content Directories, Organising Content
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2007-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? Organisation of Content
-
-:B~? Content Directories
-
-1~organising_content Organising Content - Directory Structure and Mapping
-
-SiSU v3 has new options for the source directory tree, and output directory structures of which there are 3 alternatives.
-
-2~ Document Source Directory
-
-The document source directory is the directory in which sisu processing commands are given. It contains the sisu source files (.sst .ssm .ssi), or (for sisu v3 may contain) subdirectories with language codes which contain the sisu source files, so all English files would go in subdirectory en/, French in fr/, Spanish in es/ and so on. ISO 639-1 codes are used (as varied by po4a). A list of available languages (and possible sub-directory names) can be obtained with the command "sisu --help lang" The list of languages is limited to langagues supported by XeTeX polyglosia.
-
-3~ General Directories
-
-code{
-
-./subject_name/
-
-% files stored at this level e.g. sisu_manual.sst or
-% for sisu v3 may be under language sub-directories
-% e.g.
-
-./subject_name/en
-
-./subject_name/fr
-
-./subject_name/es
-
-./subject_name/_sisu
-
-% configuration file e.g. sisurc.yml
-
-./subject_name/_sisu/skin
-
-% skins in various skin directories doc, dir, site, yml
-
-./subject_name/_sisu/css
-
-./subject_name/_sisu/image
-
-}code
-
-2~ Document Output Directory Structures
-
-3~ Output Directory Root
-
-The output directory root can be set in the sisurc.yml file. Under the root, subdirectories are made for each directory in which a document set resides. If you have a directory named poems or conventions, that directory will be created under the output directory root and the output for all documents contained in the directory of a particular name will be generated to subdirectories beneath that directory (poem or conventions). A document will be placed in a subdirectory of the same name as the document with the filetype identifier stripped (.sst .ssm)
-
-The last part of a directory path, representing the sub-directory in which a document set resides, is the directory name that will be used for the output directory. This has implications for the organisation of document collections as it could make sense to place documents of a particular subject, or type within a directory identifying them. This grouping as suggested could be by subject (sales_law, english_literature); or just as conveniently by some other classification (X University). The mapping means it is also possible to place in the same output directory documents that are for organisational purposes kept separately, for example documents on a given subject of two different institutions may be kept in two different directories of the same name, under a directory named after each institution, and these would be output to the same output directory. Skins could be associated with each institution on a directory basis and resulting documents will take on the appropriate different appearance.
-
-3~ Alternative Output Structures
-
-There are 3 possibile output structures described as being, by language, by filetype or by filename, the selection is made in sisurc.yml
-
-code{
-
-#% output_dir_structure_by: language; filetype; or filename
-output_dir_structure_by: language #(language & filetype, preferred?)
-#output_dir_structure_by: filetype
-#output_dir_structure_by: filename #(default, closest to original v1 & v2)
-
-}code
-
-3~ By Language
-
-The by language directory structure places output files
-
-The by language directory structure separates output files by language code (all files of a given language), and within the language directory by filetype.
-
-Its selection is configured in sisurc.yml
-
-output_dir_structure_by: language
-
-% works for html epub odf, pdf, sortof for info NOT for man pages
-
-code{
-
- |-- en
- |-- epub
- |-- hashes
- |-- html
- | |-- viral_spiral.david_bollier
- | |-- manifest
- | |-- qrcode
- | |-- odt
- | |-- pdf
- | |-- sitemaps
- | |-- txt
- | |-- xhtml
- | `-- xml
- |-- po4a
- | `-- live-manual
- | |-- po
- | |-- fr
- | `-- pot
- `-- _sisu
- |-- css
- |-- image
- |-- image_sys -> ../../_sisu/image_sys
- `-- xml
- |-- rnc
- |-- rng
- `-- xsd
-
-}code
-
-#by: language
-subject_dir/en/manifest/filename.html
-
-3~ By Filetype
-
-The by filetype directory structure separates output files by filetype, all html files in one directory pdfs in another and so on. Filenames are given a language extension.
-
-Its selection is configured in sisurc.yml
-
-output_dir_structure_by: filetype
-
-% works for html epub odf, pdf, sortof for info NOT for man pages
-
-code{
-
- |-- epub
- |-- hashes
- |-- html
- |-- viral_spiral.david_bollier
- |-- manifest
- |-- qrcode
- |-- odt
- |-- pdf
- |-- po4a
- |-- live-manual
- | |-- po
- | |-- fr
- | `-- pot
- |-- _sisu
- | |-- css
- | |-- image
- | |-- image_sys -> ../../_sisu/image_sys
- | `-- xml
- | |-- rnc
- | |-- rng
- | `-- xsd
- |-- sitemaps
- |-- txt
- |-- xhtml
- `-- xml
-
-}code
-
-#by: filetype
-subject_dir/html/filename/manifest.en.html
-
-3~ By Filename
-
-The by filename directory structure places most output of a particular file (the different filetypes) in a common directory.
-
-Its selection is configured in sisurc.yml
-
-output_dir_structure_by: filename
-
-% works for html epub odf, pdf, sortof for info NOT for man pages
-
-code{
-
- |-- epub
- |-- po4a
- |-- live-manual
- | |-- po
- | |-- fr
- | `-- pot
- |-- _sisu
- | |-- css
- | |-- image
- | |-- image_sys -> ../../_sisu/image_sys
- | `-- xml
- | |-- rnc
- | |-- rng
- | `-- xsd
- |-- sitemaps
- |-- src
- |-- pod
- `-- viral_spiral.david_bollier
-
-}code
-
-#by: filename
-subject_dir/filename/manifest.en.html
-
-3~ Remote Directories
-
-code{
-
-./subject_name/
-
-% containing sub_directories named after the generated files from which they are made
-
-./subject_name/src
-
-% contains shared source files text and binary e.g. sisu_manual.sst and sisu_manual.sst.zip
-
-./subject_name/_sisu
-
-% configuration file e.g. sisurc.yml
-
-./subject_name/_sisu/skin
-
-% skins in various skin directories doc, dir, site, yml
-
-./subject_name/_sisu/css
-
-./subject_name/_sisu/image
-
-% images for documents contained in this directory
-
-./subject_name/_sisu/mm
-
-}code
-
-3~ Sisupod
-
-code{
-
-./sisupod/
-
-% files stored at this level e.g. sisu_manual.sst
-
-./sisupod/_sisu
-
-% configuration file e.g. sisurc.yml
-
-./sisupod/_sisu/skin
-
-% skins in various skin directories doc, dir, site, yml
-
-./sisupod/_sisu/css
-
-./sisupod/_sisu/image
-
-% images for documents contained in this directory
-
-./sisupod/_sisu/mm
-
-}code
-
-2~ Organising Content
-
-
-
-% .SH "SKINS \- document, directory and site skins"
-
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_css.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_css.ssi
deleted file mode 100644
index 9eb680ed..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_css.ssi
+++ /dev/null
@@ -1,42 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: CSS - Cascading Style Sheets
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2007-08-28
- :issued: 2007-08-28
- :available: 2007-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? CSS
-
-1~css CSS - Cascading Style Sheets (for html, XHTML and XML)
-
-CSS files to modify the appearance of SiSU html, XHTML or XML may be placed in the configuration directory: ./_sisu/css ; ~/.sisu/css or; /etc/sisu/css and these will be copied to the output directories with the command sisu -CC.
-
-The basic CSS file for html output is html.css, placing a file of that name in directory _sisu/css or equivalent will result in the default file of that name being overwritten.
-
-HTML:
-html.css
-
-XML DOM:
-dom.css
-
-XML SAX:
-sax.css
-
-XHTML:
-xhtml.css
-
-The default homepage may use homepage.css or html.css
-
-Under consideration is to permit the placement of a CSS file with a different name in directory _sisu/css directory or equivalent, and change the default CSS file that is looked for in a skin.~{ SiSU has worked this way in the past, though this was dropped as it was thought the complexity outweighed the flexibility, however, the balance was rather fine and this behaviour could be reinstated. }~
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_description.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_description.sst
deleted file mode 100644
index ec16f4f6..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_description.sst
+++ /dev/null
@@ -1,561 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
- :subtitle: Description
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :published: 2007-08-30
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents;SiSU:document:description;sisu:document:description
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu
- :bold: /Debian|Ruby|SiSU|ocn|object citation numbering|granular search|rant|utf-?8|WARNING/
- :italics: /Linux|FreeBSD|Dragonfly|Perl|LaTeX|Postgresql|PostgreSQL|Postgres|sqlite|SQL|PHP|xml|XML|Ion|g?vim|ascii|pdf|xhtml|pdflatex|pgsql|Postscript|texinfo|metadata|metatags|metaverse|rant|rake|YAML|object citation system|ocn|object citation numbering|granular search|Dublin Core|Lex Mercatoria/i
-
-:A~? @title @creator
-
-:B~? SiSU an attempt to describe
-
-1~ Description
-
-2~ Outline
-
-SiSU is a flexible document preparation, generation publishing and search system.~{ This information was first placed on the web 12 November 2002; with predating material taken from http://www.jus.uio.no/lm/lm.information/toc.html part of a site started and developed since 1993. See document metadata section http://www.jus.uio.no/sisu/SiSU/metadata.html or manifest page http://www.jus.uio.no/sisu/SiSU/sisu_manifest.html for information on this version. Dates related to the development of SiSU may be tracked in the http://www.jus.uio.no/sisu/SiSU/changelog.html or the Git repository http://git.sisudoc.org/?p=code/sisu.git;a=summary some of the more significant events may be contained within the Chronology section of this document http://www.jus.uio.no/sisu/sisu_chronology }~
-
-SiSU ("SiSU information Structuring Universe" or "Structured information, Serialized Units"),~{ also chosen for the meaning of the Finnish term "sisu". }~ is a Unix command line oriented framework for document structuring, publishing and search. Featuring minimalistic markup, multiple standard outputs, a common citation system, and granular search.
-
-Using markup applied to a document, SiSU can produce plain text, HTML, XHTML, XML, OpenDocument, EPUB, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity (e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
-
-SiSU is the data/information structuring and transforming tool, that has resulted from work on one of the oldest law web projects. It makes possible the one time, simple human readable markup of documents, that SiSU can then publish in various forms, suitable for paper~{ PDF via LaTeX }~, web~{ currently HTML (two forms of HTML presentation one based on css the other on tables), and /PHP/; potentially structured XML }~ and relational database~{ any SQL - currently PostgreSQL and SQLite (for portability, testing and development) }~ presentations, retaining common data-structure and meta-information across the output/presentation formats. Several requirements of legal and scholarly publication on the web have been addressed, including the age old need to be able to reliably cite/pinpoint text within a document, to easily make footnotes/endnotes, to allow for semantic document meta-tagging, and to keep required markup to a minimum. These and other features of interest are listed and described below. A few points are worth making early (and will be repeated a number of times):
-
-_1 (i) The SiSU document generator was the first to place material on the web with a system that makes possible citation across different document types, with paragraph, or rather object citation numbering~{ previously called "text object numbering" }~ a text positioning system, available for the pinpointing of text, 1997, a simple idea from which much benefit, and SiSU remains today, to the best of my knowledge, the only multiple format e-book/ electronic-document system on the web that gives you this possibility (including for relational databases).
-
-_1 (ii) Markup is done once for the multiple formats produced.
-
-_1 (iii) Markup is simple, and human readable (with a little practice), in almost all cases there is less and simpler markup required than basic HTML. In any event the markup required is very much simpler than the HTML, EPUB, LaTeX, [lout], structured XML, ODT (Open Document Format text), PostgreSQL or SQLite feed etc. that you can have SiSU generate for you.
-
-_1 (iv) SiSU is a batch processor, dealing with as many files as you need to generate at a time.
-
-_1 (v) Scalability is dependent on your file system, the database (currently PostgreSQL and/or SQLite) and your hardware.
-
-SiSU Sabaki~{ SiSU Sabaki, release version. Pre-release version SiSU Scribe, and version prior to that SiSU nicknamed Scribbler. Pre-release versions go back several years. Both Scribbler and Scribe (still maintained) made system calls to SiSU's various parts, instead of using libraries. }~ (or just SiSU) is the provisional name given to the software described here that helps structure documents for web and other publication. The name SiSU is a loose anagram for something along the lines of *{/{"SiSU is structuring unit"}/}*, or /{"SiSU, information structuring unit"}/ or the more descriptive /{"Structured information, Serialized Units"}/ or *{/{"simple - information structuring unit"}/}* or the more descriptive /{"Structured information, Serialized Units"}/ or what it may be directed towards /{"*semantic* and *{information structuring universe}*"}/,~{ A little universe it may be, but semantic you may have a hard time getting away with, given the meaning the word has taken on with markup. On a document wide basis semantic information may be provided, which can be really useful, (and meaningful, especially) if you have a large document set, and use this with rss feeds or in an sql database etc. On a markup level, I have little inclination to add semantic markup formally beyond references, title, author [Dublin Core entities? addresses?] etc. Actually this deserves a bit of thought possibly use letter tags (including letter alias/synonyms for font faces) to create a small set of default semantic tags, with the possibility for per document adjustments. Will seek to permit XML entity tagging, within SiSU markup and have that ignored/removed by the parts of the program that have no use for it. }~ tongue in cheek, only just. Guess I'll get away with *{/{"Simple - information Structuring Universe"}/}*. SiSU is also a Finnish word roughly meaning guts, inner strength and perseverance.~{ "Sisu refers not to the courage of optimism, but to a concept of life that says, 'I may not win, but I will gladly give my life for what I believe.'" Aini Rajanen, Of Finnish Ways, 1981, p. 10. \\ http://www.humanlanguages.com/finnishenglish/rlfs.htm \\ "Every Finn has his own pet definition. To me, sisu means patience without passion. But there are many varieties of sisu. Sisu can be a sudden outburst or it can be the kind that lasts. A man can have both kinds. It is outside reason. It is something in the soul. It comes from oneself. For instance, it makes a soldier do things because he himself must, not because he has been told." Paavo Nurmi \\ http://personalweb.smcvt.edu/tmatikainen/finnishtraditions.htm }~
-
-SiSU was born of the need to find a way, with minimal effort, and for as wide a range of document types as possible, to produce high quality publishing output in a variety of document formats. As such it was necessary to find a simple document representation that would work across a large number of document types, and the most convenient way(s) to produce acceptable output formats. The project leading to this program was started in 1993 (together with the trade law project now known as Lex Mercatoria) as an investigation of how to effectively/efficiently place documents on the web. The unified document handling, together with features such as paragraph numbering, endnote handling and tables... appeared in 1996/97. SiSU was originally written in Perl,~{ http://www.perl.org/ }~ and converted to Ruby,~{ http://www.ruby-lang.org/en/ }~ in 2000, one of the most impressive programming languages in existence! In its current form it has been written to run on the Gnu/Linux platform, and in particular on Debian,~{ http://www.debian.org/ }~ taking advantage of many of the wonderful projects that are available there.
-
-SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to PDF or Postscript), EPUB, XML (in this case, structural representation), ODF (Open Document Format text), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
-
-From markup that is simpler and more sparse than HTML you get:
-
-_* far greater output possibilities, including HTML, EPUB, XML, ODF (Open Document Format text), LaTeX (PDF), and SQL;
-
-_* the advantages implicit in the very different output possibilities;
-
-_* a common citation system (for all outputs - including the relational database, search results are relevant for all outputs);
-
-For more see the short summary of features provided below.
-
-SiSU processes files with minimal tagging to produce various document outputs including HTML, EPUB, ODF, LaTeX (which is converted to PDF) and if required loads the structured information into an SQL database (PostgreSQL and SQLite have been used for this). SiSU produces an intermediate processing format.~{ This proved to be the easiest way to develop syntax, changes could be made, or alternatives provided for the markup syntax whilst the intermediate markup syntax was largely held constant. There is actually an optional second intermediate markup format in YAML http://www.yaml.org/ }~
-
-SiSU was originally used in constructing Lex Mercatoria http://lexmercatoria.org/ or http://www.jus.uio.no/lm/ (one of the oldest law web sites), and considerable thought went into producing output that would be suitable for legal and academic writings (that do not have formulae) given the limitations of HTML, and publication in a wide variety of "formats", in particular in relation to the convenient and accurate citation of text. However, the construction of Lex Mercatoria uses only a fraction of the features available from SiSU today, /vis/ generation of flat file structures, rather than in addition the building of ("granular") SQL database content, (at an object level with relevant relational tables, and other outputs also available).
-
-2~ Short summary of features *~summary
-
-!_ (i)
-markup syntax: (a) simpler than html, (b) mnemonic, influenced by mail/messaging/wiki markup practices, (c) human readable, and easily writable,
-
-!_ (ii)
-(a) minimal markup requirement, (b) single file marked up for multiple outputs,
-
-notes:
-
-* documents are prepared in a single UTF-8 file using a minimalistic mnemonic syntax. Typical literature, documents like "War and Peace" require almost no markup, and most of the headers are optional.
-
-* markup is easily readable/parsed by the human eye, (basic markup is simpler and more sparse than the most basic html), [this may also be converted to XML representations of the same input/source document].
-
-* markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions.
-
-!_ (iii)
-(a) multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; EPUB; (structured) XML; ODF (Open Document text)l; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content). (b) takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))
-
-!_ (iv)
-outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, EPUB, XML, Opendocument, SQLite, PostgreSQL), this numbering system can be used to reference content.
-
-!_ (v)
-SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperesteier].
-
-!_ (vi)
-use of semantic meta-tags in headers permit the addition of semantic information on documents, (the available fields are easily extended)
-
-!_ (vii)
-creates organised directory/file structure for (file-system) output, easily mapped with its clearly defined structure, with all text objects numbered, you know in advance where in each document output type, a bit of text will be found (e.g. from an SQL search, you know where to go to find the prepared html output or PDF etc.)... there is more; easy directory management and document associations, the document preparation (sub-)directory may be used to determine output (sub-)directory, the skin used, and the SQL database used,
-
-!_ (viii)
-"Concordance file" wordmap, consisting of all the words in a document and their (text/ object) locations within the text, (and the possibility of adding vocabularies),
-
-!_ (ix)
-document content certification and comparison considerations: the document and each object within it stamped with an md5 hash making it possible to easily check or guarantee that the substantive content of a document is unchanged.
-
-!_ (x)
-SiSU's minimalist markup makes for meaningful "diffing" of the substantive content of markup-files,
-
-!_ (xi)
-easily skinnable, document appearance on a project/site wide, directory wide, or document instance level easily controlled/changed,
-
-!_ (xii)
-in many cases a regular expression may be used (once in the document header) to define all or part of a documents structure obviating or reducing the need to provide structural markup within the document,
-
-!_ (xiii)
-prepared files may be batch process, documents produced are static files so this needs to be done only once but may be repeated for various reasons as desired (updated content, addition of new output formats, updated technology document presentations/representations)
-
-!_ (xiv)
-possible to pre-process, which permits: the easy creation of standard form documents, and templates/term-sheets, or; building of composite documents (master documents) from other sisu marked up documents, or marked up parts, i.e. import documents or parts of text into a main document should this be desired
-
-there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added.
-
-!_ (xv)
-there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added: (a) modular, (thanks in no small part to Ruby) another output format required, write another module.... (b) easy to update output formats (eg html, XHTML, EPUB, LaTeX/PDF produced can be updated in program and run against whole document set), (c) easy to add, modify, or have alternative syntax rules for input, should you need to,
-
-!_ (xvi)
-scalability, dependent on your file-system and on the relational database used (currently PostgreSQL and SQLite), and your hardware,
-
-!_ (xvii)
-only marked up files need be backed up, to secure the larger document set produced,
-
-!_ (xviii)
-document management,
-
-!_ (xix)
-Syntax highlighting for SiSU markup is available for a number of text editors.
-
-!_ (xx)
-remote operations: (a) run SiSU on a remote server, (having prepared sisu markup documents locally or on that server, i.e. this solution where sisu is installed on the remote server, would work whatever type of machine you chose to prepare your markup documents on), (b) generated document outputs may be posted by sisu to remote sites (using rsync/scp) (c)document source (plaintext utf-8) if shared on the net may be identified by its url and processed locally to produce the different document outputs.
-
-!_ (xxi)
-document source may be bundled together (automatically) with associated documents (multiple language versions or master document with inclusions) and images and sent as a zip file called a sisupod, if shared on the net these too may be processed locally to produce the desired document outputs, these may be downloaded, shared as email attachments, or processed by running sisu against them, either using a url or the filename.
-
-!_ (xxii)
-for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, EPUB, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
-
-as a developers tool it is flexible and extensible
-
-SiSU was developed in relation to legal documents, and is strong across a wide variety of texts (law, literature...). SiSU handles images but is not suitable for formulae/ statistics, or for technical writing at this time.
-
-SiSU has been developed and has been in use for several years. Requirements to cover a wide range of documents within its use domain have been explored.
-
-Some modules are more mature than others, the most mature being html and LaTeX / pdf. PostgreSQL and search functions are useable and together with /ocn/ unique (to the best of my knowledge). The XML output document set is "well formed" but largely proof of concept.
-
-2~ How it works
-
-SiSU markup is fairly minimalistic, it consists of: a (largely optional) document header, made up of information about the document (such as when it was published, who authored it, and granting what rights) and any processing instructions; and markup within text which is related to document structure and typeface. SiSU must be able to discern the structure of a document, (text headings and their levels in relation to each other), either from information provided in the instruction header or from markup within the text (or from a combination of both). Processing is done against an abstraction of the document comprising of information on the document's structure and its objects,~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ which the program serializes (providing the object numbers) and which are assigned hash sum values based on their content. This abstraction of information about document structure, objects, (and hash sums), provides considerable flexibility in representing documents different ways and for different purposes (e.g. search, document layout, publishing, content certification, concordance etc.), and makes it possible to take advantage of some of the strengths of established ways of representing documents, (or indeed to create new ones).
-
-2~ Simple markup
-
-SiSU markup is based on requiring the minimum markup needed to determine the structure of a document. (This can be as little as saying in a header to look for the word Book at a specified level and the word Chapter at another level). SiSU then breaks a document into its smallest parts (at a heading, and paragraph level) while retaining all structural information. This break up of the document and information on its structure is taken advantage of in the transformations made in generating the very different output types that can be created, and in providing as much as can be for what each output type is best at doing, e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), EPUB, XML (in this case, structural representation), ODF (OpenDocument), SQL (e.g. document search; representing constituent parts of documents based on their structure, headings, chapters, paragraphs as required; user control).~{ where explicit structure is provided through the use of tagging headings, it could be reduced (still) further, for example by reducing the number of characters used to identify heading levels; but in many cases even that information is not required as regular expressions can be used to extract the implicit structure. }~
-
-3~ Sparse markup requirement, try to get the most out of markup
-
-One of its strengths is that very small amounts of initial tagging is required for the program to generate its output.
-
-This is a basic markup example:
-
-_* { basic markup example, text file - an international convention }http://www.jus.uio.no/sisu/src/un_contracts_international_sale_of_goods_convention_1980.sst ~{ http://www.jus.uio.no/sisu/src/un_contracts_international_sale_of_goods_convention_1980.sst output provided as example in the next section }~
-
-Emphasis has been on simplicity and minimalism in markup requirements. Design philosophy is to try keep the amount of markup required low, for whatever has been determined to be acceptable output.~{ seems there are several "smart ASCIIs" available, primarily for ascii to html conversion, that make this, and reasonable looking ascii their goal \\ http://webseitz.fluxent.com/wiki/SmartAscii \\ http://daringfireball.net/projects/markdown/ \\ http://www.textism.com/tools/textile/ }~
-
-SiSU's markup is more minimalistic and simpler than (the equivalent) html and for it, you get considerably more than just html, as this preparation gives you all available output formats, upon request.
-
-3~ Single markup file provides multiple output formats
-
-For each document, there is only one (input, minimalistically marked up) file from which all the available output types are generated.~{ These include richly laid out and linked html (table or css variants), /PHP/, LaTeX (from which pdf portrait and landscape documents are produced), texinfo (for info files etc.), and PostgreSQL and/or SQLite. And the opportunity to fairly easily build additional modules, such as XML. See the examples provided in this document. }~
-
-Eg. the markup example:
-
-_* {~^ original text file - an international convention }http://www.jus.uio.no/sisu/src/un_contracts_international_sale_of_goods_convention_1980.sst
-
-Produces the following output:
-
-_* {~^ Manifest of output presentations generated }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/sisu_manifest.html
-
-_* {~^ Segmented html version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/toc.html
-
-_* {~^ Full length html document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/doc.html
-
-_* {~^ EPUB version of document }http://www.jus.uio.no/sisu/epub/un_contracts_international_sale_of_goods_convention_1980.epub
-
-_* {~^ pdf landscape version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/landscape.letter.pdf
-
-_* {~^ pdf portrait version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/portrait.letter.pdf
-
-_* {~^ odt open document format text version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/opendocument.odt
-
-_* {~^ xml sax version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/sax.xml
-
-_* {~^ xml dom version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/dom.xml
-
-_* {~^ clean tex ascii version of document }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/plain.txt
-
-_* {~^ Concordance }http://www.jus.uio.no/sisu/un_contracts_international_sale_of_goods_convention_1980/concordance.html
-
-(and in addition to these: PostgreSQL, SQLite, texinfo and -{YAML}- ~{ discontinued for the time being }~ versions if desired)
-
-3~ Syntax relatively easy to read and remember
-
-Syntax is kept simple and mnemonic.~{ SiSU markup syntax, an incomplete summary: http://www.jus.uio.no/sisu/sisu_markup/toc.html \\ Visual check of elementary font face modifiers: *bold* *{bold}* !{emphasis}! /{italics}/ _{underscore}_ -{strikethrough}- ^{superscript}^ ,{subscript}, }~
-
-3~ Kept simple by having a limited publishing feature set, and features identified as most important, are available across several document types
-
-To keep SiSU markup sparse and simple SiSU deliberately provides a limited publishing feature set, including: indent levels; bold; italics; superscript; subscript; simple tables; images; tables of contents and; endnotes. Which in most cases are available across the different output formats.
-
-The publishing feature set may be expanded as required.
-
-2~ Designed with usability in mind
-
-Output is designed to be uniform, easy to read, navigate and cite.
-
-2~ Code separate from content
-
-Code~{ the program that generates the documents }~ is separated from content. This means that when changes are desired in the output presentation, the code that produces them, and not the marked up text data set (which could be thousands of documents) is modified. Separating code from content makes large scale changes to output appearance trivial, and permits the easy addition of new output modules.
-
-2~ Object citation numbering, a text or object positioning / citation system - "paragraph" (or text object) numbering, that remains same and usable across all output formats by people and machine *~citation *~ocn
-
-Object citation numbering is a simple object (text) positioning and cition system that is human relevant and machine useable, used by SiSU for all manner of presentations, and that is available for use in all text mappings. It is based on the automated sequential numbering of objects (roughly paragraphs, (headings, tables, verse) or other blocks of text or images etc.). The text positioning system (in which I claim copyright) is invaluable for publishing requiring the citing text across multiple output formats, and for the general mapping of text within a document:
-
-_* in html, html not being easily citeable (change font size, or use a different browser and the page on which specific text appears has changed), and
-
-_* across multiple formats being common to all output formats html/xml/pdf/sql output,
-
-_* the results of an sql search can just be "live" citation references to the documents in which the text is found, {~^ much like an index (see image examples provided). }http://www.jus.uio.no/sisu/SiSU/1.html#search
-
-I claim copyright on the system I use which is the most basic of all, numbering all text in headings and paragraphs sequentially (with tables and images being treated as a single paragraph) and only footnotes/endnotes not following this numbering, as their position in text is not strictly determined, (a change from footnotes to endnotes would change their numbering), footnotes instead "belong" to the paragraph from which they are referenced, and have sequential numbers of their own.
-
-SiSU has a paragraph numbering system, that remains the same regardless of the output format. This provides an effective means of citation, pinpointing text accurately in all output formats, using the same reference. This is particularly useful where text has to be located across different output formats - for example once html is printed the number of pages and pages on which given text is found will vary depending on the browser, its settings the font size setting etc. Similarly SiSU produces pdf in different forms, eg. on the example site Lex Mercatoria as portrait and landscape documents - here too page numbering varies, but paragraph numbering is the same, /{vis a vis}/ all versions of the text (portrait and landscape pdf and the html versions of the text, and as stored (with "paragraphs" as records) to the PostgreSQL or SQLite database).
-
-These numbers are placed in the text margins and are intended to be independent of and not to interfere with authors tagging. [The citation system (object citation numbering system, automated "paragraph numbering") which is automatically generated and is common and identical across all document formats] The paragraph numbering system is more accurately described as an (text) object numbering system, as headings are also numbered... all headings and paragraphs are numbered sequentially. Endnotes are automatically numbered independently and rather "belong" to the paragraph from which they are referenced, as an endnote does not (necessarily) form a part of a documents sequence, (they may be produced as either endnotes or footnotes (or both depending on what output you choose to look at - if you take the segmented html version document provided as an example, you will find that the endnotes are placed both at the end of each section, and in a separate section of their own called endnotes, and these are hyper-linked)). An attractive feature of providing citation numbering in this way is that it is independent of the document structure... it remains the same regardless of what is done about the document structure.
-
-The rules have been kept very simple, unique incremental object citation numbers are assigned to headings, paragraphs, verse, tables and images. It is possible to manually override this feature on a per heading or comment basis though this should be used exceptionally, it may be of use where there a substantive text, and the addition of a minor comment by the publisher that should not be mapped as part of the text.
-
-The object citation number markers contain additional numbering information with regard to the document structure, that can be used for alternative presentations, including such detail as the type of object (heading, paragraph, table, image, etc.), numbered sequentially.
-
-An advantage is that the numbering remains the same regardless of document structure.
-
-Text object ("paragraph") numbering is the same for all output versions of the same document, vis HTML, EPUB, PDF, PgSQL, etc.
-
-In the relational database, as individual text objects of a document stored (and indexed) together with object numbers, and all versions of the document have the same numbering, the results of searches may be tailored just to provide the location of the search result in all available document formats.
-
-/{ Note: there is a bug in the released behaviour of object citation numbering, (not certain when it was introduced) tables should be numbered, ie each table gets an ocn, required amongst other things for relational database. This will be corrected in a future release. Citation numbering of existing documents that contain tables will changed. }/
-
-2~ Handling of Dublin Core meta-tags making use of the Resource Description Framework
-
-SiSU is able to use meta tags based on the Dublin Core~{ http://dublincore.org/ }~ and Resource Description Framework~{ http://www.w3.org/RDF/ }~
-
-This provides the means of providing semantic information about a document, both as computer processable meta-tags, and as human readable information that may be of value for classification purposes.
-
-This information is provided both in html metatags, and (where available) under the section titled "Document Information - Metadata", near the end of a document, for example in the segmented html version of this text at: http://www.jus.uio.no/sisu/SiSU/metadata.html
-
-2~ Easy directory management
-
-#1 Directory file association, skins and special image management, made simpler.~{ The previous way was directory associations for file output were set up in the configuration file. The present system is a more natural way to work requireing less configuration. }~
-
-The last part of the name of the work directory in which markup is being done, or rather from where SiSU is run in order to generate document output, is used in determining the sub-directory name for output files, that is created in the document output directory. This provides a rather easy way to associate documents e.g. of a given subject, or by owner.
-
-code{
-
-/www/docs
- /intellectual_property
- /arbitration
- /contract_law
-
-/www/docs
- /ralph
- /sisu
-
-}code
-
-all are placed in their own directories within the directory structure created. Similar rules are used in the creation of sql type databases (though they can be overridden).
-
-There are a couple of further associations with these directories.
-
-Directory wide skins.
-
-Directory specific images.
-
-# If there is a "directory skin", that is a skin of the same name as the directory, it is used in the generation of the documents within it, rather than the default skin, unless the document has a specific skin associated with it.
-
-_# default skin (always available)
-
-_# directory skin (precedence over default if exists)
-
-_# document skin (takes precedence wherever document requests a specific skin)
-
-Skins are defined in the document skin directory and if a directory association is desired a softlink made to the relevant skin. Skins (directory association auto load) auto load skin if a directory skin exists of same name as directory stub, (and there is no specific doc skin)
-
-# If the working directory has within it a sub-directory called image_local, the images within that directory are used for references to images, that are not part of the default site build.
-
-2~ Document Version Control Information
-
-The possibility of citing an exact document version.
-
-Permits the inclusion of document version control information to the document body and metatags.~{ from a version control system such as CVS }~ This provides a much more certain method of referring to the exact version of a particular document, (assuming that the document is from a trusted source, that will retain earlier versions of a document).~{ The version control system must be run, so the version number is obtained, prior to the SiSU document generation, and subsequent posting of the document. }~
-
-This information (where available) is provided under the section of the document titled "Document Information - MetaData", near the end of a document, for example in the segmented html version of this text at: http://www.jus.uio.no/sisu/SiSU/metadata.html
-
-2~ Table of contents
-
-SiSU produces a rudimentary a table of contents based on document headings.
-
-2~ Auto-numbering of headings
-
-Headings can be automatically numbered, (and automatically named for hyper-linking)
-
-2~ Numbering and cross-hyperlinking of endnotes
-
-SiSU can automatically number footnotes/endnotes. This is the default operation where no number is provided.
-
-Footnotes/endnotes may also be manually numbered. Where a number, or numbers are provided for a footnote/endnote, this does not increment the automatic footnote/endnote number counter.
-
-In the html output footnotes/endnotes are cross-hyper-linked (to their reference point and vice versa). In th pdf output footnotes are linked from their reference point only.
-
-2~ "Skinnable"
-
-SiSU is skinnable, on a site-wide, directory-wide and per document basis, so different looking versions of things may be produced with little difficulty. There is a default skin which may be modified, as the background site skin, and each working directory may have a skin associated with it, as may each individual document. The hierarchy of application is document, directory, then site... ie if a document skin exists it gets precedence.
-
-Whilst it is skinnable, the default output styles are selected to work across the widest possible range of document types.
-
-2~ Multiple Outputs
-
-From markup that is simpler and more sparse than html you get:
-
-_* far greater output possibilities, including multiple html types, XML (different structured types), LaTeX (pdf landscape, portrait), and SQL (PostgreSQL or SQLite or other);
-
-_* the advantages implicit in these very different output possibilities;~{ e.g. LaTeX (professional document typesetting, easy conversion to pdf or Postscript), XML (in this case, structural representation), SQL (e.g. document set searches; representation of the constituent parts of documents based on their structure, headings, chapters, paragraphs as desired; control of use) }~
-
-_* a common citation system
-
-As many output formats/presentations as one cares to write modules for - several types of html (e.g. structure based on css, or structure based on tables); /{LaTeX/pdf}/ and /{Lout/pdf}/; PgSQL other databases easily added; yaml...
-
-3~ html - several presentations: full length & segmented; css & table based
-
-Most documents are produced in single and segmented html versions, described below:
-
-!_ The Scroll (full length text presentations)
-
-The full length of the text in a single scrollable document.~{ CISG http://www.jus.uio.no/lm/un.contracts.international.sale.of.goods.convention.1980/doc.html \\ The Unidroit Contract Principles http://www.jus.uio.no/lm/unidroit.contract.principles.1994/doc.html or \\ The Autonomous Contract http://www.jus.uio.no/lm/autonomous.contract.2000.amissah/doc.html }~ As a rule the files they are saved in are named: /doc/ or more precisely /{doc.html}/
-
-For various reasons texts may only be provided in this form (such as this one which is short), though most are also provided as segmented texts.
-
-"Scroll" is a reference to the historical scroll, a single long document/ parchment, and also no doubt to what you will have to do to get to the bottom of the text.~{ Scrolling is not however necessarily confined to full length documents as you will have to scroll to get to the bottom of any long segment (eg. chapter) of a segmented text. }~
-
-!_ The Segmented Text
-
-The text divided into segments (such as articles or chapters depending on the text)~{ CISG http://www.jus.uio.no/lm/un.contracts.international.sale.of.goods.convention.1980/toc.html \\ The Unidroit Principles http://www.jus.uio.no/lm/unidroit.contract.principles.1994/toc.html \\ The Autonomous Contract http://www.jus.uio.no/lm/autonomous.contract.2000.amissah/toc.html or \\ WTA 1994 http://www.jus.uio.no/lm/wta.1994 }~ As a rule the files they are saved in are named: /toc/ and /index/ or more precisely /{toc.html}/ and /{index.html}/
-
-If you know exactly what you are looking for, loading a segment of text is faster (the segments being smaller). Occasionally longer documents such as the WTA 1994 http://www.jus.uio.no/lm/wta.1994/toc are only provided in segmented form.
-
-!_ Cascading Style Sheet, and Table based html
-
-SiSU outputs html, two current standard forms available are:
-
-{ css based }http://www.jus.uio.no/sisu/SiSU/toc.html
-
-and
-
-table based [largely discontinued]~{ formatting possibility still exists in code tree but maintenance has been largely discontinuted. }~
-
-!_ The html is tested across several browsers
-
-I like to remind you that there are other excellent browsers out there, many of which have long supported practical features like tabbing.
-
-The html is tested across several browsers, including:
-
-_* {~^ *Firefox* (Mozilla-Firefox) }http://www.mozilla.org/products/firefox/
-
-_* {~^ Kazehakase }http://kazehakase.sourceforge.jp/
-
-_* {~^ Konqueror }http://www.konqueror.org/
-
-_* {~^ Mozilla }http://www.mozilla.org/
-
-_* {~^ MS Internet Explorer }http://www.microsoft.com/windows/ie/default.asp
-
-_* {~^ Netscape }http://home.netscape.com/comprod/mirror/client_download.html
-
-_* {~^ Opera }http://www.opera.com/
-
-Also lighter weight graphical browsers:
-
-_* {~^ Dillo }http://www.dillo.org/
-
-_* {~^ *Epiphany* }http://www.gnome.org/projects/epiphany/
-
-_* {~^ *Galeon* }http://galeon.sourceforge.net/
-
-And for console/text browsing:
-
-_* {~^ *elinks* }http://elinks.or.cz/
-
-_* {~^ *links2* }http://links.twibright.com/
-
-_* {~^ *w3m* }http://w3m.sourceforge.net/
-
-The html tables output is rendered more accurately across a wider variety set and older versions of browsers (than the html css output).
-
-3~ EPUB
-
-SiSU generates EPUB documents.
-
-3~ XML
-
-SiSU generates well formed XML, and multiple versions. An XML SAX version with a flat/shallow structure, and XML DOM version with a deeper (embedded) structure. There is also a released working xhtml module. Examples of SAX and DOM versions are provided within this document.
-
-3~ ODT:ODF, Open Document Format - ISO/IEC 26300:2006
-
-SiSU generates Open Document Output format.
-
-3~ PDF - portrait and landscape, (through the generation of LaTeX output which is then transformed to pdf)
-
-SiSU outputs LaTeX if required which is easily transformed to PDF.~{ LaTeX and pdf features introduced 18^th^ June 2001, Landscape and portrait pdfs introduced 7^th^ October 2001., Lout is a more recent addition 22^th^ April 2003 }~ PDF documents are generated on the site from the same source files and Ruby program that produce html. Landscape oriented pdf introduced, providing easier screen viewing, they are also (paper saving, being currently) formatted to have fewer pages than their portrait equivalents.
-
-_* {~^ Adobe Reader }http://www.adobe.com/products/acrobat/readstep2.html
-
-_* {~^ *Evince* }http://www.gnome.org/projects/evince/
-
-_* {~^ xpdf }http://www.foolabs.com/xpdf/
-
-3~ Search - loading/populating of relational database while retaining document structure information, object citation numbering and other features (currently PostgreSQL and/or SQLite)
-
-SiSU (from the same markup input file) automatically feeds into PostgreSQL~{ http://www.postgresql.org/ \\ http://advocacy.postgresql.org/ \\ http://en.wikipedia.org/wiki/Postgresql }~ and/or SQLite~{ http://www.hwaci.com/sw/sqlite/ \\ http://en.wikipedia.org/wiki/Sqlite }~ database (could be any other of the better relational databases)~{ Relational database features retaining document structure and citation introduced 15^th^ July 2002 }~ - together with all additional information related to document structure, and the alternative ways in which it is generated on the site retained. As regards scaling of the database, it is as scalable as the database (here Postgresql or SQLite) and hardware allow. I will prune the images later.
-
-This is one of the more interesting output forms, as all the structural data for the documents are retained (though can be ignored by the user of the database should they so choose). All site texts/documents are (currently) streamed to four PgSQL database tables:
-
-_1* one containing semantic (and other) headers, including, title, author, subject, (the Dublin Core...);
-
-_1* another the substantive texts by individual "paragraph" (or object) - along with structural information, each paragraph being identifiable by its paragraph number (if it has one which almost all of them do), and the substantive text of each paragraph quite naturally being searchable (both in formatted and clean text versions for searching); and
-
-_1* a third containing endnotes cross-referenced back to the paragraph from which they are referenced (both in formatted and clean text versions for searching).
-
-_1* a fourth table with a one to one relation with the headers table contains full text versions of output, eg. pdf, html, xml, and ascii.
-
-There is of course the possibility to add further structures.
-
-At this level SiSU loads a relational database with documents broken in to their smallest logical structurally constituent parts, as text objects, with their object citation number and all other structural information needed to construct the structured document. Text is stored (at this text object level) with and without elementary markup tagging, the stripped version being so as to facilitate ease of searching.
-
-Because the document structure of sites created is clearly defined, and the text object citation system is available for all forms of output, it is possible to search the sql database, and either read results from that database, or just as simply map the results to the html output, which has richer text markup.
-
-The combination of the SiSU citation system with a relational database is pretty powerful, giving rise to several possibilities. As individual text objects of a document stored (and indexed) together with object numbers, and all versions of the document have the same numbering, complex searches can be tailored to return just the locations of the search results relevant for all available output formats, with live links to the precise locations in the database or in html/xml documents; or, the structural information provided makes it possible to search the full contents of the database and have headings in which search content appears, or to search only headings etc. (as the Dublin Core is incorporated it is easy to make use of that as well).
-
-This is a larger scale project, (with little development on the front end largely ignored), though the "infrastructure" has been in place since 2002.
-
-3~ Search - database frontend sample, utilising database and SiSU features, including object citation numbering (backend currently PostgreSQL) *~search
-
-{~^ Sample search frontend }http://search.sisudoc.org
-A small database and sample query front-end (search from) that makes use of the citation system, _{object citation numbering}_ to demonstrates functionality.~{ (which could be extended further with current back-end). As regards scaling of the database, it is as scalable as the database (here PostgreSQL) and hardware allow. }~
-
-SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, EPUB, XML, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
-
-(further work needs to be done on the sample search form, which is rudimentary and only passes simple booleans correctly at present to the SQL engine)
-
-A few canned searches, showing object numbers. Search for:
-
-{ English documents matching Linux OR Debian }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=Linux%2BOR%2BDebian&db=SiSUv2c_sisu&view=index
-
-{ GPL OR Stallman }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=GPL%2BOR%2BStallman&db=SiSUv2c_sisu&view=index
-
-{ invention OR innovation }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=invention%2BOR%2Binnovation&db=SiSUv2c_sisu&view=index
-
-{ copyright in English language documents }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=copyright&db=SiSUv2c_sisu&view=index
-
-Note that the searches done in this form are case sensitive.
-
-Expand those same searches, showing the matching text in each document:
-
-{ English documents matching Linux OR Debian }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=Linux%2BOR%2BDebian&db=SiSUv2c_sisu&view=text
-
-{ GPL OR Stallman }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=GPL%2BOR%2BStallman&db=SiSUv2c_sisu&view=text
-
-{ invention OR innovation }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=invention%2BOR%2Binnovation&db=SiSUv2c_sisu&view=text
-
-{ copyright }http://search.sisudoc.org/cgi-bin/sisu_pgsql.cgi?s1=copyright&db=SiSUv2c_sisu&view=text
-
-Note you may set results either for documents matched and object number locations within each matched document meeting the search criteria; or display the names of the documents matched along with the objects (paragraphs) that meet the search criteria.~{ of this feature when demonstrated to an IBM software innovations evaluator in 2004 he said to paraphrase: this could be of interest to us. We have large document management systems, you can search hundreds of thousands of documents and we can tell you which documents meet your search criteria, but there is no way we can tell you without opening each document where within each your matches are found. }~
-
-!_ OCN index mode,
-(object citation number) the numbers displayed are relevant (and may be used to reference the match) in any sisu generated rendition of the text~{ OCN are provided for HTML, XML, EPUB, pdf ... though currently omitted in plain-text and opendocument format output }~ the links provided are to the locations of matches within the html generated by SiSU.
-
-!_ Paragraph mode,
-you may alternatively display the text of each paragraph in which the match was made, again the object/paragraph numbers are relevant to any SiSU generated/published text.
-
-Several options for output - select database to search, show results in index view (links to locations within text), show results with text, echo search in form, show what was searched, create and show a "canned url" for search, show available search fields. Also shows counters number of documents in which found and number of locations within documents where found. [could consider sorting by document with most occurrences of the search result].
-
-Simple search, results with files in which search found, and text object (paragraph or endnote) where found within files.
-
-3~ Other forms
-
-There are other forms as well, YAML file, Ruby Marshal dumps, document pre-processing (processing of documents prior to the steps described here, to produce input suitable for the program) snap in a new module as required/desired, well formed XML, no problem.
-
-2~ Concordance / Word Map or rudimentary index
-
-Concordance /WordMaps:~{ Concordance/ WordMaps introduced 15^th^ August 2002 }~ SiSU produces a rudimentary index based on the words within the text, making use of paragraph numbers to identify text locations. This is generated in html and hyper-linked but identifies these words locations in the other document formats. Though it is possible to search using a search engine, this is a means for browsing an alphabetical list of words which may suggest other useful content.
-
-% Concordance files may be built using a document vocabulary. The vocabulary to be used may be specified on a per document basis.
-
-2~ Managed (document) directory, database, or site structure
-
-SiSU builds the web site (or more generically provides a suitable directory structure) - placing various output texts in the hierarchy of the web-site (or db), which (for directories) is a sub-directory with the name of the text file.
-
-2~ Batch processing
-
-SiSU is a batch processing tool, handling and transforming multiple (or individual) documents (in many ways) with a single instruction.
-
-2~ Integration to superior Gnu/Linux and Unix tools
-
-As should have been noted by the above description of SiSU, it makes use of existing programs found on Gnu/Linux and Unix, amongst those already mentioned include the LaTeX to pdf converters and the database PostgreSQL or SQLite.
-
-3~ Backup and version control
-
-Unix provides many tools for version control. For documents Subversion, CVS and even the old RCS are useful for the per-document histories they provide.
-
-For writing code superior (more recent) version control system exist. These can also be used for documents though they tend to take stamps of changes across the repository as a whole, rather than for each individual file that is tracked, (as CVS and RCS do). My personal preference is for distributed systems such as Git, Mercurial or Darcs, of which I use Git for both code and documents.
-
-Several backup tools exist. At the base level I tend to use rdiff.
-
-3~ Editor support
-
-SiSU documents are prepared / marked up in utf-8 text _{you are free to use the text editor of your choice.}_
-
-Syntax highlighting for a number of editors are provided. Amongst them Vim, Kwrite, Kate, Gedit and diakonos. These may be found with configuration instructions at http://www.sisudoc.org/sisu/sisu_syntax_highlighting/doc.html {~^ Vim }http://www.vim.org/ as of version 7 has built in sytax highlighting for SiSU.
-
-2~ Modular design, need something new add a module
-
-Need a new output format that does not already exist, write a new module.
-
-Prefer a new input syntax, you could write a new syntax matching the existing design, though my personal preference is some uniformity in entry appearance. If necessary has been fairly easy to extend the design parameters. It is intended to incorporate some additional basic semantic tagging, (book, article, author etc.) However, keeping the requirements for input minimal, and relatively simple has been a design goal.
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_download.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_download.ssi
deleted file mode 100644
index 7ab3fb28..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_download.ssi
+++ /dev/null
@@ -1,135 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU - SiSU information Structuring Universe / Structured information, Serialized Units
- :subtitle: Download, Stable and Development Branches
-
-@creator:
- :author: Amissah, Ralph
-
-% used_by: SiSU.ssm
-
-@date:
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :published: 2009-01-18
- :modified: 2011-03-11
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? SiSU Downloads, Stable and Development Branches
-
-:C~ Download information
-
-1~download Download SiSU - Linux/Unix
-
-2~current- SiSU Current Version - Linux/Unix
-
-3~source- Source (tarball tar.gz)
-
-_* {~^ sisu_[version].orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/
-
-_* {~^ sisu-markup-samples_[version].orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/
-
-For more general use see http://sisudoc.org/sisu/sisu_manual
-
-For changelogs see http://www.jus.uio.no/sisu/SiSU/changelog.html
-
-3~git- Git (source control management)
-
-Git repository currently at:
-
-_* git clone git://git.sisudoc.org/git/code/sisu.git
-
-_* git clone _http://git.sisudoc.org/git/code/sisu.git
-
-_* http://git.sisudoc.org/?p=code/sisu.git;a=summary
-
-On using git, see
-
-!_ Git documentation:
-{~^ Git User's Manual }http://www.kernel.org/pub/software/scm/git/docs/user-manual.html, {~^ Everyday GIT With 20 Commands Or So }http://www.kernel.org/pub/software/scm/git/docs/everyday.html, {~^ A tutorial introduction to git }http://www.kernel.org/pub/software/scm/git/docs/v1.4.4.4/tutorial.html, {~^ A tutorial introduction to git: part two }http://www.kernel.org/pub/software/scm/git/docs/v1.4.4.4/tutorial-2.html
-
-!_ User contributed texts:
-{~^ The Git Community Book }http://book.git-scm.com/index.html, {~^ Git Magic }http://www-cs-students.stanford.edu/~blynn/gitmagic/, {~^ Git From the Bottom Up (pdf) }http://www.newartisans.com/blog_assets/git.from.bottom.up.pdf
-
-3~debian- Debian
-
-This section contains information on the latest SiSU release. For installation notes see http://sisudoc.org/sisu/sisu_manual/installation.html
-
-SiSU is updated fairly regularly in Debian testing and unstable, and should be available therefrom.
-
-To add this archive, should you still choose to do so, add the following lines to your /etc/apt/sources.list
-
-code{
-
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
-
-}code
-
-*{Source}* available from
-
-http://www.jus.uio.no/sisu/pkg/src/
-
-http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/
-
-http://www.sisudoc.org/sisu/archive/pool/main/s/sisu/
-
-sisu_[version].orig.tar.gz
-
-sisu_[version].debian.tar.gz
-
-sisu_[version].dsc
-
-group{
-
-*{Debs}*
-
-{~^ sisu_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ \\ sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies \\ Depends: ruby (>=1.8.7), libwebrick-ruby \\ Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
-
-{~^ sisu-complete_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ \\ a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) \\ Depends: ruby (>=1.8.7), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu \\ Recommends: sisu-examples }~
-
-{~^ sisu-pdf_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ \\ dependencies used by sisu to produce PDF from LaTeX generated \\ Depends: sisu, tetex-bin, tetex-extra, latex-ucs \\ Suggests: evince, xpdf }~
-
-{~^ sisu-postgresql_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ \\ dependencies used by sisu to populate postgresql database (further configuration is necessary) \\ Depends: sisu, postgresql, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby \\ Suggests: pgaccess, libdbd-pgsql, postgresql-contrib }~
-
-{~^ sisu-sqlite_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/ ~{ \\ dependencies used by sisu to populate sqlite database \\ Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby \\ Suggests: libdbd-sqlite }~
-
-}group
-
-For changelogs see:
-
-_1 http://www.sisudoc.org/sisu/SiSU/changelog.html
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
-
-!_ non-free
-
-Book markup samples have been moved to non-free as the substantive text of the documents are available under the author or original publisher's license, and usually do not comply with the Debian Free Software Guidelines.
-
-_* {~^ sisu-markup-samples_[version]_all.deb }http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/ ~{ \\ marked up documents and other examples related to sisu, a larger package containing a number of texts \\ Depends: sisu }~
-
-_* {~^ sisu-markup-samples_[version].dsc }http://www.jus.uio.no/sisu/pkg/src/ ~{ \\ sisu-markup-samples_[version].dsc }~
-
-For changelogs see:
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
-
-3~rpm- RPM
-
-The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/programs/alien/ }~ Dependencies are not handled, not even that of the essential Ruby.
-
-sudo rpm -i [package name]
-
-_* {~^ sisu-[version].noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/ ~{ \\ created using alien }~
-
-_* {~^ sisu-markup-samples_[version].noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/ ~{ \\ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/ \\ created using: alien -r sisu_[version]_all.deb }~
-
-For changelogs see:
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_examples.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_examples.ssi
deleted file mode 100644
index ebe4c1ea..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_examples.ssi
+++ /dev/null
@@ -1,30 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Markup Samples, Output Examples
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :published: 2007-09-16
- :modified: 2012-10-03
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? SiSU Markup and Output Examples
-
-1~examples Markup and Output Examples
-
-2~ Markup examples *~markup
-
-Current markup examples and document output samples are provided off http://sisudoc.org or http://www.jus.uio.no/sisu and in the sisu-markup-sample package available off http://sources.sisudoc.org
-
-For some documents hardly any markup at all is required at all, other than a header, and an indication that the levels to be taken into account by the program in generating its output are.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_faq.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_faq.sst
deleted file mode 100644
index bfc6023c..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_faq.sst
+++ /dev/null
@@ -1,219 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: FAQ - Frequently Asked/Answered Questions
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2008-03-12
- :created: 2006-09-06
- :available: 2006-09-06
- :issued: 2006-09-06
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents;SiSU:document:FAQ;sisu:document:FAQ;SiSU:manual:FAQ;electronic documents:SiSU:manual:FAQ
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-1~faq FAQ - Frequently Asked/Answered Questions
-
-2~ Why are urls produced with the -v (and -u) flag that point to a web server on port 8081 ?
-
-Try the following rune:
-
-_* sisu -W
-
-This should start the ruby webserver. It should be done after having produced some output as it scans the output directory for what to serve.
-
-2~ I cannot find my output, where is it?
-
-The following should provide help on output paths:
-
-_* sisu --help env
-
-_* sisu -V [same as the previous command]
-
-_* sisu --help directory
-
-_* sisu --help path
-
-_* sisu -U [filename]
-
-_* man sisu
-
-2~ I do not get any pdf output, why?
-
-SiSU produces LaTeX and pdflatex is run against that to generate pdf files.
-
-If you use Debian the following will install the required dependencies
-
-_* aptitude install sisu-pdf
-
-the following packages are required: tetex-bin, tetex-extra, latex-ucs
-
-2~ Where is the latex (or some other interim) output?
-
-Try adding -M (for maintenance) to your command flags, e.g.:
-
-_* sisu -HpMv [filename]
-
-this should result in the interim processing output being retained, and information being provided on where to find it.
-
-_* sisu --help directory
-
-_* sisu --help path
-
-should also provide some relevant information as to where it is placed.
-
-2~ Why isn't SiSU markup XML
-
-I worked with text and (though I find XML immensely valuable) disliked noise
-... better to sidestep the question and say:
-
-SiSU currently "understands" three XML input representations - or more accurately, converts from three forms of XML to native SiSU markup for processing. The three types correspond to SAX (structure described), DOM (structure embedded, whole document must be read before structure is correctly discernable) and node based (a tree) forms of XML document structure representation. Problem is I use them very seldom and check that all is as it should be with them seldom, so I would not be surprised if something breaks there, but as far as I know they are working. I will check and add an XML markup help page before the next release. There already is a bit of information in the man page under the title SiSU VERSION CONVERSION
-
-_1 sisu --to-sax [filename/wildcard]
-
-_1 sisu --to-dom [filename/wildcard]
-
-_1 sisu --to-node [filename/wildcard]
-
-The XML should be well formed... must check, but lacks sensible headers. Suggestions welcome as to what to make of them. [For the present time I am satisfied that I can convert (both ways) between 3 forms of XML representation and SiSU markup].
-
-_1 sisu --from-xml2sst [filename/wildcard]
-
-2~ LaTeX claims to be a document preparation system for high-quality typesetting. Can the same be said about SiSU?
-
-% what are some similarities and differences between LaTex and SiSU?
-
-SiSU is not really about type-setting.
-
-LaTeX is the ultimate computer instruction type-setting language for paper based publication.
-
-LaTeX is able to control just about everything that happens on page and pixel, position letters kerning, space variation between characters, words, paragraphs etc. formula.
-
-SiSU is not really about type-setting at all. It is about a lightweight markup instruction that provides enough information for an abstraction of the documents structure and objects, from which different forms of representation of the document can be generated.
-
-SiSU with very little markup instruction is able to produce relatively high quality pdf by virtue of being able to generate usable default LaTeX; it produces "quality" html by generating the html directly; likewise it populates an SQL database in a useful way with the document in object sized chunks and its meta-data. But SiSU works on an abstraction of the document's structure and content and custom builds suitable uniform output. The html for browser viewing and pdf for paper viewing/publishing are rather different things with different needs for layout - as indeed is what is needed to store information in a database in searchable objects.
-
-% SiSU is a lightweight document abstraction, meta-(structure and markup) syntax designed to make use of a minimal amount of preparation detail that can be used across very different ways of representing documents
-
-The pdfs or html produced for example by open office based on open document format and other office/word processor suits usually attempt to have similar looking outputs - your document rendered in html looks much the same, or in pdf... sisu is less this way, it seeks to have a starting point with as little information about appearance as possible, and to come up with the best possible appearance for each output that can be derived based on this minimal information.
-
-Where there are large document sets, it provides consistency in appearance in each output format for the documents.
-
-The excuse for going this way is, it is a waste of time to think much about appearance when working on substantive content, it is the substantive content that is relevant, not the way it looks beyond the basic informational tags - and yet you want to be able to take advantage of as many useful different ways of representing documents as are available, and for various types of output to to be/look as good as it can for each medium/format in which it is presented, (with different mediums having different focuses) and SiSU tries to achieve this from minimal markup.
-
-2~ Can the SiSU markup be used to prepare for a LaTex automatic building of an index to the work?
-
-Has not been, is of interest though the question on introducing such possibilities is how to keep them as unobtrusive as possible, and as generically relevant as possible to other output formats (which is why the focus on object numbers). Unobtrusive refers both to the markup (where there is no big problem with introducing optional extras); and, more challengingly how to minimise impact on competing ideas/interests, such allowing the addition of semantic tags which could be tied to objects, mapped against the objects that contain them, (permitting mapping and mining of content in various ways that would be largely agnostic of output format - object numbering being an attempt to move beyond output format based content locators (such as page numbers). The desire being to (be a meta markup and) maintain agnosticism as to what is being generated and in development to favor solutions of that nature. Keep bridging LaTeX, XML, SQL ... make use of objects and serialisation for mapping whether against content or meta-content (such as semantic [or additional structural] markers).
-
-2~ Can the conversion from SiSU to LaTeX be modified if we have special needs for the LaTeX, or do we need to modify the LaTeX manually?
-
-Should be possible to modify code, it is GPLv3, should be possible either to modify existing modules or write an independent module for generating bespoke latex. Generic improvements are welcome for inclusion/incorporation in the existing code base.
-
-If there are tools to generate mathematical/scientific formula from latex to images (jpg, png), the latex parser could conceivably be used to make these available to other output formats.
-
-2~ How do I create GIN or GiST index in Postgresql for use in SiSU
-
-This at present needs to be done "manually" and it is probably necessary to alter the sample search form. The following is a helpful response from one of the contributors of GiN to Postgresql Oleg Bartunov 2006-12-06:
-
-"I have tsearch2 slides which introduces tsearch2
-http://www.sai.msu.su/~megera/wiki/tsearch2slides
-
-FTS in PostgreSQL is provided by tsearch2, which should works without
-any indices (GiST or GIN) ! Indices provide performance, not functionality.
-
-In your example I'd do ( simple way, just for demo):
-
-!_ 0.
-compile, install tsearch2 and load tsearch2 into your database
-
-_1 cd contrib/tsearch2; make&&make&&install&&make installcheck; psql DB < tsearch2.sql
-
-!_ 1.
-Add column fts, which holds tsvector
-
-_1 alter table documents add column fts tsvector;
-
-!_ 2.
-Fill fts column
-
-_1 update document set fts = to_tsvector(clean);
-
-!_ 3.
-create index - just for performance !
-
-_1 create index fts_gin_idx on document using gin(fts);
-
-!_ 4.
-Run vacuum
-
-_1 vacuum analyze document;
-
-That's all.
-
-Now you can search:
-
-select lid, metadata_tid, rank_cd(fts, q,2)as rank from document, plainto_tsquery('markup syntax') q where q @@ fts order by rank desc limit 10;
-
-2~ Are there some examples of using Ferret Search with a SiSU repository?
-
-Heard good things about Ferret, but have not used it. The output directory structure and content produced by SiSU is very uniform. Have looked at a couple of other engines (hyperestraier, lucene). There it was enough to identify the files that needed to be indexed and pass them to the search indexing tool. Some Unix rune doing the job, such as:
-
-code{
-
-find /home/ralph/sisu_www -type f | \
-egrep '/sisu_www/(sisu|document_archive)/.+?.html$' | \
-egrep -v '(doc|concordance).html$' | \
-estcmd gather -sd casket -
-
-}code
-
-you would have to experiment with what gives the desired result, the file doc.html is the complete text in html (there are additional smaller html segments), and plain.txt the document as a text file. It may be possible to index the text file and return the html document.
-
-
-2~ Have you had any reports of building SiSU from tar on Mac OS 10.4?
-
-None. In the early days of its release a Mac friend built and run the ruby code part that did not rely on system calls to bits like the latex engine. That is already some years back. He was not into writing or document markup, and did it as a favour at the time. I have not followed up that thread of development.
-
-It should however be possible, much of the output relies on plain ruby, and the system commands to latex etc. could be made appropriate for the underlying OS.
-
-2~ Where is version 1?
-
-Version 1 was finally released on December 21, 2009, and largely to make a version 1 branch available as version 2 was in the pipeline with an imminent release. Most of SiSU was mature and stable long before the release of version 1.
-
-2~ What is the difference between version 1 and 2?
-
-Input and output of version 1 and 2 are largely the same with the following significant exceptions. On the input side, document headers, that is metadata and processing instructions have changed in version 2. On the output side, version 2 was introduced with EPUB documents as a possible output, and over time is likely to be developed further.
-
-Version 2 introduces a new processing layer, which relies more on the programming language Ruby's objects (and regular expressions), than version 1 does which relies on regular expressions. The thinking behind version 1 use of regular expressions was that it made it more straightforward to switch languages for processing, as many languages support regular expressions; the thinking behind version 2 was version 1 was more complicated than it need be, and since Ruby was the language used, why not make programming more straightforward, as it would be easier to develop further.
-
-Version 1 was removed with the introduction of the version 3 development branch
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_filetypes.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_filetypes.sst
deleted file mode 100644
index f8378e9d..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_filetypes.sst
+++ /dev/null
@@ -1,171 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Filetypes
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual:filetypes;electronic documents:SiSU:manual:filetypes
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-1~filetypes SiSU filetypes
-
-SiSU has plaintext and binary filetypes, and can process either type of document.
-
-2~ .sst .ssm .ssi marked up plain text
-
-SiSU documents are prepared as plain-text (utf-8) files with SiSU markup. They may make reference to and contain images (for example), which are stored in the directory beneath them _sisu/image. SiSU plaintext markup files are of three types that may be distinguished by the file extension used: regular text .sst; master documents, composite documents that incorporate other text, which can be any regular text or text insert; and inserts the contents of which are like regular text except these are marked .ssi and are not processed.
-
-SiSU processing can be done directly against a sisu documents; which may be located locally or on a remote server for which a url is provided.
-
-SiSU source markup can be shared with the command:
-
-_1 sisu -s [filename]
-
-3~ sisu text - regular files (.sst)
-
-The most common form of document in SiSU, see the section on SiSU markup.
-
-http://www.sisudoc.org/sisu/sisu_markup
-
-http://www.sisudoc.org/sisu/sisu_manual
-
-3~ sisu master files (.ssm)
-
-Composite documents which incorporate other SiSU documents which may be either regular SiSU text .sst which may be generated independently, or inserts prepared solely for the purpose of being incorporated into one or more master documents.
-
-The mechanism by which master files incorporate other documents is described as one of the headings under under SiSU markup in the SiSU manual.
-
-Note: Master documents may be prepared in a similar way to regular documents, and processing will occur normally if a .sst file is renamed .ssm without requiring any other documents; the .ssm marker flags that the document may contain other documents.
-
-Note: a secondary file of the composite document is built prior to processing with the same prefix and the suffix ._sst ~{ .ssc (for composite) is under consideration but ._sst makes clear that this is not a regular file to be worked on, and thus less likely that people will have "accidents", working on a .ssc file that is overwritten by subsequent processing. It may be however that when the resulting file is shared .ssc is an appropriate suffix to use. }~
-
-http://www.sisudoc.org/sisu/sisu_markup
-
-http://www.sisudoc.org/sisu/sisu_manual
-
-3~ sisu insert files (.ssi)
-
-Inserts are documents prepared solely for the purpose of being incorporated into one or more master documents. They resemble regular SiSU text files except they are ignored by the SiSU processor. Making a file a .ssi file is a quick and convenient way of flagging that it is not intended that the file should be processed on its own.
-
-2~ sisupod, zipped binary container (sisupod.zip, .ssp)
-
-A sisupod is a zipped SiSU text file or set of SiSU text files and any associated images that they contain (this will be extended to include sound and multimedia-files)
-
-SiSU plaintext files rely on a recognised directory structure to find contents such as images associated with documents, but all images for example for all documents contained in a directory are located in the sub-directory _sisu/image. Without the ability to create a sisupod it can be inconvenient to manually identify all other files associated with a document. A sisupod automatically bundles all associated files with the document that is turned into a pod.
-
-The structure of the sisupod is such that it may for example contain a single document and its associated images; a master document and its associated documents and anything else; or the zipped contents of a whole directory of prepared SiSU documents.
-
-The command to create a sisupod is:
-
-_1 sisu -S [filename]
-
-Alternatively, make a pod of the contents of a whole directory:
-
-_1 sisu -S
-
-SiSU processing can be done directly against a sisupod; which may be located locally or on a remote server for which a url is provided.
-
-http://www.sisudoc.org/sisu/sisu_commands
-
-http://www.sisudoc.org/sisu/sisu_manual
-
-1~alt Experimental Alternative Input Representations
-
-2~ Alternative XML
-
-SiSU offers alternative XML input representations of documents as a proof of concept, experimental feature. They are however not strictly maintained, and incomplete and should be handled with care.
-
-!_ convert from sst to simple xml representations (sax, dom and node):
-
-_1 sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]
-
-_1 sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]
-
-_1 sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]
-
-!_ convert to sst from any sisu xml representation (sax, dom and node):
-
-_1 sisu --from-xml2sst [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-or the same:
-
-_1 sisu --from-sxml [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-3~ XML SAX representation
-
-To convert from sst to simple xml (sax) representation:
-
-_1 sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard]
-
-To convert from any sisu xml representation back to sst
-
-_1 sisu --from-xml2sst [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-or the same:
-
-_1 sisu --from-sxml [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-3~ XML DOM representation
-
-To convert from sst to simple xml (dom) representation:
-
-_1 sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard]
-
-To convert from any sisu xml representation back to sst
-
-_1 sisu --from-xml2sst [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-or the same:
-
-_1 sisu --from-sxml [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-3~ XML Node representation
-
-To convert from sst to simple xml (node) representation:
-
-_1 sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard]
-
-To convert from any sisu xml representation back to sst
-
-_1 sisu --from-xml2sst [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-or the same:
-
-_1 sisu --from-sxml [filename/wildcard [.sxs.xml,.sxd.xml,sxn.xml]]
-
-% .SH "SKINS \- document, directory and site skins"
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help.sst
deleted file mode 100644
index b2938efb..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help.sst
+++ /dev/null
@@ -1,114 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Help
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-08-30
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual:help;electronic documents:manual:SiSU:help
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Help
-
-1~help Help
-
-2~ SiSU Manual
-
-The most up to date information on sisu should be contained in the sisu_manual, available at:
-
-_1 http://sisudoc.org/sisu/sisu_manual/
-
-The manual can be generated from source, found respectively, either within the SiSU tarball
-or installed locally at:
-
-_1 ./data/doc/sisu/markup-samples/sisu_manual
-
-_1 /usr/share/doc/sisu/markup-samples/sisu_manual
-
-move to the respective directory and type e.g.:
-
-_1 sisu sisu_manual.ssm
-
-% The manual pages provided with SiSU are also available online, and there is an interactive help, which is being superseded by the man page, and possibly some document which contains this component.
-
-2~ SiSU man pages *~man
-
-If SiSU is installed on your system usual man commands should be available, try:
-
-_1 man sisu
-
-Most SiSU man pages are generated directly from sisu documents that are used to prepare the sisu manual, the sources files for which are located within the SiSU tarball at:
-
-_1 ./data/doc/sisu/markup-samples/sisu_manual
-
-Once installed, directory equivalent to:
-
-_1 /usr/share/doc/sisu/markup-samples/sisu_manual
-
-Available man pages are converted back to html using man2html:
-
-_1 /usr/share/doc/sisu/html/
-
-_1 ./data/doc/sisu/html
-
-An online version of the sisu man page is available here:
-
-_* {~^ various sisu man pages }http://www.jus.uio.no/sisu/man/
-
-_* {~^ sisu.1 }http://www.jus.uio.no/sisu/man/sisu.1.html
-
-2~ SiSU built-in interactive help
-
-This is particularly useful for getting the current sisu setup/environment information:
-
-_1 sisu --help
-
-_1 sisu --help [subject]
-
-_2 sisu --help commands
-
-_2 sisu --help markup
-
-_2 sisu --help env [for feedback on the way your system is setup with regard to sisu]
-
-_1 sisu -V [environment information, same as above command]
-
-_1 sisu (on its own provides version and some help information)
-
-Apart from real-time information on your current configuration the SiSU manual and man pages are likely to contain more up-to-date information than the sisu interactive help (for example on commands and markup).
-
-NOTE: Running the command sisu (alone without any flags, filenames or wildcards) brings up the interactive help, as does any sisu command that is not recognised. Enter to escape.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help_sources.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help_sources.sst
deleted file mode 100644
index cf94b763..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_help_sources.sst
+++ /dev/null
@@ -1,127 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: References
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual:help sources;electronic documents:SiSU:manual:help sources
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Help Sources
-
-1~help_sources Help Sources
-
-2~ man pages
-
-_1 man sisu
-
-_1 man sisu-concordance
-
-_1 man sisu-epub
-
-_1 man sisu-git
-
-_1 man sisu-harvest
-
-_1 man sisu-html
-
-_1 man sisu-odf
-
-_1 man sisu-pdf
-
-_1 man sisu-pg
-
-_1 man sisu-po
-
-_1 man sisu-sqlite
-
-_1 man sisu-txt
-
-_1 man 7 sisu_complete
-
-_1 man 7 sisu_pdf
-
-_1 man 7 sisu_postgresql
-
-_1 man 7 sisu_sqlite
-
-_1 man sisu_termsheet
-
-_1 man sisu_webrick
-
-2~ sisu generated output - links to html
-
-Note SiSU documentation is prepared in SiSU and output is available in multiple formats including amongst others html, pdf, odf and epub, which may be also be accessed via the html pages~{ named index.html or more extensively through sisu_manifest.html }~
-
-3~ www.sisudoc.org
-
-http://sisudoc.org/sisu/sisu_manual/index.html
-
-_1 http://sisudoc.org/sisu/sisu_manual/index.html
-
-2~ man2html
-
-3~ locally installed
-
-file:///usr/share/doc/sisu/html/sisu.1.html
-
-_1 file:///usr/share/doc/sisu/html/sisu.1.html
-
-_1 /usr/share/doc/sisu/html/sisu_pdf.7.html
-
-_1 /usr/share/doc/sisu/html/sisu_postgresql.7.html
-
-_1 /usr/share/doc/sisu/html/sisu_sqlite.7.html
-
-_1 /usr/share/doc/sisu/html/sisu_webrick.1.html
-
-3~ www.jus.uio.no/sisu
-
-http://www.jus.uio.no/sisu/man/sisu.1.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu.1.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu_complete.7.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu_pdf.7.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu_postgresql.7.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu_sqlite.7.html
-
-_1 http://www.jus.uio.no/sisu/man/sisu_webrick.1.html
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_homepages.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_homepages.ssi
deleted file mode 100644
index 58dc0937..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_homepages.ssi
+++ /dev/null
@@ -1,66 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Homepages
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2007-08-28
- :issued: 2007-08-28
- :available: 2007-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? Setting up of homepages
-
-1~home Homepages
-
-SiSU is about the ability to auto-generate documents. Home pages are regarded as custom built items, and are not created by SiSU. More accurately, SiSU has a default home page, which will not be appropriate for use with other sites, and the means to provide your own home page instead in one of two ways as part of a site's configuration, these being:
-
-# through placing your home page and other custom built documents in the subdirectory _sisu/home/ (this probably being the easier and more convenient option)
-
-# through providing what you want as the home page in a skin,
-
-Document sets are contained in directories, usually organised by site or subject. Each directory can/should have its own homepage. See the section on directory structure and organisation of content.
-
-2~ Home page and other custom built pages in a sub-directory
-
-Custom built pages, including the home page index.html may be placed within the configuration directory _sisu/home/ in any of the locations that is searched for the configuration directory, namely ./_sisu ; ~/_sisu ; /etc/sisu
-From there they are copied to the root of the output directory with the command:
-
-_1 sisu -CC
-
-2~ Home page within a skin
-
-Skins are described in a separate section, but basically are a file written in the programming language Ruby that may be provided to change the defaults that are provided with sisu with respect to individual documents, a directories contents or for a site.
-
-If you wish to provide a homepage within a skin the skin should be in the directory _sisu/skin/dir and have the name of the directory for which it is to become the home page. Documents in the directory commercial_law would have the homepage modified in skin_commercial law.rb ; or the directory poems in skin_poems.rb
-
-code{
-
- class Home
- def homepage
- # place the html content of your homepage here, this will become index.html
- <<HOME <html>
-<head></head>
-<doc>
-<p>this is my new homepage.</p>
-</doc>
-</html>
-HOME
- end
- end
-
-}code
-
-% .SH "SKINS \- document, directory and site skins"
-
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_howto.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_howto.sst
deleted file mode 100644
index 3d3a0f0c..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_howto.sst
+++ /dev/null
@@ -1,1416 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Technical, Howto
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual:howto;electronic documents:SiSU:manual:howto;SiSU:document:howto;sisu:document:howto
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU some technical information
-
-:C~ HowTo
-
-1~howto_help Getting Help
-
-An online manual of sorts should be available at:
-
-http://www.jus.uio.no/sisu_manual/
-
-The manual pages provided with SiSU are also available online, and there is an interactive help, which is being superseded by the man page, and possibly some document which contains this component.
-
-2~ SiSU "man" pages *~man
-
-If SiSU is installed on your system usual man commands should be available, try:
-
-man sisu
-
-The SiSU man pages can be viewed online at:~{ generated from source using rman<br> http://polyglotman.sourceforge.net/rman.html <br>With regard to SiSU man pages the formatting generated for markup syntax is not quite right, for that you might prefer the links under:<br> http://www.jus.uio.no/sample }~
-
-An online version of the sisu man page is available here:
-
-_* {~^ various sisu man pages }http://www.jus.uio.no/sisu/man/
-
-_* {~^ sisu.1 }http://www.jus.uio.no/sisu/man/sisu.1.html
-
-_* {~^ sisu.8 }http://www.jus.uio.no/sisu/man/sisu.8.html
-
-_* {~^ sisu_webrick.1 }http://www.jus.uio.no/sisu/man/sisu_webrick.1.html
-
-2~ SiSU built-in help
-
-_1 sisu --help
-
-_1 sisu --help [subject]
-
-_2 sisu --help env [for feedback on the way your system is setup with regard to sisu]
-
-_2 sisu -V [same as above command]
-
-_2 sisu --help commands
-
-_2 sisu --help markup
-
-2~ Command Line with Flags - Batch Processing
-
-Running sisu (alone without any flags, filenames or wildcards) brings up the interactive help, as does any sisu command that is not recognised.
-
-In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" or "sisu -h *.{sst,ssm}" to produce html version of all documents.
-
-1~howto_setup Setup, initialisation
-
-2~ initialise output directory
-
-Images, css files for a document directory are copied to their respective locations in the output directory.
-
-while within your document markup/preparation directory, issue the following command
-
-_1 sisu -CC
-
-3~ Use of search functionality, an example using sqlite
-
-SiSU can populate PostgreSQL and Sqlite databases and provides a sample search form for querying these databases.
-
-This note provides an example to get you started and will use sqlite
-
-It is necessary to:
-
-(1) make sure the required dependencies have been installed
-
-(2) have a directory with sisu markup samples that is writable
-
-(3) use sisu to create a database
-
-(4) use sisu tp populate a database
-
-(5) use sisu to start the webrick (httpd) server
-
-(6) use sisu to create a search form
-
-(7) copy the search form to the cgi directory
-
-(8) open up the form in your browser
-
-(9) query the database using the search form
-
-!_ (1) make sure the required dependencies have been installed
-
-if you use Debian, the following command will install the required dependencies
-
-aptitude install sisu-sqlite
-
-!_ (2) have a directory with sisu markup samples that is writable
-
-ideally copy the sisu-examples directory to your home directory (because the directory in which you run this example should be writable)
-
-cp -rv /usr/share/doc/sisu/markup-samples/samples .
-
-you are better off installing the package sisu-markup-samples which will make the following available
-
-cp -rv /usr/share/doc/sisu/markup-samples-non-free/samples .
-
-!_ (3) use sisu to create an sqlite database
-
-within the sisu-examples directory
-
-sisu -dv createall
-
-!_ (4) use sisu tp populate a database with some text
-
-within the sisu-examples directory
-
-sisu -div free_*.sst
-
-or
-
-sisu -dv import free_*.sst debian_constitution_v1.2.sst debian_social_contract_v1.1.sst gpl2.fsf.sst
-
-!_ (5) use sisu to start the webrick (httpd) server (if it has not already been started):
-
-sisu -W
-
-!_ (6) use sisu to create a search form (for use with the webrick server, and your sample documents)
-
-within the sisu-examples directory
-
-sisu -F webserv=webrick
-
-and follow the instructions provided
-
-#here i run into a problem, you are working from a read only
-#directory..., not my usual mode of operation, to complete the example
-#the following is necessary
-sudo touch sisu_sqlite.cgi sisu_pgsql.cgi
-sudo -P chown $USER sisu_sqlite.cgi sisu_pgsql.cgi
-
-#now this should be possible:
-sisu -F webrick
-
-!_ (7) copy the search form to the cgi directory
-
-sisu -F webserv=webrick
-
-and follow the instructions provided
-
-% sudo chmod -v 755 /usr/lib/cgi-bin/sisu_sqlite.cgi
-
-!_ (8) open up the form in your browser and query it
-
-url:
-
-http://localhost:8081/cgi-bin/sisu_sqlite.cgi
-
-or as instructed by command sisu -F webrick
-
-!_ (9) query the database using the search form
-
-if there are other options in the dropdown menu select
-
-document_samples_sisu_markup
-
-and search for some text, e.g.:
-
-aim OR project
-
-_* selecting the *index* radio button gives an index of results using the object numbers
-
-_* selecting the *text* radio button gives the content of the matched paragraphs with the match highlighted
-
-!_ (10) to start again with a new database
-
-to start from scratch you can drop the database with the command
-
-sisu -dv dropall
-
-and go to step 3
-
-to get to step 3 in one step with a single command
-
-sisu -dv recreate
-
-continue subsequent steps
-
-2~ misc
-
-3~ url for output files -u -U
-
-_1 sisu -uv[and other flags] [filename/wildcard]
-
-_1 sisu -Uv [filename/wildcard]
-
-3~ toggle screen color
-
-_1 sisu -cv[and processing flags] [filename/wildcard]
-
-3~ verbose mode
-
-_1 sisu -v[and processing flags] [filename/wildcard]
-
-_1 sisu -V[and processing flags] [filename/wildcard]
-
-3~ quiet mode
-
-_1 sisu -q[and processing flags] [filename/wildcard]
-
-3~ maintenance mode
-intermediate files kept -M
-
-_1 sisu -Mv[and other flags] [filename/wildcard]
-
-3~ start the webrick server
-
-_1 sisu -W
-
-2~ remote placement of output
-
-configuration is necessary
-
-scp
-
-_1 sisu -vr[and processing flags] [filename/wildcard]
-
-rsync
-
-_1 sisu -vR[and processing flags] [filename/wildcard]
-
-1~howto_config Configuration Files
-
-Sample provided, on untarring the source tarball:
-
-_1 conf/sisu/v2/sisurc.yml
-
-_1 conf/sisu/v3/sisurc.yml
-
-and on installation under:
-
-_1 /etc/sisu/v2/sisurc.yml
-
-_1 /etc/sisu/v3/sisurc.yml
-
-The following paths are searched:
-
-_1 ./_sisu/v2/sisurc.yml or ./_sisu/v3/sisurc.yml
-
-_1 ./_sisu/sisurc.yml
-
-_1 ~/.sisu/v2/sisurc.yml or ~/.sisu/v3/sisurc.yml
-
-_1 ~/.sisu/sisurc.yml
-
-_1 /etc/sisu/v2/sisurc.yml /etc/sisu/v3/sisurc.yml
-
-_1 /etc/sisu/sisurc.yml
-
-1~howto_markup Markup
-
-See sample markup provided on
-
-http://www.sisudoc.org/
-
-http://www.jus.uio.no/sisu
-
-http://www.jus.uio.no/sisu_markup
-
-http://www.jus.uio.no/sisu/SiSU
-
-in particular for each of the document output samples provided, the source document is provided as well
-
-http://www.jus.uio.no/sisu/SiSU/examples.html
-
-on untarring the source tarball:
-
-_1 data/doc/sisu/markup-samples
-
-or the same once source is installed (or sisu-examples) under:
-
-_1 /usr/share/doc/sisu/markup-samples/
-
-and if you have sisu-markup-samples installed, under
-
-_1 data/doc/sisu/markup-samples-non-free/
-
-_1 /usr/share/doc/sisu/markup-samples-non-free/
-
-Some notes are contained within the man page, *{man sisu}* and within sisu help via the commands *{sisu help markup}* and *{sisu help headers}*
-
-SiSU is for literary and legal text, also for some social science material. In particular it does not do formula, and is not particularly suited to technical documentation. Despite the latter caveat, some notes will be provided here and added to over time:
-
-2~ Headers
-
-Headers @headername: provide information related to the document, this may relate to
-
-# how it is to be processed, such as whether headings are to be numbered, what skin is to be used and markup instructions, such as the document structure, or words to be made bold within the document
-
-# semantic information about the document including the dublin core
-
-2~ Font Face
-
-Defaults are set. You may change the face to: bold, italics, underscore, strikethrough, ...
-
-3~ Bold
-
-\@bold: [list of words that should be made bold within document]
-
-!_ bold line
-
-\!_ bold line
-
-*{ bold word or sentence }*
-
-!\{ bold word or sentence \}!
-
-*\{ bold word or sentence \}*
-
-*boldword* or !boldword!
-
-\*boldword\* or \!boldword\!
-
-3~ Italics
-
-\@italics: [list of words that should be italicised within document]
-
-/{ italicise word or sentence }/
-
-/\{ italicise word or sentence \}/
-
-/italicisedword/
-
-\/italicisedword\/
-
-3~ Underscore
-
-_{ underscore word or sentence }_
-
-_\{ underscore word or sentence \}_
-
-_underscoreword_
-
-3~ Strikethrough
-
--{ strikethrough word or sentence }-
-
--\{ strikethrough word or sentence \}-
-
--strikeword-
-
-\-strikeword\-
-
-2~ Endnotes
-
-There are two forms of markup for endnotes, they cannot be mixed within the same document
-
-here~{ this is an endnote }~
-
-# preferred endnote markup
-
-here~\{ this is an endnote \}~
-
-# alternative markup equivalent, kept because it is possible to search and replace to get markup in existing texts such as Project Gutenberg
-
-here\~^
-
-^\~ this is an endote
-
-2~ Links
-
-{ SiSU }http://www.sisudoc.org
-
-code{
-
-{ SiSU }http://www.sisudoc.org
-
-}code
-
-{sisu.png }http://www.sisudoc.org
-
-code{
-
-{sisu.png }http://www.sisudoc.org
-
-}code
-
-{tux.png 64x80 }image
-
-code{
-
-{ tux.png 64x80 }image
-
-}code
-
-{~^ SiSU }http://www.sisudoc.org
-
-code{
-
-{~^ SiSU }http://www.sisudoc.org
-
-}code
-
-is equivalent to:
-
-code{
-
-{ SiSU }http://www.sisudoc.org ~{ http://www.sisudoc.org }~
-
-}code
-
-the same can be done with an image:
-
-{~^ sisu.png "SiSU" }http://www.sisudoc.org
-
-code{
-
-{~^ sisu.png "SiSU" }http://www.sisudoc.org
-
-}code
-
-2~ Number Titles
-
-Set with the header @markup:
-
-2~ Line operations
-
-Line Operations (marker placed at start of line)
-
-\!_ bold line
-
-!_ bold line
-
-\_1 indent paragraph one level
-
-_1 indent paragraph one level
-
-\_2 indent paragraph two steps
-
-_2 indent paragraph two steps
-
-\_* bullet paragraph
-
-_* bullet paragraph
-
-\# number paragraph (see headers for numbering document headings)
-
-# number paragraph (see headers for numbering document headings)
-
-\_# number paragraph level 2 (see headers for numbering document headings)
-
-_# number paragraph level 2 (see headers for numbering document headings)
-
-2~ Tables
-
-Table markup sample
-
-code{
-
-table{~h c3; 26; 32; 32;
-
-This is a table, column1
-this would become row one of column two
-column three of row one is here
-
-column one row 2
-column two of row two
-column three of row two, and so on
-
-column one row three
-and so on
-here
-
-}table
-
-}code
-
-Alternative form of table markup
-
-code{
-
-{t~h}
- |Mon|Tue|Wed|Thu|Fri|Sat|Sun
-0 | * | * | * | * | * | * | *
-1 | * | * | * | * | | |
-2 | - | * | * | * | * | * |
-3 | - | * | * | * | * | * | *
-4 | - | | | * | * | * |
-5 | * | * | * | * | * | * | *
-
-}code
-
-2~ Grouped Text
-
-code{
-
- 5.times { puts 'Ruby' }
-
-}code
-
-code\{
-
-code{
-
- 5.times { puts 'Ruby' }
-
-}code
-
-\}code
-
-poem{
-
-A Limerick
-
-There was a young lady from Clyde,
-who ate a green apple and died,
-but the apple fermented inside the lamented,
-and made cider inside her inside.
-
-}poem
-
-code{
-
-poem{
-
-There was a young lady from Clyde,
-who ate a green apple and died,
-but the apple fermented inside the lamented,
-and made cider inside her inside.
-
-}poem
-
-}code
-
-2~ Composite Document
-
-To import another document, the master document or importing document should be named filename.r3 (r for require)
-
-\<\< \{ filename.sst \}
-
-\<\< \{ filename.ssi \}
-
-1~howto_appearance Change Appearance
-
-2~ Skins
-
-"Skins" may be used to change various aspects related to the output documents appearance, including such things as the url for the home page on which the material will be published, information on the credit band, and for html documents colours and icons used in navigation bars. Skins are ruby files which permit changing of the default values set within the program for SiSU output.
-
-There are a few examples provided, on untarring the source tarball:
-
-_1 conf/sisu/skin/doc/
-
-_1 data/doc/sisu/markup-samples/samples/_sisu/skin/doc/
-
-and on installation under:
-
-_1 /etc/sisu/skin/doc/
-
-_1 /usr/share/doc/sisu-markup-samples/v2/samples/_sisu/skin/doc
-
-The following paths are searched:
-
-_1 ./_sisu/skin
-
-_1 ~/.sisu/skin
-
-_1 /etc/sisu/skin
-
-Skins under the searched paths in a per document directory, a per directory directory, or a site directory, named:
-
-doc [may be specified individually in each document]
-
-dir [used if identifier part of name matches markup directory name]
-
-site
-
-It is usual to place all skins in the document directory, with symbolic links as required from dir or site directories.
-
-2~ CSS
-
-The appearance of html and XML related output can be changed for an ouput collection directory by prepareing and placing a new css file in one of the sisu css directories searched in the sisu configuration path. These are located at:
-
-_./_sisu/css
-
-~/.sisu/css
-
-and
-
-/etc/sisu/css
-
-The contents of the first directory found in the search path are copied to the corresponding sisu output directory with the commnd:
-
-sisu -CC
-
-The SiSU standard css files for SiSU output are:
-
-dom.css html.css html_tables.css index.css sax.css xhtml.css
-
-A document may specify its own/bespoke css file using the css header.
-
-\@css:
-
-[expand]
-
-:C~ Extracts from the README
-
-1~howto_readme README
-
-SiSU 0.55 2007w27/6 2007-07-07
-
-Homepage: http://www.sisudoc.org
-
-old homepage: http://www.jus.uio.no/sisu
-
-!_ Description
-
-SiSU is lightweight markup based document creation and publishing framework that is controlled from the command line. Prepare documents for SiSU using your text editor of choice, then use SiSU to generate various output document formats.
-
-With minimal preparation of a plain-text (UTF-8) file using its native markup-syntax, SiSU produces: plain-text, HTML, XHTML, EPUB, XML, ODF:ODT (Opendocument), LaTeX, PDF, and populates an SQL database (PostgreSQL or SQLite) in paragraph sized chunks so that document searches are done at this "atomic" level of granularity.
-
-Outputs share a common citation numbering system, and any semantic meta-data provided about the document.
-
-SiSU also provides concordance files, document content certificates and manifests of generated output.
-
-SiSU takes advantage of well established open standard ways of representing text, and provides a bridge to take advantage of the strengths of each, while remaining simple. SiSU implements across document formats a "useful common feature set" [coming from a humanities, law, and possibly social sciences perspective, rather than technical or scientific writing] ... focus is primarily on content and data integrity rather than appearance, (though outputs in the various formats are respectable).
-
-A vim syntax highlighting file and an ftplugin with folds for sisu markup is provided. Vim 7 includes syntax highlighting for SiSU.
-
-man pages, and interactive help are provided.
-
-Dependencies for various features are taken care of in sisu related packages. The package sisu-complete installs the whole of SiSU.
-
-Additional document markup samples are provided in the package sisu-markup-samples which is found in the non-free archive the licenses for the substantive content of the marked up documents provided is that provided by the author or original publisher.
-
-Homepage: http://www.sisudoc.org
-
-old homepage: http://www.jus.uio.no/sisu
-
-SiSU - simple information structuring universe, is a publishing tool, document generation and management, (and search enabling) tool primarily for literary, academic and legal published works.
-
-SiSU can be used for Internet, Intranet, local filesystem or cd publishing.
-
-SiSU can be used directly off the filesystem, or from a database.
-
-SiSU's scalability, is dependent on your hardware, and filesystem, and/or database Postgresql.
-
-Amongst it's characteristics are:
-
-_* simple mnemonoic markup style,
-
-_* the ability to produce multiple output formats, including html, structured XML, LaTeX, pdf (via LaTeX), stream to a relational database whilst retaining document structure - Postgresql and Sqlite,
-
-_* that all share a common citation system (a simple idea from which much good), possibly most exciting, the following: if fed into a relational database (as it can be automatically), the document set is searchable, with results displayed at a paragraph level, or the possibility of an indexed display of documents in which the match is found together with a hyperlinked listing for each of each paragraph in which the match is found. In any event citations using this system (with or without the relational database) are relevant for all output formats.
-
-_* it is command line driven, and can be set up on a remote server
-
-_* Documents are marked up in SiSU syntax in your favourite editor. SiSU syntax may be regarded as a type of smart ascii - which in its basic form is simpler than the most elementary html. There is currently a syntax highlighter, and folding for Vim. Syntax highlighters for other editors are welcome.
-
-Input files should be UTF-8
-
-Once set up it is simple to use.
-
-2~ Online Information, places to look
-
-http://www.sisudoc.org
-
-http://www.jus.uio.no/sisu
-
-Download Sources:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#current
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#debian
-
-2~ Installation
-
-NB. Platform is Unix / Linux.
-
-3~ Debian
-
-If you use Debian use the Debian packages, check the information at:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#debian
-
-(A) SiSU is available directly off the Debian archives for Sid and testing. It
-should necessary only to run as root:
-
-_1 aptitude update
-
-_1 aptitude install sisu-complete
-
-(B) If there are newer versions of SiSU upstream of the Debian archives, they
-will be available by adding the following to your /etc/apt/sources.list
-
-_1 deb http://www.jus.uio.no/sisu/archive unstable main non-free
-
-_1 deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
-
-[the non-free line is for document markup samples, for which the substantive text is provided under the author or original publisher's license and which in most cases will not be debian free software guideline compliant]
-
-Then as root run:
-
-_1 aptitude update
-
-_1 aptitude install sisu-complete
-
-3~ RPM
-
-RPMs are provided though untested, they are prepared by running alien against the source package, and against the debs.
-
-They may be downloaded from:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#rpm
-
-3~ Source package .tgz
-
-Otherwise to install SiSU from source, check information at:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#current
-
-alternative modes of installation from source are provided, setup.rb (by Minero Aoki), rake (by Jim Weirich) built install file, rant (by Stefan Lang) built install file,
-
-Ruby is the essential dependency for the basic operation of SiSU
-
-1. Download the latest source (information available) from:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#current
-
-2. Unpack the source
-
-Note however, that additional external package dependencies, such as texlive or postgresql should you desire to use it are not taken care of for you.
-
-3~ to use setup.rb
-
-this is a three step process, in the root directory of the unpacked SiSU as root type:
-
-_1 ruby setup.rb config
-
-_1 ruby setup.rb setup
-
-as root:
-
-_1 ruby setup.rb install
-
-further information:
-
-_1 http://i.loveruby.net/en/projects/setup/
-
-_1 http://i.loveruby.net/en/projects/setup/doc/usage.html
-
-3~ to use install (prapared with "Rake")
-
-Rake must be installed on your system:
-
-_1 http://rake.rubyforge.org/
-
-_1 http://rubyforge.org/frs/?group_id=50
-
-in the root directory of the unpacked SiSU as root type:
-
-_1 rake
-
-or
-
-_1 rake base
-
-This makes use of Rake (by Jim Weirich) and the provided Rakefile
-
-For a list of alternative actions you may type:
-
-_1 rake help
-
-_1 rake -T
-
-3~ to use install (prapared with "Rant")
-
-(you may use the instructions above for rake substituting rant if rant is
-installed on your system, or you may use an independent installer created using
-rant as follows:)
-
-in the root directory of the unpacked SiSU as root type:
-
-_1 ruby ./sisu-install
-
-or
-
-_1 ruby ./sisu-install base
-
-This makes use of Rant (by Stefan Lang) and the provided Rantfile. It has been configured to do post installation setup setup configuration and generation of first test file. Note however, that additional external package dependencies, such as tetex-extra are not taken care of for you.
-
-further information:
-
-_1 http://make.rubyforge.org/
-
-_1 http://rubyforge.org/frs/?group_id=615
-
-For a list of alternative actions you may type:
-
-_1 ruby ./sisu-install help
-
-_1 ruby ./sisu-install -T
-
-2~ Dependencies
-
-Once installed see 'man 8 sisu' for some information on additional programs that sisu makes use of, and that you may need or wish to install. (this will depend on such factors as whether you want to generate pdf, whether you will be using SiSU with or without a database, ...) 'man sisu-markup-samples' may also be of interest if the sisu-markup-samples package has also been installed.
-
-The information in man 8 may not be most up to date, and it is possible that more useful information can be gleaned from the following notes taken from the Debian control file (end edited), gives an idea of additional packages that SiSU can make use of if available, (the use/requirement of some of which are interdependent for specific actions by SiSU).
-
-The following is from the debian/control file of sisu-3.0.2, which amongst other things provides the dependencies of sisu within Debian.
-
-code{
-
-Source: sisu
-Section: text
-Priority: optional
-Maintainer: SiSU Project <sisu@lists.sisudoc.org>
-Uploaders: Ralph Amissah <ralph@amissah.com>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.1
-Homepage: http://www.sisudoc.org/
-Vcs-Browser: http://git.sisudoc.org/?p=code/sisu.git
-Vcs-Git: git://git.sisudoc.org/git/code/sisu.git
-XS-Dm-Upload-Allowed: yes
-
-}code
-
-code{
-
-Package: sisu
-Architecture: all
-Depends: ${misc:Depends}, ruby (>= 1.8.2), libwebrick-ruby, rsync, unzip, zip
-Recommends:
- sisu-pdf, sisu-sqlite, sisu-postgresql, imagemagick, keychain, librmagick-ruby,
- librexml-ruby, openssl, openssh-client | lsh-client, tidy, vim-addon-manager
-Suggests: lv, calibre, pinfo, texinfo, trang
-Conflicts: sisu-markup-samples (<= 1.0.11)
-Replaces: sisu-markup-samples (<= 1.0.11)
-Description: documents - structuring, publishing in multiple formats and search
- SiSU is a lightweight markup based, command line oriented, document
- structuring, publishing and search framework for document collections.
- .
- With minimal preparation of a plain-text, (UTF-8) file, using its native
- markup syntax in your text editor of choice, SiSU can generate various
- document formats (most of which share a common object numbering system for
- locating content), including plain text, HTML, XHTML, XML, EPUB, OpenDocument
- text (ODF:ODT), LaTeX, PDF files, and populate an SQL database with objects
- (roughly paragraph-sized chunks) so searches may be performed and matches
- returned with that degree of granularity: your search criteria is met by these
- documents and at these locations within each document. Object numbering is
- particularly suitable for "published" works (finalized texts as opposed to
- works that are frequently changed or updated) for which it provides a fixed
- means of reference of content. Document outputs also share semantic meta-data
- provided.
- .
- SiSU also provides concordance files, document content certificates and
- manifests of generated output.
- .
- A vim syntax highlighting file and an ftplugin with folds for sisu markup is
- provided, as are syntax highlighting files for kate, kwrite, gedit and
- diakonos. Vim 7 includes syntax highlighting for SiSU.
- .
- man pages, and interactive help are provided.
- .
- Dependencies for various features are taken care of in sisu related packages.
- The package sisu-complete installs the whole of SiSU.
- .
- Additional document markup samples are provided in the package
- sisu-markup-samples which is found in the non-free archive the licenses for
- the substantive content of the marked up documents provided is that provided
- by the author or original publisher.
-
-}code
-
-code{
-
-Package: sisu-complete
-Architecture: all
-Depends:
- ${misc:Depends}, ruby (>= 1.8.2), sisu (= ${source:Version}),
- sisu-pdf (= ${source:Version}), sisu-postgresql (= ${source:Version}),
- sisu-sqlite (= ${source:Version})
-Description: installs all SiSU related packages
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
- .
- This package installs SiSU and related packages that enable sisu to produce
- pdf and to populate PostgreSQL and sqlite databases.
- .
- See sisu for a description of the package.
-
-}code
-
-code{
-
-Package: sisu-pdf
-Architecture: all
-Depends:
- ${misc:Depends}, sisu, texlive-latex-base, texlive-fonts-recommended,
- texlive-latex-recommended, texlive-latex-extra, texlive-xetex, lmodern,
- ttf-liberation
-Suggests: evince | pdf-viewer
-Description: dependencies to convert SiSU LaTeX output to pdf
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
- .
- This package enables the conversion of SiSU LaTeX output to pdf.
-
-}code
-
-code{
-
-Package: sisu-pdf
-Architecture: all
-Depends:
- ${misc:Depends}, sisu, texlive-latex-base, texlive-fonts-recommended,
- texlive-latex-recommended, texlive-latex-extra, texlive-xetex, lmodern,
- ttf-liberation
-Suggests: evince | pdf-viewer
-Description: dependencies to convert SiSU LaTeX output to pdf
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
- .
- This package enables the conversion of SiSU LaTeX output to pdf.
-
-}code
-
-code{
-
-Package: sisu-postgresql
-Architecture: all
-Depends:
- ${misc:Depends}, sisu, libdbd-pg-ruby, libdbd-pg-ruby1.8, libdbi-ruby,
- libdbi-ruby1.8, libdbm-ruby, postgresql, libfcgi-ruby1.8 | libfcgi-ruby1.9.1
-Suggests: postgresql-contrib
-Description: SiSU dependencies for use with PostgreSQL database
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
- .
- This package enables SiSU to populate a PostgreSQL database. This is done at
- an object/paragraph level, making granular searches of documents possible.
- .
- This relational database feature of SiSU is not required but provides
- interesting possibilities, including that of granular searches of documents
- for matching units of text, primarily paragraphs that can be displayed or
- identified by object citation number, from which an index of documents
- matched and each matched paragraph within them can be displayed.
-
-}code
-
-code{
-
-Package: sisu-sqlite
-Architecture: all
-Depends:
- ${misc:Depends}, sisu, sqlite3, libsqlite3-ruby, libdbd-sqlite3-ruby,
- libdbd-sqlite3-ruby1.8, libdbi-ruby, libdbi-ruby1.8, libdbm-ruby,
- libfcgi-ruby1.8 | libfcgi-ruby1.9.1
-Description: SiSU dependencies for use with SQLite database
- SiSU is a lightweight markup based document structuring, publishing and search
- framework for document collections.
- .
- This package enables SiSU to populate an SQLite database. This is done at an
- object/paragraph level, making granular searches of documents possible.
- .
- This relational database feature of SiSU is not required but provides
- interesting possibilities, including that of granular searches of documents
- for matching units of text, primarily paragraphs that can be displayed or
- identified by object citation number, from which an index of documents
- matched and each matched paragraph within them can be displayed.
-
-}code
-
-2~ Quick start
-
-Most of the installation should be taken care of by the aptitude or rant
-install. (The rant install if run in full will also test run the generation of
-the first document).
-
-After installation of sisu-complete, move to the document samples directory
-
-_1 cd /usr/share/doc/sisu/markup-samples/samples
-
-and run
-
-_1 sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-or the same:
-
-_1 sisu -NhwpoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-look at output results, see the "sisu_manifest" page created for the document
-
-or to generate an online document move to a writable directory, as the file will be downloaded there and e.g.
-
-sisu -3 http://www.jus.uio.no/sisu/src/free_culture.lawrence_lessig.sst
-
-the database stuff is extra perhaps, the latex stuff could be considered extra perhaps but neither needs to be installed for most of sisu output to work
-
-examine source document, vim has syntax support
-
-gvim free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-additional markup samples in
-
-_1 http://www.jus.uio.no/sisu/SiSU/examples.html
-
-For help
-
-_1 man sisu
-
-or
-
-_1 sisu --help
-
-e.g.
-
-for the way sisu "sees/maps" your system
-
-_1 sisu --help env
-
-for list of commands and so on
-
-_1 sisu --help commands
-
-2~ Configuration files
-
-The default configuration/setup is contained within the program and is altered by configuration settings in /etc/[sisu version]/sisurc.yml or in ~/.sisu/sisurc.yml
-
-_* configuration file - a yaml file
-
-_1 /etc/sisu/[sisu version]/sisurc.yml
-
-_1 ~/.sisu/sisurc.yml
-
-_* directory structure - setting up of output and working directory.
-
-* skins - changing the appearance of a project, directory or individual
-documents within ~/.sisu/skin
-
-_1 ~/.sisu/skin/doc contains individual skins, with symbolic links from
-
-_1 ~/.sisu/skin/dir if the contents of a directory are to take a particular document skin.
-
-_* additional software - eg. Tex and LaTeX (tetex, tetex-base, tetex-extra on Debian), Postgresql, [sqlite], trang, tidy, makeinfo, ... none of which are required for basic html or XML processing.
-
-_* if you use Vim as editor there is a syntax highlighter and fold resource config file for SiSU. I hope more syntax highlighters follow.
-
-There are post installation steps (which are really part of the overall installation)
-
-sisu -C in your marked up document directory, should do some auto-configuring provided you have the right permissions for the output directories. (and provided the output directories have already been specified if you are not using the defaults).
-
-2~ Use General Overview
-
-Documents are marked up in SiSU syntax and kept in an ordinary text editable file, named with the suffix .sst, or .ssm
-
-Marked up SiSU documents are usually kept in a sub-directory of your choosing
-
-use the interactive help and man pages
-
-_1 sisu --help
-
-_1 man sisu
-
-2~ Help
-
-interactive help described below, or man page:
-
-_1 man sisu
-
-_1 man 8 sisu
-
-'man sisu_markup-samples' [if the sisu-markup-samples package is also installed]
-
-Once installed an interactive help is available typing 'sisu' (without) any flags, and select an option:
-
-_1 sisu
-
-alternatively, you could type e.g.
-
-_1 sisu --help commands
-
-_1 sisu --help env
-
-_1 sisu --help headers
-
-_1 sisu --help markup
-
-_1 sisu --help headings
-
-etc.
-
-for questions about mappings, output paths etc.
-
-_1 sisu --help env
-
-_1 sisu --help path
-
-_1 sisu --help directory
-
-2~ Directory Structure
-
-Once installed, type:
-
-_1 sisu --help env
-
-or
-
-_1 sisu -V
-
-2~ Configuration File
-
-The defaults can be changed via SiSU's configure file sisurc.yml which the program expects to find in ./_sisu ~/.sisu or /etc/sisu (searched in that order, stopping on the first one found)
-
-2~ Markup
-
-See man pages.
-
-_1 man sisu
-
-_1 man 8 sisu
-
-Once installed there is some information on SiSU Markup in its help:
-
-_1 sisu --help markup
-
-and
-
-_1 sisu --help headers
-
-Sample marked up document are provided with the download tarball in the directory:
-
-_1 ./data/doc/sisu/markup-samples/
-
-These are installed on the system usually at:
-
-_1 /usr/share/doc/sisu/markup-samples/
-
-More markup samples are available in the package sisu-markup-samples, which if installed should be available at:
-
-_1 /usr/share/doc/sisu/markup-samples-non-free/
-
-Many more are available online off:
-
-_1 http://www.jus.uio.no/sisu/SiSU/examples.html
-
-2~ Additional Things
-
-There is syntax support for some editors provided (together with a README file) in
-
-_1 ./data/sisu/v2/conf/editor-syntax-etc
-
-usually installed to:
-
-_1 /usr/share/sisu/v2/conf/editor-syntax-etc
-
-2~ License
-
-License: GPL 3 or later see the copyright file in
-
-_1 ./data/doc/sisu
-
-usually installed to:
-
-_1 /usr/share/doc/sisu
-
-2~ SiSU Standard
-
-SiSU uses:
-
-_* Standard SiSU markup syntax,
-
-_* Standard SiSU meta-markup syntax, and the
-
-_* Standard SiSU object citation numbering and system
-
-© Ralph Amissah 1997, current 2006 All Rights Reserved.
-
-_* however note the License section
-
-CHANGELOG
-
-_1 ./CHANGELOG
-
-and see
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog.html
-
-_1 http://www.jus.uio.no/sisu/SiSU/changelog_markup_samples.html
-
-:C~ Extracts from man 8 sisu
-
-1~howto_setup_post_installation Post Installation Setup
-
-2~ Post Installation Setup - Quick start
-
-After installation of sisu-complete, move to the document samples directory,
-
-_1 cd /usr/share/doc/sisu/markup-samples/samples
-
-[this is not where you would normally work but provides sample documents for
-testing, you may prefer instead to copy the contents of that directory to a local
-directory before proceeding]
-
-and in that directory, initialise the output directory with the command
-
-_1 sisu -CC
-
-then run:
-
-_1 sisu -1 free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-or the same:
-
-_1 sisu -NhwpoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-look at output results, see the "sisu_manifest" page created for the document
-
-for an overview of your current sisu setup, type:
-
-_1 sisu --help env
-
-or
-
-_1 sisu -V
-
-To generate a document from a remote url accessible location move to a writable directory, (create a work directory and cd into it) as the file will be downloaded there and e.g.
-
-_1 sisu -1 http://www.jus.uio.no/sisu/src/gpl.fsf.sst
-
-_1 sisu -3 http://www.jus.uio.no/sisu/src/free_culture.lawrence_lessig.sst
-
-examine source document, vim has syntax highlighting support
-
-gvim free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-additional markup samples in
-
-_1 http://www.jus.uio.no/sisu/SiSU/examples.html
-
-it should also be possible to run sisu against sisupods (prepared zip files, created by running the command sisu -S [filename]), whether stored locally or remotely.
-
-_1 sisu -3 http://www.jus.uio.no/sisu/pod/free_culture.lawrence_lessig.sst.zip
-
-there is a security issue associated with the running of document skins that are not your own, so these are turned of by default, and the use of the following command, which switches on the associated skin is not recommended:
-
-_1 sisu -3 --trust http://www.jus.uio.no/sisu/pod/free_culture.lawrence_lessig.sst.zip
-
-For help
-
-_1 man sisu
-
-_1 sisu --help
-
-_1 sisu --help env
-for the way sisu "sees/maps" your system
-
-_1 sisu --help commands
-for list of commands and so on
-
-2~ Document markup directory
-
-% B. Generate a (local) document from a markup/work directory.
-
-Perhaps the easiest way to begin is to create a directory for sisu marked up documents within your home directory, and copy the file structure (and document samples) provided in the document sample directory:
-
-_1 mkdir ~/sisu_test
-
-_1 cd ~/sisu_test
-
-_1 cp -a /usr/share/doc/sisu/markup-samples/samples/* ~/sisu_test/.
-
-better if you have installed sisu-markup-samples
-
-_1 cp -a /usr/share/doc/sisu/markup-samples-non-free/samples/* ~/sisu_test/.
-
-% !_ Tip:
-% the markup syntax examples may be of interest
-%
-% _1 http://www.jus.uio.no/sisu/sample/
-
-!_ Tip:
-
-_1 sisu -U [sisu markup filename]
-
-should printout the different possible outputs and where sisu would place them.
-
-!_ Tip:
-if you want to toggle ansi color add
-
-_1 c
-
-to your flags.
-
-3~ Configuration files
-
-SiSU configuration file search path is:
-
-_1 ./_sisu/sisurc.yaml
-
-_1 ~/.sisu/sisurc.yaml
-
-_1 /etc/sisu/sisurc.yaml
-
-.\"%% Debian Installation Note
-
-3~ Debian INSTALLATION Note
-
-It is best you see
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#debian
-
-for up the most up to date information.
-
-notes taken from the Debian control file (end edited), gives an idea of additional packages that SiSU can make use of if available, (the use/requirement of some of which are interdependent for specific actions by SiSU):
-
-Package: sisu
-
-SiSU is a lightweight markup based, command line oriented, document structuring, publishing and search framework for document collections.
-
-With minimal preparation of a plain-text, (UTF-8) file, using its native markup syntax in your text editor of choice, SiSU can generate various document formats (most of which share a common object numbering system for locating content), including plain text, HTML, XHTML, XML, OpenDocument text (ODF:ODT), EPUB, LaTeX, PDF files, and populate an SQL database with objects (roughly paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity: your search criteria is met by these documents and at these locations within each document. Object numbering is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content. Document outputs also share semantic meta-data provided.
-
-SiSU also provides concordance files, document content certificates and manifests of generated output.
-
-A vim syntax highlighting file and an ftplugin with folds for sisu markup is provided, as are syntax highlighting files for kate, kwrite, gedit and diakonos. Vim 7 includes syntax highlighting for SiSU.
-
-man pages, and interactive help are provided.
-
-Dependencies for various features are taken care of in sisu related packages. The package sisu-complete installs the whole of SiSU.
-
-Additional document markup samples are provided in the package sisu-markup-samples which is found in the non-free archive the licenses for the substantive content of the marked up documents provided is that provided by the author or original publisher.
-
-Homepage: http://www.sisudoc.org
-
-old homepage: http://www.jus.uio.no/sisu
-
-3~ Document Resource Configuration
-
-!_ sisu
-resource configuration information is obtained from sources (where they exist):
-
-_1 ~/.sisu/sisurc.yaml
-
-_1 /etc/sisu/[sisu version]/sisurc.yaml
-
-_1 sisu program defaults
-
-3~ Skins
-
-!_ Skins
-default document appearance may be modified using skins contained in sub-directories located at the following paths:
-
-_1 ./_sisu/skin
-
-_1 ~/.sisu/skin
-
-_1 /etc/sisu/skin
-
-more specifically, the following locations (or their /etc/sisu equivalent) should be used:
-
-_1 ~/.sisu/skin/doc
-
-skins for individual documents;
-
-_1 ~/.sisu/skin/dir
-
-skins for directories of matching names;
-
-_1 ~/.sisu/skin/site
-
-site-wide skin modifying the site-wide appearance of documents.
-
-Usually all skin files are placed in the document skin directory:
-
-_1 ~/.sisu/skin/doc
-
-with softlinks being made to the skins contained there from other skin
-directories as required.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_introduction.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_introduction.sst
deleted file mode 100644
index 08cd8574..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_introduction.sst
+++ /dev/null
@@ -1,74 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Introduction
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-09-18
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2011
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? What is SiSU?
-
-:C~? Description
-
-1~sisu_intro Introduction - What is SiSU?
-
-SiSU is a framework for document structuring, publishing (in multiple open standard formats) and search, comprising of: (a) a lightweight document structure and presentation markup syntax; and (b) an accompanying engine for generating standard document format outputs from documents prepared in sisu markup syntax, which is able to produce multiple standard outputs (including the population of sql databases) that (can) share a common numbering system for the citation of text within a document.
-
-SiSU is developed under an open source, software libre license (GPLv3). Its use case for development is work with medium to large document sets and cope with evolving document formats/ representation technologies. Documents are prepared once, and generated as need be to update the technical presentation or add additional output formats. Various output formats (including search related output) share a common mechanism for cross-output-format citation.
-
-SiSU both defines a markup syntax and provides an engine that produces open standards format outputs from documents prepared with SiSU markup. From a single lightly prepared document sisu custom builds several standard output formats which share a common (text object) numbering system for citation of content within a document (that also has implications for search). The sisu engine works with an abstraction of the document's structure and content from which it is possible to generate different forms of representation of the document. Significantly SiSU markup is more sparse than html and outputs which include HTML, EPUB, ODT (Open Document Format text), LaTeX, landscape and portrait PDF, all of which can be added to and updated. SiSU is also able to populate SQL type databases at an object level, which means that searches can be made with that degree of granularity.
-
-Source document preparation and output generation is a two step process: (i) document source is prepared, that is, marked up in sisu markup syntax and (ii) the desired output subsequently generated by running the sisu engine against document source. Output representations if updated (in the sisu engine) can be generated by re-running the engine against the prepared source. Using SiSU markup applied to a document, SiSU custom builds (to take advantage of the strengths of different ways of representing documents) various standard open output formats including plain text, HTML, XHTML, XML, EPUB, ODT, LaTeX or PDF files, and populate an SQL database with objects~{ objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced. }~ (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity ( e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
-
-In preparing a SiSU document you optionally provide semantic information related to the document in a document header, and in marking up the substantive text provide information on the structure of the document, primarily indicating heading levels and footnotes. You also provide information on basic text attributes where used. The rest is automatic, sisu from this information custom builds~{ i.e. the HTML, PDF, EPUB, ODT outputs are each built individually and optimised for that form of presentation, rather than for example the html being a saved version of the odf, or the pdf being a saved version of the html. }~ the different forms of output requested.
-
-SiSU works with an abstraction of the document based on its structure which is comprised of its headings~{ the different heading levels }~ and objects~{ units of text, primarily paragraphs and headings, also any tables, poems, code-blocks }~, which enables SiSU to represent the document in many different ways, and to take advantage of the strengths of different ways of presenting documents. The objects are numbered, and these numbers can be used to provide a common basis for citing material within a document across the different output format types. This is significant as page numbers are not well suited to the digital age, in web publishing, changing a browser's default font or using a different browser can mean that text will appear on a different page; and publishing in different formats, html, landscape and portrait pdf etc. again page numbers are not useful to cite text. Dealing with documents at an object level together with object numbering also has implications for search that SiSU is able to take advantage of.
-
-One of the challenges of maintaining documents is to keep them in a format that allows use of them independently of proprietary platforms. Consider issues related to dealing with legacy proprietary formats today and what guarantee you have that old proprietary formats will remain (or can be read without proprietary software/equipment) in 15 years time, or the way the way in which html has evolved over its relatively short span of existence. SiSU provides the flexibility of producing documents in multiple non-proprietary open formats including HTML, EPUB,~{ An open standard format for e-books }~ ODT,~{ Open Document Format (ODF) text }~ PDF~{ Specification submitted by Adobe to ISO to become a full open ISO specification <br> http://www.linux-watch.com/news/NS7542722606.html }~ ODF,~{ ISO standard ISO/IEC 26300:2006 }~. Whilst SiSU relies on software, the markup is uncomplicated and minimalistic which guarantees that future engines can be written to run against it. It is also easily converted to other formats, which means documents prepared in SiSU can be migrated to other document formats. Further security is provided by the fact that the software itself, SiSU is available under GPLv3 a licence that guarantees that the source code will always be open, and free as in libre, which means that that code base can be used, updated and further developed as required under the terms of its license. Another challenge is to keep up with a moving target. SiSU permits new forms of output to be added as they become important, (Open Document Format text was added in 2006 when it became an ISO standard for office applications and the archival of documents), EPUB was introduced in 2009; and allows the technical representations existing output to be updated (HTML has evolved and the related module has been updated repeatedly over the years, presumably when the World Wide Web Consortium (w3c) finalises HTML 5 which is currently under development, the HTML module will again be updated allowing all existing documents to be regenerated as HTML 5).
-
-The document formats are written to the file-system and available for indexing by independent indexing tools, whether off the web like Google and Yahoo or on the site like Lucene and Hyperestraier.
-
-SiSU also provides other features such as concordance files and document content certificates, and the working against an abstraction of document structure has further possibilities for the research and development of other document representations, the availability of objects is useful for example for topic maps and thesauri, together with the flexibility of SiSU offers great possibilities.
-
-SiSU is primarily for published works, which can take advantage of the citation system to reliably reference its documents. SiSU works well in a complementary manner with such collaborative technologies as Wikis, which can take advantage of and be used to discuss the substance of content prepared in SiSU.
-
-http://www.sisudoc.org/
-
-http://www.jus.uio.no/sisu
-
-% SiSU is a way of preparing, publishing, managing and searching documents.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_manual.ssm b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_manual.ssm
deleted file mode 100644
index 0e927713..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_manual.ssm
+++ /dev/null
@@ -1,117 +0,0 @@
-% SiSU master 2.0
-
-@title: SiSU
- :subtitle: Manual
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2008-07-21
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: SiSU:manual;electronic documents:SiSU:manual
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~ @title @creator
-
-:B~ What is SiSU?
-
-<< sisu_introduction.sst
-
-<< sisu_how.ssi
-
-<< sisu_short_feature_summary.ssi
-
-<< sisu_help.sst
-
-% :B~? SiSU Commands
-
-<< sisu_commands.sst
-
-% :B~? SiSU Markup
-
-<< sisu_markup.sst
-
-<< sisu_filetypes.sst
-
-% :B~? SiSU Configuration and Skins
-
-<< sisu_config.ssi
-
-<< sisu_skin.sst
-
-<< sisu_css.ssi
-
-<< sisu_content_directories.ssi
-
-<< sisu_homepages.ssi
-
-% :B~? SiSU Output and Markup Examples
-
-<< sisu_examples.ssi
-
-<< sisu_output_overview.sst
-
-<< sisu_search_intro.ssi
-
-<< sisu_sql.ssi
-
-<< sisu_postgresql.sst
-
-<< sisu_sqlite.sst
-
-<< sisu_search_cgi.ssi
-
-<< sisu_webrick.sst
-
-<< sisu_remote.sst
-
-% :B~? SiSU Download and Installation
-
-<< sisu_download.ssi
-
-<< sisu_installation.ssi
-
-<< sisu_quickstart.sst
-
-% :B~? SiSU Howto and FAQ
-
-<< sisu_howto.sst
-
-<< sisu_faq.sst
-
-<< sisu_interesting_to_whom.ssi
-
-<< sisu_work_needed_and_wishlist.ssi
-
-<< sisu_syntax_highlighting.sst
-
-<< sisu_help_sources.sst
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup.sst
deleted file mode 100644
index 3af84ad9..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup.sst
+++ /dev/null
@@ -1,1275 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Markup
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2008-05-22
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:markup;SiSU:document:markup;SiSU:document:markup;SiSU:manual:markup;electronic documents:SiSU:manual:markup
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/i
-
-:A~? @title @creator
-
-:B~? SiSU Markup
-
-1~markup Introduction to SiSU Markup~{ From sometime after SiSU 0.58 it should be possible to describe SiSU markup using SiSU, which though not an original design goal is useful. }~
-
-2~ Summary
-
-SiSU source documents are plaintext (UTF-8)~{ files should be prepared using UTF-8 character encoding }~ files
-
-All paragraphs are separated by an empty line.
-
-Markup is comprised of:
-
-_* at the top of a document, the document header made up of semantic meta-data about the document and if desired additional processing instructions (such an instruction to automatically number headings from a particular level down)
-
-_* followed by the prepared substantive text of which the most important single characteristic is the markup of different heading levels, which define the primary outline of the document structure. Markup of substantive text includes:
-
-_1* heading levels defines document structure
-
-_1* text basic attributes, italics, bold etc.
-
-_1* grouped text (objects), which are to be treated differently, such as code blocks or poems.
-
-_1* footnotes/endnotes
-
-_1* linked text and images
-
-_1* paragraph actions, such as indent, bulleted, numbered-lists, etc.
-
-Some interactive help on markup is available, by typing sisu and selecting markup or sisu --help markup
-
-To check the markup in a file:
-
-_1 sisu --identify [filename].sst
-
-For brief descriptive summary of markup history
-
-_1 sisu --query-history
-
-or if for a particular version:
-
-_1 sisu --query-0.38
-
-2~ Markup Examples
-
-3~ Online
-
-Online markup examples are available together with the respective outputs produced from http://www.jus.uio.no/sisu/SiSU/examples.html or from http://www.jus.uio.no/sisu/sisu_examples/
-
-There is of course this document, which provides a cursory overview of sisu markup and the respective output produced: http://www.jus.uio.no/sisu/sisu_markup/
-
-an alternative presentation of markup syntax: /usr/share/doc/sisu/on_markup.txt.gz
-
-3~ Installed
-
-With SiSU installed sample skins may be found in: /usr/share/doc/sisu/markup-samples (or equivalent directory) and if sisu-markup-samples is installed also under: /usr/share/doc/sisu/markup-samples-non-free
-
-1~headers Markup of Headers
-
-Headers contain either: semantic meta-data about a document, which can be used by any output module of the program, or; processing instructions.
-
-Note: the first line of a document may include information on the markup version used in the form of a comment. Comments are a percentage mark at the start of a paragraph (and as the first character in a line of text) followed by a space and the comment:
-
-code{
-
-% this would be a comment
-
-}code
-
-2~ Sample Header
-
-This current document is loaded by a master document that has a header similar to this one:
-
-code{
-
-% SiSU master 2.0
-
-@title: SiSU
- :subtitle: Manual
-
-@creator:
- :author: Amissah, Ralph
-
-@publisher: [publisher name]
-
-@rights: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
-
-@classify:
- :type: information
- :topic_register: SiSU:manual;electronic documents:SiSU:manual
- :subject: ebook, epublishing, electronic book, electronic publishing,
- electronic document, electronic citation, data structure,
- citation systems, search
-
-% used_by: manual
-
-@date:
- :published: 2008-05-22
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2010-03-03
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search;
- synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ]
- . sisu [-Ddcv] [instruction]
- . sisu [-CcFLSVvW]
- . sisu --v2 [operations]
- . sisu --v3 [operations]
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-}code
-
-2~ Available Headers
-
-Header tags appear at the beginning of a document and provide meta information on the document (such as the Dublin Core), or information as to how the document as a whole is to be processed. All header instructions take the form @headername: or on the next line and indented by once space :subheadername: All Dublin Core meta tags are available
-
-!_ @identifier:
-information or instructions
-
-where the "identifier" is a tag recognised by the program, and the "information" or "instructions" belong to the tag/identifier specified
-
-Note: a header where used should only be used once; all headers apart from @title: are optional; the @structure: header is used to describe document structure, and can be useful to know.
-
-This is a sample header
-
-% (Dublin Core in fuschia, other information headers in cyan, markup instructions in red):
-
-code{
-
-% SiSU 2.0 [declared file-type identifier with markup version]
-
-}code
-
-code{
-
-@title: [title text] [this header is the only one that is mandatory]
- :subtitle: [subtitle if any]
- :language: English
-
-}code
-
-code{
-
-@creator:
- :author: [Lastname, First names]
- :illustrator: [Lastname, First names]
- :translator: [Lastname, First names]
- :prepared_by: [Lastname, First names]
-
-}code
-
-code{
-
-@date:
- :published: [year or yyyy-mm-dd]
- :created: [year or yyyy-mm-dd]
- :issued: [year or yyyy-mm-dd]
- :available: [year or yyyy-mm-dd]
- :modified: [year or yyyy-mm-dd]
- :valid: [year or yyyy-mm-dd]
- :added_to_site: [year or yyyy-mm-dd]
- :translated: [year or yyyy-mm-dd]
-
-}code
-
-code{
-
-@rights:
- :copyright: Copyright (C) [Year and Holder]
- :license: [Use License granted]
- :text: [Year and Holder]
- :translation: [Name, Year]
- :illustrations: [Name, Year]
-
-}code
-
-code{
-
-@classify:
- :topic_register: SiSU:markup sample:book;book:novel:fantasy
- :type:
- :subject:
- :description:
- :keywords:
- :abstract:
- :isbn: [ISBN]
- :loc: [Library of Congress classification]
- :dewey: [Dewey classification
-
-}code
-
-code{
-
-@links: { SiSU }http://www.sisudoc.org
- { FSF }http://www.fsf.org
-
-}code
-
-code{
-
-@make:
- :skin: skin_name [skins change default settings related to the appearance of documents generated]
- :num_top: 1
- :headings: [text to match for each level
- (e.g. PART; Chapter; Section; Article; or another: none; BOOK|FIRST|SECOND; none; CHAPTER;)
- :breaks: new=:C; break=1
- :promo: sisu, ruby, sisu_search_libre, open_society
- :bold: [regular expression of words/phrases to be made bold]
- :italics: [regular expression of words/phrases to italicise]
-
-}code
-
-code{
-
-@original:
- :language: [language]
-
-}code
-
-code{
-
-@notes:
- :comment:
- :prefix: [prefix is placed just after table of contents]
-
-}code
-
-% header ends here, NB only @title: is mandatory [this would be a comment]
-% NOTE: headings/levels below refer to 0.38 expermental markup (a conversion script provided in sisu-examples, modify.rb makes conversion between 0.37 and 0.38 markup simple)
-
-1~ Markup of Substantive Text
-
-2~heading_levels Heading Levels
-
-Heading levels are :A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ ... :A - :C being part / section headings, followed by other heading levels, and 1 -6 being headings followed by substantive text or sub-headings. :A~ usually the title :A~? conditional level 1 heading (used where a stand-alone document may be imported into another)
-
-!_ :A~ [heading text]
-Top level heading [this usually has similar content to the title @title: ]
-NOTE: the heading levels described here are in 0.38 notation, see heading
-
-!_ :B~ [heading text]
-Second level heading [this is a heading level divider]
-
-!_ :C~ [heading text]
-Third level heading [this is a heading level divider]
-
-!_ 1~ [heading text]
-Top level heading preceding substantive text of document or sub-heading 2, the heading level that would normally be marked 1. or 2. or 3. etc. in a document, and the level on which sisu by default would break html output into named segments, names are provided automatically if none are given (a number), otherwise takes the form 1~my_filename_for_this_segment
-
-!_ 2~ [heading text]
-Second level heading preceding substantive text of document or sub-heading 3 , the heading level that would normally be marked 1.1 or 1.2 or 1.3 or 2.1 etc. in a document.
-
-!_ 3~ [heading text]
-Third level heading preceding substantive text of document, that would normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
-
-code{
-
-1~filename level 1 heading,
-
-% the primary division such as Chapter that is followed by substantive text, and may be further subdivided (this is the level on which by default html segments are made)
-
-}code
-
-2~ Font Attributes
-
-!_ markup example:
-
-code{
-
-normal text, *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}",
-^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
-
-normal text
-
-*{emphasis}* [note: can be configured to be represented by bold, italics or underscore]
-
-!{bold text}!
-
-/{italics}/
-
-_{underscore}_
-
-"{citation}"
-
-^{superscript}^
-
-,{subscript},
-
-+{inserted text}+
-
--{strikethrough}-
-
-#{monospace}#
-
-}code
-
-!_ resulting output:
-
-normal text, *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}",
-^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}#
-
-normal text
-
-*{emphasis}* [note: can be configured to be represented by bold, italics or underscore]
-
-!{bold text}!
-
-/{italics}/
-
-_{underscore}_
-
-"{citation}"
-
-^{superscript}^
-
-,{subscript},
-
-+{inserted text}+
-
--{strikethrough}-
-
-#{monospace}#
-
-2~ Indentation and bullets
-
-!_ markup example:
-
-code{
-
-ordinary paragraph
-
-_1 indent paragraph one step
-
-_2 indent paragraph two steps
-
-_9 indent paragraph nine steps
-
-}code
-
-!_ resulting output:
-
-ordinary paragraph
-
-_1 indent paragraph one step
-
-_2 indent paragraph two steps
-
-_9 indent paragraph nine steps
-
-!_ markup example:
-
-code{
-
-_* bullet text
-
-_1* bullet text, first indent
-
-_2* bullet text, two step indent
-
-}code
-
-!_ resulting output:
-
-_* bullet text
-
-_1* bullet text, first indent
-
-_2* bullet text, two step indent
-
-Numbered List (not to be confused with headings/titles, (document structure))
-
-!_ markup example:
-
-code{
-
-# numbered list numbered list 1., 2., 3, etc.
-
-_# numbered list numbered list indented a., b., c., d., etc.
-
-}code
-
-2~ Hanging Indents
-
-!_ markup example:
-
-code{
-
-_0_1 first line no indent,
-rest of paragraph indented one step
-
-_1_0 first line indented,
-rest of paragraph no indent
-
-in each case level may be 0-9
-
-}code
-
-!_ resulting output:
-
-_0_1 first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step; first line no indent, rest of paragraph indented one step;
-
-A regular paragraph.
-
-_1_0 first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent first line indented, rest of paragraph no indent
-
-in each case level may be 0-9
-
-_0_1 *{live-build}* A collection of scripts used to build customized Debian Livesystems. /{live-build}/ was formerly known as live-helper, and even earlier known as live-package.
-
-_0_1 *{live-build}* \\
-A collection of scripts used to build customized Debian Livesystems. /{live-build}/ was formerly known as live-helper, and even earlier known as live-package.
-
-2~ Footnotes / Endnotes
-
-Footnotes and endnotes are marked up at the location where they would be indicated within a text. They are automatically numbered. The output type determines whether footnotes or endnotes will be produced
-
-!_ markup example:
-
-code{
-
-~{ a footnote or endnote }~
-
-}code
-
-!_ resulting output:
-
-~{ a footnote or endnote }~
-
-!_ markup example:
-
-code{
-
-normal text~{ self contained endnote marker & endnote in one }~ continues
-
-}code
-
-!_ resulting output:
-
-normal text~{ self contained endnote marker & endnote in one }~ continues
-
-!_ markup example:
-
-code{
-
-normal text ~{* unnumbered asterisk footnote/endnote, insert multiple asterisks if required }~ continues
-
-normal text ~{** another unnumbered asterisk footnote/endnote }~ continues
-
-}code
-
-!_ resulting output:
-
-normal text ~{* unnumbered asterisk footnote/endnote, insert multiple asterisks if required }~ continues
-
-normal text ~{** another unnumbered asterisk footnote/endnote }~ continues
-
-!_ markup example:
-
-code{
-
-normal text ~[* editors notes, numbered asterisk footnote/endnote series ]~ continues
-
-normal text ~[+ editors notes, numbered asterisk footnote/endnote series ]~ continues
-
-}code
-
-!_ resulting output:
-
-normal text ~[* editors notes, numbered asterisk footnote/endnote series ]~ continues
-
-normal text ~[+ editors notes, numbered asterisk footnote/endnote series ]~ continues
-
-!_ Alternative endnote pair notation for footnotes/endnotes:
-
-code{
-
-% note the endnote marker "~^"
-
-normal text~^ continues
-
-^~ endnote text following the paragraph in which the marker occurs
-
-}code
-
-the standard and pair notation cannot be mixed in the same document
-
-2~ Links
-
-3~ Naked URLs within text, dealing with urls
-
-urls found within text are marked up automatically. A url within text is automatically hyperlinked to itself and by default decorated with angled braces, unless they are contained within a code block (in which case they are passed as normal text), or escaped by a preceding underscore (in which case the decoration is omitted).
-
-!_ markup example:
-
-code{
-
-normal text http://www.sisudoc.org/ continues
-
-}code
-
-!_ resulting output:
-
-normal text http://www.sisudoc.org/ continues
-
-An escaped url without decoration
-
-!_ markup example:
-
-code{
-
-normal text _http://www.sisudoc.org/ continues
-
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
-
-}code
-
-!_ resulting output:
-
-normal text _http://www.sisudoc.org/ continues
-
-deb _http://www.jus.uio.no/sisu/archive unstable main non-free
-
-where a code block is used there is neither decoration nor hyperlinking, code blocks are discussed later in this document
-
-!_ resulting output:
-
-code{
-
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
-
-}code
-
-3~link_text Linking Text
-
-To link text or an image to a url the markup is as follows
-
-!_ markup example:
-
-code{
-
-about { SiSU }http://url.org markup
-
-}code
-
-!_ resulting output:
-
-about { SiSU }http://www.sisudoc.org/ markup
-
-A shortcut notation is available so the url link may also be provided automatically as a footnote
-
-!_ markup example:
-
-code{
-
-about {~^ SiSU }http://url.org markup
-
-}code
-
-!_ resulting output:
-
-about {~^ SiSU }http://www.sisudoc.org/ markup
-
-Internal document links to a tagged location, including an ocn
-
-!_ markup example:
-
-code{
-
-about { text links }#link_text
-
-}code
-
-!_ resulting output:
-
-about { text links }#link_text
-
-Shared document collection link
-
-!_ markup example:
-
-code{
-
-about { SiSU book markup examples }:SiSU/examples.html
-
-}code
-
-!_ resulting output:
-
-about { SiSU book markup examples }:SiSU/examples.html
-
-3~ Linking Images
-
-!_ markup example:
-
-code{
-
-{ tux.png 64x80 }image
-
-% various url linked images
-
-{tux.png 64x80 "a better way" }http://www.sisudoc.org/
-
-{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
-
-{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
-}code
-
-!_ resulting output:
-
-{ tux.png 64x80 }image
-
-{tux.png 64x80 "Gnu/Linux - a better way" }http://www.sisudoc.org/
-
-{GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/
-
-{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/
-
-!_ linked url footnote shortcut
-
-code{
-
-{~^ [text to link] }http://url.org
-
-% maps to: { [text to link] }http://url.org ~{ http://url.org }~
-
-% which produces hyper-linked text within a document/paragraph, with an endnote providing the url for the text location used in the hyperlink
-
-}code
-
-code{
-
-text marker *~name
-
-}code
-
-note at a heading level the same is automatically achieved by providing names to headings 1, 2 and 3 i.e. 2~[name] and 3~[name] or in the case of auto-heading numbering, without further intervention.
-
-3~ Link shortcut for multiple versions of a sisu document in the same directory tree
-
-!_ markup example:
-
-code{
-
-!_ /{"Viral Spiral"}/, David Bollier
-
-{ "Viral Spiral", David Bollier [3sS]}viral_spiral.david_bollier.sst
-
-}code
-
-
-!_ /{"Viral Spiral"}/, David Bollier
-
-{ "Viral Spiral", David Bollier [3sS]}viral_spiral.david_bollier.sst
-
-2~ Grouped Text
-
-3~ Tables
-
-Tables may be prepared in two either of two forms
-
-!_ markup example:
-
-code{
-
-table{ c3; 40; 30; 30;
-
-This is a table
-this would become column two of row one
-column three of row one is here
-
-And here begins another row
-column two of row two
-column three of row two, and so on
-
-}table
-
-}code
-
-!_ resulting output:
-
-table{ c3; 40; 30; 30;
-
-This is a table
-this would become column two of row one
-column three of row one is here
-
-And here begins another row
-column two of row two
-column three of row two, and so on
-
-}table
-
-a second form may be easier to work with in cases where there is not much information in each column
-
-*{markup example:}*~{ Table from the Wealth of Networks by Yochai Benkler<br> http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler }~
-
-code{
-
-!_ Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
-
-{table~h 24; 12; 12; 12; 12; 12; 12;}
- |Jan. 2001|Jan. 2002|Jan. 2003|Jan. 2004|July 2004|June 2006
-Contributors* | 10| 472| 2,188| 9,653| 25,011| 48,721
-Active contributors** | 9| 212| 846| 3,228| 8,442| 16,945
-Very active contributors*** | 0| 31| 190| 692| 1,639| 3,016
-No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
-No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
-
-* Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
-
-}code
-
-!_ resulting output:
-
-
-!_ Table 3.1: Contributors to Wikipedia, January 2001 - June 2005
-
-{table~h 24; 12; 12; 12; 12; 12; 12;}
- |Jan. 2001|Jan. 2002|Jan. 2003|Jan. 2004|July 2004|June 2006
-Contributors* | 10| 472| 2,188| 9,653| 25,011| 48,721
-Active contributors** | 9| 212| 846| 3,228| 8,442| 16,945
-Very active contributors*** | 0| 31| 190| 692| 1,639| 3,016
-No. of English language articles| 25| 16,000| 101,000| 190,000| 320,000| 630,000
-No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,000|1,600,000
-
-* Contributed at least ten times; ** at least 5 times in last month; *** more than 100 times in last month.
-
-% code{
-
-% test
-
-% ~#
-
-% % unnumbered paragraph (place marker at end of paragraph)
-
-% -#
-
-% % unnumbered paragraph, delete when not required (place marker at end of paragraph) [used in dummy headings, eg. for segmented html]
-
-% % add a comment to text, that will be removed prior to processing (place marker at beginning of line)
-
-% }code
-
-3~ Poem
-
-!_ basic markup:
-
-code{
-
-poem{
-
- Your poem here
-
-}poem
-
-Each verse in a poem is given an object number.
-
-}code
-
-!_ markup example:
-
-code{
-
-poem{
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}poem
-
-}code
-
-!_ resulting output:
-
-poem{
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}poem
-
-3~ Group
-
-!_ basic markup:
-
-code{
-
-group{
-
- Your grouped text here
-
-}group
-
-A group is treated as an object and given a single object number.
-
-}code
-
-!_ markup example:
-
-code{
-
-group{
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}group
-
-}code
-
-!_ resulting output:
-
-group{
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}group
-
-3~ Code
-
-Code tags #{ code{ ... }code }# (used as with other group tags described above) are used to escape regular sisu markup, and have been used extensively within this document to provide examples of SiSU markup. You cannot however use code tags to escape code tags. They are however used in the same way as group or poem tags.
-
-A code-block is treated as an object and given a single object number. [an option to number each line of code may be considered at some later time]
-
-!_ use of code tags instead of poem compared, resulting output:
-
-code{
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}code
-
-From SiSU 2.7.7 on you can number codeblocks by placing a hash after the opening code tag #{ code{# }# as demonstrated here:
-
-code{#
-
- `Fury said to a
- mouse, That he
- met in the
- house,
- "Let us
- both go to
- law: I will
- prosecute
- YOU. --Come,
- I'll take no
- denial; We
- must have a
- trial: For
- really this
- morning I've
- nothing
- to do."
- Said the
- mouse to the
- cur, "Such
- a trial,
- dear Sir,
- With
- no jury
- or judge,
- would be
- wasting
- our
- breath."
- "I'll be
- judge, I'll
- be jury,"
- Said
- cunning
- old Fury:
- "I'll
- try the
- whole
- cause,
- and
- condemn
- you
- to
- death."'
-
-}code
-
-2~ Additional breaks - linebreaks within objects, column and page-breaks
-
-3~ line-breaks
-
-To break a line within a "paragraph object", two backslashes \\\\ \\ with a space before and a space or newline after them \\ may be used.
-
-code{
-
-To break a line within a "paragraph object",
-two backslashes \\ with a space before
-and a space or newline after them \\
-may be used.
-
-}code
-
-The html break br enclosed in angle brackets (though undocumented) is available in versions prior to 3.0.13 and 2.9.7 (it remains available for the time being, but is depreciated).
-
-3~ page breaks
-
-Page breaks are only relevant and honored in some output formats. A page break or a new page may be inserted manually using the following markup on a line on its own:
-
-code{
-
-<:pb>
-
-}code
-
-or
-
-code{
-
-<:pn>
-
-}code
-
-page new <:pn> breaks the page, starts a new page.
-
-page break <:pb> breaks a column, starts a new column, if using columns, else breaks the page, starts a new page.
-
-2~ Book index
-
-To make an index append to paragraph the book index term relates to it, using an equal sign and curly braces.
-
-Currently two levels are provided, a main term and if needed a sub-term. Sub-terms are separated from the main term by a colon.
-
-code{
-
- Paragraph containing main term and sub-term.
- ={Main term:sub-term}
-
-}code
-
-The index syntax starts on a new line, but there should not be an empty line between paragraph and index markup.
-
-The structure of the resulting index would be:
-
-code{
-
- Main term, 1
- sub-term, 1
-
-}code
-
-Several terms may relate to a paragraph, they are separated by a semicolon. If the term refers to more than one paragraph, indicate the number of paragraphs.
-
-code{
-
- Paragraph containing main term, second term and sub-term.
- ={first term; second term: sub-term}
-
-}code
-
-The structure of the resulting index would be:
-
-code{
-
- First term, 1,
- Second term, 1,
- sub-term, 1
-
-}code
-
-If multiple sub-terms appear under one paragraph, they are separated under the main term heading from each other by a pipe symbol.
-
-code{
-
- Paragraph containing main term, second term and sub-term.
- ={Main term:sub-term+1|second sub-term}
-
- A paragraph that continues discussion of the first sub-term
-
-}code
-
-The plus one in the example provided indicates the first sub-term spans one additional paragraph. The logical structure of the resulting index would be:
-
-code{
-
- Main term, 1,
- sub-term, 1-3,
- second sub-term, 1,
-
-}code
-
-1~ Composite documents markup
-
-It is possible to build a document by creating a master document that requires other documents. The documents required may be complete documents that could be generated independently, or they could be markup snippets, prepared so as to be easily available to be placed within another text. If the calling document is a master document (built from other documents), it should be named with the suffix *{.ssm}* Within this document you would provide information on the other documents that should be included within the text. These may be other documents that would be processed in a regular way, or markup bits prepared only for inclusion within a master document *{.sst}* regular markup file, or *{.ssi}* (insert/information) A secondary file of the composite document is built prior to processing with the same prefix and the suffix *{._sst}*
-
-basic markup for importing a document into a master document
-
-code{
-
-<< filename1.sst
-
-<< filename2.ssi
-
-}code
-
-The form described above should be relied on. Within the Vim editor it results in the text thus linked becoming hyperlinked to the document it is calling in which is convenient for editing.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup_syntax_history.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup_syntax_history.sst
deleted file mode 100644
index f0b621ff..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_markup_syntax_history.sst
+++ /dev/null
@@ -1,256 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Markup
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2008-05-22
- :modified: 2012-10-03
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :topic_register: electronic documents:SiSU:document:markup;SiSU:document:markup;SiSU:document:markup;SiSU:manual:markup;electronic documents:SiSU:manual:markup
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
-
-:A~? @title @creator
-
-1~syntax_history Markup Syntax History
-
-2~ Notes related to Files-types and Markup Syntax
-
-3.0 very minor additions to markup added, substantially the same as version 2.0
-
-2.0 introduced new headers and is therefore incompatible with 1.0 though otherwise the same with the addition of a couple of tags (i.e. a superset)
-
-0.38 is substantially current for version 1.0
-
-depreciated 0.16 supported, though file names were changed at 0.37
-
-_* sisu --query=[sisu version [0.38] or 'history]
-
-provides a short history of changes to SiSU markup
-
-!_ SiSU 2.0
-(2010-03-06:09/6)
-same as 1.0, apart from the changing of headers and the addition of a monospace tag related headers now grouped, e.g.
-
-code{
-
-@title:
- :subtitle:
-
-@creator:
- :author:
- :translator:
- :illustrator:
-
-@rights:
- :text:
- :illustrations:
-
-}code
-
-see document markup samples, and sisu --help headers
-
-the monospace tag takes the form of a hash '#'
-
-code{
-
-#{ this enclosed text would be monospaced }#
-
-}code
-
-!_ 1.0
-(2009-12-19:50/6)
-same as 0.69
-
-!_ 0.69
-(2008-09-16:37/2)
-(same as 1.0) and as previous (0.57) with the addition of book index tags
-
-code{
-
-/^={.+?}$/
-
-}code
-
-e.g. appended to a paragraph, on a new-line (without a blank line in between) logical structure produced assuming this is the first text "object"
-
-code{
-
- ={GNU/Linux community distribution:Debian+2|Fedora|Gentoo;Free Software Foundation+5}
-
-}code
-
-code{
-
-Free Software Foundation, 1-6
-GNU/Linux community distribution, 1
- Debian, 1-3
- Fedora, 1
- Gentoo,
-
-}code
-
-!_ 0.66
-(2008-02-24:07/7)
-same as previous, adds semantic tags, [experimental and not-used]
-
-code{
-
-/[:;]{.+?}[:;][a-z+]/
-
-}code
-
-!_ 0.57
-(2007w34/4)
-SiSU 0.57 is the same as 0.42 with the introduction of some a shortcut to use the headers @title and @creator in the first heading [expanded using the contents of the headers @title: and @author:]
-
-code{
-
-:A~ @title by @author
-
-}code
-
-!_ 0.52
-(2007w14/6)
-declared document type identifier at start of text/document:
-
-_1 SiSU 0.52
-
-or, backward compatible using the comment marker:
-
-_1 % SiSU 0.38
-
-variations include 'SiSU (text|master|insert) [version]' and 'sisu-[version]'
-
-!_ 0.51
-(2007w13/6)
-skins changed (simplified), markup unchanged
-
-!_ 0.42
-(2006w27/4)
-* (asterisk) type endnotes, used e.g. in relation to author
-
-SiSU 0.42 is the same as 0.38 with the introduction of some additional endnote types,
-
-Introduces some variations on endnotes, in particular the use of the asterisk
-
-code{
-
-~{* for example for describing an author }~ and ~{** for describing a second author }~
-
-}code
-
-* for example for describing an author
-
-** for describing a second author
-
-and
-
-code{
-
-~[* my note ]~ or ~[+ another note ]~
-
-}code
-
-which numerically increments an asterisk and plus respectively
-
-*1 my note
-+1 another note
-
-!_ 0.38
-(2006w15/7)
-introduced new/alternative notation for headers, e.g. @title: (instead of 0\~title), and accompanying document structure markup, :A,:B,:C,1,2,3 (maps to previous 1,2,3,4,5,6)
-
-SiSU 0.38 introduced alternative experimental header and heading/structure markers,
-
-code{
-
-@headername: and headers :A~ :B~ :C~ 1~ 2~ 3~
-
-}code
-
-as the equivalent of:
-
-code{
-
-0~headername and headers 1~ 2~ 3~ 4~ 5~ 6~
-
-}code
-
-The internal document markup of SiSU 0.16 remains valid and standard Though note that SiSU 0.37 introduced a new file naming convention
-
-SiSU has in effect two sets of levels to be considered, using 0.38 notation A-C headings/levels, pre-ordinary paragraphs /pre-substantive text, and 1-3 headings/levels, levels which are followed by ordinary text. This may be conceptualised as levels A,B,C, 1,2,3, and using such letter number notation, in effect: A must exist, optional B and C may follow in sequence (not strict) 1 must exist, optional 2 and 3 may follow in sequence i.e. there are two independent heading level sequences A,B,C and 1,2,3 (using the 0.16 standard notation 1,2,3 and 4,5,6) on the positive side: the 0.38 A,B,C,1,2,3 alternative makes explicit an aspect of structuring documents in SiSU that is not otherwise obvious to the newcomer (though it appears more complicated, is more in your face and likely to be understood fairly quickly); the substantive text follows levels 1,2,3 and it is 'nice' to do most work in those levels
-
-!_ 0.37
-(2006w09/7)
-introduced new file naming convention, .sst (text), .ssm (master), .ssi (insert), markup syntax unchanged
-
-SiSU 0.37 introduced new file naming convention, using the file extensions .sst .ssm and .ssi to replace .s1 .s2 .s3 .r1 .r2 .r3 and .si
-
-this is captured by the following file 'rename' instruction:
-
-code{
-
-rename 's/\.s[123]$/\.sst/' *.s{1,2,3}
-rename 's/\.r[123]$/\.ssm/' *.r{1,2,3}
-rename 's/\.si$/\.ssi/' *.si
-
-}code
-
-The internal document markup remains unchanged, from SiSU 0.16
-
-!_ 0.35
-(2005w52/3)
-sisupod, zipped content file introduced
-
-!_ 0.23
-(2005w36/2)
-utf-8 for markup file
-
-!_ 0.22
-(2005w35/3)
-image dimensions may be omitted if rmagick is available to be relied upon
-
-!_ 0.20.4
-(2005w33/4)
-header 0~links
-
-!_ 0.16
-(2005w25/2)
-substantial changes introduced to make markup cleaner, header 0\~title type, and headings [1-6]\~ introduced, also percentage sign (%) at start of a text line as comment marker
-
-SiSU 0.16 (0.15 development branch) introduced the use of
-
-the header 0~ and headings/structure 1~ 2~ 3~ 4~ 5~ 6~
-
-in place of the 0.1 header, heading/structure notation
-
-SiSU 0.1 headers and headings structure represented by
-header 0{~ and headings/structure 1{ 2{ 3{ 4{~ 5{ 6{
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_output_overview.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_output_overview.sst
deleted file mode 100644
index 2fc6cb3f..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_output_overview.sst
+++ /dev/null
@@ -1,161 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: SiSU overview of status of features available in various outputs
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2005-10-31
- :available: 2006-10-31
- :issued: 2006-10-31
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:markup table;SiSU:manual:output overview;electronic documents:SiSU:manual:output overview;SiSU:document:output overview;SiSU:document:output overview
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
-% :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU overview of status of features available in various outputs
-
-1~ A Checklist of Output Features
-
-% 2~ features available in various output types
-
-This table gives an indication of the features that are available
-for various forms of output of SiSU.
-
-!_ sisu-2.0.0 on 2010-03-06
-
-{table~h 28}
-feature |txt|ltx/pdf|HTML|EPUB|XML/s|XML/d|ODF|SQLite|pgSQL
-headings | * | * | * | * | * | * | * | * | *
-footnotes | * | * | * | * | * | * | * | * | *
-bold, underscore, italics | . | * | * | * | * | * | * | * | *
-strikethrough | . | * | * | * | * | * | * | |
-superscript, subscript | . | * | * | * | * | * | * | |
-extended ascii set (utf-8)| * | * | * | * | * | * | * | | *
-indents | * | * | * | * | * | * | * | |
-bullets | . | * | * | * | * | * | . | |
-groups | | | | | | | | |
-* tables | | * | * | * | . | . | . | . | .
-* poem | * | * | * | * | . | . | * | . | .
-* code | * | * | * | * | . | . | * | . | .
-url | * | * | * | * | * | * | * | . | .
-links | * | * | * | * | * | * | * | . | .
-images | - | * | * | * | T | T | * | T | T
-image caption | - | * | * | * | | | | |
-table of contents | | * | * | * | * | * | . | |
-page header/footer? | - | * | * | * | * | * | t | |
-line break | * | * | * | * | * | * | * | |
-page break | | * | | | | | * | |
-segments | | | * | * | | | | |
-skins | * | * | * | * | * | * | | |
-ocn | . | * | * | * | * | * | -?| * | *
-auto-heading numbers | * | * | * | * | * | * | * | * | *
-minor list numbering | * | * | * | * | * | * | * | * | *
-special characters | . | . | . | . | | | | |
-
-!_ sisu-1.0.0 on 2009-10-28
-
-{table~h 28}
-feature |txt|ltx/pdf|HTML|XML/s|XML/d|ODF|SQLite|pgSQL
-headings | * | * | * | * | * | * | * | *
-footnotes | * | * | * | * | * | * | * | *
-bold, underscore, italics | . | * | * | * | * | * | * | *
-strikethrough | . | * | * | * | * | * | |
-superscript, subscript | . | * | * | * | * | * | |
-extended ascii set (utf-8)| * | * | * | * | * | * | | *
-indents | * | * | * | * | * | * | |
-bullets | . | * | * | * | * | . | |
-groups | | | | | | | |
-* tables | | * | * | . | . | . | . | .
-* poem | * | * | * | . | . | * | . | .
-* code | * | * | * | . | . | * | . | .
-url | * | * | * | * | * | * | . | .
-links | * | * | * | * | * | * | . | .
-images | - | * | * | T | T | * | T | T
-image caption | - | * | * | | | | |
-table of contents | | * | * | * | * | . | |
-page header/footer? | - | * | * | * | * | t | |
-line break | * | * | * | * | * | * | |
-page break | | * | | | | * | |
-segments | | | * | | | | |
-skins | * | * | * | * | * | | |
-ocn | . | * | * | * | * | -?| * | *
-auto-heading numbers | * | * | * | * | * | * | * | *
-minor list numbering | * | * | * | * | * | * | * | *
-special characters | . | . | . | | | | |
-
-!_ sisu-0.36.6 on 2006-01-23
-
-{table~h 28; 8; 8; 8; 8; 8; 8; 8; 8; 8;}
-feature |txt|ltx/pdf|HTML|XHTML|XML/s|XML/d|ODF|SQLite|pgSQL
-headings | * | * | * | * | * | * | * | * | *
-footnotes | * | * | * | * | * | * | * | * | *
-bold, underscore, italics | . | * | * | * | * | * | * | * | *
-strikethrough | . | * | * | * | * | * | * | |
-superscript, subscript | . | * | * | * | * | * | * | |
-extended ascii set (utf-8)| * | * | * | * | * | * | * | | *
-indents | * | * | * | * | * | * | * | |
-bullets | . | * | * | * | * | * | . | |
-groups | | | | | | | | |
-* tables | | * | * | . | . | . | . | . | .
-* poem | * | * | * | . | . | . | * | . | .
-* code | * | * | * | . | . | . | * | . | .
-url | * | * | * | * | * | * | * | . | .
-links | * | * | * | * | * | * | * | . | .
-images | - | * | * | T | T | T | * | T | T
-image caption | - | * | * | | | | | |
-table of contents | | * | * | * | * | * | . | |
-page header/footer? | - | * | * | * | * | * | t | |
-line break | * | * | * | * | * | * | * | |
-page break | | * | | | | | * | |
-segments | | | * | | | | | |
-skins | * | * | * | * | * | * | | |
-ocn | . | * | * | * | * | * | -?| * | *
-auto-heading numbers | * | * | * | * | * | * | * | * | *
-minor list numbering | * | * | * | * | * | * | * | * | *
-special characters | . | . | . | | | | | |
-
-group{
-
- Done
- * yes/done
- . partial
-
- - not available/appropriate
-
- Not Done
- T task todo
- t lesser task/todo
- not done
-
-}group
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_postgresql.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_postgresql.sst
deleted file mode 100644
index 7987296d..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_postgresql.sst
+++ /dev/null
@@ -1,99 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Search
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :topic_register: electronic documents:SiSU:document:postgresql;SiSU:manual:postgresql;electronic documents:SiSU:manual:postgresql;SiSU:document:postgresql;SiSU:document:postgresql;
- :type: information
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: section=7; name=sisu - package to install what sisu needs to to populate a postgresql database (postgresql dependency component); synopsis=sisu -Dv [filename/wildcard ]\n sisu -Dv [instruction]
-
-:A~? @title @creator
-
-% :B~? SiSU Postgresql
-
-1~postgresql Postgresql
-
-2~ Name
-
-SiSU - Structured information, Serialized Units - a document publishing system, postgresql dependency package
-
-2~ Description
-
-Information related to using postgresql with sisu (and related to the sisu_postgresql dependency package, which is a dummy package to install dependencies needed for SiSU to populate a postgresql database, this being part of SiSU - man sisu).
-
-2~ Synopsis
-
-_1 sisu -D [instruction] [filename/wildcard if required]
-
-_1 sisu -D --pg --[instruction] [filename/wildcard if required]
-
-
-2~ Commands
-
-Mappings to two databases are provided by default, postgresql and sqlite, the same commands are used within sisu to construct and populate databases however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql, alternatively --sqlite or --pgsql may be used
-
-!_ -D or --pgsql
-may be used interchangeably.
-
-3~ create and destroy database
-
-!_ --pgsql --createall<br>
-initial step, creates required relations (tables, indexes) in existing (postgresql) database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi)
-
-!_ sisu -D --createdb<br>
-creates database where no database existed before
-
-!_ sisu -D --create<br>
-creates database tables where no database tables existed before
-
-!_ sisu -D --Dropall<br>
-destroys database (including all its content)! kills data and drops tables, indexes and database associated with a given directory (and directories of the same name).
-
-!_ sisu -D --recreate<br>
-destroys existing database and builds a new empty database structure
-
-3~ import and remove documents
-
-!_ sisu -D --import -v [filename/wildcard]<br>
-populates database with the contents of the file. Imports documents(s) specified to a postgresql database (at an object level).
-
-!_ sisu -D --update -v [filename/wildcard]<br>
-updates file contents in database
-
-!_ sisu -D --remove -v [filename/wildcard]<br>
-removes specified document from postgresql database.
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_quickstart.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_quickstart.sst
deleted file mode 100644
index 7f78e645..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_quickstart.sst
+++ /dev/null
@@ -1,275 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Quickstart, installation and use
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2006-09-06
- :available: 2006-09-06
- :issued: 2006-09-06
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:quickstart;SiSU:manual:quickstart;electronic documents:SiSU:manual:quickstart;SiSU:document:quickstart;SiSU:document:quickstart
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? Quickstart - SiSU installation and use
-
-1~ Quickstart - Getting Started Howto
-
-2~ Installation
-
-Installation is currently most straightforward and tested on the Debian platform, as there are packages for the installation of sisu and all requirements for what it does.
-
-3~ Debian Installation
-
-SiSU is available directly from the Debian Sid and testing archives (and possibly Ubuntu), assuming your /etc/apt/sources.list is set accordingly:
-
-code{
-
- aptitude update
- aptitude install sisu-complete
-
-}code
-
-The following /etc/apt/sources.list setting permits the download of additional markup samples:
-
-code{
-
-#/etc/apt/sources.list
-
- deb http://ftp.fi.debian.org/debian/ unstable main non-free contrib
- deb-src http://ftp.fi.debian.org/debian/ unstable main non-free contrib
-
-}code
-
-The aptitude commands become:
-
-code{
-
- aptitude update
- aptitude install sisu-complete sisu-markup-samples
-
-}code
-
-If there are newer versions of SiSU upstream of the Debian archives, they will be available by adding the following to your /etc/apt/sources.list
-
-code{
-
-#/etc/apt/sources.list
-
- deb http://www.jus.uio.no/sisu/archive unstable main non-free
- deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
-
-}code
-
-repeat the aptitude commands
-
-code{
-
- aptitude update
- aptitude install sisu-complete sisu-markup-samples
-
-}code
-
-Note however that it is not necessary to install sisu-complete if not all components of sisu are to be used. Installing just the package sisu will provide basic functionality.
-
-3~ RPM Installation
-
-RPMs are provided though untested, they are prepared by running alien against the source package, and against the debs.
-
-They may be downloaded from:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#rpm
-
-as root type:
-
-_1 rpm -i [rpm package name]
-
-3~ Installation from source
-
-To install SiSU from source check information at:
-
-_1 http://www.jus.uio.no/sisu/SiSU/download.html#current
-
-_* download the source package
-
-_* Unpack the source
-
-Two alternative modes of installation from source are provided, setup.rb (by Minero Aoki) and a rant(by Stefan Lang) built install file, in either case: the first steps are the same, download and unpack the source file:
-
-For basic use SiSU is only dependent on the programming language in which it is written Ruby, and SiSU will be able to generate html, EPUB, various XMLs, including ODF (and will also produce LaTeX). Dependencies required for further actions, though it relies on the installation of additional dependencies which the source tarball does not take care of, for things like using a database (postgresql or sqlite)~{ There is nothing to stop MySQL support being added in future. }~ or converting LaTeX to pdf.
-
-!_ setup.rb
-
-This is a standard ruby installer, using setup.rb is a three step process. In the root directory of the unpacked SiSU as root type:
-
-code{
-
- ruby setup.rb config
- ruby setup.rb setup
- #[and as root:]
- ruby setup.rb install
-
-}code
-
-further information on setup.rb is available from:
-
-_1 http://i.loveruby.net/en/projects/setup/
-
-_1 http://i.loveruby.net/en/projects/setup/doc/usage.html
-
-!_ "install"
-
-The "install" file provided is an installer prepared using "rant". In the root directory of the unpacked SiSU as root type:
-
-_1 ruby install base
-
-or for a more complete installation:
-
-_1 ruby install
-
-or
-
-_1 ruby install base
-
-This makes use of Rant (by Stefan Lang) and the provided Rantfile. It has been configured to do post installation setup setup configuration and generation of first test file. Note however, that additional external package dependencies, such as tetex-extra are not taken care of for you.
-
-Further information on "rant" is available from:
-
-_1 http://make.rubyforge.org/
-
-_1 http://rubyforge.org/frs/?group_id=615
-
-For a list of alternative actions you may type:
-
-_1 ruby install help
-
-_1 ruby install -T
-
-2~ Testing SiSU, generating output
-
-To check which version of sisu is installed:
-
-sisu -v
-
-Depending on your mode of installation one or a number of markup sample files may be found either in the directory:
-
-...
-
-or
-
-...
-
-change directory to the appropriate one:
-
-cd /usr/share/doc/sisu/markup-samples/samples
-
-3~ basic text, plaintext, html, XML, ODF, EPUB
-
-Having moved to the directory that contains the markup samples (see instructions above if necessary), choose a file and run sisu against it
-
-sisu -NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-this will generate html including a concordance file, opendocument text format, plaintext, XHTML and various forms of XML, and OpenDocument text
-
-3~ LaTeX / pdf
-
-Assuming a LaTeX engine such as tetex or texlive is installed with the required modules (done automatically on selection of sisu-pdf in Debian)
-
-Having moved to the directory that contains the markup samples (see instructions above if necessary), choose a file and run sisu against it
-
-sisu -pv free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-should generate most available output formats: html including a concordance file, opendocument text format, plaintext, XHTML and various forms of XML, and OpenDocument text and pdf
-
-3~ relational database - postgresql, sqlite
-
-Relational databases need some setting up - you must have permission to create the database and write to it when you run sisu.
-
-Assuming you have the database installed and the requisite permissions
-
-sisu --sqlite --recreate
-
-sisu --sqlite -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-sisu --pgsql --recreate
-
-sisu --pgsql -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst
-
-2~ Getting Help
-
-3~ The man pages
-
-Type:
-
-_1 man sisu
-
-The man pages are also available online, though not always kept as up to date as within the package itself:
-
-_* {~^ sisu.1 }http://www.jus.uio.no/sisu/man/sisu.1.html
-
-_* {~^ sisu.8 }http://www.jus.uio.no/sisu/man/sisu.8.html
-
-_* {~^ man directory }http://www.jus.uio.no/sisu/man
-
-3~ Built in help
-
-sisu --help
-
-sisu --help --env
-
-sisu --help --commands
-
-sisu --help --markup
-
-3~ The home page
-
-http://www.sisudoc.org/
-
-http://www.jus.uio.no/sisu
-
-http://www.jus.uio.no/sisu/SiSU
-
-2~ Markup Samples
-
-A number of markup samples (along with output) are available off:
-
-http://www.jus.uio.no/sisu/SiSU/examples.html
-
-Additional markup samples are packaged separately in the file:
-
-***
-
-On Debian they are available in non-free~{ the Debian Free Software guidelines require that everything distributed within Debian can be changed - and the documents are authors' works that while freely distributable are not freely changeable. }~ to include them it is necessary to include non-free in your /etc/apt/source.list or obtain them from the sisu home site.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_remote.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_remote.sst
deleted file mode 100644
index 042fd506..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_remote.sst
+++ /dev/null
@@ -1,107 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Remote Operations
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:remote;SiSU:manual:remote;electronic documents:SiSU:manual:remote;SiSU:document:remote;SiSU:document:remote
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Remote Operations
-
-1~remote_source Remote Source Documents
-
-SiSU processing instructions can be run against remote source documents by providing the url of the documents against which the processing instructions are to be carried out. The remote SiSU documents can either be sisu marked up files in plaintext .sst or .ssm or; zipped sisu files, sisupod.zip or filename.ssp
-
-!_ .sst / .ssm - sisu text files
-
-SiSU can be run against source text files on a remote machine, provide the processing instruction and the url. The source file and any associated parts (such as images) will be downloaded and generated locally.
-
-code{
-
-sisu -3 http://[provide url to valid .sst or .ssm file]
-
-}code
-
-Any of the source documents in the sisu examples page can be used in this way, see http://www.jus.uio.no/sisu/SiSU/examples.html and use the url to the .sst for the desired document.
-
-NOTE: to set up a remote machine to serve SiSU documents in this way, images should be in the directory relative to the document source ../_sisu/image
-
-!_ sisupod - zipped sisu files
-
-A sisupod is the zipped content of a sisu marked up text or texts and any other associated parts to the document such as images.
-
-SiSU can be run against a sisupod on a (local or) remote machine, provide the processing instruction and the url, the sisupod will be downloaded and the documents it contains generated locally.
-
-code{
-
-sisu -3 http://[provide url to valid sisupod.zip or .ssp file]
-
-}code
-
-Any of the source documents in the sisu examples page can be used in this way, see http://www.jus.uio.no/sisu/SiSU/examples.html and use the url for the desired document.
-
-:C~ Remote Document Output
-
-1~remote_output Remote Output
-
-Once properly configured SiSU output can be automatically posted once generated to a designated remote machine using either rsync, or scp.
-
-In order to do this some ssh authentication agent and keychain or similar tool will need to be configured. Once that is done the placement on a remote host can be done seamlessly with the -r (for scp) or -R (for rsync) flag, which may be used in conjunction with other processing flags, e.g.
-
-code{
-
-sisu -3R sisu_remote.sst
-
-}code
-
-2~ commands
-
-!_ -R [filename/wildcard] <br>
-copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync different if -R is used with other flags from if used alone. Alone the rsync --delete parameter is sent, useful for cleaning the remote directory (when -R is used together with other flags, it is not). Also see -r
-
-!_ -r [filename/wildcard] <br>
-copies sisu output files to remote host using scp. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Also see -R
-
-2~ configuration
-
-[expand on the setting up of an ssh-agent / keychain]
-
-1~remote_servers Remote Servers
-
-As SiSU is generally operated using the command line, and works within a Unix type environment, SiSU the program and all documents can just as easily be on a remote server, to which you are logged on using a terminal, and commands and operations would be pretty much the same as they would be on your local machine.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search.ssm b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search.ssm
deleted file mode 100644
index 316771a1..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search.ssm
+++ /dev/null
@@ -1,54 +0,0 @@
-% SiSU master 2.0
-
-@title: SiSU
- :subtitle: Search
-
-@creator:
- :author: Ralph Amissah
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :bold: /Gnu|Debian|Ruby|SiSU/
- :skin: skin_sisu_manual
-
-:A~? @title @creator
-
-:B~? SiSU Search
-
-<< sisu_search_intro.ssi
-
-<< sisu_sql.ssi
-
-<< sisu_postgresql.sst
-
-<< sisu_sqlite.sst
-
-<< sisu_search_cgi.ssi
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_intro.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_intro.ssi
deleted file mode 100644
index 7cb096f5..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_search_intro.ssi
+++ /dev/null
@@ -1,37 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Search
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Search
-
-1~search_intro SiSU Search - Introduction
-
-SiSU output can easily and conveniently be indexed by a number of standalone indexing tools, such as Lucene, Hyperestraier.
-
-Because the document structure of sites created is clearly defined, and the text object citation system is available hypothetically at least, for all forms of output, it is possible to search the sql database, and either read results from that database, or just as simply map the results to the html output, which has richer text markup.
-
-In addition to this SiSU has the ability to populate a relational sql type database with documents at an object level, with objects numbers that are shared across different output types, which make them searchable with that degree of granularity. Basically, your match criteria is met by these documents and at these locations within each document, which can be viewed within the database directly or in various output formats.
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_short_feature_summary.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_short_feature_summary.ssi
deleted file mode 100644
index c8099fb0..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_short_feature_summary.ssi
+++ /dev/null
@@ -1,81 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Summary of Features
-
-@creator:
- :author: Ralph Amissah
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? What is SiSU?
-
-:C~? Description
-
-1~sisu_feature_summary Summary of features
-
-_* sparse/minimal markup (clean utf-8 source texts). Documents are prepared in a single UTF-8 file using a minimalistic mnemonic syntax. Typical literature, documents like "War and Peace" require almost no markup, and most of the headers are optional.
-
-_* markup is easily readable/parsable by the human eye, (basic markup is simpler and more sparse than the most basic HTML), [this may also be converted to XML representations of the same input/source document].
-
-_* markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions. SiSU markup is primarily an abstraction of document structure and document metadata to permit taking advantage of the basic strengths of existing alternative practical standard ways of representing documents [be that browser viewing, paper publication, sql search etc.] (html, epub, xml, odf, latex, pdf, sql)
-
-_* for output produces reasonably elegant output of established industry and institutionally accepted open standard formats.[3] takes advantage of the different strengths of various standard formats for representing documents, amongst the output formats currently supported are:
-
-_1* html - both as a single scrollable text and a segmented document
-
-_1* xhtml
-
-_1* epub
-
-_1* XML - both in sax and dom style xml structures for further development as required
-
-_1* ODF - open document format, the iso standard for document storage
-
-_1* LaTeX - used to generate pdf
-
-_1* pdf (via LaTeX)
-
-_1* sql - population of an sql database, (at the same object level that is used to cite text within a document)
-
-Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content). (b) takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))
-
-_* ensuring content can be cited in a meaningful way regardless of selected output format. Online publishing (and publishing in multiple document formats) lacks a useful way of citing text internally within documents (important to academics generally and to lawyers) as page numbers are meaningless across browsers and formats. sisu seeks to provide a common way of pinpoint the text within a document, (which can be utilized for citation and by search engines). The outputs share a common numbering system that is meaningful (to man and machine) across all digital outputs whether paper, screen, or database oriented, (pdf, HTML, EPUB, xml, sqlite, postgresql), this numbering system can be used to reference content.
-
-_* Granular search within documents. SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperestraier].
-
-_* long term maintainability of document collections in a world of changing formats, having a very sparsely marked-up source document base. there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added. e.g. addition of odf (open document text) module in 2006, epub in 2009 and in future html5 output sometime in future, without modification of existing prepared texts
-
-_* SQL search aside, documents are generated as required and static once generated.
-
-_* documents produced are static files, and may be batch processed, this needs to be done only once but may be repeated for various reasons as desired (updated content, addition of new output formats, updated technology document presentations/representations)
-
-_* document source (plaintext utf-8) if shared on the net may be used as input and processed locally to produce the different document outputs
-
-_* document source may be bundled together (automatically) with associated documents (multiple language versions or master document with inclusions) and images and sent as a zip file called a sisupod, if shared on the net these too may be processed locally to produce the desired document outputs
-
-_* generated document outputs may automatically be posted to remote sites.
-
-_* for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, HTML, EPUB, XML, ODF, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to pdf, a latex processor like tetex or texlive.
-
-_* as a developers tool it is flexible and extensible
-
-Syntax highlighting for SiSU markup is available for a number of text editors.
-
-SiSU is less about document layout than about finding a way with little markup to be able to construct an abstract representation of a document that makes it possible to produce multiple representations of it which may be rather different from each other and used for different purposes, whether layout and publishing, or search of content
-
-i.e. to be able to take advantage from this minimal preparation starting point of some of the strengths of rather different established ways of representing documents for different purposes, whether for search (relational database, or indexed flat files generated for that purpose whether of complete documents, or say of files made up of objects), online viewing (e.g. html, xml, pdf), or paper publication (e.g. pdf)...
-
-the solution arrived at is by extracting structural information about the document (about headings within the document) and by tracking objects (which are serialized and also given hash values) in the manner described. It makes possible representations that are quite different from those offered at present. For example objects could be saved individually and identified by their hashes, with an index of how the objects relate to each other to form a document.
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_skin.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_skin.sst
deleted file mode 100644
index 02858593..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_skin.sst
+++ /dev/null
@@ -1,106 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Skins
-
-@creator:
- :author: Amissah, Ralph
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007, part of SiSU documentation, License GPL 3
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:skins;SiSU:manual:skins;electronic documents:SiSU:manual:skins;SiSU:document:skins;SiSU:document:skins
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-% used_by: sisu_manual.ssm SiSU.ssm
-
-@date:
- :published: 2007-09-16
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :modified: 2011-02-07
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-:A~? @title @creator
-
-:B~? Document Skins - configuration
-
-1~skins Skins
-
-% .SH "SKINS \- document, directory and site skins"
-
-Skins modify the default appearance of document output on a document, directory, or site wide basis. Skins are looked for in the following locations:
-
-_1 ./_sisu/skin
-
-_1 ~/.sisu/skin
-
-_1 /etc/sisu/skin
-
-!_ Within the skin directory
-are the following the default sub-directories for document skins:
-
-_1 ./skin/doc
-
-_1 ./skin/dir
-
-_1 ./skin/site
-
-A skin is placed in the appropriate directory and the file named skin_[name].rb
-
-The skin itself is a ruby file which modifies the default appearances set in the program.
-
-2~ Document Skin
-
-Documents take on a document skin, if the header of the document specifies a skin to be used.
-
-code{
-
-@skin: skin_united_nations
-
-}code
-
-2~ Directory Skin
-
-A directory may be mapped on to a particular skin, so all documents within that directory take on a particular appearance. If a skin exists in the skin/dir with the same name as the document directory, it will automatically be used for each of the documents in that directory, (except where a document specifies the use of another skin, in the skin/doc directory).
-
-A personal habit is to place all skins within the doc directory, and symbolic links as needed from the site, or dir directories as required.
-
-2~ Site Skin
-
-A site skin, modifies the program default skin.
-
-2~ Sample Skins
-
-With SiSU installed sample skins may be found in:
-
-_1 /etc/sisu/skin/doc and /usr/share/doc/sisu/markup-samples/samples/_sisu/skin/doc
-
-(or equivalent directory) and if sisu-markup-samples is installed also under:
-
-_1 /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/doc
-
-Samples of list.yml and promo.yml (which are used to create the right column list) may be found in:
-
-_1 /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/yml (or equivalent directory)
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sql.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sql.ssi
deleted file mode 100644
index 902a4a3b..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sql.ssi
+++ /dev/null
@@ -1,51 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: SQL and Search
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-:A~? @title @creator
-
-:B~? SiSU Search
-
-:C~? Search
-
-1~search_sql SQL
-
-2~ populating SQL type databases
-
-SiSU feeds sisu markupd documents into sql type databases PostgreSQL~{ http://www.postgresql.org/ <br> http://advocacy.postgresql.org/ <br> http://en.wikipedia.org/wiki/Postgresql }~ and/or SQLite~{ http://www.hwaci.com/sw/sqlite/ <br> http://en.wikipedia.org/wiki/Sqlite }~ database together with information related to document structure.
-
-This is one of the more interesting output forms, as all the structural data of the documents are retained (though can be ignored by the user of the database should they so choose). All site texts/documents are (currently) streamed to four tables:
-
-_1* one containing semantic (and other) headers, including, title, author, subject, (the Dublin Core...);
-
-_1* another the substantive texts by individual "paragraph" (or object) - along with structural information, each paragraph being identifiable by its paragraph number (if it has one which almost all of them do), and the substantive text of each paragraph quite naturally being searchable (both in formatted and clean text versions for searching); and
-
-_1* a third containing endnotes cross-referenced back to the paragraph from which they are referenced (both in formatted and clean text versions for searching).
-
-_1* a fourth table with a one to one relation with the headers table contains full text versions of output, eg. pdf, html, xml, and ascii.
-
-There is of course the possibility to add further structures.
-
-At this level SiSU loads a relational database with documents chunked into objects, their smallest logical structurally constituent parts, as text objects, with their object citation number and all other structural information needed to construct the document. Text is stored (at this text object level) with and without elementary markup tagging, the stripped version being so as to facilitate ease of searching.
-
-Being able to search a relational database at an object level with the SiSU citation system is an effective way of locating content generated by SiSU. As individual text objects of a document stored (and indexed) together with object numbers, and all versions of the document have the same numbering, complex searches can be tailored to return just the locations of the search results relevant for all available output formats, with live links to the precise locations in the database or in html/xml documents; or, the structural information provided makes it possible to search the full contents of the database and have headings in which search content appears, or to search only headings etc. (as the Dublin Core is incorporated it is easy to make use of that as well).
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sqlite.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sqlite.sst
deleted file mode 100644
index 3bb2e278..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_sqlite.sst
+++ /dev/null
@@ -1,99 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Sqlite / search
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:sqlite;SiSU:manual:sqlite;electronic documents:SiSU:manual:sqlite;SiSU:document:sqlite;SiSU:document:sqlite
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: section=7; name=sisu - package to install what sisu needs to to populate a postgresql database (postgresql dependency component); synopsis=sisu -dv [filename/wildcard ]\n sisu -dv [instruction]
-
-:A~? @title @creator
-
-% :B~? SiSU Sqlite
-
-1~sqlite Sqlite
-
-2~ Name
-
-SiSU - Structured information, Serialized Units - a document publishing system.
-
-
-2~ Description
-
-Information related to using sqlite with sisu (and related to the sisu_sqlite dependency package, which is a dummy package to install dependencies needed for SiSU to populate an sqlite database, this being part of SiSU - man sisu).
-
-2~ Synopsis
-
-_1 sisu -d [instruction] [filename/wildcard if required]
-
-_1 sisu -d --(sqlite|pg) --[instruction] [filename/wildcard if required]
-
-
-2~ Commands
-
-Mappings to two databases are provided by default, postgresql and sqlite, the same commands are used within sisu to construct and populate databases however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql, alternatively --sqlite or --pgsql may be used
-
-!_ -d or --sqlite
-may be used interchangeably.
-
-3~ create and destroy database
-
-!_ --sqlite --createall<br>
-initial step, creates required relations (tables, indexes) in existing (sqlite) database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi)
-
-!_ sisu -d --createdb<br>
-creates database where no database existed before
-
-!_ sisu -d --create<br>
-creates database tables where no database tables existed before
-
-!_ sisu -d --dropall<br>
-destroys database (including all its content)! kills data and drops tables, indexes and database associated with a given directory (and directories of the same name).
-
-!_ sisu -d --recreate<br>
-destroys existing database and builds a new empty database structure
-
-3~ import and remove documents
-
-!_ sisu -d --import -v [filename/wildcard]<br>
-populates database with the contents of the file. Imports documents(s) specified to an sqlite database (at an object level).
-
-!_ sisu -d --update -v [filename/wildcard]<br>
-updates file contents in database
-
-!_ sisu -d --remove -v [filename/wildcard]<br>
-removes specified document from sqlite database.
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_synopsis.ssi b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_synopsis.ssi
deleted file mode 100644
index 0c165f72..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_synopsis.ssi
+++ /dev/null
@@ -1,48 +0,0 @@
-% SiSU 3.0
-
-@title: SiSU
- :subtitle: Commands
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? SiSU Commands
-
-1~ Synopsis
-
-SiSU - Structured information, Serialized Units - a document publishing system
-
-sisu [ -abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9 ] [ filename/ wildcard ]
-
-sisu [ -Ddcv ] [ instruction ]
-
-sisu [ -CcFLSVvW ]
-
-Note: commands should be issued from within the directory that contains the marked up files, cd to markup directory.
-
-sisu is at version 2, version 3 is under development. To use sisu version 3
-
-sisu --v3 [and options/operations as above]
-
-or
-
-sisu3 [and options/operations as above]
-
-sisu version 1 has been discontinued.
-
-for settings see sisu --help env
-
-sisu [ filename/ wildcard] == sisu -0 [filename/wildcard]
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_syntax_highlighting.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_syntax_highlighting.sst
deleted file mode 100644
index ddca75ee..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_syntax_highlighting.sst
+++ /dev/null
@@ -1,174 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Syntax Highlighting
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:syntax highlighting;SiSU:manual:syntax highlighting;electronic documents:SiSU:manual:syntax highlighting;SiSU:document:syntax highlighting;SiSU:document:syntax highlighting
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu_manual
- :bold: /Gnu|Debian|Ruby|SiSU/
-
-:A~? @title @creator
-
-:B~? SiSU Syntax Highlighting
-
-1~ Editor Files, Syntax Highlighting
-
-The directory:
-
-_1 ./data/sisu/v2/conf/editor-syntax-etc/
-
-_1 ./data/sisu/v3/conf/editor-syntax-etc/
-
-_1 /usr/share/sisu/v2/conf/editor-syntax-etc
-
-_1 /usr/share/sisu/v3/conf/editor-syntax-etc
-
-contains rudimentary sisu syntax highlighting files for:
-
-_* (g)vim http://www.vim.org
-
-_1 package: sisu-vim
-
-status: largely done
-
-_1 there is a vim syntax highlighting and folds component
-
-_* gedit http://www.gnome.org/projects/gedit
-
-_* gobby http://gobby.0x539.de/
-
-_1 file: sisu.lang
-
-place in:
-
-_1 /usr/share/gtksourceview-1.0/language-specs
-
-or
-
-_1 ~/.gnome2/gtksourceview-1.0/language-specs
-
-_1 status: very basic syntax highlighting
-
-_1 comments: this editor features display line wrap and is used by Goby!
-
-_* nano http://www.nano-editor.org
-
-_1 file: nanorc
-
-save as:
-
-_1 ~/.nanorc
-
-_1 status: basic syntax highlighting
-
-_1 comments: assumes dark background; no display line-wrap; does line breaks
-
-_* diakonos (an editor written in ruby) http://purepistos.net/diakonos
-
-file: diakonos.conf
-
-save as:
-
-_1 ~/.diakonos/diakonos.conf
-
-includes:
-
-_1 status: basic syntax highlighting
-
-comments: assumes dark background; no display line-wrap
-
-_* kate & kwrite http://kate.kde.org
-
-_1 file: sisu.xml
-
-_1 place in:
-
-_2 /usr/share/apps/katepart/syntax
-
-_1 or
-
-_2 ~/.kde/share/apps/katepart/syntax
-
-_1 [settings::configure kate::{highlighting,filetypes}]
-
-_1 [tools::highlighting::{markup,scripts}::SiSU]
-
-% kde-config --prefix
-% KDEDIR/share/apps/katepart/syntax/
-% KDEHOME/share/apps/katepart/syntax
-% [In the configure dialog in kate, go to the "Editor->highlighting" page and
-% >select a highlight to change the mimetype/pattern associations for it.]
-% /etc/mime.types
-% /usr/share/mime/text
-
-_* nedit http://www.nedit.org
-
-_1 file: sisu_nedit.pats
-
-_1 nedit -import sisu_nedit.pats
-
-_1 status: a very clumsy first attempt [not really done]
-
-_1 comments: this editor features display line wrap
-
-_* emacs http://www.gnu.org/software/emacs/emacs.html
-
-_1 files: sisu-mode.el
-
-_1 to file ~/.emacs add the following 2 lines:
-
-_2 (add-to-list 'load-path "/usr/share/sisu/v2/conf/editor-syntax-etc/emacs")
-
-_2 (require 'sisu-mode.el)
-
-_1 [not done / not yet included]
-
-_* vim & gvim http://www.vim.org
-
-_1 files:
-
-_1 package is the most comprehensive sisu syntax highlighting and editor environment provided to date (is for vim/ gvim, and is separate from the contents of this directory)
-
-_1 status: this includes: syntax highlighting; vim folds; some error checking
-
-_1 comments: this editor features display line wrap
-
-NOTE:
-
-[SiSU parses files with long lines or line breaks, but, display linewrap (without line-breaks) is a convenient editor feature to have for sisu markup]
-
-% aeditor (an editor written in ruby)
-
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_webrick.sst b/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_webrick.sst
deleted file mode 100644
index 81401189..00000000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/sisu_webrick.sst
+++ /dev/null
@@ -1,93 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: sisu_webrick
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2007-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-@classify:
- :type: information
- :topic_register: electronic documents:SiSU:document:webrick;SiSU:manual:webrick;electronic documents:SiSU:manual:webrick;SiSU:document:webrick;SiSU:document:webrick
- :subject: ebook, epublishing, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, search
-
-@links:
- { SiSU Homepage }http://www.sisudoc.org/
- { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/
- { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html
- { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html
- { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html
- { SiSU Git repo }http://git.sisudoc.org/?p=code/sisu.git;a=summary
- { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/
- { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html
- { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
- { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU
-
-@make:
- :num_top: 1
- :breaks: new=C; break=1
- :skin: skin_sisu
- :bold: /Gnu|Debian|Ruby|SiSU/
- :manpage: section=7; name=sisu - documents: structuring, publishing in multiple formats, and search; synopsis=sisu -W
-
-:A~? @title @creator
-
-:B~? SiSU Webrick
-
-1~webrick sisu_webrick
-
-2~ Name
-
-SiSU - Structured information, Serialized Units - a document publishing system
-
-2~ Synopsis
-
-sisu_webrick [port]
-
-or
-
-sisu -W [port]
-
-2~ Description
-
-sisu_webrick is part of SiSU (man sisu) sisu_webrick starts Ruby's Webrick web-server and points it to the directories to which SiSU output is written, providing a list of these directories (assuming SiSU is in use and they exist).
-
-The default port for sisu_webrick is set to 8081, this may be modified in the yaml file: ~/.sisu/sisurc.yml a sample of which is provided as /etc/sisu/sisurc.yml (or in the equivalent directory on your system).
-
-2~ Summary of man page
-
-sisu_webrick, may be started on it's own with the command: sisu_webrick [port] or using the sisu command with the -W flag: sisu -W [port]
-
-where no port is given and settings are unchanged the default port is 8081
-
-2~ Document processing command flags
-
-sisu -W [port] starts Ruby Webrick web-server, serving SiSU output directories, on the port provided, or if no port is provided and the defaults have not been changed in ~/.sisu/sisurc.yaml then on port 8081
-
-2~ Further information
-
-For more information on SiSU see: http://www.sisudoc.org/ or http://www.jus.uio.no/sisu
-
-or man sisu
-
-2~ Author
-
-Ralph Amissah ralph@amissah.com or ralph.amissah@gmail.com
-
-2~ SEE ALSO
-
-_1 sisu(1)
-
-_1 sisu_vim(7)
-
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
deleted file mode 100644
index 0f3f4a16..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/Gnu_Debian_Linux_Ruby_Way_Better.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/b_doc.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/b_doc.png
deleted file mode 100644
index 13ca8ebe..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/b_doc.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Copyleft.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Copyleft.png
deleted file mode 100644
index 5b3865b8..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Copyleft.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Euro.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Euro.png
deleted file mode 100644
index 8e5c13a9..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/c_Euro.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/debian_home.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/debian_home.png
deleted file mode 100644
index cee42aa0..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/debian_home.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png
deleted file mode 100644
index 679c22a5..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_01_pdp_1_processor_with_kl_10.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png
deleted file mode 100644
index 9ed7b355..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/free_as_in_freedom_2_02_rms_st_ignucius.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/levitating_gnu.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/levitating_gnu.png
deleted file mode 100644
index 9a25319a..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/levitating_gnu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/philosophical_gnu.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/philosophical_gnu.png
deleted file mode 100644
index ebd239ef..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/philosophical_gnu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/sisu.png b/data/doc/sisu/markup-samples/v4/samples/_sisu/image/sisu.png
deleted file mode 100644
index b449fa6b..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/_sisu/image/sisu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/samples/sisu_output_overview.ssi b/data/doc/sisu/markup-samples/v4/samples/sisu_output_overview.ssi
deleted file mode 100644
index e2c90529..00000000
--- a/data/doc/sisu/markup-samples/v4/samples/sisu_output_overview.ssi
+++ /dev/null
@@ -1,61 +0,0 @@
-% @title: SiSU overview of status of features available in various outputs
-
-% @date.created: 2005-10-31
-
-% @date.available: 2006-10-31
-
-% @date.modified: 2006-01-23
-
-% @date: 2006-01-23
-
-% :A~? SiSU overview of status of features available in various outputs
-
-!_ A Checklist of Output Features
-
-This table gives an indication of the features that are available
-for various forms of output of SiSU.~{ updated for sisu-0.36.6 on 2006-01-23 }~
-
-{t~h}
-feature |txt|ltx/pdf|HTML|XHTML|XML/s|XML/d|ODF|SQLite|pgSQL
-headings | * | * | * | * | * | * | * | * | *
-footnotes | * | * | * | * | * | * | * | * | *
-bold, underscore, italics | . | * | * | * | * | * | * | * | *
-strikethrough | . | * | * | * | * | * | * | |
-superscript, subscript | . | * | * | * | * | * | * | |
-extended ascii set (utf-8)| * | * | * | * | * | * | * | | *
-indents | * | * | * | * | * | * | * | |
-bullets | . | * | * | * | * | * | . | |
-groups | | | | | | | | |
-* tables | | * | * | . | . | . | . | . | .
-* poem | * | * | * | . | . | . | * | . | .
-* code | * | * | * | . | . | . | * | . | .
-url | * | * | * | * | * | * | * | . | .
-links | * | * | * | * | * | * | * | . | .
-images | - | * | * | T | T | T | * | T | T
-image caption | - | * | * | | | | | |
-table of contents | | * | * | * | * | * | . | |
-page header/footer? | - | * | * | * | * | * | t | |
-line break | * | * | * | * | * | * | * | |
-page break | | * | | | | | * | |
-segments | | | * | | | | | |
-skins | * | * | * | * | * | * | | |
-ocn | . | * | * | * | * | * | -?| * | *
-auto-heading numbers | * | * | * | * | * | * | * | * | *
-minor list numbering | * | * | * | * | * | * | * | * | *
-special characters | . | . | . | | | | | |
-
-group{
-
- Done
- * yes/done
- . partial
-
- - not available/appropriate
-
- Not Done
- T task todo
- t lesser task/todo
- not done
-
-}group
-
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
deleted file mode 100644
index ce5b8830..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/GnuDebianLinuxRubyBetterWay.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/ruby_logo.png b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/ruby_logo.png
deleted file mode 100644
index 829e2458..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/ruby_logo.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.home.png b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.home.png
deleted file mode 100644
index b449fa6b..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.home.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.png b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.png
deleted file mode 100644
index b449fa6b..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/sisu.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/tux.png b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/tux.png
deleted file mode 100644
index 15fd152b..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/image/tux.png
+++ /dev/null
Binary files differ
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml
deleted file mode 100644
index 34d4a662..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/local/lib/sisu-cgi'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-# file_links: webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: 'sisu_processing'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
-# default: '-NQdhewpotbxXyYv' # includes verbose; -m would in any event be run by default
-# i: '-NQdhewpoty' # -m run by default
-# ii: '-NQdhewpotbxXy' # -m run by default
-# iii: '-NQdhewpotbxXyY' # -m run by default
-# iv: '-NQhewpotbxXYDy --update' # -m run by default
-# v: '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'a4,letter'
- #language: 'en'
- #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
- #texpdf_font_mono: 'Liberation Mono' #'Inconsolata'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #language: 'English'
- #emphasis: 'italics'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#sql database info, postgresql and sqlite
-db:
- postgresql:
- port: '5432' # '5432'
- #host: # '[if not localhost, provide host tcp/ip address or domain name]''
- #user: # '[(if different from user) provide username]'
- #password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filename
-
-permission_set:
- zap: true
- css_modify: true
- remote_base_site: true
-
-program_set:
- rmagick: true
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-
-#program_select:
-# editor: 'vim'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml
deleted file mode 100644
index 57440498..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/local/lib/sisu-cgi'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-# file_links: webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: 'sisu_processing'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
-# default: '-NQdhewpotbxXyYv' # includes verbose; -m would in any event be run by default
-# i: '-NQdhewpoty' # -m run by default
-# ii: '-NQdhewpotbxXy' # -m run by default
-# iii: '-NQdhewpotbxXyY' # -m run by default
-# iv: '-NQhewpotbxXYDy --update' # -m run by default
-# v: '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'a4,letter'
- #language: 'en'
- #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
- #texpdf_font_mono: 'Liberation Mono' #'Inconsolata'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #language: 'English'
- #emphasis: 'italics'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#sql database info, postgresql and sqlite
-db:
- postgresql:
- port: '5432' # '5432'
- #host: # '[if not localhost, provide host tcp/ip address or domain name]''
- #user: # '[(if different from user) provide username]'
- #password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filetype
-
-permission_set:
- zap: true
- css_modify: true
- remote_base_site: true
-
-program_set:
- rmagick: true
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-
-#program_select:
-# editor: 'vim'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml
deleted file mode 100644
index c9da8898..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: ralph@amissah.com
-# Description: Site wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/local/lib/sisu-cgi'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-# file_links: webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: 'sisu_processing'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
-# default: '-NQdhewpotbxXyYv' # includes verbose; -m would in any event be run by default
-# i: '-NQdhewpoty' # -m run by default
-# ii: '-NQdhewpotbxXy' # -m run by default
-# iii: '-NQdhewpotbxXyY' # -m run by default
-# iv: '-NQhewpotbxXYDy --update' # -m run by default
-# v: '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'a4,letter'
- #language: 'en'
- #texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
- #texpdf_font_mono: 'Liberation Mono' #'Inconsolata'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #language: 'English'
- #emphasis: 'italics'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#sql database info, postgresql and sqlite
-db:
- postgresql:
- port: '5432' # '5432'
- #host: # '[if not localhost, provide host tcp/ip address or domain name]''
- #user: # '[(if different from user) provide username]'
- #password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: language
-
-permission_set:
- zap: true
- css_modify: true
- remote_base_site: true
-
-program_set:
- rmagick: true
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-
-#program_select:
-# editor: 'vim'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_how.ssi b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_how.ssi
deleted file mode 100644
index 3372bcd4..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_how.ssi
+++ /dev/null
@@ -1,26 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: How Does SiSU Work?
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? Description
-
-1~sisu_how How does sisu work?
-
-SiSU markup is fairly minimalistic, it consists of: a (largely optional) document header, made up of information about the document (such as when it was published, who authored it, and granting what rights) and any processing instructions; and markup within the substantive text of the document, which is related to document structure and typeface. SiSU must be able to discern the structure of a document, (text headings and their levels in relation to each other), either from information provided in the document header or from markup within the text (or from a combination of both). Processing is done against an abstraction of the document comprising of information on the document's structure and its objects,[2] which the program serializes (providing the object numbers) and which are assigned hash sum values based on their content. This abstraction of information about document structure, objects, (and hash sums), provides considerable flexibility in representing documents different ways and for different purposes (e.g. search, document layout, publishing, content certification, concordance etc.), and makes it possible to take advantage of some of the strengths of established ways of representing documents, (or indeed to create new ones).
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_installation.ssi b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_installation.ssi
deleted file mode 100644
index f908bb6e..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_installation.ssi
+++ /dev/null
@@ -1,368 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Installation
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :published: 2007-09-16
- :created: 2002-11-12
- :issued: 2002-11-12
- :available: 2002-11-12
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? SiSU Installation notes
-
-:C~ Installation
-
-1~installation Installation
-
-See the {~^ download pages }http://www.jus.uio.no/sisu/SiSU/download.html for information related to installation.
-
-2~ Debian
-
-SiSU is developed on Debian, and packages are available for Debian that take care of the dependencies encountered on installation.
-
-The package is divided into the following components:
-
-_1 *sisu*, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies
-
-_1 *sisu-complete*, a dummy package that installs the whole of greater sisu as described below, apart from sisu-examples
-
-_1 *sisu-pdf*, dependencies used by sisu to produce pdf from LaTeX generated
-
-_1 *sisu-postgresql*, dependencies used by sisu to populate postgresql database (further configuration is necessary)
-
-_1 *sisu-remote*, dependencies used to place sisu output on a remote server (further configuration is necessary)
-
-_1 *sisu-sqlite*, dependencies used by sisu to populate sqlite database
-
-_1 *sisu-markup-samples*, sisu markup samples and other miscellany (under Debian Free Software Guidelines non-free)
-
-SiSU is available off { Debian Unstable and Testing }http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu&sourceid=mozilla-search ~{ http://packages.qa.debian.org/s/sisu.html }~ install it using apt-get, aptitude or alternative Debian install tools. SiSU is currently comprised of eight packages. *~apt-get
-
-Initial packaging is done here and to get the latest version of SiSU available you may add the following line(s) to your sources list: *~sources.list
-
-code{
-
-#/etc/apt/sources.list
-
-deb http://www.jus.uio.no/sisu/archive unstable main non-free
-deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
-
-}code
-
-The non-free section is for sisu markup samples provided, which contain authored works the substantive text of which cannot be changed, and which as a result do not meet the debian free software guidelines.
-
-On Debian there is little more to know beyond how to install software on Debian using apt, aptitude or synaptic.
-
-code{
-
-#Using aptitude:
-
- aptitude update
-
- aptitude install sisu-complete sisu-markup-samples
-
-}code
-
-code{
-
-Using apt-get
-
- apt-get update
-
- apt get install sisu-complete sisu-examples
-
-}code
-
-2~ Other Unix / Linux
-
-A source tarball or an rpms built using alien are available, (however dependencies have not been tested). SiSU is first packaged and tested with dependency handling for Debian.~{ Notes on dependencies are provided in the section that follows }~ Information on dependencies configured for Debian is provided as this may be of assistance.
-
-3~ source tarball
-
-!_ installation with provided install script
-
-To install SiSU, in the root directory of the unpacked SiSU _{as root type}_:~{ This makes use of rant and the provided Rantfile. Note however, that additional external package dependencies, such as tetex-extra are not taken care of for you. }~
-
-_1 ruby install
-
-Once installed see man 8 sisu for information on additional programs that sisu makes use of.
-
-Further notes on install script.
-
-The install script is prepared using Rant, and a Rantfile *~rant is provided,~{ a Rantfile has been configured to do post installation setup }~ with more comprehensive install options, and post install and setup configuration and generation of first test file, if you have installed Stefan Lang's {~^ Rant }http://make.rubyforge.org/ ~{ http://make.rubyforge.org/ <br> http://rubyforge.org/frs/?group_id=615 }~ installed. While in the package directory, type: rant help, or rant -T, or to install SiSU _{as root}_, type:
-
-*install* is an install script prepared using Stefan Lang's {~^ Rant }http://make.rubyforge.org/ ~{ http://make.rubyforge.org/ <br> http://rubyforge.org/frs/?group_id=615 }~ It should work whether you have previously installed Rant or not. It has fairly comprehensive install options, and can do some post install and setup configuration and generation of first test file. For options type:
-
-_1 ruby install -T
-
-To install as root type:
-
-_1 ruby install
-
-For a minimal install type:
-
-_1 ruby install base
-
-!_ installation with setup.rb
-
-{~^ setup.rb }http://i.loveruby.net/en/projects/setup/ is provided the package and will install SiSU~{ Minero Aoki<br> http://i.loveruby.net/en/projects/setup/doc/ }~ installation is a 3 step process~{ Installation instructions<br> http://i.loveruby.net/en/projects/setup/doc/usage.html }~ the following string assumes you are in the package directory and that you have root as sudo:
-
-_1 ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install
-
-!_ installation of rpm
-
-The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/programs/alien/ }~ Dependencies are not handled, not even that of the essential Ruby.
-
-1~install_dependencies_and_notes SiSU Components, Dependencies and Notes
-
-The dependency lists are from the Debian control file for SiSU version 0.36, and may assist in building SiSU on other distributions.
-
-2~ sisu
-
-_* the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies
-
-*Depends:* on ruby (>=1.8.2), libwebrick-ruby
-
-*Recommends:* sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl
-
-initialise directory
-
-_1 sisu -CC
-
-html
-
-_1 sisu -hv [filename/wildcard]
-
-_1 sisu -Hv [filename/wildcard]
-
-LaTeX (but sisu-pdf dependencies required to convert that to pdf)
-
-_1 sisu -pv [filename/wildcard]
-
-plain text Unix with footnotes
-
-_1 sisu -av [filename/wildcard]
-
-plain text Dos with footnotes
-
-_1 sisu -Av [filename/wildcard]
-
-plain text Unix with endnotes
-
-_1 sisu -ev [filename/wildcard]
-
-plain text Dos with endnotes
-
-_1 sisu -Ev [filename/wildcard]
-
-openoffice odt
-
-_1 sisu -ov [filename/wildcard]
-
-xhtml
-
-_1 sisu -bv [filename/wildcard]
-
-XML SAX
-
-_1 sisu -xv [filename/wildcard]
-
-XML DOM
-
-_1 sisu -Xv [filename/wildcard]
-
-wordmap (a rudimentary index of content)
-
-_1 sisu -wv [filename/wildcard]
-
-document content certificate
-
-_1 sisu -Nv [filename/wildcard]
-
-placement of sourcefile in output directory
-
-_1 sisu -sv [filename/wildcard]
-
-creation of source tarball with images, and placement of source tarball in ouput directory
-
-_1 sisu -Sv [filename/wildcard]
-
-manifest of output produced (polls output directory and provides links to existing output)
-
-_1 sisu -yv [filename/wildcard]
-
-url for output files -u -U
-
-_1 sisu -uv[and other flags] [filename/wildcard]
-
-_1 sisu -Uv [filename/wildcard]
-
-toggle screen colour
-
-_1 sisu -cv[and processing flags] [filename/wildcard]
-
-verbose mode
-
-_1 sisu -v[and processing flags] [filename/wildcard]
-
-_1 sisu -V[and processing flags] [filename/wildcard]
-
-quiet mode
-
-_1 sisu -q[and processing flags] [filename/wildcard]
-
-maintenance mode, intermediate files kept -M
-
-_1 sisu -Mv[and other flags] [filename/wildcard]
-
-[the -v is for verbose]
-
-start the webrick server
-
-_1 sisu -W
-
-2~ sisu-complete
-
-_* a dummy package that installs the whole SiSU, apart from sisu-examples
-
-*Depends:* ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite
-
-*Recommends:* sisu-examples
-
-2~ sisu-examples
-
-_* installs sisu markup samples and other miscelleny
-
-*Depends:* sisu
-
-2~ sisu-pdf
-
-_* dependencies used by sisu to produce pdf from LaTeX generated
-
-*Depends:* sisu, tetex-bin, tetex-extra, latex-ucs
-
-*Suggests:* evince, xpdf
-
-converts sisu LaTeX produced to pdf
-
-_1 sisu -pv [filename/wildcard]
-
-[the -v is for verbose]
-
-2~ sisu-postgresql
-
-_* dependencies used by sisu to populate postgresql database (further configuration is necessary)
-
-*Depends:* sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby
-
-*Suggests:* pgaccess, libdbd-pgsql, postgresql-contrib-8.1
-
-installs dependencies for sisu to work with and populate postgresql database
-
-create database
-
-_1 sisu -Dv createall
-
-drop database
-
-_1 sisu -Dv dropall
-
-import content
-
-_1 sisu -Div [filename/wildcard]
-
-_1 sisu -Dv import [filename/wildcard]
-
-update content
-
-_1 sisu -Duv [filename/wildcard]
-
-_1 sisu -Dv update [filename/wildcard]
-
-[the -v is for verbose]
-
-The following are available without installation of the sisu-postgresql component, but are of interest in this context
-
-generate a sample database query form for use with webserver on port 80
-
-_1 sisu -F
-
-or for use with webrick server
-
-_1 sisu -F webrick
-
-to start webrick server
-
-_1 sisu -W
-
-2~ sisu-remote
-
-_* dependencies used to place sisu output on a remote server (further configuration is necessary)
-
-scp
-
-_1 sisu -vr[and processing flags] [filename/wildcard]
-
-rsync
-
-_1 sisu -vR[and processing flags] [filename/wildcard]
-
-[the -v is for verbose]
-
-*Depends:* sisu, rsync, openssh-client|lsh-client, keychain
-
-2~ sisu-sqlite
-
-_* dependencies used by sisu to populate sqlite database
-
-*Depends:* sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby
-
-*Suggests:* libdbd-sqlite
-
-installs dependencies for sisu to work with and populate sqlite database
-
-create database
-
-_1 sisu -dv createall
-
-drop database
-
-_1 sisu -dv dropall
-
-update content
-
-_1 sisu -div [filename/wildcard]
-
-_1 sisu -dv import [filename/wildcard]
-
-update content
-
-_1 sisu -duv [filename/wildcard]
-
-_1 sisu -dv update [filename/wildcard]
-
-[the -v is for verbose]
-
-The following are available without installation of the sisu-sqlite component, but are of interest in this context
-
-generate a sample database query form for use with webserver on port 80
-
-_1 sisu -F
-
-or for use with webrick server
-
-_1 sisu -F webrick
-
-to start webrick server
-
-_1 sisu -W
-
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_interesting_to_whom.ssi b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_interesting_to_whom.ssi
deleted file mode 100644
index 750c46ea..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_interesting_to_whom.ssi
+++ /dev/null
@@ -1,32 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Who Might Be Interested?
-
-@creator:
- :author: Amissah, Ralph
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? Who might SiSU interest?
-
-1~sisu_interest Who might be interested in the SiSU feature set?
-
-SiSU is most likely to be of interest to people who are working with medium to large volumes of published texts that would like to have the presented in a uniform way that is searchable (either using sisu database integration or an appropriate indexing tool), with the possibility of multiple alternative output formats that may be added to and upgraded/updated over time. SiSU should be of interest to institutions/ organisations/ governments/ individuals with document collections and some technical knowhow that are interested in:
-
-_* long term maintenance and reducing downstream/future costs of maintaining those document sets for which SiSU is suited.
-
-_* the ability to output multiple standard format outputs for various purposes.
-
-_* the implications for search offered
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_cgi.ssi b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_cgi.ssi
deleted file mode 100644
index 03eef9ff..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_search_cgi.ssi
+++ /dev/null
@@ -1,75 +0,0 @@
-% SiSU insert 2.0
-
-@title: SiSU
- :subtitle: Search
-
-@creator:
- :author: Ralph Amissah
-
-@date:
- :published: 2007-09-16
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? SiSU Search
-
-:C~? CGI Search Form
-
-1~search_cgi Introduction
-
-2~ Search - database frontend sample, utilising database and SiSU features, including object citation numbering (backend currently PostgreSQL) *~search
-
-{~^ Sample search frontend }http://search.sisudoc.org
-A small database and sample query front-end (search from) that makes use of the citation system, _{object citation numbering}_ to demonstrates functionality.~{ (which could be extended further with current back-end). As regards scaling of the database, it is as scalable as the database (here Postgresql) and hardware allow. }~
-
-SiSU can provide information on which documents are matched and at what locations within each document the matches are found. These results are relevant across all outputs using object citation numbering, which includes html, XML, EPUB, LaTeX, PDF and indeed the SQL database. You can then refer to one of the other outputs or in the SQL database expand the text within the matched objects (paragraphs) in the documents matched.
-
-Note you may set results either for documents matched and object number locations within each matched document meeting the search criteria; or display the names of the documents matched along with the objects (paragraphs) that meet the search criteria.~{ of this feature when demonstrated to an IBM software innovations evaluator in 2004 he said to paraphrase: this could be of interest to us. We have large document management systems, you can search hundreds of thousands of documents and we can tell you which documents meet your search criteria, but there is no way we can tell you without opening each document where within each your matches are found. }~
-
-% Several options for output - select database to search, show results in index view (links to locations within text), show results with text, echo search in form, show what was searched, create and show a "canned url" for search, show available search fields. Also shows counters number of documents in which found and number of locations within documents where found. [could consider sorting by document with most occurrences of the search result].
-
-!_ sisu -F --webserv-webrick<br>
-builds a cgi web search frontend for the database created
-
-The following is feedback on the setup on a machine provided by the help command:
-
-_1 sisu --help sql
-
-code{
-
-Postgresql
- user: ralph
- current db set: SiSU_sisu
- port: 5432
- dbi connect: DBI:Pg:database=SiSU_sisu;port=5432
-
-sqlite
- current db set: /home/ralph/sisu_www/sisu/sisu_sqlite.db
- dbi connect DBI:SQLite:/home/ralph/sisu_www/sisu/sisu_sqlite.db
-
-}code
-
-Note on databases built
-
-By default, [unless otherwise specified] databases are built on a directory basis, from collections of documents within that directory. The name of the directory you choose to work from is used as the database name, i.e. if you are working in a directory called /home/ralph/ebook the database SiSU_ebook is used. [otherwise a manual mapping for the collection is necessary]
-
-2~ Search Form
-
-!_ sisu -F<br>
-generates a sample search form, which must be copied to the web-server cgi directory
-
-!_ sisu -F --webserv-webrick<br>
-generates a sample search form for use with the webrick server, which must be copied to the web-server cgi directory
-
-!_ sisu -W<br>
-starts the webrick server which should be available wherever sisu is properly installed
-
-The generated search form must be copied manually to the webserver directory as instructed
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_work_needed_and_wishlist.ssi
deleted file mode 100644
index 20e774ac..00000000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ /dev/null
@@ -1,59 +0,0 @@
-% SiSU 2.0
-
-@title: SiSU
- :subtitle: Work Needed and Wishlist
-
-@creator:
- :author: Ralph Amissah
-
-@date:
- :created: 2002-08-28
- :issued: 2002-08-28
- :available: 2002-08-28
- :published: 2007-09-16
- :modified: 2011-02-07
-
-@rights:
- :copyright: Copyright (C) Ralph Amissah 2007
- :license: GPL 3 (part of SiSU documentation)
-
-:A~? @title @creator
-
-:B~? Work Needed and Wishlist
-
-1~sisu_work_needed Work Needed
-
-SiSU is fairly mature and for most purposes the syntax and what it is supposed to do is clear. For the most part additions and changes are minor and backward compatible, (in particular there may be things of interest that to be able to achieve will require additions to the syntax).
-
-_* Amongst the most requested features is a way to represent and extract bibliographies from scholarly and other writings. This involves an extension of sisu markup syntax and a new module to extract the bibliography.
-
-_* Integration of postgresql tsearch2 / gin indexing, (which currently needs to be done manually, and) which has been waiting for the integration of tsearch2 / gin into Postgresql main, which is supposed to occur in Postgresql 8.3
-
-_* Internationalisation always. SiSU is utf-8 and for those parts that are utf-8 friendly will work out of the box - html and postgresql for example work out of the box (and for example comfortably represent Chinese text), LaTeX and odf do not work out of the box, they need additional work for extended language sets.
-
-_* Refinements and improvements to output representations, some are fairly mature, others (such as manpages and info files (and even ODF) remain young.
-
-_* Simple extension to contain, link and share included audio and multi-media files, (including sisupod.zip)
-
-1~sisu_wishlist Wishlist
-
-SiSU provides a lot of "plumbing" and is readily usable as a tool by those comfortable with marking up documents with an editor. The syntax is fairly easy to learn, especially the subset required to start using SiSU effectively.
-
-SiSU might also be of interest to developers interested in:
-
-_* experimenting with the search implications offered
-
-_* producing additional output formats
-
-_* producing conversion tools
-
-_* producing input interfaces, (experimenting with additional interfaces for producing sisu source documents)
-
-Several tools that are of interest would come under the heading interface and conversion. Amongst others, the following are of interest:
-
-_* Converters from various document formats, such as Open Document Text (ODF), MS Word(TM) and Word Perfect(TM), even html. The problem here is one of the most important things for SiSU is to be able to recognise the structure of a document, and many documents prepared in other formats have not been prepared strictly with a view to representing structure, but appearance - so heading levels may be "painted" to look right rather than have the correct structural representation. Even if conversion is not perfect this may serve as a first step in assisting in conversion of documents to SiSU for those with legacy document sets that they would like to have in sisu format. (once in SiSU it is easier to get out in various other formats as this is what sisu does, within the constraints of the information that sisu uses to generate output)
-
-_* The possibility to save directly from from various word processors, and possibly templates within them to assist in making sure the document structure is "understood" by SiSU.
-
-_* Web interface/front-end, a form like front end for the writing or submission of sisu documents to a server which uses SiSU to generate output. Headers could be made available as separate small entry forms with help provided to explain where they might be used. Apart from the most important headers such as title, author, date and possibly subject the remainder of the header forms could be placed after the form for substantive content. This would offer a more Web 2.0 like approach to the use of SiSU and the possibility of using it for collaborative editing of content (possibly for documents that are to be finalised/published as the citation system is most suited to published works). [Collaborative editing is currently possible through use of a collaborative editor such as Gobby which makes use of the Obby protocol].
-
diff --git a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
index d5fda20d..e123734f 100644
--- a/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
+++ b/data/doc/sisu/sisu_user_txt/configuration_sisurc.txt
@@ -8,7 +8,7 @@ be modified in sisurc.yml
sisurc.yml can be located in one of the following locations:
/etc/sisu/sisurc.yml ~/.sisu/sisurc.yml and ./_sisu/sisurc.yml
-and if sisu versions 2 and 3 are both in use, the v2 sisurc.yml can be placed a the
+and if sisu versions 4 and 5 are both in use, the v2 sisurc.yml can be placed a the
following locations:
-/etc/sisu/v2/sisurc.yml ~/.sisu/v2/sisurc.yml and ./_sisu/v2/sisurc.yml
-/etc/sisu/v3/sisurc.yml ~/.sisu/v3/sisurc.yml and ./_sisu/v3/sisurc.yml
+/etc/sisu/v4/sisurc.yml ~/.sisu/v4/sisurc.yml and ./_sisu/v4/sisurc.yml
+/etc/sisu/v5/sisurc.yml ~/.sisu/v5/sisurc.yml and ./_sisu/v5/sisurc.yml
diff --git a/data/doc/sisu/sisu_user_txt/configuration_skin.txt b/data/doc/sisu/sisu_user_txt/configuration_skin.txt
deleted file mode 100644
index 2695dda8..00000000
--- a/data/doc/sisu/sisu_user_txt/configuration_skin.txt
+++ /dev/null
@@ -1,15 +0,0 @@
- index.txt
- configuration.txt
-%% skin ------------------------------------------------------------------------
-
-skins can be used to modify the appearance of output
-
-[provide information]
-
-%% css ------------------------------------------------------------------------
-
-the default css may be replaced for the site or particular processing
-directories
-
-[provide information]
-
diff --git a/data/sisu/v3/conf/cgi-bin/sisu_search_pgsql.cgi b/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
index c196c756..c196c756 100644
--- a/data/sisu/v3/conf/cgi-bin/sisu_search_pgsql.cgi
+++ b/data/sisu/conf/cgi-bin/sisu_search_pgsql.cgi
diff --git a/data/sisu/v3/conf/cgi-bin/sisu_search_sqlite.cgi b/data/sisu/conf/cgi-bin/sisu_search_sqlite.cgi
index 34bb3748..34bb3748 100644
--- a/data/sisu/v3/conf/cgi-bin/sisu_search_sqlite.cgi
+++ b/data/sisu/conf/cgi-bin/sisu_search_sqlite.cgi
diff --git a/data/sisu/v3/conf/completion/README b/data/sisu/conf/completion/README
index d723a140..d723a140 100644
--- a/data/sisu/v3/conf/completion/README
+++ b/data/sisu/conf/completion/README
diff --git a/data/sisu/v3/conf/completion/_sisu b/data/sisu/conf/completion/_sisu
index 076795cb..076795cb 100644
--- a/data/sisu/v3/conf/completion/_sisu
+++ b/data/sisu/conf/completion/_sisu
diff --git a/data/sisu/v3/conf/convert/kdissert_to_sisu b/data/sisu/conf/convert/kdissert_to_sisu
index 35921c3e..35921c3e 100644
--- a/data/sisu/v3/conf/convert/kdissert_to_sisu
+++ b/data/sisu/conf/convert/kdissert_to_sisu
diff --git a/data/sisu/v3/conf/convert/modify.rb b/data/sisu/conf/convert/modify.rb
index 8a4b9074..8a4b9074 100644
--- a/data/sisu/v3/conf/convert/modify.rb
+++ b/data/sisu/conf/convert/modify.rb
diff --git a/data/sisu/v3/conf/convert/sisu_convert b/data/sisu/conf/convert/sisu_convert
index a3a12189..a3a12189 100644
--- a/data/sisu/v3/conf/convert/sisu_convert
+++ b/data/sisu/conf/convert/sisu_convert
diff --git a/data/sisu/v3/conf/convert/wvHtml.xml b/data/sisu/conf/convert/wvHtml.xml
index 3cc9dd29..3cc9dd29 100644
--- a/data/sisu/v3/conf/convert/wvHtml.xml
+++ b/data/sisu/conf/convert/wvHtml.xml
diff --git a/data/sisu/v3/conf/convert/wvSiSU.xml b/data/sisu/conf/convert/wvSiSU.xml
index 271b00ff..271b00ff 100644
--- a/data/sisu/v3/conf/convert/wvSiSU.xml
+++ b/data/sisu/conf/convert/wvSiSU.xml
diff --git a/data/sisu/v3/conf/editor-syntax-etc/README b/data/sisu/conf/editor-syntax-etc/README
index c03f3569..c03f3569 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/README
+++ b/data/sisu/conf/editor-syntax-etc/README
diff --git a/data/sisu/v3/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
index a3c3afe4..a3c3afe4 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ b/data/sisu/conf/editor-syntax-etc/diakonos/diakonos.conf
diff --git a/data/sisu/v3/conf/editor-syntax-etc/emacs/README b/data/sisu/conf/editor-syntax-etc/emacs/README
index 24816c1e..24816c1e 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/emacs/README
+++ b/data/sisu/conf/editor-syntax-etc/emacs/README
diff --git a/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
index e738d4b2..fe0476fd 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -4,7 +4,7 @@
;; @Version: 4.0.8 2013-02-17 (3.0.7 2011-04-20) (2008-12-14)
;; [3.0.7 2011-04-20 Ambrose Kofi Laing & Ralph Amissah]
;; [4.0.9 2013-02-22 Ralph Amissah]
-;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
+;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS)
;; @License: GPLv3
;; @Home URL: SiSU: http://www.jus.uio.no/sisu
diff --git a/data/sisu/v3/conf/editor-syntax-etc/gedit/sisu.lang b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
index b82d5f80..b82d5f80 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/gedit/sisu.lang
+++ b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang
diff --git a/data/sisu/v3/conf/editor-syntax-etc/kate/sisu.xml b/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
index a8054f2d..a8054f2d 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/kate/sisu.xml
+++ b/data/sisu/conf/editor-syntax-etc/kate/sisu.xml
diff --git a/data/sisu/v3/conf/editor-syntax-etc/nano/nanorc b/data/sisu/conf/editor-syntax-etc/nano/nanorc
index 30ba439c..30ba439c 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/nano/nanorc
+++ b/data/sisu/conf/editor-syntax-etc/nano/nanorc
diff --git a/data/sisu/v3/conf/editor-syntax-etc/nedit/sisu_nedit.pats b/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats
index ef01b2be..ef01b2be 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/nedit/sisu_nedit.pats
+++ b/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/8.vim
index 15c4776e..29145510 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/8.vim
@@ -2,7 +2,7 @@
" Name: 8
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes frugal & sparse
:set background=dark
:hi clear
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim
index a3fdfb44..f59a2b8e 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim
@@ -2,7 +2,7 @@
" Name: def-ruby
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def-ruby.vim;hb=HEAD>
" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
" (with occasional other colors selected from 256 color palate)
" .Xdefaults tweaking to make identical to def (256) provided,
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim
index e0067507..14178dc4 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim
@@ -2,7 +2,7 @@
" Name: def-sisu
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def-sisu.vim;hb=HEAD>
" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
" (with occasional other colors selected from 256 color palate)
" .Xdefaults tweaking to make identical to def (256) provided,
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim
index 20bd9dde..f7d6282c 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def.vim
@@ -2,7 +2,7 @@
" Name: def
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def.vim;hb=HEAD>
" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
" (with occasional other colors selected from 256 color palate)
" .Xdefaults tweaking to make identical to def (256) provided,
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
index 59f17ce1..09b8a3ce 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
@@ -2,7 +2,7 @@
" Name: def256-ruby
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def256-ruby.vim;hb=HEAD>
" Note: based on colorscheme defx, this scheme has 256 colors
" selected primarily from 16 colors around the colors available
" for 16 color cterm (with occasional other colors selected
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
index 2866c820..d2cd7295 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
@@ -2,7 +2,7 @@
" Name: def256-sisu
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def256-sisu.vim;hb=HEAD>
" Note: based on colorscheme defx, this scheme has 256 colors
" selected primarily from 16 colors around the colors available
" for 16 color cterm (with occasional other colors selected
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim
index bbafc3cc..334c2b01 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim
@@ -2,7 +2,7 @@
" Name: def256
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-14
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/def256.vim;hb=HEAD>
" Note: based on colorscheme defx, this scheme has 256 colors
" selected primarily from 16 colors around the colors available
" for 16 color cterm (with occasional other colors selected
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index 6240330d..b09b4664 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -2,7 +2,7 @@
" Name: frugal-cterm-ruby
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & sparse
:set background=dark
:hi clear
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index 1c4d2d6b..fee4ce6d 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -2,7 +2,7 @@
" Name: frugal-cterm-sisu
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & sparse
:set background=dark
:hi clear
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
index 39b929a1..347705cf 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
@@ -2,7 +2,7 @@
" Name: frugal-cterm
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & sparse
" http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
" http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal.vim
index 1677ae0e..659dc289 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -2,7 +2,7 @@
" Name: frugal
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & sparse
:set background=dark
:hi clear
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim
index 14731b2d..8e3d00a1 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -2,7 +2,7 @@
" Name: Slate
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
" Notes: cterm now uses frugal-sisu 8 colors for term
" (for gui originally looked at desert Hans Fugal <hans@fugal.net>
" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 8bd1dfa8..54b966d2 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -2,7 +2,7 @@
" Name: sparse-cterm-ruby
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & frugal
:set background=dark
:hi clear
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 4de32515..ff83bdc2 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -2,7 +2,7 @@
" Name: sparse-cterm-sisu
" Maintainer: Ralph Amissah <ralph@amissah.com>
" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
" Note: 8 color cterm, related colorschemes 8 & frugal
:set background=dark
:hi clear
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/filetype.vim b/data/sisu/conf/editor-syntax-etc/vim/filetype.vim
index 917c3e04..917c3e04 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/filetype.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/filetype.vim
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index a72251da..a72251da 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
index d21d04f3..1d5a0748 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -2,7 +2,7 @@
" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
" SiSU Markup: SiSU (sisu-4.0.9)
" Last Change: 2013-02-22
-" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
+" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
"(originally looked at Ruby Vim by Mirko Nasato)
if version < 600
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssi.tpl b/data/sisu/conf/editor-syntax-etc/vim/templates/ssi.tpl
index a101dee6..a101dee6 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssi.tpl
+++ b/data/sisu/conf/editor-syntax-etc/vim/templates/ssi.tpl
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssm.tpl b/data/sisu/conf/editor-syntax-etc/vim/templates/ssm.tpl
index cbda5053..cbda5053 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/ssm.tpl
+++ b/data/sisu/conf/editor-syntax-etc/vim/templates/ssm.tpl
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/sst.tpl b/data/sisu/conf/editor-syntax-etc/vim/templates/sst.tpl
index dd19efb4..dd19efb4 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/templates/sst.tpl
+++ b/data/sisu/conf/editor-syntax-etc/vim/templates/sst.tpl
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/vim-sisu.yaml b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
index ca665bc8..ca665bc8 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/vim-sisu.yaml
+++ b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml
diff --git a/data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu b/data/sisu/conf/lighttpd/lighttpd.cfg.sisu
index 6647de9f..6647de9f 100644
--- a/data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu
+++ b/data/sisu/conf/lighttpd/lighttpd.cfg.sisu
diff --git a/data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu_www b/data/sisu/conf/lighttpd/lighttpd.cfg.sisu_www
index 0dd16c94..0dd16c94 100644
--- a/data/sisu/v3/conf/lighttpd/lighttpd.cfg.sisu_www
+++ b/data/sisu/conf/lighttpd/lighttpd.cfg.sisu_www
diff --git a/data/sisu/v3/conf/ruby/irbrc b/data/sisu/conf/ruby/irbrc
index cceffdfc..cceffdfc 100644
--- a/data/sisu/v3/conf/ruby/irbrc
+++ b/data/sisu/conf/ruby/irbrc
diff --git a/data/sisu/image/DebTuxRubySiSU.png b/data/sisu/image/DebTuxRubySiSU.png
deleted file mode 100644
index 06109cd9..00000000
--- a/data/sisu/image/DebTuxRubySiSU.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/image/arrow_next_blue.png b/data/sisu/image/arrow_next_blue.png
deleted file mode 100644
index 64e126bd..00000000
--- a/data/sisu/image/arrow_next_blue.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/image/arrow_prev_blue.png b/data/sisu/image/arrow_prev_blue.png
deleted file mode 100644
index 3e8f12fe..00000000
--- a/data/sisu/image/arrow_prev_blue.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/image/arrow_up_blue.png b/data/sisu/image/arrow_up_blue.png
deleted file mode 100644
index 2db1ce62..00000000
--- a/data/sisu/image/arrow_up_blue.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/image/c_Copyleft.png b/data/sisu/image/c_Copyleft.png
deleted file mode 100644
index 5b3865b8..00000000
--- a/data/sisu/image/c_Copyleft.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/image/c_Euro.png b/data/sisu/image/c_Euro.png
deleted file mode 100644
index 8e5c13a9..00000000
--- a/data/sisu/image/c_Euro.png
+++ /dev/null
Binary files differ
diff --git a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
deleted file mode 100644
index 84e7cbef..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ /dev/null
@@ -1,368 +0,0 @@
-;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
-;; @Author: Ambrose Kofi Laing & Ralph Amissah
-;; @Keywords: text, syntax, processes, tools
-;; @Version: 3.0.7 2011-04-20 (2008-12-14)
-;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
-;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS)
-;; @License: GPLv3
-;; @Home URL: SiSU: http://www.jus.uio.no/sisu
-;; originally looked at (based on) doc-mode, with kind permission of the author
-;; Author: SUN, Tong <suntong001@users.sf.net>, (c)2001-6, all right reserved
-;; Version: $Date: 2006/01/19 03:13:41 $ $Revision: 1.14 $
-;; Home URL: http://xpt.sourceforge.net/
-;;
-;; Distribute freely, but please include the author's info & copyright,
-;; the file's version & url with the distribution.
-;;
-; Viva Software Libre!
-;; Support the free software movement!
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;{{{ Commentary:
-
-;;
-;; To enter sisu-mode automatically, add (autoload 'sisu-mode "sisu-mode")
-;; to your .emacs file and change the first line of your sisu file to:
-;; # -*- Sisu -*-
-;; if it doesn't have a .sisu extension.
-;;
-;; To handle .sisu files, e.g., 'filename.sisu', add something like
-;; (add-to-list 'auto-mode-alist '("\\.sisu$" . sisu-mode))
-;; to your .emacs file
-
-;;
-;; The documentation for the "Structure Of The Hierarchy Text" can be found in
-;; the sisustring for the sisu-mode function.
-;;
-
-;;}}}
-
-;;{{{ Variables:
-
-(defgroup sisu-faces nil
- "AsciiSisu highlighting"
- :group 'sisus)
-
-;; == Colors
-; color n is more prominent than color n+1
-
-(defface sisu-title-1-face
- `((((class color)
- (background dark))
- (:foreground "brown3" :bold t :height 1.2 :inherit variable-pitch))
- (((class color)
- (background light))
- (:foreground "brown3" :bold t :height 1.2 :inherit variable-pitch))
- (t (:weight bold :inherit variable-pitch)))
- "Face for AsciiSisu titles at level 1."
- :group 'sisu-faces)
-
-(defface sisu-title-2-face
- `((((class color)
- (background dark))
- (:foreground "yellow4" :bold t :height 1.1 :inherit variable-pitch))
- (((class color)
- (background light))
- (:foreground "yellow4" :bold t :height 1.1 :inherit variable-pitch))
- (t (:weight bold :inherit variable-pitch)))
- "Face for AsciiSisu titles at level 2."
- :group 'sisu-faces)
-
-(defface sisu-title-3-face
- `((((class color)
- (background dark))
- (:foreground "sienna3" :bold t))
- (((class color)
- (background light))
- (:foreground "sienna3" :bold t))
- (t (:weight bold)))
- "Face for AsciiSisu titles at level 3."
- :group 'sisu-faces)
-
-(defface sisu-title-4-face
- `((((class color)
- (background dark))
- (:foreground "burlywood3"))
- (((class color)
- (background light))
- (:foreground "burlywood3"))
- (t ()))
- "Face for AsciiSisu titles at level 4."
- :group 'sisu-faces)
-
-(defface info-node
- '((((class color) (background light)) (:foreground "brown" :bold t :italic t))
- (((class color) (background dark)) (:foreground "white" :bold t :italic t))
- (t (:bold t :italic t)))
- "Face for Info node names."
- :group 'sisu-faces)
-
-(defvar sisu-title-1 'sisu-title-1-face)
-(defvar sisu-title-2 'sisu-title-2-face)
-(defvar sisu-title-3 'sisu-title-3-face)
-(defvar sisu-title-4 'sisu-title-4-face)
-
-(defvar general-font-lock-red1 font-lock-warning-face)
-(defvar general-font-lock-red2 font-lock-comment-face)
-(defvar general-font-lock-red3 font-lock-string-face)
-
-(defvar general-font-lock-green1 font-lock-type-face)
-(defvar general-font-lock-green2 font-lock-constant-face)
-
-(defvar general-font-lock-blue1 font-lock-keyword-face)
-(defvar general-font-lock-blue2 font-lock-function-name-face)
-(defvar general-font-lock-blue3 font-lock-builtin-face)
-
-(defvar general-font-lock-yellow1 font-lock-variable-name-face)
-(defvar general-font-lock-yellow2 font-lock-comment-face)
-
-;; == sisu-mode settings
-
-(defvar sisu-mode-hook nil
- "Normal hook run when entering Sisu Text mode.")
-
-(defvar sisu-mode-abbrev-table nil
- "Abbrev table in use in Sisu-mode buffers.")
-(define-abbrev-table 'sisu-mode-abbrev-table ())
-
-(defconst sisu-font-lock-keywords
- (eval-when-compile
- (list
-
- ;;grouped text
- (cons "^group\{\\|^\}group" 'general-font-lock-red2)
- (cons "^block\{\\|^\}block" 'general-font-lock-red2)
- (cons "^code\{\\|^\}code" 'general-font-lock-red2)
- (cons "^poem\{\\|^\}poem" 'general-font-lock-red2)
- (cons "^alt\{\\|^\}alt" 'general-font-lock-red2)
- (cons "^table\{.+\\|^\}table" 'general-font-lock-red2)
- (cons "^\{table[^}]+\}" 'general-font-lock-red2)
-
- ;; footnote/endnote
- ;(cons "\~\{.+?\}\~" 'general-font-lock-green1)
- (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~" 'general-font-lock-red2)
- (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~" 'general-font-lock-red2)
-
- (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
-
- (list (concat
- "\\(\*\~\\)"
- "\\([^ \r\t\n]+\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-blue2 t))
-
- ;; emphasis (can be program configured to be bold italics or underscore)
- (list (concat
- "\\([*]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[*]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; bold
- (list (concat
- "\\([!]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[!]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
- (cons "\\*[^ ]+\\*" 'general-font-lock-red1)
- (cons "^!_ .+" 'general-font-lock-red1)
-
- ;;; italics
- (list (concat
- "\\([/]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[/]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-blue1 t)
- '(3 general-font-lock-red1 t))
-
- ;; underscore
- (list (concat
- "\\([_]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[_]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; monospace
- (list (concat
- "\\([#]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[#]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; citation
- (list (concat
- "\\([\"]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[\"]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; inserted text
- (list (concat
- "\\([\+]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[\+]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; strike through
- (list (concat
- "\\(\\-\{\\)"
- "\\([^\}]+\\)"
- "\\(\}\\-\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; superscript
- (list (concat
- "\\(\\^\{\\)"
- "\\([^\}]+\\)"
- "\\(\}\\^\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; subscript
- (list (concat
- "\\([,]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[,]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;;numbered list
- (cons "^# \\|^_# " 'general-font-lock-red1)
-
- ;;bullet text
- (cons "^_\\*[1-9] \\|^_\\* " 'general-font-lock-red1)
-
- ;;indented text
- (cons "^_[1-9] " 'general-font-lock-red1)
- (cons "^_[1-9]! " 'general-font-lock-red1)
-
- ;hanging indented text [proposed enable when implemented]
- (cons "^__[1-9] " 'general-font-lock-red1)
- (cons "^_[0-9]_[0-9] " 'general-font-lock-red1)
- (cons "^__[1-9]! " 'general-font-lock-red1)
- (cons "^_[0-9]_[0-9]! " 'general-font-lock-red1)
-
- ;;url
- (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
-
- ;; Comment Lines
- (cons "^% .*" 'general-font-lock-blue1)
-
- ;; line break
- (cons " \\\\\\\\ " 'general-font-lock-red1)
- ;; line break (depreciated)
- (cons "<br>" 'general-font-lock-red1)
-
- ;; Section titles
- (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
- '(1 sisu-title-1 t)
- '(3 sisu-title-2 t))
-
- ;; hyper-links
- (list (concat
- "\\(\{~^\\|\{\\)"
- "\\([^\}\{]+\\)"
- "\\(\}http:[/][/][^ \r\n\t<]+\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-blue2 t))
-
- ;; book index
- (cons "^\=\{.+\}" 'general-font-lock-green1)
-
- ;; numbers
- (cons "\\<[.0-9]+\\>" 'general-font-lock-green2)
-
- ;; bullets sisu_normal (nearly copied regexp)
- (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
-
- ;; image links
- (list (concat
- "\\(\{\\)"
- "\\([^\}\{]+\\)"
- "\\(\}image\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-blue2 t))
-
- ;; insert file links
- (list (concat
- "\\(<< \\)"
- "\\([^ \r\t\n]+\\.ss\\)"
- "\\(i\\|t\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-blue2 t)
- '(3 general-font-lock-blue2 t))
-
- ;; raw keywords
- (list (concat
- "^\\(\\@\\("
- "title\\|"
- "creator\\|"
- "date\\|"
- "publisher\\|"
- "rights\\|"
- "classify\\|"
- "original\\|"
- "notes\\|"
- "links\\|"
- "make\\|"
- "\\):\\)\\(.*\\)")
- '(1 sisu-title-2 keep)
- '(3 sisu-title-3 keep))
-
- ))
- "Default expressions to highlight in AsciiSisu mode.")
-
-;;}}}
-
-;;{{{ Sisu & Autoload:
-
-;;###autoload
-(define-derived-mode sisu-mode text-mode "SiSU"
- "Major mode for editing SiSU files."
- (interactive)
- (modify-syntax-entry ?\' ".")
- ;(flyspell-mode nil)
-
- (make-local-variable 'paragraph-start)
- (setq paragraph-start (concat "$\\|>" page-delimiter))
- (make-local-variable 'paragraph-separate)
- (setq paragraph-separate paragraph-start)
- (make-local-variable 'paragraph-ignore-fill-prefix)
- (setq paragraph-ignore-fill-prefix t)
-
- (make-local-variable 'require-final-newline)
- (setq require-final-newline t)
-
- (make-local-variable 'font-lock-defaults)
- (setq font-lock-defaults
- '(sisu-font-lock-keywords
- nil ; KEYWORDS-ONLY: no
- nil ; CASE-FOLD: no
- ((?_ . "w")) ; SYNTAX-ALIST
- ))
- (run-hooks 'sisu-mode-hook))
-
-(provide 'sisu-mode)
-
-;;}}}
-
-;;; sisu-mode.el ends here
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
deleted file mode 100644
index 3fd2a967..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Name: frugal-cterm-ruby
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & sparse
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "frugal-cterm-ruby"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor cterm=reverse
-:hi lCursor cterm=reverse
-:hi StatusLine cterm=reverse
-:hi StatusLineNC cterm=reverse
-:hi Search cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
-:hi SpecialKey ctermfg=4
-:hi Visual cterm=reverse
-:hi VisualNOS cterm=bold,underline
-:hi MoreMsg ctermfg=2
-:hi ModeMsg cterm=bold
-:hi Question ctermfg=2
-:hi Title ctermfg=1
-:hi NonText cterm=bold ctermfg=4
-:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory ctermfg=4
-:hi WildMenu ctermbg=3 ctermfg=0
-:hi VertSplit cterm=reverse
-:hi Folded cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=4
-:hi Constant ctermfg=1
-:hi Special ctermfg=6
-:hi Identifier cterm=none ctermfg=6
-:hi Statement cterm=none ctermfg=2
-":hi Operator ctermfg=1
-:hi PreProc ctermfg=1
-:hi Type cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo ctermbg=3 ctermfg=0
-:hi Underlined cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg ctermfg=1
-:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
-:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
deleted file mode 100644
index 37cfaf5a..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Name: frugal-cterm-sisu
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & sparse
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "frugal-cterm-sisu"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor cterm=reverse
-:hi lCursor cterm=reverse
-:hi StatusLine cterm=bold,reverse
-:hi StatusLineNC cterm=reverse
-:hi Search cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
-:hi SpecialKey ctermfg=4
-:hi Visual cterm=reverse
-:hi VisualNOS cterm=bold,underline
-:hi MoreMsg ctermfg=2
-:hi ModeMsg cterm=bold
-:hi Question ctermfg=2
-:hi Title cterm=bold ctermfg=3
-:hi NonText cterm=bold ctermfg=4
-:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory ctermfg=4
-:hi WildMenu ctermbg=3 ctermfg=0
-:hi VertSplit cterm=reverse
-:hi Folded cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=none ctermbg=0 ctermfg=7
-:hi Constant ctermfg=1
-:hi Special ctermfg=6
-:hi Identifier ctermfg=6
-:hi Statement ctermfg=6
-:hi Operator ctermfg=1
-:hi PreProc ctermbg=7 ctermfg=1
-:hi Type ctermfg=2
-:hi Delimiter cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo ctermbg=3 ctermfg=0
-:hi Underlined cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg ctermfg=1
-:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
-:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
deleted file mode 100644
index 21698d22..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Name: sparse-cterm-ruby
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & frugal
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "frugal-cterm-ruby"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor cterm=reverse
-:hi lCursor cterm=reverse
-:hi StatusLine cterm=reverse
-:hi StatusLineNC cterm=reverse
-:hi Search cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
-:hi SpecialKey ctermfg=4
-:hi Visual cterm=reverse
-:hi VisualNOS cterm=bold,underline
-:hi MoreMsg ctermfg=2
-:hi ModeMsg cterm=bold
-:hi Question ctermfg=2
-:hi Title ctermfg=1
-:hi NonText cterm=bold ctermfg=4
-:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory ctermfg=4
-:hi WildMenu ctermbg=3 ctermfg=0
-:hi VertSplit cterm=reverse
-:hi Folded cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant ctermfg=1
-:hi Special ctermfg=6
-:hi Identifier cterm=none ctermfg=6
-:hi Statement cterm=none ctermfg=2
-":hi Operator ctermfg=1
-:hi PreProc ctermfg=1
-:hi Type cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo ctermbg=3 ctermfg=0
-:hi Underlined cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg ctermfg=1
-:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
-:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
deleted file mode 100644
index 0ca364af..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Name: sparse-cterm-sisu
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & frugal
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "sparse-cterm-sisu"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor cterm=reverse
-:hi lCursor cterm=reverse
-:hi StatusLine cterm=bold,reverse
-:hi StatusLineNC cterm=reverse
-:hi Search cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
-:hi SpecialKey ctermfg=4
-:hi Visual cterm=reverse
-:hi VisualNOS cterm=bold,underline
-:hi MoreMsg ctermfg=2
-:hi ModeMsg cterm=bold
-:hi Question ctermfg=2
-:hi Title cterm=bold ctermfg=3
-:hi NonText cterm=bold ctermfg=4
-:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory ctermfg=4
-:hi WildMenu ctermbg=3 ctermfg=0
-:hi VertSplit cterm=reverse
-:hi Folded cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant ctermfg=1
-:hi Special ctermfg=6
-:hi Identifier ctermfg=6
-:hi Statement ctermfg=6
-:hi Operator ctermfg=1
-:hi PreProc ctermbg=7 ctermfg=1
-:hi Type ctermfg=2
-:hi Delimiter cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo ctermbg=3 ctermfg=0
-:hi Underlined cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg ctermfg=1
-:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
-:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
deleted file mode 100644
index 49c70986..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ /dev/null
@@ -1,261 +0,0 @@
-" SiSU Vim syntax file
-" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup: SiSU (sisu-3.3.3)
-" Last Change: 2012-08-08
-" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
-"(originally looked at Ruby Vim by Mirko Nasato)
-
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-else
-endif
-let s:cpo_save = &cpo
-set cpo&vim
-
-"% "Errors:
-syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
-
-"% "Markers Identifiers:
-if !exists("sisu_no_identifiers")
- syn match sisu_mark_endnote "\~^"
- syn match sisu_break contains=@NoSpell " \\\\\( \|$\)\|<br>\|<br />"
- syn match sisu_control contains=@NoSpell "^\(-\\\\-\|=\\\\=\|<:p[bn]>\)\s*$"
- syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$"
- syn match sisu_marktail "[~-]#"
- syn match sisu_control "\""
- syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
- syn match sisu_number contains=@NoSpell "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
- syn match sisu_link contains=@NoSpell "\(_\?https\?://\|\.\.\/\)\S\+"
- syn match sisu_link " \*\~\S\+"
- syn match sisu_action "^<:insert\d\+>"
- syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$"
- syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$"
- syn match sisu_structure "^:A\~$"
-
-"% "Document Sub Headers:
- syn match sisu_sub_header_title "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content
- syn match sisu_sub_header_creator "^\s\+:\(author\|editor\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s" " &hon &institution
- syn match sisu_sub_header_rights "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s" " access_rights license
- syn match sisu_sub_header_classify "^\s\+:\(topic_register\|coverage\|format\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\|oclc\|pg\|isbn\):\s"
- syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
- syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
- syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|substitute\|omit\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
- syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
-
-"% "semantic markers: (ignore)
- syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]"
- syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker_block "\([a-z][a-z._]*\|\):\[\|\]:[a-z._]*[a-z]"
- syn match sisu_sem_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):{[^}].\{-}}:\1"
- syn match sisu_sem_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";{[^}].\{-}};[a-z]\+"
- syn match sisu_sem_ex_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):\[[^}].\{-}\]:\1"
- syn match sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";\[[^}].\{-}\];[a-z]\+"
-endif
-
-"% "URLs Numbers And ASCII Codes:
-syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>"
-syn match sisu_number "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)"
-
-"% "Tuned Error: (is error if not already matched)
-syn match sisu_error contains=sisu_error "[\~/\*!_]{\|}[\~/\*!_]"
-syn match sisu_error contains=sisu_error "<a href\|</a>]"
-
-"% "Simple Paired Enclosed Markup:
-"url/link
-syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
-
-"% "Document Header:
-" title
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" creator
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" dates
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" publisher
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" rights
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" classify document
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" original language (depreciated)
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" notes
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" links of interest
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" make, processing instructions
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-
-"% "Headings:
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
-
-"% "Block Group Text:
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
-" block, group, poem, alt
-syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
-" code
-syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
-
-"% "Endnotes:
-" regular endnote or asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
-" numbered asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
-" endnote content marker (for binary content marking)
-syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$"
-
-"% "Links And Images:
-" image with url link (and possibly footnote of url)
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|:\|\.\.\/\|#\)\S\+" oneline
-" sisu outputs, short notation
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
-" image
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
-
-"% "Some Line Operations:
-" bold line
-syn region sisu_bold contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^!_ " end=" \\\\\|$"
-" indent and bullet paragraph
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
-" indent and bullet (bold start) paragraph
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\)!_\? " end=" \\\\\|$"
-" hanging indent paragraph [proposed]
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9] " end="$"
-" hanging indent (bold start/ definition) paragraph [proposed]
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9]!_\? " end=" \\\\\|$"
-" list numbering
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
-
-"% "Font Face Curly Brackets:
-"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
-" book index:
-syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
-" emphasis:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
-" bold:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
-" underscore:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
-" italics:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/"
-" added:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+"
-" superscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^"
-" subscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="},"
-" monospace:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="#{" end="}#"
-" strikethrough:
-syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-"
-
-"% "Single Words Bold Italicise Etc: (depreciated)
-syn region sisu_bold contains=sisu_error matchgroup=sisu_bold start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline
-"misc
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline
-
-"% "Expensive Mode:
-if !exists("sisu_no_expensive")
-else " not Expensive
- syn region sisu_content_alt matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline
-endif " Expensive?
-
-"% "Headers And Headings: (Document Instructions)
-syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+"
-syn region sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$"
-
-"% "Errors:
-syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$"
-syn match sisu_error contains=sisu_error_wspace "\t\+"
-syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
-syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"
-syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n$"
-syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n$"
-syn match sisu_error contains=sisu_error "\s\+.{{"
-syn match sisu_error contains=sisu_error "^\~\s*$"
-syn match sisu_error contains=sisu_error "^0\~.*"
-syn match sisu_error contains=sisu_error "^[1-9]\~\s*$"
-syn match sisu_error contains=sisu_error "^[1-9]\~\S\+\s*$"
-syn match sisu_error contains=sisu_error "[^{]\~\^[^ \)]"
-syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
-syn match sisu_error contains=sisu_error "{\~^\S\+"
-syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
-syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
-syn match sisu_error contains=sisu_error "<dir>"
-"errors for filetype sisu, though not error in 'metaverse':
-syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>"
-syn match sisu_error "/\?<\([biu]\)>[^(</\1>)]\{-}\n$"
-
-"% "Error Exceptions:
-syn match sisu_control "\n$" "contains=ALL
-"syn match sisu_control " //"
-syn match sisu_error "%{"
-syn match sisu_error "<br>_\?https\?:\S\+\|_\?https\?:\S\+<br>"
-syn match sisu_error "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]"
-syn match sisu_comment "^%\{1,2\}.\+"
-
-"% "Definitions Default Highlighting:
-hi def link sisu_normal Normal
-hi def link sisu_bold Statement
-hi def link sisu_header PreProc
-hi def link sisu_header_content Normal
-hi def link sisu_sub_header_title Statement
-hi def link sisu_sub_header_creator Statement
-hi def link sisu_sub_header_date Statement
-hi def link sisu_sub_header_publisher Statement
-hi def link sisu_sub_header_rights Statement
-hi def link sisu_sub_header_classify Statement
-hi def link sisu_sub_header_original Statement
-hi def link sisu_sub_header_links Statement
-hi def link sisu_sub_header_notes Statement
-hi def link sisu_sub_header_make Statement
-hi def link sisu_heading Title
-hi def link sisu_structure Operator
-hi def link sisu_contain Include
-hi def link sisu_mark_endnote Delimiter
-hi def link sisu_require NonText
-hi def link sisu_link NonText
-hi def link sisu_linked String
-hi def link sisu_fontface Delimiter
-hi def link sisu_strikeout DiffDelete
-hi def link sisu_content_alt Special
-hi def link sisu_sem_content SpecialKey
-hi def link sisu_sem_block Special
-hi def link sisu_sem_marker Visual
-"hi def link sisu_sem_marker Structure
-hi def link sisu_sem_marker_block MatchParen
-hi def link sisu_sem_ex_marker FoldColumn
-hi def link sisu_sem_ex_marker_block Folded
-hi def link sisu_sem_ex_content Comment
-"hi def link sisu_sem_ex_content SpecialKey
-hi def link sisu_sem_ex_block Comment
-hi def link sisu_index SpecialKey
-hi def link sisu_index_block Visual
-hi def link sisu_content_endnote Special
-hi def link sisu_control Delimiter
-hi def link sisu_ocn Include
-hi def link sisu_number Number
-hi def link sisu_identifier Function
-hi def link sisu_underline Underlined
-hi def link sisu_markpara Include
-hi def link sisu_marktail Include
-hi def link sisu_mark Identifier
-hi def link sisu_break Structure
-hi def link sisu_html Type
-hi def link sisu_action Identifier
-hi def link sisu_comment Comment
-hi def link sisu_error_sem_marker Error
-hi def link sisu_error_wspace Error
-hi def link sisu_error Error
-let b:current_syntax = "sisu"
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
deleted file mode 100644
index 257e1cba..00000000
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
+++ /dev/null
@@ -1,281 +0,0 @@
-" SiSU Vim syntax file
-" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup: SiSU (sisu-3.1.0)
-" Last Change: 2011-10-03
-" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
-"(originally looked at Ruby Vim by Mirko Nasato)
-
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-else
-endif
-let s:cpo_save = &cpo
-set cpo&vim
-
-"% "Errors:
-syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
-
-"% "Markers Identifiers:
-if !exists("sisu_no_identifiers")
- syn match sisu_mark_endnote "\~^"
- syn match sisu_break contains=@NoSpell " \\\\\( \|$\)"
- syn match sisu_break contains=@NoSpell "<br>\|<br />"
- syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$"
- "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$"
- syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pr\|o\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pr\|o\)\]\s*$"
- syn match sisu_marktail "[~-]#"
- syn match sisu_control "\""
- syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
- syn match sisu_number contains=@NoSpell "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
- syn match sisu_link contains=@NoSpell "\(_\?https\?://\|\.\.\/\)\S\+"
- syn match sisu_link " \*\~\S\+"
- syn match sisu_action "^<:insert\d\+>"
- syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$"
- syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$"
- syn match sisu_structure "^:A\~$"
-
-"% "Document Sub Headers:
- syn match sisu_sub_header_title "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content
- syn match sisu_sub_header_creator "^\s\+:\(author\|editor\):\s" " &hon &institution
- syn match sisu_sub_header_contributor "^\s\+:\(editor\|translator\|illustrator\|photographer\|audio\|video\|prepared_by\|digitized_by\):\s"
- syn match sisu_sub_header_rights "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s" " access_rights license
- syn match sisu_sub_header_classify "^\s\+:\(topic_register\|coverage\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\):\s"
- syn match sisu_sub_header_identify "^\s\+:\(isbn\|urn\|oclc\|pg\):\s"
- syn match sisu_sub_header_format "^\s\+:\(mimetype\):\s"
- syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
- syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
- syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
- syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
-
-"% "semantic markers: (ignore)
- syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]"
- syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker_block "\([a-z][a-z._]*\|\):\[\|\]:[a-z._]*[a-z]"
- syn match sisu_sem_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):{[^}].\{-}}:\1"
- syn match sisu_sem_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";{[^}].\{-}};[a-z]\+"
- syn match sisu_sem_ex_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):\[[^}].\{-}\]:\1"
- syn match sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";\[[^}].\{-}\];[a-z]\+"
-endif
-
-"% "URLs Numbers And ASCII Codes:
-syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>"
-syn match sisu_number "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)"
-
-"% "Tuned Error: (is error if not already matched)
-syn match sisu_error contains=sisu_error "[\~/\*!_]{\|}[\~/\*!_]"
-syn match sisu_error contains=sisu_error "<a href\|</a>]"
-
-"% "Simple Paired Enclosed Markup:
-"url/link
-syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
-
-"% "Document Header:
-" title
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" creator
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" contributor
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_contributor matchgroup=sisu_header start="^[@]contributor:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" dates
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" publisher
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" rights
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" classify document
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" identifier
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_identifier matchgroup=sisu_header start="^[@]identifier:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" format
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_format matchgroup=sisu_header start="^[@]format:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" original language (depreciated)
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" notes
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" links of interest
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" make, processing instructions
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-
-"% "Headings:
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
-
-"% "Block Group Text:
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
-" block, group, poem, alt
-syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
-" code
-syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
-
-"% "Endnotes:
-" regular endnote or asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
-" numbered asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
-" endnote content marker (for binary content marking)
-syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$"
-
-"% "Links And Images:
-" image with url link (and possibly footnote of url)
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|:\|\.\.\/\|#\)\S\+" oneline
-" sisu outputs, short notation
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
-" image
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
-
-"% "Some Line Operations:
-" bold line
-syn region sisu_bold contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^!_ " end=" \\\\\|$"
-" indent and bullet paragraph
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
-" indent and bullet (bold start) paragraph
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\)!_\? " end=" \\\\\|$"
-" hanging indent paragraph [proposed]
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9] " end="$"
-" hanging indent (bold start/ definition) paragraph [proposed]
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9]!_\? " end=" \\\\\|$"
-" list numbering
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
-
-"% "Font Face Curly Brackets:
-"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
-" book index:
-syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
-" emphasis:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
-" bold:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
-" underscore:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
-" italics:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/"
-" added:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+"
-" superscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^"
-" subscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="},"
-" monospace:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="#{" end="}#"
-" strikethrough:
-syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-"
-" (depreciated remove, consider marking as error):
-" syn region sisu_html contains=sisu_error contains=sisu_strikeout matchgroup=sisu_contain start="<a href=\".\{-}\">" end="</a>" oneline
-
-"% "Single Words Bold Italicise Etc: (depreciated)
-syn region sisu_bold contains=sisu_error matchgroup=sisu_bold start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline
-"misc
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline
-
-"% "Expensive Mode:
-if !exists("sisu_no_expensive")
-else " not Expensive
- syn region sisu_content_alt matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline
-endif " Expensive?
-
-"% "Headers And Headings: (Document Instructions)
-syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+"
-syn region sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$"
-
-"% "Errors:
-syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
-"syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+\|\t\+"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$"
-syn match sisu_error contains=sisu_error_wspace "\t\+"
-syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
-syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"
-syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n$"
-syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n$"
-syn match sisu_error contains=sisu_error "\s\+.{{"
-syn match sisu_error contains=sisu_error "^\~\s*$"
-syn match sisu_error contains=sisu_error "^0\~.*"
-syn match sisu_error contains=sisu_error "^[1-9]\~\s*$"
-syn match sisu_error contains=sisu_error "^[1-9]\~\S\+\s*$"
-syn match sisu_error contains=sisu_error "[^{]\~\^[^ \)]"
-syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
-syn match sisu_error contains=sisu_error "{\~^\S\+"
-syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
-syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
-syn match sisu_error contains=sisu_error "<dir>"
-"errors for filetype sisu, though not error in 'metaverse':
-syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>"
-syn match sisu_error "/\?<\([biu]\)>[^(</\1>)]\{-}\n$"
-
-"% "Error Exceptions:
-syn match sisu_control "\n$" "contains=ALL
-"syn match sisu_control " //"
-syn match sisu_error "%{"
-syn match sisu_error "<br>_\?https\?:\S\+\|_\?https\?:\S\+<br>"
-syn match sisu_error "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]"
-syn match sisu_comment "^%\{1,2\}.\+"
-
-"% "Definitions Default Highlighting:
-hi def link sisu_normal Normal
-hi def link sisu_bold Statement
-hi def link sisu_header PreProc
-hi def link sisu_header_content Normal
-hi def link sisu_sub_header_title Statement
-hi def link sisu_sub_header_creator Statement
-hi def link sisu_sub_header_date Statement
-hi def link sisu_sub_header_publisher Statement
-hi def link sisu_sub_header_rights Statement
-hi def link sisu_sub_header_classify Statement
-hi def link sisu_sub_header_original Statement
-hi def link sisu_sub_header_links Statement
-hi def link sisu_sub_header_notes Statement
-hi def link sisu_sub_header_make Statement
-hi def link sisu_heading Title
-hi def link sisu_structure Operator
-hi def link sisu_contain Include
-hi def link sisu_mark_endnote Delimiter
-"hi def link sisu_mark_endnote Include
-hi def link sisu_require NonText
-hi def link sisu_link NonText
-hi def link sisu_linked String
-hi def link sisu_fontface Delimiter
-"hi def link sisu_fontface Include
-hi def link sisu_strikeout DiffDelete
-hi def link sisu_content_alt Special
-hi def link sisu_sem_content SpecialKey
-hi def link sisu_sem_block Special
-hi def link sisu_sem_marker Visual
-"hi def link sisu_sem_marker Structure
-hi def link sisu_sem_marker_block MatchParen
-hi def link sisu_sem_ex_marker FoldColumn
-hi def link sisu_sem_ex_marker_block Folded
-hi def link sisu_sem_ex_content Comment
-"hi def link sisu_sem_ex_content SpecialKey
-hi def link sisu_sem_ex_block Comment
-hi def link sisu_index SpecialKey
-hi def link sisu_index_block Visual
-hi def link sisu_content_endnote Special
-hi def link sisu_control Delimiter
-"hi def link sisu_control Define
-hi def link sisu_ocn Include
-hi def link sisu_number Number
-hi def link sisu_identifier Function
-hi def link sisu_underline Underlined
-hi def link sisu_markpara Include
-hi def link sisu_marktail Include
-hi def link sisu_mark Identifier
-hi def link sisu_break Structure
-hi def link sisu_html Type
-hi def link sisu_action Identifier
-hi def link sisu_comment Comment
-hi def link sisu_error_sem_marker Error
-hi def link sisu_error_wspace Error
-hi def link sisu_error Error
-let b:current_syntax = "sisu"
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
deleted file mode 100644
index b16979ea..00000000
--- a/data/sisu/v3/v/version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:version: 3.3.11
-:date_stamp: 2013w07/3
-:date: "2013-02-20"
-:project: SiSU
diff --git a/data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi b/data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi
deleted file mode 100644
index c196c756..00000000
--- a/data/sisu/v4/conf/cgi-bin/sisu_search_pgsql.cgi
+++ /dev/null
@@ -1,904 +0,0 @@
-#!/usr/bin/env ruby
-=begin
- * Name: SiSU information Structuring Universe
- * Author: Ralph Amissah
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
-
- * Description: generates naive cgi search form for search of sisu database (pgsql)
- * Name: SiSU generated sample cgi search form
-
- * Description: generated sample cgi search form for SiSU
- (SiSU is a framework for document structuring, publishing and search)
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
-
- * License: GPL 3 or later:
-
- SiSU, a framework for document structuring, publishing and search
-
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-
- If you have Internet connection, the latest version of the GPL should be
- available at these locations:
- <http://www.fsf.org/licenses/gpl.html>
- <http://www.gnu.org/copyleft/gpl.html>
- <http://www.jus.uio.no/sisu/gpl.fsf>
-
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
-
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
-
- * Download:
- <http://www.jus.uio.no/sisu/SiSU/download.html>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
-=end
- require 'cgi'
- require 'fcgi'
- require 'dbi'
- @version='sisu_search_pgsql'
- @image_src="http://localhost/sisu/_sisu/image"
- @hosturl_db="http://localhost"
- @hosturl_files="http://www.jus.uio.no"
- @port="5432"
- user=''
- @@limit,@@offset=1000,0
- @base="#@hosturl_db/cgi-bin/#@version.cgi"
- @@canned_search_url=@base
- @color_heading='#DDFFAA'
- @color_match='#ffff48'
- class Form
- def initialize(base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can='')
- search_note='' if checked_searched !~/\S/
- the_can='' if checked_url !~/\S/
- search_field='' if checked_echo !~/\S/
- @base,@search_field,@selected_db,@checked_index,@checked_text,@checked_tip,@checked_stats,@checked_searched,@checked_url,@checked_case,@checked_echo,@checked_sql,@checked_all,@checked_none,@checked_selected,@checked_default,@search_note,@the_can=base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can
- @tip=if checked_tip =~/\S/
- '<font size="2" color="#666666">text:__; keywords:__; title:__; author:__; subject:__; description:__; publisher:__; contributor:__; date:__; type:__; format:__; identifier:__; source:__; language:__; relation:__; coverage:__; rights:__; comment:__; abstract:__; filename:__;</font><br />'
- else ''
- end
- end
- def submission_form
- search_form=<<-WOK
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>
- SiSU search form (sample): SiSU information Structuring Universe
- </title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <meta name="sourcefile" content="SiSU._sst" />
- <link rel="generator" href="http://www.jus.uio.no/sisu" />
- <link rel="shortcut icon" href="http://localhost/sisu/_sisu/image/rb7.ico" />
- <link rel="stylesheet" href="../_sisu/css/html.css" type="text/css" />
- </head>
- <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
- <table summary="band" border="0" cellpadding="3" cellspacing="0">
- <tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="http://localhost/sisu/_sisu/image/sisu.png" alt="SiSU --&gt;" /></a></td><td>
-<!-- <p class="tiny"><a href="http://www.jus.uio.no/sisu/SiSU/">&nbsp;http://www.jus.uio.no/sisu/SiSU/</a></p> -->
- <label for="find"><b>sample search form</b></label>
- </td></tr>
- </table>
- <form action="#@base" id="Test Form" method="post">
- <table cellpadding="2">
- <tr><td valign=\"top\">
- <textarea id="find" name="find" type="text" rows="6" cols="40" maxlength="256">#@search_field</textarea>
- </td>
- <td valign=\"top\">
- #@tip
- #@search_note
- #@the_can
- </td></tr></table>
- <td valign=\"top\"><tr><td>
- <!input type="text" id="find" name="find" value="#@search_field" />
- <!input type="text" id="find" name="find" value="" />
- <font size="2" color="#222222">
- <b>to search:</b> select which database to search (drop-down menu below); enter your search query (in the form above); and <b>click on the search button</b> (below)
- <br />
- <select name="db" size="1">
- #@selected_db
- <option value="SiSU_pace">pace</option>
- <option value="SiSU_sisu">sisu</option>
- </select>
- <input type="submit" value="SiSU search" />
- <input type="radio" name="view" value="index" #@checked_index> index
- <input type="radio" name="view" value="text" #@checked_text> text / grep
- <input type="checkbox" name="casesense" #@checked_case> case sensitive
- <br />
- <input type="checkbox" name="echo" #@checked_echo> echo query
- <input type="checkbox" name="stats" #@checked_stats> result stats
- <input type="checkbox" name="url" #@checked_url> search url
- <input type="checkbox" name="searched" #@checked_searched> searched
- <input type="checkbox" name="tip" #@checked_tip> available fields
- <input type="checkbox" name="sql" #@checked_sql> sql statement
- <br />
- checks:
- <input type="radio" name="checks" value="check_default" #@checked_default> default
- <input type="radio" name="checks" value="check_selected" #@checked_selected> selected
- <input type="radio" name="checks" value="check_all" #@checked_all> all
- <input type="radio" name="checks" value="check_none" #@checked_none> none
- </font>
- </td></tr>
- </table>
- </form>
- WOK
- end
- end
- class Search_request #% search_for
- attr_accessor :text1,:keywords,:title,:author,:subject,:description,:publisher,:contributor,:date,:type,:format,:identifier,:source,:language,:relation,:coverage,:rights,:comment,:abstract,:owner,:date_created,:date_issued,:date_modified,:date_available,:date_valid,:filename
- def initialize(search_field='',q='')
- @search_field,@q=search_field,q
- @text1=@keywords=@title=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@comment=@abstract=@owner=@date_created=@date_issued=@date_modified=@date_available=@date_valid=@filename=''
- if @search_field=~/\S/
- @text1=text_to_match('text:')
- @keywords=text_to_match('key(?:words?)?:')
- @title=text_to_match('title:') # DublinCore 1 - title
- @author=text_to_match('(?:author|creator)s?:') # DublinCore 2 - creator/author
- @subject=text_to_match('subj(?:ect)?:') # DublinCore 3 - subject
- @description=text_to_match('description:') # DublinCore 4 - description
- @publisher=text_to_match('pub(?:lisher)?:') # DublinCore 5 - publisher
- @contributor=text_to_match('contributor:') # DublinCore 6 - contributor
- @date=text_to_match('date:') # DublinCore 7 - date dd-mm-yy
- @type=text_to_match('type:') # DublinCore 8 - type
- @format=text_to_match('format:') # DublinCore 9 - format
- @identifier=text_to_match('identifier:') # DublinCore 10 - identifier
- @source=text_to_match('source:') # DublinCore 11 - source
- @language=text_to_match('language:') # DublinCore 12 - language
- @relation=text_to_match('relation:') # DublinCore 13 - relation
- @coverage=text_to_match('coverage:') # DublinCore 14 - coverage
- @rights=text_to_match('rights:') # DublinCore 15 - rights
- @comment=text_to_match('comment:')
- @abstract=text_to_match('abs(?:tract)?:')
- @owner=text_to_match('owner:')
- @date_created=text_to_match('date_created:')
- @date_issued=text_to_match('date_issued:')
- @date_modified=text_to_match('date_modified:')
- @date_available=text_to_match('date_available:')
- @date_valid=text_to_match('date_valid:')
- @filename=text_to_match('filename:')
- @text1=text_to_match unless @keywords or @author or @title or @text1 or @comment or @abstract or @rights or @subject or @publisher or @date or @filename
- else
- @text1=q['s1'] if q['s1']=~/\S/
- @keywords=q['key'] if q['key']=~/\S/
- @title=q['ti'] if q['ti']=~/\S/
- @author=q['au'] if q['au']=~/\S/
- @subject=q['sj'] if q['sj']=~/\S/
- @description=q['dsc'] if q['dsc']=~/\S/
- @publisher=q['pb'] if q['pb']=~/\S/
- @contributor=q['cntr'] if q['cntr']=~/\S/
- @date=q['dt'] if q['dt']=~/\S/
- @type=q['ty'] if q['ty']=~/\S/
- @identifier=q['id'] if q['id']=~/\S/
- @source=q['src'] if q['src']=~/\S/
- @language=q['lang'] if q['lang']=~/\S/
- @relation=q['rel'] if q['rel']=~/\S/
- @coverage=q['cov'] if q['cov']=~/\S/
- @rights=q['cr'] if q['cr']=~/\S/
- @comment=q['co'] if q['co']=~/\S/
- @abstract=q['ab'] if q['ab']=~/\S/
- @date_created=q['dtc'] if q['dtc']=~/\S/
- @date_issued=q['dti'] if q['dti']=~/\S/
- @date_modified=q['dtm'] if q['dtm']=~/\S/
- @date_available=q['dta'] if q['dta']=~/\S/
- @date_valid=q['dtv'] if q['dtv']=~/\S/
- @filename=q['fns'] if q['fns']=~/\S/
- @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000
- @@offset=q['off'] if q['off']=~/\d+/ # 0
- end
- end
- def text_to_match(identifier='')
- m={
- :string => /#{identifier}\s*(.+?)/,
- :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/,
- :word => /#{identifier}[\s(]*(\S+)/
- }
- search_string=if @search_field =~m[:word]
- search_string=if @search_field =~m[:braces]; m[:braces].match(@search_field)[1]
- elsif @search_field =~m[:string]; m[:string].match(@search_field)[1]
- else
- str=m[:word].match(@search_field)[1]
- str.gsub!(/[()]/,'')
- str
- end
- search_string.strip!
- search_string.gsub!(/\s+/,'+')
- search_string
- #else
- # "__"
- end
- end
- end
- class Dbi_search_string
- def initialize(l,t,q,cse=false)
- @l,@t,@q,@c=l,t,q,cse
- end
- def string
- search={ :search => [],:flag => false }
- if @t =~/\S+/ or @q =~/\S+/
- if @t =~/\S+/; unescaped_search=CGI.unescape(@t)
- elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q)
- end
- search_construct=[]
- if @c
- unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~\( '")
- unescaped_search.gsub!(/(.+)/,"#@l~\( '\\1' \)")
- else
- unescaped_search.gsub!(/\s*(AND|OR)\s*/,"' \) \\1 #@l~*\( '")
- unescaped_search.gsub!(/(.+)/,"#@l~*\( '\\1' \)")
- end
- search_construct << unescaped_search
- search_construct=search_construct.join(' ')
- search[:search] << search_construct
- search[:flag]=true
- search
- end
- search
- end
- end
- class Dbi_search_statement
- attr_reader :text_search_flag,:sql_select_body_format,:sql_select_endnotes_format,:sql_offset,:sql_limit
- def initialize(conn,search_for,q,c)
- @conn=conn
- @text_search_flag=false
- @sql_statement={ :body=>'',:endnotes=>'',:range=>'' }
- #@offset||=@@offset
- #@offset+=@@limit
- search={ :text => [],:endnotes => [] }
- cse=if c =~/\S/; true
- else false
- end
- st=Dbi_search_string.new('documents.clean',search_for.text1,q['s1'],cse).string
- se=Dbi_search_string.new('endnotes.clean',search_for.text1,q['s1'],cse).string
- @text_search_flag=st[:flag]
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << se[:search]
- end
- st=Dbi_search_string.new('metadata.keywords',search_for.keywords,q['key'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.title',search_for.title,q['ti'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.creator',search_for.author,q['au'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.subject',search_for.subject,q['sj'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.description',search_for.description,q['dsc'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.publisher',search_for.publisher,q['pb'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.contributor',search_for.contributor,q['cntr'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.date',search_for.date,q['dt'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.type',search_for.type,q['ty'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.identifier',search_for.identifier,q['id'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.source',search_for.source,q['src'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.language',search_for.language,q['lang'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.relation',search_for.relation,q['rel'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.coverage',search_for.coverage,q['cov'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.rights',search_for.rights,q['cr'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.comment',search_for.comment,q['co'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.abstract',search_for.abstract,q['ab'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.filename',search_for.filename,q['fns'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000
- @@offset=q['off'] if q['off']=~/\d+/ # 0
- @search_text,@search_endnotes=[],[]
- #%
- search[:text].each{|x| @search_text << "#{x} AND " }
- @search_text=@search_text.to_s.gsub!(/AND\s+$/,'')
- @search_text.gsub!(/(documents\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)')
- search[:endnotes].each{|x| @search_endnotes << "#{x} AND " }
- @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'')
- @search_endnotes.gsub!(/(endnotes\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)')
- end
- def sql_offset
- @@offset
- end
- def sql_limit
- @@limit
- end
- def sql_canned_search
- @offset_next=sql_offset.to_i + sql_limit.to_i
- @offset_previous=sql_offset.to_i - sql_limit.to_i
- def current
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + sql_offset.to_s
- end
- def next
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + @offset_next.to_s
- end
- def previous
- @offset_previous >= 0 ? (@@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + @offset_previous.to_s) : ''
- end
- def start
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + 0.to_s
- end
- self
- end
- def sql_canned_search_url(ok)
- if ok
- can=sql_canned_search
- page=(sql_offset.to_i + sql_limit.to_i)/sql_limit.to_i
- case page.to_s
- when /^1$/
- %{<hr /><br /><center>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- when /^2$/
- %{<hr /><br /><center>
- <a href="#{can.previous}">&lt;&nbsp;&nbsp;</a>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- else
- %{<hr /><br /><center>
- <a href="#{can.start}">|&lt;&nbsp;&nbsp;</a>
- <a href="#{can.previous}">&lt;&nbsp;&nbsp;</a>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- end
- else ''
- end
- end
- def sql_select_body
- limit ||=@@limit
- offset ||=@@offset
- @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE (#@search_text) AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
- @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
- select=@sql_statement[:body] + ' ' + @sql_statement[:range]
- select
- end
- def sql_select_endnotes
- limit ||=@@limit
- offset ||=@@offset
- @sql_statement[:endnotes]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE (#@search_endnotes) AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
- @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
- select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range]
- select
- end
- def sql_select_body_format
- %{<font color="#666666" size="2">#{sql_select_body}</font>}
- end
- def sql_select_endnotes_format
- %{<font color="#666666" size="2">#{sql_select_endnotes}</font>}
- end
- def contents
- @conn.select_all(sql_select_body)
- end
- def endnotes
- @conn.select_all(sql_select_endnotes)
- end
- end
- def tail
- <<-'WOK'
- <br /><hr /><br />
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="2" border="0">
- <!-- widget sisu -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="http://www.jus.uio.no/sisu" >
- <img border="0" src="http://localhost/sisu/_sisu/image/sisu.png" alt="SiSU" width="120" height="39" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
-<!-- SiSU Rights -->
- <p class="tiny_left"><font color="#666666" size="2">
- Generated by
- <a href="http://www.jus.uio.no/sisu" >
- SiSU</a> 0.55.3 2007-07-10 (2007w28/2)
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- <b>SiSU</b></a> <sup>&copy;</sup> Ralph Amissah
- 1993, current 2007.
- All Rights Reserved.
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- SiSU</a>
- is software for document structuring, publishing and search,
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- www.jus.uio.no/sisu
- </a>
- and
- <a href="http://www.sisudoc.org" >
- www.sisudoc.org
- </a>
- <br />
- <i>w3 since October 3 1993</i>
- <a href="mailto://ralph@amissah.com" >
- ralph@amissah.com
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU using:
- <br />Standard SiSU markup syntax,
- <br />Standard SiSU meta-markup syntax, and the
- <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
- <br />
- <sup>&copy;</sup> Ralph Amissah 1997, current 2007.
- All Rights Reserved.
- </font></p>
-</td></tr>
- <!-- widget way better -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="http://www.gnu.org/licenses/gpl.html">
- <img border="0" src="http://localhost/sisu/_sisu/image/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU is released under
- <a href="http://www.gnu.org/licenses/gpl.html">GPL&nbsp;v3</a>
- or later,
- <a href="http://www.gnu.org/licenses/gpl.html">
- http://www.gnu.org/licenses/gpl.html
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU, developed using
- <a href="http://www.ruby-lang.org/en/">
- Ruby
- </a>
- on
- <a href="http://www.debian.org/">
- Debian/Gnu/Linux
- </a>
- software infrastructure,
- with the usual GPL (or OSS) suspects.
- <br />
- Better - "performance, reliability, scalability, security &amp; total cost of ownership"
- [not to mention flexibility &amp; choice]
- <br />
- Get With the Future
- <a href="http://www.jus.uio.no/sisu/">
- Way Better!
- </a>
- </font></p>
-</td></tr>
-</table>
- <a name="bottom" id="bottom"></a><a name="down" id="down"></a><a name="end" id="end"></a><a name="finish" id="finish"></a><a name="stop" id="stop"></a><a name="credits" id="credits"></a>
- </body></html>
- WOK
- end
- @tail=tail
- @counter_txt_doc,@counter_txt_ocn,@counter_endn_doc,@counter_endn_ocn=0,0,0,0
- @counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','',''
- FCGI.each_cgi do |cgi|
- begin # all code goes in begin section
- @search={ :text => [],:endnotes => [] }
- q=CGI.new
- @db=if cgi['db'] =~/\S+/;
- @stub=/SiSU_(\S+)/.match(cgi['db'])[1]
- cgi['db']
- else
- @stub='sisu'
- 'SiSU_sisu'
- end
- checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','',''
- if cgi['view']=~/text/; checked_index,checked_text='','checked'
- else checked_index,checked_text='checked',''
- end
- checked_echo='checked' if cgi['echo'] =~/\S/
- checked_stats='checked' if cgi['stats'] =~/\S/
- checked_url='checked' if cgi['url'] =~/\S/ or cgi['u'].to_i==1
- checked_searched='checked' if cgi['searched'] =~/\S/
- checked_tip='checked' if cgi['tip'] =~/\S/
- checked_case='checked' if cgi['casesense'] =~/\S/
- checked_sql='checked' if cgi['sql'] =~/\S/
- if cgi['checks'] =~/check_all/ or cgi['check_all'] =~/\S/ or cgi['a'].to_i==1
- checked_all='checked'
- checked_echo=checked_stats=checked_url=checked_searched=checked_tip=checked_sql='checked'
- checked_none=''
- elsif cgi['checks'] =~/check_none/
- checked_none='checked'
- checked_all=checked_url=checked_stats=checked_searched=checked_tip=checked_echo=checked_sql=''
- elsif cgi['checks'] =~/check_selected/
- checked_selected='checked'
- elsif cgi['checks'] =~/check_default/
- checked_default='checked'
- checked_echo=checked_stats=checked_url='checked'
- checked_searched=checked_tip=checked_case=checked_sql=''
- else
- checked_selected='checked'
- checked_echo=checked_stats=checked_url='checked'
- checked_searched=checked_tip=checked_case=checked_sql=''
- end
- selected_db=case cgi['db']
- when /SiSU_pace/; '<option value="SiSU_pace">pace</option>'
- when /SiSU_sisu/; '<option value="SiSU_sisu">sisu</option>'
- end
- dbi="dbi:Pg:database=#{@db};port=#{@port}"
- @conn=DBI.connect(dbi,user)
- search_field=cgi['find'] if cgi['find'] # =~/\S+/
- @search_for=Search_request.new(search_field,q) #.analyze #% search_for
- #% searches
- #Canned_search.new(@base,@search_for.text1,cgi)
- if @search_for.text1=~/\S+/ or @search_for.author=~/\S+/ #and search_field =~/\S/
- s1='s1=' + CGI.escape(@search_for.text1) if @search_for.text1=~/\S/
- key='key=' + CGI.escape(@search_for.keywords) if @search_for.keywords=~/\S/
- ti='&ti=' + CGI.escape(@search_for.title) if @search_for.title=~/\S/
- au='&au=' + CGI.escape(@search_for.author) if @search_for.author=~/\S/
- sj='&sj=' + CGI.escape(@search_for.subject) if @search_for.subject=~/\S/
- dsc='&dsc=' + CGI.escape(@search_for.description) if @search_for.description=~/\S/
- pb='&pb=' + CGI.escape(@search_for.publisher) if @search_for.publisher=~/\S/
- cntr='&cntr=' + CGI.escape(@search_for.contributor) if @search_for.contributor=~/\S/
- dt='&dt=' + CGI.escape(@search_for.date) if @search_for.date=~/\S/
- ty='&ty=' + CGI.escape(@search_for.type) if @search_for.type=~/\S/
- id='&id=' + CGI.escape(@search_for.identifier) if @search_for.identifier=~/\S/
- src='&src=' + CGI.escape(@search_for.source) if @search_for.source=~/\S/
- lang='&lang=' + CGI.escape(@search_for.language) if @search_for.language=~/\S/
- rel='&rel=' + CGI.escape(@search_for.relation) if @search_for.relation=~/\S/
- cov='&cov=' + CGI.escape(@search_for.coverage) if @search_for.coverage=~/\S/
- cr='&cr=' + CGI.escape(@search_for.rights) if @search_for.rights=~/\S/
- co='&co=' + CGI.escape(@search_for.comment) if @search_for.comment=~/\S/
- ab='&ab=' + CGI.escape(@search_for.abstract) if @search_for.abstract=~/\S/
- dtc='&dtc=' + CGI.escape(@search_for.date_created) if @search_for.date_created=~/\S/
- dti='&dti=' + CGI.escape(@search_for.date_issued) if @search_for.date_issued=~/\S/
- dtm='&dtm=' + CGI.escape(@search_for.date_modified) if @search_for.date_modified=~/\S/
- dta='&dta=' + CGI.escape(@search_for.date_available) if @search_for.date_available=~/\S/
- dtv='&dtv=' + CGI.escape(@search_for.date_valid) if @search_for.date_valid=~/\S/
- fns='&fns=' + CGI.escape(@search_for.filename) if @search_for.filename=~/\S/
- @@canned_search_url=if checked_all =~/checked/
- "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1"
- else "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}"
- end
- @canned_base_url="#@base?#{s1}&db=#{cgi['db']}"
- if checked_case=~/\S/
- @search[:text][1]=%{documents.clean~'#{@search_for.text1}'} #s1
- @search[:endnotes][1]=%{endnotes.clean~'#{@search_for.text1}'} #s1
- else
- @search[:text][1]=%{documents.clean~*'#{@search_for.text1}'} #s1
- @search[:endnotes][1]=%{endnotes.clean~*'#{@search_for.text1}'} #s1
- end
- canned_note='search url:'
- else
- @@canned_search_url="#@base?s1=United+Nations&db=documents&view=index"
- canned_note='search url example:'
- end
- if search_field =~/\S+/
- analyze_format=search_field.gsub(/\s*\n/,'; ')
- elsif checked_all =~/checked/ or checked_url =~/checked/
- canned_search=@@canned_search_url.scan(/(?:s1|au|ti|fns)=[^&]+/)
- af=canned_search.join('; ')
- af.gsub!(/s1=/,'text: ')
- af.gsub!(/au=/,'author: ')
- af.gsub!(/ti=/,'title: ')
- af.gsub!(/fns=/,'filename: ')
- af.gsub!(/%2B/,' ')
- analyze_format=af
- st=af.split(/\s*;\s*/)
- search_field=st.join("\n")
- end
- green=%{<font size="2" color="#004000">}
- canned_search_url_txt=CGI.escapeHTML(@@canned_search_url)
- the_can=%{<font size="2" color="#666666">#{canned_note} <a href="#{@@canned_search_url}">#{canned_search_url_txt}</a></font><br />}
- p_text=p_keywords=p_title=p_author=p_subject=p_description=p_publisher=p_contributor=p_date=p_type=p_format=p_identifier=p_source=p_language=p_relation=p_coverage=p_rights=p_comment=p_abstract=p_subject=p_filename=''
- p_text=%{text: #{green}#{@search_for.text1}</font><br />} if @search_for.text1 =~/\S+/
- p_keywords=%{keywords: #{green}#{@search_for.keywords}</font><br />} if @search_for.keywords =~/\S+/
- p_title=%{title: #{green}#{@search_for.title}</font><br />} if @search_for.title =~/\S+/
- p_author=%{author: #{green}#{@search_for.author}</font><br />} if @search_for.author =~/\S+/
- p_subject=%{subject: #{green}#{@search_for.subject}</font><br />} if @search_for.subject =~/\S+/
- p_description=%{description: #{green}#{@search_for.description}</font><br />} if @search_for.description =~/\S+/
- p_publisher=%{publisher: #{green}#{@search_for.publisher}</font><br />} if @search_for.publisher =~/\S+/
- p_contributor=%{contributor: #{green}#{@search_for.contributor}</font><br />} if @search_for.contributor =~/\S+/
- p_date=%{date: #{green}#{@search_for.date}</font><br />} if @search_for.date =~/\S+/
- p_type=%{type: #{green}#{@search_for.type}</font><br />} if @search_for.type =~/\S+/
- p_format=%{format: #{green}#{@search_for.format}</font><br />} if @search_for.format =~/\S+/
- p_identifier=%{identifier: #{green}#{@search_for.identifier}</font><br />} if @search_for.identifier =~/\S+/
- p_source=%{source: #{green}#{@search_for.source}</font><br />} if @search_for.source =~/\S+/
- p_language=%{language: #{green}#{@search_for.language}</font><br />} if @search_for.language =~/\S+/
- p_relation=%{relation: #{green}#{@search_for.relation}</font><br />} if @search_for.relation =~/\S+/
- p_coverage=%{coverage: #{green}#{@search_for.coverage}</font><br />} if @search_for.coverage =~/\S+/
- p_rights=%{rights: #{green}#{@search_for.rights}</font><br />} if @search_for.rights =~/\S+/
- p_comment=%{comment: #{green}#{@search_for.comment}</font><br />} if @search_for.comment =~/\S+/
- p_abstract=%{abstract: #{green}#{@search_for.abstract}</font><br />} if @search_for.abstract =~/\S+/
- p_filename=%{filename: #{green}#{@search_for.filename}</font><br />} if @search_for.filename =~/\S+/
- search_note=<<-WOK
- <font size="2" color="#666666">
- <b>database:</b> #{green}#@db</font>; <b>selected view:</b> #{green}#{cgi['view']}</font>
- <b>search string:</b> "#{green}#{analyze_format}</font>"<br />
- #{p_text} #{p_keywords} #{p_title} #{p_author} #{p_subject} #{p_description} #{p_publisher} #{p_contributor} #{p_date} #{p_type} #{p_format} #{p_identifier} #{p_source} #{p_language} #{p_relation} #{p_coverage} #{p_rights} #{p_comment} #{p_abstract} #{p_filename}
- </font>
- WOK
- #eg = %{canned search e.g.:<br /> <a href="#{url}">#{url}</a><br />find: #{analyze}<br />database: #{database}}
- #dbi_canning
- @header=Form.new(@base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form
- unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/
- print "Content-type: text/html\n\n"
- puts (@header+@tail)
- else #% searches
- s1=if @search_for.text1 =~/\S/
- @search_for.text1
- else 'Unavailable'
- end
- if checked_case=~/\S/
- @search[:text]<<%{documents.clean~'#{CGI.unescape(s1)}'}
- @search[:endnotes]<<%{endnotes.clean~'#{CGI.unescape(s1)}'}
- else
- @search[:text]<<%{documents.clean~*'#{CGI.unescape(s1)}'}
- @search[:endnotes]<<%{endnotes.clean~*'#{CGI.unescape(s1)}'}
- end
- #dbi_request
- dbi_statement=Dbi_search_statement.new(@conn,@search_for,q,checked_case)
- @text_search_flag=false
- @text_search_flag=dbi_statement.text_search_flag
- s_contents=dbi_statement.contents
- s_endnotes=dbi_statement.endnotes
- @body_main,@endnotes=[],[]
- @search_regx=nil
- oldtid=0
- if @text_search_flag
- if checked_sql =~/\S/
- sql_select_body=dbi_statement.sql_select_body_format
- sql_select_endnotes=dbi_statement.sql_select_endnotes_format
- else sql_select_body,sql_select_endnotes='',''
- end
- @body_main << '<p><hr><br /><b>Main Text:</b><br />' << sql_select_body
- @endnotes << '<p><hr><br /><b>Endnotes:</b><br />' << sql_select_endnotes
- else
- end
- #text_objects_body
- s_contents.each do |c| #% text body
- location=c['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
- file_suffix=c['filename'][/.+?\.(_?sst|ssm)$/,1]
- lang=if location =~ /\S+?~(\S\S\S?)$/
- l=location[/\S+?~(\S\S\S?)$/,1]
- location.gsub!(/(\S+?)~\S\S\S?/,'\1')
- l=".#{l}"
- else ''
- end
- #metadata_found_body
- if c['tid'].to_i != oldtid.to_i
- ti=if c['subtitle'] =~/\S+/; "#{c['title']} - #{c['subtitle']}"
- else c['title']
- end
- can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- else %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- end
- title=%{<span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{c['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a> <a href="#@hosturl_files/#@stub/#{location}/portrait#{lang}.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a> <a href="#@hosturl_files/#@stub/#{location}/landscape#{lang}.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a> <a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a> <a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ #hmm watch file_suffix
- if @text_search_flag; title='<br /><hr>'+title
- else title='<br />'+title
- end
- @counter_txt_doc+=1
- oldtid=c['tid'].to_i
- else title=''
- end
- if @text_search_flag
- if cgi['view']=~/text/ #% txt body
- text=if c['suffix'] !~/1/ #seg
- if @search_for.text1 =~/\S+/ or q['s1'] =~/\S+/ #% only this branch is working !!
- unescaped_search=if @search_for.text1 =~/\S+/; CGI.unescape(@search_for.text1)
- elsif q['s1'] =~/\S+/; CGI.unescape(q['s1'])
- else nil
- end
- @search_regx=if unescaped_search #check
- search_regex=[]
- build=unescaped_search.scan(/\S+/).each do |g|
- if g.to_s =~/(AND|OR)/
- search_regex << '|'
- else search_regex << %{#{g.to_s}}
- end
- end
- search_regex=search_regex.join(' ')
- search_regex=search_regex.gsub(/\s*\|\s*/,'|')
- Regexp.new(search_regex, Regexp::IGNORECASE)
- else nil
- end
- else nil
- end
- matched_para=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
- matched=c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
- else c['body']
- end
- %{<hr><p><font size="2">ocn <b><a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
- elsif c['suffix'] =~/1/ #doc
- %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
- end
- @counter_txt_ocn+=1
- output=if c['seg'] =~/\S+/; title+text
- else text
- end
- elsif cgi['view']=~/index/ #% idx body
- if c['suffix'] !~/1/ #seg
- index=%{<a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
- elsif c['suffix'] =~/1/ #doc
- index=%{<a href="#@hosturl_files/#@stub/#{location}/doc#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, }
- end
- if c['seg'] =~/\S+/
- if @text_search_flag
- @counter_txt_ocn+=1
- output=title+index
- end
- else
- @counter_txt_ocn+=1
- output=unless c['suffix'] =~/1/; title+index
- else %{#{title}#{c['ocn'].sort}, }
- end
- end
- end
- else output=title
- end
- @counters_txt=if @counter_txt_doc > 0
- if checked_stats =~/\S/
- @@lt_t=if @counter_txt_ocn == dbi_statement.sql_limit.to_i
- over='over'
- true
- else
- over=''
- false
- end
- %{<hr /><font size="2" color="#666666">Found in the main body of #@counter_txt_doc documents, and at #{over} #@counter_txt_ocn locations within.</font><br />}
- else ''
- end
- else ''
- end
- @body_main << output #+ details
- end
- #text_objects_endnote
- oldtid = 0
- s_endnotes.each do |e| #% endnotes
- location=e['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
- file_suffix=e['filename'][/.+?\.(_?sst|ssm)$/,1]
- lang=if location =~ /\S+?~(\S\S\S?)$/
- l=location[/\S+?~(\S\S\S?)$/,1]
- location.gsub!(/(\S+?)~\S\S\S?/,'\1')
- l=".#{l}"
- else ''
- end
- #metadata_found_endnotes
- if @text_search_flag
- if e['metadata_tid'].to_i != oldtid.to_i
- ti=if e['subtitle'] =~/\S+/; "#{e['title']} - #{e['subtitle']}"
- else e['title']
- end
- can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- else %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- end
- title=%{<br /><hr><span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{e['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a> <a href="#@hosturl_files/#@stub/#{location}/portrait.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a><a href="#@hosturl_files/#@stub/#{location}/landscape.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a> <a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a> <a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/
- @counter_endn_doc+=1
- oldtid=e['metadata_tid'].to_i
- else title = ''
- end
- if cgi['view']=~/text/ #% txt endnotes
- @counter_endn_ocn+=1
- matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
- matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
- else e['body']
- end
- output=%{#{title}<hr><font size="2">note <b><a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
- elsif cgi['view']=~/index/ #% idx endnotes
- @counter_endn_ocn+=1
- output=%{#{title}<a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>], }
- end
- @counters_endn=if @counter_endn_doc > 0
- if checked_stats =~/\S/
- @@lt_e=if @counter_endn_ocn == dbi_statement.sql_limit.to_i
- over='over'
- true
- else
- over=''
- false
- end
- %{<font size="2" color="#666666">Found in the endnotes of #@counter_endn_doc documents, and at #{over} #@counter_endn_ocn locations within.</font><br />}
- else ''
- end
- end
- @endnotes << output #+ details
- else @endnotes=[] #does not take out yet
- end
- end
- offset=dbi_statement.sql_offset.to_s
- limit=dbi_statement.sql_limit.to_s
- @@lt_t ||=false; @@lt_e ||=false
- canned=if (@@lt_t or @@lt_e)
- dbi_statement.sql_canned_search_url(true).to_s
- else
- dbi_statement.sql_canned_search_url(false).to_s
- end
- limit=dbi_statement.sql_limit.to_s
- cgi.out{@header + @counters_txt + @counters_endn + @body_main.join + @endnotes.join + canned + @tail} #% print cgi_output_header+counters+body+endnotes
- end
- rescue Exception => e
- s='<pre>' + CGI::escapeHTML(e.backtrace.reverse.join("\n"))
- s << CGI::escapeHTML(e.message) + '</pre>'
- cgi.out{s}
- next
- ensure # eg. disconnect from server
- @conn.disconnect if @conn
- end
- end
diff --git a/data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi b/data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi
deleted file mode 100644
index 34bb3748..00000000
--- a/data/sisu/v4/conf/cgi-bin/sisu_search_sqlite.cgi
+++ /dev/null
@@ -1,901 +0,0 @@
-#!/usr/bin/env ruby
-=begin
- * Name: SiSU information Structuring Universe
- * Author: Ralph Amissah
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
-
- * Description: generates naive cgi search form for search of sisu database (sqlite)
- * Name: SiSU generated sample cgi search form
-
- * Description: generated sample cgi search form for SiSU
- (SiSU is a framework for document structuring, publishing and search)
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah All Rights Reserved.
-
- * License: GPL 3 or later:
-
- SiSU, a framework for document structuring, publishing and search
-
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007 Ralph Amissah
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-
- If you have Internet connection, the latest version of the GPL should be
- available at these locations:
- <http://www.fsf.org/licenses/gpl.html>
- <http://www.gnu.org/copyleft/gpl.html>
- <http://www.jus.uio.no/sisu/gpl.fsf>
-
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
-
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
-
- * Download:
- <http://www.jus.uio.no/sisu/SiSU/download.html>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
-=end
- require 'cgi'
- require 'fcgi'
- require 'dbi'
- @version='sisu_search_sqlite'
- @image_src="http://localhost/sisu/_sisu/image"
- @hosturl_db="http://localhost"
- @hosturl_files="http://www.jus.uio.no"
- @@limit,@@offset=1000,0
- @base="#@hosturl_db/cgi-bin/#@version.cgi"
- @@canned_search_url=@base
- @color_heading='#DDFFAA'
- @color_match='#ffff48'
- class Form
- def initialize(base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can='')
- search_note='' if checked_searched !~/\S/
- the_can='' if checked_url !~/\S/
- search_field='' if checked_echo !~/\S/
- @base,@search_field,@selected_db,@checked_index,@checked_text,@checked_tip,@checked_stats,@checked_searched,@checked_url,@checked_case,@checked_echo,@checked_sql,@checked_all,@checked_none,@checked_selected,@checked_default,@search_note,@the_can=base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can
- @tip=if checked_tip =~/\S/
- '<font size="2" color="#666666">text:__; keywords:__; title:__; author:__; subject:__; description:__; publisher:__; contributor:__; date:__; type:__; format:__; identifier:__; source:__; language:__; relation:__; coverage:__; rights:__; comment:__; abstract:__; filename:__;</font><br />'
- else ''
- end
- end
- def submission_form
- search_form=<<-WOK
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>
- SiSU search form (sample): SiSU information Structuring Universe
- </title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <meta name="sourcefile" content="SiSU._sst" />
- <link rel="generator" href="http://www.jus.uio.no/sisu" />
- <link rel="shortcut icon" href="http://localhost/sisu/_sisu/image/rb7.ico" />
- <link rel="stylesheet" href="../_sisu/css/html.css" type="text/css" />
- </head>
- <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
- <table summary="band" border="0" cellpadding="3" cellspacing="0">
- <tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="http://localhost/sisu/_sisu/image/sisu.png" alt="SiSU --&gt;" /></a></td><td>
-<!-- <p class="tiny"><a href="http://www.jus.uio.no/sisu/SiSU/">&nbsp;http://www.jus.uio.no/sisu/SiSU/</a></p> -->
- <label for="find"><b>sample search form</b></label>
- </td></tr>
- </table>
- <form action="#@base" id="Test Form" method="post">
- <table cellpadding="2">
- <tr><td valign=\"top\">
- <textarea id="find" name="find" type="text" rows="6" cols="40" maxlength="256">#@search_field</textarea>
- </td>
- <td valign=\"top\">
- #@tip
- #@search_note
- #@the_can
- </td></tr></table>
- <td valign=\"top\"><tr><td>
- <!input type="text" id="find" name="find" value="#@search_field" />
- <!input type="text" id="find" name="find" value="" />
- <font size="2" color="#222222">
- <b>to search:</b> select which database to search (drop-down menu below); enter your search query (in the form above); and <b>click on the search button</b> (below)
- <br />
- <select name="db" size="1">
- #@selected_db
- <option value="SiSU_pace">pace</option>
- <option value="SiSU_sisu">sisu</option>
- </select>
- <input type="submit" value="SiSU search" />
- <input type="radio" name="view" value="index" #@checked_index> index
- <input type="radio" name="view" value="text" #@checked_text> text / grep
- <br />
- <input type="checkbox" name="echo" #@checked_echo> echo query
- <input type="checkbox" name="stats" #@checked_stats> result stats
- <input type="checkbox" name="url" #@checked_url> search url
- <input type="checkbox" name="searched" #@checked_searched> searched
- <input type="checkbox" name="tip" #@checked_tip> available fields
- <input type="checkbox" name="sql" #@checked_sql> sql statement
- <br />
- checks:
- <input type="radio" name="checks" value="check_default" #@checked_default> default
- <input type="radio" name="checks" value="check_selected" #@checked_selected> selected
- <input type="radio" name="checks" value="check_all" #@checked_all> all
- <input type="radio" name="checks" value="check_none" #@checked_none> none
- </font>
- </td></tr>
- </table>
- </form>
- WOK
- end
- end
- class Search_request #% search_for
- attr_accessor :text1,:keywords,:title,:author,:subject,:description,:publisher,:contributor,:date,:type,:format,:identifier,:source,:language,:relation,:coverage,:rights,:comment,:abstract,:owner,:date_created,:date_issued,:date_modified,:date_available,:date_valid,:filename
- def initialize(search_field='',q='')
- @search_field,@q=search_field,q
- @text1=@keywords=@title=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@comment=@abstract=@owner=@date_created=@date_issued=@date_modified=@date_available=@date_valid=@filename=''
- if @search_field=~/\S/
- @text1=text_to_match('text:')
- @keywords=text_to_match('key(?:words?)?:')
- @title=text_to_match('title:') # DublinCore 1 - title
- @author=text_to_match('(?:author|creator)s?:') # DublinCore 2 - creator/author
- @subject=text_to_match('subj(?:ect)?:') # DublinCore 3 - subject
- @description=text_to_match('description:') # DublinCore 4 - description
- @publisher=text_to_match('pub(?:lisher)?:') # DublinCore 5 - publisher
- @contributor=text_to_match('contributor:') # DublinCore 6 - contributor
- @date=text_to_match('date:') # DublinCore 7 - date dd-mm-yy
- @type=text_to_match('type:') # DublinCore 8 - type
- @format=text_to_match('format:') # DublinCore 9 - format
- @identifier=text_to_match('identifier:') # DublinCore 10 - identifier
- @source=text_to_match('source:') # DublinCore 11 - source
- @language=text_to_match('language:') # DublinCore 12 - language
- @relation=text_to_match('relation:') # DublinCore 13 - relation
- @coverage=text_to_match('coverage:') # DublinCore 14 - coverage
- @rights=text_to_match('rights:') # DublinCore 15 - rights
- @comment=text_to_match('comment:')
- @abstract=text_to_match('abs(?:tract)?:')
- @owner=text_to_match('owner:')
- @date_created=text_to_match('date_created:')
- @date_issued=text_to_match('date_issued:')
- @date_modified=text_to_match('date_modified:')
- @date_available=text_to_match('date_available:')
- @date_valid=text_to_match('date_valid:')
- @filename=text_to_match('filename:')
- @text1=text_to_match unless @keywords or @author or @title or @text1 or @comment or @abstract or @rights or @subject or @publisher or @date or @filename
- else
- @text1=q['s1'] if q['s1']=~/\S/
- @keywords=q['key'] if q['key']=~/\S/
- @title=q['ti'] if q['ti']=~/\S/
- @author=q['au'] if q['au']=~/\S/
- @subject=q['sj'] if q['sj']=~/\S/
- @description=q['dsc'] if q['dsc']=~/\S/
- @publisher=q['pb'] if q['pb']=~/\S/
- @contributor=q['cntr'] if q['cntr']=~/\S/
- @date=q['dt'] if q['dt']=~/\S/
- @type=q['ty'] if q['ty']=~/\S/
- @identifier=q['id'] if q['id']=~/\S/
- @source=q['src'] if q['src']=~/\S/
- @language=q['lang'] if q['lang']=~/\S/
- @relation=q['rel'] if q['rel']=~/\S/
- @coverage=q['cov'] if q['cov']=~/\S/
- @rights=q['cr'] if q['cr']=~/\S/
- @comment=q['co'] if q['co']=~/\S/
- @abstract=q['ab'] if q['ab']=~/\S/
- @date_created=q['dtc'] if q['dtc']=~/\S/
- @date_issued=q['dti'] if q['dti']=~/\S/
- @date_modified=q['dtm'] if q['dtm']=~/\S/
- @date_available=q['dta'] if q['dta']=~/\S/
- @date_valid=q['dtv'] if q['dtv']=~/\S/
- @filename=q['fns'] if q['fns']=~/\S/
- @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000
- @@offset=q['off'] if q['off']=~/\d+/ # 0
- end
- end
- def text_to_match(identifier='')
- m={
- :string => /#{identifier}\s*(.+?)/,
- :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/,
- :word => /#{identifier}[\s(]*(\S+)/
- }
- search_string=if @search_field =~m[:word]
- search_string=if @search_field =~m[:braces]; m[:braces].match(@search_field)[1]
- elsif @search_field =~m[:string]; m[:string].match(@search_field)[1]
- else
- str=m[:word].match(@search_field)[1]
- str.gsub!(/[()]/,'')
- str
- end
- search_string.strip!
- search_string.gsub!(/\s+/,'+')
- search_string
- #else
- # "__"
- end
- end
- end
- class Dbi_search_string
- def initialize(l,t,q,cse=false)
- @l,@t,@q=l,t,q
- end
- def string
- search={ :search => [],:flag => false }
- if @t =~/\S+/ or @q =~/\S+/
- if @t =~/\S+/; unescaped_search=CGI.unescape(@t)
- elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q)
- end
- search_construct=[]
- unescaped_search.gsub!(/\s*(AND|OR)\s*/,"%' \) \\1 #@l LIKE \( '%")
- unescaped_search.gsub!(/(.+)/,"#@l LIKE \( '%\\1%' \)")
- search_construct << unescaped_search
- search_construct=search_construct.join(' ')
- search[:search] << search_construct
- search[:flag]=true
- search
- end
- search
- end
- end
- class Dbi_search_statement
- attr_reader :text_search_flag,:sql_select_body_format,:sql_select_endnotes_format,:sql_offset,:sql_limit
- def initialize(conn,search_for,q,c)
- @conn=conn
- @text_search_flag=false
- @sql_statement={ :body=>'',:endnotes=>'',:range=>'' }
- #@offset||=@@offset
- #@offset+=@@limit
- search={ :text => [],:endnotes => [] }
- cse=if c =~/\S/; true
- else false
- end
- st=Dbi_search_string.new('documents.clean',search_for.text1,q['s1'],cse).string
- se=Dbi_search_string.new('endnotes.clean',search_for.text1,q['s1'],cse).string
- @text_search_flag=st[:flag]
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << se[:search]
- end
- st=Dbi_search_string.new('metadata.keywords',search_for.keywords,q['key'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.title',search_for.title,q['ti'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.creator',search_for.author,q['au'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.subject',search_for.subject,q['sj'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.description',search_for.description,q['dsc'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.publisher',search_for.publisher,q['pb'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.contributor',search_for.contributor,q['cntr'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.date',search_for.date,q['dt'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.type',search_for.type,q['ty'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.identifier',search_for.identifier,q['id'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.source',search_for.source,q['src'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.language',search_for.language,q['lang'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.relation',search_for.relation,q['rel'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.coverage',search_for.coverage,q['cov'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.rights',search_for.rights,q['cr'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.comment',search_for.comment,q['co'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.abstract',search_for.abstract,q['ab'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=Dbi_search_string.new('metadata.filename',search_for.filename,q['fns'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000
- @@offset=q['off'] if q['off']=~/\d+/ # 0
- @search_text,@search_endnotes=[],[]
- #%
- search[:text].each{|x| @search_text << "#{x} AND " }
- @search_text=@search_text.to_s.gsub!(/AND\s+$/,'')
- @search_text.gsub!(/(documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)')
- search[:endnotes].each{|x| @search_endnotes << "#{x} AND " }
- @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'')
- @search_text.gsub!(/(endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)')
- end
- def sql_offset
- @@offset
- end
- def sql_limit
- @@limit
- end
- def sql_canned_search
- @offset_next=sql_offset.to_i + sql_limit.to_i
- @offset_previous=sql_offset.to_i - sql_limit.to_i
- def current
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + sql_offset.to_s
- end
- def next
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + @offset_next.to_s
- end
- def previous
- @offset_previous >= 0 ? (@@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + @offset_previous.to_s) : ''
- end
- def start
- @@canned_search_url.to_s + '&ltd=' + sql_limit.to_s + '&off=' + 0.to_s
- end
- self
- end
- def sql_canned_search_url(ok)
- if ok
- can=sql_canned_search
- page=(sql_offset.to_i + sql_limit.to_i)/sql_limit.to_i
- case page.to_s
- when /^1$/
- %{<hr /><br /><center>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- when /^2$/
- %{<hr /><br /><center>
- <a href="#{can.previous}">&lt;&nbsp;&nbsp;</a>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- else
- %{<hr /><br /><center>
- <a href="#{can.start}">|&lt;&nbsp;&nbsp;</a>
- <a href="#{can.previous}">&lt;&nbsp;&nbsp;</a>
- pg. #{page.to_s}
- <a href="#{can.next}">&nbsp;&nbsp;&gt;</a>
- </center>}
- end
- else ''
- end
- end
- def sql_select_body
- limit ||=@@limit
- offset ||=@@offset
- @sql_statement[:body]=%{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, metadata.suffix, documents.body, documents.seg, documents.ocn, metadata.tid FROM documents, metadata WHERE #{@search_text} AND documents.metadata_tid = metadata.tid ORDER BY metadata.title, metadata.filename, documents.ocn}
- @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
- select=@sql_statement[:body] + ' ' + @sql_statement[:range]
- select
- end
- def sql_select_endnotes
- limit ||=@@limit
- offset ||=@@offset
- @sql_statement[:endnotes]= %{SELECT metadata.title, metadata.subtitle, metadata.creator, metadata.filename, endnotes.body, endnotes.nr, endnotes.ocn, endnotes.metadata_tid FROM metadata, endnotes WHERE #{@search_endnotes} AND metadata.tid = endnotes.metadata_tid ORDER BY metadata.title, metadata.filename, endnotes.nr}
- @sql_statement[:range]=%{LIMIT #{limit} OFFSET #{offset} ;}
- select=@sql_statement[:endnotes] + ' ' + @sql_statement[:range]
- select
- end
- def sql_select_body_format
- %{<font color="#666666" size="2">#{sql_select_body}</font>}
- end
- def sql_select_endnotes_format
- %{<font color="#666666" size="2">#{sql_select_endnotes}</font>}
- end
- def contents
- @conn.select_all(sql_select_body)
- end
- def endnotes
- @conn.select_all(sql_select_endnotes)
- end
- end
- def tail
- <<-'WOK'
- <br /><hr /><br />
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="2" border="0">
- <!-- widget sisu -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="http://www.jus.uio.no/sisu" >
- <img border="0" src="http://localhost/sisu/_sisu/image/sisu.png" alt="SiSU" width="120" height="39" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
-<!-- SiSU Rights -->
- <p class="tiny_left"><font color="#666666" size="2">
- Generated by
- <a href="http://www.jus.uio.no/sisu" >
- SiSU</a> 0.55.3 2007-07-10 (2007w28/2)
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- <b>SiSU</b></a> <sup>&copy;</sup> Ralph Amissah
- 1993, current 2007.
- All Rights Reserved.
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- SiSU</a>
- is software for document structuring, publishing and search,
- <br />
- <a href="http://www.jus.uio.no/sisu" >
- www.jus.uio.no/sisu
- </a>
- and
- <a href="http://www.sisudoc.org" >
- www.sisudoc.org
- </a>
- <br />
- <i>w3 since October 3 1993</i>
- <a href="mailto://ralph@amissah.com" >
- ralph@amissah.com
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU using:
- <br />Standard SiSU markup syntax,
- <br />Standard SiSU meta-markup syntax, and the
- <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
- <br />
- <sup>&copy;</sup> Ralph Amissah 1997, current 2007.
- All Rights Reserved.
- </font></p>
-</td></tr>
- <!-- widget way better -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="http://www.gnu.org/licenses/gpl.html">
- <img border="0" src="http://localhost/sisu/_sisu/image/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU is released under
- <a href="http://www.gnu.org/licenses/gpl.html">GPL&nbsp;v3</a>
- or later,
- <a href="http://www.gnu.org/licenses/gpl.html">
- http://www.gnu.org/licenses/gpl.html
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- SiSU, developed using
- <a href="http://www.ruby-lang.org/en/">
- Ruby
- </a>
- on
- <a href="http://www.debian.org/">
- Debian/Gnu/Linux
- </a>
- software infrastructure,
- with the usual GPL (or OSS) suspects.
- <br />
- Better - "performance, reliability, scalability, security &amp; total cost of ownership"
- [not to mention flexibility &amp; choice]
- <br />
- Get With the Future
- <a href="http://www.jus.uio.no/sisu/">
- Way Better!
- </a>
- </font></p>
-</td></tr>
-</table>
- <a name="bottom" id="bottom"></a><a name="down" id="down"></a><a name="end" id="end"></a><a name="finish" id="finish"></a><a name="stop" id="stop"></a><a name="credits" id="credits"></a>
- </body></html>
- WOK
- end
- @tail=tail
- @counter_txt_doc,@counter_txt_ocn,@counter_endn_doc,@counter_endn_ocn=0,0,0,0
- @counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','',''
- FCGI.each_cgi do |cgi|
- begin # all code goes in begin section
- @search={ :text => [],:endnotes => [] }
- q=CGI.new
- @db=if cgi['db'] =~/\S+/;
- @stub=/SiSU_(\S+)/.match(cgi['db'])[1]
- cgi['db']
- else
- @stub='sisu'
- 'SiSU_sisu'
- end
- checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','',''
- if cgi['view']=~/text/; checked_index,checked_text='','checked'
- else checked_index,checked_text='checked',''
- end
- checked_echo='checked' if cgi['echo'] =~/\S/
- checked_stats='checked' if cgi['stats'] =~/\S/
- checked_url='checked' if cgi['url'] =~/\S/ or cgi['u'].to_i==1
- checked_searched='checked' if cgi['searched'] =~/\S/
- checked_tip='checked' if cgi['tip'] =~/\S/
- checked_case='checked' if cgi['casesense'] =~/\S/
- checked_sql='checked' if cgi['sql'] =~/\S/
- if cgi['checks'] =~/check_all/ or cgi['check_all'] =~/\S/ or cgi['a'].to_i==1
- checked_all='checked'
- checked_echo=checked_stats=checked_url=checked_searched=checked_tip=checked_sql='checked'
- checked_none=''
- elsif cgi['checks'] =~/check_none/
- checked_none='checked'
- checked_all=checked_url=checked_stats=checked_searched=checked_tip=checked_echo=checked_sql=''
- elsif cgi['checks'] =~/check_selected/
- checked_selected='checked'
- elsif cgi['checks'] =~/check_default/
- checked_default='checked'
- checked_echo=checked_stats=checked_url='checked'
- checked_searched=checked_tip=checked_case=checked_sql=''
- else
- checked_selected='checked'
- checked_echo=checked_stats=checked_url='checked'
- checked_searched=checked_tip=checked_case=checked_sql=''
- end
- selected_db=case cgi['db']
- when /SiSU_pace/; '<option value="SiSU_pace">pace</option>'
- when /SiSU_sisu/; '<option value="SiSU_sisu">sisu</option>'
- end
- db_name='sisu_sqlite.db'
- db_sqlite=case cgi['db']
- when /SiSU_pace/; "/home/ralph/sisu_www/pace/sisu_sqlite.db"
- when /SiSU_sisu/; "/home/ralph/sisu_www/sisu/sisu_sqlite.db"
- end
- @dbi="DBI:SQLite:#{db_sqlite}" #sqlite3 ?
- @conn=DBI.connect(@dbi)
- search_field=cgi['find'] if cgi['find'] # =~/\S+/
- @search_for=Search_request.new(search_field,q) #.analyze #% search_for
- #% searches
- #Canned_search.new(@base,@search_for.text1,cgi)
- if @search_for.text1=~/\S+/ or @search_for.author=~/\S+/ #and search_field =~/\S/
- s1='s1=' + CGI.escape(@search_for.text1) if @search_for.text1=~/\S/
- key='key=' + CGI.escape(@search_for.keywords) if @search_for.keywords=~/\S/
- ti='&ti=' + CGI.escape(@search_for.title) if @search_for.title=~/\S/
- au='&au=' + CGI.escape(@search_for.author) if @search_for.author=~/\S/
- sj='&sj=' + CGI.escape(@search_for.subject) if @search_for.subject=~/\S/
- dsc='&dsc=' + CGI.escape(@search_for.description) if @search_for.description=~/\S/
- pb='&pb=' + CGI.escape(@search_for.publisher) if @search_for.publisher=~/\S/
- cntr='&cntr=' + CGI.escape(@search_for.contributor) if @search_for.contributor=~/\S/
- dt='&dt=' + CGI.escape(@search_for.date) if @search_for.date=~/\S/
- ty='&ty=' + CGI.escape(@search_for.type) if @search_for.type=~/\S/
- id='&id=' + CGI.escape(@search_for.identifier) if @search_for.identifier=~/\S/
- src='&src=' + CGI.escape(@search_for.source) if @search_for.source=~/\S/
- lang='&lang=' + CGI.escape(@search_for.language) if @search_for.language=~/\S/
- rel='&rel=' + CGI.escape(@search_for.relation) if @search_for.relation=~/\S/
- cov='&cov=' + CGI.escape(@search_for.coverage) if @search_for.coverage=~/\S/
- cr='&cr=' + CGI.escape(@search_for.rights) if @search_for.rights=~/\S/
- co='&co=' + CGI.escape(@search_for.comment) if @search_for.comment=~/\S/
- ab='&ab=' + CGI.escape(@search_for.abstract) if @search_for.abstract=~/\S/
- dtc='&dtc=' + CGI.escape(@search_for.date_created) if @search_for.date_created=~/\S/
- dti='&dti=' + CGI.escape(@search_for.date_issued) if @search_for.date_issued=~/\S/
- dtm='&dtm=' + CGI.escape(@search_for.date_modified) if @search_for.date_modified=~/\S/
- dta='&dta=' + CGI.escape(@search_for.date_available) if @search_for.date_available=~/\S/
- dtv='&dtv=' + CGI.escape(@search_for.date_valid) if @search_for.date_valid=~/\S/
- fns='&fns=' + CGI.escape(@search_for.filename) if @search_for.filename=~/\S/
- @@canned_search_url=if checked_all =~/checked/
- "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}&a=1"
- else "#@base?#{s1}#{key}#{ti}#{au}#{sj}#{dsc}#{pb}#{cntr}#{dt}#{ty}#{id}#{src}#{lang}#{rel}#{cov}#{cr}#{co}#{ab}#{dtc}#{dti}#{dtm}#{dta}#{dtv}#{fns}&db=#{cgi['db']}&view=#{cgi['view']}"
- end
- @canned_base_url="#@base?#{s1}&db=#{cgi['db']}"
- if checked_case=~/\S/
- @search[:text][1]=%{documents.clean~'#{@search_for.text1}'} #s1
- @search[:endnotes][1]=%{endnotes.clean~'#{@search_for.text1}'} #s1
- else
- @search[:text][1]=%{documents.clean~*'#{@search_for.text1}'} #s1
- @search[:endnotes][1]=%{endnotes.clean~*'#{@search_for.text1}'} #s1
- end
- canned_note='search url:'
- else
- @@canned_search_url="#@base?s1=United+Nations&db=documents&view=index"
- canned_note='search url example:'
- end
- if search_field =~/\S+/
- analyze_format=search_field.gsub(/\s*\n/,'; ')
- elsif checked_all =~/checked/ or checked_url =~/checked/
- canned_search=@@canned_search_url.scan(/(?:s1|au|ti|fns)=[^&]+/)
- af=canned_search.join('; ')
- af.gsub!(/s1=/,'text: ')
- af.gsub!(/au=/,'author: ')
- af.gsub!(/ti=/,'title: ')
- af.gsub!(/fns=/,'filename: ')
- af.gsub!(/%2B/,' ')
- analyze_format=af
- st=af.split(/\s*;\s*/)
- search_field=st.join("\n")
- end
- green=%{<font size="2" color="#004000">}
- canned_search_url_txt=CGI.escapeHTML(@@canned_search_url)
- the_can=%{<font size="2" color="#666666">#{canned_note} <a href="#{@@canned_search_url}">#{canned_search_url_txt}</a></font><br />}
- p_text=p_keywords=p_title=p_author=p_subject=p_description=p_publisher=p_contributor=p_date=p_type=p_format=p_identifier=p_source=p_language=p_relation=p_coverage=p_rights=p_comment=p_abstract=p_subject=p_filename=''
- p_text=%{text: #{green}#{@search_for.text1}</font><br />} if @search_for.text1 =~/\S+/
- p_keywords=%{keywords: #{green}#{@search_for.keywords}</font><br />} if @search_for.keywords =~/\S+/
- p_title=%{title: #{green}#{@search_for.title}</font><br />} if @search_for.title =~/\S+/
- p_author=%{author: #{green}#{@search_for.author}</font><br />} if @search_for.author =~/\S+/
- p_subject=%{subject: #{green}#{@search_for.subject}</font><br />} if @search_for.subject =~/\S+/
- p_description=%{description: #{green}#{@search_for.description}</font><br />} if @search_for.description =~/\S+/
- p_publisher=%{publisher: #{green}#{@search_for.publisher}</font><br />} if @search_for.publisher =~/\S+/
- p_contributor=%{contributor: #{green}#{@search_for.contributor}</font><br />} if @search_for.contributor =~/\S+/
- p_date=%{date: #{green}#{@search_for.date}</font><br />} if @search_for.date =~/\S+/
- p_type=%{type: #{green}#{@search_for.type}</font><br />} if @search_for.type =~/\S+/
- p_format=%{format: #{green}#{@search_for.format}</font><br />} if @search_for.format =~/\S+/
- p_identifier=%{identifier: #{green}#{@search_for.identifier}</font><br />} if @search_for.identifier =~/\S+/
- p_source=%{source: #{green}#{@search_for.source}</font><br />} if @search_for.source =~/\S+/
- p_language=%{language: #{green}#{@search_for.language}</font><br />} if @search_for.language =~/\S+/
- p_relation=%{relation: #{green}#{@search_for.relation}</font><br />} if @search_for.relation =~/\S+/
- p_coverage=%{coverage: #{green}#{@search_for.coverage}</font><br />} if @search_for.coverage =~/\S+/
- p_rights=%{rights: #{green}#{@search_for.rights}</font><br />} if @search_for.rights =~/\S+/
- p_comment=%{comment: #{green}#{@search_for.comment}</font><br />} if @search_for.comment =~/\S+/
- p_abstract=%{abstract: #{green}#{@search_for.abstract}</font><br />} if @search_for.abstract =~/\S+/
- p_filename=%{filename: #{green}#{@search_for.filename}</font><br />} if @search_for.filename =~/\S+/
- search_note=<<-WOK
- <font size="2" color="#666666">
- <b>database:</b> #{green}#@db</font>; <b>selected view:</b> #{green}#{cgi['view']}</font>
- <b>search string:</b> "#{green}#{analyze_format}</font>"<br />
- #{p_text} #{p_keywords} #{p_title} #{p_author} #{p_subject} #{p_description} #{p_publisher} #{p_contributor} #{p_date} #{p_type} #{p_format} #{p_identifier} #{p_source} #{p_language} #{p_relation} #{p_coverage} #{p_rights} #{p_comment} #{p_abstract} #{p_filename}
- </font>
- WOK
- #eg = %{canned search e.g.:<br /> <a href="#{url}">#{url}</a><br />find: #{analyze}<br />database: #{database}}
- #dbi_canning
- @header=Form.new(@base,search_field,selected_db,checked_index,checked_text,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form
- unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/
- print "Content-type: text/html\n\n"
- puts (@header+@tail)
- else #% searches
- s1=if @search_for.text1 =~/\S/
- @search_for.text1
- else 'Unavailable'
- end
- if checked_case=~/\S/
- @search[:text]<<%{documents.clean~'#{CGI.unescape(s1)}'}
- @search[:endnotes]<<%{endnotes.clean~'#{CGI.unescape(s1)}'}
- else
- @search[:text]<<%{documents.clean~*'#{CGI.unescape(s1)}'}
- @search[:endnotes]<<%{endnotes.clean~*'#{CGI.unescape(s1)}'}
- end
- #dbi_request
- dbi_statement=Dbi_search_statement.new(@conn,@search_for,q,checked_case)
- @text_search_flag=false
- @text_search_flag=dbi_statement.text_search_flag
- s_contents=dbi_statement.contents
- s_endnotes=dbi_statement.endnotes
- @body_main,@endnotes=[],[]
- @search_regx=nil
- oldtid=0
- if @text_search_flag
- if checked_sql =~/\S/
- sql_select_body=dbi_statement.sql_select_body_format
- sql_select_endnotes=dbi_statement.sql_select_endnotes_format
- else sql_select_body,sql_select_endnotes='',''
- end
- @body_main << '<p><hr><br /><b>Main Text:</b><br />' << sql_select_body
- @endnotes << '<p><hr><br /><b>Endnotes:</b><br />' << sql_select_endnotes
- else
- end
- #text_objects_body
- s_contents.each do |c| #% text body
- location=c['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
- file_suffix=c['filename'][/.+?\.(_?sst|ssm)$/,1]
- lang=if location =~ /\S+?~(\S\S\S?)$/
- l=location[/\S+?~(\S\S\S?)$/,1]
- location.gsub!(/(\S+?)~\S\S\S?/,'\1')
- l=".#{l}"
- else ''
- end
- #metadata_found_body
- if c['tid'].to_i != oldtid.to_i
- ti=if c['subtitle'] =~/\S+/; "#{c['title']} - #{c['subtitle']}"
- else c['title']
- end
- can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- else %{<a href="#{@canned_base_url}&fns=#{c['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- end
- title=%{<span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{c['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a> <a href="#@hosturl_files/#@stub/#{location}/portrait#{lang}.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a> <a href="#@hosturl_files/#@stub/#{location}/landscape#{lang}.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a> <a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a> <a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ #hmm watch file_suffix
- if @text_search_flag; title='<br /><hr>'+title
- else title='<br />'+title
- end
- @counter_txt_doc+=1
- oldtid=c['tid'].to_i
- else title=''
- end
- if @text_search_flag
- if cgi['view']=~/text/ #% txt body
- text=if c['suffix'] !~/1/ #seg
- if @search_for.text1 =~/\S+/ or q['s1'] =~/\S+/ #% only this branch is working !!
- unescaped_search=if @search_for.text1 =~/\S+/; CGI.unescape(@search_for.text1)
- elsif q['s1'] =~/\S+/; CGI.unescape(q['s1'])
- else nil
- end
- @search_regx=if unescaped_search #check
- search_regex=[]
- build=unescaped_search.scan(/\S+/).each do |g|
- if g.to_s =~/(AND|OR)/
- search_regex << '|'
- else search_regex << %{#{g.to_s}}
- end
- end
- search_regex=search_regex.join(' ')
- search_regex=search_regex.gsub(/\s*\|\s*/,'|')
- Regexp.new(search_regex, Regexp::IGNORECASE)
- else nil
- end
- else nil
- end
- matched_para=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
- matched=c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
- else c['body']
- end
- %{<hr><p><font size="2">ocn <b><a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
- elsif c['suffix'] =~/1/ #doc
- %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
- end
- @counter_txt_ocn+=1
- output=if c['seg'] =~/\S+/; title+text
- else text
- end
- elsif cgi['view']=~/index/ #% idx body
- if c['suffix'] !~/1/ #seg
- index=%{<a href="#@hosturl_files/#@stub/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
- elsif c['suffix'] =~/1/ #doc
- index=%{<a href="#@hosturl_files/#@stub/#{location}/doc#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, }
- end
- if c['seg'] =~/\S+/
- if @text_search_flag
- @counter_txt_ocn+=1
- output=title+index
- end
- else
- @counter_txt_ocn+=1
- output=unless c['suffix'] =~/1/; title+index
- else %{#{title}#{c['ocn'].sort}, }
- end
- end
- end
- else output=title
- end
- @counters_txt=if @counter_txt_doc > 0
- if checked_stats =~/\S/
- @@lt_t=if @counter_txt_ocn == dbi_statement.sql_limit.to_i
- over='over'
- true
- else
- over=''
- false
- end
- %{<hr /><font size="2" color="#666666">Found in the main body of #@counter_txt_doc documents, and at #{over} #@counter_txt_ocn locations within.</font><br />}
- else ''
- end
- else ''
- end
- @body_main << output #+ details
- end
- #text_objects_endnote
- oldtid = 0
- s_endnotes.each do |e| #% endnotes
- location=e['filename'][/(.+?)\.(?:_?sst|ssm)$/,1]
- file_suffix=e['filename'][/.+?\.(_?sst|ssm)$/,1]
- lang=if location =~ /\S+?~(\S\S\S?)$/
- l=location[/\S+?~(\S\S\S?)$/,1]
- location.gsub!(/(\S+?)~\S\S\S?/,'\1')
- l=".#{l}"
- else ''
- end
- #metadata_found_endnotes
- if @text_search_flag
- if e['metadata_tid'].to_i != oldtid.to_i
- ti=if e['subtitle'] =~/\S+/; "#{e['title']} - #{e['subtitle']}"
- else e['title']
- end
- can_txt_srch=if cgi['view']=~/index/; %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=text"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- else %{<a href="#{@canned_base_url}&fns=#{e['filename']}&view=index"><img border="0" width="12" height="12" src="#@image_src/bullet_red.png" alt="red bullet"></a> }
- end
- title=%{<br /><hr><span style="background-color: #@color_heading"><a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> by #{e['creator']} #{can_txt_srch}<a href="#@hosturl_files/#@stub/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#@image_src/b_toc.png" alt="toc html"></a> <a href="#@hosturl_files/#@stub/#{location}/portrait.pdf"><img border="0" width="15" height="18" src="#@image_src/b_pdf.png" alt="pdf portrait"></a><a href="#@hosturl_files/#@stub/#{location}/landscape.pdf"><img border="0" width="18" height="15" src="#@image_src/b_pdf.png" alt="pdf landscape"></a> <a href="#@hosturl_files/#@stub/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#@image_src/b_odf.png" alt="odf"></a> <a href="#@hosturl_files/#@stub/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#@image_src/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/
- @counter_endn_doc+=1
- oldtid=e['metadata_tid'].to_i
- else title = ''
- end
- if cgi['view']=~/text/ #% txt endnotes
- @counter_endn_ocn+=1
- matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/)
- matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{<span style="background-color: #@color_match">\\1</span>})
- else e['body']
- end
- output=%{#{title}<hr><font size="2">note <b><a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
- elsif cgi['view']=~/index/ #% idx endnotes
- @counter_endn_ocn+=1
- output=%{#{title}<a href="#@hosturl_files/#@stub/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#@hosturl_files/#@stub/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>], }
- end
- @counters_endn=if @counter_endn_doc > 0
- if checked_stats =~/\S/
- @@lt_e=if @counter_endn_ocn == dbi_statement.sql_limit.to_i
- over='over'
- true
- else
- over=''
- false
- end
- %{<font size="2" color="#666666">Found in the endnotes of #@counter_endn_doc documents, and at #{over} #@counter_endn_ocn locations within.</font><br />}
- else ''
- end
- end
- @endnotes << output #+ details
- else @endnotes=[] #does not take out yet
- end
- end
- offset=dbi_statement.sql_offset.to_s
- limit=dbi_statement.sql_limit.to_s
- @@lt_t ||=false; @@lt_e ||=false
- canned=if (@@lt_t or @@lt_e)
- dbi_statement.sql_canned_search_url(true).to_s
- else
- dbi_statement.sql_canned_search_url(false).to_s
- end
- limit=dbi_statement.sql_limit.to_s
- cgi.out{@header + @counters_txt + @counters_endn + @body_main.join + @endnotes.join + canned + @tail} #% print cgi_output_header+counters+body+endnotes
- end
- rescue Exception => e
- s='<pre>' + CGI::escapeHTML(e.backtrace.reverse.join("\n"))
- s << CGI::escapeHTML(e.message) + '</pre>'
- cgi.out{s}
- next
- ensure # eg. disconnect from server
- @conn.disconnect if @conn
- end
- end
diff --git a/data/sisu/v4/conf/completion/README b/data/sisu/v4/conf/completion/README
deleted file mode 100644
index d723a140..00000000
--- a/data/sisu/v4/conf/completion/README
+++ /dev/null
@@ -1,7 +0,0 @@
-_sisu (naive zsh completion for SiSU)
- on Debian file is located at /usr/share/sisu/conf/completion
- installation: works if copied somewhere within your $fpath
- do it yourself on Debian copy to ~/.zfunc or
- /usr/local/share/zsh/site-functions and run compinit
-
- note zsh is not installed by default on a Debian system
diff --git a/data/sisu/v4/conf/completion/_sisu b/data/sisu/v4/conf/completion/_sisu
deleted file mode 100644
index 076795cb..00000000
--- a/data/sisu/v4/conf/completion/_sisu
+++ /dev/null
@@ -1,64 +0,0 @@
-#compdef sisu
-# Copyright (C) 2006 Ralph Amissah
-# sisu, version 0.46.1
-# same license as Zsh or SiSU
-local curcontext="$curcontext" state line ret=1
-typeset -A opt_args
-_arguments -s -C -M 'r:|[_-]=* r:|=*' \
- '(--convert --to -C)-U[prints to screen url output map of available output possibilities]' \
- '(--convert --to -C)-u[url mapping of output files for requested processing flags]' \
- '(--convert --to -C)-V[more verbose than -v]' \
- '(--convert --to -C)-v[verbose]' \
- '--no-ocn[-\[hHp\]switches off object citation numbering]' \
- '--no-annotate[-\[mhHpoxXabN\] strips output text of additional editors endnotes]' \
- '(--convert --to -C)-A[plaintext with dos line-feeds, footnotes follow paragraphs in which they occur]' \
- '(--convert --to -C)-a[plaintext with Unix line-feeds, footnotes follow paragraphs in which they occur]' \
- '(--convert --to -C)-b[XHTML output]' \
- '(- *)-C[initialise site]' \
- '(--convert --to -C)-c[toggle screen color on or off depending on set default]' \
- '(--convert --to -C)-E[plaintext with dos line-feeds, endnotes following main text]' \
- '(--convert --to -C)-e[plaintext with Unix line-feeds, endnotes following main text]' \
- '(--convert --to -C)-F[generate sample cgi web search form \[--webserv=webrick for sisu webrick url\]]' \
- '(--convert --to -C -h)-H[HTML output, without link suffixes]' \
- '(--convert --to -C -H)-h[HTML output]' \
- '(--convert --to -C)-I[texinfo output, not maintained]' \
- '(--convert --to -C)-L[print license info]' \
- '(--convert --to -C)-M[maintenance mode, retain intermediate processing files]' \
- '(--convert --to -C)-m[create intermediate markup file, metaverse, assumed for most output instuctions]' \
- '(--convert --to -C)-N[document content certificate, output document digests]' \
- '(--convert --to -C)-n[skip intermediate markup, skip -m]' \
- '(--convert --to -C)-o[Open Document text format output]' \
- '(--convert --to -C)-p[LaTeX pdf output]' \
- '(--convert --to -C)-q[quiet mode]' \
- '(--convert --to -C)-R[post output to remote host using rsync, requires pre-configuration]' \
- '(--convert --to -C)-r[post output to remote host using scp, requires pre-configuration]' \
- '(--convert --to -C)-S[produces and shares tarred gzipped markup source document with associated images etc.]' \
- '(--convert --to -C)-s[shares markup source]' \
- '(--convert --to -C)-t[termsheet, preprocessing]' \
- '(- *)-W[starts ruby webrick server]' \
- '(--convert --to -C)-w[concordance file]' \
- '(--convert --to -C)-X[XML dom style]' \
- '(--convert --to -C)-x[XML sax style]' \
- '(--convert --to -C)-y[output summary page, manifest of existing generated output]' \
- '(--convert --to -C)-Z[Zap delete/destroy output]' \
- '--import[-\[Dd\] imports document to database]' \
- '--update[-\[Dd\] updates document in database]' \
- '--remove[-\[Dd\] removes document from database]' \
- '--dropall[-\[Dd\] drops database, tables, indexes, all!]' \
- '--create[-\[Dd\] creates new database - tables, indexes, etc.]' \
- '--recreate[-\[Dd\] drops database, killing data and creates new empty database - tables, indexes, etc.]' \
- '(--convert --to -C)-D[postgresql database instruction]' \
- '(--convert --to -C)-d[sqlite database instruction]' \
- '(- *)--help[display help information]' \
- '(--convert --to -C -2 -3 -4 -5)-1[shortcut, initial default -mNHwpy]' \
- '(--convert --to -C -1 -3 -4 -5)-2[shortcut, initial default -mNHwpaoy]' \
- '(--convert --to -C -1 -2 -4 -5)-3[shortcut, initial default -mNHwpaobxXy]' \
- '(--convert --to -C -1 -2 -3 -5)-4[shortcut, initial default -mNHwpaobxXDy --import]' \
- '(--convert --to -C -1 -2 -3 -4)-5[shortcut, initial default -mNHwpaobxXDy --update]' \
- '--to=node[XML node based input representation, experimental]' \
- '--to=sax[XML sax based input representation, experimental]' \
- '--to=dom[XML dom based input representation, experimental]' \
- '--convert=footnotes[embedded footnotes]' \
- '--to=current[current markup]' \
- '--to=xml2sst[from sisu xml to sst]' \
- '*:SiSU files:_files -g "*.(sst|ssm)(.)"'
diff --git a/data/sisu/v4/conf/convert/kdissert_to_sisu b/data/sisu/v4/conf/convert/kdissert_to_sisu
deleted file mode 100644
index 35921c3e..00000000
--- a/data/sisu/v4/conf/convert/kdissert_to_sisu
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env ruby
-=begin
- * Name: modify.rb
- * Author: Ralph Amissah
- * http://www.jus.uio.no/sisu
- * http://www.jus.uio.no/sisu/SiSU/download
- * Description: Conversion script from kdissert .kdi to sisu markup .sst
- * Copyright (C) 2004, 2006 Ralph Amissah
- * Packaged with: SiSU information Structuring Universe -
- Structured information, Serialized Units
- * SiSU Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Ralph Amissah
-
- * License: GPL 3 or later
-
- Summary of GPL 3
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
- If you have Internet connection, the latest version of the GPL should be
- available at these locations:
- http://www.fsf.org/licenses/gpl.html
- http://www.gnu.org/copyleft/gpl.html
- http://www.jus.uio.no/sisu/gpl3.fsf
-
- © Ralph Amissah 1997, current 2006.
- All Rights Reserved.
-
- * Ralph Amissah: ralph@amissah.com
- ralph.amissah@gmail.com
-=end
-require 'rexml/document'
-include REXML
-argv=$*
-@sisu,@sisu_base=Array.new,Array.new
-unless argv.empty?
- argv.each do |kdi|
- if kdi =~/\.kdi$/
- system("cp #{kdi} #{kdi}.tar.gz && tar xzvf #{kdi}.tar.gz && rm #{kdi}.tar.gz")
- file=File.new("maindoc.xml")
- #system("cp #{kdi} /tmp/. && cd /tmp && tar xzvf /tmp/#{kdi} && cd -")
- #file=File.new("/tmp/maindoc.xml")
- @output=File.new("#{kdi}.sst",'w')
- doc=Document.new(file)
- root=doc.root
- @el=Array.new
- root.each do |x|
- end
- root.each_with_index do |content,idx|
- if root.elements["item[#{idx}]/summary"]
- id,ma,ch=nil,nil,Array.new
- if root.elements["item[#{idx}]/id"]
- id=root.elements["item[#{idx}]/id"].text.to_i
- end
- if root.elements["item[#{idx}]/parent"]
- ma=root.elements["item[#{idx}]/parent"].text.to_s
- end
- if root.elements["item[#{idx}]/child"] #problem only get one child, even where several
- root.get_elements("item[#{idx}]/child").each do |x|
- ch << x.text
- end
- end
- if root.elements["item[#{idx}]/summary"]
- sum=root.elements["item[#{idx}]/summary"].text.to_s.strip
- end
- if root.elements["item[#{idx}]/text"]
- txt=root.elements["item[#{idx}]/text"].text.to_s.strip
- end
- @el[id]=Hash.new
- @el[id][:id]=id
- @el[id][:ma]=ma
- @el[id][:ch]=ch
- @el[id][:sum]=sum
- @el[id][:txt]=txt
- if ma == '-1'
- @el[id][:lev]=':A'
- @top=id
- end
- end
- end
- @doc=Array.new
- @title=@el[@top][:sum]
- p @el[@top][:sum]
- @doc << ':A~ ' + @el[@top][:sum]
- @el[@top][:ch].each do |x|
- @el[x.to_i][:lev]='1'
- @doc << '1~ ' + @el[x.to_i][:sum]
- @doc << @el[x.to_i][:txt]
- @el[x.to_i][:ch].each do |y|
- @el[y.to_i][:lev]='2'
- @doc << '2~ ' + @el[y.to_i][:sum]
- @doc << @el[y.to_i][:txt]
- @el[y.to_i][:ch].each do |z|
- @el[z.to_i][:lev]='3'
- @doc << '3~ ' + @el[z.to_i][:sum]
- @doc << @el[z.to_i][:txt]
- @el[z.to_i][:ch].each do |za| #unsupported... consder
- @el[za.to_i][:lev]='4'
- @doc << '!_ ' + @el[za.to_i][:sum]
- @doc << @el[za.to_i][:txt]
- end
- end
- end
- end
- #@el.each_with_index do |x,i|
- # if x: puts "#{i}: lev: #{x[:lev]}, id: #{x[:id]}, ma: #{x[:ma]}, ch: #{x[:ch].join(',')}"
- # end
- #end
-# regexs strip most kdissert markup, and provide minimal info for sisu markup -->
- @doc.each do |c,idx|
- c.gsub!(/<\/summary>/,'')
- c.gsub!(/<html>.+?\n|<\/body>|<\/html>|<p>/m,'')
- c.gsub!(/<\/p>/,"\n")
- c.gsub!(/<span style="font-weight:600">(.+?)<\/span>/," *{ \\1 }* ")
- c.gsub!(/<span style="text-decoration:underline">(.+?)<\/span>/," _{ \\1 }_ ")
- c.gsub!(/<span style="font-style:italic">(.+?)<\/span>/," /{ \\1 }/ ")
- c.gsub!(/<ul type="disc">/,'_* ')
- c.gsub!(/<\S+?>/,'')
- c.gsub!(/&lt;(:p[bn])&gt;/,"<\\1>")
- c.gsub!(/&lt;&lt;(|.?|@|.?|)/,"<<\\1")
- c.gsub!(/&quot;/,'"')
- c.gsub!(/ \s+/,' ')
- @sisu_base << c.strip + "\n\n"
- end
- else puts ".kdi extension expected, filename not recognised: << #{kdi} >>"
- end
- end
-else puts '.kdi file for conversion to sisu expected'
-end
-sisu_head=<<WOK
-% converted from Kdissert to SiSU
-
-@title: #@title
-
-@prefix: Kdissert mind/topic mapping auto conversion to SiSU markup
-
-@links: {Kdissert}http://freehackers.org/~tnagy/kdissert/
-
-@base_program: kdissert
-
-% @date:
-
-@rcs: $Id$
-
-@level: num_top=1
-
-WOK
-#puts @sisu_base
-@output << sisu_head << @sisu_base
-__END__
diff --git a/data/sisu/v4/conf/convert/modify.rb b/data/sisu/v4/conf/convert/modify.rb
deleted file mode 100644
index 8a4b9074..00000000
--- a/data/sisu/v4/conf/convert/modify.rb
+++ /dev/null
@@ -1,376 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-=begin
-
- * Name: modify.rb
-
- * Description: A conversion script for canned substitutions,
- a fairly generic simple tool that can be used to store other canned conversions,
- (used here for altering SiSU markup or the SiSU program)
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997 - 2012, Ralph Amissah, All Rights Reserved.
-
- * License: GPL 3 or later:
-
- * Packaged with: SiSU a framework for document structuring, publishing & search
-
- Copyright (C) Ralph Amissah
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-
- If you have Internet connection, the latest version of the GPL should be
- available at these locations:
- <http://www.fsf.org/licensing/licenses/gpl.html>
- <http://www.gnu.org/licenses/gpl.html>
-
- <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
- <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
- <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
-
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
-
- * Download:
- <http://www.jus.uio.no/sisu/SiSU/download.html>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
-=end
-module SiSU_Modify
- class Operations
- def initialize(cf,files)
- @cf,@files=cf,files
- @description="This is a script that contains canned text conversions for reuse"
- pwd=Dir.pwd
- @mod_inst='modify_instructions.rb'
- @modify_instructions_script="#{pwd}/#{@mod_inst}"
- if FileTest.file?(@modify_instructions_script) ==true
- puts <<-WOK
- autoload script: "#{@modify_instructions_script}"
- used by "ruby #{__FILE__} --convert" if
- "Extracted.new.modify.modules_and_classes" is used
- (see "matches_and_replaces")
- EDIT this file manually
- [to rebuild run: "ruby #{__FILE__} --build-gsub"]
-
- WOK
- else
- puts <<-WOK
- autoload script does not exist: "#{@modify_instructions_script}"
- needed for "ruby #{__FILE__} --convert" if
- "Extracted.new.modify.modules_and_classes" is used
- (see "matches_and_replaces")
- try run: "ruby #{__FILE__} --build-gsub"
-
- WOK
- end
- autoload :Extracted, "./#{@mod_inst}"
- end
- def matches_and_replaces #edit manually
- [
- #Extracted.new.modify.modules_and_classes,
- #Extracted.new.modify.modules,
- #Extracted.new.modify.classes,
- #modify.dates,
- #modify.modules,
- #modify.classes,
- #modify.misc,
- ]
- end
- def message(text)
- response=''
- while response !~/yes/
- print %{
- #{text}
- To continue type "yes" [to exit type "no" or "quit"]: }
- response=File.new('/dev/tty').gets.strip
- exit if response =~/^(?:quit|no)$/
- end
- end
- def help
- print <<WOK
-
-#{@description}
-
-note converting twice in a single direction will result
-in markup inconsistency
-
-modify.rb --convert
- performs the current conversion that is set in method "matches_and_replaces",
- this needs to be edited manually, as do the substitutions to be made on the
- files matched in the settings [handle with care]
-
-modify.rb --report
- reports on the names of modules and classes in each file requested
- (the defalt is all)
-
-modify.rb --build-gsub
- creates modify_instructions.rb methods for substitutions of methods and
- classes for editing
-
-WOK
- exit
- end
- #%% substitutions to be made
- # [//, ''],
- #def rename_default
- # message(%q{rename SiSU modules, classes, date})
- # [
- # [/1997\s+-\s+2012/, '1997 - 2012'],
- # ]
- #end
- def modify
- def misc
- [
- #[//, ''],
- ]
- end
- def dates
- [
- [/1997\s+-\s+2011/, '1997 - 2012'],
- ]
- end
- def modules
- [
- #[//, ''],
- ]
- end
- def classes
- [
- #[//, ''],
- ]
- end
- self
- end
- def convert
- message("WARNING, proceed at your own risk,\npermanent changes requested for the above named files\n best that you check (manually) what this file is set to do\n conversions set are at the top of the file")
- if matches_and_replaces.length > 0
- @files.each do |i|
- @new,@matched,@empty1,@empty2=true,false,false,false
- file=File.open(i,'r')
- cont=file.readlines
- file.close
- @file=File.new(i,'w')
- cont.each do |t|
- matches_and_replaces.each do |match_and_replace|
- match_and_replace.each do |m,r|
- if t =~m
- p m.to_s + ' -> ' + r
- puts "in: #{t}"
- t=t.gsub(m,r) if m and r
- puts "out: #{t}"
- end
- end
- end
- if t=~/^\s*$/; @empty1=true
- else @empty1=false
- end
- @file.puts t unless (@empty1==true and @empty2==true)
- if t=~/^\s*$/; @empty2=true
- else @empty2=false
- end
- end
- @file.close
- end
- end
- end
- def report_modules_and_classes
- @f=nil
- @structure={}
- @arr={mod: [], cl: []}
- @files.each do |f|
- @new,@matched,@empty1,@empty2=true,false,false,false
- file=File.open(f,'r')
- cont=file.readlines
- file.close
- cont.each do |t|
- if f != @f
- @f=f
- @mod=nil
- #puts "---\n#{@f}"
- @structure[@f]={}
- end
- if t =~/^\s*module\s+\S+/
- @mod=t.match(/^\s*module\s+(\S+)/)[1]
- #puts ' ' + @mod
- @arr[:mod] << @mod
- @structure[@f].store(@mod,[])
- #@structure[@f] = {@mod => []}
- end
- if t =~/^\s*class\s+\S+/
- cl=t.match(/^\s*class\s+(\S+)/)[1]
- #puts ' ' + cl
- @arr[:cl] << cl
- @structure[@f][@mod] << cl
- end
- end
- end
- @structure.sort.each do |fl,modules|
- puts "---\n" + fl
- modules.sort.each do |mod,classes|
- puts ' ' + mod
- classes.sort.each do |cl|
- puts ' ' + cl
- end
- end
- end
- puts '---'
- puts 'number of modules: ' + @arr[:mod].length.to_s + ', unique: ' + @arr[:mod].uniq.length.to_s
- puts 'number of classes: ' + @arr[:cl].length.to_s + ', unique: ' + @arr[:cl].uniq.length.to_s
- end
- def build_search_and_replace_method_for_modules_and_classes
- @f=nil
- @structure={}
- @arr={mod: [], cl: []}
- @files.each do |f|
- @new,@matched,@empty1,@empty2=true,false,false,false
- file=File.open(f,'r')
- cont=file.readlines
- file.close
- cont.each do |t|
- if f != @f
- @f=f
- @mod=nil
- #puts "---\n#{@f}"
- @structure[@f]={}
- end
- if t =~/^\s*module\s+\S+/
- @mod=t.match(/^\s*module\s+(\S+)/)[1]
- #puts ' ' + @mod
- @arr[:mod] << @mod
- @structure[@f].store(@mod,[])
- #@structure[@f] = {@mod => []}
- end
- if t =~/^\s*class\s+\S+/
- cl=t.match(/^\s*class\s+(\S+)/)[1]
- #puts ' ' + cl
- @arr[:cl] << cl
- @structure[@f][@mod] << cl
- end
- end
- end
- puts 'number of modules: ' + @arr[:mod].length.to_s + ', unique: ' + @arr[:mod].uniq.length.to_s
- puts 'number of classes: ' + @arr[:cl].length.to_s + ', unique: ' + @arr[:cl].uniq.length.to_s
- method_modules_and_classes=[]
- method_modules_and_classes <<<<-WOK
-#module SiSU_MC
- class Extracted
- def modify
- WOK
- #% modules_and_classes
- method_modules_and_classes <<<<-WOK
- def modules_and_classes
- [
- WOK
- @structure.sort.each do |fl,modules|
- method_modules_and_classes << ' '*8 + "##% -- " + fl
- modules.sort.each do |mod,classes|
- method_modules_and_classes << ' '*8 + '# ' + "[/#{mod}/," + ' '*(67 - mod.length) + "'#{mod}'],"
- classes.uniq.sort.each do |cl|
- method_modules_and_classes << ' '*8 + '# ' + "[/#{cl}/," + ' '*(65 - cl.length) + "'#{cl}'],"
- end
- end
- end
- method_modules_and_classes <<<<-WOK
- ]
- end
- WOK
- #% modules
- method_modules_and_classes <<<<-WOK
- def modules
- [
- WOK
- method_modules_and_classes << ' '*8 + '# ' + 'number of modules: ' + @arr[:mod].length.to_s +
- ', unique: ' + @arr[:mod].uniq.length.to_s
- @arr[:mod].uniq.sort.each do |mod|
- method_modules_and_classes << ' '*8 + '# ' + "[/#{mod}/," + ' '*(67 - mod.length) + "'#{mod}'],"
- end
- method_modules_and_classes <<<<-WOK
- ]
- end
- WOK
- #% classes
- method_modules_and_classes <<<<-WOK
- def classes
- [
- WOK
- method_modules_and_classes << ' '*8 + '# ' + 'number of classes: ' + @arr[:cl].length.to_s +
- ', unique: ' + @arr[:cl].uniq.length.to_s
- @arr[:cl].uniq.sort.each do |cl|
- method_modules_and_classes << ' '*8 + '# ' + "[/#{cl}/," + ' '*(67 - cl.length) + "'#{cl}'],"
- end
- method_modules_and_classes <<<<-WOK
- ]
- end
- WOK
- method_modules_and_classes <<<<-WOK
- self
- end
- end
-#end
- WOK
- #method_modules_and_classes.each{|x| puts x}
- if FileTest.file?(@modify_instructions_script) ==true
- message("WARNING << #{@mod_inst} >> exists (and may have been edited). The existing << #{@mod_inst} >> will be overwritten if you proceed.")
- end
- instructs=File.new(@modify_instructions_script,'w')
- method_modules_and_classes.each do |x|
- puts x
- instructs.puts x
- end
- instructs.close
- end
- def action
- if @files and @files.length > 0
- p @files
- mr=nil
- #%% changes to make m match, r replace -------------------------->
- if @cf =~/--help/; help
- else
- case @cf
- when /--convert/; convert
- when /--report/; report_modules_and_classes
- when /--build-gsub/; build_search_and_replace_method_for_modules_and_classes
- else help
- end
- #act
- end
- else puts "this routine makes permanent changes to the contents of the files matched, as instructed within [no matches]"
- end
- end
- end
-end
-#% files to match for this conversion set ------------------------->
-f=$* #; p $*
-cf=f[0].to_s
-f.shift
-match_and_replace=Array.new
-unless f.length > 0
- f=if cf == '--report' \
- or cf == '--build-gsub'
- Dir.glob("[a-zA-Z]*.rb") #restrict to ruby files
- else
- Dir.glob("[a-zA-Z]*")
- end
- f=f.sort.delete_if { |x| x == __FILE__ or x == 'modify_instructions.rb' }
-end
-SiSU_Modify::Operations.new(cf,f).action
-__END__
-#f=Dir.glob("{bin,conf,data,lib}/**/*.rb") #sisu development
-#f=Dir.glob("[^_]/**/*") #all files subdirectories beneath pwd except those starting with _
diff --git a/data/sisu/v4/conf/convert/sisu_convert b/data/sisu/v4/conf/convert/sisu_convert
deleted file mode 100644
index a3a12189..00000000
--- a/data/sisu/v4/conf/convert/sisu_convert
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/usr/bin/env ruby
-# = sisu - SiSU information Structuring Universe
-#
-# Copyright (c) Ralph Amissah 1997,2004
-#
-# Ralph Amissah mailto:ralph@amissah.com
-#
-# * Name: SiSU information Structuring Universe
-# * Author: Ralph@Amissah.com
-# * Description: document conversion tool, to sisu from other formats
-# * License: GPL 3 or later
-# * Notes: word conversion uses wvWare and wvSiSU.xml (a modified/stripped wvHtml.xml)
-# * http://wvware.sourceforge.net/
-# * http://sourceforge.net/projects/wvware
-# * <url:sisu.lnk>|sisu.lnk|@|^|
-# * <url:sisu>
-module CONVERT
- class MyOutput
- def initialize(data, filename, instruct)
- @data=data.compact
- @filename=filename
- @instruct=instruct
- end
- def headerBasic
- <<WOK
-% SiSU 2.0
-
-@title:
- :subtitle:
-
-@creator:
- :author:
-
-@classify:
- :topic_register:
-
-@date:
- :published:
-
-@rights:
- :copyright:
- :license:
-
-WOK
- end
- def headerDefault
- <<WOK
-% SiSU 2.0
-
-@title:
- :subtitle:
-
-@creator:
- :author:
-
-@classify:
- :topic_register:
-
-@date:
- :published:
-
-@rights:
- :copyright:
- :license:
-
-WOK
- end
- def hardOutput
- pre = Array.new
- case @instruct
- when /default/
- pre << headerDefault
- else
- pre << headerBasic
- end
- @filename_wv=File.new(%{,,#{@filename}.sst},'w+')
- @filename_wv << pre
- @data.each do |x|
- y = x.split("\n")
- y.each do |z| # cleaner output this way
- z.strip!
- @filename_wv.puts "#{z}\n\n" unless z =~/^$/
- end
- end
- end
- end
- class WareWord97
- def initialize(data, filename, instruct)
- @data=data
- @filename=filename
- @instruct=instruct
- end
- def songsheet
- data=@data
- print "Convert to SiSU file from Word97 << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>>
- data=WareWord97.new(data.collect,@filename,@instruct).strip
- data=WareWord97.new(data.collect,@filename,@instruct).strip
- data=WareWord97.new(data.collect,@filename,@instruct).markup_rules
- data=MyOutput.new(data.collect,@filename,@instruct).hardOutput
- end
- def strip
- data=@data
- tuned_file=Array.new
- endnote_no=1
- data.each do |para|
- para.strip!
- para.gsub!(/<u>\s*<\/u>/,'')
- para.gsub!(/<\/u>\s*<u>/,'')
- para.gsub!(/<b>\s*<\/b>/,'')
- para.gsub!(/<\/b>\s*<b>/,'')
- para.gsub!(/<i>\s*<\/i>/,'')
- para.gsub!(/<\/i>\s*<i>/,'')
- tuned_file << para unless para == nil
- end
- tuned_file
- end
- def markup_rules
- data=@data
- tuned_file=Array.new
- endnote_no=1
- data.each do |para|
- para.strip!
- para.gsub!(/\s+/,' ')
- para.gsub!(/^<b>(Chapter|Article)(.+?)<\/b>/i,'1~ \1 \2') #watch case insensitivity
- para.gsub!(/^<b>(Part|Section|Book)(.+?)<\/b>/i,':C~ \1 \2') #watch case insensitivity
- para.gsub!(/^<b>(\d+\.\d+\.\d+\.?)(.+?)<\/b>/i,'3~ \1 \2') #numeric, decide what to do, can be different
- para.gsub!(/^<b>(\d+\.\d+\.?)(.+?)<\/b>/i,'2~ \1 \2') #numeric, decide what to do, can be different
- para.gsub!(/^<b>(\d.+?)<\/b>/i,'4~ \1 \2') #numeric, decide what to do, can be different
- #para.gsub!(/^<b>([\d.]+?)<\/b>/i,'4~ \1 \2') #numeric, decide what to do, can be different
- para.gsub!(/<u>(.+?)<\/u>/,'_{\1}_')
- para.gsub!(/<b>(.+?)<\/b>/,'!{\1}!')
- para.gsub!(/<i>(.+?)<\/i>/,'/{\1}/')
- tuned_file << para unless para == nil
- end
- tuned_file
- end
- end
- class Html
- def initialize(data, filename, instruct)
- @data=data
- @filename=filename
- @instruct=instruct
- end
- def songsheet
- data=@data
- print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>>
- #data=Html.new(data.collect, @filename, @instruct).space_paragraphs
- #data=Html.new(data.split(''), @filename, @instruct).space_paragraphs
- data=Html.new(data.join.split(/\n\n+/), @filename, @instruct).space_paragraphs
- #data=Html.new(data.split("\n"), @filename, @instruct).space_paragraphs
- #data=Html.new(data.collect.join.split("\n"), @filename, @instruct).space_paragraphs
- data=Html.new(data.collect, @filename, @instruct).multiline
- data=Html.new(data.collect.join.split("\n\n"), @filename, @instruct).markup_rules
- data=MyOutput.new(data.collect, @filename, @instruct).hardOutput
- end
- def space_paragraphs
- #data=@data.join.split(/\n/)
- data=@data
- #p data.length
- tuned_file=Array.new
- data.each do |para|
- para.strip!
- para.gsub!(/\r/,'')
- #para.gsub!(/\n/, ' ') #PROBLEM, serious time issues on a few files also for \n (or multiline matches which is less surprising), edit out if necessary
- para.gsub!(/<\/?p>/i,'zZz')
- para.gsub!(/<\/?\s*p(?:\s+ALIGN=.+?)?>/i,'zZz') #all manner of <p> para.gsub!(/<\/?p>/i, "\n\n")
- para.gsub!(/<p\s+(class|align).+?>/i,'zZz') #
- para.gsub!(/<\/p>/i,'zZz') # repeat actually
- para.gsub!(/<(?:dir|tr|br)>/i,'zZz') #
- #para.gsub!(/<(?:\/\s*)?(?:dir|tr|br)>/i, "zZz") #
- para.gsub!(/(<\/center>)/i,'\1zZz')
- para.gsub!(/(<\/h[1-6]>)/i,'\1zZz')
- para.gsub!(/ \s+/i,' ')
- para.gsub!(/(?:\s*zZz\s*)+/i,'zZz') #
- tuned_file << para unless para == nil
- end
- tuned_file
- end
- def blockquotes(sub='') # SERIOUS PROBLEM INTRODUCED, some blockquotes go missing !, quite unacceptable, debug, for now not used
- res=Array.new
- sub.each do |x|
- if x=~/(<\/blockquote>)/i
- m = $1
- res << x[/(.+?)#{m}/mi,1].gsub!(/zZz/,'zZz_1 ') if x =~/.+?#{m}/mi
- res << x[/#{m}(.+)/mi,1]
- else
- res << x #[/(.+)/mi,1]
- end
- end
- res.join
- end
- def multiline
- data=@data
- tuned_file=Array.new
- data.each do |para|
- para.gsub!(/\n/,' ')
- para.gsub!(/ \s+/mi,' ')
- #ALL HERE could be very time EXPENSIVE but tamed? compromise ... /mi
- para.gsub!(/<([biu]|h[1-6])>(?:zZz)?([^<]+)?zZz(.+?)<\/\1>/i,'zZz<\1>\2 \3</\1>')
- para.gsub!(/<([biu]|h[1-6])>(?:<center>|zZz)+(.+?)(?:<\/center>)?zZz(.+?)?<\/\1>/i,'zZz<\1>\2 \3</\1>')
- #para.gsub!(/<([biu]|h[1-6])>(?:<center>|zZz)+(.+?)<\/center>zZz(.+?)?<\/\1>/i,'zZz<\1>\2 \3</\1>')
- para.gsub!(/<([biu]|h[1-6])>(?:<center>|zZz)+(.+?)<\/\1>/i,'zZz<\1>\2</\1>')
- para.gsub!(/<(h[1-6])>(.+?)(?:<center>|zZz)+<\/\1>/i,'zZz<\1>\2</\1>zZz') #does catch some h1, h2 etc, too expensive to have biu
- #para.gsub!(/<([biu]|h[1-6])>(.+?)(?:<center>|zZz)+<\/\1>/i,'zZz<\1>\2 \3</\1>') #may go too far? useful for h1 h2 etc, remove biu?
- #para.gsub!(/<([biu]|h[1-6])>([^<]+)?zZz(.+?)<\/\1>/i,'zZz<\1>\2 \3</\1>')
- #para.gsub!(/<([biu]|h[1-6])>([^<]+)?zZz(.+?)<\/\1>/i,'zZz<\1>\2 \3</\1>')
- ### SERIOUS PROBLEM INTRODUCED
- # sub = para.split(/<blockquote>/i)
- # para = blockquotes(sub) if sub.length > 0 #check was on >1 could have serious repercussions 2004w29
- para.gsub!(/zZz(\s*zZz)*/,"\n\n")
- tuned_file << para << "\n\n" unless para == nil
- end
- tuned_file
- end
- def markup_rules
- @@flag_blockquote=false
- data=@data
- tuned_file=Array.new
- data.each do |para|
- if para=~/<a href="(http:\/\/.+?)">/i
- #p para.grep(/<a href="(http:\/\/.+?)">/i)
- #m=$1
- #para.gsub!(/(?:&lt;\s*)?<a href="#{m}">#{m}<\/a>(?:\s*&gt;)?\.?/i, "#{m}")
- para.gsub!(/(?:&lt;\s*)?<a href="(http:\/\/.+?)">http:\/\/.+?<\/a>(?:\s*&gt;)?\.?/i,'\1') #risk that url & url are not to match
- #para.gsub!(/(?:&lt;\s*)?<a href="(\w+\.html)">(http:\/\/.+?\/\1)<\/a>(?:\s*&gt;)?\.?/i, "\\2") #does not match
- end
- if para=~/<BLOCKQUOTE>/i
- @@flag_blockquote=true
- end
- if @@flag_blockquote
- para.gsub!(/^/,'_1 ') unless para.empty? or para =~/^\s*<\/?blockquote?>\s*$/i
- end
- if para=~/<\/BLOCKQUOTE>/i
- @@flag_blockquote=false
- end
- para.gsub!(/<\/?blockquote?>/i,'')
- ### clean
- para.gsub!(/^\s+/i,'')
- para.gsub!(/<([bui]|em|su[pb])>\s*<\/\1>/i,'')
- para.gsub!(/<\/?center>/i,'')
- para.gsub!(/\s*<\/dir>/i,'')
- para.gsub!(/<hr>/i,'')
- para.gsub!(/\s*<a href=".+?\.html#(?:[a-z_]+)?(?:[a-z0-9_-]|\*)+">\[(\*+)\]<\/a>/i,'^{[\1]}^ ') #other endnote marker
- para.gsub!(/<a href=".+?\.html#(?:[a-z_$]+)?[0-9_-]+"(?:\s+name=".+?")?>\[[a-z]?\d+\](?:<\/[bi]>)?<\/a>/i,'~^ ') #endnote marker
- para.gsub!(/<a name=".+?"\s+href=".+?\.html#(?:[a-z_$]+)?[0-9_-]+"?>\[[a-z]?\d+\](?:<\/[bi]>)?<\/a>/i,'~^ ') #endnote marker
- para.gsub!(/<a name="(?:[a-z$]+)?[0-9_-]+">\s*(<\/a>)?\s*\d+\.?\s*(<\/a>)?\s*/i,'^~ ') #endnote
- #para.gsub!(/<h([1-6])>\s*(.+?)\s*<\/h\1>\s*/i,'\1~ \2') #
- para.gsub!(/<h([1-6])(?: align=.+?)?>\s*(.+?)\s*<\/h\1>\s*/i,'\1~ \2') #
- para.gsub!(/^<b>(Chapter|Article)(.+?)<\/b>/i,'4~ \1 \2') #watch case insensitivity
- para.gsub!(/^<b>(Part|Section|Book)(.+?)<\/b>/i,'3~ \1 \2') #watch case insensitivity
- para.gsub!(/^<b>(\d+\.\d+\.\d+\.?)(.+?)<\/b>/i,'6~ \1 \2') #numeric, decide what to do, can be different
- para.gsub!(/^<b>(\d+\.\d+\.?)(.+?)<\/b>/i,'5~ \1 \2') #numeric, decide what to do, can be different
- para.gsub!(/^<b>(\d+\.?)(.+?)<\/b>/i,'4~ \1 \2') #numeric, decide what to do, can be different
- #<a name="ii"></a><B>
- para.gsub!(/^(<a name=".+?">)(?:<small>)?<(?:b|strong)>\s*(.+?)\s*<\/(?:b|strong)>/i,'5~ \2 \1') #watch
- para.gsub!(/^(<(a name|A NAME)=".+?">)(\s*|<\/[aA]>)?([A-Z][A-Z])+/,'5~ \2 \1') #watch
- para.gsub!(/^(\s+|<p>)?(<a name=".+?">)(\s*|<\/a>)?<b>/i,'5~ \2 \1') #watch
- para.gsub!(/<h([1-6])>\s*(.+?)\s*<\/h\1>\s*/i,'\1~ \2') #
- para.gsub!(/^<b>\s*(.+?)<\/b>\s*(<\/i>\s*)?$/i,'4~ \1\2') # wish it all were less messy
- para.gsub!(/^<i>\s*([^"(].+?)<\/i>\s*(<\/b>\s*)?$/i,'5~ \1\2') # wish it all were less messy
- para.gsub!(/<\/?[biu]>/i,'') if para =~/[1-6]\{/
- para.gsub!(/<u>\s*(.+?)\s*<\/u>/i,'_{\1}_')
- para.gsub!(/<(b|strong)>\s*(.+?)\s*<\/\1>/i,'*{\2}*')
- para.gsub!(/<(i|em)>\s*(.+?)\s*<\/\1>/i,'/{\2}/')
- para.gsub!(/<sup>\s*(.+?)\s*<\/sup>/i,'^{\1}^')
- para.gsub!(/(([\/\*!_])\{.+?\}\2)\s\s+/i,'\1 ')
- para.gsub!(/(([\/\*!_])\{.+?\}\2)\s+([.,;?\)])\s+/i,'\1\3 ')
- para.gsub!(/(([\/\*!_])\{.+?\}\2)(["'])\s+/i,'\1\3 ')
- para.gsub!(/(([\/\*!_])\{.+?\}\2)\s*([a-z0-9])/i,'\1 \3')
- para.gsub!(/(([\/\*_])\{.+?\}\2)\s*([a-z0-9])/i,'\1 \3')
- para.gsub!(/([a-z0-9])(([\/\*_])\{.+?\}\3)/i,' \1 \2') #eg this/{problem}/
- para.gsub!(/([\/\*_])\{([,.;; ]+)\}\1/i,'\2') #eg /{,}/ or *{ }* etc.
- para.gsub!(/ \s+/i,' ')
- #para.gsub!(/\/\{\*\{/i, '*{/{')
- #para.gsub!(/\}\*\}\//i, '}/}*')
- para.gsub!(/&quot;/i,'"')
- para.gsub!(/&amp;/i,'and')
- para.gsub!(/<!doctype html public .+/i,'')
- para.gsub!(/<\/?(?:html|head|body|font|small)>/i,'')
- para.gsub!(/<\/(?:title)>/i,'')
- para.gsub!(/<title>/i,'#{~title? ')
- para.gsub!(/<blockquote>(.+?)<\/blockquote>/mi,"\n\n_1 \\1\n\n")
- para.gsub!(/<div align=.+?>|<\/div>|<font size=.+?>|<\/a><\/em><\/strong>/i,'')
- para.gsub!(/~^\s+\.\s*/i,'.~^ ') #check vim equiv # %s/\~e\s\+\.\s*/.\~e /c
- para.gsub!(/\s+~^\s+/i,'~^ ')
- para.gsub!(/ \s+/i,' ')
- para.gsub!(/\s+$/i,'')
- para.gsub!(/^(?:<\/[bi]>)+$/i,'')
- para.gsub!(/^(?:(?:<i>)+<b>|(?:<b>)+<i>)\s*([^"(].+?)/i,'5~ \1\2') # wish it all were less messy
- para.gsub!(/^(?:<\/?(?:[ib]|em)>\s*)+$/i,'') # cleaning up left over <i> etc.
- para.gsub!(/<(?:i|em)>\s*(.+)/i,'/{\1}/') # using up left over <i>
- para.gsub!(/<b>\s*(.+)/i,'*{\1}*') # using up left over <b>
- para.gsub!(/<dd>([\d.]+)/i,'5~ \1')
- para.gsub!(/<dd>(?:&nbsp;)+([\d.]+)/i,'6~ \1')
- para.gsub!(/<dd>(\([a-z]\))/i,'7~ \1')
- para.gsub!(/^([1-9]~)( .+?)<a name="(\S+?)">(.+?)(<\/a>)/i,'\1\3\2\4')
- para.gsub!(/^([1-9]~)( .+?)<a name="(\S+?)">/i,'\1\3\2')
- para.gsub!(/http\/\/(\S+)/i,'http:\/\/\1')
- para.gsub!(/\s*<a href="\S+?">(http:\/\/\S+?)<\/a>\s*/i,' \1 ')
- para.gsub!(/([a-zA-Z.,!?;:])([*\/_-]\{)/,'\1 \2')
- para.gsub!(/^\s*(&nbsp;){10,12}/i,'_2 ')
- para.gsub!(/^\s*(&nbsp;){4,5}/i,'_1 ')
- para.gsub!(/&#9;/,' ') #check
- ## glyphs & tildes
- para.gsub!(/&iexcl;/, '¡') #'Inverted exclamation
- para.gsub!(/&cent;/, '¢') #'Cent sign ¢
- para.gsub!(/&pound;/, '£') #'Pound sign £
- para.gsub!(/&curren;/, '¤') #'General currency sign
- para.gsub!(/&yen;/, '¥') #'Yen sign ¥
- para.gsub!(/&brvbar;/, '¦') #'Broken vertical bar
- para.gsub!(/&sect;/, '§') #'Section sign §
- para.gsub!(/&uml;/, '¨') #'Umlaut
- para.gsub!(/&copy;/, '©') #'Copyright ©
- para.gsub!(/&ordf;/, 'ª') #'Feminine ordinal ª
- para.gsub!(/&laquo;/, '«') #'Left angle quote «
- para.gsub!(/&not;/, '¬') #'Not sign
- para.gsub!(/&shy;/, '­') #'Soft hyphen
- para.gsub!(/&reg;/, '®') #'Registered trademark ®
- para.gsub!(/&macr;/, '¯') #'Macron accent
- para.gsub!(/&deg;/, '°') #'Degree sign °
- para.gsub!(/&plusmin;/,'±') #'Plus or minus ±
- para.gsub!(/&sup2;/, '²') #'Superscript 2 ²
- para.gsub!(/&sup3;/, '³') #'Superscript 3 ³
- para.gsub!(/&acute;/, '') #'Acute accent
- para.gsub!(/&micro;/, 'µ') #'Micro sign (Greek mu) µ
- para.gsub!(/&para;/, '¶') #'Paragraph sign ¶
- para.gsub!(/&middot;/, '·') #'Middle dot
- para.gsub!(/&cedil;/, '¸') #'Cedilla
- para.gsub!(/&sup1;/, '¹') #'Superscript 1 ¹
- para.gsub!(/&ordm;/, 'º') #'Masculine ordinal º
- para.gsub!(/&raquo;/, '»') #'Right angle quote
- para.gsub!(/&frac14;/, '¼') #'Fraction one quarter ¼
- para.gsub!(/&frac12;/, '½') #'Fraction on half ½
- para.gsub!(/&frac34;/, '¾') #'Fraction three quarters ¾
- para.gsub!(/&iquest;/, '¿') #'Inverted question mark ¿
- para.gsub!(/&Agrave;/, 'À') #'Capital A, grave accent À
- para.gsub!(/&Aacute;/, 'Á') #'Capital A, acute accent Á
- para.gsub!(/&Acirc;/, 'Â') #'Capital A, circumflex accent Â
- para.gsub!(/&Atilde;/, 'Ã') #'Capital A, tilde Ã
- para.gsub!(/&Auml;/, 'Ä') #'Capital A, umlaut Ä
- para.gsub!(/&Aring;/, 'Å') #'Capital A, ring Å
- para.gsub!(/&AElig;/, 'Æ') #'Capital AE ligature Æ
- para.gsub!(/&Ccedil;/, 'Ç') #'Capital C, cedilla Ç
- para.gsub!(/&Egrave;/, 'È') #'Capital E, grave accent È
- para.gsub!(/&Eacute;/, 'É') #'Capital E, acute accent É
- para.gsub!(/&Ecirc;/, 'Ê') #'Capital E, circumflex accent Ê
- para.gsub!(/&Euml;/, 'Ë') #'Capital E, umlaut Ë
- para.gsub!(/&Igrave;/, 'Ì') #'Capital I, grave accent Ì
- para.gsub!(/&Iacute;/, 'Í') #'Capital I, acute accent Í
- para.gsub!(/&Icirc;/, 'Î') #'Capital I, circumflex accent Î
- para.gsub!(/&Iuml;/, 'Ï') #'Capital I, umlaut Ï
- para.gsub!(/&ETH;/, 'Ð') #'Capital eth, Icelandic
- para.gsub!(/&Ntilde;/, 'Ñ') #'Capital N, tilde Ñ
- para.gsub!(/&Ograve;/, 'Ò') #'Capital O, grave accent Ò
- para.gsub!(/&Oacute;/, 'Ó') #'Capital O, acute accent Ó
- para.gsub!(/&Ocirc;/, 'Ô') #'Capital O, circumflex accent Ô
- para.gsub!(/&Otilde;/, 'Õ') #'Capital O, tilde Õ
- para.gsub!(/&Ouml;/, 'Ö') #'Capital O, umlaut Ö
- para.gsub!(/&times;/, '×') #'Multiply sign ×
- para.gsub!(/&Oslash;/, 'Ø') #'Capital O, slash Ø
- para.gsub!(/&Ugrave;/, 'Ù') #'Capital U, grave accent Ù
- para.gsub!(/&Uacute;/, 'Ú') #'Capital U, acute accent Ú
- para.gsub!(/&Ucirc;/, 'Û') #'Capital U, circumflex accent Û
- para.gsub!(/&Uuml;/, 'Ü') #'Capital U, umlaut Ü
- para.gsub!(/&Yacute;/, 'Ý') #'Capital Y, acute accent Ý
- para.gsub!(/&THORN;/, 'Þ') #'Capital thorn, Icelandic Þ
- para.gsub!(/&szlig;/, 'ß') #'Small sz ligature, German ß
- para.gsub!(/&agrave;/, 'à') #'Small a, grave accent à
- para.gsub!(/&aacute;/, 'á') #'Small a, acute accent á
- para.gsub!(/&acirc;/, 'â') #'Small a, circumflex accent â
- para.gsub!(/&atilde;/, 'ã') #'Small a, tilde ã
- para.gsub!(/&auml;/, 'ä') #'Small a, umlaut ä
- para.gsub!(/&aring;/, 'å') #'Small a, ring å
- para.gsub!(/&aelig;/, 'æ') #'Small ae ligature æ
- para.gsub!(/&ccedil;/, 'ç') #'Small c, cedilla ç
- para.gsub!(/&egrave;/, 'è') #'Small e, grave accent è
- para.gsub!(/&eacute;/, 'é') #'Small e, acute accent é
- para.gsub!(/&ecirc;/, 'ê') #'Small e, circumflex accent ê
- para.gsub!(/&euml;/, 'ë') #'Small e, umlaut ë
- para.gsub!(/&igrave;/, 'ì') #'Small i, grave accent ì
- para.gsub!(/&iacute;/, 'í') #'Small i, acute accent í
- para.gsub!(/&icirc;/, 'î') #'Small i, circumflex accent î
- para.gsub!(/&iuml;/, 'ï') #'Small i, umlaut ï
- para.gsub!(/&eth;/, 'ð') #'Small eth, Icelandic ð
- para.gsub!(/&ntilde;/, 'ñ') #'Small n, tilde ñ
- para.gsub!(/&ograve;/, 'ò') #'Small o, grave accent ò
- para.gsub!(/&oacute;/, 'ó') #'Small o, acute accent ó
- para.gsub!(/&ocirc;/, 'ô') #'Small o, circumflex accent ô
- para.gsub!(/&otilde;/, 'õ') #'Small o, tilde õ
- para.gsub!(/&ouml;/, 'ö') #'Small o, umlaut ö
- para.gsub!(/&divide;/, '÷') #'Divide sign ÷
- para.gsub!(/&oslash;/, 'ø') #'Small o, slash ø
- para.gsub!(/&ugrave;/, 'ù') #'Small u, grave accent ù
- para.gsub!(/&uacute;/, 'ú') #'Small u, acute accent ú
- para.gsub!(/&ucirc;/, 'û') #'Small u, circumflex accent û
- para.gsub!(/&uuml;/, 'ü') #'Small u, umlaut ü
- para.gsub!(/&yacute;/, 'ý') #'Small y, acute accent ý
- para.gsub!(/&thorn;/, 'þ') #'Small thorn, Icelandic þ
- para.gsub!(/&yuml;/, 'ÿ') #'Smally y, umlaut ÿ
- ##
- para.gsub!(/\s\s+/,' ')
- para.gsub!(/\t+/,' ')
- #para.gsub!(/ +/,' ')
- #para.gsub!(/^(?:<(?:\/)?[bi]>)+$/i, '')
- tuned_file << para unless para == nil
- end
- tuned_file
- end
- end
- class Default < Html
- def initialize(data, filename, instruct)
- @data=data
- @filename=filename
- @instruct=instruct
- end
- def songsheet
- data=@data
- print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>>
- data=Default.new(data.collect, @filename, @instruct).space_paragraphs
- data=Default.new(data.collect, @filename, @instruct).multiline
- data=Default.new(data.collect.join.split("\n\n"), @filename, @instruct).markup_rules
- data=Default.new(data.collect, @filename, @instruct).markup_default
- data=MyOutput.new(data.collect, @filename, @instruct).hardOutput
- end
- def markup_default
- data=@data
- tuned_file=Array.new
- data.each do |para|
- para.gsub!(/<i>(Id\.?)(\s|$)/i,'/\{\1\}\2/')
- para.gsub!(/^(~\{\{ .+?)(<\/LI>\s*|<\/OL>\s*)+$/i,'\1')
- para.gsub!(/\/\{Id\.\s*<\/LI>\s*\}\//i,'/{Id.}/')
- tuned_file << para unless para == nil
- end
- tuned_file
- end
- end
-end
-def help
- puts <<WOK
-conversion program
-initial SiSU markup from other file formats
-
- zxy_convert --word does initial conversion from word97 to sisu markup, expects [filename].doc (can also use --doc)
- zxy_convert --html does initial conversion from html to sisu markup, expects [filename].html
- zxy_convert --default does initial conversion from defalt html to sisu markup, expects [filename].html
-
-WOK
-end
-def do_word(argv, instruct)
- argv.each do |f|
- if f =~/.+?\.doc$/
- @argv << f[/(.+?)\.doc$/, 1]
- else
- print "not .doc? << #{f} >> "
- end
- end
- @argv.each do |filename|
- system(%{wvWare -x #{@dir.path.home}/.sisu/convert/wvSiSU.xml #{filename}.doc > #{filename}.wv})
- file_array=IO.readlines("#{filename}.wv", "")
- CONVERT::WareWord97.new(file_array, filename, instruct).songsheet # metaverse created here
- end
-end
-def do_html(argv, instruct)
- argv.each do |f|
- if f =~/.+?\.html?$/
- @argv << f[/(.+?)\.html?$/, 1]
- else
- print "not .html? << #{f} >> "
- end
- end
- @argv.each do |filename|
- file_end=if FileTest.file?("#{filename}.html")
- 'html'
- elsif FileTest.file?("#{filename}.htm")
- 'htm'
- end
- file_array=IO.readlines("#{filename}.#{file_end}","\n\r")
- CONVERT::Html.new(file_array,filename,instruct).songsheet # metaverse created here
- end
-end
-def do_default(argv, instruct)
- argv.each do |f|
- if f =~/.+?\.html$/
- @argv << f[/(.+?)\.html$/, 1]
- else
- print "not .html? << #{f} >> "
- end
- end
- @argv.each do |filename|
- file_array=IO.readlines("#{filename}.html", "\n\r")
- CONVERT::Default.new(file_array, filename, instruct).songsheet # metaverse created here
- end
-end
-def cases(argv, instruct)
- case instruct
- when/^--(word(97)?|doc)$/i #creates minimal sisu_small.gz package to send
- do_word(argv, instruct)
- when/^--(html)$/i #creates sisu.gz package to send
- do_html(argv, instruct)
- when/^--(default)$/i #creates sisu.gz package to send
- do_default(argv, instruct)
- else
- help
- end
-end
-$KCODE='u'
-branch='v2'
-@argv=Array.new
-argv=$*
-SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
-SiSU_lib="sisu/#{SiSU_version_dir}"
-require "#{SiSU_lib}/sysenv"
-include SiSU_Env
-@dir=SiSU_Env::Info_env.new
-instruct = "#{argv[0].to_s}"
-argv.shift
-instruct.chomp!
-instruct = "help" if instruct.nil? or instruct == "";
-cases(argv, instruct)
diff --git a/data/sisu/v4/conf/convert/wvHtml.xml b/data/sisu/v4/conf/convert/wvHtml.xml
deleted file mode 100644
index 3cc9dd29..00000000
--- a/data/sisu/v4/conf/convert/wvHtml.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<main>
-<charentity>
-<begin>HTML</begin>
-</charentity>
-
-<document>
-<begin>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/REC-html40/loose.dtd&quot;&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;META HTTP-EQUIV=&quot;Content-Type&quot; CONTENT=&quot;text/html; charset=<charset/>&quot;&gt;
-&lt;META NAME=&quot;GENERATOR&quot; CONTENT=&quot;wvWare/<version/>&quot;&gt;
-&lt;title&gt;
-<title/>
-&lt;/title&gt;
-&lt;/head&gt;
-&lt;body bgcolor=&quot;#FFFFFF&quot; text=&quot;#000000&quot; link=&quot;#0000ee&quot; vlink=&quot;#551a8b&quot;&gt;
-</begin>
-<end>
-&lt;!--
-&lt;hr&gt;
-&lt;address&gt;
-&lt;a href=&quot;http://wvware.sourceforge.net/&quot;&gt;&lt;img
-src=&quot;wvSmall.gif&quot; height=31 width=47
-align=left border=0 alt=&quot;wvWare&quot;&gt;&lt;/a&gt;
-&lt;a href=&quot;http://validator.w3.org/check/referer&quot;&gt;&lt;img
-src=&quot;vh40.gif&quot; height=31 width=88
-align=right border=0 alt=&quot;Valid HTML 4.0!&quot;&gt;&lt;/a&gt;
-Document created with &lt;a href=&quot;http://wvware.sourceforge.net/&quot;&gt;wvWare/<version/>&lt;/a&gt;&lt;br&gt;
-&lt;/address&gt;
---&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</end>
-</document>
-
-<section>
-<begin>
-&lt;!--Section Begins--&gt;&lt;br&gt;
-</begin>
-<end>
-&lt;!--Section Ends--&gt;
-</end>
-</section>
-
-<justification>
-<left>left</left>
-<right>right</right>
-<center>center</center>
-<block>left</block>
-<asian>&lt;!--Could Someone who sees this tag tell me what was is this type of justification, asian languages only i thing--&gt;</asian>
-</justification>
-
-<numbering>
-<Arabic>type=&quot;1&quot;</Arabic>
-<UpperRoman>type=&quot;I&quot;</UpperRoman>
-<LowerRoman>type=&quot;i&quot;</LowerRoman>
-<UpperCaseN>type=&quot;A&quot;</UpperCaseN>
-<LowerCaseN>type=&quot;a&quot;</LowerCaseN>
-</numbering>
-
-<border>
-<noned>none</noned>
-<singled>solid</singled>
-<thickd>solid</thickd>
-<doubled>double</doubled>
-<number4d>double</number4d>
-<hairlined>solid</hairlined>
-<dotd>dotted</dotd>
-<dashlargegapd>dashed</dashlargegapd>
-<dotdashd>dotted</dotdashd>
-<dotdotdashd>dotted</dotdotdashd>
-<tripled>double</tripled>
-<thin-thicksmallgapd>dashed</thin-thicksmallgapd>
-<thick-thinsmallgapd>dashed</thick-thinsmallgapd>
-<thin-thick-thinsmallgapd>dashed</thin-thick-thinsmallgapd>
-<thin-thickmediumgapd>dashed</thin-thickmediumgapd>
-<thick-thinmediumgapd>dashed</thick-thinmediumgapd>
-<thin-thick-thinmediumgapd>dashed</thin-thick-thinmediumgapd>
-<thin-thicklargegapd>dashed</thin-thicklargegapd>
-<thick-thinlargegapd>dashed</thick-thinlargegapd>
-<thin-thick-thinlargegapd>dashed</thin-thick-thinlargegapd>
-<waved>solid</waved>
-<doublewaved>double</doublewaved>
-<dashsmallgapd>sashed</dashsmallgapd>
-<dashdotstrokedd>dashed</dashdotstrokedd>
-<emboss3Dd>ridge</emboss3Dd>
-<engrave3Dd>groove</engrave3Dd>
-<defaultd>ridge</defaultd>
-</border>
-
-<!-- <begin>&lt;ol <nfc/> start=&quot;<start/>&quot;&gt; -->
-<olist>
-<begin>&lt;ol <nfc/>&gt;
-</begin>
-<end>&lt;/ol&gt;</end>
-</olist>
-
-<ulist>
-<begin>&lt;ul&gt;
-</begin>
-<end>&lt;/ul&gt;</end>
-</ulist>
-
-<!-- <begin>&lt;li&gt;</begin> -->
-<entry>
-<begin>&lt;li value=&quot;<start/>&quot;&gt;</begin>
-<end>&lt;/li&gt;</end>
-</entry>
-
-
-<!--
-this tableoverride option can be used to turn off handling of
-these tags in tables, which I find is necessary for at least netscape
--->
-<tableoverrides>
-<ParaBefore>0</ParaBefore>
-<ParaRight>0</ParaRight>
-<ParaAfter>0</ParaAfter>
-<ParaLeft>0</ParaLeft>
-<ParaLeft1>0</ParaLeft1>
-<VertMergedCells>0</VertMergedCells>
-</tableoverrides>
-
-<table>
-<begin>&lt;table width=&quot;<tablerelwidth/>%&quot; border=&quot;1&quot; cols=&quot;<no_cols/>&quot; rows=&quot;<no_rows/>&quot;&gt;</begin>
-<end>&lt;/table&gt;</end>
-</table>
-
-<row>
-<begin>&lt;tr&gt;</begin>
-<end>&lt;/tr&gt;</end>
-</row>
-
-<cell>
-<begin>&lt;td bgcolor=&quot;<cellbgcolor/>&quot; width=&quot;<cellrelwidth/>%&quot; rowspan=&quot;<rowspan/>&quot; colspan=&quot;<colspan/>&quot;&gt;</begin>
-<end>&lt;/td&gt;</end>
-</cell>
-
-<paragraph>
-<begin>
-<table.end/>
-<table.begin/>
-<row.begin/><cell.begin/><olist.end/><olist.begin/><ulist.end/><ulist.begin/><entry.begin/><text.begin/>
-</begin>
-<end>
-<text.end/><entry.end/><olist.end/><ulist.end/><cell.end/><row.end/>
-</end>
-</paragraph>
-
-<!-- these are all the character properties that can show up in word -->
-<bold><begin>&lt;b&gt;</begin><end>&lt;/b&gt;</end></bold>
-<italic><begin>&lt;i&gt;</begin><end>&lt;/i&gt;</end></italic>
-
-<!--
-text that has been deleted and will be displayed with strikethrough when
-revision marked text is to be displayed
-
-use either this line...
--->
-<RMarkDel><begin>&lt;s&gt;</begin><end>&lt;/s&gt;&lt;a href=&quot;#author<ibstRMarkDel/>&quot;&gt;[Author ID<ibstRMarkDel/>: at <dttmRMarkDel/> ]&lt;/a&gt;</end></RMarkDel>
-
-<!--
-or uncomment below to make deleted text dissappear (well, become commented out)
--->
-<!--
-<RMarkDel><begin>&lt;!-&#45;</begin><end>-&#45;&gt;</end></RMarkDel>
--->
-
-<!-- Overwriting char props. like CaPs->CAPS SmallCaps->smallcaps -->
-<outline><begin></begin><end></end></outline>
-<smallcaps><begin>&lt;span style=&quot;text-transform:lowercase&quot;&gt;</begin><end>&lt;/span&gt;</end></smallcaps>
-<caps><begin>&lt;span style=&quot;text-transform:uppercase&quot;&gt;</begin><end>&lt;/span&gt;</end></caps>
-<vanish><begin></begin><end></end></vanish>
-
-<!--If you uncomment this then the annotation text links will become commented out by html tags-->
-<!--
-<vanish><begin>&lt;!-&#45;</begin><end>-&#45;&gt;</end></vanish>
--->
-
-<!--
-text that has been newly typed since the last time revision marks have been accepted
-and will be displayed with underline when revision marked text is to be displayed
-
-use either this line...
--->
-<RMark><begin>&lt;u&gt;</begin><end>&lt;/u&gt;&lt;a href=&quot;#author<ibstRMark/>&quot;&gt;[Author ID<ibstRMark/>: at <dttmRMark/>]&lt;/a&gt;</end></RMark>
-
-<!--
-or uncomment below to make the underline dissappear
--->
-<!--
-<RMark><begin></begin><end></end></RMark>
--->
-
-
-<strike><begin>&lt;s&gt;</begin><end>&lt;/s&gt;</end></strike>
-<shadow><begin></begin><end></end></shadow>
-<lowercase><begin></begin><end></end></lowercase>
-<emboss><begin></begin><end></end></emboss>
-<imprint><begin></begin><end></end></imprint>
-<!--double strike-->
-<dstrike><begin>&lt;s&gt;</begin><end>&lt;/s&gt;</end></dstrike>
-
-<!--
-ftc's
-&
-hps
-
-keep them for font face and do that later.
--->
-
-<super><begin>&lt;sup&gt;</begin><end>&lt;/sup&gt;</end></super>
-<sub><begin>&lt;sub&gt;</begin><end>&lt;/sub&gt;</end></sub>
-
-<singleu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></singleu>
-<wordu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></wordu>
-<doubleu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></doubleu>
-<dottedu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dottedu>
-<hiddenu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></hiddenu>
-<thicku><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></thicku>
-<dashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dashu>
-<dotu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotu>
-<dotdashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotdashu>
-<dotdotdashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotdotdashu>
-<waveu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></waveu>
-
-<!--
-text whose properties have been changed since the last time revision marks have been accepted
-and will be displayed with a note showing the change points.
-
-use either this line (which admit it a bit scary looking, but harmless)...
--->
-<PropRMark><begin>&lt;a href=&quot;#author<ibstPropRMark/>&quot;&gt;-&#45;&amp;gt;&lt;/a&gt;</begin><end>&lt;a href=&quot;#author<ibstPropRMark/>&quot;&gt;[Author ID<ibstPropRMark/>: at <dttmPropRMark/>]&lt;/a&gt;</end></PropRMark>
-
-<!--
-or uncomment below to make the notes dissappear
--->
-<!--
-<PropRMark><begin></begin><end></end></PropRMark>
--->
-
-<!--
-<color>
--->
-<Black><begin>Black</begin><end></end></Black>
-<Blue><begin>Blue</begin><end></end></Blue>
-<Cyan><begin>Cyan</begin><end></end></Cyan>
-<Green><begin>Green</begin><end></end></Green>
-<Magenta><begin>Magenta</begin><end></end></Magenta>
-<Red><begin>Red</begin><end></end></Red>
-<Yellow><begin>Yellow</begin><end></end></Yellow>
-<White><begin>White</begin><end></end></White>
-<DkBlue><begin>DarkBlue</begin><end></end></DkBlue>
-<DkCyan><begin>DarkCyan</begin><end></end></DkCyan>
-<DkGreen><begin>DarkGreen</begin><end></end></DkGreen>
-<DkMagenta><begin>DarkMagenta</begin><end></end></DkMagenta>
-<DkRed><begin>DarkRed</begin><end></end></DkRed>
-<DkYellow><begin>#8b8b00</begin><end></end></DkYellow>
-<DkGray><begin>DarkGray</begin><end></end></DkGray>
-<LtGray><begin>LightGrey</begin><end></end></LtGray>
-<!--
-</color>
--->
-
-<!--
-<animation>
--->
-<LasVegas><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></LasVegas>
-<BackgroundBlink><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></BackgroundBlink>
-<SparkleText><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></SparkleText>
-<MarchingAnts><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></MarchingAnts>
-<MarchingRedAnts><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></MarchingRedAnts>
-<Shimmer><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></Shimmer>
-<!--
-</animation>
--->
-
-<!--
-I dont understand what this one is, and ive never come across it
-
-use this sample line (which admit it a bit scary looking, but harmless)...
--->
-<DispFldRMark><begin>&lt;a href=&quot;#author<ibstDispFldRMark/>&quot;&gt;--&amp;gt;&lt;/a&gt;</begin><end>&lt;a href=&quot;#author<ibstDispFldRMark/>&quot;&gt;[Author ID<ibstDispFldRMark/>: at <dttmDispFldRMark/> (<xstDispFldRMark/>)]&lt;/a&gt;</end></DispFldRMark>
-
-<!--
-or uncomment below to ignore it, the previous might even crash wv ?
--->
-<!--
-<DispFldRMark><begin></begin><end></end></DispFldRMark>
--->
-
-<animation>
-<begin><LasVegas.begin/><BackgroundBlink.begin/><SparkleText.begin/><MarchingAnts.begin/><MarchingRedAnts.begin/><Shimmer.begin/></begin>
-<end><Shimmer.end/><MarchingRedAnts.end/><MarchingAnts.end/><SparkleText.end/><BackgroundBlink.end/><LasVegas.end/></end>
-</animation>
-
-<fontstr>
-<begin>&lt;font color=&quot;<black.begin/><blue.begin/><cyan.begin/><green.begin/><magenta.begin/><red.begin/><yellow.begin/><white.begin/><dkblue.begin/><dkcyan.begin/><dkgreen.begin/><dkmagenta.begin/><dkred.begin/><dkyellow.begin/><dkgray.begin/><ltgray.begin/>&quot;&gt;</begin>
-<end><ltgray.end/><dkgray.end/><dkyellow.end/><dkred.end/><dkmagenta.end/><dkgreen.end/><dkcyan.end/><dkblue.end/><white.end/><yellow.end/><red.end/><magenta.end/><green.end/><cyan.end/><blue.end/><black.end/>&lt;/font&gt;</end>
-</fontstr>
-
-<comment>
-<begin>
-&lt;a href=&quot;#comment<ibstAnno/> &quot;&gt;-&#45;&amp;gt;&lt;/a&gt;
-</begin>
-<end>&lt;a href=&quot;#comment<ibstAnno/> &quot;&gt;[Author:<xstUsrInitl/>]&lt;/a&gt;
-</end>
-</comment>
-
-<style name="Normal">
-<character>
-<begin><PropRMark.begin/><DispFldRMark.begin/><animation.begin/><fontstr.begin/><bold.begin/><italic.begin/><strike.begin/><RMarkDel.begin/><outline.begin/><smallcaps.begin/><caps.begin/><vanish.begin/><RMark.begin/><shadow.begin/><lowercase.begin/><emboss.begin/><imprint.begin/><dstrike.begin/><super.begin/><sub.begin/><singleu.begin/><wordu.begin/><doubleu.begin/><dottedu.begin/><hiddenu.begin/><thicku.begin/><dashu.begin/><dotu.begin/><dotdashu.begin/><dotdotdashu.begin/><waveu.begin/></begin>
-<end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end>
-</character>
-
-<!-- Netscape does handle this correctly yet, here is how each different side of the border should work.
-border-top: thin <bordertopstyle/> <bordertopcolor/>;
-border-left: thin <borderleftstyle/> <borderleftcolor/>;
-border-right: thin <borderrightstyle/> <borderrightcolor/>;
-border-bottom: thin <borderbottomstyle/> <borderbottomcolor/>
--->
-
-
-<pmargin>
-<begin>margin: <mmParaBefore/> <mmParaRight/> <mmParaAfter/> <mmParaLeft/>;</begin>
-</pmargin>
-
-<pborder>
-<begin>
-border: thin <borderleftstyle/> <borderleftcolor/>;
-<!--
-border-top: thin <bordertopstyle/> <bordertopcolor/>;
-border-left: thin <borderleftstyle/> <borderleftcolor/>;
-border-right: thin <borderrightstyle/> <borderrightcolor/>;
-border-bottom: thin <borderbottomstyle/> <borderbottomcolor/>
--->
-</begin>
-</pborder>
-
-<text>
-<begin>&lt;p&gt;&lt;div name=&quot;<stylename/>&quot; align=&quot;<just/>&quot; style=&quot;<paramargin/> <paraborder/> padding: <mmPadTop/> <mmPadRight/> <mmPadBottom/> <mmPadLeft/>; &quot;&gt;
-
-&lt;p style=&quot;text-indent: <mmParaLeft1/>; text-align: <just/>; line-height: <mmLineHeight/>; color: <parafgcolor/>; background-color: <parabgcolor/>; &quot;&gt;</begin>
-
-<end>&lt;/p&gt;&lt;/div&gt;</end>
-</text>
-
-<picture>
-<begin>
-&lt;img <htmlAlignGuess/> width=&quot;<pixPicWidth/>&quot; height=&quot;<pixPicHeight/>&quot; alt=&quot;0x01 graphic&quot; src=&quot;placeholder.png&quot;&gt;<htmlNextLineGuess/>
-</begin>
-</picture>
-
-</style>
-
-<!--we need to be override the character properties-->
-<!--
-<style name="Normal">
-<character>
-<begin><PropRMark.begin/><DispFldRMark.begin/><animation.begin/><fontstr.begin/><bold.begin/><italic.begin/><strike.begin/><RMarkDel.begin/><outline.begin/><smallcaps.begin/><caps.begin/><vanish.begin/><RMark.begin/><shadow.begin/><lowercase.begin/><emboss.begin/><imprint.begin/><dstrike.begin/><super.begin/><sub.begin/><singleu.begin/><wordu.begin/><doubleu.begin/><dottedu.begin/><hiddenu.begin/><thicku.begin/><dashu.begin/><dotu.begin/><dotdashu.begin/><dotdotdashu.begin/><waveu.begin/></begin>
-<end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end>
-</character>
-
-<text>
-<begin>&lt;div name=&quot;<stylename/>&quot; align=&quot;<just/>&quot;&gt;&lt;p&gt;</begin>
-<end>&lt;/p&gt;&lt;/div&gt;</end>
-</text>
-
-</style>
-
-<style name="Heading 1">
-
-<character>
-<begin></begin>
-<end></end>
-</character>
-
-<text>
-<begin>&lt;div name=&quot;<stylename/>&quot; align=&quot;<just/>&quot;&gt;&lt;H1&gt;</begin>
-<end>&lt;/H1&gt;&lt;/div&gt;</end>
-</text>
-
-
-
-</style>
--->
-
-</main>
diff --git a/data/sisu/v4/conf/convert/wvSiSU.xml b/data/sisu/v4/conf/convert/wvSiSU.xml
deleted file mode 100644
index 271b00ff..00000000
--- a/data/sisu/v4/conf/convert/wvSiSU.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<main>
-<charentity>
-<begin>HTML</begin>
-</charentity>
-<!-- wvWare -x wvSiSU.xml [inputfile.doc] [outputfile.html] -->
-
-<document>
-<begin>
-</begin>
-<end>
-</end>
-</document>
-
-<section>
-<begin>
-</begin>
-<end>
-</end>
-</section>
-
-<justification>
-<left>left</left>
-<right>right</right>
-<center>center</center>
-<block>left</block>
-<asian>&lt;!--Could Someone who sees this tag tell me what was is this type of justification, asian languages only i thing--&gt;</asian>
-</justification>
-
-<numbering>
-<Arabic>type=&quot;1&quot;</Arabic>
-<UpperRoman>type=&quot;I&quot;</UpperRoman>
-<LowerRoman>type=&quot;i&quot;</LowerRoman>
-<UpperCaseN>type=&quot;A&quot;</UpperCaseN>
-<LowerCaseN>type=&quot;a&quot;</LowerCaseN>
-</numbering>
-
-<border>
-<noned>none</noned>
-<singled>solid</singled>
-<thickd>solid</thickd>
-<doubled>double</doubled>
-<number4d>double</number4d>
-<hairlined>solid</hairlined>
-<dotd>dotted</dotd>
-<dashlargegapd>dashed</dashlargegapd>
-<dotdashd>dotted</dotdashd>
-<dotdotdashd>dotted</dotdotdashd>
-<tripled>double</tripled>
-<thin-thicksmallgapd>dashed</thin-thicksmallgapd>
-<thick-thinsmallgapd>dashed</thick-thinsmallgapd>
-<thin-thick-thinsmallgapd>dashed</thin-thick-thinsmallgapd>
-<thin-thickmediumgapd>dashed</thin-thickmediumgapd>
-<thick-thinmediumgapd>dashed</thick-thinmediumgapd>
-<thin-thick-thinmediumgapd>dashed</thin-thick-thinmediumgapd>
-<thin-thicklargegapd>dashed</thin-thicklargegapd>
-<thick-thinlargegapd>dashed</thick-thinlargegapd>
-<thin-thick-thinlargegapd>dashed</thin-thick-thinlargegapd>
-<waved>solid</waved>
-<doublewaved>double</doublewaved>
-<dashsmallgapd>sashed</dashsmallgapd>
-<dashdotstrokedd>dashed</dashdotstrokedd>
-<emboss3Dd>ridge</emboss3Dd>
-<engrave3Dd>groove</engrave3Dd>
-<defaultd>ridge</defaultd>
-</border>
-
-<!-- <begin>&lt;ol <nfc/> start=&quot;<start/>&quot;&gt; -->
-<olist>
-<begin>
-</begin>
-<end></end>
-</olist>
-
-<ulist>
-<begin>
-</begin>
-<end></end>
-</ulist>
-
-<!-- <begin>&lt;li&gt;</begin> -->
-<entry>
-<begin></begin>
-<end></end>
-</entry>
-
-
-<!--
-this tableoverride option can be used to turn off handling of
-these tags in tables, which I find is necessary for at least netscape
--->
-<tableoverrides>
-<ParaBefore>0</ParaBefore>
-<ParaRight>0</ParaRight>
-<ParaAfter>0</ParaAfter>
-<ParaLeft>0</ParaLeft>
-<ParaLeft1>0</ParaLeft1>
-<VertMergedCells>0</VertMergedCells>
-</tableoverrides>
-
-<table>
-<begin></begin>
-<end></end>
-</table>
-
-<row>
-<begin>&lt;tr&gt;</begin>
-<end>&lt;/tr&gt;</end>
-</row>
-
-<cell>
-<begin></begin>
-<end></end>
-</cell>
-
-<!-- EDITING OUT DID MUCH OF TRICK -->
-<paragraph>
-<begin>
-</begin>
-<end>
-</end>
-</paragraph>
-
-<!-- these are all the character properties that can show up in word -->
-<bold><begin>&lt;b&gt;</begin><end>&lt;/b&gt;</end></bold>
-<italic><begin>&lt;i&gt;</begin><end>&lt;/i&gt;</end></italic>
-
-<!--
-text that has been deleted and will be displayed with strikethrough when
-revision marked text is to be displayed
-
-use either this line...
--->
-<RMarkDel><begin>&lt;s&gt;</begin><end>&lt;/s&gt;&lt;a href=&quot;#author<ibstRMarkDel/>&quot;&gt;[Author ID<ibstRMarkDel/>: at <dttmRMarkDel/> ]&lt;/a&gt;</end></RMarkDel>
-
-<!--
-or uncomment below to make deleted text dissappear (well, become commented out)
--->
-<!--
-<RMarkDel><begin>&lt;!-&#45;</begin><end>-&#45;&gt;</end></RMarkDel>
--->
-
-<!-- Overwriting char props. like CaPs->CAPS SmallCaps->smallcaps -->
-<outline><begin></begin><end></end></outline>
-<smallcaps><begin></begin><end></end></smallcaps>
-<caps><begin></begin><end></end></caps>
-<vanish><begin></begin><end></end></vanish>
-
-<!--If you uncomment this then the annotation text links will become commented out by html tags-->
-<!--
-<vanish><begin>&lt;!-&#45;</begin><end>-&#45;&gt;</end></vanish>
--->
-
-<!--
-text that has been newly typed since the last time revision marks have been accepted
-and will be displayed with underline when revision marked text is to be displayed
-
-use either this line...
--->
-<RMark><begin></begin><end></end></RMark>
-
-<!--
-or uncomment below to make the underline dissappear
--->
-<!--
-<RMark><begin></begin><end></end></RMark>
--->
-
-
-<strike><begin>&lt;s&gt;</begin><end>&lt;/s&gt;</end></strike>
-<shadow><begin></begin><end></end></shadow>
-<lowercase><begin></begin><end></end></lowercase>
-<emboss><begin></begin><end></end></emboss>
-<imprint><begin></begin><end></end></imprint>
-<!--double strike-->
-<dstrike><begin>&lt;s&gt;</begin><end>&lt;/s&gt;</end></dstrike>
-
-<!--
-ftc's
-&
-hps
-
-keep them for font face and do that later.
--->
-
-<super><begin>&lt;sup&gt;</begin><end>&lt;/sup&gt;</end></super>
-<sub><begin>&lt;sub&gt;</begin><end>&lt;/sub&gt;</end></sub>
-
-<singleu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></singleu>
-<wordu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></wordu>
-<doubleu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></doubleu>
-<dottedu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dottedu>
-<hiddenu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></hiddenu>
-<thicku><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></thicku>
-<dashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dashu>
-<dotu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotu>
-<dotdashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotdashu>
-<dotdotdashu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></dotdotdashu>
-<waveu><begin>&lt;u&gt;</begin><end>&lt;/u&gt;</end></waveu>
-
-<!--
-text whose properties have been changed since the last time revision marks have been accepted
-and will be displayed with a note showing the change points.
-
-use either this line (which admit it a bit scary looking, but harmless)...
--->
-<PropRMark><begin></begin><end></end></PropRMark>
-
-<!--
-or uncomment below to make the notes dissappear
--->
-<!--
-<PropRMark><begin></begin><end></end></PropRMark>
--->
-
-<!--
-<color>
--->
-<Black><begin>Black</begin><end></end></Black>
-<Blue><begin>Blue</begin><end></end></Blue>
-<Cyan><begin>Cyan</begin><end></end></Cyan>
-<Green><begin>Green</begin><end></end></Green>
-<Magenta><begin>Magenta</begin><end></end></Magenta>
-<Red><begin>Red</begin><end></end></Red>
-<Yellow><begin>Yellow</begin><end></end></Yellow>
-<White><begin>White</begin><end></end></White>
-<DkBlue><begin>DarkBlue</begin><end></end></DkBlue>
-<DkCyan><begin>DarkCyan</begin><end></end></DkCyan>
-<DkGreen><begin>DarkGreen</begin><end></end></DkGreen>
-<DkMagenta><begin>DarkMagenta</begin><end></end></DkMagenta>
-<DkRed><begin>DarkRed</begin><end></end></DkRed>
-<DkYellow><begin>#8b8b00</begin><end></end></DkYellow>
-<DkGray><begin>DarkGray</begin><end></end></DkGray>
-<LtGray><begin>LightGrey</begin><end></end></LtGray>
-<!--
-</color>
--->
-
-<!--
-<animation>
--->
-<LasVegas><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></LasVegas>
-<BackgroundBlink><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></BackgroundBlink>
-<SparkleText><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></SparkleText>
-<MarchingAnts><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></MarchingAnts>
-<MarchingRedAnts><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></MarchingRedAnts>
-<Shimmer><begin>&lt;blink&gt;</begin><end>&lt;/blink&gt;</end></Shimmer>
-<!--
-</animation>
--->
-
-<!--
-I dont understand what this one is, and ive never come across it
-
-use this sample line (which admit it a bit scary looking, but harmless)...
--->
-<DispFldRMark><begin></begin><end></end></DispFldRMark>
-
-<!--
-or uncomment below to ignore it, the previous might even crash wv ?
--->
-<!--
-<DispFldRMark><begin></begin><end></end></DispFldRMark>
--->
-
-<animation>
-<begin></begin>
-<end></end>
-</animation>
-
-<fontstr>
-<begin></begin>
-<end></end>
-</fontstr>
-
-<comment>
-<begin>
-</begin>
-<end>
-</end>
-</comment>
-
-<style name="Normal">
-<character>
-<begin><bold.begin/><italic.begin/><strike.begin/><RMarkDel.begin/><outline.begin/><smallcaps.begin/><caps.begin/><vanish.begin/><RMark.begin/><shadow.begin/><lowercase.begin/><emboss.begin/><imprint.begin/><dstrike.begin/><super.begin/><sub.begin/><singleu.begin/><wordu.begin/><doubleu.begin/><dottedu.begin/><hiddenu.begin/><thicku.begin/><dashu.begin/><dotu.begin/><dotdashu.begin/><dotdotdashu.begin/><waveu.begin/></begin>
-<end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/></end>
-</character>
-
-<!-- KEEP
-<style name="Normal">
-<character>
-<begin><PropRMark.begin/><DispFldRMark.begin/><animation.begin/><fontstr.begin/><bold.begin/><italic.begin/><strike.begin/><RMarkDel.begin/><outline.begin/><smallcaps.begin/><caps.begin/><vanish.begin/><RMark.begin/><shadow.begin/><lowercase.begin/><emboss.begin/><imprint.begin/><dstrike.begin/><super.begin/><sub.begin/><singleu.begin/><wordu.begin/><doubleu.begin/><dottedu.begin/><hiddenu.begin/><thicku.begin/><dashu.begin/><dotu.begin/><dotdashu.begin/><dotdotdashu.begin/><waveu.begin/></begin>
-<end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end>
-</character>
--->
-
-<!-- Netscape does handle this correctly yet, here is how each different side of the border should work.
-border-top: thin <bordertopstyle/> <bordertopcolor/>;
-border-left: thin <borderleftstyle/> <borderleftcolor/>;
-border-right: thin <borderrightstyle/> <borderrightcolor/>;
-border-bottom: thin <borderbottomstyle/> <borderbottomcolor/>
--->
-
-
-<pmargin>
-<begin></begin>
-</pmargin>
-
-<pborder>
-<begin>
-</begin>
-</pborder>
-
-<text>
-<begin>
-
-<mmParaLeft1/></begin>
-
-<end></end>
-</text>
-
-<picture>
-<begin>
-</begin>
-</picture>
-
-</style>
-
-<!--we need to be override the character properties-->
-<!--
-<style name="Normal">
-<character>
-<begin><PropRMark.begin/><DispFldRMark.begin/><animation.begin/><fontstr.begin/><bold.begin/><italic.begin/><strike.begin/><RMarkDel.begin/><outline.begin/><smallcaps.begin/><caps.begin/><vanish.begin/><RMark.begin/><shadow.begin/><lowercase.begin/><emboss.begin/><imprint.begin/><dstrike.begin/><super.begin/><sub.begin/><singleu.begin/><wordu.begin/><doubleu.begin/><dottedu.begin/><hiddenu.begin/><thicku.begin/><dashu.begin/><dotu.begin/><dotdashu.begin/><dotdotdashu.begin/><waveu.begin/></begin>
-<end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end>
-</character>
-
-<text>
-<begin>&lt;div name=&quot;<stylename/>&quot; align=&quot;<just/>&quot;&gt;&lt;p&gt;</begin>
-<end>&lt;/p&gt;&lt;/div&gt;</end>
-</text>
-
-</style>
-
-<style name="Heading 1">
-
-<character>
-<begin></begin>
-<end></end>
-</character>
-
-<text>
-<begin>&lt;div name=&quot;<stylename/>&quot; align=&quot;<just/>&quot;&gt;&lt;H1&gt;</begin>
-<end>&lt;/H1&gt;&lt;/div&gt;</end>
-</text>
-
-
-
-</style>
--->
-
-</main>
diff --git a/data/sisu/v4/conf/editor-syntax-etc/README b/data/sisu/v4/conf/editor-syntax-etc/README
deleted file mode 100644
index c03f3569..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/README
+++ /dev/null
@@ -1,90 +0,0 @@
-This directory
- ./data/sisu/conf/editor-syntax-etc/
- /usr/share/sisu/conf/editor-syntax-etc/
-contains rudimentary sisu syntax highlighting files for:
-
-* (g)vim <http://www.vim.org>
- * package: sisu-vim
- * status: largely done
- there is a vim syntax highlighting and folds component
-
-* gedit <http://www.gnome.org/projects/gedit>
-* gobby <http://gobby.0x539.de/>
- file: sisu.lang
- place in:
- /usr/share/gtksourceview-1.0/language-specs
- or
- ~/.gnome2/gtksourceview-1.0/language-specs
- * status: very basic syntax highlighting
- * comments: this editor features display line wrap and is used by Goby!
-
-* nano <http://www.nano-editor.org>
- file: nanorc
- save as:
- ~/.nanorc
- includes:
- * status: basic syntax highlighting
- * comments: assumes dark background
- no display line-wrap
- does line breaks
-
-* diakonos (an editor written in ruby) <http://purepistos.net/diakonos>
- file: diakonos.conf
- save as:
- ~/.diakonos/diakonos.conf
- includes:
- * status: basic syntax highlighting
- * comments: assumes dark background
- no display line-wrap
-
-* kate & kwrite http://kate.kde.org
- file: sisu.xml
- place in:
- /usr/share/apps/katepart/syntax
- or
- ~/.kde/share/apps/katepart/syntax
- [settings::configure kate::{highlighting,filetypes}]
- [tools::highlighting::{markup,scripts}::SiSU]
-
-* nedit <http://www.nedit.org>
- file: sisu_nedit.pats
- nedit -import sisu_nedit.pats
- * status: a very clumsy first attempt
- [not really done]
- * comments: this editor features display line wrap
-
-* emacs <http://www.gnu.org/software/emacs/emacs.html>
- files: sisu-mode.el
- to file ~/.emacs add the following 2 lines:
- (add-to-list 'load-path "/usr/share/sisu-examples/config/syntax_hi")
- (require 'sisu-mode.el)
- [not done / not yet included]
-
-* vim & gvim <http://www.vim.org>
- files: sisu-vim <http://www.jus.uio.no/sisu/SiSU/download>
- package is the most comprehensive sisu syntax highlighting and editor
- environment provided to date (is for vim/ gvim, and is separate from the
- contents of this directory)
- on debian:
- aptitude install sisu-vim
- * status: this includes:
- syntax highlighting
- vim folds
- some error checking
- * comments: this editor features display line wrap
-
-NOTE:
-
-[SiSU parses files with long lines or line breaks,
-but, display linewrap (without line-breaks) is a
-convenient editor feature to have for sisu markup]
-
-kde-config --prefix
-KDEDIR/share/apps/katepart/syntax/
-KDEHOME/share/apps/katepart/syntax
-[In the configure dialog in kate, go to the "Editor->highlighting" page and
->select a highlight to change the mimetype/pattern associations for it.]
-/etc/mime.types
-/usr/share/mime/text
-#
-# * aeditor (an editor written in ruby)
diff --git a/data/sisu/v4/conf/editor-syntax-etc/diakonos/diakonos.conf b/data/sisu/v4/conf/editor-syntax-etc/diakonos/diakonos.conf
deleted file mode 100644
index a3c3afe4..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/diakonos/diakonos.conf
+++ /dev/null
@@ -1,1159 +0,0 @@
-logfile ~/.diakonos/diakonos.log
-
-# When the cursor is view.margin.y lines or less from the top or
-# bottom line, repeatedly scroll the screen view.jump.y lines until
-# the cursor is more than view.margin.y lines from the top and
-# bottom line.
-# Similarly for view.margin.x and view.jump.x, with respect to the
-# left-most and right-most screen columns.
-view.margin.x 10
-view.margin.y 5
-view.jump.x 10
-view.jump.y 5
-view.scroll_amount 1
-view.lookback 200
-view.nonfilelines.visible false
-view.nonfilelines.character ~
-view.wrap.visual true
-
-# bol_behaviour: This specifies where the cursor should go when the
-# beginning-of-line key (the default is the Home key) is pressed.
-# zero: Always move to the left-most column of the line
-# first-char: Always move to the left-most non-whitespace character
-# alternating-zero: As with 'zero', unless the cursor is
-# already there, in which case, as with 'first-char'.
-# alternating-first-char: As with 'first-char', unless the cursor is
-# already there, in which case, as with 'zero'.
-# bol_behavior is a synonym for bol_behaviour.
-bol_behaviour alternating-first-char
-
-# eol_behaviour: This specifies where the cursor should go when the
-# end-of-line key (the default is the End key) is pressed.
-# end: Always move to the right-most column of the line
-# last-char: Always move to the right-most non-whitespace character
-# alternating-end: As with 'end', unless the cursor is
-# already there, in which case, as with 'last-char'.
-# alternating-last-char: As with 'last-char', unless the cursor is
-# already there, in which case, as with 'end'.
-# eol_behavior is a synonym for eol_behaviour.
-eol_behaviour alternating-end
-
-# Ensures saved files end with a newline character by adding it if necessary.
-eof_newline false
-
-delete_newline_on_delete_to_eol false
-
-# Specifies whether the cursor should be at the end (false) of found text, or the
-# beginning (true).
-found_cursor_start false
-
-max_clips 30
-
-# The maximum number of undo lines held in memory per file
-# Smaller files will be able to have more undo levels.
-max_undo_lines 16384
-
-convert_tabs false
-
-diff_command diff -U 5
-
-# Whether or not to use /usr/bin/file to determine whether files are readable
-# before opening them.
-use_magic_file false
-
-# ---------------------------------------------------------------------
-# Status Line
-
-# Use "% syntax" as placeholders
-# e.g. %d for decimal integers, %s for strings
-status.left -- %s %s%s%s -- (%s) --%s
-status.right - Buf %d of %d --- L%3d/%3d C%2d --
-# The string to use to fill in the space between the left and right sides
-# of the status line.
-status.filler -
-status.modified_str (modified)
-status.selecting_str (selecting)
-status.unnamed_str (unnamed file)
-status.read_only_str (read-only)
-# status.vars: any subset of:
-# line row num_lines col filename modified type buffer_number num_buffers selecting read_only
-status.vars filename modified read_only selecting type @git_branch buffer_number num_buffers row num_lines col
-status.format inverse
-
-# ---------------------------------------------------------------------
-# Context Line
-
-# The context line shows the wrapping context of the cursor, with respect to
-# indentation. This shows the current code block(s) that the cursor is in.
-
-context.visible false
-context.combined false
-context.max_levels 4
-context.format inverse
-context.separator |
-context.separator.format red inverse
-#context.max_segment_width 10
-
-# ---------------------------------------------------------------------
-# Interaction Line
-
-# Duration of "alert" blink (in seconds) when user has made an invalid choice
-interaction.blink_duration 0.05
-interaction.blink_string ***********************************************************
-# Time to wait (in seconds) before accepting user keystrokes when prompting for
-# a choice which has no default
-interaction.choice_delay 3
-
-# ---------------------------------------------------------------------
-# Key Configuration
-# key <keystroke> [<keystroke>...];<function> [<arg>[,<arg>...]]
-# If no function is specified, it unmaps any previous mapping.
-# i.e. key <keystroke> [<keystroke>...];
-# <keystroke> can be "keycode##" to specify specific keycodes.
-# e.g. key keycode8;delete
-# Note the lack of space after the word keycode.
-
-# To obtain the string to use for any keychain, use the printKeychain command
-# (default alt+k).
-
-# The shell, execute and pasteShellResult commands can take variables:
-
-# $f current buffer's filepath
-# $F all current buffer filepaths, space-separated
-# $i get a string from user input
-# $c temp file containing current clipboard text
-# $k temp file containing current klipper (KDE clipboard) text
-# $s temp file containing currently selected text
-
-key left;cursorLeft
-key esc [ D;cursorLeft
-key right;cursorRight
-key esc [ C;cursorRight
-key up;cursorUp
-key esc [ A;cursorUp
-key down;cursorDown
-key esc [ B;cursorDown
-key home;cursorBOL
-key esc O H;cursorBOL
-key esc [ H;cursorBOL
-key esc [ 1 ~ cursorBOL
-key esc [ 7 ~ cursorBOL
-key end;cursorEOL
-key esc O F;cursorEOL
-key esc [ F;cursorEOL
-key esc [ 4 ~;cursorEOL
-key esc [ 8 ~;cursorEOL
-key pageup;pageUp
-key pagedown;pageDown
-#key ctrl+a;cursorBOL
-key ctrl+e;cursorEOL
-key alt+<;cursorBOF
-key esc [ 1 ; 5 H cursorBOF
-key alt+>;cursorEOF
-key esc [ 1 ; 5 F cursorEOF
-key alt+,;cursorTOV
-key alt+.;cursorBOV
-key ctrl+j;cursorReturn
-key ctrl+l;cursorReturn "forward"
-key alt+n;scrollDown
-key alt+p;scrollUp
-key esc up;scrollUp
-key esc [ 1 ; 3 A scrollUp
-key esc [ 1 ; 5 A scrollUp
-key keycode520 scrollUp
-key keycode521 scrollUp
-key esc down;scrollDown
-key esc [ 1 ; 3 B scrollDown
-key esc [ 1 ; 5 B scrollDown
-key keycode513 scrollDown
-key keycode514 scrollDown
-key esc right;seek /(?:^|\W)(\w)|\w(\W|$)/
-key esc [ 1 ; 3 C seek /\w(\W|$)|(?:^|\W)(\w)/
-key esc [ 1 ; 5 C seek /\w(\W|$)|(?:^|\W)(\w)/
-key keycode517 seek /\w(\W|$)|(?:^|\W)(\w)/
-key keycode518 seek /\w(\W|$)|(?:^|\W)(\w)/
-key esc left;seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
-key esc [ 1 ; 3 D seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
-key esc [ 1 ; 5 D seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
-key keycode515 seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
-key keycode516 seek /\w(\W|$)|(?:^|\W)(\w)/, "up"
-
-key ctrl+g;goToLineAsk
-key alt+b alt+b;toggleBookmark
-key alt+b alt+n;goToNextBookmark
-key alt+b alt+p;goToPreviousBookmark
-key alt+b alt+a;addNamedBookmark
-key alt+b alt+r;removeNamedBookmark
-key alt+b alt+g;goToNamedBookmark
-key alt+b alt+!;addNamedBookmark 1
-key alt+b alt+@;addNamedBookmark 2
-key alt+b alt+#;addNamedBookmark 3
-key alt+b alt+$;addNamedBookmark 4
-key alt+b alt+%;addNamedBookmark 5
-key alt+b alt+1;goToNamedBookmark 1
-key alt+b alt+2;goToNamedBookmark 2
-key alt+b alt+3;goToNamedBookmark 3
-key alt+b alt+4;goToNamedBookmark 4
-key alt+b alt+5;goToNamedBookmark 5
-key alt+t;goToTag
-key alt+);goToTagUnderCursor
-key alt+(;popTag
-
-key backspace;backspace
-key ctrl+h;backspace
-key del;delete
-#key ctrl+k;deleteLine
-key ctrl+k;deleteAndStoreLine
-key ctrl+alt+k;deleteToEOL
-key esc del;collapseWhitespace
-key esc [ 3 ; 3 ~ collapseWhitespace
-key alt+w wrap_paragraph
-key alt+a columnize
-key enter;carriageReturn
-key tab;parsedIndent
-#key tab;indent
-#key ctrl+alt+l;unindent
-key alt+i;indent
-key esc i;indent
-key esc I;unindent
-key esc [ Z unindent
-key keycode353 unindent
-#key tab;insertSpaces 4
-#key tab;insertTab
-key ctrl+t;insertTab
-key alt+j joinLines
-
-key f1 help
-key esc O P help
-key esc [ 1 1 ~ help
-key esc [ [ A help
-key f11;loadConfiguration
-key esc [ 2 3 ~;loadConfiguration
-key f12;openFile "~/.diakonos/diakonos.conf"
-key esc [ 2 4 ~;openFile "~/.diakonos/diakonos.conf"
-
-key ctrl+alt+r;redraw
-key esc C;toggleSessionSetting 'context.visible', DO_REDRAW
-key ctrl+alt+d;toggleSessionSetting 'display'
-key esc W;toggleSessionSetting 'view.wrap.visual', DO_REDRAW
-
-key ctrl+n;newFile
-key ctrl+o;openFileAsk
-key ctrl+s;saveFile
-key alt+s;saveFileAs
-key ctrl+w;closeFile
-key ctrl+alt+o;revert
-key alt+!;setReadOnly
-key ctrl+q;quit
-key esc T;setBufferType
-
-key alt+1;switchToBufferNumber 1
-key alt+2;switchToBufferNumber 2
-key alt+3;switchToBufferNumber 3
-key alt+4;switchToBufferNumber 4
-key alt+5;switchToBufferNumber 5
-key alt+6;switchToBufferNumber 6
-key alt+7;switchToBufferNumber 7
-key alt+8;switchToBufferNumber 8
-key alt+9;switchToBufferNumber 9
-key alt+0;switchToBufferNumber 10
-key alt+-;switchToPreviousBuffer
-key alt+=;switchToNextBuffer
-key ctrl+alt+b list_buffers
-
-key ctrl+space;anchorSelection
-#key ctrl+space;toggleSelection
-key ctrl+c;copySelection
-key ctrl+x;cutSelection
-key alt+u;removeSelection
-key ctrl+a select_all
-
-# If you are using KDE, you can uncomment these lines to synchronize
-# the Diakonos clipboard with the KDE clipboard
-#key ctrl+c copy_selection_to_klipper
-#key ctrl+x cut_selection_to_klipper
-#key ctrl+v paste_from_klipper
-#key ctrl+k delete_and_store_line_to_klipper
-#key ctrl+alt+k delete_to_eol_to_klipper
-
-key ctrl+b select_block
-# Select file diff in a patch
-key ctrl+alt+d f select_block /^Index: /, /^(Index: |$)/, false
-# Select a diff hunk in a patch
-key ctrl+alt+d h select_block /^@@ /, /^(@@ |$)/, false
-key esc # comment_out
-key esc @ uncomment
-
-key ctrl+alt+v;showClips
-key ctrl+v;paste
-key ctrl+y;unundo
-key ctrl+z;undo
-#key ctrl+z;suspend
-key suspend;undo
-#key suspend;suspend
-
-key ctrl+f;find
-#key ctrl+f;find "down", CASE_SENSITIVE
-key alt+f;find "down", CASE_SENSITIVE
-#key alt+f;findExact
-key ctrl+alt+f;find "up"
-#key ctrl+alt+f;find "up", CASE_SENSITIVE
-key f3;findAgain "down"
-key esc [ [ C findAgain "down"
-key esc O R;findAgain "down"
-key esc [ 1 3 ~;findAgain "down"
-key f15;findAgain "up"
-key esc [ 2 8 ~ findAgain "up"
-key esc O 2 R;findAgain "up"
-key ctrl+r searchAndReplace
-key alt+r searchAndReplace CASE_SENSITIVE
-key ctrl+alt+u;clearMatches
-key alt+c;close_code
-
-key f2 shell
-key esc O Q shell
-key esc [ 1 2 ~ shell
-key esc [ [ B shell
-key f8;execute
-key esc F;execute "glark '$i' $F | less"
-key esc d shell "diff -U 5 -w -b $c $s", "clipboard.diff"
-#key esc F;shell "grep -n '$i' $F"
-#key esc F;execute "grep -n '$i' $F | less"
-#key esc l execute "aspell check $f"
-key f14 evaluate
-key esc O 2 Q evaluate
-key esc [ 2 6 ~ evaluate
-key ctrl+alt+c shell "ruby -c $f"
-
-# To use the following:
-# 1) Copy to the clipboard some Ruby code which operates on stdin text and outputs to stdout.
-# 2) Select (highlight) some text to operate on.
-# 3) Activate this pasteShellResult command.
-# 4) The selected text should now be replaced with the script's results.
-key ctrl+alt+p;pasteShellResult "cat $s | ruby $c"
-#key ctrl+alt+p;pasteShellResult "cat $s | perl $c"
-#key ctrl+alt+p;pasteShellResult "cat $s | python $c"
-#key ctrl+alt+p;pasteShellResult "cat $s | sed -f $c"
-#key ctrl+alt+p;pasteShellResult "cat $s | awk -f $c"
-
-key alt+k printKeychain
-key esc K print_mapped_function
-key alt+m;toggleMacroRecording
-key f4 playMacro
-key esc O S playMacro
-key esc [ 1 4 ~ playMacro
-key esc [ [ D playMacro
-key f5 loadScript
-key esc [ 1 5 ~ loadScript
-key esc [ [ E loadScript
-key f6;repeatLast
-key esc [ 1 7 ~;repeatLast
-key f7;operateOnEachLine
-key f19;operateOnString
-key esc [ 1 8 ; 2 ~ operateOnString
-key esc f7 operateOnLines
-key esc [ 1 8 ; 3 ~ operateOnLines
-key keycode319 operateOnLines
-
-# Emacs-like keychains
-
-#key ctrl+s;find
-#key ctrl+x ctrl+c;quit
-#key ctrl+x ctrl+f;openFileAsk
-#key ctrl+x ctrl+s;saveFile
-
-# ---------------------------------------------------------------------
-# Colour Definitions
-#
-# colour <integer greater than 7> <foreground colour> <background colour>
-#
-# For a list of colour names, see the list of format codes in the
-# Language Definitions section, below.
-#
-# With this colour command you can set a different background colour than the
-# terminal default.
-#
-# color is a synonym for colour.
-colour 8 white blue
-colour 9 white red
-colour 10 white magenta
-colour 11 yellow blue
-colour 12 white green
-colour 13 white brown
-colour 14 black cyan
-colour 15 yellow red
-
-# ---------------------------------------------------------------------
-# Language Definitions
-# For syntax highlighting and indentation.
-
-# lang.<language>.tokens.<any name>[.case_insensitive] <regexp with one pair of parentheses identifying the token>
-# lang.<language>.tokens.<any name>.format <format codes>
-# <format codes> can be any subset of:
-# normal black red green brown blue magenta cyan white standout underline inverse blink dim bold
-# The numbers of colour pairs (as defined by the configuration command "colour")
-# can also be used as format codes.
-#
-# indent.roundup: If a line's indentation is not evenly divisible by the
-# indent.size, and indent.roundup is true, then the non-integer indentation
-# level will be rounded up. If indent.roundup is false, then it will be
-# rounded down.
-# e.g. given an indent.size of 4, and a line with 6 spaces, indent.roundup
-# true will make Diakonos consider the line indented 2 levels. With
-# indent.roundup false, it will be considered indented 1 level.
-#
-# The filemask can also be used to specify specific filenames which
-# don't conform to the standard extensions for a language.
-
-# Text (default)
-
-lang.text.format.default white
-lang.text.format.selection inverse
-lang.text.format.found yellow inverse
-lang.text.indent.size 2
-lang.text.indent.auto true
-lang.text.indent.roundup false
-#lang.text.indent.using_tabs true
-lang.text.tabsize 8
-lang.text.wrap_margin 80
-
-# Diakonos help files
-
-lang.dhf.filemask \.dhf
-lang.dhf.format.default white
-lang.dhf.format.selection inverse
-lang.dhf.format.found yellow inverse
-lang.dhf.tokens.tags (^Tags: .+)
-lang.dhf.tokens.tags.format blue
-lang.dhf.tokens.title (^# .*)
-lang.dhf.tokens.title.format 8 bold
-lang.dhf.tokens.subtitle (^## .*)
-lang.dhf.tokens.subtitle.format cyan bold
-lang.dhf.tokens.subsubtitle (^### .*)
-lang.dhf.tokens.subsubtitle.format cyan
-lang.dhf.tokens.keys <(.+?)>
-lang.dhf.tokens.keys.format white bold
-lang.dhf.indent.size 2
-lang.dhf.indent.auto true
-lang.dhf.indent.roundup true
-lang.dhf.wrap_margin 80
-
-# XML
-
-lang.xml.filemask \.(xml|xsl|rdl|aiml|xhtml)$
-lang.xml.format.default white
-lang.xml.format.selection inverse
-lang.xml.format.found yellow inverse
-lang.xml.tabsize 8
-lang.xml.indent.size 2
-lang.xml.indent.auto true
-lang.xml.indent.roundup true
-#lang.xml.indent.using_tabs true
-lang.xml.tokens.entities &\S+?;
-lang.xml.tokens.entities.format magenta bold
-lang.xml.tokens.code.open (<)(?:[^%]|$)
-lang.xml.tokens.code.close (?:[^%]|^)(>)
-lang.xml.tokens.code.format white bold
-lang.xml.tokens.code.change_to xml_tag
-lang.xml.tokens.comments.open (<!--)
-lang.xml.tokens.comments.close (-->)
-lang.xml.tokens.comments.format 8
-lang.xml.tokens.comments.change_to xml_comment
-lang.xml.comment_string <!--
-lang.xml.comment_close_string " -->"
-lang.xml.tokens.template.open \[@--
-lang.xml.tokens.template.close --@\]
-lang.xml.tokens.template.format brown
-lang.xml.tokens.template.change_to perl
-lang.xml.closers.tag.regexp <([^/> ]*)
-lang.xml.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
-lang.xml_tag.format.default white bold
-lang.xml_tag.format.selection inverse
-lang.xml_tag.format.found yellow inverse
-lang.xml_tag.tabsize 8
-lang.xml_tag.indent.size 2
-lang.xml_tag.indent.auto true
-lang.xml_tag.indent.roundup true
-#lang.xml_tag.indent.using_tabs true
-lang.xml_tag.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.xml_tag.tokens.doublequoted_strings.format green bold
-lang.xml_tag.tokens.singlequoted_strings ('.*?[^\\]')
-lang.xml_tag.tokens.singlequoted_strings.format green bold
-lang.xml_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.xml_tag.tokens.non_alphanum.format white
-lang.xml_tag.tokens.namespaces ([a-zA-Z_-]+):
-lang.xml_tag.tokens.namespaces.format yellow bold
-lang.xml_comment.format.default 8
-lang.xml_comment.format.selection inverse
-lang.xml_comment.format.found yellow inverse
-lang.xml_comment.tabsize 8
-lang.xml_comment.indent.size 2
-lang.xml_comment.indent.auto true
-lang.xml_comment.indent.roundup true
-#lang.xml_comment.indent.using_tabs true
-
-lang.html.filemask \.([rx]?html?|php|asp)$
-lang.html.format.default white
-lang.html.format.selection inverse
-lang.html.format.found yellow inverse
-lang.html.tabsize 8
-lang.html.indent.size 2
-lang.html.indent.auto true
-lang.html.indent.roundup true
-#lang.html.indent.using_tabs true
-lang.html.tokens.code.open (<)(?:[^%]|$)
-lang.html.tokens.code.close (?:[^%]|^)(>)
-lang.html.tokens.code.format white bold
-lang.html.tokens.code.change_to html_tag
-lang.html.tokens.entities &\S+?;
-lang.html.tokens.entities.format magenta bold
-lang.html.tokens.eruby.open <%
-lang.html.tokens.eruby.close %>
-lang.html.tokens.eruby.format 9 bold
-lang.html.tokens.eruby.change_to ruby
-lang.html.tokens.ezamar.open <\?r
-lang.html.tokens.ezamar.close \?>
-lang.html.tokens.ezamar.format 9 bold
-lang.html.tokens.ezamar.change_to ruby
-lang.html.tokens.ezamar-value.open \#\{
-lang.html.tokens.ezamar-value.close \}
-lang.html.tokens.ezamar-value.format 9 bold
-lang.html.tokens.ezamar-value.change_to ruby
-lang.html.tokens.php.open <\?(?:php)?
-lang.html.tokens.php.close \?>
-lang.html.tokens.php.format 10 bold
-lang.html.tokens.php.change_to php
-lang.html.tokens.comments.open (<!--)
-lang.html.tokens.comments.close (-->)
-lang.html.tokens.comments.format 8
-lang.html.tokens.comments.change_to html_comment
-lang.html.comment_string <!--
-lang.html.comment_close_string " -->"
-lang.html.closers.tag.regexp <([^/> ]*)
-lang.html.closers.tag.closer { |m| "</" + m[ 1 ] + ">" }
-lang.html_tag.format.default white bold
-lang.html_tag.format.selection inverse
-lang.html_tag.format.found yellow inverse
-lang.html_tag.tabsize 8
-lang.html_tag.indent.size 4
-lang.html_tag.indent.auto true
-lang.html_tag.indent.roundup true
-#lang.html_tag.indent.using_tabs true
-lang.html_tag.tokens.attribute (href)
-lang.html_tag.tokens.attribute.format green bold
-lang.html_tag.tokens.elements.case_insensitive \b(A|ABBR|ACRONYM|ADDRES|APPLET|AREA|B|BASE|BASEFONT|BDO|BIG|BLOCKQUOTE|BODY|BR|BUTTON|CAPTION|CENTER|CITE|CODE|COL|COLGROUP|DD|DEL|DFN|DIR|DIV|DL|DT|EM|FIELDSET|FONT|FORM|FRAME|FRAMESET|H1|H2|H3|H4|H5|H6|HEAD|HR|HTML|I|IFRAME|IMG|INPUT|INS|ISINDEX|KBD|LABEL|LEGEND|LI|LINK|MAP|MENU|META|NOFRAMES|NOSCRIPT|OBJECT|OL|OPTGROUP|OPTION|P|PARAM|PRE|Q|S|SAMP|SCRIPT|SELECT|SMALL|SPAN|STRIKE|STRONG|STYLE|SUB|SUP|TABLE|TBODY|TD|TEXTAREA|TFOOT|TH|THEAD|TITLE|TR|TT|U|UL|VA)\b
-lang.html_tag.tokens.elements.format cyan
-lang.html_tag.tokens.attributes.case_insensitive \b(abbr|accept-charset|accept|accesskey|action|align|alink|alt|archive|axis|background|bgcolor|border|cellpadding|cellspacing|char|charoff|charset|checked|cite|class|classid|clear|code|codebase|codetype|color|cols|colspan|compact|content|coords|data|datetime|declare|defer|dir|disabled|enctype|face|for|frame|frameborder|headers|height|href|href|hreflang|hspace|http-equiv|id|ismap|label|lang|language|link|longdesc|marginheight|marginwidth|maxlength|media|method|multiple|name|nohref|noresize|noshade|nowrap|object|onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload|profile|prompt|readonly|rel|rev|rows|rowspan|rules|scheme|scope|scrolling|selected|shape|size|span|src|standby|start|style|summary|tabindex|target|text|title|type|usemap|valign|value|valuetype|version|vlink|vspace|width)\b
-lang.html_tag.tokens.attributes.format white
-lang.html_tag.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.html_tag.tokens.doublequoted_strings.format green bold
-lang.html_tag.tokens.singlequoted_strings ('.*?[^\\]')
-lang.html_tag.tokens.singlequoted_strings.format green bold
-lang.html_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.html_tag.tokens.non_alphanum.format white
-lang.html_comment.format.default 8
-lang.html_comment.format.selection inverse
-lang.html_comment.format.found yellow inverse
-lang.html_comment.tabsize 8
-lang.html_comment.indent.size 4
-lang.html_comment.indent.auto true
-lang.html_comment.indent.roundup true
-#lang.html_comment.indent.using_tabs true
-
-# CSS
-
-lang.css.filemask \.css$
-lang.css.format.default white
-lang.css.format.selection inverse
-lang.css.format.found yellow inverse
-lang.css.tabsize 8
-lang.css.indent.size 4
-lang.css.indent.auto true
-lang.css.indent.roundup true
-#lang.css.indent.using_tabs true
-lang.css.indent.indenters (\{)
-lang.css.indent.unindenters (\})
-lang.css.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.css.tokens.properties \b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-collapse|border-color|border-spacing|border-style|border-top|border-bottom|border-right|border-left|border-top-color|border-top-style|border-top-width|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-right|margin-top|margin-left|margin-bottom|margin|max-height|max-width|min-height|min-width|orphans|outline-color|outline-style|outline-width|outline|overflow|padding-top|padding-left|padding-right|padding-bottom|padding|page-break-after|page-break-before|page-break-inside|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|table-layout|text-align|text-decoration|text-indent|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\s*:
-lang.css.tokens.properties.format white bold
-lang.css.tokens.colours #[A-Fa-f0-9]{6}|\b(?:aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b
-lang.css.tokens.colours.format yellow bold
-lang.css.tokens.long_comments.open \/\*
-lang.css.tokens.long_comments.close \*\/
-lang.css.tokens.long_comments.format 8 bold
-lang.css.comment_string /*
-lang.css.comment_close_string " */"
-lang.css.tokens.numbers \b([0-9]+\.[0-9]+|[0-9]+)
-lang.css.tokens.numbers.format blue bold
-lang.css.tokens.units [^A-Za-z](em|pt|px)\b
-lang.css.tokens.units.format cyan
-lang.css.tokens.html_elements.case_insensitive \b(A|ABBR|ACRONYM|ADDRES|APPLET|AREA|B|BASE|BASEFONT|BDO|BIG|BLOCKQUOTE|BODY|BR|BUTTON|CAPTION|CENTER|CITE|CODE|COL|COLGROUP|DD|DEL|DFN|DIR|DIV|DL|DT|FIELDSET|FORM|FRAME|FRAMESET|H1|H2|H3|H4|H5|H6|HEAD|HR|HTML|I|IFRAME|IMG|INPUT|INS|ISINDEX|KBD|LABEL|LEGEND|LI|LINK|MAP|MENU|META|NOFRAMES|NOSCRIPT|OBJECT|OL|OPTGROUP|OPTION|P|PARAM|PRE|Q|S|SAMP|SCRIPT|SELECT|SMALL|SPAN|STRIKE|STRONG|STYLE|SUB|SUP|TABLE|TBODY|TD|TEXTAREA|TFOOT|TH|THEAD|TITLE|TR|TT|U|UL|VA)\b
-lang.css.tokens.html_elements.format green
-lang.css.tokens.values \b(auto|block|inherit|inline|larger|none|smaller|solid)\b
-lang.css.tokens.values.format blue bold
-lang.css.column_delimiters :|,
-
-# Ruby
-
-lang.ruby.filemask (?:[Rr]akefile)|(?:\.(?:rb|gem(?:spec)?)$)
-lang.ruby.bangmask ruby
-lang.ruby.format.default white bold
-lang.ruby.format.selection inverse
-lang.ruby.format.found yellow inverse
-lang.ruby.tokens.reserved_words \b(__FILE__|and|def|end|in|or|self|unless|__LINE__|begin|defined\?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|class|elsif|if|not|return|undef|yield)\b
-lang.ruby.tokens.reserved_words.format white
-lang.ruby.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.ruby.tokens.constants.format yellow bold
-lang.ruby.tokens.symbols [^:](:[a-zA-Z_][a-zA-Z_0-9]*)
-lang.ruby.tokens.symbols.format white bold
-lang.ruby.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;~]
-lang.ruby.tokens.non_alphanum.format white
-lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
-lang.ruby.tokens.instance_variables.format white bold
-lang.ruby.tokens.comments (#.*)
-lang.ruby.tokens.comments.format 8 bold
-lang.ruby.comment_string #
-lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
-lang.ruby.tokens.regular_expressions.format red bold
-lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
-lang.ruby.tokens.regular_expressions2.format red bold
-lang.ruby.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
-lang.ruby.tokens.doublequoted_strings.format green bold
-lang.ruby.tokens.interpolated_string.open (%Q?\{)
-lang.ruby.tokens.interpolated_string.close (\})
-lang.ruby.tokens.interpolated_string.format green bold
-lang.ruby.tokens.interpolated_string.change_to interpolated_ruby
-lang.interpolated_ruby.format.default green bold
-lang.interpolated_ruby.tokens.interpolation.open (#\{)
-lang.interpolated_ruby.tokens.interpolation.close (\})
-lang.interpolated_ruby.tokens.interpolation.format 12 bold
-lang.interpolated_ruby.tokens.interpolation.change_to ruby
-lang.ruby.tokens.singlequoted_strings ('.*?[^\\]'|'')
-lang.ruby.tokens.singlequoted_strings.format green bold
-lang.ruby.tokens.backquoted_strings (`.*?[^\\]`|``)
-lang.ruby.tokens.backquoted_strings.format red bold
-lang.ruby.tokens.interpolated_exec_string.open (%x\{)
-lang.ruby.tokens.interpolated_exec_string.close (\})
-lang.ruby.tokens.interpolated_exec_string.format red bold
-lang.ruby.tokens.interpolated_exec_string.change_to interpolated_exec_ruby
-lang.interpolated_exec_ruby.format.default red bold
-lang.interpolated_exec_ruby.tokens.interpolation.open (#\{)
-lang.interpolated_exec_ruby.tokens.interpolation.close (\})
-lang.interpolated_exec_ruby.tokens.interpolation.format 9 bold
-lang.interpolated_exec_ruby.tokens.interpolation.change_to ruby
-lang.ruby.tokens.character_codes \W(\?\S)
-lang.ruby.tokens.character_codes.format magenta bold
-lang.ruby.tokens.long_comments.open ^=begin
-lang.ruby.tokens.long_comments.close ^=end
-lang.ruby.tokens.long_comments.format 8 bold
-lang.ruby.tokens.sql_string.open (<<-EOSQL)
-lang.ruby.tokens.sql_string.close (EOSQL)
-lang.ruby.tokens.sql_string.format 1
-lang.ruby.tokens.sql_string.change_to sql
-lang.ruby.indent.size 2
-lang.ruby.indent.auto true
-lang.ruby.indent.roundup true
-#lang.ruby.indent.using_tabs true
-lang.ruby.tabsize 2
-lang.ruby.indent.indenters ^\s*(case|def|begin|ensure|when|else|ensure|for|while|until|elsif|if|class|module|rescue)\b|([{\[(]$|\{\s*\|[\w\s,]*\|\s*$)|\b(do)\b
-lang.ruby.indent.unindenters ^\s*(end|else|elsif|ensure|when|rescue)\b|(^\s+[\]})])
-lang.ruby.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*)|\S\s+if
-lang.ruby.indent.ignore ^\s*$
-lang.ruby.context.ignore ^=(begin|end)$
-lang.ruby.column_delimiters =>?|:|,
-
-# PHP
-
-lang.php.filemask \.php\d?$
-lang.php.bangmask php
-lang.php.format.default white bold
-lang.php.format.selection inverse
-lang.php.format.found yellow inverse
-lang.php.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.php.tokens.doublequoted_strings.format green bold
-lang.php.tokens.singlequoted_strings ('.*?[^\\]')
-lang.php.tokens.singlequoted_strings.format green bold
-lang.php.tokens.reserved_words \b(NULL|E_ALL|__wakeup|not|endwhile|__sleep|new|endswitch|__LINE__|list|endif|__FILE__|global|endforeach|while|include_once|endfor|virtual|include|enddeclare|xor|if|empty|var|elseif|TRUE|true|else|this|echo|stdClass|die|switch|do|static|default|return|function|declare|require_once|foreach|continue|require|for|class|print|FALSE|false|cfunction|PHP_VERSION|extends|case|exit|break|PHP_OS|eval|argc|parent|E_WARNING|as|or|E_ERROR|argv|old_function|E_PARSE|and)\b
-lang.php.tokens.reserved_words.format white
-lang.php.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.php.tokens.constants.format yellow bold
-lang.php.tokens.comments (\/\/.*)
-lang.php.tokens.comments.format 8 bold
-lang.php.comment_string //
-lang.php.tokens.preprocessor (^\s*#.*)
-lang.php.tokens.preprocessor.format yellow bold
-lang.php.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.php.tokens.non_alphanum.format white
-lang.php.tokens.long_comments.open \/\*
-lang.php.tokens.long_comments.close \*\/
-lang.php.tokens.long_comments.format 8 bold
-lang.php.tokens.sql_string.open (<<<EOS)
-lang.php.tokens.sql_string.close (EOS)
-lang.php.tokens.sql_string.format 1
-lang.php.tokens.sql_string.change_to sql
-lang.php.tokens.js.open (<<<EOJS)
-lang.php.tokens.js.close (EOJS)
-lang.php.tokens.js.format 12 bold
-lang.php.tokens.js.change_to java
-lang.php.indent.size 4
-lang.php.indent.auto true
-lang.php.indent.roundup false
-#lang.php.indent.using_tabs true
-lang.php.indent.indenters ([{\[(]$)
-lang.php.indent.unindenters (^\s+[\]})])
-lang.php.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.php.indent.ignore ^(.+:|\s*?)$
-lang.php.context.ignore ^(.+:|\s*\{?)$
-
-# Perl
-
-lang.perl.filemask \.(?:pl|pm)$
-lang.perl.bangmask perl
-lang.perl.format.default white bold
-lang.perl.format.selection inverse
-lang.perl.format.found yellow inverse
-lang.perl.tokens.comments (#.*)
-lang.perl.tokens.comments.format 8 bold
-lang.perl.comment_string #
-lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.perl.tokens.constants.format yellow bold
-lang.perl.tokens.non_alphanum [!#^&*()\[\]{}/?=+\-\\|,<.>;:~]
-lang.perl.tokens.non_alphanum.format white
-lang.perl.tokens.regular_expressions (\/.+?[^\\]\/)
-lang.perl.tokens.regular_expressions.format red bold
-lang.perl.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.perl.tokens.doublequoted_strings.format green bold
-lang.perl.tokens.singlequoted_strings ('.*?[^\\]')
-lang.perl.tokens.singlequoted_strings.format green bold
-lang.perl.tokens.backquoted_strings (`.*?[^\\]`)
-lang.perl.tokens.backquoted_strings.format red bold
-lang.perl.tokens.reserved_words \b(unless|until|else|for|while|foreach|if|return|do|next|elsif|last|redo|continue|sub|goto)\b
-lang.perl.tokens.reserved_words.format white
-lang.perl.tokens.builtins \b(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|m|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|q|qq|qr|quotemeta|qw|qx|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|s|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|tr|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)\b
-lang.perl.tokens.builtins.format cyan bold
-lang.perl.tokens.array_variables \s(@[A-Za-z_][A-Za-z_0-9]*)\b
-lang.perl.tokens.array_variables.format red bold
-lang.perl.tokens.hash_variables \s(%[A-Za-z_][A-Za-z_0-9]*)\b
-lang.perl.tokens.hash_variables.format magenta bold
-lang.perl.indent.size 4
-lang.perl.indent.auto true
-lang.perl.indent.roundup true
-#lang.perl.indent.using_tabs true
-lang.perl.indent.indenters (case|[{\[(]$)
-lang.perl.indent.unindenters (case|^\s+[\]})])
-#lang.perl.indent.indenters \b(unless|else|for|while|foreach|if|do|elsif|sub)\b
-#lang.perl.indent.unindenters \b(else)\b
-lang.perl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(\/.+?[^\\]\/)|(^\s*#.*)
-lang.perl.indent.ignore ^\s*$
-lang.perl.context.ignore ^(.+:|\s*\{?)$
-lang.perl.column_delimiters =>?|:|,
-
-# Python
-
-lang.python.filemask \.py$
-lang.python.bangmask python
-lang.python.format.default white bold
-lang.python.format.selection inverse
-lang.python.format.found yellow inverse
-lang.python.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.python.tokens.constants.format yellow bold
-lang.python.tokens.non_alphanum [@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:~]
-lang.python.tokens.non_alphanum.format white
-lang.python.tokens.comments (#.*)
-lang.python.tokens.comments.format 8 bold
-lang.python.comment_string #
-lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.python.tokens.doublequoted_strings.format green bold
-lang.python.tokens.singlequoted_strings ('.*?[^\\]')
-lang.python.tokens.singlequoted_strings.format green bold
-lang.python.tokens.backquoted_strings (`.*?[^\\]`)
-lang.python.tokens.backquoted_strings.format red bold
-lang.python.tokens.reserved_words \b(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|yield)\b
-lang.python.tokens.reserved_words.format white
-lang.python.indent.size 4
-lang.python.indent.auto true
-lang.python.indent.roundup true
-#lang.python.indent.using_tabs true
-lang.python.indent.indenters \b(class|def|elif|else|except|finally|for|if|try|while)\b
-#lang.python.indent.indenters :
-lang.python.indent.unindenters \b(else|elif|except)\b
-lang.python.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(^\s*#.*)
-lang.python.indent.ignore ^\s*$
-
-# Java
-
-lang.java.filemask \.(?:java|js)$
-lang.java.format.default white bold
-lang.java.format.selection inverse
-lang.java.format.found yellow inverse
-lang.java.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.java.tokens.doublequoted_strings.format green bold
-lang.java.tokens.singlequoted_strings ('.*?[^\\]')
-lang.java.tokens.singlequoted_strings.format green bold
-lang.java.tokens.reserved_words \b(abstract|do|if|package|synchronized|boolean|double|implements|private|this|break|else|import|protected|throw|byte|extends|instanceof|public|throws|case|false|int|return|transient|catch|final|interface|short|true|char|finally|long|static|try|class|float|native|strictfp|void|const|for|new|super|volatile|continue|goto|null|switch|while|default|assert)\b
-lang.java.tokens.reserved_words.format white
-lang.java.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.java.tokens.constants.format yellow bold
-lang.java.tokens.comments (\/\/.*)
-lang.java.tokens.comments.format 8 bold
-lang.java.comment_string //
-lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.java.tokens.non_alphanum.format white
-lang.java.tokens.long_comments.open \/\*
-lang.java.tokens.long_comments.close \*\/
-lang.java.tokens.long_comments.format 8 bold
-lang.java.tokens.regular_expressions (\/.+?[^\\]\/)
-lang.java.tokens.regular_expressions.format red bold
-lang.java.indent.size 4
-lang.java.indent.auto true
-lang.java.indent.roundup false
-#lang.java.indent.using_tabs true
-lang.java.indent.indenters (\{)
-lang.java.indent.unindenters (\})
-lang.java.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.java.indent.ignore ^(.+:|\s*?)$
-lang.java.context.ignore ^(.+:|\s*\{?)$
-lang.java.closers.for.regexp for$
-lang.java.closers.for.closer { |m| "( $i = 0; $i < limit; $i++ ) {\n%_\n}" }
-lang.java.column_delimiters =|:|,
-
-# C
-
-lang.c.filemask \.(c(pp|xx)?|h)$
-lang.c.format.default white bold
-lang.c.format.selection inverse
-lang.c.format.found yellow inverse
-lang.c.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.c.tokens.doublequoted_strings.format green bold
-lang.c.tokens.singlequoted_strings ('.*?[^\\]')
-lang.c.tokens.singlequoted_strings.format green bold
-lang.c.tokens.reserved_words \b(if|double|break|else|byte|case|int|return|short|char|long|static|void|for|super|continue|goto|switch|while)\b
-lang.c.tokens.reserved_words.format white
-lang.c.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
-lang.c.tokens.constants.format yellow bold
-lang.c.tokens.comments (\/\/.*)
-lang.c.tokens.comments.format 8 bold
-lang.c.comment_string //
-lang.c.tokens.preprocessor (^\s*#.*)
-lang.c.tokens.preprocessor.format yellow bold
-lang.c.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.c.tokens.non_alphanum.format white
-lang.c.tokens.long_comments.open \/\*
-lang.c.tokens.long_comments.close \*\/
-lang.c.tokens.long_comments.format 8 bold
-lang.c.indent.size 4
-lang.c.indent.auto true
-lang.c.indent.roundup false
-#lang.c.indent.using_tabs true
-lang.c.indent.indenters (case|[{\[(]$)
-lang.c.indent.unindenters (case|^\s+[\]})])
-lang.c.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.c.indent.ignore ^(.+:|\s*?)$
-lang.c.context.ignore ^(.+:|\s*\{?)$
-
-# Configuration files
-
-lang.conf.filemask (?:\.conf(?:ig)?|\.cfg|\.cnf|user_prefs|XF86Config)$
-lang.conf.format.default white
-lang.conf.format.selection inverse
-lang.conf.format.found yellow inverse
-lang.conf.tokens.commands ^\s*([^\s=]+)
-lang.conf.tokens.commands.format cyan bold
-lang.conf.tokens.comments (^\s*#.*)
-lang.conf.tokens.comments.format yellow bold
-lang.conf.comment_string #
-lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.conf.tokens.doublequoted_strings.format green bold
-lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
-lang.conf.tokens.singlequoted_strings.format green bold
-lang.conf.indent.size 4
-lang.conf.indent.auto true
-lang.conf.indent.roundup true
-#lang.conf.indent.using_tabs true
-
-# crontab
-
-lang.crontab.filemask (?:^|\/)crontab$
-lang.crontab.format.default white
-lang.crontab.format.selection inverse
-lang.crontab.format.found yellow inverse
-lang.crontab.tokens.comments (^\s*#.*)
-lang.crontab.tokens.comments.format yellow bold
-lang.crontab.comment_string #
-lang.crontab.tokens.schedule ^((?:[0-9\/*,-]+\s+){5})
-lang.crontab.tokens.schedule.format cyan bold
-lang.crontab.tokens.commands ^(\S+=.+)
-lang.crontab.tokens.commands.format cyan
-lang.crontab.indent.size 4
-lang.crontab.indent.auto true
-lang.crontab.indent.roundup true
-#lang.crontab.indent.using_tabs true
-
-lang.fstab.filemask ^fstab$
-lang.fstab.format.default white
-lang.fstab.format.selection inverse
-lang.fstab.format.found yellow inverse
-lang.fstab.tokens.comments (^\s*#.*)
-lang.fstab.tokens.comments.format yellow bold
-lang.fstab.comment_string #
-lang.fstab.indent.size 4
-lang.fstab.indent.auto true
-lang.fstab.indent.roundup true
-#lang.fstab.indent.using_tabs true
-
-# SQL
-
-lang.sql.filemask \.sql$
-lang.sql.format.default white bold
-lang.sql.format.selection inverse
-lang.sql.format.found yellow inverse
-lang.sql.indent.size 4
-lang.sql.indent.auto true
-lang.sql.indent.roundup true
-#lang.sql.indent.using_tabs true
-#lang.sql.tokens.reserved_words.case_insensitive \b(ABSOLUTE|ACCESS|ACTION|ADD|ADMIN|AFTER|ALIAS|ALL|ALLOCATE|AND|ANY|ARE|AS|ASC|ASSERTION|AT|AUDIT|AUTHORIZATION|AVG|BEFORE|BEGIN|BETWEEN|BIT_LENGTH|BOTH|BREADTH|BY|CASCADE|CASCADED|CASE|CAST|CATALOG|CHAR_LENGTH|CHARACTER_LENGTH|CHECK|CLASS|CLOSE|CLUSTER|COALESCE|COBOL|COLLATE|COLLATION|COLUMN|COMPLETION|COMPRESS|COMPUTED|CONCAT|CONNECT|CONNECTION|CONSTRAINT|CONSTRAINTS|CONSTRUCTOR|CONTINUE|CONVERT|CORRESPONDING|COUNT|CROSS|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURRENT|CURSOR|CYCLE|DATA|DAY|DBHIGH|DBKEY|DBLOW|DBMAC|DEALLOCATE|DECLARE|DECODE|DEFAULT|DEFERRABLE|DEFERRED|DEPTH|DEREF|DESC|DESCRIBE|DESCRIPTOR|DESTROY|DESTRUCTOR|DIAGNOSTICS|DICTIONARY|DISCONNECT|DISTINCT|DO|DOMAIN|EACH|ELEMENT|ELSE|ELSEIF|END-EXEC|END|EQUALS|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXISTS|EXTERNAL|EXTERNALLY|EXTRACT|FALSE|FILE|FIRST|FOR|FOREIGN|FORTRAN|FOUND|FROM|FULL|FUNCTION|GENERAL|GET|GLOBAL|GO|GOTO|GROUP|HAVING|HOUR|IDENTIFIED|IDENTITY|IF|IGNORE|IMMEDIATE|IN|INCREMENT|INDEX|INDICATOR|INITIAL|INITIALLY|INNER|INOUT|INPUT|INSENSITIVE|INSTEAD|INTERSECT|INTERVAL|INTO|IS|ISOLATION|JOIN|KEY|LABEL|LANGUAGE|LAST|LEADING|LEAVE|LEFT|LESS|LEVEL|LIKE|LIMIT|LOCAL|LOCK|LOOP|LOWER|MATCH|MAX|MAXEXTENTS|MIN|MINUS|MINUTE|MLSLABEL|MLS_LABEL_FORMAT|MODE|MODIFY|MODULE|MONTH|MOVE|MULTISET|NAMES|NATIONAL|NATURAL|NEW_TABLE|NEXT|NO|NOAUDIT|NOCOMPRESS|NONE|NOT|NOWAIT|NULL|NULLIF|NUMBER|NVL|OCTET_LENGTH|OF|OFF|OFFLINE|OID|OLD|OLD_TABLE|ON|ONLINE|ONLY|OPEN|OPERATION|OPERATORS|OPTION|OR|ORDER|OTHERS|OUT|OUTER|OUTPUT|OVERLAPS|PAD|PARAMETER|PARTIAL|PASCAL|PCTFREE|PENDANT|PLI|POSITION|PRECISION|PREORDER|PRESERVE|PRIMARY|PRIOR|PRIVATE|PRIVILEGES|PROCEDURE|PROTECTED|PUBLIC|RAW|READ|READUP|REAL|RECORD|RECURSIVE|REF|REFERENCES|REFERENCING|RELATIVE|RENAME|REPLACE|REPRESENTATION|RESIGNAL|RESOURCE|RESTRICT|RETURN|RETURNS|RIGHT|ROLE|ROUTINE|ROW|ROWID|ROWNUM|ROWS|SAVEPOINT|SCHEMA|SCROLL|SEARCH|SECOND|SECTION|SENSITIVE|SEQUENCE|SESSION|SESSION_USER|SET|SHARE|SIGNAL|SIMILAR|SIZE|SOME|SPACE|SPECIFIC|SQL|SQLCODE|SQLERROR|SQLEXCEPTION|SQLSTATE|SQLWARNING|START|STRUCTURE|SUBSTRING|SUCCESSFUL|SUM|SYNONYM|SYSDATE|SYSTEM_USER|TABLE|TEMPLATE|TEMPORARY|TEST|THAN|THEN|THERE|SQ92|TIMEZONE_HOUR|TIMEZONE_MINUTE|TO|TRAILING|TRANSACTION|TRANSLATE|TRANSLATION|TRIGGER|TRIM|TRUE|TUPLE|TYPE|UID|UNDER|UNION|UNIQUE|UNKNOWN|UPPER|USAGE|USER|USING|VALIDATE|VALUE|VALUES|VARIABLE|VARIANT|VIRTUAL|VARYING|VIEW|VISIBLE|VOID|WAIT|WHEN|WHENEVER|WHERE|WHILE|WITH|WITHOUT|WORK|WRITE|WRITEDOWN|WRITEUP|YEAR|ZONE)\b
-lang.sql.tokens.reserved_words.case_insensitive \b(ALL|AND|ANY|AS|ASC|BEGIN|BY|CASCADE|CASE|CAST|CHECK|COALESCE|COLUMN|CONSTRAINT|COUNT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURSOR|DECLARE|DEFAULT|DESC|DISTINCT|DO|ELSE|ELSEIF|END|EXCEPT|EXISTS|FALSE|FIRST|FOR|FOREIGN|FOUND|FROM|FULL|FUNCTION|GROUP|HAVING|HOUR|IF|IN|INCREMENT|INDEX|INNER|INPUT|INSTEAD|INTERSECT|INTERVAL|INTO|IS|JOIN|KEY|LANGUAGE|LAST|LEFT|LIKE|LIMIT|LOOP|MAX|MIN|NATURAL|NEXT|NO|NONE|NOT|NULL|NUMBER|OF|OFF|OLD|ON|ONLY|OR|ORDER|OUT|OUTER|PARTIAL|PRECISION|PRIMARY|REAL|RECORD|REF|REFERENCES|REPLACE|RESTRICT|RETURN|RETURNS|RIGHT|SCHEMA|SEQUENCE|SET|SUM|TABLE|TEMPORARY|THAN|THEN|TO|TRANSACTION|TRIGGER|TRUE|TYPE|UNION|UNIQUE|UPPER|USING|VALUE|VALUES|VARYING|VIEW|WHEN|WHERE|WHILE|WITH|WITHOUT|WORK)\b
-lang.sql.tokens.reserved_words.format white
-lang.sql.tokens.commands.case_insensitive \b(ALTER|COMMENT|COMMIT|CREATE|DELETE|DROP|EXEC|EXECUTE|FETCH|GRANT|INSERT|PERFORM|PREPARE|REVOKE|ROLLBACK|SELECT|UPDATE)\b
-lang.sql.tokens.commands.format cyan
-lang.sql.tokens.data_types.case_insensitive \b(BIT|BOOLEAN|CHAR|CHARACTER|DATE|DEC|DECIMAL|DOUBLE|FLOAT|INT|INTEGER|INTERVAL|LONG|NCHAR|NUMBER|NUMERIC|REAL|RECORD|ROW|SMALLINT|STRUCTURE|TIME|TIMESTAMP|TUPLE|VARCHAR|VARCHAR2)\b
-lang.sql.tokens.data_types.format brown
-lang.sql.tokens.comments (--.*)
-lang.sql.tokens.comments.format 8 bold
-lang.sql.comment_string --
-lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
-lang.sql.tokens.singlequoted_strings.format green bold
-lang.sql.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.sql.tokens.non_alphanum.format white
-lang.sql.tokens.typos (==)
-lang.sql.tokens.typos.format 15 bold
-lang.sql.indent.indenters ((?:\(|BEGIN|DECLARE|FROM|LOOP|ORDER BY|SELECT|SET|WHERE)$)
-lang.sql.indent.unindenters (^\s+(?:\)|;|BEGIN|DECLARE|END))
-lang.sql.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')
-lang.sql.context.ignore ^(\W+)$
-
-# Bash
-
-lang.bash.filemask (?:\.(?:ebuild|bash_profile|bashrc))$
-lang.bash.bangmask (?:ba)?sh\b
-lang.bash.format.default white bold
-lang.bash.format.selection inverse
-lang.bash.format.found yellow inverse
-lang.bash.indent.size 4
-lang.bash.indent.auto true
-lang.bash.indent.roundup true
-#lang.bash.indent.using_tabs true
-lang.bash.tabsize 4
-lang.bash.tokens.comments (^\s*#.*)
-lang.bash.tokens.comments.format 8 bold
-lang.bash.comment_string #
-lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
-lang.bash.tokens.singlequoted_strings.format green bold
-lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.bash.tokens.doublequoted_strings.format green bold
-lang.bash.tokens.backquoted_strings (`.*?[^\\]`)
-lang.bash.tokens.backquoted_strings.format red bold
-lang.bash.indent.indenters (\{)
-lang.bash.indent.unindenters (\})
-lang.bash.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-lang.bash.indent.ignore ^(.+:|\s*?)$
-
-# Tcl
-
-lang.tcl.filemask \.tcl$
-lang.tcl.bangmask tcl
-lang.tcl.format.default white bold
-lang.tcl.format.selection inverse
-lang.tcl.format.found yellow inverse
-lang.tcl.indent.size 4
-lang.tcl.indent.auto true
-lang.tcl.indent.roundup true
-#lang.tcl.indent.using_tabs true
-lang.tcl.tabsize 4
-lang.tcl.tokens.comments (^\s*#.*)
-lang.tcl.tokens.comments.format 8 bold
-lang.tcl.comment_string #
-lang.tcl.tokens.reserved_words \b(encoding|incr|pid|tcl_endOfWord|Tcl|eof|info|tcl_findLibrary|after|error|interp|pkg_mkIndex|tcl_startOfNextWord|append|eval|join|proc|tcl_startOfPreviousWord|array|exec|lappend|puts|tcl_wordBreakAfter|auto_execok|exit|lassign|pwd|tcl_wordBreakBefore|auto_import|expr|lindex|re_syntax|tcltest|auto_load|fblocked|linsert|read|tclvars|auto_mkindex|fconfigure|list|regexp|tell|auto_mkindex_old|fcopy|llength|registry|time|auto_qualify|file|load|regsub|trace|auto_reset|fileevent|lrange|rename|unknown|bgerror|filename|lrepeat|resource|unload|binary|flush|lreplace|return|unset|break|for|lsearch|scan|update|catch|foreach|lset|seek|uplevel|cd|format|lsort|set|upvar|clock|gets|memory|socket|variable|close|glob|msgcat|source|vwait|concat|global|namespace|split|while|continue|history|open|string|dde|http|package|subst|dict|if|parray|switch)\b
-lang.tcl.tokens.reserved_words.format white
-lang.tcl.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
-lang.tcl.tokens.non_alphanum.format white
-lang.tcl.tokens.variables (\$[A-Za-z_][A-Za-z_0-9]*)\b
-lang.tcl.tokens.variables.format yellow bold
-lang.tcl.tokens.doublequoted_strings (\".*?[^\\]\")
-lang.tcl.tokens.doublequoted_strings.format green bold
-lang.tcl.indent.indenters (\{)
-lang.tcl.indent.unindenters (\})
-lang.tcl.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
-
-lang.diff.filemask (?:\.(?:diff|patch)|COMMIT_EDITMSG)$
-lang.diff.format.default white
-lang.diff.format.selection inverse
-lang.diff.format.found yellow inverse
-lang.diff.indent.size 4
-lang.diff.indent.auto false
-#lang.diff.indent.using_tabs true
-lang.diff.tabsize 4
-lang.diff.tokens.oldfile (^--- .+$)
-lang.diff.tokens.oldfile.format red bold
-lang.diff.tokens.newfile (^\+\+\+ .+$)
-lang.diff.tokens.newfile.format green bold
-lang.diff.tokens.oldline (^-.+$)
-lang.diff.tokens.oldline.format red bold
-lang.diff.tokens.newline (^\+.+$)
-lang.diff.tokens.newline.format green bold
-lang.diff.tokens.location (^@@.+$)
-lang.diff.tokens.location.format green
-lang.diff.tokens.filediff (^Only in .+$)
-lang.diff.tokens.filediff.format magenta bold
-lang.diff.tokens.diff_command (^diff .+$)
-lang.diff.tokens.diff_command.format 13 bold
-
-lang.yaml.filemask (?:\.ya?ml)$
-lang.yaml.bangmask ^---
-lang.yaml.format.default white bold
-lang.yaml.format.selection inverse
-lang.yaml.format.found yellow inverse
-lang.yaml.indent.size 4
-lang.yaml.indent.auto false
-lang.yaml.indent.roundup false
-lang.yaml.tabsize 8
-lang.yaml.tokens.value_indicator (:)(?: |$)
-lang.yaml.tokens.value_indicator.format white
-lang.yaml.tokens.key_indicator (\? )
-lang.yaml.tokens.key_indicator.format white
-lang.yaml.tokens.nested_series (?:^|[^-])(- )
-lang.yaml.tokens.nested_series.format magenta bold
-lang.yaml.tokens.series_separator (,)
-lang.yaml.tokens.series_separator.format white
-lang.yaml.tokens.inline_series ([\[\]])
-lang.yaml.tokens.inline_series.format white
-lang.yaml.tokens.inline_keyed ([{}])
-lang.yaml.tokens.inline_keyed.format white
-lang.yaml.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
-lang.yaml.tokens.doublequoted_strings.format green bold
-lang.yaml.tokens.singlequoted_strings ('.*?[^\\]'|'')
-lang.yaml.tokens.singlequoted_strings.format green bold
-lang.yaml.tokens.block_scalar (\|[0-9+-]*)$
-lang.yaml.tokens.block_scalar.format blue bold
-lang.yaml.tokens.folded_scalar (>[0-9+-]*)$
-lang.yaml.tokens.folded_scalar.format blue bold
-lang.yaml.tokens.document_header ^(---.*)$
-lang.yaml.tokens.document_header.format 10 bold
-lang.yaml.tokens.document_terminator ^(\.\.\.)
-lang.yaml.tokens.document_terminator.format 10
-lang.yaml.tokens.directive_indicator ^(%.*)
-lang.yaml.tokens.directive_indicator.format 10
-lang.yaml.tokens.comment_indicator (#.+)
-lang.yaml.tokens.comment_indicator.format 8 bold
-lang.yaml.comment_string #
-lang.yaml.tokens.anchor_indicator (&\w+)
-lang.yaml.tokens.anchor_indicator.format red bold
-lang.yaml.tokens.alias_indicator (\*\w+)
-lang.yaml.tokens.alias_indicator.format yellow
-lang.yaml.tokens.tag (!\w*)
-lang.yaml.tokens.tag.format yellow bold
-lang.yaml.tokens.null (~|null)
-lang.yaml.tokens.null.format red
-lang.yaml.indent.size 4
-lang.yaml.indent.auto true
-lang.yaml.indent.roundup true
-lang.yaml.indent.indenters :$
-lang.yaml.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(`.+?[^\\]`)|(^\s*#.*)
-lang.yaml.indent.ignore ^\s*$
-
-lang.haml.filemask \.haml$
-lang.haml.format.default white bold
-lang.haml.format.selection inverse
-lang.haml.format.found yellow inverse
-lang.haml.tabsize 8
-lang.haml.indent.size 2
-lang.haml.indent.auto true
-lang.haml.indent.roundup true
-lang.haml.indent.using_tabs false
-lang.haml.tokens.code.open [=~-]
-lang.haml.tokens.code.close $
-lang.haml.tokens.code.format 9 bold
-lang.haml.tokens.code.change_to ruby
-lang.haml.tokens.tags (%\w+\b)
-lang.haml.tokens.tags.format white
-lang.haml.tokens.hash.open [{\[]
-lang.haml.tokens.hash.close [}\]]
-lang.haml.tokens.hash.format blue bold
-lang.haml.tokens.hash.change_to ruby
-lang.haml.tokens.class \.\w+
-lang.haml.tokens.class.format cyan bold
-lang.haml.tokens.id #\w+
-lang.haml.tokens.id.format cyan
-lang.haml.tokens.xml !!!
-lang.haml.tokens.xml.format magenta bold
-lang.haml.tokens.html_comment ^ *(\/.*)
-lang.haml.tokens.html_comment.format 8 bold
-lang.haml.tokens.line_joiner \|$
-lang.haml.tokens.line_joiner.format 12 bold
-
-#% SiSU
-lang.sisu.filemask \.(?:sst|ssm|ssi|[_-]sst)$
-lang.sisu.format.default white
-lang.sisu.tokens.comment ^%+\s+.*
-lang.sisu.tokens.comment.format 8
-#langsisu.tokens.comments.format 8 bold
-lang.sisu.tokens.header ^(@\S+?:|0~\S+)\s+.*
-lang.sisu.tokens.header.format cyan
-lang.sisu.tokens.heading ^:?[A-C1-9]~(?:\S+)?\s+.*
-lang.sisu.tokens.heading.format yellow bold
-#lang.sisu.tokens.heading.format white inverse
-lang.sisu.tokens.headings.case_insensitive ^(?:Chapter|Part|Section|Book|Article|Preamble|Appendix)\s.*
-lang.sisu.tokens.headings.format white bold
-lang.sisu.tokens.bullet ^_[1-9]?\*\s+
-lang.sisu.tokens.bullet.format yellow
-lang.sisu.tokens.indent ^_[1-9]\s+
-lang.sisu.tokens.indent.format yellow
-lang.sisu.tokens.link \{.+?\}(?:https?://\S+|\.\./\S+|image)
-lang.sisu.tokens.link.format cyan
-lang.sisu.tokens.url http://\S+
-lang.sisu.tokens.url.format blue bold
-lang.sisu.tokens.url ^\<\<\s+\S+?\.ss[it]$
-lang.sisu.tokens.line_bold ^!_\s+.*
-lang.sisu.tokens.line_bold.format white bold
-lang.sisu.tokens.font_bold (([!*])\{.+?\}\2)
-lang.sisu.tokens.font_bold.format white bold
-lang.sisu.tokens.font_modify (([/_^,+-])\{.+?\}\2)
-lang.sisu.tokens.font_modify.format brown
-lang.sisu.tokens.page_break <:(?:pb|np)>
-lang.sisu.tokens.page_break.format white bold inverse
-lang.sisu.tokens.br <:?br>
-lang.sisu.tokens.br.format white bold inverse
-lang.sisu.tokens.endnote_mark ~\^(?:\s|$)
-lang.sisu.tokens.endnote_mark.format green
-lang.sisu.tokens.endnote_content ^\^~\s.+
-lang.sisu.tokens.endnote_content.format green
-#lang.sisu.tokens.endnote.open ~\{
-#lang.sisu.tokens.endnote.close \}~
-lang.sisu.tokens.endnotes ~\{.+?\}~
-lang.sisu.tokens.endnotes.format green
-lang.sisu.tokens.group.open ^group\{
-lang.sisu.tokens.group.close ^\}group
-lang.sisu.tokens.group.format green
-lang.sisu.tokens.poem.open ^poem\{
-lang.sisu.tokens.poem.close ^\}poem
-lang.sisu.tokens.poem.format green
-lang.sisu.tokens.code.open ^code\{
-lang.sisu.tokens.code.close ^\}code
-lang.sisu.tokens.code.format green
-lang.sisu.tokens.sem (([a-z]+):\{.+?\}:\2)
-lang.sisu.tokens.sem (([a-z]+);\{.+?\};\2)
-lang.sisu.tokens.sem (([a-z]+):\[.+?\]:\2)
-lang.sisu.tokens.sem (([a-z]+);\[.+?\];\2)
-lang.sisu.tokens.sem.format green
-lang.sisu.tokens.error \s+$|<\S{2}\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
-#lang.sisu.tokens.error \s+$|<\S+?>|[a-zA-Z0-9,.::?!&><]+http://\S+|http://\S+<
-lang.sisu.tokens.error.format magenta reverse
-
-# Custom configuration files can be included.
-# If a setting is specified again, it overrides the previous setting given
-# higher up in the configuration file(s).
-
-include ~/.diakonos/pistos.conf
-
-# Uncomment this line if your terminal supports 256 colours.
-#include ~/.diakonos/diakonos-256-colour.conf
diff --git a/data/sisu/v4/conf/editor-syntax-etc/emacs/README b/data/sisu/v4/conf/editor-syntax-etc/emacs/README
deleted file mode 100644
index 24816c1e..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/emacs/README
+++ /dev/null
@@ -1,5 +0,0 @@
-put this into your .emacs file, then use the mode file:
-
-(load-file "~/emacs/el/sisu-mode.el")
-(add-to-list 'auto-mode-alist '("\\.sst$" . sisu-mode))
-
diff --git a/data/sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang b/data/sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang
deleted file mode 100644
index b82d5f80..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/gedit/sisu.lang
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="SiSU" version="1.0" _section="Markup" mimetypes="text/x-ruby">
-<!-- SiSU syntax highligting for gedit, place in:
- /usr/share/gtksourceview-1.0/language-specs
-or:
- ~/gtksourceview-1.0/language-specs
--->
-
- <syntax-item _name="Header" style="Data Type">
- <start-regex>^0~\S|^\@\S+:\s</start-regex>
- <end-regex>\n\n</end-regex>
- </syntax-item>
-
- <pattern-item _name="Bold" style="Keyword" end-at-line-end = "TRUE">
- <regex>^(:[A-C]|[1-6])~[a-zA-Z0-9.?_-]*\s+.+</regex>
- </pattern-item>
-
- <pattern-item _name="Operators" style="Function">
- <regex>^(!_|_[1-9]|_[1-9]?\*)\s</regex>
- </pattern-item>
-
- <syntax-item _name="Note Function" style="Function">
- <start-regex>~\{</start-regex>
- <end-regex>\}~</end-regex>
- </syntax-item>
-
- <syntax-item _name="Bold Function" style="Function">
- <start-regex>[*]\{</start-regex>
- <end-regex>\}[*]</end-regex>
- </syntax-item>
-
- <syntax-item _name="Exclaim Function" style="Function">
- <start-regex>!\{</start-regex>
- <end-regex>\}!</end-regex>
- </syntax-item>
-
- <syntax-item _name="Italics Function" style="Function">
- <start-regex>/\{</start-regex>
- <end-regex>\}/</end-regex>
- </syntax-item>
-
- <syntax-item _name="Underscore Function" style="Function">
- <start-regex>_\{</start-regex>
- <end-regex>\}_</end-regex>
- </syntax-item>
-
- <syntax-item _name="Supercript Function" style="Function">
- <start-regex>\^{</start-regex>
- <end-regex>\}\^</end-regex>
- </syntax-item>
-
- <syntax-item _name="Subscript Function" style="Function">
- <start-regex>,{</start-regex>
- <end-regex>\},</end-regex>
- </syntax-item>
-
- <syntax-item _name="Added Function" style="Function">
- <start-regex>[+]\{</start-regex>
- <end-regex>\}[+]</end-regex>
- </syntax-item>
-
- <syntax-item _name="Strikethrough Function" style="Function">
- <start-regex>[-]\{</start-regex>
- <end-regex>\}[-]</end-regex>
- </syntax-item>
-
- <pattern-item _name="Bold Single" style="String">
- <regex>[*]\S+[*]</regex>
- </pattern-item>
-
- <pattern-item _name="Link" style="String">
- <regex>\{[^}]+\}(https?:\/\/\S+|image)\s</regex>
- </pattern-item>
-
- <pattern-item _name="Link Internal" style="String">
- <regex>\s\*~\S+</regex>
- </pattern-item>
-
- <pattern-item _name="Url" style="String">
- <regex>http[s]*:\/\/\S+</regex>
- </pattern-item>
-
- <pattern-item _name="Url" style="String">
- <regex>^&lt;&lt;\s+\S+\.ss[ti]</regex>
- </pattern-item>
-
- <line-comment _name="Line Comment" style="Comment">
- <start-regex>^%+\s.</start-regex>
- </line-comment>
-
- <syntax-item _name="Multiline Code" style="Others">
- <start-regex>^code\{\s*$</start-regex>
- <end-regex>^\}code\s*$</end-regex>
- </syntax-item>
-
- <syntax-item _name="Multiline Poem" style="Others">
- <start-regex>^poem\{\s*$</start-regex>
- <end-regex>^\}poem\s*$</end-regex>
- </syntax-item>
-
- <syntax-item _name="Multiline Group" style="Others">
- <start-regex>^group\{\s*$</start-regex>
- <end-regex>^\}group\s*$</end-regex>
- </syntax-item>
-
- <syntax-item _name="Multiline Alt" style="Others">
- <start-regex>^alt\{\s*$</start-regex>
- <end-regex>^\}alt\s*$</end-regex>
- </syntax-item>
-
- <pattern-item _name="Page Break" style="Others 2" end-at-line-end = "TRUE">
- <regex>&lt;:(pb|np)&gt;</regex>
- </pattern-item>
-
- <pattern-item _name="Line Break" style="Others 2" end-at-line-end = "TRUE">
- <regex>&lt;:?br&gt;</regex>
- </pattern-item>
-
- <pattern-item _name="Footnote Reference" style="Others" end-at-line-end = "TRUE">
- <regex>~\^(\s|$)</regex>
- </pattern-item>
-
- <pattern-item _name="Footnote Content" style="Others" end-at-line-end = "TRUE">
- <regex>^\^~\s.+</regex>
- </pattern-item>
-
-</language>
diff --git a/data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml b/data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml
deleted file mode 100644
index a8054f2d..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/kate/sisu.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="SiSU" version="1.00" section="Markup" kateversion="2.4" extensions="*.sst; *.ssm; *.ssi; *._sst; *.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
- <highlighting>
- <list name="somename">
- <item> class </item>
- <item> const </item>
- </list>
- <contexts>
- <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
- <StringDetect String="&lt;br&gt;" attribute="Break" context="#pop" />
- <RegExpr String="\s+$" attribute="Warn" context="#pop" />
- <RegExpr String="&lt;\S+&gt;" attribute="Warn" context="#pop" />
- <RegExpr String="&lt;a href=\S+&gt;" attribute="Warn" context="#pop" />
- <RegExpr String="&lt;a href=" attribute="Warn" context="#pop" />
- <RegExpr String="&lt;/a&gt;" attribute="Warn" context="#pop" />
- <RegExpr String="&lt;https?:\/\/\S+&gt;" attribute="Warn" context="#pop"/>
- <RegExpr String="&gt;https?:\/\/\S+" attribute="Warn" context="#pop"/>
- <RegExpr String="^&lt;&lt;\s+[a-zA-Z._]+\.ss[it]" attribute="Link" context="#pop"/>
- <RegExpr String="^&lt;&lt;\{\s*[a-zA-Z._]+\.ss[it]\s*\}" attribute="Link" context="#pop"/>
- <RegExpr String="&lt;&lt;\s+&#124;" attribute="Link" context="#pop"/>
- <RegExpr String="https?:\/\/\S+&lt;" attribute="Warn" context="#pop"/>
- <keyword attribute="Keyword" context="#stay" String="somename" />
- <DetectChar attribute="String" context="string" char="&quot;" />
- <RegExpr String="^(0~\S+|@\S+)\s.+$" attribute="Header" context="#pop" />
- <RegExpr String="^:?[A-C1-9]~.+$" attribute="Heading" context="#pop" />
- <StringDetect String="~{" attribute="Endnote" context="footnote"/>
- <StringDetect String="^~" attribute="Endnote" context="endnote"/>
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- <RegExpr String="\{[\s\S]+\}https?:\/\/\S+(\s|$)" attribute="Link" context="#pop" minimal="true" />
- <RegExpr String="\{[\s\S]+\}\.\.\/\S+(\s|$)" attribute="Link" context="#stay" minimal="true" />
- <RegExpr String="\{[\s\S]+\}image(\s|$)" attribute="Link" context="#stay" minimal="true" />
- <RegExpr String="\s_?https?:\/\/\S+" attribute="Link" context="#stay"/>
- <RegExpr String="^_?https?:\/\/\S+" attribute="Link" context="#stay"/>
- <RegExpr String="^!_ .+" attribute="Bold" context="boldline"/>
- <RegExpr String="^(_[1-9]|_\*|_[1-9]\*)\s" attribute="Indent" context="#stay"/>
- <RegExpr String="~\^" attribute="Endnote" context="#stay"/>
- <RegExpr String="^%+\s.+$" attribute="Comment" context="#stay" endRegion="regionMarker" firstNonSpace="true" />
- </context>
- <context attribute="String" lineEndContext="#stay" name="string" >
- <DetectChar attribute="String" context="#pop" char="&quot;" />
- </context>
- <context attribute="Endnote" lineEndContext="#stay" name="footnote" >
- <StringDetect attribute="Endnote" context="#pop" String="}~" />
- <RegExpr String="\{[\s\S]+\}https?:\/\/\S+(\s|$)" attribute="Link" context="#pop" minimal="true" />
- <RegExpr String="\{[\s\S]+\}\.\.\/\S+(\s|$)" attribute="Link" context="#stay" minimal="true" />
- <RegExpr String="\{[\s\S]+\}image(\s|$)" attribute="Link" context="#stay" minimal="true" />
- <RegExpr String="\s_?https?:\/\/\S+" attribute="Link" context="#stay"/>
- <RegExpr String="^_?https?:\/\/\S+" attribute="Link" context="#stay"/>
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Bold" lineEndContext="#stay" name="bold" >
- <StringDetect attribute="Bold" context="#pop" String="}*" />
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Bold" lineEndContext="#stay" name="emphasis" >
- <StringDetect attribute="Bold" context="#pop" String="}!" />
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Italic" lineEndContext="#stay" name="italic" >
- <StringDetect attribute="Italic" context="#pop" String="}/" />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Underscore" lineEndContext="#stay" name="underscore" >
- <StringDetect attribute="Underscore" context="#pop" String="}_" />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Superscript" lineEndContext="#stay" name="superscript" >
- <StringDetect attribute="Superscript" context="#pop" String="}^" />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Subscript" lineEndContext="#stay" name="subscript" >
- <StringDetect attribute="Subscript" context="#pop" String="}," />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Strike" lineEndContext="#stay" name="strike" >
- <StringDetect attribute="Strike" context="#pop" String="}-" />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="+{" attribute="Insert" context="insert"/>
- </context>
- <context attribute="Insert" lineEndContext="#stay" name="insert" >
- <StringDetect attribute="Insert" context="#pop" String="}+" />
- <StringDetect String="!{" attribute="Bold" context="emphasis"/>
- <StringDetect String="*{" attribute="Bold" context="bold"/>
- <StringDetect String="/{" attribute="Italic" context="italic"/>
- <StringDetect String="_{" attribute="Underscore" context="underscore"/>
- <StringDetect String="^{" attribute="Superscript" context="superscript"/>
- <StringDetect String=",{" attribute="Subscript" context="subscript"/>
- <StringDetect String="-{" attribute="Strike" context="strike"/>
- </context>
- <context attribute="Endnote" lineEndContext="#pop" name="endnote" />
- <context attribute="Bold" lineEndContext="#pop" name="boldline" />
- <context attribute="Indent" lineEndContext="#pop" name="indent" />
- <context attribute="Warn" lineEndContext="#pop" name="warn" />
- </contexts>
- <itemDatas>
- <itemData name="Normal Text" defStyleNum="dsNormal" />
- <itemData name="Header" defStyleNum="dsNormal" color="#1c869b" selColor="#60FFFF" bold="0" italic="0"/>
- <itemData name="Heading" defStyleNum="dsNormal" color="#ff0000" selColor="#60FFFF" bold="1" italic="0"/>
- <itemData name="Bold" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="1" italic="0"/>
- <itemData name="Italic" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="1"/>
- <itemData name="Underscore" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Superscript" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Subscript" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Strike" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Insert" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Keyword" defStyleNum="dsKeyword" />
- <itemData name="Endnote" defStyleNum="dsNormal" color="#0AAA00" selColor="#60FFFF" bold="0" italic="0"/>
- <itemData name="Link" defStyleNum="dsNormal" color="#0000FF" selColor="#60FFFF" bold="0" italic="0"/>
- <itemData name="String" defStyleNum="dsString" />
- <itemData name="Comment" defStyleNum="dsComment"/>
- <itemData name="Group" defStyleNum="dsRegionMarker"/>
- <itemData name="Break" defStyleNum="dsNormal" color="#FF0000" selColor="#60FFFF" bold="0" italic="0"/>
- <itemData name="Indent" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Structure" defStyleNum="dsNormal" color="#F00000" selColor="#80FFD0" bold="0" italic="0"/>
- <itemData name="Warn" defStyleNum="dsError" color="#FF00FF" selColor="#000000" bold="1" italic="0"/>
- </itemDatas>
- </highlighting>
- <general>
- <keywords weakDeliminator="\" wordWrapDeliminator=",{}[]"/>
- <comments>
- <comment name="singleLine" start="%" />
- </comments>
- </general>
-</language>
diff --git a/data/sisu/v4/conf/editor-syntax-etc/nano/nanorc b/data/sisu/v4/conf/editor-syntax-etc/nano/nanorc
deleted file mode 100644
index 30ba439c..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/nano/nanorc
+++ /dev/null
@@ -1,221 +0,0 @@
-## Sample initialization file for GNU nano
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read! Also note that characters specially
-## interpreted by the shell should not be escaped here.
-##
-## To make sure a value is not enabled, use "unset <option>"
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-
-## Use auto-indentation.
-# set autoindent
-
-## Backup files to filename~.
-# set backup
-
-## The directory to put unique backup files in.
-# set backupdir ""
-
-## Do backwards searches by default.
-# set backwards
-
-## The characters treated as closing brackets. They cannot contain
-## blank characters. Only closing punctuation, optionally followed by
-## closing brackets, can end sentences.
-##
-# set brackets "'")}]>"
-
-## Do case sensitive searches by default.
-# set casesensitive
-
-## Constantly display the cursor position in the statusbar. Note that
-## this cancels out "quickblank".
-# set const
-
-## Use cut to end of line by default.
-# set cut
-
-## Set the line length for wrapping text and justifying paragraphs.
-## If fill is 0 or less, the line length will be the screen width less
-## this number.
-##
-# set fill -8
-
-## Enable ~/.nano_history for saving and reading search/replace strings.
-# set historylog
-
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
-## Enable mouse support, so that mouse clicks can be used to set the
-## mark and run shortcuts.
-# set mouse
-
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer). You must have configured with --enable-multibuffer
-## for this to work.
-##
-# set multibuffer
-
-## Don't convert files from DOS/Mac format.
-# set noconvert
-
-## Don't follow symlinks when writing files.
-# set nofollow
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-# set nohelp
-
-## Don't wrap text at all.
-# set nowrap
-
-## Set operating directory. nano will not read or write files outside
-## this directory and its subdirectories. Also, the current directory
-## is changed to here, so files are inserted from this dir. A blank
-## string means the operating directory feature is turned off.
-##
-# set operatingdir ""
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation. They cannot contain
-## blank characters. Only closing punctuation, optionally followed by
-## closing brackets, can end sentences.
-##
-# set punct ".?!"
-
-## Do quick statusbar blanking. Statusbar messages will disappear after
-## 1 keystroke instead of 25. Note that "const" cancels this out.
-##
-# set quickblank
-
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string. Default:
-# set quotestr "^([ ]*[\|>:}#])+"
-## if you have regexps, otherwise:
-# set quotestr "> "
-## You can get old nano quoted-justify behavior via:
-# set quotestr "(> )+"
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## Make the Home key smarter. When Home is pressed anywhere but at the
-## very beginning of non-whitespace characters on a line, the cursor
-## will jump to that beginning (either forwards or backwards). If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
-# set smarthome
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Use this spelling checker instead of the internal one. This option
-## does not properly have a default value.
-##
-# set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-# set suspend
-
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Convert typed tabs to spaces.
-# set tabstospaces
-
-## Save automatically on exit, don't prompt.
-# set tempfile
-
-## Disallow file modification; why would you want this in an rcfile? ;)
-# set view
-
-## The two single-column characters used to display the first characters
-## of tabs and spaces. 187 decimal (00BB hexadecimal) and 183 decimal
-## (00B7 hexadecimal) seem to be good values for these.
-# set whitespace " "
-
-## Color setup
-##
-## Format:
-##
-## syntax "short description" ["filename regex" ...]
-##
-## color foreground,background "regex" ["regex"...]
-## or
-## icolor foreground,background "regex" ["regex"...]
-##
-## "color" will do case sensitive matches, while "icolor" will do case
-## insensitive matches.
-##
-## Legal colors: white, black, red, blue, green, yellow, magenta, cyan.
-## You may use the prefix "bright" to mean a stronger color highlight
-## for the foreground.
-##
-## To use multi-line regexes, use the start="regex" end="regex" format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color. If you don't want this, be sure
-## to set the background color to black or white.
-##
-# syntax "c-file" "\.(c|C|cc|cpp|cxx|h|H|hh|hpp|hxx)$"
-# color red "\<[A-Z_]{2,}\>"
-# color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|signed|unsigned|inline)\>"
-# color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
-# color brightyellow "\<(for|if|while|do|else|case|default|switch|goto|continue|break|return)\>"
-# color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
-# color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
-# color brightmagenta "'([^\]|(\\['abfnrtv\\]))'" "'\\(([0-7][0-7]?)|([0-3][0-7][0-7]))'" "'\\x[0-9A-Fa-f][0-9A-Fa-f]?'"
-## color foreground,background "regex" ["regex"...]
-##
-#% sisu
-syntax "sisu" "\.ss[tmi]$"
-#color white,black ".*"
-color cyan start="^0~" end="^$"
-color cyan start="^@\S+:" end="^$"
-#color cyan "^0~.*"
-color brightyellow "^[1-6]~.*"
-color brightyellow "^:?[A-C]~.*"
-icolor brightwhite "^(Chapter|Part|Section|Book|Article|Preamble|Appendix)\s.*"
-color brightyellow "^!_\s.*"
-color brightyellow "[!*]\{.+?\}[!*]"
-color yellow "[/_+-^,]\{.+?\}[/_+-^,]"
-color green "~\{.+?\}~"
-color green "~\^(\s|$)"
-color green "^\^~\s.+"
-#color green start="~\{" end="\}~"
-color yellow "\{.+?\}http:\/\/\S+"
-color brightblue "http:\/\/\S+"
-color brightblue "^<<\s\S+?\.ss[it]"
-color yellow "^(_[12]?\*|_[12])"
-color magenta "^%+\s+.*"
-color green start="^poem\{$" end="^\}poem$"
-color green start="^code\{$" end="^\}code$"
-color green start="^group\{$" end="^\}group$"
-color green start="^alt\{$" end="^\}alt$"
-color magenta "<:(pb|np)>"
-color magenta "<(\/\s*)?br>"
-color magenta "[a-zA-Z0-9,.::?!&]+http:\/\/\S+"
-
-# .nanorc
-#
- syntax "nanorc" "(\.|/|)nanorc$"
-# highlight possible errors and parameters
- icolor brightwhite "^[[:space:]]*(set|unset|syntax|i?color).*$"
-# set, unset and syntax
- icolor cyan "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|brackets|casesensitive|const|cut|fill|historylog|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quickblank|quotestr|rebinddelete)\>" "^[[:space:]]*(set|unset)[[:space:]]+(regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace)\>"
- icolor green "^[[:space:]]*(set|unset|syntax)\>"
-# colors
- icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
- icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
-# strings
- icolor white "\"(\\.|[^\"])*\""
-# comments
- icolor blue "^[[:space:]]*#.*$"
-
diff --git a/data/sisu/v4/conf/editor-syntax-etc/nedit/sisu_nedit.pats b/data/sisu/v4/conf/editor-syntax-etc/nedit/sisu_nedit.pats
deleted file mode 100644
index ef01b2be..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/nedit/sisu_nedit.pats
+++ /dev/null
@@ -1,79 +0,0 @@
-! Nedit Syntax highlighting patterns and commenting for SiSU
-! Version 0.1
-!
-! INSTALLATION
-!
-! Load this pattern by starting nedit with:
-!
-! nedit -import <name of this file>
-!
-! Then, check that the patterns were loaded correctly, and choose Save Defaults
-! from the Preferences menu. The new patterns will now be incorporated into
-! your own .nedit file, so the next time you start NEdit, you will no longer
-! need to use -import.
-!
-! These comments will not appear in your ~/.nedit
-!
-nedit.macroCommands: \
- SiSU Comments>Comment Out Lines@SiSU:::R: {\n\
- replace_in_selection("^.*$", "%+ &", "regex")\n\
- }\n\
- SiSU Comments>Uncomment Lines@SiSU:::R: {\n\
- replace_in_selection("(^[ \\\\t]*# ?)(.*)$", "\\\\2", "regex")\n\
- }\n\
- SiSU Comments>Comment Out Sel.@SiSU:::R: {\n\
- beginning-of-selection()\n\
- mark("1")\n\
- deselect-all()\n\
- insert-string("=begin\\n")\n\
- goto-mark("1")\n\
- beginning-of-selection()\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- backward-character("extend")\n\
- mark("1")\n\
- end-of-selection()\n\
- deselect-all()\n\
- insert-string("\\n=end")\n\
- goto-mark("1")\n\
- }\n\
- SiSU Comments>Uncomment Sel.@SiSU:::R: {\n\
- beginning-of-selection()\n\
- mark("1")\n\
- deselect-all()\n\
- replace("=begin\\n","")\n\
- goto-mark("1")\n\
- deselect-all()\n\
- replace("\\n=end","","backward")\n\
- goto-mark("1")\n\
- }\n
-nedit.highlightPatterns: SiSU:1:0{\n\
- comment:"^%+ ":"$"::Comment::\n\
- endnote1:"~\\^(\s|$)":::Keyword::D\n\
- endnote2:"^\\^~ ":"$"::Comment::\n\
- header:"^0~|@\S+:\s":"$"::Keyword::\n\
- bold_line:"^!_ ":"$"::Keyword::\n\
- heading:"^[1-9]~":"$"::Keyword::\n\
- code_block:"^code\\{":"^\\}code"::Comment::\n\
- poem_block:"^poem\\{":"^\\}poem"::Comment::\n\
- group_block:"^group\\{":"^\\}group"::Comment::\n\
- alt_block:"^alt\\{":"^\\}alt"::Comment::\n\
- endnote:"~\\{":"\\}~":"\\n":String::\n\
- string2:"'":"'":"\\n":String1::\n\
- string escape chars:"\\\\(.|\\n)":::String1:endnote:\n\
- character constant:"'":"'":"[^\\\\][^']":Character Const::\n\
- numeric constant:"<((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?>":::Plain::D\n\
- storage keyword:"<(class)>":::Storage Type::D\n\
- line:"^(_[1-9]|_\\*|_[1-9]\\*)":::Keyword::D\n\
- link:"[{}](http://[a-zA-Z0-9?.!+\\-_/&=#]+)?":::Keyword::D\n\
- url:"http://[a-zA-Z0-9?.!+\\-_/&=#]+":::Keyword::D\n\
- }
-! endnote:"~\\{":"\\}~"::Keyword::\n\
-! link:"\\{":"\\}http://\S+"::Keyword::D\n\
-nedit.languageModes: SiSU:.sst::::::".,/\\`'!|@#%^&*()-=+{}[]"":;<>?~"
-! nedit.languageModes: SiSU:.sst::::::".,/\\`'!|@#%^&*()-=+{}[]"":;<>?~"
-! nedit.languageModes: SiSU:.ss[tmi]::::::
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
deleted file mode 100644
index ac973e8e..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-" Vim color file
-" Name: 8
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes frugal & sparse
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "8"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=bold,reverse cterm=bold,reverse
-:hi StatusLineNC term=reverse cterm=reverse
-:hi Search term=reverse cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch term=reverse cterm=bold ctermbg=2 ctermfg=7
-:hi SpecialKey term=bold ctermfg=4
-:hi Visual term=reverse cterm=reverse
-:hi VisualNOS term=bold,underline cterm=bold,underline
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold ctermfg=1
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=none ctermbg=7 ctermfg=0
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=none ctermbg=0 ctermfg=4
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=3
-:hi Identifier term=underline cterm=none ctermfg=6
-:hi Statement term=bold cterm=none ctermfg=2
-":hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermfg=1
-:hi Type term=underline cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
deleted file mode 100644
index fcafe3f4..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-" Name: frugal-cterm
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & sparse
-" http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
-" http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png
-:set t_Co=256
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "frugal-cterm"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor cterm=reverse
-:hi lCursor cterm=reverse
-:hi StatusLine cterm=bold,reverse
-:hi StatusLineNC cterm=reverse
-:hi Search cterm=none ctermbg=2 ctermfg=0
-:hi IncSearch cterm=bold ctermbg=2 ctermfg=0
-:hi SpecialKey ctermfg=4
-:hi Visual cterm=reverse
-:hi VisualNOS cterm=bold,underline
-:hi MoreMsg ctermfg=2
-:hi ModeMsg cterm=bold
-:hi Question ctermfg=2
-:hi Title cterm=bold ctermfg=3
-:hi NonText cterm=bold ctermfg=4
-:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory ctermfg=4
-:hi WildMenu ctermbg=3 ctermfg=0
-:hi VertSplit cterm=reverse
-:hi Folded cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=none ctermbg=0 ctermfg=7
-:hi Constant ctermfg=1
-:hi Special ctermfg=6
-:hi Identifier ctermfg=6
-:hi Statement ctermfg=2
-:hi Operator ctermfg=2
-:hi PreProc ctermfg=1
-:hi Type cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo ctermbg=3 ctermfg=0
-:hi Underlined cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg ctermfg=1
-:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
-:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
deleted file mode 100644
index 4a021519..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Name: frugal
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD>
-" Note: 8 color cterm, related colorschemes 8 & sparse
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "frugal"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7 guibg=black guifg=white
-:hi Cursor term=reverse cterm=reverse gui=bold guibg=white guifg=black
-:hi lCursor term=reverse cterm=reverse gui=bold guibg=white guifg=black
-:hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse
-:hi StatusLineNC term=reverse cterm=reverse gui=reverse
-:hi Search term=reverse ctermbg=2 guifg=green
-:hi IncSearch term=reverse cterm=reverse gui=reverse
-:hi SpecialKey term=bold ctermfg=4 guifg=blue
-:hi Visual term=reverse cterm=reverse gui=reverse
-:hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline
-:hi MoreMsg term=bold ctermfg=2 guifg=green
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2 guifg=green
-:hi Title term=bold ctermfg=1 guifg=red
-:hi NonText term=bold cterm=bold ctermfg=4 guifg=blue
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* gui=bold guibg=black guifg=grey
-:hi Directory term=bold ctermfg=4 guifg=blue
-:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black
-:hi VertSplit term=reverse cterm=reverse gui=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 gui=none guibg=black guifg=white
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black
-:hi DiffText cterm=none ctermbg=6 ctermfg=0 gui=none guibg=magenta guifg=black
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 gui=none guibg=green guifg=black
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black
-:hi String cterm=none ctermfg=3 gui=none guifg=yellow
-:hi Comment cterm=none ctermbg=0 ctermfg=4 gui=bold guibg=black guifg=grey
-:hi Constant term=underline ctermfg=1 guifg=red
-:hi Special term=bold ctermfg=3 guifg=yellow
-:hi Identifier term=underline cterm=none ctermfg=6 gui=none guifg=magenta
-:hi Statement term=bold cterm=none ctermfg=2 gui=none guifg=green
-":hi Operator term=bold ctermfg=1 guifg=red
-:hi PreProc term=underline ctermfg=1 guifg=red
-:hi Type term=underline cterm=bold ctermfg=3 gui=bold guifg=yellow
-:hi Delimiter cterm=none ctermfg=2 gui=none guifg=green
-:hi Ignore cterm=bold ctermfg=7 gui=bold guifg=white
-:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black
-:hi Underlined term=underline cterm=underline gui=underline
-":hi Include ctermfg=1 guifg=red
-":hi Define ctermfg=3 guifg=yellow
-":hi Function ctermfg=6 guifg=magenta
-":hi Structure ctermfg=2 guifg=green
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline
-:hi CursorColumn cterm=bold
-:hi ColorColumn ctermbg=8
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
-:hi WarningMsg term=standout ctermfg=1 guifg=red
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
deleted file mode 100644
index 94e5f43b..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-"%% SiSU Vim color file
-" Name: Slate
-" Maintainer: Ralph Amissah <ralph@amissah.com>
-" Last Change: 2013-02-09
-" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
-" Notes: cterm now uses frugal-sisu 8 colors for term
-" (for gui originally looked at desert Hans Fugal <hans@fugal.net>
-" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003))
-:set background=dark
-:hi clear
-if exists("syntax_on")
- syntax reset
-endif
-:let colors_name = "slate"
-" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7 guibg=grey15 guifg=white
-:hi Cursor term=reverse cterm=reverse guibg=khaki guifg=slategrey
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black
-:hi StatusLineNC term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40
-:hi Search term=reverse cterm=none ctermbg=2 ctermfg=0 guibg=peru guifg=wheat
-:hi IncSearch term=reverse cterm=bold ctermbg=2 ctermfg=7 guibg=black guifg=green
-:hi SpecialKey term=bold ctermfg=4 guifg=yellowgreen
-:hi Visual term=reverse cterm=reverse gui=none guibg=olivedrab guifg=khaki
-:hi VisualNOS term=bold,underline cterm=bold,underline
-:hi MoreMsg term=bold ctermfg=2 guifg=SeaGreen
-:hi ModeMsg term=bold cterm=bold guifg=goldenrod
-:hi Question term=standout ctermfg=2 guifg=springgreen
-:hi Title term=bold cterm=bold ctermfg=3 gui=bold guifg=gold
-:hi NonText term=bold cterm=bold ctermfg=4 guibg=grey15 guifg=RoyalBlue
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* guifg=grey50
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=darkyellow guifg=black
-:hi VertSplit term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 guibg=black guifg=grey40
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4 guibg=black guifg=grey20
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=white
-:hi DiffText cterm=none ctermbg=6 ctermfg=0 guibg=darkcyan guifg=white
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 guibg=darkgreen guifg=white
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=black
-:hi String cterm=none ctermfg=3 guifg=SkyBlue
-:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 guifg=grey40
-:hi Constant term=underline ctermfg=1 guifg=#ffa0a0
-:hi Special term=bold ctermfg=6 guifg=darkkhaki
-:hi Identifier term=underline ctermfg=6 guifg=salmon
-:hi Statement term=bold ctermfg=6 guifg=CornflowerBlue
-:hi Operator term=bold ctermfg=1 guifg=red
-:hi PreProc term=underline ctermbg=7 ctermfg=1 guibg=white guifg=red
-:hi Type term=underline ctermfg=2 guifg=CornflowerBlue
-:hi Delimiter term=none cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7 guifg=grey40
-:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow2 guifg=orangered
-:hi Underlined term=underline cterm=underline
-:hi Include ctermfg=1 guifg=red
-:hi Define ctermfg=3 gui=bold guifg=gold
-:hi Function ctermfg=6 guifg=navajowhite
-:hi Structure ctermfg=2 guifg=green
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=bold,underline guibg=black
-:hi CursorColumn cterm=bold guibg=black
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1 guibg=darkmagenta guifg=salmon
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white
-:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black
-:hi Red ctermbg=black ctermfg=red guibg=black guifg=red
-:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta
-:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue
-:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan
-:hi Green ctermbg=black ctermfg=green guibg=black guifg=green
-:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow
-:hi White ctermbg=black ctermfg=white guibg=black guifg=white
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/filetype.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/filetype.vim
deleted file mode 100644
index 917c3e04..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/filetype.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-" SiSU filetype file
-if exists("did_load_filetypes")
- finish
-endif
-augroup filetypedetect
- au! BufNewFile,BufRead *.sst,*.ssm,*.ssi,*.-sst setf sisu
- au! BufNewFile,BufRead *._sst,*.sst.meta,*.-sst.meta,*._sst.meta setf sisu
-augroup END
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
deleted file mode 100644
index a72251da..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ /dev/null
@@ -1,185 +0,0 @@
-"%% SiSU Vim ftplugin
-" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup: SiSU (sisu-3.3) 2012-08-18
-" an ftplugin setting defaults for editing sisu markup files
-:syntax on
-:filetype on
-:filetype indent on
-:autocmd FileType sisu :set nonumber
-:set encoding=utf-8 fileencodings=
-:set ff=unix
-:set autowrite " Automatically save before commands like :next and :make
-:set nocompatible
-:set tabstop=2
-:set expandtab
-:set shiftwidth=2
-:set autoindent
-:set showcmd " Show (partial) command in status line.
-:set showmatch " Show matching brackets.
-:set ignorecase " Do case insensitive matching
-:set smartcase
-:set incsearch
-:set hlsearch
-:set gdefault
-:set guioptions=agr " add 'm' for menu
-:map <silent> <C-m> :if &guioptions =~# 'm' <Bar>
- \set guioptions-=m <Bar>
- \set guioptions-=T <Bar>
- \else <Bar>
- \set guioptions+=m <Bar>
- \set guioptions-=T <Bar>
- \endif<CR>
-:set paste
-:set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%v:%l/%L\ %p%%]
-:set laststatus=2 " status line always on
-"% textwrap
-:set whichwrap=<,>,h,l,[,]
-:set nolinebreak " only affects display not buffer
-:set wrap
-:set wrapmargin=0
-"% map
-":let mapleader = "," " consider
-:map <leader>paste :set invpaste<cr>
-"% wrap/formatting paragraph according to the current 'textwidth' with ^J (control-j):
-:imap <C-J> <C-O>gqap
-:nmap <C-J> gqap
-:vmap <C-J> gq
-"% save file, go to next file in buffer
-:map <leader>nf :w <enter> :n <enter>
-"% vimdiff q exits
-:if &diff
-: cmap q qa
-:endif
-"% directory files, placed in vertical split window
-:map <leader>ls :vs<cr> :Explore<cr>
-:map <leader>dir :vs<cr> :Explore<cr>
-:if &diff
-: cmap q qa
-:endif
-"% remapping lines make cursor jump a line at a time within wrapped text
-:nnoremap j gj
-:nnoremap k gk
-:vnoremap j gj
-:vnoremap k gk
-:nnoremap <Down> gj
-:nnoremap <Up> gk
-:vnoremap <Down> gj
-:vnoremap <Up> gk
-:inoremap <Down> <C-o>gj
-:inoremap <Up> <C-o>gk
-"% search and replace
-:map <leader>rd :.,$s///c "search and replace down
-:map <leader>rg :%s///c "search and replace whole file
-:map <leader>rr :rubyd gsub!(//,"")
-"% pwd t64 working directory set to that of the file you're editing
-"changes pwd to directory of file in current buffer
-:function! CHANGE_CURR_DIR()
-: let _dir = expand("%:p:h")
-: exec "cd " . _dir
-: unlet _dir
-:endfunction
-"% Change to the directory the file in your current buffer is in
-:if has("autocmd")
- autocmd BufEnter * :lcd %:p:h
-:endif
-"% autocompletefilenames To search for files in the current directory
-:set path=,,
-"auto-completion for file to edit in current dir, used in normal mode
-:map <leader>e :e <c-r>=expand("%:p:h") . "/" <cr>
-:map <leader>pwd :exe 'cd ' . expand ("%:p:h")<cr>
-"% searchhighlight t93: Toggle search highlight <C-n>
-:function! ToggleHLSearched()
-: if &hls
-: set nohls
-: else
-: set hls
-: endif
-:endfun
-:nmap <silent> <C-n> :silent call ToggleHLSearched()<cr>
-"%% SiSU vim folds
-"% foldsearchx FoldSearch (opens result of search all else closed) t77
-:map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
-:map <leader>ff :F<cr>
-:map <leader>fe :F<cr> zE
-"% foldtoggle Fold Toggle mapped to <space>
-:fun! ToggleFold()
-: if foldlevel('.') == 0
-: normal! l
-: else
-: if foldclosed('.') < 0
-: foldclose
-: else
-: foldopen
-: endif
-: endif
-" Clear status line
-: echo
-:endfun
-" Map this function to Space key.
-:noremap <space> :call ToggleFold()<cr>
-"% foldtype Fold? set foldtext
-:set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\=','','g',)
-:set foldexpr=getline(v:lnum-1)!~@/&&getline(v:lnum)!~@/&&getline(v:lnum+1)!~@/
-"% foldsearch t77: Fold on search result
-:function! FoldMake(search)
-: set fdm=manual
-: normal zE
-: normal G$
-: let folded = 0 "flag to set when a fold is found
-: let flags = "w" "allow wrapping in the search
-: let line1 = 0 "set marker for beginning of fold
-: while search(a:search, flags) > 0
-: let line2 = line(".")
-: if (line2 -1 > line1)
-: "echo line1 . ":" . (line2-1)
-: "echo "a fold goes here."
-: execute ":" . line1 . "," . (line2-1) . "fold"
-: let folded = 1 "at least one fold has been found
-: endif
-: let line1 = line2 "update marker
-: let flags = "W" "turn off wrapping
-: endwhile
-" create the last fold which goes to the end of the file.
-: normal $G
-: let line2 = line(".")
-: if (line2 > line1 && folded == 1)
-: execute ":". line1 . "," . line2 . "fold"
-: endif
-: normal 1G
-:endfunction
-"% folds Fold Patterns
-:command! -nargs=+ -complete=command FMake call FoldMake(<q-args>)
-: if ( &filetype == "ruby" )
-: command! F FMake ^# ==\?\|^\s*\(\(def\|class\|module\)\s\|\(public\|protected\|private\|__END__\)\s*$\)\|\(^\s*\|\s\+\)#%\s
-: command! Fa FMake \(^# ==\?\|^\s*\(\(\(def\|class\|module\)\s\)\|\(\(public\|protected\|private\|__END__\)\(\s*$\)\)\)\)\|^[0-9]\~\|\([#%]\|^["]\)\{1,4\}\s*%\|{\({\|!!\)
-: command! FD FMake \(^# ==\?\|^\s*\(\(def\|class\|module\)\s\)\)\|^\s*\([#%"0-9]\{0,4\}\~\(%\+\s\|!!\)\|#\s\+=\+\s\+\)
-: else
-"% folds :F Fold Patterns SiSU Markup :F
-: command! F FMake ^\([1-8]\|:\?[A-C]\)\~\|\(^%\|\(^\|\s\+\)[#"]\)%\{1,2\}\(\s\|$\)\|^<<\s*|
-: command! Fa FMake ^\([1-8]\|:\?[A-C]\)\~\|\(^%\|\(^\|\s\+\)[#"]\)%\{1,2\}\(\s\|$\)\|^<<\s*|\|^\(Book\|Part\|Chapter\|Section\|Article\|BOOK\|PART\|CHAPTER\|SECTION\|ARTICLE\)\s
-: command! F0 FMake ^\(\s*0\~\|@\S\+:[+-]\?\s\+\)
-: command! FA FMake ^:\?A\~
-: command! FB FMake ^:\?[AB]\~
-: command! FC FMake ^:\?[A-C]\~
-: command! F1 FMake ^\(:\?[A-C]\|1\)\~
-: command! F2 FMake ^\(:\?[A-C]\|[12]\)\~
-: command! F3 FMake ^\(:\?[A-C]\|[1-3]\)\~
-: command! F4 FMake ^[1-4]\~
-: command! F5 FMake ^[4-5]\~
-: command! F6 FMake ^[4-6]\~
-: command! Fc FMake ^[%]\+\s\+
-: endif
-"% folds Fold Patterns misc
-":command! Fp FMake ^\s*[A-Za-z0-9#]
-:command! Fp FMake ^\s*\S
-:command! Fo FMake ^[%\"]\s*[{>]
-"% linenumbering, on, relative, off
-:map <Leader>nn :set <c-r>={'00':'','01':'r','10':'nor'}[&rnu.&nu]<CR>nu<CR>
-"% cursorline
-:map <leader>cu :if &cursorcolumn <Bar>
- \set nocursorline nocursorcolumn <Bar>
- \else <Bar>
- \set cursorline cursorcolumn <Bar>
- \endif<cr>
-:map <leader>cu- :set nocursorline nocursorcolumn<cr>
-:map <leader>cu+ :set cursorline cursorcolumn<cr>
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu_next.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
deleted file mode 100644
index 257e1cba..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
+++ /dev/null
@@ -1,281 +0,0 @@
-" SiSU Vim syntax file
-" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup: SiSU (sisu-3.1.0)
-" Last Change: 2011-10-03
-" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
-"(originally looked at Ruby Vim by Mirko Nasato)
-
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-else
-endif
-let s:cpo_save = &cpo
-set cpo&vim
-
-"% "Errors:
-syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
-
-"% "Markers Identifiers:
-if !exists("sisu_no_identifiers")
- syn match sisu_mark_endnote "\~^"
- syn match sisu_break contains=@NoSpell " \\\\\( \|$\)"
- syn match sisu_break contains=@NoSpell "<br>\|<br />"
- syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$"
- "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$"
- syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pr\|o\)>\s*$"
- "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pr\|o\)\]\s*$"
- syn match sisu_marktail "[~-]#"
- syn match sisu_control "\""
- syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
- syn match sisu_number contains=@NoSpell "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
- syn match sisu_link contains=@NoSpell "\(_\?https\?://\|\.\.\/\)\S\+"
- syn match sisu_link " \*\~\S\+"
- syn match sisu_action "^<:insert\d\+>"
- syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$"
- syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$"
- syn match sisu_structure "^:A\~$"
-
-"% "Document Sub Headers:
- syn match sisu_sub_header_title "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content
- syn match sisu_sub_header_creator "^\s\+:\(author\|editor\):\s" " &hon &institution
- syn match sisu_sub_header_contributor "^\s\+:\(editor\|translator\|illustrator\|photographer\|audio\|video\|prepared_by\|digitized_by\):\s"
- syn match sisu_sub_header_rights "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s" " access_rights license
- syn match sisu_sub_header_classify "^\s\+:\(topic_register\|coverage\|identifier\|keywords\|relation\|subject\|type\|dewey\|loc\):\s"
- syn match sisu_sub_header_identify "^\s\+:\(isbn\|urn\|oclc\|pg\):\s"
- syn match sisu_sub_header_format "^\s\+:\(mimetype\):\s"
- syn match sisu_sub_header_date "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
- syn match sisu_sub_header_original "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
- syn match sisu_sub_header_make "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|skin\|stamp\|promo\|ad\|manpage\):\s"
- syn match sisu_sub_header_notes "^\s\+:\(abstract\|comment\|description\|history\|prefix\|prefix_[ab]\|suffix\):\s"
-
-"% "semantic markers: (ignore)
- syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]"
- syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker ";\[\|\];[a-z._]*[a-z]"
- syn match sisu_sem_ex_marker_block "\([a-z][a-z._]*\|\):\[\|\]:[a-z._]*[a-z]"
- syn match sisu_sem_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):{[^}].\{-}}:\1"
- syn match sisu_sem_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";{[^}].\{-}};[a-z]\+"
- syn match sisu_sem_ex_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):\[[^}].\{-}\]:\1"
- syn match sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";\[[^}].\{-}\];[a-z]\+"
-endif
-
-"% "URLs Numbers And ASCII Codes:
-syn match sisu_number "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>"
-syn match sisu_number "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)"
-
-"% "Tuned Error: (is error if not already matched)
-syn match sisu_error contains=sisu_error "[\~/\*!_]{\|}[\~/\*!_]"
-syn match sisu_error contains=sisu_error "<a href\|</a>]"
-
-"% "Simple Paired Enclosed Markup:
-"url/link
-syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
-
-"% "Document Header:
-" title
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" creator
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" contributor
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_contributor matchgroup=sisu_header start="^[@]contributor:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" dates
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" publisher
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" rights
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" classify document
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" identifier
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_identifier matchgroup=sisu_header start="^[@]identifier:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" format
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_format matchgroup=sisu_header start="^[@]format:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" original language (depreciated)
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" notes
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" links of interest
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-" make, processing instructions
-syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
-
-"% "Headings:
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
-
-"% "Block Group Text:
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
-" table
-syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
-" block, group, poem, alt
-syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
-" code
-syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
-
-"% "Endnotes:
-" regular endnote or asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
-" numbered asterisk or plus sign endnote
-syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
-" endnote content marker (for binary content marking)
-syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$"
-
-"% "Links And Images:
-" image with url link (and possibly footnote of url)
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|:\|\.\.\/\|#\)\S\+" oneline
-" sisu outputs, short notation
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
-" image
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
-
-"% "Some Line Operations:
-" bold line
-syn region sisu_bold contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^!_ " end=" \\\\\|$"
-" indent and bullet paragraph
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
-" indent and bullet (bold start) paragraph
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\)!_\? " end=" \\\\\|$"
-" hanging indent paragraph [proposed]
-syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9] " end="$"
-" hanging indent (bold start/ definition) paragraph [proposed]
-syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9]!_\? " end=" \\\\\|$"
-" list numbering
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
-
-"% "Font Face Curly Brackets:
-"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
-" book index:
-syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
-" emphasis:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
-" bold:
-syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
-" underscore:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
-" italics:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/"
-" added:
-syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+"
-" superscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^"
-" subscript:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="},"
-" monospace:
-syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="#{" end="}#"
-" strikethrough:
-syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-"
-" (depreciated remove, consider marking as error):
-" syn region sisu_html contains=sisu_error contains=sisu_strikeout matchgroup=sisu_contain start="<a href=\".\{-}\">" end="</a>" oneline
-
-"% "Single Words Bold Italicise Etc: (depreciated)
-syn region sisu_bold contains=sisu_error matchgroup=sisu_bold start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline
-"misc
-syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline
-
-"% "Expensive Mode:
-if !exists("sisu_no_expensive")
-else " not Expensive
- syn region sisu_content_alt matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline
-endif " Expensive?
-
-"% "Headers And Headings: (Document Instructions)
-syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+"
-syn region sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$"
-
-"% "Errors:
-syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
-"syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+\|\t\+"
-syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$"
-syn match sisu_error contains=sisu_error_wspace "\t\+"
-syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
-syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"
-syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n$"
-syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n$"
-syn match sisu_error contains=sisu_error "\s\+.{{"
-syn match sisu_error contains=sisu_error "^\~\s*$"
-syn match sisu_error contains=sisu_error "^0\~.*"
-syn match sisu_error contains=sisu_error "^[1-9]\~\s*$"
-syn match sisu_error contains=sisu_error "^[1-9]\~\S\+\s*$"
-syn match sisu_error contains=sisu_error "[^{]\~\^[^ \)]"
-syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
-syn match sisu_error contains=sisu_error "{\~^\S\+"
-syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
-syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
-syn match sisu_error contains=sisu_error "<dir>"
-"errors for filetype sisu, though not error in 'metaverse':
-syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>"
-syn match sisu_error "/\?<\([biu]\)>[^(</\1>)]\{-}\n$"
-
-"% "Error Exceptions:
-syn match sisu_control "\n$" "contains=ALL
-"syn match sisu_control " //"
-syn match sisu_error "%{"
-syn match sisu_error "<br>_\?https\?:\S\+\|_\?https\?:\S\+<br>"
-syn match sisu_error "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]"
-syn match sisu_comment "^%\{1,2\}.\+"
-
-"% "Definitions Default Highlighting:
-hi def link sisu_normal Normal
-hi def link sisu_bold Statement
-hi def link sisu_header PreProc
-hi def link sisu_header_content Normal
-hi def link sisu_sub_header_title Statement
-hi def link sisu_sub_header_creator Statement
-hi def link sisu_sub_header_date Statement
-hi def link sisu_sub_header_publisher Statement
-hi def link sisu_sub_header_rights Statement
-hi def link sisu_sub_header_classify Statement
-hi def link sisu_sub_header_original Statement
-hi def link sisu_sub_header_links Statement
-hi def link sisu_sub_header_notes Statement
-hi def link sisu_sub_header_make Statement
-hi def link sisu_heading Title
-hi def link sisu_structure Operator
-hi def link sisu_contain Include
-hi def link sisu_mark_endnote Delimiter
-"hi def link sisu_mark_endnote Include
-hi def link sisu_require NonText
-hi def link sisu_link NonText
-hi def link sisu_linked String
-hi def link sisu_fontface Delimiter
-"hi def link sisu_fontface Include
-hi def link sisu_strikeout DiffDelete
-hi def link sisu_content_alt Special
-hi def link sisu_sem_content SpecialKey
-hi def link sisu_sem_block Special
-hi def link sisu_sem_marker Visual
-"hi def link sisu_sem_marker Structure
-hi def link sisu_sem_marker_block MatchParen
-hi def link sisu_sem_ex_marker FoldColumn
-hi def link sisu_sem_ex_marker_block Folded
-hi def link sisu_sem_ex_content Comment
-"hi def link sisu_sem_ex_content SpecialKey
-hi def link sisu_sem_ex_block Comment
-hi def link sisu_index SpecialKey
-hi def link sisu_index_block Visual
-hi def link sisu_content_endnote Special
-hi def link sisu_control Delimiter
-"hi def link sisu_control Define
-hi def link sisu_ocn Include
-hi def link sisu_number Number
-hi def link sisu_identifier Function
-hi def link sisu_underline Underlined
-hi def link sisu_markpara Include
-hi def link sisu_marktail Include
-hi def link sisu_mark Identifier
-hi def link sisu_break Structure
-hi def link sisu_html Type
-hi def link sisu_action Identifier
-hi def link sisu_comment Comment
-hi def link sisu_error_sem_marker Error
-hi def link sisu_error_wspace Error
-hi def link sisu_error Error
-let b:current_syntax = "sisu"
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssi.tpl b/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssi.tpl
deleted file mode 100644
index a101dee6..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssi.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-% SiSU 2.0 insert
-
-@title: #___#
- :subtitle: #___#
-
-@creator:
- :author: #___#
-
-@rights:
- :copyright: #___#
- :license: #___#
-
-@classify:
- :topic_register: #___#
- :subject: #___#
- :type: #___#
- :loc: #___#
- :oclc: #___#
- :isbn: #___#
-
-@date:
- :published: 20YY-MM-DD
- :added_to_site: 20YY-MM-DD
- :modified: 20YY-MM-DD
-
-@make:
- :headings: none; none; none; none;
- :num_top: 1
- :breaks: new=:C; break=1
- :bold: / #___#/i
- :italics: / #___#/i
- :skin: #___#
-
-@links:
- {SiSU}http://www.jus.uio.no/sisu/SiSU
-
-:A~ @title @author
-
-1~ #___#
-
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssm.tpl b/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssm.tpl
deleted file mode 100644
index cbda5053..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/ssm.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-% SiSU 2.0 master
-
-@title: #___#
- :subtitle: #___#
-
-@creator:
- :author: #___#
-
-@rights:
- :copyright: #___#
- :license: #___#
-
-@classify:
- :topic_register: #___#
- :subject: #___#
- :type: #___#
- :loc: #___#
- :oclc: #___#
- :isbn: #___#
-
-@date:
- :published: 20YY-MM-DD
- :added_to_site: 20YY-MM-DD
- :modified: 20YY-MM-DD
-
-@make:
- :headings: none; none; none; none;
- :num_top: 1
- :breaks: new=:C; break=1
- :bold: / #___#/i
- :italics: / #___#/i
- :skin: #___#
-
-@links:
- {SiSU}http://www.jus.uio.no/sisu/SiSU
-
-:A~ @title @author
-
-1~ #___#
-
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/sst.tpl b/data/sisu/v4/conf/editor-syntax-etc/vim/templates/sst.tpl
deleted file mode 100644
index dd19efb4..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/templates/sst.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-% SiSU 2.0
-
-@title: #___#
- :subtitle: #___#
-
-@creator:
- :author: #___#
-
-@rights:
- :copyright: #___#
- :license: #___#
-
-@classify:
- :topic_register: #___#
- :subject: #___#
- :type: #___#
- :loc: #___#
- :oclc: #___#
- :isbn: #___#
-
-@date:
- :published: 20YY-MM-DD
- :added_to_site: 20YY-MM-DD
- :modified: 20YY-MM-DD
-
-@make:
- :headings: none; none; none; none;
- :num_top: 1
- :breaks: new=:C; break=1
- :bold: / #___#/i
- :italics: / #___#/i
- :skin: #___#
-
-@links:
- {SiSU}http://www.jus.uio.no/sisu/SiSU
-
-:A~ @title @author
-
-1~ #___#
-
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/vim-sisu.yaml b/data/sisu/v4/conf/editor-syntax-etc/vim/vim-sisu.yaml
deleted file mode 100644
index ca665bc8..00000000
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/vim-sisu.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-#vim-addons: debian vim-addon-manager
-addon: sisu
-description: SiSU documents - structuring, publishing in multiple formats and search
-basedir: /usr/share/vim-scripts/
-files:
- - ftplugin/sisu.vim
- - syntax/sisu.vim
diff --git a/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu b/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu
deleted file mode 100644
index 6647de9f..00000000
--- a/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu
+++ /dev/null
@@ -1,115 +0,0 @@
-# lighttpd configuration file
-#
-# use a it as base for lighttpd 1.0.0 and above
-#
-#%% Options you really have to take care of
-#%
-# modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-server.dir-listing = "disable"
-server.modules = ( "mod_rewrite",
- "mod_access",
- "mod_fastcgi",
- "mod_compress",
- "mod_accesslog")
-#%% a static document-root, for virtual-hosting take look at the
-#% server.virtual-* options
-server.document-root = "/var/www/"
-#server.document-root = "/home/*username*/web/public/"
-## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
-#server.document-root = "/home/*username*/web/public/"
-#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
-#% files to check for if .../ is requested
-server.indexfiles = ( "index.php", "index.html",
- "index.htm", "index.rb")
-##% mimetype mapping
-##include "mime.types.conf"
-##include_shell "/usr/local/bin/confmimetype /etc/mime.types"
-#% mimetype mapping
-mimetype.assign = (
- ".pdf" => "application/pdf",
- ".gz" => "application/x-gzip",
- ".tar.gz" => "application/x-tgz",
- ".tgz" => "application/x-tgz",
- ".zip" => "application/zip",
- ".gif" => "image/gif",
- ".jpg" => "image/jpeg",
- ".jpeg" => "image/jpeg",
- ".png" => "image/png",
- ".css" => "text/css",
- ".html" => "text/html",
- ".htm" => "text/html",
- ".js" => "text/javascript",
- ".text" => "text/plain",
- ".txt" => "text/plain",
- ".s1" => "text/plain",
- ".s2" => "text/plain",
- ".s3" => "text/plain",
- ".dtd" => "text/xml",
- ".xml" => "text/xml",
- ".odt" => "application/vnd.oasis.opendocument.text",
- ".bz2" => "application/x-bzip",
- ".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
- )
-# text/x-server-parsed-html
-#%Server ID Header
-server.tag = "lighttpd | TextDriven"
-#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
-#% deny access the file-extensions
-#
-# ~ is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-# of the document-root
-url.access-deny = ( "~", ".inc" )
-
-#%% Options that are good to be but not neccesary to be changed
-##% bind to port (default: 80)
-server.port = 81
-#server.port = 8111
-#server.port = 8965
-##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
-##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
-#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
-$HTTP["host"] == "localhost" {
- server.document-root = "/var/www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
- url.rewrite-repeat = (
- "^.*/$" => "index.html",
- "^(.*/(landscape|portrait))$" => "$1.pdf",
- "^(.*/(opendocument))$" => "$1.odt",
- "^(.*/(sax|dom))$" => "$1.xml",
- "^([^.]+)$" => "$1.html"
- )
- server.error-handler-404 = "/dispatch.fcgi"
-# fastcgi.server = ( ".fcgi" =>
-# ( "localhost" =>
-# (
-# "socket" => "/home/[*username*]/var/lighttpd/cgi/lighttpd-fcgi.socket",
-# "bin-path" => "/home/[*username*]/var/lighttpd/public/dispatch.fcgi",
-# "min-procs" => 1,
-# "max-procs" => 2,
-# "idle-timeout" => 60
-# )
-# )
-# )
-}
-#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
-#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
-#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
-compress.filetype = ("text/plain", "text/html")
diff --git a/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www b/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www
deleted file mode 100644
index 0dd16c94..00000000
--- a/data/sisu/v4/conf/lighttpd/lighttpd.cfg.sisu_www
+++ /dev/null
@@ -1,115 +0,0 @@
-# lighttpd configuration file
-#
-# use a it as base for lighttpd 1.0.0 and above
-#
-#%% Options you really have to take care of
-#%
-# modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-server.dir-listing = "disable"
-server.modules = ( "mod_rewrite",
- "mod_access",
- "mod_fastcgi",
- "mod_compress",
- "mod_accesslog")
-#%% a static document-root, for virtual-hosting take look at the
-#% server.virtual-* options
-server.document-root = "/home/[user home]/sisu_www/"
-#server.document-root = "/home/*username*/web/public/"
-## 'Parent' domain on any server except davie.
-#server.document-root = "/home/*username*/public_html/"
-##'Parent' domain for those of you currently on davie.textdrive.com, and all future servers.
-#server.document-root = "/home/*username*/web/public/"
-#% where to send error-messages to
-server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd.error.log"
-#% files to check for if .../ is requested
-server.indexfiles = ( "index.php", "index.html",
- "index.htm", "index.rb")
-##% mimetype mapping
-##include "mime.types.conf"
-##include_shell "/usr/local/bin/confmimetype /etc/mime.types"
-#% mimetype mapping
-mimetype.assign = (
- ".pdf" => "application/pdf",
- ".gz" => "application/x-gzip",
- ".tar.gz" => "application/x-tgz",
- ".tgz" => "application/x-tgz",
- ".zip" => "application/zip",
- ".gif" => "image/gif",
- ".jpg" => "image/jpeg",
- ".jpeg" => "image/jpeg",
- ".png" => "image/png",
- ".css" => "text/css",
- ".html" => "text/html",
- ".htm" => "text/html",
- ".js" => "text/javascript",
- ".text" => "text/plain",
- ".txt" => "text/plain",
- ".s1" => "text/plain",
- ".s2" => "text/plain",
- ".s3" => "text/plain",
- ".dtd" => "text/xml",
- ".xml" => "text/xml",
- ".odt" => "application/vnd.oasis.opendocument.text",
- ".bz2" => "application/x-bzip",
- ".tbz" => "application/x-bzip-compressed-tar",
- ".tar.bz2" => "application/x-bzip-compressed-tar"
- )
-# text/x-server-parsed-html
-#%Server ID Header
-server.tag = "lighttpd | TextDriven"
-#%### accesslog module
-accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
-#% deny access the file-extensions
-#
-# ~ is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-# of the document-root
-url.access-deny = ( "~", ".inc" )
-
-#%% Options that are good to be but not neccesary to be changed
-##% bind to port (default: 80)
-server.port = 8111
-#server.port = 8111
-#server.port = 8965
-##% bind to localhost (default: all interfaces)
-server.bind = "localhost"
-#server.bind = "corundum"
-##server.bind = "grisu.home.kneschke.de"
-##% to help the rc.scripts
-server.pid-file = "/home/[*username*]/var/lighttpd/run/lighttpd.pid"
-#$HTTP["host"] =~ "\.corundum\.(name|com|net|org)" {
-$HTTP["host"] == "localhost" {
- server.document-root = "/home/[*username*]/sisu_www/"
- server.errorlog = "/home/[*username*]/var/lighttpd/log/lighttpd-error.log"
- accesslog.filename = "/home/[*username*]/var/lighttpd/log/access_log"
- url.rewrite-repeat = (
- "^.*/$" => "index.html",
- "^(.*/(landscape|portrait))$" => "$1.pdf",
- "^(.*/(opendocument))$" => "$1.odt",
- "^(.*/(sax|dom))$" => "$1.xml",
- "^([^.]+)$" => "$1.html"
- )
- server.error-handler-404 = "/dispatch.fcgi"
-# fastcgi.server = ( ".fcgi" =>
-# ( "localhost" =>
-# (
-# "socket" => "/home/[*username*]/var/lighttpd/cgi/lighttpd-fcgi.socket",
-# "bin-path" => "/home/[*username*]/var/lighttpd/public/dispatch.fcgi",
-# "min-procs" => 1,
-# "max-procs" => 2,
-# "idle-timeout" => 60
-# )
-# )
-# )
-}
-#% change uid to <uid> (default: don't care)
-server.username = "[*username*]"
-#% change uid to <uid> (default: don't care)
-server.groupname = "[*username*]"
-#%## compress module
-compress.cache-dir = "/home/[*username*]/var/lighttpd/cache/compress/"
-compress.filetype = ("text/plain", "text/html")
diff --git a/data/sisu/v4/conf/ruby/irbrc b/data/sisu/v4/conf/ruby/irbrc
deleted file mode 100644
index cceffdfc..00000000
--- a/data/sisu/v4/conf/ruby/irbrc
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'irb/completion'
-IRB.conf[:use_readline] = true
-IRB.conf[:PROMPT_MODE] = :XMP
-#IRB.conf[:PROMPT] =
-#simple-prompt
-def ri arg
- puts `ri #{arg}`
-end
-def ri(*names)
- system(%{ri #{names.map {|name| name.to_s}.join(" ")}})
-end
-#require 'rdoc/ri/ri_driver'
-#def ri(*names)
-# oargv = Object.const_get(:ARGV)
-# Object.const_set(:ARGV, names)
-# RiDriver.new.process_args
-# Object.const_set(:ARGV, oargv)
-#end
-
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
new file mode 100644
index 00000000..5af4fba5
--- /dev/null
+++ b/data/sisu/v5/v/version.yml
@@ -0,0 +1,5 @@
+---
+:version: 5.0.0
+:date_stamp: 2013w18/3
+:date: "2013-05-08"
+:project: SiSU
diff --git a/lib/sisu/v3/defaults.rb b/lib/sisu/v3/defaults.rb
deleted file mode 100644
index 416534d1..00000000
--- a/lib/sisu/v3/defaults.rb
+++ /dev/null
@@ -1,2196 +0,0 @@
-# encoding: utf-8
-=begin
-
- * Name: SiSU
-
- * Description: a framework for document structuring, publishing and search
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
-
- * License: GPL 3 or later:
-
- SiSU, a framework for document structuring, publishing and search
-
- Copyright (C) Ralph Amissah
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
-
- If you have Internet connection, the latest version of the GPL should be
- available at these locations:
- <http://www.fsf.org/licensing/licenses/gpl.html>
- <http://www.gnu.org/licenses/gpl.html>
-
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
-
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
-
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
-
- * Download:
- <http://www.sisudoc.org/sisu/en/SiSU/download.html>
-
- * Git
- <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/defaults.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Default values (reset by skins)
-
-=end
-$latex_run=nil
-module SiSU_Viz
- require 'uri'
- require_relative 'sysenv' # sysenv.rb
- include SiSU_Env
- require_relative 'css' # css.rb
- include SiSU_Style
- class Skin
- def initialize
- @fonts='verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman' # 'verdana, arial, georgia, tahoma, sans-serif, helvetica, "times new roman", times, roman'
- @dir=SiSU_Env::InfoEnv.new
- @date=SiSU_Env::InfoDate.new #{@date.year}
- @v=SiSU_Env::InfoVersion.instance.get_version
- end
- #% glyph
- def glyph_bullet # &bullet;
- '&#149;&nbsp;' # [&#149; flagged]
- end
- #% html
- def html_hardspace
- '&nbsp;'
- end
- def semantic_tags
- def default
- {
- pub: 'publication',
- conv: 'convention',
- vol: 'volume',
- pg: 'page',
- cty: 'city',
- org: 'organization',
- uni: 'university',
- dept: 'department',
- fac: 'faculty',
- inst: 'institute',
- co: 'company',
- com: 'company',
- conv: 'convention',
- dt: 'date',
- y: 'year',
- m: 'month',
- d: 'day',
- ti: 'title',
- au: 'author',
- ed: 'editor', #editor?
- v: 'version', #edition
- n: 'name',
- fn: 'firstname',
- mn: 'middlename',
- ln: 'lastname',
- in: 'initials',
- qt: 'quote',
- ct: 'cite',
- ref: 'reference',
- ab: 'abreviation',
- def: 'define',
- desc: 'description',
- trans: 'translate',
- }
- end
- self
- end
- #% decorate
- def decorate_italics
- 'title|article|book|journal'
- end
- def decorate_bold
- end
- def decorate_uppercase
- 'surname'
- end
- #% semantic
- def sem_title #dc 1
- 'title'
- end
- def sem_article
- 'article'
- end
- def sem_book
- 'book'
- end
- def sem_journal
- 'journal'
- end
- def sem_fullname # (contains: firstname, surname) #issues arise as contains surname etc.
- 'fullname'
- end
- def sem_first
- 'first'
- end
- def sem_surname
- 'surname'
- end
- def sem_middle
- 'middle'
- end
- def sem_creator #dc 2 #==fullname (contains: firstname, surname)
- 'creator'
- end
- def sem_author #==fullname (contains: firstname, surname)
- 'author'
- end
- def sem_editor #==fullname (contains: firstname, surname)
- 'editor'
- end
- def sem_illustrator #==fullname (contains: firstname, surname)
- 'illustrator'
- end
- def sem_translator #==fullname (contains: firstname, surname)
- 'translator'
- end
- def sem_isbn # 10 or 13
- 'isbn'
- end
- def sem_isbn_10
- 'isbn10'
- end
- def sem_isbn_13
- 'isbn13'
- end
- def sem_loc # library of congress
- 'loc'
- end
- def sem_dewey
- 'dewey'
- end
- def sem_pg # project gutenberg number
- 'pg'
- end
- def sem_subject #dc 3
- 'subject'
- end
- def sem_date #dc 7
- 'date'
- end
- def sem_date_created
- 'date_created'
- end
- def sem_date_issued
- 'date_issued'
- end
- def sem_date_available
- 'date_available'
- end
- def sem_date_valid
- 'date_valid'
- end
- def sem_date_modified
- 'date_modified'
- end
- def sem_type #dc 8
- 'type'
- end
- def sem_description #dc 4
- 'description'
- end
- def sem_publisher #dc 5
- 'publisher'
- end
- def sem_contributor #dc 6
- 'contributor'
- end
- def sem_format #dc 9
- 'format'
- end
- def sem_identifier #dc 10
- 'identifier'
- end
- def sem_source #dc 11
- 'source'
- end
- def sem_language #dc 12
- 'language'
- end
- def sem_relation #dc 13
- 'source'
- end
- def sem_coverage #dc 14
- 'coverage'
- end
- def sem_rights #dc 15
- 'rights'
- end
- def sem_copyright
- 'copyright'
- end
- def sem_license
- 'license'
- end
- def sem_prepared_by
- 'prepared_by'
- end
- def sem_digitized_by
- 'digitized_by'
- end
- def sem_keywords
- 'keywords'
- end
- def sem_comments
- 'comments'
- end
- def sem_abstract
- 'abstract'
- end
- #% path
- def path_stylesheet_home
- %{ <link rel="stylesheet" href="./#{@dir.path.style}/homepage.css" type="text/css" />}
- end
- #% text #changed from txt to avoid naming conflicts #FOLLOW
- def txt_generator
- %{ <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
- <link rel="generator" href="http://www.sisudoc.org/" />}
- end
- def txt_generator_comment
- %{ <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/ ->}
- end
- def txt_hp
- '&nbsp;SiSU'
- end
- def txt_hp_alias
- 'SiSU'
- end
- def txt_home
- 'SiSU'
- end
- def txt_signature # used in latex/pdf footer
- 'SiSU'
- end
- #% url
- def url_urify(uri)
- URI.parse(uri)
- end
- def url_sisu
- 'http://www.sisudoc.org/'
- end
- def url_sisudoc
- 'http://www.sisudoc.org'
- end
- def url_footer_signature
- 'http://www.sisudoc.org/'
- end
- def url_root
- '/sisu' #watch
- end
- def url_root_http
- 'http://www.sisudoc.org/' #watch
- end
- def url_home
- 'http://www.sisudoc.org/' # used in pdf header
- end
- def url_site #used as stub... where there are subdirectories and is different from home
- url_home
- #'http://www.sisudoc.org/' # used in pdf header
- end
- def url_txt
- 'www.sisudoc.org/'
- end
- def url_path_image_base #used for html image display
- "#{Xx[:html_relative2]}_sisu/image"
- end
- def url_path_image #used for html image display
- "#{Xx[:html_relative2]}_sisu/image"
- end
- def url_path_image_sys #used for html image display
- "#{Xx[:html_relative2]}_sisu/image_sys"
- end
- def url_path_image_epub
- './image'
- end
- def url_path_ebook_dir
- './ebook'
- end
- def url_path_ebook_images
- '.'
- end
- def url_promo
- ''
- end
- def url_promo_home
- ''
- end
- def url_decoration
- def tex_open #'{\UseTextSymbol{OML}{<}}'
- Dx[:url_o]
- end
- def tex_close #'{\UseTextSymbol{OML}{>}}'
- Dx[:url_c]
- end
- def xml_open #'&lt;'
- Dx[:url_o]
- end
- def xml_close #'&gt;'
- Dx[:url_c]
- end
- def txt_open
- '<'
- end
- def txt_close
- '>'
- end
- self
- end
- def rel_decoration
- def tex_open #'{\UseTextSymbol{OML}{<}}'
- Dx[:rel_o]
- end
- def tex_close #'{\UseTextSymbol{OML}{>}}'
- Dx[:rel_c]
- end
- def xml_open #'&lt;'
- Dx[:rel_o]
- end
- def xml_close #'&gt;'
- Dx[:rel_c]
- end
- def txt_open
- '<'
- end
- def txt_close
- '>'
- end
- self
- end
- #% color
- def color_shadow
- '"4"'
- end
- def color_body
- %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
- end
- def color_white
- '"#ffffff"'
- end
- def color_black
- '#000000'
- end
- def color_shadow #hmmm
- '"4"'
- end
- def color_blue_dark
- '#000099'
- end
- def color_blue
- 'blue'
- end
- def color_blue_base
- '#b9d4dd'
- end
- def color_blue_ink
- '#003399'
- end
- def color_blue_tinge
- '#e3ecef'
- end
- def color_blue_grey
- '#8faebf'
- end
- def color_blue_murky
- '#437389'
- end
- def color_beige
- '#f1e8de'
- end
- def color_subtleglow
- '#dddccc'
- end
- def color_glow
- '#fff0c3'
- end
- def color_rose
- '#ffdec9'
- end
- def color_turquoise
- '#1c869b'
- end
- def color_grey_pale
- '#eeeeee'
- end
- def color_grey_medium
- '#cccccc'
- end
- def color_grey
- '#999999'
- end
- def color_yellow_light
- '#fff3b6'
- end
- def color_yellow
- '#ffde14'
- end
- def color_yellow_dark
- '#ffcc00'
- end
- def color_green_light
- '#b7d398' # #e2efd5 #b7d398 #b1c999 # '#aed19e'
- end
- def color_green
- '#0a8400'
- end
- def color_green_dark
- '#086800'
- end
- def color_ruby
- '#a00000'
- end
- def color_maroon
- '#800000'
- end
- def color_paper
- %{"#{color_white}"}
- end
- def color_band1
- %{"#{color_white}"}
- end
- def color_band2
- %{"#{color_white}"}
- end
- def color_body
- %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
- end
- def color_font_face #was font WATCH
- "#{color_black}"
- end
- def color_surround
- %{"#{color_white}"}
- end
- def color_band
- %{"#{color_white}"}
- end
- def color_table1
- 'ffffcc'
- end
- def color_table2
- 'c0d0f0'
- end
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% icon
- def icon_ico
- 'rb7.ico'
- end
- def icon_sisu
- 'sisu.png'
- end
- def icon_manifest
- 'b_info.png'
- end
- def icon_doc
- 'b_doc.png'
- end
- def icon_toc
- 'b_toc.png'
- end
- def icon_wmp
- 'b_wmp.png'
- end
- def icon_odf
- 'b_odf.png'
- end
- def icon_epub
- 'b_epub.png'
- end
- def icon_pdf
- 'b_pdf.png'
- end
- def icon_pdf_portrait
- 'b_pdf.png'
- end
- def icon_pdf_landscape
- 'b_pdf.png'
- end
- def icon_status
- 'b_status.png'
- end
- def icon_external
- 'b_ext.png'
- end
- def icon_external_toc
- 'b_ext_toc.png'
- end
- def icon_seg_toc
- 'b_bluebell.png'
- end
- def icon_crosslink_toc
- 'b_amber.png'
- end
- def icon_mail
- 'b_mail.png'
- end
- def icon_para
- 'b_para.png'
- end
- def icon_pdf
- 'b_pdf.png'
- end
- def icon_ftp
- 'b_ftp.png'
- end
- def icon_gopher
- 'b_gopher.png'
- end
- def icon_choice
- 'b_choice.png'
- end
- def icon_new
- 'b_new.png'
- end
- def icon_book
- 'b_amber.png'
- # b_book.png
- end
- def icon_dot_clear
- 'dot_clear.png'
- end
- def icon_dot_white
- 'dot_white.png'
- end
- def icon_dot
- icon_dot_white
- end
- def icon_amber
- 'b_amber.png'
- end
- def icon_rose
- 'b_rose.png'
- end
- def icon_bluebell
- 'b_bluebell.png'
- end
- def icon_home_button
- 'sisu.png'
- end
- def icon_home_banner
- 'sisu.png'
- end
- def icon_site
- 'b_home.png'
- end
- def icon_bluedot
- 'blueband.png'
- end
- def icon_next
- 'arrow_next_red.png'
- end
- def icon_previous
- 'arrow_prev_red.png'
- end
- def icon_up
- 'arrow_up_red.png'
- end
- #% font
- def font_fonts
- @fonts
- end
- def font_face
- %{face="#{font_fonts}"}
- end
- def font_lmtoc_face
- %{face="#{font_fonts}"}
- end
- def font_ebook_face
- %{face="#{font_fonts}"}
- end
- def font_face_lmtoc
- %{face="#{font_fonts}"}
- end
- def font_color
- 'color="#000000"'
- end
- def font_size
- 'size="4"'
- end
- def font_size_txt
- 'size="4"'
- end
- def font_size_txt_00
- 'size="3"'
- end
- def font_size_endnote
- 'size="3"'
- end
- def font_small
- 'size="3"'
- end
- def font_tiny
- 'size="2"'
- end
- #% markup
- def markup_italics_list #regular expression of words to be italised
- end
- def markup_bold_list #regular expression of words to be made bold
- 'SiSU'
- end
- def markup_make_italic
- if defined? italics_list \
- and italics_list
- make={}
- if italics_list
- r=italics_list.dup
- x=case r
- when /\/i$/; 'i'
- else ''
- end
- r=r.gsub(/^\/(.+?)\/i?/,'\1').
- gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
- m='\b(' + r + ')\b'
- make[:str]
- make[:regx]=(x =~/i/) \
- ? (/#{m}/i)
- : (/#{m}/)
- else nil
- end
- end
- end
- def markup_make_bold
- if defined? bold_list \
- and not bold_list.empty?
- make={}
- if bold_list
- r=bold_list.dup
- x=case r
- when /\/i$/; 'i'
- else ''
- end
- r.gsub(/^\/(.+?)\/i?/,'\1').
- gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
- m='\b(' + r + ')\b'
- make[:str]
- make[:regx]=(x =~/i/) \
- ? (/#{m}/i)
- : (/#{m}/)
- else nil
- end
- make
- end
- end
- #% paragraph
- def paragraph_txt
- %{<p class="normal">}
- end
- def paragraph_txt_00
- %{<p class="justify">}
- end
- def paragraph_font_citation
- %{<font #{font_size_txt} #{font_face}>}
- end
- def paragraph_endnote
- %{<p class="endnote">}
- end
- def paragraph_table
- %{<p align="left"><font #{font_small} #{font_color} #{font_face}>}
- end
- def paragraph_tiny
- %{<p class="tiny">}
- end
- def paragraph_small
- %{<p class="small">} # keep but not used?
- end
- def paragraph_font_tiny
- %{<font #{font_tiny} #{font_face}>}
- end
- def paragraph_font_small
- %{<font #{font_small} #{font_face}>}
- end
- def paragraph_heading_1
- %{<h1>}
- end
- def paragraph_heading_1_center
- %{<h1 class="center">}
- end
- #% table
- def table_close
- '</td></tr>
-</table>'
- end
- def table_close_centered_table
- end
- def table_align_A
- end
- def table_align_B
- end
- def table_align_C
- end
- def table_width_1
- '"100%"'
- end
- def table_width_2
- '"99%"'
- end
- def table_width_3
- '"94%"'
- end
- def table_width_4
- '"90%"'
- end
- def table_width_txt
- '"94%"'
- end
- def table_width_txt_avgo
- '"100%"'
- end
- def table_width_txt_r
- '"96%"'
- end
- def table_cellpad_small_paper_margins
- '"6"'
- end
- def table_cellpad_paper_margins
- '"36"'
- end
- def table_cellpad_A
- '"0"'
- end
- def table_cellpad_B
- '"20"'
- end
- def table_cellpad_shadow
- '"4"'
- end
- def table_cellpad_band
- '"16"'
- end
- def table_cellpad_box
- '"20"'
- end
- def table_table_align_A
- '<center>'
- end
- def table_table_align_B
- '<center>'
- end
- def table_table_align_C
- ' '
- end
- #% table_do
- def table_do_table_paper
- %{#{table_align_C} <table summary="table paper" width=#{table_width_2} border="0" cellpadding=#{table_cellpad_paper_margins} bgcolor=#{color_paper} align="Justify"><tr><td>\n<font color="#000000"><p />\n}
- end
- def table_do_table_surround
- %{<table summary="table surround" width="100%" border="0" cellpadding="0" bgcolor="#ffffff" align="center"><tr><td>\n}
- end
- #% indent
- def indent_level_0
- '"1%"'
- end
- def indent_level_1
- '"4%"'
- end
- def indent_level_2
- '"6%"'
- end
- def indent_level_3
- '"8%"'
- end
- def indent_level_4
- '"10%"'
- end
- #% margin
- def margin_num
- '</p> </td><td width="4%" align="right" valign="top">'
- end
- def margin_numless
- '</td><td width="4%" align="right" valign="top">'
- end
- def margin_num_css
- '</td>
-<td width="2%" align="right" valign="top"> '
- end
- def margin_num_header
- '</td>
-<td width="4%" align="right" valign="top">'
- end
- def margin_txt_00_1
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width=#{indent_level_1} align="right">
-</td>
-<td valign="top" align="left" width=#{indent_level_1_c2w100}>}
- end
- def margin_txt_w1
- %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width="6%" align="right">&nbsp;</td>
-<td width="90%" valign="top" align="justify">}
- end
- def margin_txt_w2
- %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width="10%" align="right">&nbsp;</td>
-<td width="86%" valign="top" align="justify">}
- end
- def margin_txt_0
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width=#{indent_level_0} align="right">
-</td><td valign="top" align="justify">}
- end
- def margin_txt_1
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width=#{indent_level_1} align="right"></td><td valign="top" align="justify">}
- end
- def margin_txt_2
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width=#{indent_level_2} align="right">
-</td>
-<td valign="top" align="justify">}
- end
- def margin_txt_3
- %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td width=#{indent_level_3} align="right">
-</td>
-<td valign="top" align="justify">}
- end
- def margin_css #unused, check
- '<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
-<tr><td valign="top" align="justify"> '
- end
- #% png
- def png_ico
- %{ <link rel="shortcut icon" href="../_sisu/image/#{icon_ico}" />}
- end
- def png_sisu #check url path
- %{ <a href="#{@url.sisu}">
- <img border="0" width="160" height="60" src="#{url_path_image}/#{icon_sisu}" alt="SiSU" />
- </a>}
- end
- def png_hp
- dir=SiSU_Env::InfoEnv.new #(@fns)
- %{ <a href="#{url.site}">
- <img border="0" width="160" height="60" src="#{@dir.url.images_local}/#{icon_home_banner}" alt="#{txt_home}" />
- </a>}
- end
- def png_site
- %{<img src="#{url_path_image}/#{icon_site}" alt="@" border="0" />}
- end
- def png_homepage
- png_site
- end
- def png_nav
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_bluebell}" alt="Contents" />}
- end
- def png_manifest
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_manifest}" alt="Document Manifest" />}
- end
- def png_doc
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_doc}" alt="Full Text" />}
- end
- def png_toc
- %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_toc}" alt="TOC linked" />}
- end
- def png_odf
- %{<img border="0" height="18" width="18" src="#{url_path_image_sys}/#{icon_odf}" alt="ODF/ODT" />}
- end
- def png_epub
- %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_epub}" alt="EPUB" />}
- end
- def png_pdf
- %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF" />}
- end
- def png_pdf_portrait
- %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF portrait" />}
- end
- def png_pdf_landscape
- %{<img border="0" height="15" width="18" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF landscape" />}
- end
- def png_wmp
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_wmp}" alt="Concordance" />}
- end
- def png_para
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_para}" alt="Segment" />}
- end
- def png_status
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_status}" alt="Membership status" />}
- end
- def png_mark
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_rose}" alt="*" />}
- end
- def png_doc_tiny
- %{<img border="0" height="8" width="8" src="#{url_path_image_sys}/#{icon_doc}" alt="Doc" />}
- end
- def png_toc_tiny
- %{<img border="0" height="8" width="8" src="#{url_path_image_sys}/#{icon_toc}" alt="TOC" />}
- end
- def png_status_tiny
- %{<img border="0" height="8" width="8" src="#{url_path_image_sys}/#{icon_status}" alt="Status, Member States" />}
- end
- def png_ftp
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_ftp}" alt="FTP" />}
- end
- def png_gopher
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_gopher}" alt="Gopher" />}
- end
- def png_crosslink
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_crosslink_toc}" alt="lateral hop" />}
- end
- def png_crosslink_ext
- %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_external_toc}" alt="lateral hop" />}
- end
- def png_home
- #dir=SiSU_Env::InfoEnv.new #(@fns)
- %{<img border="0" src="#{url_path_image_base}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
- #%{<img border="0" src="#{dir.url.images_local}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
- end
- def png_home_button
- rel=@dir.path_rel_links.html_scroll_2
- %{<img border="0" src="#{rel}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
- end
- def png_book
- %{<img border="2" height="15" width="15" src="#{url_path_image_sys}/#{icon_book}" alt="Cameron May Books" />}
- end
- #% png_nav #not currently used
- def png_nav_home
- end
- def png_nav_toc
- %{<img border="0" width="22" height="22" src="#{url_path_image_sys}/#{icon_up}" alt="TOC" />}
- end
- def png_nav_doc
- end
- def png_nav_previous
- %{<img border="0" width="22" height="22" src="#{url_path_image_sys}/#{icon_previous}" alt="&lt;&lt;&nbsp;previous" />}
- end
- def png_nav_next
- %{<img border="0" width="22" height="22" src="#{url_path_image_sys}/#{icon_next}" alt="next&nbsp;&gt;&gt;" />}
- end
- def png_nav_pre
- png_nav_previous
- end
- def png_nav_nxt
- png_nav_next
- end
- def epub_png_nav_previous
- %{<img border="0" width="22" height="22" src="#{url_path_image_epub}/#{icon_previous}" alt="&lt;&lt;&nbsp;previous" />}
- end
- def epub_png_nav_next
- %{<img border="0" width="22" height="22" src="#{url_path_image_epub}/#{icon_next}" alt="next&nbsp;&gt;&gt;" />}
- end
- def epub_png_nav_up
- %{<img border="0" width="22" height="22" src="#{url_path_image_epub}/#{icon_up}" alt="&#094;up&nbsp;&#094;" />}
- end
- def epub_png_nav_pre
- epub_png_nav_previous
- end
- def epub_png_nav_nxt
- epub_png_nav_next
- end
- def epub_png_nav_toc
- epub_png_nav_up
- end
- def png_nav_pdf
- %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF" />}
- end
- def png_nav_pdf_portrait
- %{<img border="0" width="15" height="18" src="#{url_path_image_sys}/#{icon_pdf}" alt="pdf portrait" />}
- end
- def png_nav_pdf_landscape
- %{<img border="0" width="18" height="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="pdf landscape" />}
- end
- def png_nav_dot_toc
- %{<img border="0" width="100%" height="20" src="#{url_path_image_sys}/#{icon_dot}" alt="&#094;" />}
- end
- def png_nav_dot_previous
- %{<img border="0" width="100%" height="20" src="#{url_path_image_sys}/#{icon_dot}" alt="&lt;" />}
- end
- def png_nav_dot_next
- %{<img border="0" width="100%" height="20" src="#{url_path_image_sys}/#{icon_dot}" alt="&gt;" />}
- end
- def png_nav_dot_pre
- png_nav_dot_previous
- end
- def png_nav_dot_nxt
- png_nav_dot_next
- end
- #% nav_txt
- def nav_txt_home
- %{ <font face="#{font_fonts}" size="2">
- #{png_site}&nbsp;
- </font> }
- end
- def nav_txt_home_button
- %{ <font face="#{font_fonts}" size="2">
- #{png_home_button}&nbsp;
- </font> }
- end
- def nav_txt_homepage
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;home&nbsp;
- </font> }
- end
- def nav_txt_toc_link
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;&nbsp;toc&nbsp;
- </font> }
- end
- def nav_txt_toc_link_verbose
- %{ <font face="#{font_fonts}" size="2">
- #{png_toc}&nbsp;&nbsp;segments'&nbsp;toc&nbsp;
- </font> }
- end
- def nav_txt_doc_link
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;scroll&nbsp;
- </font> }
- end
- def nav_txt_manifest
- #{png_manifest}&nbsp;document&nbsp;manifest
- %{ <font face="#{font_fonts}" size="2">
- [&nbsp;document&nbsp;manifest&nbsp;]
- </font> }
- end
- def nav_txt_concordance
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;&nbsp;A-Z&nbsp;
- </font> }
- end
- def nav_txt_previous
- ' <font face="" size="2">
- &nbsp;&nbsp;<b>&lt;&lt;</b>&nbsp;Previous&nbsp;&nbsp;
- </font>
- Full&nbsp;Text&nbsp;'
- end
- def nav_txt_next
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>&gt;&gt;</b>&nbsp;&nbsp;
- </font> }
- end
- def nav_txt_plaintext
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;&nbsp;txt&nbsp;
- </font> }
- end
- def nav_txt_odf
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;&nbsp;odt&nbsp;
- </font> }
- end
- def nav_txt_pdfs
- %{ <font face="#{font_fonts}" size="2">
- pdfs&nbsp;&nbsp;
- </font> }
- end
- def nav_txt_epub
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;epub&nbsp;
- </font> }
- end
- def nav_txt_pdf_portrait
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;pdf&nbsp;
- </font> }
- end
- def nav_txt_pdf_landscape
- %{ <font face="#{font_fonts}" size="2">
- &nbsp;pdf&nbsp;
- </font> }
- end
- #% banner
- def banner_home
- %{ <center>
- <a href="#{url_site}/" target="_top">
- #{png_site}
- </a>
- <br />
- <font size="2" color="#444444">
- an
- <br />
- (&nbsp;international&nbsp;|&nbsp;transnational&nbsp;)
- <br />
- commercial&nbsp;law&nbsp;&&nbsp;e-commerce
- <br />
- infrastructure monitor</font></center>}
- end
- def banner_home_guide
- %{ <br />
- <a href="#{url_site}/" target="_top">
- #{png_doc} LM toc
- </a>
- <a href="../treaties.and.organisations/lm.chronological" target="_top">
- #{png_doc} LM 20**
- </a>
- <br />}
- end
- def banner_home_button_only
- %{<a href="#{url_site}/">
- #{png_home_button}
- </a>}
- end
- def banner_home_button #yellow_dark now white
- %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center">
-<tr><td align="left" valign="middle" bgcolor="#{color_white}" width="10%">
- <a href="#{url_site}/">
- #{png_home_button}
- </a>
-</td>
-<td width="90%">
-#{table_close}}
- end
- def banner_home_and_index_buttons #yellow_dark now white
- %{<table summary="home and index buttons" bgcolor=#{color_band1}>
-<tr><td width="20%">
-<table summary="home button" width="100%" border="0" cellpadding="3" align="center">
-<tr><td align="center" valign="middle" bgcolor="#{color_white}">
- <a href="#{url_site}/" target="_top">
- #{png_home}
- </a>
-</td></tr>
-</table>
-</td>
-<td width="60%">
-<table summary="other contents buttons" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="center" bgcolor=#{color_band2}>
- <font face="arial" size="2">
- <a href="toc" target="_top">
- &nbsp;This&nbsp;text's&nbsp;sub-&nbsp;
- <br />
- &nbsp;Table&nbsp;of&nbsp;Contents&nbsp;
- </a>
- </font>
-</td></tr>
-</table>
-</td>
-<td width="20%">
- &nbsp;
-#{table_close}}
- end
- def banner_url_txt_sisu
- %{<a href="#{url_sisu}/sisu" target="_top">SiSU</a>}
- end
- def banner_band #yellow_dark now white
- %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center">
-<tr><td align="left" valign="middle" bgcolor="#{color_white}">
- <a href="#{url_site}/" target="_top">
- #{png_home}
- </a>
-</td>
-<td width="90%">
-#{table_close}}
- end
- def banner_credit_band
- %{<table summary="credits table yellow" width="80%" border="1" cellpadding="0" bgcolor="#{color_yellow_dark}" align="center">
-<tr><td align="center">
-<table summary="salmon" width="100%" border="0" cellpadding="0" bgcolor="#ffdec9">
-<tr><td align="center">
-<table summary="credits white background" width="100%" border="0" cellpadding="6" bgcolor="#ffffff">
-<tr><td align="center">}
- end
- def banner_instrument_cover_band_scr
- '<table summary="scroll instrument cover band" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
-<tr><td align="center">'
- end
- def banner_instrument_cover_band_seg
- '<table summary="segment instrument cover band, title, author, location" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
-<tr><td align="center">'
- end
- #% widget
- def widget_promo # Array used to build promo from list.yml and promo.yml
- # ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
- end
- def widget_browsers
-<<WOK
-<tr align="center"><td align="center">
-<table summary="browser suggestions" bgcolor="#ffffff" cellpadding="4" border="0">
-<tr><td>
- <p>
- <font color="#666666" size="2">
- If you have problems viewing pages on this site please update your browser:
- </font>
- </p>
-#{table_close}
-<table summary="browser suggestions" bgcolor="#ffffff" cellpadding="4" border="0">
-<tr><td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.gnome.org/projects/epiphany/" target="external">
- &nbsp;Epiphany
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://galeon.sourceforge.net/" target="external">
- &nbsp;Galeon
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.microsoft.com/windows/ie/default.asp" target="external">
- I-Explorer
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://kazehakase.sourceforge.jp/" target="external">
- Kazehakase</a>
- <sup>&reg;</sup>&nbsp;|</font></p></td>
-<td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.konqueror.org/" target="external">
- Konqueror</a>
- <sup>&reg;</sup>&nbsp;|</font></p></td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.mozilla.org/" target="external">
- Mozilla
- </a>
- <a href="http://www.mozilla.org/products/firefox/" target="external">
- <b>Firefox</b>
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://home.netscape.com/comprod/mirror/client_download.html" target="external">
- Netscape
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.opera.com/" target="external">
- Opera
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.apple.com/safari/" target="external">
- Safari
- </a>
- <sup>&reg;</sup>
- </font>
- </p>
-#{table_close}
-<table summary="lightweight browser and text browser suggestions" bgcolor="#ffffff" cellpadding="4" border="0">
-<tr><td>
- <p>
- <font color="#666666" size="1">
- for console/text viewing:
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://elinks.or.cz/" target="external">
- <b>elinks</b>
- </a>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links" target="external">
- <b>links2</b>
- </a>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://w3m.sourceforge.net/" target="external">
- <b>w3m</b>
- </a>
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- for lightweight gui (X) viewing try:
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.dillo.org/" target="external">
- Dillo
- </a>
- &nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://www.gnome.org/projects/epiphany/" target="external">
- &nbsp;Epiphany
- </a>
- <sup>&reg;</sup>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://galeon.sourceforge.net/" target="external">
- &nbsp;Galeon
- </a>&nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p>
- <font color="#666666" size="1">
- <a href="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links" target="external">
- <b>links2 -g</b>
- </a>
- </font>
- </p>
-#{table_close}
-</td></tr>
-WOK
- end
- def widgets_open
-<<WOK
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
-WOK
- end
- def widget_pdfviewers
-<<WOK
-<tr align="center"><td align="center">
-<!-- pdf viewer suggestions -->
-<tr><td>
- <p class="center">
- <font color="#666666" size="1">
- &amp; for
- <a href="http://www.adobe.com/products/acrobat/adobepdf.html" target="external">
- pdf
- </a>
- viewings of this site we recommend stand alone viewers
- <br />
- (rather than web browser plugins):
- </font>
- </p>
-</td></tr>
-<tr align="center"><td align="center">
- <p class="center">
- <font color="#666666" size="1">
- <a href="http://www.adobe.com/products/acrobat/readstep2.html" target="external">
- Acrobat Reader
- </a>
- <sup>&reg;</sup>
- &nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p class="center">
- <font color="#666666" size="1">
- <a href="http://www.gnome.org/projects/evince/" target="external">
- <b>Evince</b>
- </a>
- <sup>&reg;</sup>
- </font>
- </p>
-</td>
-<td>
- <p class="center"><font color="#666666" size="1">
- <a href="http://www.cs.wisc.edu/~ghost/gv/" target="external">
- &nbsp;GhostView<sup>&reg;</sup>&nbsp;</a>,
- <a href="http://wwwthep.physik.uni-mainz.de/~plass/gv/" target="external">
- GV<sup>&reg;</sup>
- </a>
- &amp;
- <a href="http://www.cs.wisc.edu/~ghost/gsview/" target="external">
- GSview<sup>&reg;</sup>
- </a>
- &nbsp;|
- </font>
- </p>
-</td>
-<td>
- <p class="center">
- <font color="#666666" size="1">
- <a href="http://www.foolabs.com/xpdf/" target="external">
- &nbsp;Xpdf
- </a>
- <sup>&reg;</sup>
- </font>
- </p>
-</td></tr>
-WOK
- end
- def widget_sisu_text
-<<WOK
- <p class="tiny"><font color="#666666" size="2">
- Output generated by
- <a href="#{url_sisu}">
- #{@v[:project]}
- </a>
- #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
- </font></p>
-WOK
- end
- def widget_sisu
-<<WOK
-<!-- widget sisu -->
-<tr><td valign="top" width="100%">
-<!-- SiSU Rights -->
-#{widget_sisu_text}
-</td></tr>
-WOK
- end
- def widget_sisu_verbose
-<<WOK
-<!-- widget sisu -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="#{url_sisu}">
- <img border="0" src="../_sisu/image/sisu.png" alt="SiSU" width="120" height="39" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
-<!-- SiSU Rights -->
- <p class="tiny_left"><font color="#666666" size="2">
- Output generated by
- <a href="#{url_sisu}">
- #{@v[:project]}
- </a>
- #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
- <br />
- <a href="#{url_sisu}">
- <b>#{@v[:project]}</b>
- </a>
- Copyright <sup>&copy;</sup> Ralph Amissah
- 1997, current #{@date.year_static}.
- All Rights Reserved.
- <br />
- <a href="#{url_sisu}">
- #{@v[:project]}
- </a>
- is software for document structuring, publishing and search,
- <br />
- <a href="#{url_sisu}">
- www.sisudoc.org/
- </a>
- and
- <a href="#{url_sisudoc}">
- www.sisudoc.org
- </a>
- <br />
- <i>w3 since October 3 1993</i>
- <a href="mailto:ralph@amissah.com">
- ralph@amissah.com
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- #{@v[:project]} using:
- <br />Standard SiSU markup syntax,
- <br />Standard SiSU meta-markup syntax, and the
- <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
- <br />
- Copyright <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year_static}.
- All Rights Reserved.
- </font></p>
-</td></tr>
-WOK
- end
- def widget_way_better
- <<WOK
-<!-- widget way better -->
-<tr><td valign="top" width="10%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="http://www.gnu.org/licenses/gpl.html">
- <img border="0" src="../_sisu/image/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
- </a>
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- <a href="#{url_sisu}">
- #{@v[:project]}
- </a>
- is released under
- <a href="http://www.gnu.org/licenses/gpl.html">GPLv3</a>
- or later,
- #{url_decoration.xml_open}<a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>#{url_decoration.xml_close}
- </font></p>
-</td><td valign="top" width="45%">
- <p class="tiny_left"><font color="#666666" size="2">
- #{@v[:project]}, developed using
- <a href="http://www.ruby-lang.org/en/">
- Ruby
- </a>
- on
- <a href="http://www.debian.org/">
- Debian/Gnu/Linux
- </a>
- software infrastructure,
- with the usual GPL (or OSS) suspects.
- <br />
- Better - "performance, reliability, scalability, security &amp; total cost of ownership"
- [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libré.
- <br />
- Get With the Future
- <a href="http://www.sisudoc.org/">
- Way Better!
- </a>
- </font></p>
-</td></tr>
-WOK
- end
- #% credits
- def credits_itl_cover_band
- %{<table summary="itl cover band" width="88%" border="0" cellpadding="0" bgcolor="blue">
-<tr><td>
-<table summary="" width="100%" border="0" cellpadding="8" bgcolor="#000099">
-<tr><td>
-<table summary="" width="99%" border="1" cellpadding="0" bgcolor="#ffcc00">
-<tr><td>
-<table summary="" width="100%" border="1" cellpadding="0" bgcolor="#ffffff">
-<tr><td align="center">
- <font #{font_face}>
- <br />
- \@
- <br />
- #{txt_home}
- <br />
- #{banner_url_txt_sisu}
- <br />
- </font>
-#{table_close*4}}
- end
- def credits_sisu_manifest
- widget_sisu_text
- end
- def credits_sisu
- x=%{<div class="substance">
-<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
-<tr><td>
- #{widget_sisu}
- #{widget_way_better}
-</table></div>}
- ''
- end
- def credits_splash
- end
- def credits_sisu_epub
- x=%{<div class="substance">
-<p class="center"><a href="http://www.openebook.org"><b>EPUB</b></a> generated by <a href="http://www.sisudoc.org"><b>#{@v[:project]}</b></a> v#{@v[:version]}, GPL3</p>
-</div>}
- ''
- end
- #% bottom
- def bottom_surround
- %{</td>
-<td align="center" valign="bottom">#{table_close}<table summary="" border="0" width="100%" valign="top">
-<tr><td valign="top" width="20%"><table summary="" width="100%" border="0" cellpadding="0" bgcolor="#e3ecef" align="center">
-<tr><td valign="top">
-#{table_close}
-</td>
-<td align="center" valign="top">
- #{banner_band}
-#{table_close}
-<table summary="" border="0" width="100%" valign="top">
-<tr><td valign="top" width="20%">
-<table summary="" width="100%" border="0" cellpadding="0" bgcolor="#e3ecef" align="center">
-<tr><td valign="top">
- #{table_close}
-</td>
-<td align="center" valign="top">
- #{credits_splash}
-#{table_close}
-</body>
-</html>}
- end
- end
- class Home < Skin
- def initialize
- @v=SiSU_Env::InfoVersion.instance.get_version
- @dir=SiSU_Env::InfoEnv.new
- @date=SiSU_Env::InfoDate.new #{@date.year}
- end
- def redirect
- <<WOK
-<html><head>
-<title>SiSU</title>
-<meta http-equiv="refresh" content="0, url=http://www.sisudoc.org/sisu/SiSU/">
-</head>
-<body>
-SiSU informtion provided at <a href="http://www.sisudoc.org/sisu/SiSU/">www.sisudoc.org/sisu/SiSU</a><p />
-If your browser supports redirection, you will be escorted there shortly.
-</body>
-</html>
-WOK
- end
- def homepage
- <<WOK
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<title>SiSU information Structuring Universe - Structured
-information, Serialized Units - software for electronic texts,
-documents, books, digital libraries in plaintext, html, XHTML, XML,
-ODF (OpenDocument), EPUB, LaTeX, PDF, SQL (PostgreSQL and SQLite), and
-for search</title>
-<meta name="dc.title"
- content="SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
-<meta name="dc.creator" content="Ralph Amissah" />
-<meta name="dc.subject" content=
-"document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, EPUB, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
-<meta name="dc.publisher" content=
-"SiSU http://www.sisudoc.org/" />
-<meta name="dc.language" content="en" />
-<meta name="dc.rights" content="Copyright Ralph Amissah" />
-<meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
-<link rel="generator" href="http://www.sisudoc.org/sisu/SiSU" />
-<link rel="stylesheet" href="./#{@dir.path.style}/html.css" type="text/css" />
-<link rel="shortcut icon" href="./_sisu/image/rb7.ico" />
-</head>
-<body>
-<div id="top_band">
-<p class="top_band_image">
- <a href="http://www.sisudoc.org/sisu/SiSU" target="_top">
- <img border="0" src="./_sisu/image/sisu.png" alt="SiSU &gt;&gt;">
- </a>
-</p>
-<h1 class="top_band">
- SiSU information Structuring Universe
-</h1>
-<h2 class="top_band_tiny">
- Structured information, Serialized Units
- &nbsp;&nbsp;
- <a href="http://www.sisudoc.org" target="_top">
- &lt;www.sisudoc.org&gt;
- </a>
- &nbsp;&nbsp;or&nbsp;&nbsp;
- <a href="http://www.jus.uio.no/sisu/" target="_top">
- &lt;www.jus.uio.no/sisu/&gt;
- </a>
-</h2>
-<h2 class="top_band_tiny">
-software for electronic texts, document collections, books, digital libraries, and search,
-</h2>
-<h2 class="top_band_tiny">
- with "atomic search" and text positioning system (shared text citation numbering: "<i>ocn</i>")
-</h2>
-<h2 class="top_band_tiny">
-outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, PDF, SQL (PostgreSQL and SQLite)
-</h2>
-</div>
-<div id="top_band_search">
-</div>
-<div id="column_left">
-<p class="bold">
- <a href="http://www.sisudoc.org/sisu/SiSU" target="_top">
- SiSU
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/sisu_manual/" target="_top">
- SiSU Manual
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/1.html#summary" target="_top">
- What does SiSU do? Summary
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/examples.html" target="_top">
- Book Samples and Markup Examples
- </a>
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/sisu_site_metadata/harvest_authors.html" target="_top">
- sorted by Author (sisu metadata)
- </a>
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/sisu_site_metadata/harvest_topics.html" target="_top">
- sorted by Topic (sisu metadata)
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/1.html#ocn" target="_top">
- Object Citation Numbering - <i>ocn</i>
- </a>
-</p>
-<p class="tiny">(a text positioning system)</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/1.html#search" target="_top">
- Search - "<i>granular</i>"
- </a>
-</p>
-<p class="tiny">
- Of interest is the ease of streaming documents to a relational database, at an object (roughly paragraph) level and the potential for increased precision in the presentation of matches that results thereby. The ability to serialise html, LaTeX, XML, SQL, (whatever) is also inherent in / incidental to the design. For a description see the
- <a href="http://www.sisudoc.org/sisu/sisu_provisional_patent_application_200408" target="_top">
- abandoned U.S. provisional patent application
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://git.sisudoc.org/" target="_top">
- <b>Development, SCM - Git</b>
- </a><br />
- <a href="http://git.sisudoc.org/" target="_top">
- &lt;http://git.sisudoc.org&gt;
- </a>
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/download.html" target="_top">
- <b>Download</b> alternatives
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- <a href="http://www.sisudoc.org/sisu/SiSU/changelog.html" target="_top">
- Changelog
- </a>
-</p>
-<p class="tiny">
- ---
-</p>
-<p class="small">
- License, SiSU is licensed under
- <a href="http://www.gnu.org/licenses/gpl.html" target="_top">
- GPLv3 or later
- </a>
-</p>
-<p class="tiny">
- Gnu / Linux / Unix
-</p>
-<p class="tiny">
- Note: the placement of SiSU documents on the Net predate the release of SiSU.
-</p>
-</div>
-<div id="column_center">
-<p class="bold">
-SiSU Short Description
-</p>
-<p>
-SiSU is a comprehensive future-proofing electronic document management system. Built-in search capabilities allow you to search across multiple documents and highlight matches in an easy-to-follow format. Paragraph numbering system allows you to cite your electronic documents in a consistent manner across multiple file formats. Multiple format outputs allow you to display your documents in plain text, PDF (portrait and horizontal), OpenDocument format, HTML, or e-book reading format (EPUB). Word mapping allows you to easily create word indexes for your documents. Future-proofing flexibility allows you to quickly adapt your documents to newer output formats as needed. All these and many other features are achieved with little or no additional work on your documents - by marking up the documents with a super simplistic markup language, leaving the SiSU engine to handle the heavy-lifting processing.
-</p>
-<p>
-Potential users of SiSU include individual authors who want to publish their books or articles electronically to reach a broad audience, web publishers who want to provide multiple channels of access to their electronic documents, or any organizations which centrally manage a medium or large set of electronic documents, especially governmental organizations which may prefer to keep their documents in easily accessible yet non-proprietary formats.
-</p>
-<p>
-SiSU is an Open Source project initiated and led by Ralph Amissah <a href="mailto:ralph.amissah@gmail.com">&lt;ralph.amissah@gmail.com&gt;</a> and can be contacted via mailing list <a href="http://lists.sisudoc.org/listinfo/sisu">&lt;http://lists.sisudoc.org/listinfo/sisu&gt;</a> at <a href="mailto:sisu@lists.sisudoc.org">&lt;sisu@lists.sisudoc.org&gt;</a>. SiSU is licensed under the GNU General Public License.
-</p>
-<p class="bold">
- For less markup than the most elementary HTML you can have more.
-</p>
-<p><a href="http://www.sisudoc.org/sisu/SiSU" target="_top"><b>SiSU</b> - Structured information, Serialized Units</a> for electronic documents, is an information structuring, transforming, publishing and search framework with the following features:</p>
-<p>
-<b>(i)</b> markup syntax:
-<b>(a)</b>
-simpler than html,
-<b>(b)</b>
-mnemonic, influenced by mail/messaging/wiki markup practices,
-<b>(c)</b> human readable, and easily writable,</p>
-<p><b>(ii)</b>
-<b>(a)</b>
-minimal markup requirement,
-<b>(b)</b>
-single file marked up for multiple outputs,</p>
-<p><b>
-notes
-</b></p>
-<p class="small">
-<b>*</b>
-documents are prepared in a single UTF-8 file using a minimalistic mnemonic syntax. Typical literature, documents like "War and Peace" require almost no markup, and most of the headers are optional.
-</p>
-<p class="small">
-<b>*</b>
-markup is easily readable/parsed by the human eye, (basic markup is simpler and more sparse than the most basic html), [this may also be converted to XML representations of the same input/source document].
-</p>
-<p class="small">
-<b>*</b>
-markup defines document structure (this may be done once in a header pattern-match description, or for heading levels individually); basic text attributes (bold, italics, underscore, strike-through etc.) as required; and semantic information related to the document (header information, extended beyond the Dublin core and easily further extended as required); the headers may also contain processing instructions.
-</p>
-<p><b>(iii)</b>
-<b>(a)</b>
-multiple outputs primarily industry established and institutionally accepted open standard formats, include amongst others: plaintext (UTF-8); html; (structured) XML; ODF (Open Document text); EPUB; LaTeX; PDF (via LaTeX); SQL type databases (currently PostgreSQL and SQLite). Also produces: concordance files; document content certificates (md5 or sha256 digests of headings, paragraphs, images etc.) and html manifests (and sitemaps of content).
-
-<b>(b)
-</b>
-takes advantage of the strengths implicit in these very different output types, (e.g. PDFs produced using typesetting of LaTeX, databases populated with documents at an individual object/paragraph level, making possible granular search (and related possibilities))</p>
-<p><b>(iv)</b>
-outputs share a common numbering system (dubbed "object citation numbering" (ocn)) that is meaningful (to man and machine) across various digital outputs whether paper, screen, or database oriented, (PDF, html, XML, EPUB, sqlite, postgresql), this numbering system can be used to reference content.</p>
-<p>
-<b>(v)</b>
-SQL databases are populated at an object level (roughly headings, paragraphs, verse, tables) and become searchable with that degree of granularity, the output information provides the object/paragraph numbers which are relevant across all generated outputs; it is also possible to look at just the matching paragraphs of the documents in the database; [output indexing also work well with search indexing tools like hyperesteier].</p>
-<p>
-<b>(vi)</b>
- use of semantic meta-tags in headers permit the addition of semantic information on documents, (the available fields are easily extended)</p>
-<p>
-<b>(vii)</b>
-creates organised directory/file structure for (file-system) output, easily mapped with its clearly defined structure, with all text objects numbered, you know in advance where in each document output type, a bit of text will be found (e.g. from an SQL search, you know where to go to find the prepared html output or PDF etc.)... there is more; easy directory management and document associations, the document preparation (sub-)directory may be used to determine output (sub-)directory, the skin used, and the SQL database used,</p>
-<p>
-<b>(viii)</b>
-"Concordance file" wordmap, consisting of all the words in a document and their (text/ object) locations within the text, (and the possibility of adding vocabularies),</p>
-<p>
-<b>(ix)</b>
-document content certification and comparison considerations:
-<b>(a)</b>
-the document and each object within it stamped with an md5 hash making it possible to easily check or guarantee that the substantive content of a document is unchanged,
-<b>(b)</b>
-version control, documents integrated with time based source control system, default RCS or CVS with use of $Id$ tag, which SiSU checks
-</p>
-<p>
-<b>(x)</b>
-SiSU's minimalist markup makes for meaningful "diffing" of the substantive content of markup-files,</p>
-<p>
-<b>(xi)</b>
-easily skinnable, document appearance on a project/site wide, directory wide, or document instance level easily controlled/changed,</p>
-<p>
-<b>(xii)</b>
-in many cases a regular expression may be used (once in the document header) to define all or part of a documents structure obviating or reducing the need to provide structural markup within the document,</p>
-<p>
-<b>(xiii)</b>
-prepared files may be batch process, documents produced are static files so this needs to be done only once but may be repeated for various reasons as desired (updated content, addition of new output formats, updated technology document presentations/representations)</p>
-<p>
-<b>(xiv)</b>
-possible to pre-process, which permits: the easy creation of standard form documents, and templates/term-sheets, or; building of composite documents (master documents) from other sisu marked up documents, or marked up parts, i.e. import documents or parts of text into a main document should this be desired</p>
-<p>
-there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added.
-</p>
-<p>
-<b>(xv)</b>
-there is a considerable degree of future-proofing, output representations are "upgradeable", and new document formats may be added:
-<b>(a)</b>
-modular, (thanks in no small part to Ruby) another output format required, write another module....
-<b>(b)</b> easy to update output formats (eg html, XHTML, LaTeX/PDF produced can be updated in program and run against whole document set),
-<b>(c)</b> easy to add, modify, or have alternative syntax rules for input, should you need to,</p>
-<p>
-<b>(xvi)</b>
-scalability, dependent on your file-system (ext3, Reiserfs, XFS, whatever) and on the relational database used (currently Postgresql and SQLite), and your hardware,</p>
-<p>
-<b>(xvii)</b>
-only marked up files need be backed up, to secure the larger document set produced,</p>
-<p>
-<b>(xviii)</b>
-document management,</p>
-<p>
-<b>(xix)</b>
-Syntax highlighting for SiSU markup is available for a number of text editors.</p>
-<p><b>(xx)</b> remote operations:
-<b>(a)</b>
-run SiSU on a remote server, (having prepared sisu markup documents locally or on that server, i.e. this solution where sisu is installed on the remote server, would work whatever type of machine you chose to prepare your markup documents on),
-<b>(b)</b>
-generated document outputs may be posted by sisu to remote sites (using rsync/scp)
-<b>(c)</b>
-document source (plaintext utf-8) if shared on the net may be identified by its url and processed locally to produce the different document outputs.</p>
-<p>
-<b>(xxi)</b>
-document source may be bundled together (automatically) with associated documents (multiple language versions or master document with inclusions) and images and sent as a zip file called a sisupod, if shared on the net these too may be processed locally to produce the desired document outputs, these may be downloaded, shared as email attachments, or processed by running sisu against them, either using a url or the filename.
-</p>
-<p>
-<b>(xxii)</b>
-for basic document generation, the only software dependency is Ruby, and a few standard Unix tools (this covers plaintext, html, XML, ODF, EPUB, LaTeX). To use a database you of course need that, and to convert the LaTeX generated to PDF, a LaTeX processor like tetex or texlive.
-</p>
-<p>
-as a developers tool it is flexible and extensible
-</p>
-<br />
-<p class="small">
-<a href="http://www.sisudoc.org"><b>SiSU</b></a> at <a href="http://www.sisudoc.org">&lt;www.sisudoc.org&gt;</a> or <a href="http://www.jus.uio.no/sisu/">&lt;www.jus.uio.no/sisu/&gt;</a></p>
-</div>
-<div id="column_right">
-<p class="tiny">
-<!-- Search SiSU -->
-<a name="search"></a><form method="get" action="http://search.sisudoc.org" target="_top">
-<input type="text" name="s1" size="24" maxlength="255" />
-<br />
-<input type="submit" name="ignore" value="search" />
-<input type="hidden" name="db" value="#{Db[:name_prefix]}sisu" />
-<input type="hidden" name="a" value="1" />
-<input type="radio" name="view" value="index" checked="checked" /> idx
-<input type="radio" name="view" value="text" /> txt
-<a href="http://search.sisudoc.org" target="_top">&lt;search.sisudoc.org&gt;</a>
-</form>
-<!-- Search SiSU -->
-</p>
-<p class="tiny">
-SiSU ("SiSU information Structuring Universe" or "Structured information, Serialized Units"),<sup>1</sup> is a Unix command line oriented framework for document structuring, publishing and search. Featuring minimalistic markup, multiple standard outputs, a common citation system, and granular search.
-</p>
-<p class="tiny">
- Using markup applied to a document, SiSU can produce plain text, HTML, XHTML, XML, OpenDocument, LaTeX or PDF files, and populate an SQL database with objects<sup>2</sup> (equating generally to paragraph-sized chunks) so searches may be performed and matches returned with that degree of granularity (e.g. your search criteria is met by these documents and at these locations within each document). Document output formats share a common object numbering system for locating content. This is particularly suitable for "published" works (finalized texts as opposed to works that are frequently changed or updated) for which it provides a fixed means of reference of content.
-</p>
-
-<p class="small">
-How it works
-</p>
-<p class="tiny">
-SiSU markup is fairly minimalistic, it consists of: a (largely optional) document header, made up of information about the document (such as when it was published, who authored it, and granting what rights) and any processing instructions; and markup within text which is related to document structure and typeface. SiSU must be able to discern the structure of a document, (text headings and their levels in relation to each other), either from information provided in the instruction header or from markup within the text (or from a combination of both). Processing is done against an abstraction of the document comprising of information on the document's structure and its objects,<sup>2</sup> which the program serializes (providing the object numbers) and which are assigned hash sum values based on their content. This abstraction of information about document structure, objects, (and hash sums), provides considerable flexibility in representing documents different ways and for different purposes (e.g. search, document layout, publishing, content certification, concordance etc.), and makes it possible to take advantage of some of the strengths of established ways of representing documents, (or indeed to create new ones).</p>
-<p class="tiny">
-<sup>1.</sup> also chosen for the meaning of the Finnish term "sisu".
-</p>
-<p class="tiny">
-<sup>2</sup> objects include: headings, paragraphs, verse, tables, images, but not footnotes/endnotes which are numbered separately and tied to the object from which they are referenced.</p>
-<p class="small">
- More information on <a href="http://www.sisudoc.org/sisu/SiSU/"><b>SiSU</b></a> provided at:
- <a href="http://www.sisudoc.org/sisu/SiSU/">
- &lt;www.sisudoc.org/sisu/SiSU&gt;
- </a>
-</p>
-<p class="tiny">
-SiSU was developed in relation to legal documents, and is strong across a wide variety of texts (law, literature...(humanities, law and part of the social sciences)). SiSU handles images but is not suitable for formulae/ statistics, or for technical writing at this time.</p>
-<p class="tiny">
-SiSU has been developed and has been in use for several years. Requirements to cover a wide range of documents within its use domain have been explored.</p>
-<p class="small">
-<a href="mailto:ralph@amissah.com">
-&lt;ralph@amissah.com&gt;
-</a>
-</p>
-<p class="small">
-<a href="mailto:ralph.amissah@gmail.com">
-&lt;ralph.amissah@gmail.com&gt;
-</a>
-</p>
-<p class="small">
-<a href="mailto:sisu@lists.sisudoc.org">
-&lt;sisu@lists.sisudoc.org&gt;
-</a>
-</p>
-<p class="small">
-<a href="http://lists.sisudoc.org/listinfo/sisu">
-&lt;http://lists.sisudoc.org/listinfo/sisu&gt;
-</a>
-</p>
-<p class="small">
-#{@date.year_static}
-</p>
-<p class="tiny">
-w3 since October 3 1993
-</p>
-</div>
-</body>
-</html>
-WOK
- end
- def home_toc
- ' '
- end
- end
- class Inserts
- end
- class TeX < Skin
- def initialize(papersize='')
- @papersize=papersize
- end
- def a4
- def portrait
- def w
- 160
- end
- def h
- 228
- end
- def img_px
- 450
- end
- self
- end
- def landscape
- def w
- 238
- end
- def h
- 160
- end
- def img_px
- 300
- end
- self
- end
- self
- end
- def letter
- def portrait
- def w
- 166
- end
- def h
- 212
- end
- def img_px
- 468
- end
- self
- end
- def landscape
- def w
- 226
- end
- def h
- 166
- end
- def img_px
- 290
- end
- self
- end
- self
- end
- def legal
- def portrait
- def w
- 168
- end
- def h
- 286
- end
- def img_px
- 474
- end
- self
- end
- def landscape
- def w
- 296
- end
- def h
- 166
- end
- def img_px
- 420
- end
- self
- end
- self
- end
- def b5
- def portrait
- def w
- 140
- end
- def h
- 204
- end
- def img_px
- 356
- end
- self
- end
- def landscape
- def w
- 200
- end
- def h
- 130
- end
- def img_px
- 260
- end
- self
- end
- self
- end
- def a5
- def portrait
- def w
- 112
- end
- def h
- 162
- end
- def img_px
- 280
- end
- self
- end
- def landscape
- def w
- 152
- end
- def h
- 100
- end
- def img_px
- 190
- end
- self
- end
- self
- end
- def dimensions
- d=case @papersize
- when /a4/; a4
- when /letter/; letter
- when /legal/; legal
- when /b5/; b5
- when /a5/; a5
- else a4
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v3/air.rb b/lib/sisu/v5/air.rb
index d4b49392..cd5c2f68 100644
--- a/lib/sisu/v3/air.rb
+++ b/lib/sisu/v5/air.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/air.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/air.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/author_format.rb b/lib/sisu/v5/author_format.rb
index 5f08ef45..3a9d49a6 100644
--- a/lib/sisu/v3/author_format.rb
+++ b/lib/sisu/v5/author_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/author_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/author_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/cgi.rb b/lib/sisu/v5/cgi.rb
index f0ae55ba..dd9cdf22 100644
--- a/lib/sisu/v3/cgi.rb
+++ b/lib/sisu/v5/cgi.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/cgi.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -69,17 +69,9 @@ module SiSU_CGI
@opt=opt
@webserv=@opt.files[0].to_s.strip
end
- def search_info
- a=%{
- For help on sisu search, type:
- sisu --help search
- }
- SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
- end
def read
SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
- search_info unless @opt.cmd =~/q/
end
end
end
diff --git a/lib/sisu/v3/cgi_pgsql.rb b/lib/sisu/v5/cgi_pgsql.rb
index 20e51772..8d09f733 100644
--- a/lib/sisu/v3/cgi_pgsql.rb
+++ b/lib/sisu/v5/cgi_pgsql.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/cgi_pgsql.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_pgsql.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -68,10 +68,40 @@ module SiSU_CGI_PgSQL
@opt,@webserv=opt,webserv
@env=SiSU_Env::InfoEnv.new('',opt)
@sys=SiSU_Env::SystemCall.new
- @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
- @common=SiSU_CGI_SQL::CGI_Common.new(@webserv,@opt,@image_src,@env)
@db=SiSU_Env::InfoDb.new
+ get_init=SiSU_Env::GetInit.new
+ @rc=get_init.sisu_yaml.rc
+ @name_of={}
+ if defined? @rc['webserv'] \
+ and defined? @rc['webserv']['url_root'] \
+ and defined? @rc['webserv']['url_root'] =~/\S+/
+ @name_of[:host_url_docs]=@rc['webserv']['url_root']
+ end
+ @name_of[:output_dir_structure]=if defined? @rc['output_dir_structure_by'] \
+ and defined? @rc['output_dir_structure_by'] =~/(language|filetype|filename)/
+ @rc['output_dir_structure_by']
+ else 'language'
+ end
+ if defined? @rc['search'] \
+ and defined? @rc['search']['sisu'] \
+ and defined? @rc['search']['sisu']['action'] \
+ and @rc['search']['sisu']['action'] =~/https?:\/\/\S+?\.cgi/ \
+ and defined? @rc['search']['sisu']['db'] \
+ and @rc['search']['sisu']['db'] =~/\S+/
+ @name_of[:db]=@rc['search']['sisu']['db']
+ #@name_of[:cgi_script]=/https?:\/\/\S+?([^\/]+?)\.cgi$/.match(@rc['search']['sisu']['action'])[1]
+ @name_of[:host_url_cgi],@name_of[:cgi_script]=/(https?:\/\/\S+?)\/([^\/]+?)\.cgi$/.match(@rc['search']['sisu']['action'])[1,2]
+ else
+ @name_of[:host_url_docs]=@env.url.webserv_files_from_db
+ @name_of[:db]='sisu' #breaks if not present
+ @name_of[:host_url_cgi]=@env.url.webserv_base_cgi
+ @name_of[:cgi_script]='sisu_pgsql'
+ false
+ end
@cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by.to_s}_pgsql.cgi"
+ @cgi_link_name="#{@name_of[:db]}.cgi" #sisu_pgsql.cgi,
+ @image_src="#{@name_of[:host_url_docs]}/_sisu/image_sys"
+ @common=SiSU_CGI_SQL::CGI_Common.new(@webserv,@opt,@image_src,@env)
end
def pgsql
serve=[]
@@ -90,16 +120,12 @@ module SiSU_CGI_PgSQL
serve.each do |x|
f1 << %{ <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
end
- f2 << %{ selected_db=case cgi['db']\n}
- serve.each do |x|
- f2 << %{ when /#{Db[:name_prefix]}#{x}/; '<option value="#{Db[:name_prefix]}#{x}">#{x}</option>'\n} unless x =~/apache|sisu\/image/ #check
- end
end
- f2 << " end\n"
+ f2 << %q{ selected_db=%{<option value="#{@db_name_prefix}#{@stub}">#{@stub}</option>}} + "\n"
if FileTest.writable?('.')
output=File.open(@cgi_file_name,'w')
output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons1_pgsql << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3
- a=%{ generated sisu_pgsql.cgi,
+ a=%{ generated #{@cgi_file_name},
BASED ON ALREADY EXISTING directories that could potentially be used to populate postgresql db, (-D)
}
SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey
@@ -108,11 +134,11 @@ module SiSU_CGI_PgSQL
else "if necessary make the directory /usr/lib/cgi-bin :
sudo cp -vi #{Dir.pwd}/#{@cgi_file_name} /usr/lib/cgi-bin/.
sudo chmod -v 755 /usr/lib/cgi-bin/#{@cgi_file_name}
- sudo ln -s /usr/lib/cgi-bin/#{@cgi_file_name} /usr/lib/cgi-bin/sisu_pgsql.cgi
- (copy #{@cgi_file_name} to your cgi directory) set file permissions to 755, and make symbolic link to sisu_pgsql.cgi"
+ sudo ln -s /usr/lib/cgi-bin/#{@cgi_file_name} /usr/lib/cgi-bin/#{@cgi_link_name}
+ (copy #{@cgi_file_name} to your cgi directory) set file permissions to 755, and make symbolic link to #{@cgi_link_name}"
end
a=%{#{c}
- #{@env.webserv_base_cgi}/cgi-bin/sisu_pgsql.cgi
+ #{@env.webserv_base_cgi}/cgi-bin/#{@cgi_link_name}
}
SiSU_Screen::Ansi.new(@opt.cmd,a).warn
a="postgresql db used for present directory: #{@db.psql.db}"
@@ -132,13 +158,14 @@ module SiSU_CGI_PgSQL
require 'cgi'
require 'fcgi'
require 'dbi'
- @version='sisu_pgsql'
- @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
- @hosturl_db="#{@env.url.webserv_base_cgi}"
- @hosturl_files="#{@env.url.webserv_files_from_db}"
+ @stub_default="#{@name_of[:db]}"
+ @image_src="#{@name_of[:host_url_docs]}/_sisu/image_sys"
+ @hosturl_cgi="#{@name_of[:host_url_cgi]}"
+ @hosturl_files="#{@name_of[:host_url_docs]}"
+ @output_dir_structure_by="#{@name_of[:output_dir_structure]}"
@port="#{@db.psql.port}"
@db_name_prefix="#{Db[:name_prefix]}"
- user='#{@env.user}' # check user name for access to pg database: '#{@env.user}'
+ user='www-data' # check user name for access to pg database: e.g. www-data or '#{@env.user}'
WOK_SQL
end
def search_statement
diff --git a/lib/sisu/v3/cgi_sql_common.rb b/lib/sisu/v5/cgi_sql_common.rb
index 627cdbfa..5604d6cb 100644
--- a/lib/sisu/v3/cgi_sql_common.rb
+++ b/lib/sisu/v5/cgi_sql_common.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/cgi_sql_common.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_common.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -130,7 +130,7 @@ module SiSU_CGI_SQL
<<-'WOK_SQL'
#Common TOP
@@offset=0
- @base="#{@hosturl_db}/cgi-bin/#{@version}.cgi"
+ @base="#{@hosturl_cgi}/#{@stub_default}.cgi" #fix sqlite
@@canned_search_url=@base
@color_heading='#DDFFAA'
@color_match='#ffff48'
@@ -167,8 +167,7 @@ module SiSU_CGI_SQL
<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
<table summary="band" border="0" cellpadding="3" cellspacing="0">
<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{@image_src}/sisu.png" alt="SiSU --&gt;" /></a></td><td>
-<!-- <p class="tiny"><a href="http://www.jus.uio.no/sisu/SiSU/">&nbsp;http://www.jus.uio.no/sisu/SiSU/</a></p> -->
- <label for="find"><b>#{@env.sample_search_form_title}</b></label>
+ <label for="find"><b>#{@env.sample_search_form_title(@opt.dir_structure_by)}</b></label>
</td></tr>
</table>
WOK_SQL
@@ -349,11 +348,6 @@ module SiSU_CGI_SQL
search[:text] << st[:search]
search[:endnotes] << st[:search]
end
- st=DBI_SearchString.new('metadata_and_text.classify_keywords',search_for.keywords,q['key'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
st=DBI_SearchString.new('metadata_and_text.title',search_for.title,q['ti'],cse).string
if st[:flag]
search[:text] << st[:search]
@@ -374,6 +368,11 @@ module SiSU_CGI_SQL
search[:text] << st[:search]
search[:endnotes] << st[:search]
end
+ st=DBI_SearchString.new('metadata_and_text.classify_keywords',search_for.keywords,q['key'],cse).string
+ if st[:flag]
+ search[:text] << st[:search]
+ search[:endnotes] << st[:search]
+ end
st=DBI_SearchString.new('metadata_and_text.notes_description',search_for.description,q['dsc'],cse).string
if st[:flag]
search[:text] << st[:search]
@@ -399,12 +398,7 @@ module SiSU_CGI_SQL
search[:text] << st[:search]
search[:endnotes] << st[:search]
end
- st=DBI_SearchString.new('metadata_and_text.classify_type',search_for.type,q['ty'],cse).string
- if st[:flag]
- search[:text] << st[:search]
- search[:endnotes] << st[:search]
- end
- st=DBI_SearchString.new('metadata_and_text.classify_identifier',search_for.identifier,q['id'],cse).string
+ st=DBI_SearchString.new('metadata_and_text.notes_type',search_for.type,q['ty'],cse).string
if st[:flag]
search[:text] << st[:search]
search[:endnotes] << st[:search]
@@ -419,12 +413,12 @@ module SiSU_CGI_SQL
search[:text] << st[:search]
search[:endnotes] << st[:search]
end
- st=DBI_SearchString.new('metadata_and_text.classify_relation',search_for.relation,q['rel'],cse).string
+ st=DBI_SearchString.new('metadata_and_text.notes_relation',search_for.relation,q['rel'],cse).string
if st[:flag]
search[:text] << st[:search]
search[:endnotes] << st[:search]
end
- st=DBI_SearchString.new('metadata_and_text.classify_coverage',search_for.coverage,q['cov'],cse).string
+ st=DBI_SearchString.new('metadata_and_text.notes_coverage',search_for.coverage,q['cov'],cse).string
if st[:flag]
search[:text] << st[:search]
search[:endnotes] << st[:search]
@@ -630,14 +624,6 @@ module SiSU_CGI_SQL
</a>
software infrastructure,
with the usual GPL (or OSS) suspects.
- <br />
- Better - "performance, reliability, scalability, security &amp; total cost of ownership"
- [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libré.
- <br />
- Get With the Future
- <a href="http://www.jus.uio.no/sisu/">
- Way Better!
- </a>
</font></p>
</td></tr>
</table>
@@ -656,12 +642,12 @@ module SiSU_CGI_SQL
begin # all code goes in begin section
@search={ text: [], endnotes: [] }
q=CGI.new
- @db=if cgi['db'] =~/\S+/
- @stub=/#{@db_name_prefix}(\S+)/.match(cgi['db'])[1]
+ @db=if cgi['db'] =~ /#{@db_name_prefix}(\S+)/
+ @stub=$1
cgi['db']
else
- @stub='sisu'
- "#{@db_name_prefix}#{@stub}"
+ @stub=@stub_default
+ @db_name_prefix + @stub
end
checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','',''
result_type=(cgi['view']=~/text/) \
@@ -839,7 +825,6 @@ module SiSU_CGI_SQL
else
end
@hostpath="#{@hosturl_files}/#{@stub}"
- @ln='en'
WOK_SQL
end
def dir_structure
@@ -927,7 +912,7 @@ module SiSU_CGI_SQL
can_txt_srch=(cgi['view']=~/index/) \
? %{<a href="#{@canned_base_url}&fns=#{c['src_filename']}&lang=#{c['language_document_char']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
: %{<a href="#{@canned_base_url}&fns=#{c['src_filename']}&lang=#{c['language_document_char']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
- title=%{<span style="background-color: #{@color_heading}"><a href="#{path_toc(location,c['language_document_char'])}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> [#{c['language_document_char']}] by #{c['creator_author']} #{can_txt_srch}<a href="#{path_toc(location,c['language_document_char'])}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a>&nbsp;<a href="#{path_manifest(location,c['language_document_char'])}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ #hmm watch file_suffix
+ title=%{<span style="background-color: #{@color_heading}"><a href="#{path_toc(location,c['language_document_char'])}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> [#{c['language_document_char']}] by #{c['creator_author']} <a href="#{path_manifest(location,c['language_document_char'])}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a> #{can_txt_srch}<br />} if file_suffix=~/s/ #hmm watch file_suffix
title=@text_search_flag \
? '<br /><hr>'+title
: '<br />'+title
@@ -964,7 +949,7 @@ module SiSU_CGI_SQL
matched_para=(@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) \
? (c['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>}))
: c['body']
- %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],@ln)}##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
+ %{<hr><p><font size="2">ocn <b><a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}}
elsif c['suffix'] =~/1/ #doc
%{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}}
end
@@ -972,9 +957,9 @@ module SiSU_CGI_SQL
output=title+text
else #elsif cgi['view']=~/index/ #% idx body
if c['suffix'] !~/1/ #seg
- index=%{<a href="#{path_filename(location,c['seg'],@ln)}##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
+ index=%{<a href="#{path_filename(location,c['seg'],c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag
elsif c['suffix'] =~/1/ #doc #FIX
- index=%{<a href="#{path_html_doc(location,@ln)}##{c['ocn']}">#{c['ocn']}</a>, }
+ index=%{<a href="#{path_html_doc(location,c['language_document_char'])}##{c['ocn']}">#{c['ocn']}</a>, }
end
if c['seg'] =~/\S+/
if @text_search_flag
@@ -1020,7 +1005,7 @@ module SiSU_CGI_SQL
can_txt_srch=(cgi['view']=~/index/) \
? %{<a href="#{@canned_base_url}&fns=#{e['src_filename']}&lang=#{e['language_document_char']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
: %{<a href="#{@canned_base_url}&fns=#{e['src_filename']}&lang=#{e['language_document_char']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a>&nbsp;}
- title=%{<br /><hr><span style="background-color: #{@color_heading}"><a href="#{path_toc(location,@ln)}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> [#{e['language_document_char']}] by #{e['creator_author']} #{can_txt_srch}<a href="#{path_toc(location,@ln)}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a>&nbsp;<a href="#{path_manifest(location,@ln)}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/
+ title=%{<br /><hr><span style="background-color: #{@color_heading}"><a href="#{path_toc(location,e['language_document_char'])}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html">&nbsp;#{ti}</a></span> [#{e['language_document_char']}] by #{e['creator_author']} #{can_txt_srch}<a href="#{path_toc(location,e['language_document_char'])}"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a>&nbsp;<a href="#{path_manifest(location,e['language_document_char'])}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/
@counter_endn_doc+=1
oldtid=e['metadata_tid'].to_i
else title = ''
@@ -1032,10 +1017,10 @@ module SiSU_CGI_SQL
&& @search_regx.to_s=~/\S\S+/) \
? (matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>}))
: e['body']
- output=%{#{title}<hr><font size="2">note <b><a href="#{path_endnotes(location,@ln)}#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#{path_html_doc(location,@ln)}##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
+ output=%{#{title}<hr><font size="2">note <b><a href="#{path_endnotes(location,e['language_document_char'])}#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#{path_html_doc(location,e['language_document_char'])}##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}}
else #elsif cgi['view']=~/index/ #doc #FIX #% idx endnotes
@counter_endn_ocn+=1
- output=%{#{title}<a href="#{path_endnotes(location,@ln)}#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#{path_html_doc(location,@ln)}##{e['ocn']}">#{e['ocn']}</a>], }
+ output=%{#{title}<a href="#{path_endnotes(location,e['language_document_char'])}#_#{e['nr']}">#{e['nr']}</a> [&sect; <a href="#{path_html_doc(location,e['language_document_char'])}##{e['ocn']}">#{e['ocn']}</a>], }
end
@counters_endn=if @counter_endn_doc > 0
if checked_stats =~/\S/
diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v5/cgi_sqlite.rb
index e56fa359..45f6d1ca 100644
--- a/lib/sisu/v3/cgi_sqlite.rb
+++ b/lib/sisu/v5/cgi_sqlite.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/cgi_sql_sqlite.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_sqlite.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -131,10 +131,11 @@ module SiSU_CGI_SQLite
require 'cgi'
require 'fcgi'
require 'dbi'
- @version='sisu_sqlite'
- @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys"
- @hosturl_db="#{@env.url.webserv_base_cgi}"
- @hosturl_files="#{@env.url.webserv_files_from_db}"
+ @stub_default="#{@name_of[:db]}"
+ @image_src="#{@name_of[:host_url_docs]}/_sisu/image_sys"
+ @hosturl_cgi="#{@name_of[:host_url_cgi]}"
+ @hosturl_files="#{@name_of[:host_url_docs]}"
+ @output_dir_structure_by="#{@name_of[:output_dir_structure]}"
@db_name_prefix="#{Db[:name_prefix]}"
WOK_SQL
end
diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v5/composite.rb
index 3923799c..c1cfb127 100644
--- a/lib/sisu/v3/composite.rb
+++ b/lib/sisu/v5/composite.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/composite.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/composite.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -87,21 +87,6 @@ module SiSU_Assemble
FileUtils::mkdir_p(output_path) unless FileTest.directory?(output_path)
SiSU_Env::SystemCall.new("#{path}/*",output_path,'q').rsync
end
- def download_doc_skin(doc_skin) #first element in array is source url
- path="#{@env.processing_path.processing}/external_document/skin/doc"
- FileUtils::mkdir_p(path) unless FileTest.directory?(path)
- download_from=doc_skin.shift
- doc_skin.each do |i|
- skin="#{path}/#{i}.rb"
- unless FileTest.exists?(skin)
- skinfile=File.new(skin,'w+')
- open("#{download_from}/#{i}.rb") do |g|
- skinfile << g.read
- end
- skinfile.close
- end
- end
- end
end
class Composite
@@imager={}
@@ -143,21 +128,6 @@ module SiSU_Assemble
end
end
end
- def download_doc_skin(doc_skin) #first element in array is source url
- path="#{@env.processing_path.processing}/external_document/skin/doc"
- FileUtils::mkdir_p(path) unless FileTest.directory?(path)
- download_from=doc_skin.shift
- doc_skin.each do |i|
- skin="#{path}/#{i}.rb"
- unless FileTest.exists?(skin)
- skinfile=File.new(skin,'w+')
- open("#{download_from}/#{i}.rb") do |g|
- skinfile << g.read
- end
- skinfile.close
- end
- end
- end
def insertion(fni,insert_array)
file={ prepared: [], images: [] }
rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v5/concordance.rb
index 6a984454..ac148f49 100644
--- a/lib/sisu/v3/concordance.rb
+++ b/lib/sisu/v5/concordance.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/concordance.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/concordance.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -84,7 +84,7 @@ module SiSU_Concordance
? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}"
: "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
@md.opt.cmd=~/[MVvz]/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,"Concordance",tool).grey_title_hi
+ ? SiSU_Screen::Ansi.new(@opt.cmd,"Concordance",tool).green_hi_blue
: SiSU_Screen::Ansi.new(@opt.cmd,'Concordance',tool).green_title_hi
end
wordmax=@env.concord_max
@@ -116,28 +116,26 @@ module SiSU_Concordance
@particulars,@md=particulars,particulars.md
@data=SiSU_HTML::Source::HTML_Environment.new(particulars).tuned_file_instructions
@file=SiSU_Env::FileOp.new(@md)
- @vz=SiSU_Env::GetInit.instance.skin
txt_path=%{#{@md.dir_out}}
- SiSU_Env::InfoSkin.new(@md).select
@fnb=@md.fnb
@lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
@doc_details =<<WOK
<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table>
WOK
+ @make=SiSU_Env::ProcessingSettings.new(@md)
end
def create
head_banner=SiSU_HTML_Format::HeadToc.new(@md)
minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,@data).songsheet.join("\n")
stylesheet=SiSU_Style::CSS_HeadInfo.new(@md).stylesheet
- make=SiSU_Env::ProcessingSettings.new(@md)
- if make.build.manifest_minitoc?
+ if @make.build.manifest_minitoc?
toc='<div class="toc">' + minitoc + '</div>'
div_class='content'
else
toc=''
div_class='content0'
end
- top_band=if make.build.html_top_band?
+ top_band=if @make.build.html_top_band?
head_banner.concordance_navigation_band
else ''
end
@@ -201,7 +199,6 @@ WOK
def initialize(particulars)
@particulars=particulars
begin
- @vz=SiSU_Env::GetInit.instance.skin
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
@file=SiSU_Env::FileOp.new(@md)
@freq=Hash.new(0)
@@ -370,7 +367,6 @@ WOK
end
# special cases endnotes and header levels 1 - 3
end
- credits=@vz.credits_sisu
@file_concordance << %{</div></body>\n</html>} # footer
SiSU_Screen::Ansi.new(@md.opt.cmd,@md.fns,"#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").flow if @md.opt.cmd =~/[MV]/
end
diff --git a/lib/sisu/v3/conf.rb b/lib/sisu/v5/conf.rb
index e9fecf32..4d5b58d2 100644
--- a/lib/sisu/v3/conf.rb
+++ b/lib/sisu/v5/conf.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/conf.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/conf.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/constants.rb b/lib/sisu/v5/constants.rb
index 10eb8040..d72049e9 100644
--- a/lib/sisu/v3/constants.rb
+++ b/lib/sisu/v5/constants.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/constants.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/constants.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -102,6 +102,7 @@ Mx={
br_nl: '╲', #lB ▌ 』 ┘
br_paragraph: '█', #FB █ 9608 # PP ∥ 8741 #▐ #'┘' #'¶' #FB █ 9608 lB ▌ 9612 RB ▐ 9616
br_obj: 'break_obj',
+ br_page_line: '▭',
br_page: '┼',
br_page_new: '╋',
lnk_o: '⌠', lnk_c: '⌡', #'⌈' '⌋' '⌠' '⌡' #Mx[:lnk_o: '◁'; Mx[:lnk_c: '▷' #‹ ›
@@ -139,6 +140,7 @@ Mx[:pa_non_object_dummy_heading]="#{Mx[:pa_o]}-##{Mx[:pa_c]}" #
Mx[:pa_non_object_no_heading]="#{Mx[:pa_o]}~##{Mx[:pa_c]}" #unnumbered paragraph (place marker at end of paragraph)
Hx={
br_obj: { obj: Mx[:br_obj] }, # line sep
+ br_page_line: { obj: Mx[:br_page_line] }, # line across page
br_page: { obj: Mx[:br_page] }, # newpage
br_page_new: { obj: Mx[:br_page_new] }, # clearpage
}
@@ -202,13 +204,27 @@ Px={
}
Px[:lng_lst_rgx]=Px[:lng_lst].join('|')
Ep={
+ alt: :on,
d_oebps: 'OEBPS',
+ d_image: 'OEBPS/image',
+ d_css: 'OEBPS/css',
f_ncx: 'toc.ncx',
f_opf: 'content.opf',
}
+$ep=if Ep[:alt]==:on
+ {
+ o: 'opf:',
+ hsp: ' ',
+ }
+else
+ {
+ o: '',
+ hsp: '&nbsp;',
+ }
+end
Db={
- name_prefix: "SiSU#{SiSU_version_dir}f_",
- name_prefix_db: "sisu_#{SiSU_version_dir}f_",
+ name_prefix: "SiSU#{SiSU_version_dir}a_",
+ name_prefix_db: "sisu_#{SiSU_version_dir}a_",
col_title: 800,
col_title_part: 400,
col_title_edition: 10,
@@ -217,12 +233,11 @@ Db={
col_language: 100,
col_language_char: 6,
col_date_text: 10,
- col_classify_txt_long: 600,
- col_classify_txt_short: 600,
- col_classify_short: 200,
- col_classify_identify: 256,
- col_classify_library: 30,
- col_classify_small: 16,
+ col_txt_long: 600,
+ col_txt_short: 200,
+ col_identify_hash: 256,
+ col_library: 30,
+ col_small: 16,
col_filename: 256,
col_digest: 64,
col_filesize: 10,
@@ -243,7 +258,10 @@ Gt={
audio: 'audio',
video: 'video',
conf: 'doc/_sisu',
- skin: 'doc/_sisu/skin', #Gt[:skin: 'conf/skin/doc'
+}
+S_CONF={
+ header_make: 'sisu_document_make',
+ rc_yml: 'sisurc.yml',
}
ANSI_C={
red: "\033[#{31}m",
@@ -277,6 +295,13 @@ DEVELOPER={
maintenance: :false,
}
__END__
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:red).set
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
+puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__
+puts "#{ANSI_C[:red]} #{__LINE__.to_s} #{ANSI_C[:off]} #{__FILE__}"
+puts ANSI_C[:fuchsia] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:fuchsia]}\\1#{ANSI_C[:off]}")
+puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:red]}\\1#{ANSI_C[:off]}")
consider:
〔comment〕
〔links?????〕
diff --git a/lib/sisu/v3/css.rb b/lib/sisu/v5/css.rb
index c6358cd0..4b682e5d 100644
--- a/lib/sisu/v3/css.rb
+++ b/lib/sisu/v5/css.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/css.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/css.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -156,7 +156,7 @@ module SiSU_Style
end
class CSS
def initialize
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def fonts
@vz.font_fonts
@@ -2406,6 +2406,23 @@ WOK
p.right, th.right, td.right {
text-align: right;
}
+
+ .svg_outer {
+ display: block;
+ margin-bottom: 0;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 0;
+ padding-bottom: 0;
+ padding-left: 0;
+ padding-right: 0;
+ padding-top: 0;
+ text-align: left;
+ }
+ .svg_inner {
+ display: block;
+ text-align: center;
+ }
WOK
end
def xml_sax #stylesheet for xml sax
diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v5/dal.rb
index 3feb5782..e6003b4f 100644
--- a/lib/sisu/v3/dal.rb
+++ b/lib/sisu/v5/dal.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -95,12 +95,16 @@ module SiSU_DAL
@@fns=nil
def initialize(opt,fnx=nil)
@opt,@fnx=opt,fnx
- @@fns||@opt.fns
- @make_fns=if @fnx and @fnx =~/\.ss[tmi]$/
- SiSU_Env::InfoFile.new(@fnx)
+ @@fns ||=opt.fns
+ fn_use=if fnx \
+ and fnx =~/\.ss[tmi]$/
+ fnx
+ elsif opt.fns =~/\.ssm$/
+ opt.fns + '.sst'
else
- SiSU_Env::InfoFile.new(@opt.fns)
+ opt.fns
end
+ @make_fns=SiSU_Env::InfoFile.new(fn_use)
@fnm=@make_fns.marshal.dal_metadata
@fnc=@make_fns.marshal.dal_content
@idx_sst=@make_fns.marshal.dal_idx_sst_rel_html_seg
@@ -269,7 +273,7 @@ module SiSU_DAL
tell=(@opt.cmd=~/[vVM]/) \
? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction')
: SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}")
- tell.grey_title_hi
+ tell.blue_title_hi
end
fn=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
diff --git a/lib/sisu/v3/dal_character_check.rb b/lib/sisu/v5/dal_character_check.rb
index c993b8e1..62aa60c1 100644
--- a/lib/sisu/v3/dal_character_check.rb
+++ b/lib/sisu/v5/dal_character_check.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_character_check.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_character_check.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_doc_objects.rb b/lib/sisu/v5/dal_doc_objects.rb
index 94bb9cb0..de9d568f 100644
--- a/lib/sisu/v3/dal_doc_objects.rb
+++ b/lib/sisu/v5/dal_doc_objects.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_doc_objects.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_objects.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v5/dal_doc_str.rb
index 87da4fad..da417bd6 100644
--- a/lib/sisu/v3/dal_doc_str.rb
+++ b/lib/sisu/v5/dal_doc_str.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_doc_str.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_str.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -75,6 +75,7 @@ module SiSU_DAL_DocumentStructureExtract
SiSU_DAL_DocumentStructureExtract::Instantiate.new
@pb=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
@pbn=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
+ @pbl=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line])
end
def ln_get(lv)
ln=case lv
@@ -243,6 +244,8 @@ module SiSU_DAL_DocumentStructureExtract
SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page],:markup)
when /^(?:=\\\\=|<:pn>)\s*$/ #[br:pgn]
SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new],:markup)
+ when /^-\.\.-\s*$/ #[br:pgl]
+ SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line],:markup)
else #paragraph
image=image_test(t_o)
note=endnote_test?(t_o)
diff --git a/lib/sisu/v3/dal_endnotes.rb b/lib/sisu/v5/dal_endnotes.rb
index 326efea1..8412b45e 100644
--- a/lib/sisu/v3/dal_endnotes.rb
+++ b/lib/sisu/v5/dal_endnotes.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_doc_endnotes.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_endnotes.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_expand_insertions.rb b/lib/sisu/v5/dal_expand_insertions.rb
index 68855ba0..46efaa63 100644
--- a/lib/sisu/v3/dal_expand_insertions.rb
+++ b/lib/sisu/v5/dal_expand_insertions.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_expand_insertions.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_expand_insertions.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_hash_digest.rb b/lib/sisu/v5/dal_hash_digest.rb
index f2e13cb5..29d8a1ed 100644
--- a/lib/sisu/v3/dal_hash_digest.rb
+++ b/lib/sisu/v5/dal_hash_digest.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_hash_digest.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_hash_digest.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_idx.rb b/lib/sisu/v5/dal_idx.rb
index bf8d569c..67f2805d 100644
--- a/lib/sisu/v3/dal_idx.rb
+++ b/lib/sisu/v5/dal_idx.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_idx.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_idx.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -165,12 +165,7 @@ module SiSU_DAL_BookIndex
the_idx
end
def clean_xml(str)
- str=str.gsub(/&/,'&#038;').
- gsub(/\(/,'&#040;').
- gsub(/\)/,'&#041;').
- gsub(/\*/,'&#042;').
- gsub(/\+/,'&#043;').
- gsub(/,/,'&#044;')
+ str=str.gsub(/&/,'&amp;')
str
end
def index(the_idx)
@@ -197,8 +192,8 @@ module SiSU_DAL_BookIndex
idx[:html] << ''
idx[:xhtml] << ''
else
- idx[:html] << %{<a href="##{x}">#{x}</a>,&nbsp;}
- idx[:xhtml] << %{<a href="##{x.downcase}">#{x}</a>,&nbsp;}
+ idx[:html] << %{<a href="##{x}">#{x}</a>,#{$ep[:hsp]}}
+ idx[:xhtml] << %{<a href="##{x.downcase}">#{x}</a>,#{$ep[:hsp]}}
end
end
idx[:html] << '</p>'
diff --git a/lib/sisu/v3/dal_images.rb b/lib/sisu/v5/dal_images.rb
index 2c867c1c..1141447d 100644
--- a/lib/sisu/v3/dal_images.rb
+++ b/lib/sisu/v5/dal_images.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_images.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_images.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_metadata.rb b/lib/sisu/v5/dal_metadata.rb
index 4dbfe175..1fa5619c 100644
--- a/lib/sisu/v3/dal_metadata.rb
+++ b/lib/sisu/v5/dal_metadata.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_metadata.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_metadata.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dal_numbering.rb b/lib/sisu/v5/dal_numbering.rb
index 21ada29f..39524cc9 100644
--- a/lib/sisu/v3/dal_numbering.rb
+++ b/lib/sisu/v5/dal_numbering.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_numbering.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_numbering.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -347,13 +347,15 @@ module SiSU_DAL_Numbering
@seg=dob.name
end
@tuned_file << if dob.is==:heading \
- && (@md.pagenew || @md.pagebreak)
+ && (@md.pagenew || @md.pagebreak || @md.pageline)
m=dob.ln.to_s
dob_tmp=[]
if @md.pagenew.inspect =~/#{m}/
dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) << dob
elsif @md.pagebreak.inspect =~/#{m}/
dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) << dob
+ elsif @md.pageline.inspect =~/#{m}/
+ dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line]) << dob
end
para_result=unless dob_tmp.length > 0; dob
else dob_tmp
diff --git a/lib/sisu/v3/dal_substitutions_and_insertions.rb b/lib/sisu/v5/dal_substitutions_and_insertions.rb
index 847f917a..051d2bfd 100644
--- a/lib/sisu/v3/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v5/dal_substitutions_and_insertions.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_substitutions_and_insertions.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_substitutions_and_insertions.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -63,7 +63,6 @@ module SiSU_DAL_SubstituteAndInsert
class SI
def initialize(md,data)
@md,@data=md,data
- @skin=SiSU_Env::InfoSkin.new(@md)
end
def substitutions_and_insertions?
data=@data
@@ -79,7 +78,6 @@ module SiSU_DAL_SubstituteAndInsert
data.each do |para|
if para =~/<:(insert\d+)!?>/ \
and para !~/^%\s+/
- @skin.select
ins=SiSU_Viz::Inserts.new
case para
when /^\s*<:(insert1)>\s*$/
@@ -87,49 +85,42 @@ module SiSU_DAL_SubstituteAndInsert
if defined? ins.insert1
para=[]
ins.insert1.split(/\n\n/).each {|x| para << x }
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert2)>\s*$/
i=$1
if defined? ins.insert2
para=[]
ins.insert2.split(/\n\n/).each {|x| para << x }
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert3)>\s*$/
i=$1
if defined? ins.insert3
para=[]
ins.insert3.split(/\n\n/).each {|x| para << x << "\n"}
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert4)>\s*$/
i=$1
if defined? ins.insert4
para=[]
ins.insert4.split(/\n\n/).each {|x| para << x << "\n"}
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert5)>\s*$/
i=$1
if defined? ins.insert5
para=[]
ins.insert5.split(/\n\n/).each {|x| para << x << "\n"}
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert6)>\s*$/
i=$1
if defined? ins.insert6
para=[]
ins.insert6.split(/\n\n/).each {|x| para << x << "\n"}
- else p "skin #{i} not found in #{@skin.select}"
end
when /^\s*<:(insert7)>\s*$/
i=$1
if defined? ins.insert7
para=[]
ins.insert7.split(/\n\n/).each {|x| para << x << "\n"}
- else p "skin #{i} not found in #{@skin.select}"
end
end
para.each {|x| data_expand << x }
diff --git a/lib/sisu/v3/dal_syntax.rb b/lib/sisu/v5/dal_syntax.rb
index a43ca005..03d397b3 100644
--- a/lib/sisu/v3/dal_syntax.rb
+++ b/lib/sisu/v5/dal_syntax.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dal_syntax.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_syntax.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,15 +67,15 @@ module SiSU_DAL_Syntax
end
class Markup
def initialize(md='',data='')
- @data,@md=data,md
- @vz=SiSU_Env::GetInit.instance.skin
+ @md,@data=md,data
+ @vz=SiSU_Viz::Defaults.new
@data_new=[]
url_and_stub=SiSU_Env::InfoEnv.new.url
@output_url="#{url_and_stub.remote}"
@env=SiSU_Env::InfoEnv.new
- emph_set=if defined? @md.make.emphasis \
- and not @md.make.emphasis.nil?
- @md.make.emphasis
+ emph_set=if defined? @md.emphasis_set_to \
+ and not @md.emphasis_set_to.nil?
+ @md.emphasis_set_to
else @env.markup_emphasis
end
@emph=case emph_set
@@ -98,25 +98,22 @@ module SiSU_DAL_Syntax
tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)}
ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)}
- @line_scan_ital=if defined? @md.make.italics[:str] \
- and defined? @vz.markup_make_italic[:str]
- /#{@http_m}|#{bold_line}|#{@manmkp_ital}#{tail_m_ital}|(?:#{@md.make.italics[:str]}|#{@vz.markup_make_italic[:str]})#{tail_m_ital}|\S+|\n/i
- elsif defined? @md.make.italics[:str]
- /#{@http_m}|#{bold_line}|#{@manmkp_ital}#{tail_m_ital}|#{@md.make.italics[:str]}#{tail_m_ital}|\S+|\n/i
+ @line_scan_ital=if defined? @md.italics_match_list[:str]
+ /#{@http_m}|#{bold_line}|#{@manmkp_ital}#{tail_m_ital}|#{@md.italics_match_list[:str]}#{tail_m_ital}|\S+|\n/i
elsif defined? @vz.markup_make_italic[:str]
/#{@http_m}|#{bold_line}|#{@manmkp_ital}#{tail_m_ital}|#{@vz.markup_make_italic[:str]}#{tail_m_ital}|\S+|\n/i
end
@manmkp_bold=emph_italics \
? '^!_\s.+?(?:\n|$)|[!b]\\{.+?\\}[*!b]|[*!][a-zA-Z0-9\-_]+[!]'
: '^!_\s.+?(?:\n|$)|[*!b]\\{.+?\\}[*!b]|[*!][a-zA-Z0-9\-_]+[*!]'
- @line_scan_bold=if (defined? @md.make.bold[:str] \
- and @md.make.bold[:str]) \
+ @line_scan_bold=if (defined? @md.bold_match_list[:str] \
+ and @md.bold_match_list[:str]) \
and (defined? @vz.markup_make_bold[:str] \
and @vz.markup_make_bold[:str])
- /#{@http_m}|#{bold_line}|(?:#{@manmkp_bold}|#{@md.make.bold[:str]}|#{@vz.markup_make_bold[:str]})#{tail_m_bold}|\S+|\n/i
- elsif defined? @md.make.bold[:str] \
- and @md.make.bold[:str]
- /#{@http_m}|#{bold_line}|(?:#{@manmkp_bold}|#{@md.make.bold[:str]})#{tail_m_bold}|\S+|\n/i
+ /#{@http_m}|#{bold_line}|(?:#{@manmkp_bold}|#{@md.bold_match_list[:str]}|#{@vz.markup_make_bold[:str]})#{tail_m_bold}|\S+|\n/i
+ elsif defined? @md.bold_match_list[:str] \
+ and @md.bold_match_list[:str]
+ /#{@http_m}|#{bold_line}|(?:#{@manmkp_bold}|#{@md.bold_match_list[:str]})#{tail_m_bold}|\S+|\n/i
elsif defined? @vz.markup_make_bold[:str] \
and @vz.markup_make_bold[:str]
/#{@http_m}|#{bold_line}|(?:#{@manmkp_bold}|#{@vz.markup_make_bold[:str]})#{tail_m_bold}|\S+|\n/i
@@ -150,14 +147,15 @@ module SiSU_DAL_Syntax
gsub(/ \\\\(?: |$)/,"#{Mx[:br_line]}").
gsub(/(?:<:?pb>)/,"#{Mx[:br_page]}"). # depreciated
gsub(/(?:<:?pn>)/,"#{Mx[:br_page_new]}"). # depreciated
- gsub(/(?:<:?br>|<br \/>)/,"#{Mx[:br_line]}") # depreciated
+ gsub(/(?:<:?br>|<br \/>)/,"#{Mx[:br_line]}"). # depreciated
+ gsub(/(?:^-\.\.-\s*$)/,"#{Mx[:br_page_line]}")
end
dob
end
def wordlist_italics(dob)
dob=dob.dup
- if (defined? @md.make.italics[:str] \
- and @md.make.italics[:str]) \
+ if (defined? @md.italics_match_list[:str] \
+ and @md.italics_match_list[:str]) \
or (defined? @vz.markup_make_italic[:str] \
and @vz.markup_make_italic[:str])
dob.obj=if dob.is !=:meta \
@@ -170,9 +168,9 @@ module SiSU_DAL_Syntax
line_array=[]
word.each do |w|
unless /#{@manmkp_ital}|#{@http_m}/.match(w)
- if defined? @md.make.italics[:regx] \
- and @md.make.italics[:regx]
- w=w.gsub(@md.make.italics[:regx],
+ if defined? @md.italics_match_list[:regx] \
+ and @md.italics_match_list[:regx]
+ w=w.gsub(@md.italics_match_list[:regx],
"#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}")
elsif defined? @vz.markup_make_italic \
and @vz.markup_make_italic
@@ -241,15 +239,15 @@ module SiSU_DAL_Syntax
end
def substitutions(dob)
dob=dob.dup
- dob=if defined? @md.make.substitute[:match_and_replace] \
- and @md.make.substitute[:match_and_replace].is_a?(Array)
+ dob=if defined? @md.substitution_match_list[:match_and_replace] \
+ and @md.substitution_match_list[:match_and_replace].is_a?(Array)
dob=if dob.is !=:meta \
&& dob.is !=:heading_insert \
&& dob.is !=:code \
&& dob.is !=:comment \
&& dob.is !=:table
- if dob.obj =~/#{@md.make.substitute[:matches]}/
- @md.make.substitute[:match_and_replace].each do |x|
+ if dob.obj =~/#{@md.substitution_match_list[:matches]}/
+ @md.substitution_match_list[:match_and_replace].each do |x|
dob.obj=if x[:case_s]==:i
dob.obj.gsub(/#{x[:match]}/mi,x[:replace])
else
@@ -266,8 +264,8 @@ module SiSU_DAL_Syntax
end
def wordlist_bold(dob)
dob=dob.dup
- if (defined? @md.make.bold[:str] \
- and @md.make.bold[:str]) \
+ if (defined? @md.bold_match_list[:str] \
+ and @md.bold_match_list[:str]) \
or (defined? @vz.markup_make_bold[:str] \
and @vz.markup_make_bold[:str])
dob.obj=if dob.is !=:meta \
@@ -281,11 +279,11 @@ module SiSU_DAL_Syntax
word=word.flatten.compact
word.each do |w|
unless /#{@manmkp_bold}|#{@http_m}/.match(w)
- if defined? @md.make.bold[:regx] \
- and @md.make.bold[:regx] #document header: @bold: [bold word list]
- w=w.gsub(@md.make.bold[:regx],"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}")
+ if defined? @md.bold_match_list[:regx] \
+ and @md.bold_match_list[:regx] #document header: @bold: [bold word list]
+ w=w.gsub(@md.bold_match_list[:regx],"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}")
elsif defined? @vz.markup_make_bold \
- and @vz.markup_make_bold #defaults and skin adjusted bold word list
+ and @vz.markup_make_bold #defaults adjusted bold word list
w=w.gsub(@vz.markup_make_bold,"#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}")
end
else
diff --git a/lib/sisu/v3/db_columns.rb b/lib/sisu/v5/db_columns.rb
index 02adf4c1..14d3bb46 100644
--- a/lib/sisu/v3/db_columns.rb
+++ b/lib/sisu/v5/db_columns.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_columns.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_columns.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -1367,20 +1367,64 @@ module SiSU_DbColumns
self
end
=begin
+#% identifier
+@identifier:
+ :oclc:
+ :isbn:
+=end
+ def identifier_oclc
+ def name
+ 'identifier_oclc'
+ end
+ def create_column
+ "#{name} VARCHAR(#{Db[:col_library]}) NULL,"
+ end
+ def column_comment
+ %{COMMENT ON COLUMN metadata_and_text.#{name}
+ IS 'metadata identifier document Online Computer Library Center number';}
+ end
+ def tuple
+ t=if defined? @md.identifier.oclc \
+ and @md.identifier.oclc=~/\S+/
+ txt=@md.identifier.oclc
+ txt=special_character_escape(txt)
+ ["#{name}, ","'#{txt}', "]
+ else ['','']
+ end
+ end
+ self
+ end
+ def identifier_isbn
+ def name
+ 'identifier_isbn'
+ end
+ def create_column
+ "#{name} VARCHAR(#{Db[:col_small]}) NULL,"
+ end
+ def column_comment
+ %{COMMENT ON COLUMN metadata_and_text.#{name}
+ IS 'metadata identifier document isbn (if any)';}
+ end
+ def tuple
+ t=if defined? @md.identifier.isbn \
+ and @md.identifier.isbn=~/\S+/
+ txt=@md.identifier.isbn
+ txt=special_character_escape(txt)
+ ["#{name}, ","'#{txt}', "]
+ else ['','']
+ end
+ end
+ self
+ end
+=begin
#% classify
@classify:
:topic_register:
- :coverage:
- :format:
- :identifier:
- :keywords:
- :relation:
:subject:
+ :keywords:
:type:
:loc:
:dewey:
- :pg:
- :isbn:
=end
def classify_topic_register
def name
@@ -1409,7 +1453,7 @@ module SiSU_DbColumns
'classify_subject'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_txt_short]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_long]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
@@ -1426,34 +1470,12 @@ module SiSU_DbColumns
end
self
end
- def classify_type #check
- def name
- 'classify_type'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_classify_txt_short]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document type [DC8]';}
- end
- def tuple
- t=if defined? @md.classify.type \
- and @md.classify.type=~/\S+/
- txt=@md.classify.type
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
def classify_loc
def name
'classify_loc'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_library]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_library]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
@@ -1475,7 +1497,7 @@ module SiSU_DbColumns
'classify_dewey'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_library]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_library]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
@@ -1492,65 +1514,21 @@ module SiSU_DbColumns
end
self
end
- def classify_oclc
- def name
- 'classify_oclc'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_classify_library]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document Online Computer Library Center number';}
- end
- def tuple
- t=if defined? @md.classify.oclc \
- and @md.classify.oclc=~/\S+/
- txt=@md.classify.oclc
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
- def classify_pg
- def name
- 'classify_pg'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_classify_small]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document project gutenberg (if any)';}
- end
- def tuple
- t=if defined? @md.classify.pg \
- and @md.classify.pg=~/\S+/
- txt=@md.classify.pg
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
- def classify_isbn
+ def classify_keywords
def name
- 'classify_isbn'
+ 'classify_keywords'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_small]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_long]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document isbn (if any)';}
+ IS 'metadata classify document keywords';}
end
def tuple
- t=if defined? @md.classify.isbn \
- and @md.classify.isbn=~/\S+/
- txt=@md.classify.isbn
+ t=if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ txt=@md.classify.keywords
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1558,21 +1536,36 @@ module SiSU_DbColumns
end
self
end
- def classify_format
+=begin
+#% notes
+@notes:
+ :abstract:
+ :description:
+ :comment:
+ :coverage:
+ :relation:
+ :format:
+ :history:
+ :prefix:
+ :prefix_a:
+ :prefix_b:
+ :suffix:
+=end
+ def notes_abstract
def name
- 'classify_format'
+ 'notes_abstract'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_txt_short]}) NULL,"
+ "#{name} TEXT NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document format [DC9]';}
+ IS 'metadata document notes abstract';}
end
def tuple
- t=if defined? @md.classify.format \
- and @md.classify.format=~/\S+/
- txt=@md.classify.format
+ t=if defined? @md.notes.abstract \
+ and @md.notes.abstract=~/\S+/
+ txt=@md.notes.abstract
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1580,21 +1573,21 @@ module SiSU_DbColumns
end
self
end
- def classify_identifier
+ def notes_description
def name
- 'classify_identifier'
+ 'notes_description'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_identify]}) NULL,"
+ "#{name} TEXT NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document identifier [DC10]';}
+ IS 'metadata document notes description [DC4]';}
end
def tuple
- t=if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/
- txt=@md.classify.identifier
+ t=if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/
+ txt=@md.notes.description
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1602,21 +1595,21 @@ module SiSU_DbColumns
end
self
end
- def classify_relation
+ def notes_comment
def name
- 'classify_relation'
+ 'notes_comment'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_short]}) NULL,"
+ "#{name} TEXT NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document relation [DC13]';}
+ IS 'metadata document notes comment';}
end
def tuple
- t=if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/
- txt=@md.classify.relation
+ t=if defined? @md.notes.comment \
+ and @md.notes.comment=~/\S+/
+ txt=@md.notes.comment
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1624,12 +1617,12 @@ module SiSU_DbColumns
end
self
end
- def classify_coverage
+ def notes_coverage
def name
- 'classify_coverage'
+ 'notes_coverage'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_short]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_short]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
@@ -1646,21 +1639,21 @@ module SiSU_DbColumns
end
self
end
- def classify_keywords
+ def notes_relation
def name
- 'classify_keywords'
+ 'notes_relation'
end
def create_column
- "#{name} VARCHAR(#{Db[:col_classify_txt_short]}) NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_short]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata classify document keywords';}
+ IS 'metadata classify document relation [DC13]';}
end
def tuple
- t=if defined? @md.classify.keywords \
- and @md.classify.keywords=~/\S+/
- txt=@md.classify.keywords
+ t=if defined? @md.classify.relation \
+ and @md.classify.relation=~/\S+/
+ txt=@md.classify.relation
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1668,33 +1661,21 @@ module SiSU_DbColumns
end
self
end
-=begin
-#% notes
-@notes:
- :abstract:
- :comment:
- :description:
- :history:
- :prefix:
- :prefix_a:
- :prefix_b:
- :suffix:
-=end
- def notes_abstract
+ def notes_history #check, consider removal
def name
- 'notes_abstract'
+ 'notes_history'
end
def create_column
- "#{name} TEXT NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_long]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata document notes abstract';}
+ IS 'metadata document notes history';}
end
def tuple
- t=if defined? @md.notes.abstract \
- and @md.notes.abstract=~/\S+/
- txt=@md.notes.abstract
+ t=if defined? @md.notes.history \
+ and @md.notes.history=~/\S+/
+ txt=@md.notes.history
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1702,21 +1683,21 @@ module SiSU_DbColumns
end
self
end
- def notes_comment
+ def notes_type #check
def name
- 'notes_comment'
+ 'notes_type'
end
def create_column
- "#{name} TEXT NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_long]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata document notes comment';}
+ IS 'metadata notes document type [DC8]';}
end
def tuple
- t=if defined? @md.notes.comment \
- and @md.notes.comment=~/\S+/
- txt=@md.notes.comment
+ t=if defined? @md.notes.type \
+ and @md.notes.type=~/\S+/
+ txt=@md.notes.type
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1724,43 +1705,21 @@ module SiSU_DbColumns
end
self
end
- def notes_description
+ def notes_format
def name
- 'notes_description'
+ 'notes_format'
end
def create_column
- "#{name} TEXT NULL,"
+ "#{name} VARCHAR(#{Db[:col_txt_long]}) NULL,"
end
def column_comment
%{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata document notes description [DC4]';}
- end
- def tuple
- t=if defined? @md.notes.description \
- and @md.notes.description=~/\S+/
- txt=@md.notes.description
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
- def notes_history #check, consider removal
- def name
- 'notes_history'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_classify_txt_short]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'metadata document notes history';}
+ IS 'metadata classify document format [DC9]';}
end
def tuple
- t=if defined? @md.notes.history \
- and @md.notes.history=~/\S+/
- txt=@md.notes.history
+ t=if defined? @md.classify.format \
+ and @md.classify.format=~/\S+/
+ txt=@md.classify.format
txt=special_character_escape(txt)
["#{name}, ","'#{txt}', "]
else ['','']
@@ -1970,8 +1929,6 @@ module SiSU_DbColumns
end
=begin
#% misc
-@make:
- :skin:
@links:
=end
def fulltext
@@ -1994,73 +1951,6 @@ module SiSU_DbColumns
end
self
end
- def skin_name #check
- def name
- 'skin_name'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_filename]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'source text skin name';}
- end
- def tuple
- t=if defined? @md.skin_name \
- and @md.skin_name=~/\S+/
- txt=@md.skin_name
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
- def skin_fingerprint #check
- def name
- 'skin_fingerprint'
- end
- def create_column
- "#{name} VARCHAR(#{Db[:col_digest]}) NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'source text skin fingerprint';}
- end
- def tuple
- t=if defined? @md.dgst_skin \
- and @md.dgst_skin.is_a?(Array) \
- and @md.dgst_skin[1]=~/\S+/
- txt=@md.dgst_skin[1]
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
- def skin # you likely want a separate table for skins
- def name
- 'skin'
- end
- def create_column
- "#{name} TEXT NULL,"
- end
- def column_comment
- %{COMMENT ON COLUMN metadata_and_text.#{name}
- IS 'source text skin';}
- end
- def tuple
- t=if defined? @md.skin \
- and @md.skin=~/\S+/
- txt=@md.skin
- txt=special_character_escape(txt)
- ["#{name}, ","'#{txt}', "]
- else ['','']
- end
- end
- self
- end
def links
def name
'links'
diff --git a/lib/sisu/v3/db_create.rb b/lib/sisu/v5/db_create.rb
index 5df72a2a..e2d1f916 100644
--- a/lib/sisu/v3/db_create.rb
+++ b/lib/sisu/v5/db_create.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_create.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_create.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -84,9 +84,9 @@ module SiSU_DbCreate
def create_db
@env=SiSU_Env::InfoEnv.new(@opt.fns)
tell=(@sql_type=='sqlite') \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','Create Sqlite db tables in:',%{"#{@file}"})
- : SiSU_Screen::Ansi.new(@opt.cmd,'invert','Create PG db tables in:',%{"#{Db[:name_prefix]}#{@env.path.stub_pwd}"})
- tell.colorize if @opt.cmd =~/[vVM]/
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'Create SQLite db tables in:',%{"#{@file}"})
+ : SiSU_Screen::Ansi.new(@opt.cmd,'Create pgSQL db tables in:',%{"#{Db[:name_prefix]}#{@env.path.stub_pwd}"})
+ tell.dark_grey_title_hi if @opt.cmd =~/[vVM]/
SiSU_Env::SystemCall.new.create_pg_db(@env.path.stub_pwd) if @sql_type=='pg' #watch use of path.stub_pwd instead of stub
end
def output_dir?
@@ -167,22 +167,22 @@ module SiSU_DbCreate
/* classify */
#{column.classify_topic_register.create_column}
#{column.classify_subject.create_column}
- #{column.classify_type.create_column}
#{column.classify_loc.create_column}
#{column.classify_dewey.create_column}
- #{column.classify_oclc.create_column}
- #{column.classify_pg.create_column}
- #{column.classify_isbn.create_column}
- #{column.classify_format.create_column}
- #{column.classify_identifier.create_column}
- #{column.classify_relation.create_column}
- #{column.classify_coverage.create_column}
#{column.classify_keywords.create_column}
+ /* identifier */
+ #{column.identifier_oclc.create_column}
+ #{column.identifier_isbn.create_column}
/* notes */
#{column.notes_abstract.create_column}
- #{column.notes_comment.create_column}
#{column.notes_description.create_column}
+ #{column.notes_comment.create_column}
#{column.notes_history.create_column}
+ #{column.notes_coverage.create_column}
+ #{column.notes_relation.create_column}
+ /* column.notes_source.create_column */
+ #{column.notes_type.create_column}
+ #{column.notes_format.create_column}
#{column.notes_prefix.create_column}
#{column.notes_prefix_a.create_column}
#{column.notes_prefix_b.create_column}
@@ -195,9 +195,6 @@ module SiSU_DbCreate
#{column.src_txt.create_column}
/* misc */
#{column.fulltext.create_column}
- #{column.skin_name.create_column}
- #{column.skin_fingerprint.create_column}
- #{column.skin.create_column}
#{column.links.create_column.gsub(/,$/,'')}
/* subj VARCHAR(64) NULL, */
/* contact VARCHAR(100) NULL, */
@@ -428,21 +425,19 @@ module SiSU_DbCreate
%{#{column.rights_license.column_comment}},
%{#{column.classify_topic_register.column_comment}},
%{#{column.classify_subject.column_comment}},
- %{#{column.classify_type.column_comment}},
%{#{column.classify_loc.column_comment}},
%{#{column.classify_dewey.column_comment}},
- %{#{column.classify_oclc.column_comment}},
- %{#{column.classify_pg.column_comment}},
- %{#{column.classify_isbn.column_comment}},
- %{#{column.classify_format.column_comment}},
- %{#{column.classify_identifier.column_comment}},
- %{#{column.classify_relation.column_comment}},
- %{#{column.classify_coverage.column_comment}},
%{#{column.classify_keywords.column_comment}},
+ %{#{column.identifier_oclc.column_comment}},
+ %{#{column.identifier_isbn.column_comment}},
%{#{column.notes_abstract.column_comment}},
%{#{column.notes_comment.column_comment}},
%{#{column.notes_description.column_comment}},
%{#{column.notes_history.column_comment}},
+ %{#{column.notes_coverage.column_comment}},
+ %{#{column.notes_relation.column_comment}},
+ %{#{column.notes_type.column_comment}},
+ %{#{column.notes_format.column_comment}},
%{#{column.notes_prefix.column_comment}},
%{#{column.notes_prefix_a.column_comment}},
%{#{column.notes_prefix_b.column_comment}},
@@ -453,9 +448,6 @@ module SiSU_DbCreate
%{#{column.src_word_count.column_comment}},
%{#{column.src_txt.column_comment}},
%{#{column.fulltext.column_comment}},
- %{#{column.skin_name.column_comment}},
- %{#{column.skin_fingerprint.column_comment}},
- %{#{column.skin.column_comment}},
%{#{column.links.column_comment}},
]
conn_execute_array(sql_arr)
diff --git a/lib/sisu/v3/db_dbi.rb b/lib/sisu/v5/db_dbi.rb
index 0164ceb5..85640b3a 100644
--- a/lib/sisu/v3/db_dbi.rb
+++ b/lib/sisu/v5/db_dbi.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_dbi.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_dbi.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_drop.rb b/lib/sisu/v5/db_drop.rb
index b4f8c7ed..caf7faa5 100644
--- a/lib/sisu/v3/db_drop.rb
+++ b/lib/sisu/v5/db_drop.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_drop.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_drop.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_import.rb b/lib/sisu/v5/db_import.rb
index 530e23df..a1d332bb 100644
--- a/lib/sisu/v3/db_import.rb
+++ b/lib/sisu/v5/db_import.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_import.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_import.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -84,7 +84,6 @@ module SiSU_DbImport
@md=SiSU_Param::Parameters.new(@opt).get
@md.fnb
end
- @suffix=@opt.fns[/(?:.+?)(?:\.ssm\.sst|\.-?sst)/,1]
@fnc="#{@dal}/#{@opt.fns}.content.rbm"
@@seg,@@seg_full='','' #create? consider placing field just before clean text as opposed to seg which contains seg(.html) name info seg_full would contain seg info for levels 5 & 6 where available eg seg_full may be 7.3 (level 5) and 7.3.1 (level 6) where seg is 7
@col=Hash.new('')
diff --git a/lib/sisu/v3/db_indexes.rb b/lib/sisu/v5/db_indexes.rb
index beae0aa1..265d5169 100644
--- a/lib/sisu/v3/db_indexes.rb
+++ b/lib/sisu/v5/db_indexes.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_indexes.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_indexes.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_load_tuple.rb b/lib/sisu/v5/db_load_tuple.rb
index d615fcab..bdaf285a 100644
--- a/lib/sisu/v3/db_load_tuple.rb
+++ b/lib/sisu/v5/db_load_tuple.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_load_tuple.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_load_tuple.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -177,21 +177,19 @@ module SiSU_DbTuple
#{@tp.column.rights_license.tuple[0]}
#{@tp.column.classify_topic_register.tuple[0]}
#{@tp.column.classify_subject.tuple[0]}
-#{@tp.column.classify_type.tuple[0]}
#{@tp.column.classify_loc.tuple[0]}
#{@tp.column.classify_dewey.tuple[0]}
-#{@tp.column.classify_oclc.tuple[0]}
-#{@tp.column.classify_pg.tuple[0]}
-#{@tp.column.classify_isbn.tuple[0]}
-#{@tp.column.classify_format.tuple[0]}
-#{@tp.column.classify_identifier.tuple[0]}
-#{@tp.column.classify_relation.tuple[0]}
-#{@tp.column.classify_coverage.tuple[0]}
#{@tp.column.classify_keywords.tuple[0]}
+#{@tp.column.identifier_oclc.tuple[0]}
+#{@tp.column.identifier_isbn.tuple[0]}
#{@tp.column.notes_abstract.tuple[0]}
-#{@tp.column.notes_comment.tuple[0]}
#{@tp.column.notes_description.tuple[0]}
+#{@tp.column.notes_comment.tuple[0]}
#{@tp.column.notes_history.tuple[0]}
+#{@tp.column.notes_format.tuple[0]}
+#{@tp.column.notes_relation.tuple[0]}
+#{@tp.column.notes_coverage.tuple[0]}
+#{@tp.column.notes_type.tuple[0]}
#{@tp.column.notes_prefix.tuple[0]}
#{@tp.column.notes_prefix_a.tuple[0]}
#{@tp.column.notes_prefix_b.tuple[0]}
@@ -202,9 +200,6 @@ module SiSU_DbTuple
#{@tp.column.src_word_count.tuple[0]}
#{@tp.column.src_txt.tuple[0]}
#{@tp.column.fulltext.tuple[0]}
-#{@tp.column.skin_name.tuple[0]}
-#{@tp.column.skin_fingerprint.tuple[0]}
-#{@tp.column.skin.tuple[0]}
#{@tp.column.links.tuple[0]}
tid)
" +
@@ -262,21 +257,19 @@ tid)
#{@tp.column.rights_license.tuple[1]}
#{@tp.column.classify_topic_register.tuple[1]}
#{@tp.column.classify_subject.tuple[1]}
-#{@tp.column.classify_type.tuple[1]}
#{@tp.column.classify_loc.tuple[1]}
#{@tp.column.classify_dewey.tuple[1]}
-#{@tp.column.classify_oclc.tuple[1]}
-#{@tp.column.classify_pg.tuple[1]}
-#{@tp.column.classify_isbn.tuple[1]}
-#{@tp.column.classify_format.tuple[1]}
-#{@tp.column.classify_identifier.tuple[1]}
-#{@tp.column.classify_relation.tuple[1]}
-#{@tp.column.classify_coverage.tuple[1]}
#{@tp.column.classify_keywords.tuple[1]}
+#{@tp.column.identifier_oclc.tuple[1]}
+#{@tp.column.identifier_isbn.tuple[1]}
#{@tp.column.notes_abstract.tuple[1]}
#{@tp.column.notes_comment.tuple[1]}
#{@tp.column.notes_description.tuple[1]}
#{@tp.column.notes_history.tuple[1]}
+#{@tp.column.notes_format.tuple[1]}
+#{@tp.column.notes_relation.tuple[1]}
+#{@tp.column.notes_coverage.tuple[1]}
+#{@tp.column.notes_type.tuple[1]}
#{@tp.column.notes_prefix.tuple[1]}
#{@tp.column.notes_prefix_a.tuple[1]}
#{@tp.column.notes_prefix_b.tuple[1]}
@@ -287,9 +280,6 @@ tid)
#{@tp.column.src_word_count.tuple[1]}
#{@tp.column.src_txt.tuple[1]}
#{@tp.column.fulltext.tuple[1]}
-#{@tp.column.skin_name.tuple[1]}
-#{@tp.column.skin_fingerprint.tuple[1]}
-#{@tp.column.skin.tuple[1]}
#{@tp.column.links.tuple[1]}
#{@id}
);"
diff --git a/lib/sisu/v3/db_remove.rb b/lib/sisu/v5/db_remove.rb
index de579832..1fb40e30 100644
--- a/lib/sisu/v3/db_remove.rb
+++ b/lib/sisu/v5/db_remove.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_remove.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_remove.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_select.rb b/lib/sisu/v5/db_select.rb
index efa1e7bd..f6930fa4 100644
--- a/lib/sisu/v3/db_select.rb
+++ b/lib/sisu/v5/db_select.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_select.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_select.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_sqltxt.rb b/lib/sisu/v5/db_sqltxt.rb
index 91c775f8..eb52f300 100644
--- a/lib/sisu/v3/db_sqltxt.rb
+++ b/lib/sisu/v5/db_sqltxt.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_sqltxt.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_sqltxt.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/db_tests.rb b/lib/sisu/v5/db_tests.rb
index 33762987..5cc7c982 100644
--- a/lib/sisu/v3/db_tests.rb
+++ b/lib/sisu/v5/db_tests.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/db_tests.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_tests.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dbi.rb b/lib/sisu/v5/dbi.rb
index 9521edbc..33592727 100644
--- a/lib/sisu/v3/dbi.rb
+++ b/lib/sisu/v5/dbi.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dbi.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index b8e8f6ef..89fd3898 100644
--- a/lib/sisu/v3/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/dbi_discrete.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi_discrete.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/defaults.rb b/lib/sisu/v5/defaults.rb
new file mode 100644
index 00000000..6b3004ef
--- /dev/null
+++ b/lib/sisu/v5/defaults.rb
@@ -0,0 +1,1212 @@
+# encoding: utf-8
+=begin
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+ SiSU, a framework for document structuring, publishing and search
+
+ Copyright (C) Ralph Amissah
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+
+ If you have Internet connection, the latest version of the GPL should be
+ available at these locations:
+ <http://www.fsf.org/licensing/licenses/gpl.html>
+ <http://www.gnu.org/licenses/gpl.html>
+
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+
+ * SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
+
+ * Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
+
+ * Download:
+ <http://www.sisudoc.org/sisu/en/SiSU/download.html>
+
+ * Git
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/defaults.rb;hb=HEAD>
+
+ * Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+ ** Description: Default values
+
+=end
+$latex_run=nil
+module SiSU_Viz
+ require 'uri'
+ require_relative 'sysenv' # sysenv.rb
+ include SiSU_Env
+ require_relative 'css' # css.rb
+ include SiSU_Style
+ class Defaults
+ def initialize
+ @fonts='verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman' # 'verdana, arial, georgia, tahoma, sans-serif, helvetica, "times new roman", times, roman'
+ @dir=SiSU_Env::InfoEnv.new
+ @date=SiSU_Env::InfoDate.new #{@date.year}
+ @v=SiSU_Env::InfoVersion.instance.get_version
+ end
+ #% glyph
+ def glyph_bullet # &bullet;
+ '&#149;&nbsp;' # [&#149; flagged]
+ end
+ #% html
+ def html_hardspace
+ '&nbsp;'
+ end
+ def semantic_tags
+ def default
+ {
+ pub: 'publication',
+ conv: 'convention',
+ vol: 'volume',
+ pg: 'page',
+ cty: 'city',
+ org: 'organization',
+ uni: 'university',
+ dept: 'department',
+ fac: 'faculty',
+ inst: 'institute',
+ co: 'company',
+ com: 'company',
+ conv: 'convention',
+ dt: 'date',
+ y: 'year',
+ m: 'month',
+ d: 'day',
+ ti: 'title',
+ au: 'author',
+ ed: 'editor', #editor?
+ v: 'version', #edition
+ n: 'name',
+ fn: 'firstname',
+ mn: 'middlename',
+ ln: 'lastname',
+ in: 'initials',
+ qt: 'quote',
+ ct: 'cite',
+ ref: 'reference',
+ ab: 'abreviation',
+ def: 'define',
+ desc: 'description',
+ trans: 'translate',
+ }
+ end
+ self
+ end
+ #% decorate
+ def decorate_italics
+ 'title|article|book|journal'
+ end
+ def decorate_bold
+ end
+ def decorate_uppercase
+ 'surname'
+ end
+ #% semantic
+ def sem_title #dc 1
+ 'title'
+ end
+ def sem_article
+ 'article'
+ end
+ def sem_book
+ 'book'
+ end
+ def sem_journal
+ 'journal'
+ end
+ def sem_fullname # (contains: firstname, surname) #issues arise as contains surname etc.
+ 'fullname'
+ end
+ def sem_first
+ 'first'
+ end
+ def sem_surname
+ 'surname'
+ end
+ def sem_middle
+ 'middle'
+ end
+ def sem_creator #dc 2 #==fullname (contains: firstname, surname)
+ 'creator'
+ end
+ def sem_author #==fullname (contains: firstname, surname)
+ 'author'
+ end
+ def sem_editor #==fullname (contains: firstname, surname)
+ 'editor'
+ end
+ def sem_illustrator #==fullname (contains: firstname, surname)
+ 'illustrator'
+ end
+ def sem_translator #==fullname (contains: firstname, surname)
+ 'translator'
+ end
+ def sem_isbn # 10 or 13
+ 'isbn'
+ end
+ def sem_isbn_10
+ 'isbn10'
+ end
+ def sem_isbn_13
+ 'isbn13'
+ end
+ def sem_loc # library of congress
+ 'loc'
+ end
+ def sem_dewey
+ 'dewey'
+ end
+ def sem_pg # project gutenberg number
+ 'pg'
+ end
+ def sem_subject #dc 3
+ 'subject'
+ end
+ def sem_date #dc 7
+ 'date'
+ end
+ def sem_date_created
+ 'date_created'
+ end
+ def sem_date_issued
+ 'date_issued'
+ end
+ def sem_date_available
+ 'date_available'
+ end
+ def sem_date_valid
+ 'date_valid'
+ end
+ def sem_date_modified
+ 'date_modified'
+ end
+ def sem_type #dc 8
+ 'type'
+ end
+ def sem_description #dc 4
+ 'description'
+ end
+ def sem_publisher #dc 5
+ 'publisher'
+ end
+ def sem_contributor #dc 6
+ 'contributor'
+ end
+ def sem_format #dc 9
+ 'format'
+ end
+ def sem_identifier #dc 10
+ 'identifier'
+ end
+ def sem_source #dc 11
+ 'source'
+ end
+ def sem_language #dc 12
+ 'language'
+ end
+ def sem_relation #dc 13
+ 'source'
+ end
+ def sem_coverage #dc 14
+ 'coverage'
+ end
+ def sem_rights #dc 15
+ 'rights'
+ end
+ def sem_copyright
+ 'copyright'
+ end
+ def sem_license
+ 'license'
+ end
+ def sem_prepared_by
+ 'prepared_by'
+ end
+ def sem_digitized_by
+ 'digitized_by'
+ end
+ def sem_keywords
+ 'keywords'
+ end
+ def sem_comments
+ 'comments'
+ end
+ def sem_abstract
+ 'abstract'
+ end
+ #% path
+ def path_stylesheet_home
+ %{ <link rel="stylesheet" href="./#{@dir.path.style}/homepage.css" type="text/css" />}
+ end
+ #% text #changed from txt to avoid naming conflicts #FOLLOW
+ def txt_generator
+ %{ <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
+ <link rel="generator" href="http://www.sisudoc.org/" />}
+ end
+ def txt_generator_comment
+ %{ <!- #{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" http://www.sisudoc.org/ ->}
+ end
+ def txt_hp
+ '&nbsp;SiSU'
+ end
+ def txt_hp_alias
+ 'SiSU'
+ end
+ def txt_home
+ 'SiSU'
+ end
+ def txt_signature # used in latex/pdf footer
+ 'SiSU'
+ end
+ #% url
+ def url_urify(uri)
+ URI.parse(uri)
+ end
+ def url_sisu
+ 'http://www.sisudoc.org/'
+ end
+ def url_sisudoc
+ 'http://www.sisudoc.org'
+ end
+ def url_footer_signature
+ 'http://www.sisudoc.org/'
+ end
+ def url_root
+ '/sisu' #watch
+ end
+ def url_root_http
+ 'http://www.sisudoc.org/' #watch
+ end
+ def url_home
+ 'http://www.sisudoc.org/' # used in pdf header
+ end
+ def url_site #used as stub... where there are subdirectories and is different from home
+ url_home
+ #'http://www.sisudoc.org/' # used in pdf header
+ end
+ def url_txt
+ 'www.sisudoc.org/'
+ end
+ def url_path_image_base #used for html image display
+ "#{Xx[:html_relative2]}_sisu/image"
+ end
+ def url_path_image #used for html image display
+ "#{Xx[:html_relative2]}_sisu/image"
+ end
+ def url_path_image_sys #used for html image display
+ "#{Xx[:html_relative2]}_sisu/image_sys"
+ end
+ def url_decoration
+ def tex_open #'{\UseTextSymbol{OML}{<}}'
+ Dx[:url_o]
+ end
+ def tex_close #'{\UseTextSymbol{OML}{>}}'
+ Dx[:url_c]
+ end
+ def xml_open #'&lt;'
+ Dx[:url_o]
+ end
+ def xml_close #'&gt;'
+ Dx[:url_c]
+ end
+ def txt_open
+ '<'
+ end
+ def txt_close
+ '>'
+ end
+ self
+ end
+ def rel_decoration
+ def tex_open #'{\UseTextSymbol{OML}{<}}'
+ Dx[:rel_o]
+ end
+ def tex_close #'{\UseTextSymbol{OML}{>}}'
+ Dx[:rel_c]
+ end
+ def xml_open #'&lt;'
+ Dx[:rel_o]
+ end
+ def xml_close #'&gt;'
+ Dx[:rel_c]
+ end
+ def txt_open
+ '<'
+ end
+ def txt_close
+ '>'
+ end
+ self
+ end
+ #% color
+ def color_body
+ %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
+ end
+ def color_white
+ '"#ffffff"'
+ end
+ def color_black
+ '#000000'
+ end
+ def color_blue_ink
+ '#003399'
+ end
+ def color_blue_tinge
+ '#e3ecef'
+ end
+ def color_blue_grey
+ '#8faebf'
+ end
+ def color_blue_murky
+ '#437389'
+ end
+ def color_beige
+ '#f1e8de'
+ end
+ def color_subtleglow
+ '#dddccc'
+ end
+ def color_glow
+ '#fff0c3'
+ end
+ def color_rose
+ '#ffdec9'
+ end
+ def color_turquoise
+ '#1c869b'
+ end
+ def color_grey_pale
+ '#eeeeee'
+ end
+ def color_grey_medium
+ '#cccccc'
+ end
+ def color_grey
+ '#999999'
+ end
+ def color_yellow_light
+ '#fff3b6'
+ end
+ def color_yellow
+ '#ffde14'
+ end
+ def color_yellow_dark
+ '#ffcc00'
+ end
+ def color_green_light
+ '#b7d398' # #e2efd5 #b7d398 #b1c999 # '#aed19e'
+ end
+ def color_green
+ '#0a8400'
+ end
+ def color_green_dark
+ '#086800'
+ end
+ def color_ruby
+ '#a00000'
+ end
+ def color_maroon
+ '#800000'
+ end
+ def color_paper
+ %{"#{color_white}"}
+ end
+ def color_band1
+ %{"#{color_white}"}
+ end
+ def color_band2
+ %{"#{color_white}"}
+ end
+ def color_body
+ %{<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">}
+ end
+ def color_font_face #was font WATCH
+ "#{color_black}"
+ end
+ def color_surround
+ %{"#{color_white}"}
+ end
+ def color_band
+ %{"#{color_white}"}
+ end
+ def color_table1
+ 'ffffcc'
+ end
+ def color_table2
+ 'c0d0f0'
+ end
+ def color_band1
+ '"#ffffff"'
+ end
+ def color_band2
+ '"#ffffff"'
+ end
+ #% icon
+ def icon_ico
+ 'rb7.ico'
+ end
+ def icon_sisu
+ 'sisu.png'
+ end
+ def icon_manifest
+ 'b_info.png'
+ end
+ def icon_doc
+ 'b_doc.png'
+ end
+ def icon_toc
+ 'b_toc.png'
+ end
+ def icon_wmp
+ 'b_wmp.png'
+ end
+ def icon_odf
+ 'b_odf.png'
+ end
+ def icon_epub
+ 'b_epub.png'
+ end
+ def icon_pdf
+ 'b_pdf.png'
+ end
+ def icon_pdf_portrait
+ 'b_pdf.png'
+ end
+ def icon_pdf_landscape
+ 'b_pdf.png'
+ end
+ def icon_choice
+ 'b_choice.png'
+ end
+ def icon_new
+ 'b_new.png'
+ end
+ def icon_dot_clear
+ 'dot_clear.png'
+ end
+ def icon_dot_white
+ 'dot_white.png'
+ end
+ def icon_dot
+ icon_dot_white
+ end
+ def icon_home_button
+ 'sisu.png'
+ end
+ def icon_next
+ 'arrow_next_red.png'
+ end
+ def icon_previous
+ 'arrow_prev_red.png'
+ end
+ def icon_up
+ 'arrow_up_red.png'
+ end
+ #% font
+ def font_fonts
+ @fonts
+ end
+ def font_face
+ %{face="#{font_fonts}"}
+ end
+ def font_color
+ 'color="#000000"'
+ end
+ def font_size_endnote
+ 'size="3"'
+ end
+ def font_small
+ 'size="3"'
+ end
+ def font_tiny
+ 'size="2"'
+ end
+ #% markup
+ def markup_italics_list #regular expression of words to be italised
+ end
+ def markup_bold_list #regular expression of words to be made bold
+ 'SiSU'
+ end
+ def markup_make_italic
+ if defined? italics_list \
+ and italics_list
+ make={}
+ if italics_list
+ r=italics_list.dup
+ x=case r
+ when /\/i$/; 'i'
+ else ''
+ end
+ r=r.gsub(/^\/(.+?)\/i?/,'\1').
+ gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
+ m='\b(' + r + ')\b'
+ make[:str]
+ make[:regx]=(x =~/i/) \
+ ? (/#{m}/i)
+ : (/#{m}/)
+ else nil
+ end
+ end
+ end
+ def markup_make_bold
+ if defined? bold_list \
+ and not bold_list.empty?
+ make={}
+ if bold_list
+ r=bold_list.dup
+ x=case r
+ when /\/i$/; 'i'
+ else ''
+ end
+ r.gsub(/^\/(.+?)\/i?/,'\1').
+ gsub(/\(/,'(?:') # avoid need to escape use of brackets within regex provided
+ m='\b(' + r + ')\b'
+ make[:str]
+ make[:regx]=(x =~/i/) \
+ ? (/#{m}/i)
+ : (/#{m}/)
+ else nil
+ end
+ make
+ end
+ end
+ #% paragraph
+ def paragraph_txt
+ %{<p class="normal">}
+ end
+ def paragraph_endnote
+ %{<p class="endnote">}
+ end
+ def paragraph_font_tiny
+ %{<font #{font_tiny} #{font_face}>}
+ end
+ def paragraph_font_small
+ %{<font #{font_small} #{font_face}>}
+ end
+ #% table
+ def table_close
+ '</td></tr>
+</table>'
+ end
+ def table_width_1
+ '"100%"'
+ end
+ def table_width_2
+ '"99%"'
+ end
+ def table_width_txt
+ '"94%"'
+ end
+ def table_width_txt_r
+ '"96%"'
+ end
+ def table_cellpad_box
+ '"20"'
+ end
+ #% indent
+ def indent_level_0
+ '"1%"'
+ end
+ def indent_level_1
+ '"4%"'
+ end
+ def indent_level_2
+ '"6%"'
+ end
+ def indent_level_3
+ '"8%"'
+ end
+ def indent_level_4
+ '"10%"'
+ end
+ #% margin
+ def margin_num
+ '</p> </td><td width="4%" align="right" valign="top">'
+ end
+ def margin_numless
+ '</td><td width="4%" align="right" valign="top">'
+ end
+ def margin_num_css
+ '</td>
+<td width="2%" align="right" valign="top"> '
+ end
+ def margin_txt_w1
+ %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width="6%" align="right">&nbsp;</td>
+<td width="90%" valign="top" align="justify">}
+ end
+ def margin_txt_w2
+ %{<table summary="" width=#{table_width_txt_r} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width="10%" align="right">&nbsp;</td>
+<td width="86%" valign="top" align="justify">}
+ end
+ def margin_txt_0
+ %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width=#{indent_level_0} align="right">
+</td><td valign="top" align="justify">}
+ end
+ def margin_txt_1
+ %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width=#{indent_level_1} align="right"></td><td valign="top" align="justify">}
+ end
+ def margin_txt_2
+ %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width=#{indent_level_2} align="right">
+</td>
+<td valign="top" align="justify">}
+ end
+ def margin_txt_3
+ %{<table summary="" width=#{table_width_txt} border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td width=#{indent_level_3} align="right">
+</td>
+<td valign="top" align="justify">}
+ end
+ def margin_css
+ '<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
+<tr><td valign="top" align="justify"> '
+ end
+ #% png
+ def png_ico
+ %{ <link rel="shortcut icon" href="../_sisu/image/#{icon_ico}" />}
+ end
+ def png_sisu #check url path
+ %{ <a href="#{@url.sisu}">
+ <img border="0" width="160" height="60" src="#{url_path_image}/#{icon_sisu}" alt="SiSU" />
+ </a>}
+ end
+ def png_site
+ %{<img src="#{url_path_image}/#{icon_site}" alt="@" border="0" />}
+ end
+ def png_nav
+ %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_bluebell}" alt="Contents" />}
+ end
+ def png_manifest
+ %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_manifest}" alt="Document Manifest" />}
+ end
+ def png_doc
+ %{<img border="0" height="15" width="15" src="#{url_path_image_sys}/#{icon_doc}" alt="Full Text" />}
+ end
+ def png_toc
+ %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_toc}" alt="TOC linked" />}
+ end
+ def png_odf
+ %{<img border="0" height="18" width="18" src="#{url_path_image_sys}/#{icon_odf}" alt="ODF/ODT" />}
+ end
+ def png_epub
+ %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_epub}" alt="EPUB" />}
+ end
+ def png_pdf
+ %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF" />}
+ end
+ def png_pdf_portrait
+ %{<img border="0" height="18" width="15" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF portrait" />}
+ end
+ def png_pdf_landscape
+ %{<img border="0" height="15" width="18" src="#{url_path_image_sys}/#{icon_pdf}" alt="PDF landscape" />}
+ end
+ def png_home
+ #dir=SiSU_Env::InfoEnv.new #(@fns)
+ %{<img border="0" src="#{url_path_image_base}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
+ #%{<img border="0" src="#{dir.url.images_local}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
+ end
+ def png_home_button
+ rel=@dir.path_rel_links.html_scroll_2
+ %{<img border="0" src="#{rel}/#{icon_home_button}" alt="#{txt_home} --&gt;" />}
+ end
+ #% png_nav #not currently used
+ #% nav_txt
+ def nav_txt_homepage
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;home&nbsp;
+ </font> }
+ end
+ def nav_txt_toc_link
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;&nbsp;toc&nbsp;
+ </font> }
+ end
+ def nav_txt_doc_link
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;scroll&nbsp;
+ </font> }
+ end
+ def nav_txt_manifest
+ #{png_manifest}&nbsp;document&nbsp;manifest
+ %{ <font face="#{font_fonts}" size="2">
+ [&nbsp;document&nbsp;manifest&nbsp;]
+ </font> }
+ end
+ def nav_txt_concordance
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;&nbsp;A-Z&nbsp;
+ </font> }
+ end
+ def nav_txt_pdf_portrait
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;pdf&nbsp;
+ </font> }
+ end
+ def nav_txt_pdf_landscape
+ %{ <font face="#{font_fonts}" size="2">
+ &nbsp;pdf&nbsp;
+ </font> }
+ end
+ #% banner
+ def banner_home_button_only
+ %{<a href="#{url_site}/">
+ #{png_home_button}
+ </a>}
+ end
+ def banner_band #yellow_dark now white
+ %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center">
+<tr><td align="left" valign="middle" bgcolor="#{color_white}">
+ <a href="#{url_site}/" target="_top">
+ #{png_home}
+ </a>
+</td>
+<td width="90%">
+#{table_close}}
+ end
+ def banner_instrument_cover_band_scr
+ '<table summary="scroll instrument cover band" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
+<tr><td align="center">'
+ end
+ def banner_instrument_cover_band_seg
+ '<table summary="segment instrument cover band, title, author, location" width="100%" border="0" cellpadding="8" bgcolor="#ffffff" align="center">
+<tr><td align="center">'
+ end
+ #% widget
+ def widget_promo # Array used to build promo from list.yml and promo.yml
+ # ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
+ end
+ def widgets_open
+<<WOK
+<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
+WOK
+ end
+ def widget_sisu_text
+<<WOK
+ <p class="tiny"><font color="#666666" size="2">
+ Output generated by
+ <a href="#{url_sisu}">
+ #{@v[:project]}
+ </a>
+ #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
+ </font></p>
+WOK
+ end
+ def widget_sisu
+<<WOK
+<!-- widget sisu -->
+<tr><td valign="top" width="100%">
+<!-- SiSU Rights -->
+#{widget_sisu_text}
+</td></tr>
+WOK
+ end
+ def widget_sisu_verbose
+<<WOK
+<!-- widget sisu -->
+<tr><td valign="top" width="10%">
+ <p class="tiny_left"><font color="#666666" size="2">
+ <a href="#{url_sisu}">
+ <img border="0" src="../_sisu/image/sisu.png" alt="SiSU" width="120" height="39" />
+ </a>
+ </font></p>
+</td><td valign="top" width="45%">
+<!-- SiSU Rights -->
+ <p class="tiny_left"><font color="#666666" size="2">
+ Output generated by
+ <a href="#{url_sisu}">
+ #{@v[:project]}
+ </a>
+ #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
+ <br />
+ <a href="#{url_sisu}">
+ <b>#{@v[:project]}</b>
+ </a>
+ Copyright <sup>&copy;</sup> Ralph Amissah
+ 1997, current #{@date.year_static}.
+ All Rights Reserved.
+ <br />
+ <a href="#{url_sisu}">
+ #{@v[:project]}
+ </a>
+ is software for document structuring, publishing and search,
+ <br />
+ <a href="#{url_sisu}">
+ www.sisudoc.org/
+ </a>
+ and
+ <a href="#{url_sisudoc}">
+ www.sisudoc.org
+ </a>
+ <br />
+ <i>w3 since October 3 1993</i>
+ <a href="mailto:ralph@amissah.com">
+ ralph@amissah.com
+ </a>
+ </font></p>
+</td><td valign="top" width="45%">
+ <p class="tiny_left"><font color="#666666" size="2">
+ #{@v[:project]} using:
+ <br />Standard SiSU markup syntax,
+ <br />Standard SiSU meta-markup syntax, and the
+ <br />Standard SiSU <u>object citation numbering</u> and system, (object/text positioning system)
+ <br />
+ Copyright <sup>&copy;</sup> Ralph Amissah 1997, current #{@date.year_static}.
+ All Rights Reserved.
+ </font></p>
+</td></tr>
+WOK
+ end
+ def widget_way_better
+ <<WOK
+<!-- widget way better -->
+<tr><td valign="top" width="10%">
+ <p class="tiny_left"><font color="#666666" size="2">
+ <a href="http://www.gnu.org/licenses/gpl.html">
+ <img border="0" src="../_sisu/image/gplv3_free_software.png" alt="GPLv3" width="127" height="51" />
+ </a>
+ </font></p>
+</td><td valign="top" width="45%">
+ <p class="tiny_left"><font color="#666666" size="2">
+ <a href="#{url_sisu}">
+ #{@v[:project]}
+ </a>
+ is released under
+ <a href="http://www.gnu.org/licenses/gpl.html">GPLv3</a>
+ or later,
+ #{url_decoration.xml_open}<a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>#{url_decoration.xml_close}
+ </font></p>
+</td><td valign="top" width="45%">
+ <p class="tiny_left"><font color="#666666" size="2">
+ #{@v[:project]}, developed using
+ <a href="http://www.ruby-lang.org/en/">
+ Ruby
+ </a>
+ on
+ <a href="http://www.debian.org/">
+ Debian/Gnu/Linux
+ </a>
+ software infrastructure,
+ with the usual GPL (or OSS) suspects.
+ <br />
+ Better - "performance, reliability, scalability, security &amp; total cost of ownership"
+ [not to mention flexibility &amp; choice] use of and adherence to open standards (where practical and fair) and it is software libré.
+ <br />
+ Get With the Future
+ <a href="http://www.sisudoc.org/">
+ Way Better!
+ </a>
+ </font></p>
+</td></tr>
+WOK
+ end
+ #% credits
+ def credits_sisu_manifest
+ widget_sisu_text
+ end
+ def credits_sisu
+ x=%{<div class="substance">
+<table summary="SiSU summary" bgcolor="#ffffff" cellpadding="4" border="0">
+<tr><td>
+ #{widget_sisu}
+ #{widget_way_better}
+</table></div>}
+ ''
+ end
+ def credits_splash
+ end
+ def credits_sisu_epub
+ x=%{<div class="substance">
+<p class="center"><a href="http://www.openebook.org"><b>EPUB</b></a> generated by <a href="http://www.sisudoc.org"><b>#{@v[:project]}</b></a> v#{@v[:version]}, GPL3</p>
+</div>}
+ ''
+ end
+ end
+ class Home < Defaults
+ def initialize
+ @v=SiSU_Env::InfoVersion.instance.get_version
+ @dir=SiSU_Env::InfoEnv.new
+ @date=SiSU_Env::InfoDate.new #{@date.year}
+ end
+ def redirect
+ <<WOK
+<html><head>
+<title>SiSU</title>
+<meta http-equiv="refresh" content="0, url=http://www.sisudoc.org/sisu/SiSU/">
+</head>
+<body>
+SiSU informtion provided at <a href="http://www.sisudoc.org/sisu/SiSU/">www.sisudoc.org/sisu/SiSU</a><p />
+If your browser supports redirection, you will be escorted there shortly.
+</body>
+</html>
+WOK
+ end
+ def homepage
+ <<WOK
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<title>SiSU information Structuring Universe - Structured information, Serialized Units - software for electronic texts, documents, books, digital libraries in plaintext, HTML, EPUB, XHTML, XML, ODF (OpenDocument), LaTeX, PDF, SQL (PostgreSQL and SQLite), and for search</title>
+<meta name="dc.title" content="SiSU - SiSU information Structuring Universe, Structured information Serialised Units, #{@date.year_static}" />
+<meta name="dc.creator" content="Ralph Amissah" />
+<meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, EPUB, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
+<meta name="dc.publisher" content= "SiSU http://www.sisudoc.org/" />
+<meta name="dc.language" content="en" />
+<meta name="dc.rights" content="Copyright Ralph Amissah" />
+<meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
+<link rel="generator" href="http://www.sisudoc.org/" />
+<link rel="stylesheet" href="./#{@dir.path.style}/harvest.css" type="text/css" />
+<link rel="shortcut icon" href="./_sisu/image/rb7.ico" />
+</head>
+
+<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+<a name="top" id="top"></a>
+<a name="up" id="up"></a>
+<a name="start" id="start"></a>
+
+<h1>SiSU</h1>
+<p>
+[<a href="http://sisudoc.org/sisu_manual/en/html/sisu/toc.html">Manual</a>]
+</p>
+<p>
+[<a href="http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary">Source</a>]
+[<a href="http://lists.sisudoc.org/listinfo/sisu">List Info (sisu@lists.sisudoc.org)</a>]
+</p>
+
+<h1>SiSU Markup Samples</h1>
+<p>
+[<a href="http://sources.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary">Source</a>]
+[<a href="http://sisudoc.org/sisu_markup_samples.html">Output</a>]
+</p>
+
+<hr />
+
+<h2 class="top_band_tiny">
+ Structured information, Serialized Units
+ &nbsp;&nbsp;
+ <a href="http://www.sisudoc.org" target="_top">
+ &lt;www.sisudoc.org&gt;
+ </a>
+ &nbsp;&nbsp;or&nbsp;&nbsp;
+ <a href="http://www.jus.uio.no/sisu/" target="_top">
+ &lt;www.jus.uio.no/sisu/&gt;
+ </a>
+software for electronic texts, document collections, books, digital libraries &amp; search, with "atomic search" &amp; text locating system (shared object citation numbering: "<i>ocn</i>").
+Outputs include: plaintext, HTML, EPUB, ODT (OpenDocumentText), (XHTML, XML,) LaTeX, PDF, SQL (PostgreSQL and SQLite).
+</h2>
+<p class="small">
+<a href="mailto:sisu@lists.sisudoc.org">
+&lt;sisu@lists.sisudoc.org&gt;
+</a>
+<a href="http://lists.sisudoc.org/listinfo/sisu">
+&lt;http://lists.sisudoc.org/listinfo/sisu&gt;
+</a>
+</p>
+<p class="small">
+<a href="mailto:ralph@amissah.com">
+&lt;ralph@amissah.com&gt;
+</a>
+<a href="mailto:ralph.amissah@gmail.com">
+&lt;ralph.amissah@gmail.com&gt;
+</a>
+</p>
+<p class="tiny">
+#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!), #{@date.year_static}.
+</p>
+<p class="tiny">
+w3 since October 3 1993.
+</p>
+</body>
+</html>
+WOK
+ end
+ def home_toc
+ ' '
+ end
+ end
+ class Inserts
+ end
+ class TeX < Defaults
+ def initialize(papersize='')
+ @papersize=papersize
+ end
+ def a4
+ def portrait
+ def w
+ 160
+ end
+ def h
+ 228
+ end
+ def img_px
+ 450
+ end
+ self
+ end
+ def landscape
+ def w
+ 238
+ end
+ def h
+ 160
+ end
+ def img_px
+ 300
+ end
+ self
+ end
+ self
+ end
+ def letter
+ def portrait
+ def w
+ 166
+ end
+ def h
+ 212
+ end
+ def img_px
+ 468
+ end
+ self
+ end
+ def landscape
+ def w
+ 226
+ end
+ def h
+ 166
+ end
+ def img_px
+ 290
+ end
+ self
+ end
+ self
+ end
+ def legal
+ def portrait
+ def w
+ 168
+ end
+ def h
+ 286
+ end
+ def img_px
+ 474
+ end
+ self
+ end
+ def landscape
+ def w
+ 296
+ end
+ def h
+ 166
+ end
+ def img_px
+ 420
+ end
+ self
+ end
+ self
+ end
+ def b5
+ def portrait
+ def w
+ 140
+ end
+ def h
+ 204
+ end
+ def img_px
+ 356
+ end
+ self
+ end
+ def landscape
+ def w
+ 200
+ end
+ def h
+ 130
+ end
+ def img_px
+ 260
+ end
+ self
+ end
+ self
+ end
+ def a5
+ def portrait
+ def w
+ 112
+ end
+ def h
+ 162
+ end
+ def img_px
+ 280
+ end
+ self
+ end
+ def landscape
+ def w
+ 152
+ end
+ def h
+ 100
+ end
+ def img_px
+ 190
+ end
+ self
+ end
+ self
+ end
+ def dimensions
+ d=case @papersize
+ when /a4/; a4
+ when /letter/; letter
+ when /legal/; legal
+ when /b5/; b5
+ when /a5/; a5
+ else a4
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v3/digests.rb b/lib/sisu/v5/digests.rb
index d3c3f8c3..902a0e94 100644
--- a/lib/sisu/v3/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/digests.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/digests.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -87,7 +87,6 @@ module SiSU_DigestView
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").flow if @opt.cmd =~/[MV]/
end
SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
- SiSU_Env::InfoSkin.new(@md).select
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -233,7 +232,7 @@ module SiSU_DigestView
end
else
prefix=''
- metad=[@tr.full_title,@tr.author,@tr.translator,@tr.illustrator,@tr.prepared_by,@tr.digitized_by,@tr.description,@tr.subject,@tr.abstract,@tr.publisher,@tr.contributor,@tr.date_created,@tr.date_issued,@tr.date_available,@tr.date_modified,@tr.date_valid,@tr.date,@tr.type,@tr.format,@tr.rights,@tr.identifier,@tr.source,@tr.language,@tr.language_original,@tr.relation,@tr.coverage,@tr.keywords,@tr.comments,@tr.cls_loc,@tr.cls_dewey,@tr.cls_gutenberg,@tr.cls_isbn,@tr.prefix_a,@tr.prefix_b,@tr.sourcefile,@tr.sourcefile_digest,@tr.last_generated,@tr.sisu_version,@tr.ruby_version,@tr.sc_number,@tr.sc_date,'Skin_Digest: ','Generated by: ','Ruby version: ']
+ metad=[@tr.full_title,@tr.author,@tr.translator,@tr.illustrator,@tr.prepared_by,@tr.digitized_by,@tr.description,@tr.subject,@tr.abstract,@tr.publisher,@tr.contributor,@tr.date_created,@tr.date_issued,@tr.date_available,@tr.date_modified,@tr.date_valid,@tr.date,@tr.type,@tr.format,@tr.rights,@tr.identifier,@tr.source,@tr.language,@tr.language_original,@tr.relation,@tr.coverage,@tr.keywords,@tr.comments,@tr.cls_loc,@tr.cls_dewey,@tr.cls_gutenberg,@tr.cls_isbn,@tr.prefix_a,@tr.prefix_b,@tr.sourcefile,@tr.sourcefile_digest,@tr.last_generated,@tr.sisu_version,@tr.ruby_version,@tr.sc_number,@tr.sc_date,'Generated by: ','Ruby version: ']
metad.each do |n|
m=rgx_txt(n)
if m=~/\S+/ \
@@ -261,8 +260,6 @@ module SiSU_DigestView
@c=/#{m_author}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
when /#{m_sourcefile_digest}.+?<u>/ #watch
dgst_extra="\n" + ' '*21 +'source' +' '*4 + @md.dgst[1] + ' '*34 + @md.fns
- when /Skin_Digest: /
- dgst_extra="\n" + ' '*21 + 'skin' +' '*6 + @md.dgst_skin[1] + ' '*34 + /(skin_\S+?\.rb)/.match(@md.dgst_skin[0])[1]
when /#{m_sisu_version}: /
@v=/#{m_sisu_version}: (.+?)#{Mx[:id_o]}~\d;(?:\w|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}[0-9a-f]{#{@dl}}:[0-9a-f]{#{@dl}}#{Mx[:id_c]}/.match(para)[1].gsub(/<\/?u>/,'').strip
when /#{m_last_generated}: /
diff --git a/lib/sisu/v3/embedded.rb b/lib/sisu/v5/embedded.rb
index 2b1e7596..a75b1690 100644
--- a/lib/sisu/v3/embedded.rb
+++ b/lib/sisu/v5/embedded.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/embedded.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/embedded.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v5/epub.rb
index e7325bcd..480474e1 100644
--- a/lib/sisu/v3/epub.rb
+++ b/lib/sisu/v5/epub.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/epub.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -99,7 +99,6 @@ module SiSU_EPUB
@env.processing_path.epub_bld #(@md)
@env.processing_path.epub_cp_images(@md)
dir_epub=@env.processing_path.epub
- SiSU_Env::InfoSkin.new(@md).select
data=nil
SiSU_Env::FileOp.new(@md).mkdir.output.epub
@tuned_file_array=SiSU_EPUB::Source::XHTML_Environment.new(@particulars).tuned_file_instructions
@@ -136,7 +135,7 @@ module SiSU_EPUB
def initialize(particulars)
@particulars=particulars
@md,@env=particulars.md,particulars.env
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env,@css=particulars.env,SiSU_Style::CSS.new
end
def directories
@@ -145,7 +144,6 @@ module SiSU_EPUB
end
def tuned_file_instructions
@tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
- @md.opt.cmd=@md.opt.cmd.gsub(/H/,'h')
directories
dal_array=@particulars.dal_array # dal file drawn here
@tuned_file_array=SiSU_EPUB_Tune::Tune.new(dal_array,@md).songsheet
@@ -191,7 +189,7 @@ module SiSU_EPUB
@@firstseg=nil
def initialize(md=nil,data='')
@md,@data=md,data
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@epub=SiSU_EPUB_Format::HeadInformation.new(@md)
@tell=SiSU_Screen::Ansi.new(@md.opt.cmd) if @md
@make=SiSU_Env::ProcessingSettings.new(@md)
@@ -213,6 +211,13 @@ module SiSU_EPUB
@@toc[:opf] << @epub.metadata_opf.manifest_open
@@toc[:seg] << %{<div class="content">\n<div class="substance">}
@@toc[:scr] << %{<div class="content">\n<div class="substance">}
+ if defined? @md.make.cover_image \
+ and @md.make.cover_image.is_a?(Hash) \
+ and @md.make.cover_image[:cover] =~/\S+/
+ md_opf_a_content << @epub.metadata_opf.manifest_cover_image_information(@md)
+ md_opf_a_spine << @epub.metadata_opf.spine_cover_image
+ md_opf_a_guide << @epub.metadata_opf.guide_cover_image
+ end
md_opf_a_content << @epub.metadata_opf.manifest_content_sisu_toc
if @make.build.toc?
md_opf_a_spine << @epub.metadata_opf.spine_sisu_toc
@@ -229,7 +234,7 @@ module SiSU_EPUB
toc=case dob_toc.ln
when 1
@s_a_no +=1
- name_s_a='section_a' + @s_a_no.to_s
+ lv_name='section_a' + @s_a_no.to_s
@nav_no+=1
@nav_no2=@nav_no
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@@ -239,21 +244,21 @@ module SiSU_EPUB
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[2]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[1]
@ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6]=true,false,false,false,false,false
- @epub.sections(dob_toc,name_s_a)
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,name_s_a) if dob_toc
+ @epub.sections(dob_toc,lv_name)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name) if dob_toc
if @level_a_first_occurrence \
&& @make.build.toc?
@nav_no+=1
@@toc[:ncx] << @epub.toc_ncx.navmap_sisu_toc(@nav_no) #epub ncx navmap, toc
@level_a_first_occurrence=false
end
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_a)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_a)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_a)
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_1
when 2
@s_b_no +=1
- name_s_b='section_b' + @s_b_no.to_s
+ lv_name='section_b' + @s_b_no.to_s
@nav_no+=1
@nav_no2=@nav_no
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@@ -262,15 +267,15 @@ module SiSU_EPUB
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[2]
@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6]=true,false,false,false,false
- @epub.sections(dob_toc,name_s_b)
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,name_s_b) if dob_toc
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_b)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_b)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_b)
+ @epub.sections(dob_toc,lv_name)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name) if dob_toc
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_2
when 3
@s_c_no +=1
- name_s_c='section_c' + @s_c_no.to_s
+ lv_name='section_c' + @s_c_no.to_s
@nav_no+=1
@nav_no3=@nav_no
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@@ -278,47 +283,50 @@ module SiSU_EPUB
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[4]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6]=true,false,false,false
- @epub.sections(dob_toc,name_s_c)
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,name_s_c) if dob_toc
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_s_c)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_s_c)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_s_c)
+ @epub.sections(dob_toc,lv_name)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name) if dob_toc
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_3
when 4
@ncx_cls=[]
+ lv_name=dob_toc.name
@nav_no+=1
@dob_name=dob.name
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[5]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[4]
@ncxo[4],@ncxo[5],@ncxo[6]=true,false,false
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no) if dob_toc
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name) if dob_toc
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_4
when 5
@ncx_cls=[]
- name_lv5=@dob_name + '.xhtml' + '#o' + dob_toc.ocn.to_s
+ hashtag='#o' + dob_toc.ocn.to_s
+ lv_name=@dob_name
@nav_no+=1
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[5]
@ncxo[5],@ncxo[6]=true,false
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,name_lv5) if dob_toc
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_lv5)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_lv5)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_lv5)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name,hashtag) if dob_toc
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name,hashtag)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name,hashtag)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name,hashtag)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_5
when 6
@ncx_cls=[]
- name_lv6=@dob_name + '.xhtml' + '#o' + dob_toc.ocn.to_s
+ hashtag='#o' + dob_toc.ocn.to_s
+ lv_name=@dob_name
@nav_no+=1
@@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
@ncxo[6]=true
- @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,name_lv6) if dob_toc
- md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,name_lv6)
- md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,name_lv6)
- md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,name_lv6)
+ @@toc[:ncx] << @epub.toc_ncx.navpoint(dob_toc,@nav_no,lv_name,hashtag) if dob_toc
+ md_opf_a_content << @epub.metadata_opf.manifest_content(dob_toc,lv_name,hashtag)
+ md_opf_a_spine << @epub.metadata_opf.spine(dob_toc,lv_name,hashtag)
+ md_opf_a_guide << @epub.metadata_opf.guide(dob_toc,lv_name,hashtag)
SiSU_EPUB::Source::Toc.new(@md,dob_toc).level_6
else nil
end
@@ -515,7 +523,7 @@ module SiSU_EPUB
class ScrollHeadAndSegToc < Toc
def initialize(md='',toc='',links_guide_toc='')
@md,@toc,@links_guide_toc=md,toc,links_guide_toc
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def in_common
toc_shared=[]
@@ -545,7 +553,7 @@ module SiSU_EPUB
segtoc << format_txt_obj.center_bold
if defined? @md.creator.author \
and @md.creator.author
- creator_endnote=@md.creator.author.gsub(/(\*+)/,%{&nbsp;<sup><a href="#notes">\\1</a></sup>})
+ creator_endnote=@md.creator.author.gsub(/(\*+)/,%{#{$ep[:hsp]}<sup><a href="#notes">\\1</a></sup>})
tmp_head=creator_endnote + "\n"
txt_obj={ txt: tmp_head }
format_txt_obj=SiSU_EPUB_Format::FormatTextObject.new(@md,txt_obj)
@@ -584,7 +592,8 @@ module SiSU_EPUB
#Segtoc tail added here
segtoc << format_head_toc.xhtml_close
segtoc=segtoc.flatten.compact #watch
- SiSU_EPUB::Source::Output.new(@md,segtoc).segtoc
+ SiSU_EPUB::Source::Output.new(@md).make_cover_image
+ SiSU_EPUB::Source::Output.new(@md,segtoc).make_segtoc
segtoc=[]
@toc[:scr],@toc[:seg]=[],[]
toc_shared
@@ -692,7 +701,44 @@ module SiSU_EPUB
end
end
end
- def segtoc
+ def make_cover_image
+ begin
+ if @md.make.cover_image? \
+ and @md.make.cover_image.is_a?(Hash) \
+ and @md.make.cover_image[:cover] =~/\S+/
+ filename_xhtml=@make_file.epub.xhtml_cover_image
+ cover_image=<<WOK
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>Cover</title>
+ <meta http-equiv="Content-Type" content='text/html; charset=utf-8' />
+ <link rel="stylesheet" href="css/xhtml.css" type="text/css" />
+ <style type="text/css"> img { max-width: 100%; } </style>
+ </head>
+ <body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
+ <div class="svg_outer">
+ <div class="svg_inner">
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 #{@md.make.cover_image[:w]} #{@md.make.cover_image[:h]}" preserveAspectRatio="xMidYMid meet">
+ <image width="#{@md.make.cover_image[:w]}" height="#{@md.make.cover_image[:h]}" xlink:href="image/#{@md.make.cover_image[:cover]}" />
+ </svg>
+ </div>
+ </div>
+ </body>
+</html>
+WOK
+ filename_xhtml.puts cover_image,"\n"
+ filename_xhtml.close
+ end
+ rescue
+ SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ end
+ end
+ def make_segtoc
begin
if @make.build.toc?
filename_xhtml=@make_file.epub.xhtml_index
diff --git a/lib/sisu/v3/epub_concordance.rb b/lib/sisu/v5/epub_concordance.rb
index 4a63df91..e528a788 100644
--- a/lib/sisu/v3/epub_concordance.rb
+++ b/lib/sisu/v5/epub_concordance.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/epub_concordance.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_concordance.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -103,13 +103,12 @@ module SiSU_EPUB_Concordance
def initialize(particulars)
@particulars,@md=particulars,particulars.md
@data=SiSU_EPUB::Source::XHTML_Environment.new(particulars).tuned_file_instructions
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
txt_path=%{#{@md.dir_out}}
- SiSU_Env::InfoSkin.new(@md).select
@fnb=@md.fnb
- @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home --&gt;"></a>}
+ @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>}
@doc_details =<<WOK
-<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">&nbsp;</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table>
+<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">#{$ep[:hsp]}</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table>
WOK
end
def create
@@ -127,7 +126,7 @@ WOK
[if number of occurences exceed number of references - word occurs more than once in at least one reference. Footnote/endnotes are either assigned to the paragraph from which they are referenced or ignored, so it is relevant to check the footnotes referenced from within a paragraph as well.]
</p>
<p>
- (After the page is fully loaded) you can jump directly to a word by appending a hash (#) and the word to the url for this text, (do not forget that words are case sensitive, and may be listed twice (starting with and without an upper case letter)), #your_word # [&nbsp;http://[web host]/#{@fnb}/concordance.html#your_word&nbsp;]
+ (After the page is fully loaded) you can jump directly to a word by appending a hash (#) and the word to the url for this text, (do not forget that words are case sensitive, and may be listed twice (starting with and without an upper case letter)), #your_word # [#{$ep[:hsp]}http://[web host]/#{@fnb}/concordance.html#your_word#{$ep[:hsp]}]
</p>
WOK
end
@@ -157,7 +156,7 @@ WOK
def initialize(particulars)
@particulars=particulars
begin
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
@path="#{@env.processing_path.epub}"
@freq=Hash.new(0)
@@ -289,12 +288,12 @@ WOK
end
end
end
- scr='<font size="1" color="#777777" face=times new roman><img border="0" height="15" width="15" src="../_sisu/image/b_doc.png" alt="Full Text">&nbsp;scroll:&nbsp;</font><font size="1" color="#222222" face=times new roman>doc#&nbsp;</font> '
+ scr=%{<font size="1" color="#777777" face=times new roman><img border="0" height="15" width="15" src="../_sisu/image/b_doc.png" alt="Full Text">#{$ep[:hsp]}scroll:#{$ep[:hsp]}</font><font size="1" color="#222222" face=times new roman>doc##{$ep[:hsp]}</font> }
seg=''
@file_concordance << SiSU_EPUB_Concordance::Source::DocTitle.new(@particulars).create
alph=%W[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
@file_concordance << '<p>'
- alph.each {|x| @file_concordance << %{<a href="##{x}">#{x}</a>,&nbsp;}}
+ alph.each {|x| @file_concordance << %{<a href="##{x}">#{x}</a>,#{$ep[:hsp]}}}
@file_concordance << '</p>'
letter=alph.shift
@file_concordance << %{\n<p class="letter"><a name="A">A</a></p>}
diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v5/epub_format.rb
index 228c2df4..75967653 100644
--- a/lib/sisu/v3/epub_format.rb
+++ b/lib/sisu/v5/epub_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/epub_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -65,33 +65,31 @@ module SiSU_EPUB_Format
def initialize(md,ocn)
@md,@ocn=md,ocn.to_s
@ocn ||=''
- vz=SiSU_Env::GetInit.instance.skin
end
def ocn_display
make=SiSU_Env::ProcessingSettings.new(@md)
if make.build.ocn?
ocn_class='ocn'
- if @ocn.to_i==0
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}">&nbsp;</label>})
+ if @ocn==nil \
+ or @ocn.to_i==0 \
+ or @ocn.empty?
+ %{<label class="ocn_off"></label>}
else
@ocn.gsub(/^(\d+|)$/,
%{<label class="#{ocn_class}"><a href="#o\\1" class="lnk#{ocn_class}">\\1</a></label>})
end
else
- ocn_class='ocn_off'
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}">&nbsp;</label>})
+ %{<label class="ocn_off"></label>}
end
end
def name
- %{<a name="#{@ocn}"></a>}
+ (@ocn==nil || @ocn.empty?) ? '' : %{<a name="#{@ocn}"></a>}
end
def id #w3c? "tidy" complains about numbers as identifiers ! annoying
- %{id="o#{@ocn}"}
+ (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"}
end
def goto
- %{<a href="##{@ocn}">}
+ (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn}">}
end
end
class CSS
@@ -1221,25 +1219,36 @@ module SiSU_EPUB_Format
WOK
end
end
+ module SanitizeXML
+ def self.xml(x)
+ if x.is_a?(String)
+ x=x.gsub(/&nbsp;/,' ') if Ep[:alt]==:on
+ x.gsub(/&/,'&amp;').
+ gsub(/</,"&lt;").gsub(/>/,"&gt;").
+ gsub(/#{Dx[:url_o]}/,Dx[:url_o_xml]).gsub(/#{Dx[:url_c]}/,Dx[:url_o_xml]).
+ #gsub(/</,'&#60;').gsub(/>/,'&#62;').
+ gsub(/\\\\/,'<br />').
+ gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ else x
+ end
+ end
+ end
class HeadInformation
include SiSU_Viz
attr_reader :md,:rdf,:vz
def initialize(md)
@md=md
# DublinCore 1 - title
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@css=SiSU_Env::CSS_Stylesheet.new(md)
@seg_name_xhtml=(SiSU_EPUB::Source::Seg.new.seg_name_xhtml || [])
@seg_name_xhtml_tracker=(SiSU_EPUB::Source::Seg.new.seg_name_xhtml_tracker || [])
- @index='index'
- @metalink='#metadata'
@tocband_scroll,@tocband_segtoc=nil,nil
+ @index,@metalink='index','#metadata'
end
def doc_type_xhtml
<<-WOK
<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
WOK
end
@@ -1291,31 +1300,31 @@ application/epub+zip
</container>
WOK
end
- def sections(dob,name)
- filename="#{name}#{Sfx[:epub_xhtml]}"
- dir_epub_cont="#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}"
- segfilename="#{dir_epub_cont}/#{filename}"
+ def sections(dob,fn_base)
+ name=fn_base + Sfx[:epub_xhtml]
+ dir_epub_cont=@md.env.processing_path.epub + '/' + Ep[:d_oebps]
+ segfilename=dir_epub_cont + '/' + name
output_epub_cont_seg=File.new(segfilename,'w')
output_epub_cont_seg << %{#{doc_type}
-<head>
- <title>
- #{dob.obj} -
- #{@md.html_title}
- </title>
-<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-#{@css.xhtml_epub}
-</head>
-#{@vz.color_body}
-<div class="content">
- <div class="substance">
- <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label>
- <h1 class="norm" id="o#{dob.ocn}">
- #{dob.obj}
- </h1>
- </div>
-</div>
-</body>
-</html>}
+ <head>
+ <title>
+ #{dob.obj} -
+ #{@md.html_title}
+ </title>
+ <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+ #{@css.xhtml_epub}
+ </head>
+ #{@vz.color_body}
+ <div class="content">
+ <div class="substance">
+ <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label>
+ <h1 class="norm" id="o#{dob.ocn}">
+ #{dob.obj}
+ </h1>
+ </div>
+ </div>
+ </body>
+ </html>}
output_epub_cont_seg.close
end
def toc_ncx #list of navigation points (like chapters), table of contents, listing each navigation point (chapters and such) under the navigation map
@@ -1333,9 +1342,7 @@ output_epub_cont_seg.close
end
def open
<<-WOK
-<?xml version="1.0"?>
-<!DOCTYPE ncx PUBLIC "-//NISO//DTD ncx 2005-1//EN"
- "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd">
+<?xml version='1.0' encoding='utf-8'?>
<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
WOK
end
@@ -1351,10 +1358,12 @@ output_epub_cont_seg.close
end
def head
depth=@md.lvs[1] + @md.lvs[2] + @md.lvs[3] + @md.lvs[4]
+ title=SanitizeXML.xml(@md.title.full)
+ author=SanitizeXML.xml(@md.author)
<<-WOK
<!-- four required metadata items (for all NCX documents,
(including the relaxed constraints of OPS 2.0) -->
- <title>#{@md.title.full} by #{@md.author}</title>
+ <title>#{title} by #{author}</title>
<link href="css/xhtml.css" rel="stylesheet" type="text/css" id="main-css" />
<meta name="dtb:uid" content="urn:uuid:#{@md.dgst[1]}" />
<!-- <meta name="epub-creator" content="#{@md.publisher}" /> -->
@@ -1369,16 +1378,18 @@ output_epub_cont_seg.close
WOK
end
def doc_title
+ txt=SanitizeXML.xml(@md.title.full)
<<-WOK
<docTitle>
- <text>#{@md.title.full}</text>
+ <text>#{txt}</text>
</docTitle>
WOK
end
def doc_author
+ txt=SanitizeXML.xml(@md.author)
<<-WOK
<docAuthor>
- <text>#{@md.author}</text>
+ <text>#{txt}</text>
</docAuthor>
WOK
end
@@ -1392,31 +1403,31 @@ output_epub_cont_seg.close
? ''
: "-#{no}"
<<-WOK
- <navPoint id="navpoint#{id_u}" playOrder="#{no}">
- <navLabel>
- <text>Table of Contents</text>
- </navLabel>
- <content src="index#{Sfx[:epub_xhtml]}" />
- </navPoint>
+ <navPoint id="navpoint#{id_u}" playOrder="#{no}">
+ <navLabel>
+ <text>Table of Contents</text>
+ </navLabel>
+ <content src="index#{Sfx[:epub_xhtml]}" />
+ </navPoint>
WOK
end
- def navpoint(dob,no,name=nil)
- name=name ? name : dob.name
- cont_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ def navpoint(dob,no,fn_base,hashtag=nil)
+ fn=fn_base + Sfx[:epub_xhtml]
+ name=hashtag ? fn + hashtag : fn
id_u=DISABLE[:epub][:ncx_navpoint_unique_id] \
? ''
: "-#{no}"
<<-WOK
- <navPoint id="navpoint#{id_u}" playOrder="#{no}">
- <navLabel>
- <text>#{dob.obj}</text>
- </navLabel>
- <content src="#{cont_name}" />
+ <navPoint class="chapter" id="navpoint#{id_u}" playOrder="#{no}">
+ <navLabel>
+ <text>#{dob.obj}</text>
+ </navLabel>
+ <content src="#{name}" />
WOK
end
def navpoint_close
<<-WOK
- </navPoint>
+ </navPoint>
WOK
end
def navmap_close
@@ -1442,7 +1453,7 @@ output_epub_cont_seg.close
def package_open
<<-WOK
<?xml version='1.0' encoding='utf-8'?>
-<package xmlns="http://www.idpf.org/2007/opf" unique-identifier="EPB-UUID" version="2.0">
+<package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="EPB-UUID">
WOK
end
def package_close
@@ -1451,6 +1462,12 @@ output_epub_cont_seg.close
WOK
end
def metadata #metadata dc
+ cover_image=if defined? @md.make.cover_image \
+ and @md.make.cover_image.is_a?(Hash) \
+ and @md.make.cover_image[:cover] =~/\S+/
+ %{\n <#{$ep[:o]}meta name="cover" content="cover_image" />}
+ else ''
+ end
author=if defined? @md.creator.author \
and @md.creator.author =~/\S+/
m=''
@@ -1464,12 +1481,10 @@ output_epub_cont_seg.close
m=(m.empty?) \
? (surname + other_names)
: (m + '; ' + surname + ', ' + other_names)
- m=m.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,';')
+ m=SanitizeXML.xml(m)
end
x=@md.creator.author.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:creator opf:file-as="#{m}" opf:role="aut">#{x}</dc:creator>}
else ''
end
@@ -1486,12 +1501,10 @@ output_epub_cont_seg.close
m=(m.empty?) \
? (surname + other_names)
: (m + '; ' + surname + ', ' + other_names)
- m=m.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,';')
+ m=SanitizeXML.xml(m)
end
x=@md.creator.editor.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:creator opf:file-as="#{m}" opf:role="edt">#{x}</dc:creator>}
else ''
end
@@ -1508,12 +1521,10 @@ output_epub_cont_seg.close
m=(m.empty?) \
? (surname + other_names)
: (m + '; ' + surname + ', ' + other_names)
- m=m.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,';')
+ m=SanitizeXML.xml(m)
end
x=@md.creator.translator.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:creator opf:file-as="#{m}" opf:role="trl">#{x}</dc:creator>}
else ''
end
@@ -1530,28 +1541,24 @@ output_epub_cont_seg.close
m=(m.empty?) \
? (surname + other_names)
: (m + '; ' + surname + ', ' + other_names)
- m=m.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,';')
+ m=SanitizeXML.xml(m)
end
x=@md.creator.illustrator.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:creator opf:file-as="#{m}" opf:role="ill">#{x}</dc:creator>}
else ''
end
date_published=if defined? @md.date.published \
and @md.date.published =~/\S+/
x=@md.date.published.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:date opf:event="published">#{x}</dc:date>}
else ''
end
subject=if defined? @md.classify.subject \
and @md.classify.subject =~/\S+/
x=@md.classify.subject.dup
- x=x.gsub(/</,'&lt;').gsub(/>/,'&gt;').
- gsub(/&lt;br(?: \/)?&gt;/,'<br />')
+ x=SanitizeXML.xml(x)
%{\n <dc:subject>#{x}</dc:subject>}
else ''
end
@@ -1563,21 +1570,25 @@ output_epub_cont_seg.close
end
rights=if defined? @md.rights.all \
and @md.rights.all =~/\S+/
- rights=@md.rights.all.gsub(/<br>/,'<br />')
+ rights=SanitizeXML.xml(@md.rights.all)
+ rights=rights.gsub(/<br\s*\/?>/,' ')
%{\n <dc:rights>#{rights}</dc:rights>}
else ''
end
f=SiSU_Env::FileOp.new(@md)
<<-WOK
- <metadata xmlns:dc="http://purl.org/dc/elements/1.1/"
+ <#{$ep[:o]}metadata
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:opf="http://www.idpf.org/2007/opf"
+ xmlns:dcterms="http://purl.org/dc/terms/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
unique-identifier="urn:uuid:#{@md.dgst[1]}" version="2.0">
<dc:title>#{@md.title.full}</dc:title>
- #{author}#{editor}#{translator}#{illustrator}#{language}#{date_published}#{subject}#{rights}
- <dc:identifier opf:scheme="URI">#{f.output_path.epub.url}/#{f.base_filename.epub}</dc:identifier>
+ #{cover_image}#{author}#{editor}#{translator}#{illustrator}#{language}#{date_published}#{subject}#{rights}
+ <dc:identifier opf:scheme="URI">#{f.output_path.epub.url.gsub(/http:\/\//,'')}/#{f.base_filename.epub}</dc:identifier>
<dc:identifier id="bookid">urn:uuid:#{@md.dgst[1]}</dc:identifier>
<!-- <dc:identifier id="EPB-UUID">urn:uuid:#{@md.dgst[1]}</dc:identifier> -->
- </metadata>
+ </#{$ep[:o]}metadata>
WOK
end
def manifest_open
@@ -1592,14 +1603,24 @@ output_epub_cont_seg.close
end
def manifest_content_sisu_toc
<<-WOK
- <item id="index" href="index.xhtml" media-type="application/xhtml+xml" />
+ <item id="index#{Sfx[:epub_xhtml]}" href="index#{Sfx[:epub_xhtml]}" media-type="application/xhtml+xml" />
WOK
end
- def manifest_content(dob,name=nil)
- name=name ? name : dob.name
- href_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ def manifest_cover_image_information(md)
+ cover_image=if defined? md.make.cover_image \
+ and @md.make.cover_image.is_a?(Hash) \
+ and md.make.cover_image[:cover] =~/\S+/
+ <<-WOK
+ <item id="cover_image#{Sfx[:epub_xhtml]}" href="cover_image#{Sfx[:epub_xhtml]}" media-type="application/xhtml+xml" />
+ WOK
+ else ''
+ end
+ end
+ def manifest_content(dob,fn_base,hashtag=nil)
+ fn=fn_base + Sfx[:epub_xhtml]
+ name=hashtag ? fn + hashtag : fn
<<-WOK
- <item id="#{name}" href="#{href_name}" media-type="application/xhtml+xml" />
+ <item id="#{name}" href="#{name}" media-type="application/xhtml+xml" />
WOK
end
def manifest_images(imgs)
@@ -1607,6 +1628,7 @@ output_epub_cont_seg.close
images=[" <!-- Images -->\n"]
imgs.each do |i|
image,type=/(\S+?)\.(png|jpg|gif)/.match(i)[1,2]
+ type=type.sub(/jpg/,'jpeg')
images<<<<-WOK
<item id="#{image}" href="image/#{image}.#{type}" media-type="image/#{type}" />
WOK
@@ -1625,13 +1647,19 @@ output_epub_cont_seg.close
<spine toc="ncx">
WOK
end
+ def spine_cover_image
+ <<-WOK
+ <itemref idref="cover_image#{Sfx[:epub_xhtml]}" />
+ WOK
+ end
def spine_sisu_toc
<<-WOK
- <itemref idref="index" linear="yes" />
+ <itemref idref="index#{Sfx[:epub_xhtml]}" linear="yes" />
WOK
end
- def spine(dob,name=nil)
- name=name ? name : dob.name
+ def spine(dob,fn_base,hashtag=nil)
+ fn=fn_base + Sfx[:epub_xhtml]
+ name=hashtag ? fn + hashtag : fn
<<-WOK
<itemref idref="#{name}" linear="yes" />
WOK
@@ -1647,12 +1675,19 @@ output_epub_cont_seg.close
<guide>
WOK
end
+ def guide_cover_image
+ <<-WOK
+ <reference type="cover" title="Cover of #{SanitizeXML.xml(@md.title.full)}" href="cover_image#{Sfx[:epub_xhtml]}" />
+ WOK
+ end
def guide_sisu_toc
<<-WOK
- <reference type="index" href="index#{Sfx[:epub_xhtml]}" />
+ <reference type="index#{Sfx[:epub_xhtml]}" href="index#{Sfx[:epub_xhtml]}" />
WOK
end
- def guide(dob,name=nil)
+ def guide(dob,fn_base,hashtag=nil)
+ fn=fn_base + Sfx[:epub_xhtml]
+ name=hashtag ? fn + hashtag : fn
name=name ? name : dob.name
guide_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
<<-WOK
@@ -1695,20 +1730,20 @@ output_epub_cont_seg.close
end
def head
%{#{doc_type}
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-#{@css.xhtml_epub}
-</head>
-#{@vz.color_body}}
+ <head>
+ <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+ #{@css.xhtml_epub}
+ </head>
+ #{@vz.color_body}}
end
def concordance
if @md.concord_make
%{#{@vz.margin_css}
- <h4 class="toc">
- <a href="./#{@md.file.base_filename.html_concordance}">
- <i>Concordance</i>
- </a>
- </h4>
+ <h4 class="toc">
+ <a href="./#{@md.file.base_filename.html_concordance}">
+ <i>Concordance</i>
+ </a>
+ </h4>
#{@vz.table_close}}
else
%{#{@vz.margin_css}
@@ -1724,9 +1759,8 @@ output_epub_cont_seg.close
end
def rights
def all
- rghts=@md.rights.all.gsub(/<br>/,'<br />')
- rghts=rghts.gsub(/^\s*Copyright\s+\(C\)/,'Copyright <sup>&copy;</sup>&nbsp;')
- %{<p class="small_left">Rights: #{rghts}</p>}
+ rights=SanitizeXML.xml(@md.rights.all)
+ %{<p class="small_left">Rights: #{rights}</p>}
end
self
end
@@ -1776,15 +1810,15 @@ output_epub_cont_seg.close
end
def head
%{#{doc_type}
-<head>
- <title>
- #{@seg_name_xhtml[@seg_name_xhtml_tracker]} -
- #{@md.html_title}
- </title>
-<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-#{@css.xhtml_epub}
-</head>
-#{@vz.color_body}}
+ <head>
+ <title>
+ #{@seg_name_xhtml[@seg_name_xhtml_tracker]} -
+ #{@md.html_title}
+ </title>
+ <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+ #{@css.xhtml_epub}
+ </head>
+ #{@vz.color_body}}
end
def endnote_mark
%{
@@ -1802,7 +1836,7 @@ output_epub_cont_seg.close
<a href="#owner.details">
Owner Details
<font size="1" color="#777777">
- &nbsp;&nbsp;&nbsp;
+ #{$ep[:hsp]*3}
</font>
</a>
</font>
@@ -1810,7 +1844,7 @@ output_epub_cont_seg.close
end
end
class FormatTextObject
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
attr_accessor :md,:t_o,:txt,:ocn,:format,:table,:link,:linkname,:paranum,:p_num,:headname,:banner,:url
def initialize(md,t_o)
@md,@t_o=md,t_o
@@ -1854,7 +1888,7 @@ output_epub_cont_seg.close
@txt=@txt.gsub(/#{Mx[:mk_o]}[-~]##{Mx[:mk_c]}/,'')
end
@p_num=ParagraphNumber.new(@md,@ocn)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def nametags_seg(dob) #FIX
tags=''
@@ -1883,7 +1917,7 @@ output_epub_cont_seg.close
def no_paranum
%{
<div class="substance">
- <label class="ocn">&nbsp;</label>
+ <label class="ocn">#{$ep[:hsp]}</label>
<p class="norm">
#{@txt}
</p>
@@ -1938,7 +1972,7 @@ output_epub_cont_seg.close
para_form_css('p','norm',@txt)
end
def break
- @txt=@txt.gsub(/#{Mx[:br_page_new]}|#{Mx[:br_page]}/,'<hr /><br />').
+ @txt=@txt.gsub(/#{Mx[:br_page_new]}|#{Mx[:br_page]}|#{Mx[:br_page_line]}/,'<hr /><br />').
gsub(/#{Mx[:br_obj]}/,'<hr style="width:30%" /><br />')
para_form_css('p','norm',@txt)
end
@@ -2028,7 +2062,7 @@ output_epub_cont_seg.close
#{@txt}
</p>
#{@vz.margin_num_css}
- &nbsp;&nbsp;&nbsp;
+ #{$ep[:hsp]*3}
#{@vz.table_close}}
end
def bold_heading #unused
@@ -2038,26 +2072,30 @@ output_epub_cont_seg.close
#{@txt}
</p>
#{@vz.margin_num_css}
- &nbsp;&nbsp;&nbsp;
+ #{$ep[:hsp]*3}
#{@vz.table_close}}
end
def toc_head_copy_at
+ @txt=SanitizeXML.xml(@txt)
%{<p class="center">#{@txt}</p>\n}
end
def center
+ @txt=SanitizeXML.xml(@txt)
%{<p class="center">#{@txt}</p>\n}
end
def bold
+ @txt=SanitizeXML.xml(@txt)
%{<p class="bold">#{@txt}</p>\n}
end
def center_bold
+ @txt=SanitizeXML.xml(@txt)
%{<p class="centerbold">#{@txt}</p>\n}
end
end
class FormatScroll < FormatTextObject
def initialize(md,txt)
super(md,txt)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
end
class FormatSeg < FormatTextObject
@@ -2088,8 +2126,8 @@ output_epub_cont_seg.close
note=$1
note=note.gsub(/[\n\s]+/m,' ')
txt=txt.gsub(/(?:#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]})\s*/m,' ').
- gsub(/<a[\n\s]+"[\n\s]+href="#note_ref\d+">&nbsp;<sup id="note\d+">\d+<\/sup>&nbsp;/m,'').
- gsub(/<a[\n\s]+"[\n\s]+href="#note_ref\d+">#{Mx[:nbsp]}<sup id="note\d+">\d+<\/sup>#{Mx[:nbsp]}/m,'') #remove
+ gsub(/<a[\n\s]+"[\n\s]+href="#note_ref\d+">#{$ep[:hsp]}<sup id="note\d+">\d+<\/sup>#{$ep[:hsp]}/m,'').
+ gsub(/<a[\n\s]+"[\n\s]+href="#note_ref\d+">#{$ep[:hsp]}<sup id="note\d+">\d+<\/sup>#{$ep[:hsp]}/m,'') #remove
end
%{<#{tag} class="#{attrib}">
<a href="#o#{@ocn}"><i>#{txt}</i></a> #{note}
diff --git a/lib/sisu/v3/epub_segments.rb b/lib/sisu/v5/epub_segments.rb
index 40989632..64bea759 100644
--- a/lib/sisu/v3/epub_segments.rb
+++ b/lib/sisu/v5/epub_segments.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/epub_segments.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_segments.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -132,7 +132,7 @@ WOK
attr_reader :seg_name_xhtml,:seg_name_xhtml_tracker
def initialize(md='',data='')
@md,@data=md,data
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@seg_name_xhtml=@@seg_name_xhtml || nil
@seg_name_xhtml_tracker=@@tracker || nil
@make=SiSU_Env::ProcessingSettings.new(@md) if @md
@@ -309,7 +309,7 @@ WOK
txt_obj={ txt: @@heading1, ocn_display: @p_num.ocn_display }
format_seg=SiSU_EPUB_Format::FormatSeg.new(@md,txt_obj)
@@seg[:headings] << format_seg.title_heading1.gsub(clean,'')
- @@heading1=@@heading1.gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
+ @@heading1=@@heading1.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
if @@is2==1
heading2=@@heading2
@@ -320,7 +320,7 @@ WOK
txt_obj={ txt: heading2, ocn_display: @p_num.ocn_display }
format_seg=SiSU_EPUB_Format::FormatSeg.new(@md,txt_obj)
@@seg[:headings] << format_seg.title_heading2.gsub(clean,'')
- @@heading2=@@heading2.gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
+ @@heading2=@@heading2.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
if @@is3==1
heading3=@@heading3
@@ -331,7 +331,7 @@ WOK
txt_obj={ txt: heading3, ocn_display: @p_num.ocn_display }
format_seg=SiSU_EPUB_Format::FormatSeg.new(@md,txt_obj)
@@seg[:headings] << format_seg.title_heading3.gsub(clean,'')
- @@heading3=@@heading3.gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
+ @@heading3=@@heading3.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
if @@is4==1
heading4=@@heading4
diff --git a/lib/sisu/v3/epub_tune.rb b/lib/sisu/v5/epub_tune.rb
index 664f143e..c0005365 100644
--- a/lib/sisu/v3/epub_tune.rb
+++ b/lib/sisu/v5/epub_tune.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/epub_tune.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_tune.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -107,17 +107,17 @@ module SiSU_EPUB_Tune
str=str.gsub(/#{Mx[:gl_o]}(#[0-9]{3})#{Mx[:gl_c]}/u,'&\1;').
gsub(/#{Mx[:gl_o]}#([a-z]{2,4})#{Mx[:gl_c]}/u,'&\1;').
gsub(/<br>/u,'<br />').
- gsub(/#{Mx[:nbsp]}/u,'&nbsp;')
+ gsub(/#{Mx[:nbsp]}/u,$ep[:hsp])
end
end
class Tune
def initialize(data,md)
@data,@md=data,md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env=SiSU_Env::InfoEnv.new(@md.fns)
@sys=SiSU_Env::SystemCall.new
@env=SiSU_Env::InfoEnv.new(@md.fns)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def songsheet
begin
@@ -155,8 +155,9 @@ module SiSU_EPUB_Tune
gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'<del>\1</del>').
gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'<tt>\1</tt>'). # tt, kbd
gsub(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'').
- gsub(/#{Mx[:gl_bullet]}/m,'●&nbsp;&nbsp;').
- gsub(/#{Mx[:nbsp]}/,'&nbsp;').
+ gsub(/#{Mx[:gl_bullet]}/m,"●#{$ep[:hsp]*2}").
+ gsub(/#{Dx[:url_o]}/,Dx[:url_o_xml]).gsub(/#{Dx[:url_c]}/,Dx[:url_o_xml]).
+ gsub(/#{Mx[:nbsp]}/,$ep[:hsp]).
gsub(/<(p|br)>/,'<\1 />')
dob.obj=SiSU_EPUB_Tune::CleanXHTML.new(dob.obj).clean
@tuned_file << dob
@@ -257,9 +258,9 @@ module SiSU_EPUB_Tune
%{\n<center><a href="\\1" target="_top"><img src="#{@env.url.images_epub}/\\2" alt="\\3" /></a></center>\n})
end
dob.obj=dob.obj.gsub(/!pick/,%{<img border="0" height="15" width="15" src="#{@env.url.images_epub}/#{@vz.icon_choice}" alt="stellar" />}).
- gsub(/!new/,%{&nbsp;<img border="0" height="15" width="15" src="#{@env.url.images_epub}/#{@vz.icon_new}" alt="new" />}).
+ gsub(/!new/,%{#{$ep[:hsp]}<img border="0" height="15" width="15" src="#{@env.url.images_epub}/#{@vz.icon_new}" alt="new" />}).
gsub(/<:h(.{1,7}?)>/,'<a href="#h\1">\1</a>').
- gsub(/<:to(\d{1,7}?)>/,'<a href="#to\1">to&nbsp;{&nbsp;\1&nbsp;}</a> ').
+ gsub(/<:to(\d{1,7}?)>/,%{<a href="#to\\1">to#{$ep[:hsp]}\{#{$ep[:hsp]}\\1#{$ep[:hsp]}\}</a> }).
gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'<a href="\1" target="_top">\1</a>'). #http ftp matches escaped, no decoration
gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}<a href="mailto:\\1">\\1</a>#{@brace_url.xml_close}}).
gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}<a href="\\1" target="_top">\\1</a>#{@brace_url.xml_close}}) #http ftp matches with decoration
diff --git a/lib/sisu/v3/errors.rb b/lib/sisu/v5/errors.rb
index 505ba616..9721bf72 100644
--- a/lib/sisu/v3/errors.rb
+++ b/lib/sisu/v5/errors.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/errors.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/errors.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v5/git.rb
index 9ec2986a..eb5a9b99 100644
--- a/lib/sisu/v3/git.rb
+++ b/lib/sisu/v5/git.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/git.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/git.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -94,7 +94,6 @@ module SiSU_Git
po: git_path_fnb + '/' + Gt[:po] + '/' + lng,
pot: git_path_fnb + '/' + Gt[:pot],
conf: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:conf],
- skin: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:skin],
image: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:image],
audio: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:audio],
video: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:video],
@@ -131,7 +130,6 @@ module SiSU_Git
FileUtils::mkdir_p(@git_path[:po]) unless FileTest.directory?(@git_path[:po])
FileUtils::mkdir_p(@git_path[:pot]) unless FileTest.directory?(@git_path[:pot])
FileUtils::mkdir_p(@git_path[:conf]) unless FileTest.directory?(@git_path[:conf])
- FileUtils::mkdir_p(@git_path[:skin]) unless FileTest.directory?(@git_path[:skin])
FileUtils::mkdir_p(@git_path[:image]) unless FileTest.directory?(@git_path[:image])
#FileUtils::mkdir_p(@git_path[:audio]) unless FileTest.directory?(@git_path[:audio])
#FileUtils::mkdir_p(@git_path[:video]) unless FileTest.directory?(@git_path[:video])
@@ -201,56 +199,10 @@ module SiSU_Git
else "#{@env.path.pwd}/#{@opt.fns}"
end
end
- def locate_skin
- SiSU_Env::InfoSkin.new(@md).select
- end
def read_composite
#print __FILE__ + ':'
#p __LINE__
end
- def extract_skin
- #print __FILE__ + ':'
- #p __LINE__
- end
- def extract_skin_and_images #(parse_file)
- parse_file_name=locate_parse_file
- parse_file=IO.readlines(parse_file_name,'')
- rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
- #rgx_rb_image=/["'](\S+?\.(?:png|jpg|gif))["']/
- #rgx_rb_image=/[^\/]?([a-z]\S+?\.(?:png|jpg|gif))/
- rgx_rb_image=/([a-z][^ \/]+?\.(?:png|jpg|gif))/
- rgx_skin=/^\s+:skin:\s+(\S+)/
- skin_get=nil
- images=[]
- skin_get
- parse_file.each do |f| #% work area
- if f !~/^%+\s/
- skin_get ||= f.scan(rgx_skin).uniq.flatten if f =~rgx_skin
- if f =~rgx_image
- images << f.scan(rgx_image).uniq
- end
- end
- end
- skin=skin_get[0] if skin_get
- skin=locate_skin
- parse_skin=IO.readlines(skin,"\n")
- parse_skin.each do |f| #% work area
- if f !~/^#/ \
- and f =~rgx_rb_image
- images << f.scan(rgx_rb_image).uniq
- end
- end
- image_path="#{@env.path.pwd}/_sisu/image"
- images.flatten.each do |i|
- if FileTest.file?("#{image_path}/#{i}")
- FileUtils::cp_r("#{image_path}/#{i}",@git_path[:image])
- end
- end
- if FileTest.file?(skin)
- FileUtils::cp_r(skin,"#{@git_path[:conf]}/skin")
- end
- { skin: skin, images: images }
- end
def sisuyaml_rc
sisurc=@env.path.sisurc_path
if FileTest.file?(sisurc)
@@ -269,11 +221,9 @@ module SiSU_Git
if composite_src?
populate.copy_related_sst_ssi
end
- populate.extract_skin
#parse_file_name=locate_parse_file
#parse_file=IO.readlines(parse_file_name,'')
populate.sisuyaml_rc #(parse_file)
- populate.extract_skin_and_images #(parse_file)
#populate.extract_composite_source
#populate.read_composite # or read_each_composite
populate.identify_language_versions
diff --git a/lib/sisu/v3/harvest.rb b/lib/sisu/v5/harvest.rb
index b458b8df..ffcb6aa3 100644
--- a/lib/sisu/v3/harvest.rb
+++ b/lib/sisu/v5/harvest.rb
@@ -52,7 +52,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/harvest.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/harvest_authors.rb b/lib/sisu/v5/harvest_authors.rb
index 0c5d82e9..89a64fee 100644
--- a/lib/sisu/v3/harvest_authors.rb
+++ b/lib/sisu/v5/harvest_authors.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/harvest_authors.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_authors.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -69,7 +69,6 @@ module SiSU_HarvestAuthors
@file_list=opt.files
end
def songsheet
- puts 'authors:'
idx_array={}
@opt.f_pths.each do |y|
lang_hash_file_array={}
@@ -176,11 +175,11 @@ module SiSU_HarvestAuthors
def initialize(opt,the_idx)
@opt,@the_idx=opt,the_idx
@env=SiSU_Env::InfoEnv.new
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
@alphabet_list=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
@alph=@alphabet_list.dup
@letter=@alph.shift
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def html_file_open
@the_idx.keys.each do |lng|
@@ -198,7 +197,8 @@ module SiSU_HarvestAuthors
file="#{harvest_pth}/authors.#{lng}.html"
end
FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- puts "file://#{file}"
+ fileinfo=(@opt.cmd =~/[vVM]/) ? ("file://#{file}") : ''
+ SiSU_Screen::Ansi.new(@opt.cmd,"harvest authors (#{@opt.files.length} files)",fileinfo).dark_grey_title_hi unless @opt.cmd =~/q/
@output[lng][:html]=File.new(file,'w')
end
end
@@ -231,7 +231,7 @@ module SiSU_HarvestAuthors
topics="topics.#{lng}.html"
elsif @env.output_dir_structure.by? == :filename
css_path=(type !~/maintenance/) \
- ? '../_sisu/css/harvest.css'
+ ? './_sisu/css/harvest.css'
: 'harvest.css'
topics="topics.#{lng}.html"
end
@@ -244,11 +244,27 @@ module SiSU_HarvestAuthors
elsif @env.output_dir_structure.by? == :filetype
harvest_pth='.'
file="#{harvest_pth}/authors.#{lng}.html"
+ elsif @env.output_dir_structure.by? == :filename
+ harvest_pth='.'
+ file="#{harvest_pth}/authors.#{lng}.html"
end
l=ln[lng][:t]
harvest_languages += %{<a href="#{file}">#{l}</a>&nbsp;&nbsp;&nbsp;}
end
sv=SiSU_Env::InfoVersion.instance.get_version
+ if @env.output_dir_structure.by? == :language
+ home_pth='../..'
+ output_structure_by='(output organised by language &amp; filetype)'
+ elsif @env.output_dir_structure.by? == :filetype
+ home_pth='..'
+ output_structure_by='(output organised by filetype)'
+ elsif @env.output_dir_structure.by? == :filename
+ home_pth='.'
+ output_structure_by='(output organised by filename)'
+ else
+ home_pth='.'
+ output_structure_by='(output organised by ?)'
+ end
<<WOK
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -267,8 +283,8 @@ module SiSU_HarvestAuthors
<a name="top" id="top"></a>
<a name="up" id="up"></a>
<a name="start" id="start"></a>
-<h1>SiSU Metadata Harvest - Authors</h1>
-<p>[<a href="../index.html">&nbsp;HOME&nbsp;</a>] also see <a href="#{topics}">SiSU Metadata Harvest - Topics</a></p>
+<h1>SiSU Metadata Harvest - Authors #{output_structure_by}</h1>
+<p>[<a href="#{home_pth}/index.html">&nbsp;HOME&nbsp;</a>] also see <a href="#{topics}">SiSU Metadata Harvest - Topics</a></p>
<p>#{@env.widget_static.search_form}</p>
<hr />
<p class="tiny">#{harvest_languages}</p>
@@ -357,7 +373,7 @@ WOK
manifest_name=x[:file]
x[:file] + '.' + lng + '.html'
elsif @env.output_dir_structure.by? == :filename
- "../#{x[:file]}/#{x[:page]}"
+ "./#{x[:file]}/#{x[:page]}"
else '' #error
end
work=[ "#{x[:date]} #{x[:title]}", %{<p class="publication">#{x[:date]} <a href="#{manifest_at}">#{x[:title]}</a>, #{x[:author][:authors_s]}</p>} ]
diff --git a/lib/sisu/v3/harvest_topics.rb b/lib/sisu/v5/harvest_topics.rb
index 59ba4c06..7375e191 100644
--- a/lib/sisu/v3/harvest_topics.rb
+++ b/lib/sisu/v5/harvest_topics.rb
@@ -52,7 +52,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/harvest_topics.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_topics.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -71,7 +71,6 @@ module SiSU_HarvestTopics
@file_list=opt.files
end
def songsheet
- puts 'topics:'
idx_array={}
@opt.f_pths.each do |y|
lang_hash_file_array={}
@@ -451,11 +450,11 @@ module SiSU_HarvestTopics
def initialize(opt,the_idx)
@opt,@the_idx=opt,the_idx
@env=SiSU_Env::InfoEnv.new
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
@alphabet_list=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
@alph=@alphabet_list.dup
@letter=@alph.shift
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def html_file_open
@the_idx.keys.each do |lng|
@@ -473,7 +472,8 @@ module SiSU_HarvestTopics
file="#{harvest_pth}/topics.#{lng}.html"
end
FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- puts "file://#{file}"
+ fileinfo=(@opt.cmd =~/[vVM]/) ? ("file://#{file}") : ''
+ SiSU_Screen::Ansi.new(@opt.cmd,"harvest topics(#{@opt.files.length} files)",fileinfo).dark_grey_title_hi unless @opt.cmd =~/q/
@output[lng][:html]=File.new(file,'w')
if @opt.cmd.inspect =~/[M]/
@output[lng][:html_mnt]=File.new("#{@env.path.pwd}/topics.html",'w')
@@ -610,6 +610,19 @@ module SiSU_HarvestTopics
harvest_languages += %{<a href="#{file}">#{l}</a>&nbsp;&nbsp;&nbsp;}
end
sv=SiSU_Env::InfoVersion.instance.get_version
+ if @env.output_dir_structure.by? == :language
+ home_pth='../..'
+ output_structure_by='(output organised by language &amp; filetype)'
+ elsif @env.output_dir_structure.by? == :filetype
+ home_pth='..'
+ output_structure_by='(output organised by filetype)'
+ elsif @env.output_dir_structure.by? == :filename
+ home_pth='.'
+ output_structure_by='(output organised by filename)'
+ else
+ home_pth='.'
+ output_structure_by='(output organised by ?)'
+ end
<<WOK
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -628,8 +641,8 @@ module SiSU_HarvestTopics
<a name="top" id="top"></a>
<a name="up" id="up"></a>
<a name="start" id="start"></a>
-<h1>SiSU Metadata Harvest - Topics</h1>
-<p>[<a href="../index.html">&nbsp;HOME&nbsp;</a>] also see <a href="#{authors}">SiSU Metadata Harvest - Authors</a></p>
+<h1>SiSU Metadata Harvest - Topics #{output_structure_by}</h1>
+<p>[<a href="#{home_pth}/index.html">&nbsp;HOME&nbsp;</a>] also see <a href="#{authors}">SiSU Metadata Harvest - Authors</a></p>
<p>#{@env.widget_static.search_form}</p>
<hr />
<p class="tiny">#{harvest_languages}</p>
diff --git a/lib/sisu/v3/help.rb b/lib/sisu/v5/help.rb
index f31e71d1..b73cd138 100644
--- a/lib/sisu/v3/help.rb
+++ b/lib/sisu/v5/help.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/help.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/help.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,7 +67,8 @@ module SiSU_Help
require_relative 'i18n' # i18n.rb
def initialize(request='',color='')
@request,@color=request,color
- @cX=(color =~/color_off/) \
+ @cX=((color =~/color_off/) \
+ || (defined? color.act && color.act[:color_state][:set]==:off)) \
? (SiSU_Screen::Ansi.new('k').cX)
: (SiSU_Screen::Ansi.new('yes').cX)
fns='help_example_dummy_file_name.sst'
@@ -162,7 +163,7 @@ module SiSU_Help
end
end
def summary
- print <<WOK
+ print <<-WOK
SiSU, Copyright (C) 1997 - 2013 Ralph Amissah
License GPL version 3 or Later. This program comes with ABSOLUTELY NO WARRANTY;
This is free software, and you are welcome to redistribute it under the conditions of the GPL3 or later.
@@ -196,11 +197,10 @@ alternatively typing #{@cX.orange}sisu --help#{@cX.off} #{@cX.green}[keyword]#{@
#{@cX.green}license#{@cX.off} sisu --help license
for help type 'sisu --help', 'sisu --help [help request]', 'man sisu', (or see the system or online documentation)
-WOK
- # #{@cX.cyan}sisu_convert#{@cX.off} program for initial (very basic and partial) conversion to sisu file format (html and word97 supported)
+ WOK
end
def abstract
- print <<WOK
+ print <<-WOK
Features:
#{@cX.cyan}(i)#{@cX.off} minimal markup requirement
#{@cX.cyan}(ii)#{@cX.off} single file marked up for multiple outputs
@@ -228,27 +228,18 @@ SiSU was developed in relation to legal documents, and so is strong across a wid
There is more detailed information available on it from:
#{@cX.blue}http://www.jus.uio.no/sisu#{@cX.off}
* plaintext
- * html
+ * HTML
+ * ODT (Open Document Format text)
+ * EPUB
* XML (structured)
- * LaTeX/pdf
- * texinfo
- * sql (at present postgresql & sqlite)
-
-A couple of sample inputs and outputs:
-
-The markup for "War and Peace" (chosen because it is a large text & to test the use of SiSU on Project Gutenberg's plaintext), this is the markup, very little after the headers (there is an insert of their legal notices). Took no time at all, it is a particularly simple text to markup though
-A simple document and a more demanding document
- #{@cX.blue}http://www.jus.uio.no/sisu/sample/war.and.peace.leo.tolstoy.er20 http://www.jus.uio.no/sisu/sample/autonomy.markup1.er30#{@cX.off}
-Some resulting outputs:
- html #{@cX.blue}http://www.jus.uio.no/sisu/war.and.peace.leo.tolstoy/ http://www.jus.uio.no/sisu/autonomy.markup1/#{@cX.off}
- #{@cX.blue}http://www.jus.uio.no/sisu/autonomy.markup1/doc#{@cX.off}
- pdf #{@cX.blue}http://www.jus.uio.no/sisu/war.and.peace.leo.tolstoy/portrait http://www.jus.uio.no/sisu/autonomy.markup1/portrait
- #{@cX.blue}http://www.jus.uio.no/sisu/war.and.peace.leo.tolstoy/landscape http://www.jus.uio.no/sisu/autonomy.markup1/landscape#{@cX.off}
- plaintext #{@cX.blue}http://www.jus.uio.no/sisu/war.and.peace.leo.tolstoy/doc.txt http://www.jus.uio.no/sisu/autonomy.markup1/doc.txt#{@cX.off}
-WOK
+ * LaTeX
+ * PDF (via LaTeX)
+ * TeXinfo
+ * SQL (at postgreSQL & SQLite)
+ WOK
end
def commands
- print <<WOK
+ print <<-WOK
#{@cX.ruby}-a#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} produces plaintext with Unix linefeeds. Without markup, (object numbers are omitted), has footnotes at end of each para‐ graph that contains them. Modifier options available: --footnotes (default) or --endnotes and for linefeeds --unix (default) or --msdos
@@ -337,11 +328,11 @@ WOK
#{@cX.ruby}-D#{@cX.off} #{@cX.ruby}--recreate#{@cX.off} kills data" and drops (postgresql or sqlite) db, tables & indexes, then creates an empty db with tables and indexes [#{@cX.ruby}-d --recreate#{@cX.off} sqlite equivalent]
also see command #{@cX.green}shortcuts#{@cX.off}, and shorthand mappings for multiple flags
-WOK
+ WOK
end
def shortcuts
cf_defaults=SiSU_Env::InfoProcessingFlag.new
- print <<WOK
+ print <<-WOK
#{@cX.ruby}Shorthand for multiple flags#{@cX.off}
@@ -362,11 +353,10 @@ WOK
defaults may be changed in active sisurc.yml file under 'flag:'
add -v for verbose mode and -c (color toggle), e.g.
- sisu -2vc [filename or wildcard]
-WOK
+ WOK
end
def modifiers
- print <<WOK
+ print <<-WOK
#{@cX.ruby}Command flag modifiers#{@cX.off}
@@ -378,10 +368,10 @@ WOK
#{@cX.ruby}--no-dagger#{@cX.off} strips output text of editor endnotes~[+ square brackets ]~ denoted by dagger/plus sign
-WOK
+ WOK
end
def misc
- <<WOK
+ <<-WOK
#{@cX.cyan}misc#{@cX.off}
#{@cX.green}-s#{@cX.off} [filename or wildcard] #{@cX.green}spellcheck#{@cX.off} (aspell previously ispell
\t#{@cX.green}mailer examples#{@cX.off}
@@ -393,15 +383,15 @@ WOK
#{@cX.blue}-R #{@cX.off} (yaml|rss) extraction of semantic data into yaml file for auto build of xml feeds (rss, rdf) #{@cX.fuschia}[work area]#{@cX.off}
#{@cX.green}-R #{@cX.off} yaml extraction of semantic data into yaml file for auto build of xml feeds (rss, rdf)
#{@cX.green}-R #{@cX.off} rss creates rss2.0 feed
-WOK
+ WOK
end
def markup
- print <<WOK
+ print <<-WOK
sisu
Note: files for SiSU should be in UTF-8 character encoding.
#{@cX.cyan}Data text markup#{@cX.off} (alternative to available html subset)
- #{@cX.green}% SiSU 2.00#{@cX.off} [statement on first line of document, declared file-type identifier, SiSU markup document, markup used is version 0.38]
+ #{@cX.green}% SiSU 4.00#{@cX.off} [statement on first line of document, declared file-type identifier, SiSU markup document
#{@cX.green}A~#{@cX.off} heading/title [levels A to C available (and beneath that 1 to 6)]
@@ -518,16 +508,14 @@ sisu
general text markup: headings; endnotes; tables (which also includes a note on preformatted text)
configuration and customisation
document or site wide customisation: customise; skin
-WOK
+ WOK
help_markup
-# {../_sisu/image/tux.png http://www.jus.uio.no/sisu/ w=64 c=\"a better way\" }:image depreciated image eg
-# <!image http://www.jus.uio.no/sisu/ ../_sisu/image/tux.png width=\"64\" height=\"80\" !> old form
end
def example
help_markup
end
def example_v1
- print <<WOK
+ print <<-WOK
% SiSU 1.0
@title: Working Sample Document
@@ -567,11 +555,11 @@ _1 for a listing type: sisu ~ commands
_1 for an outline of sisu markup type: sisu ~ markup
The example ends here.
-WOK
+ WOK
help_markup
end
def example_v2
- print <<WOK
+ print <<-WOK
% SiSU 2.0
@title: Working Sample Document
@@ -615,11 +603,11 @@ _1 for a listing type: sisu ~ commands
_1 for an outline of sisu markup type: sisu ~ markup
The example ends here.
-WOK
+ WOK
help_markup
end
def headers
- print <<WOK
+ print <<-WOK
Header tags appear at the beginning of a document and provide meta information on the document (such as the Dublin Core), or information as to how the document as a whole is to be processed.
All header instructions take either the form #{@cX.green}@headername:#{@cX.off} followed on the next line by an indented sub-category header if any #{@cX.green}:sub-headername:#{@cX.off}.
#{@cX.green}@indentifier:#{@cX.off} information or instructions
@@ -652,12 +640,10 @@ where the #{@cX.green}"identifier"#{@cX.off} is a tag recognised by the program,
#{@cX.cyan}:topic_register:#{@cX.off} [e.g.:] text markup language; application:text processing;output:html|xml|latex|pdf|sql
#{@cX.cyan}:subject:#{@cX.off} (whatever your subject)
#{@cX.cyan}:keywords:#{@cX.off}
- #{@cX.cyan}:coverage:#{@cX.off}
- #{@cX.cyan}:relation:#{@cX.off}
- #{@cX.cyan}:type:#{@cX.off}
- #{@cX.cyan}:identifier:#{@cX.off}
#{@cX.cyan}:loc:#{@cX.off} [Library of Congress classification]
#{@cX.cyan}:dewey:#{@cX.off} [Dewey classification]
+
+#{@cX.ruby}@identifier:#{@cX.off}
#{@cX.cyan}:isbn:#{@cX.off}
#{@cX.cyan}:oclc:#{@cX.off}
@@ -665,7 +651,12 @@ where the #{@cX.green}"identifier"#{@cX.off} is a tag recognised by the program,
#{@cX.cyan}:description:#{@cX.off}
#{@cX.cyan}:abstract:#{@cX.off}
#{@cX.cyan}:comment:#{@cX.off}
+ #{@cX.cyan}:coverage:#{@cX.off}
+ #{@cX.cyan}:relation:#{@cX.off}
+ #{@cX.cyan}:source:#{@cX.off}
#{@cX.cyan}:history:#{@cX.off}
+ #{@cX.cyan}:type:#{@cX.off}
+ #{@cX.cyan}:format:#{@cX.off}
#{@cX.cyan}:prefix:#{@cX.off}
#{@cX.cyan}:suffix:#{@cX.off}
@@ -684,6 +675,9 @@ original language in which the work was published
#{@cX.cyan}:breaks:#{@cX.off} new=:B; break=1
#{@cX.cyan}:bold:#{@cX.off} [regular expression of words/phrases to be made bold]
#{@cX.cyan}:italics:#{@cX.off} [regular expression of words/phrases to italize]
+ #{@cX.cyan}:home_button_image:#{@cX.off} {free_as_in_freedom.png }http://stallman.org/
+ #{@cX.cyan}:home_button_text:#{@cX.off} {Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org
+ #{@cX.cyan}:footer:#{@cX.off} {Free Culture}http://www.free-culture.cc; {Lawrence Lessig}http://www.lessig.org
#{@cX.cyan}:headings:#{@cX.off} PART; CHAPTER; Section; Article;
#{@cX.grey}% optional, document structure can be defined by words to match or regular expression (the regular expression is assumed to start at the beginning of a line of text i.e. ^) default markers A~ to C~ and 1~ to 6~ can be used within text instead, without this header tag, and may be used to supplement the instructions provided in this header tag if provided#{@cX.off}
#{@cX.cyan}:papersize:#{@cX.off} (A4|US_letter|book_B5|book_A5|US_legal)
@@ -704,11 +698,11 @@ original language in which the work was published
#{@cX.blue}3~#{@cX.off} Third level heading preceding substantive text of document, that would normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document
-WOK
+ WOK
help_markup
end
def customise
- print <<WOK
+ print <<-WOK
There are a number of files that control the appearance of a site or a document i.e.
#{@cX.blue}(i)#{@cX.off} files that control #{@cX.green}site-wide appearance#{@cX.off}:
@@ -739,21 +733,21 @@ WOK
if you have a body of documents the easiest way to give them a particular appearance/skin, is to associate that directory with a skin, all files in that directory take on the specified appearance, changing appearance of documents once directories are set up is as simple as copying the files from one directory to another (or renaming the directory); or associating the directory with a different skin.
see also directories
-WOK
+ WOK
end
def configure
- print <<WOK
+ print <<-WOK
see the following topics
install
setup
and note for initial configuration it is necessary to run:
sisu -C
(this places the default CSS files and DTDs in place)
-WOK
+ WOK
end
def path
help_env
- puts <<WOK
+ puts <<-WOK
If you have problems check permissions (and if in home directory ownership).
@@ -795,12 +789,12 @@ If you have problems check permissions (and if in home directory ownership).
See also
sisu --help directory
-WOK
+ WOK
help_env
end
def directories
help_env
- print <<WOK
+ print <<-WOK
the directory structure used by sisu is controlled by the configuration files #{@cX.blue}sisurc.yml#{@cX.off}
@@ -886,7 +880,7 @@ WOK
See also
sisu --help path
-WOK
+ WOK
help_env
end
def program_found?(program)
@@ -911,7 +905,12 @@ WOK
version=SiSU_Env::InfoVersion.instance.get_version
rb_ver=SiSU_Env::InfoVersion.instance.rbversion
if version[:version]
- SiSU_Screen::Ansi.new('-v',version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version
+ opt_cmd=if defined? @color.cmd \
+ and @color.cmd =~/[ck]/
+ @color.cmd
+ else '-v'
+ end
+ SiSU_Screen::Ansi.new(opt_cmd,version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version
else puts 'SiSU version information not available'
end
end
@@ -959,7 +958,7 @@ WOK
def environment
cf_defaults=SiSU_Env::InfoProcessingFlag.new
sisu_version
- x =<<WOK
+ x =<<-WOK
#{@cX.green}current and output directories#{@cX.off}
user: #{@cX.blue}#{@env.user}#{@cX.off}
home: #{@cX.blue}#{@env.path.home}#{@cX.off}
@@ -1021,11 +1020,11 @@ WOK
(true/false defaults may be changed in active sisurc.yml file under permissions_set:)
NOTE: for HELP type 'sisu --help', 'sisu --help [help request]', 'man sisu', (or see the system or online documentation)
-WOK
-print x
+ WOK
+ print x
end
def dublin_core
- print <<WOK
+ print <<-WOK
@title:
@subtitle: [is added to title for purposes of Dublin Core description]
@@ -1060,10 +1059,10 @@ print x
@rights:
-WOK
+ WOK
end
def headings
- print <<WOK
+ print <<-WOK
These are not required, a header is quicker to prepare if a documents structure can be defined by matching words or a regular expression, see headers).
@structure: PART; CHAPTER; SECTION; ARTICLE; none; none;
@@ -1072,10 +1071,6 @@ structure can be defined by a match words or regular expression (the regular exp
The following heading or level (structuring) defaults are available (for use instead of or together with @structure: header):
- 1~ 2~ 3~ 4~ 5~ 6~
-
-or, [0.38]
-
A~ B~ C~ 1~ 2~ 3~
Heading tags take either of the forms above, ranging from 1-6
@@ -1088,26 +1083,6 @@ segments (in html output) are by default created on level 4
assigned a file name automatically according to the title number,
unless you explicitly specify otherwise)
-eg.
-
-% SiSU 0.16 - 0.37
-
-1~ Document Title
-
-2~ Document Subtitle whatever it is
-
-3~ Part
-
-4~ Chapter
-
-5~ Heading
-
-6~ sub-heading
-
-in the 0.38 notation this maps to:
-
-% SiSU 0.38
-
A~ Document Title
B~ Document Subtitle whatever it is
@@ -1120,8 +1095,6 @@ C~ Part
3~ sub-heading
-(a conversion script provided in sisu-examples, modify.rb makes conversion between 0.37 and 0.38 markup simple)
-
Normal text would follow each heading level as appropriate, though it is most usual to start with ordinary writing beneath level 4 as it is at this level that segments are created.
Automatic numbering of paragraphs is usually set to start at level 4 trough level 6 and takes the form 1. then 1.1 then 1.1.1 this being given as a Header tag 0~ There may be up to 6 levels in a document,
@@ -1135,13 +1108,13 @@ the words can be used to identify the levels in a header tag:
0~toc Part; Chapter; Section; Article; none; none
instead of providing individual heading tags
-sisu structure, (0.38) alternative notation, A,B,C,1,2,3 mapping to 1,2,3,4,5,6
+sisu structure, notation, A,B,C,1,2,3
SiSU has in effect two sets of levels to be considered
- 1-3 headings/levels, (A-C [0.38]) pre-ordinary paragraphs /pre-substantive text, and
+ A-C pre-ordinary paragraphs /pre-substantive text, and
- 4-6 headings/levels, (1-3 [0.38]) levels which are followed by ordinary text.
+ 1-3 levels which are followed by ordinary text.
This may be conceptualised as levels A,B,C, 1,2,3, and using such letter number notation, in effect:
@@ -1153,7 +1126,7 @@ sisu structure, (0.38) alternative notation, A,B,C,1,2,3 mapping to 1,2,3,4,5,6
on the positive side: (a) the A,B,C,1,2,3 alternative makes explicit an aspect of structuring documents in SiSU that is not otherwise obvious to the newcomer (though it appears more complicated, is more in your face and likely to be understood fairly quickly); (b) the substantive text follows levels 1,2,3 and it is 'nice' to do most work in those levels
-WOK
+ WOK
end
def languages
lang=SiSU_i18n::Languages.new.language.table
@@ -1164,7 +1137,7 @@ WOK
puts "#{lng[:c]}: #{lng[:t]} (#{lng[:n]})"
end
end
- puts <<WOK
+ puts <<-WOK
Multi-language Document File Naming and Directory Mapping
@@ -1200,10 +1173,10 @@ WOK
Selecting this form of filename will overide other language settings including the language header within a document.
-WOK
+ WOK
end
def endnotes
- print <<WOK
+ print <<-WOK
(1) Footnote/endnotes tags take a number of possible forms, the simplest being to embed an endnote within your text~{ this would appear as an endnote, and would have an automatically assigned number }~ Embedded endnotes~{this is an endnote}~ and at the end of the paragraph~{* an asterisk marked note }~ writing the endnote:~{another endnote}~
@@ -1216,10 +1189,10 @@ WOK
^~ another endnote
-WOK
+ WOK
end
def tables
- print <<WOK
+ print <<-WOK
#{@cX.green}table{ [number of columns] [column width %];[column width %]#{@cX.off}
@@ -1276,17 +1249,17 @@ preformatted text
#{@cX.green}}code#{@cX.off}
-WOK
+ WOK
end
def modules
- print <<WOK
+ print <<-WOK
#{@cX.ruby}IGNORE#{@cX.off}
-WOK
+ WOK
end
def install #% system configuration
- print <<WOK
+ print <<-WOK
#{@cX.green}Install SiSU#{@cX.off}
Presumably if you are reading this interactively you have a copy of SiSU already installed, nevertheless here are a few notes.
@@ -1343,10 +1316,10 @@ WOK
sisu --help
-WOK
+ WOK
end
def setup
- print <<WOK
+ print <<-WOK
#{@cX.green}configuration files#{@cX.off}
sisurc.yml used:
@@ -1367,10 +1340,10 @@ WOK
#{@cX.blue}man 8 sisu#{@cX.off}
and
#{@cX.blue}http://www.jus.uio.no/sisu/SiSU#{@cX.off}
-WOK
+ WOK
end
def termsheet
- print <<WOK
+ print <<-WOK
#{@cX.green}sisu --termsheet [termsheetname].termsheet.rb#{@cX.off}
will produce the collection of documents associated with [termsheetname.termsheet.rb]
@@ -1399,29 +1372,29 @@ WOK
it is necessary to purge the directory ~facilityData when old files are removed
-WOK
+ WOK
end
def help_commands
- print <<WOK
+ print <<-WOK
also see:
sisu --help commands
man sisu
-WOK
+ WOK
end
def help_env
- print <<WOK
+ print <<-WOK
for sisu environment information see:
sisu --help env
-WOK
+ WOK
end
def help_general
help_env
help_commands
end
def help_markup
- print <<WOK
+ print <<-WOK
for help with sisu markup see:
sisu --help markup
@@ -1433,8 +1406,6 @@ WOK
for brief descriptive summary of markup history
sisu --query-history
- or if for a particular version
- sisu --query-0.38
for markup:
sisu --help example
@@ -1443,19 +1414,14 @@ WOK
#{@cX.green}/usr/share/doc/sisu/markup-samples#{@cX.off}
and online
#{@cX.green}www.jus.uio.no/sisu#{@cX.off}
-WOK
+ WOK
end
def convert
- print <<WOK
+ print <<-WOK
for information on the markup version used within a sisu markup file:
sisu --inspect [filename]
- to convert between sst markup versions 0.37 and 0.38:
- sisu --to-current
- sisu --to-38 [filename/wildcard]
- sisu --to-37 [filename/wildcard]
-
convert an sst file with footnotes following text to (preferred) inline footnotes
sisu --convert-footnotes [filename/wildcard]
@@ -1476,50 +1442,50 @@ WOK
to attempt to convert a kdissert (.kdi) file to sisu markup:
sisu --from-kdi [kdissert filename]
(very basic and experimental)
-WOK
+ WOK
end
def dal
- print <<WOK
+ print <<-WOK
sisu --dal [filename/wildcard] creates the metaverse, used by all other modules for downstream processing
sisu -m [filename/wildcard] creates the metaverse, used by all other modules for downstream processing
-WOK
+ WOK
help_commands
end
def utf8
- print <<WOK
+ print <<-WOK
documents prepared for sisu processing should be stored in utf8
-WOK
+ WOK
end
def plaintext
- print <<WOK
+ print <<-WOK
sisu --txt [filename/wildcard] plaintext with Unix linefeeds (footnotes follow paragraphs)
sisu -t [filename/wildcard] plaintext with Unix linefeeds (footnotes follow paragraphs)
-WOK
+ WOK
help_commands
end
def html
- print <<WOK
+ print <<-WOK
sisu --html [filename/wildcard] html document type suffixes included
sisu -h [filename/wildcard] html document type suffixes included
-WOK
+ WOK
help_commands
end
def xhtml
- print <<WOK
+ print <<-WOK
sisu --xhtml [filename/wildcard] xhtml document
sisu -b [filename/wildcard] xhtml document
-WOK
+ WOK
help_commands
end
def xml
- print <<WOK
+ print <<-WOK
sisu --xml-sax [filename/wildcard] xml document (sax type parsing)
sisu -x [filename/wildcard] xml document (sax type parsing)
@@ -1532,52 +1498,52 @@ WOK
sisu --epub [filename/wildcard] odt document, (epub document)
sisu -e [filename/wildcard] odt document, (epub document)
-WOK
+ WOK
help_commands
end
def odf
- print <<WOK
+ print <<-WOK
sisu --odt [filename/wildcard] odt document, (odf open document format)
sisu -o [filename/wildcard] odt document, (odf open document format)
-WOK
+ WOK
help_commands
end
def epub
- print <<WOK
+ print <<-WOK
sisu --epub [filename/wildcard] epub document, (open format for e-books)
sisu -e [filename/wildcard] epub document, (open format for e-books)
-WOK
+ WOK
help_commands
end
def php
- print <<WOK
+ print <<-WOK
not supported
[php output has been removed]
-WOK
+ WOK
help_commands
end
def pdf
- print <<WOK
+ print <<-WOK
sisu --pdf [filename/wildcard] produces pdf files from LaTeX output
sisu -p [filename/wildcard] produces pdf files from LaTeX output
-WOK
+ WOK
help_commands
end
def latex
- print <<WOK
+ print <<-WOK
sisu --pdf [filename/wildcard] produces pdf files from LaTeX output
sisu -p [filename/wildcard] produces pdf files from LaTeX output
-WOK
+ WOK
help_commands
end
def texinfo
- print <<WOK
+ print <<-WOK
sisu --texinfo [filename] produces texinfo and info files
sisu -I [filename] produces texinfo and info files
@@ -1591,29 +1557,29 @@ WOK
and then to point at the file using
pinfo ./[filename]
-WOK
+ WOK
help_commands
end
def lout
- print <<WOK
+ print <<-WOK
sisu -l [filename/wildcard]
not currently supported, revisit someday?
-WOK
+ WOK
help_commands
end
def concordance
- print <<WOK
+ print <<-WOK
sisu --concordance starts the sisu webrick server, default port 8081
sisu --wordmap starts the sisu webrick server, default port 8081
sisu -W starts the sisu webrick server, default port 8081
-WOK
+ WOK
help_commands
end
def help_search
- print <<WOK
+ print <<-WOK
SiSU searches,
depending on how you wish to implement search,
@@ -1622,10 +1588,10 @@ WOK
sisu --help searchform (or 'sisu --help cgi')
sisu --help hyperestraier (or 'sisu --help est')
sisu --help webrick
-WOK
+ WOK
end
def cgi
- print <<WOK
+ print <<-WOK
sisu --sample-search-form generates a sample search form
sisu -F generates a sample search form
@@ -1635,12 +1601,12 @@ WOK
sisu -W starts the webrick server
the generated search form must be copied to the webserver directory as instructed
-WOK
+ WOK
help_search
help_general
end
def sql
- print <<WOK
+ print <<-WOK
Mappings to two databases are provided by default,
postgresql (--pg or -D) and sqlite (--sqlite or -d),
@@ -1671,21 +1637,21 @@ WOK
By default, [unless otherwise specified] databases are built on a directory basis, from collections of documents within that directory.
The name of the directory you choose to work from is used as the database name,
i.e. if you are working in a directory called #{@cX.blue}#{@env.path.home}/ebook#{@cX.off} the database #{@cX.blue}#{Db[:name_prefix]}ebook#{@cX.off} is used. [otherwise a manual mapping for the collection is necessary]
-WOK
+ WOK
help_search
help_general
end
def webrick
- print <<WOK
+ print <<-WOK
sisu --webrick starts the sisu webrick server, default port 8081
sisu -W starts the sisu webrick server, default port 8081
-WOK
+ WOK
help_commands
end
def hyperestraier
out_dir='(' + `ls #{@env.path.webserv}`.split("\n").join('|') + ')'
- print <<WOK
+ print <<-WOK
Not tested recently, not up-to-date
NOTE: The examples that follow assume that sisu output is placed in the directory
@@ -1742,10 +1708,10 @@ WOK
and try open the url: #{@cX.blue}
#{@env.url.webserv_host_base}/cgi-bin/estseek.cgi #{@cX.off}
-WOK
+ WOK
end
def yaml
- print <<WOK
+ print <<-WOK
Yaml sisurc files may be used to configure sisu, these are searched for in the following locations:
under the current SiSU markup data directory: #{@cX.blue}#{Dir.pwd}/_sisu/sisurc.yml#{@cX.off}
@@ -1760,10 +1726,10 @@ WOK
these may be called by the sisurc.yml, skins for document, directory or site, or from individual document headers in the header @@promo: [a commented out example header may be found in document sample: free_as_in_freedom.richard_stallman_cru‐ sade_for_free_software.sam_williams.sst, it calls for the specified lists in list.yml, which in turn calls the widgets named in promo.yml which are used to build content in the right pane of html output]
-WOK
+ WOK
end
def sitemap
- print <<WOK
+ print <<-WOK
SiSU sitemaps,
an experimental feature (following g,y,m announcement to use them this week)
@@ -1773,11 +1739,11 @@ WOK
to generate/update the index of sitemaps
sisu --sitemaps
-WOK
+ WOK
end
def license
- print <<WOK
+ print <<-WOK
* License: GPL 3 or later:
@@ -1802,7 +1768,6 @@ WOK
available at these locations:
<#{@cX.blue}http://www.fsf.org/licenses/gpl.html#{@cX.off}>
<#{@cX.blue}http://www.gnu.org/licenses/gpl.html#{@cX.off}>
- <#{@cX.blue}http://www.jus.uio.no/sisu/gpl.fsf#{@cX.off}>
* SiSU uses:
* Standard SiSU markup syntax,
@@ -1810,20 +1775,21 @@ WOK
* Standard SiSU object citation numbering and system
* Hompages:
- <#{@cX.blue}http://www.jus.uio.no/sisu#{@cX.off}>
<#{@cX.blue}http://www.sisudoc.org#{@cX.off}>
+ <#{@cX.blue}http://www.jus.uio.no/sisu#{@cX.off}>
* Download:
- <#{@cX.blue}http://www.jus.uio.no/sisu/SiSU/download.html#{@cX.off}>
+ <#{@cX.blue}http://sources.sisudoc.org#{@cX.off}>
+ <#{@cX.blue}http://www.jus.uio.no/sisu/en/html/SiSU/download.html#{@cX.off}>
Ralph Amissah
<#{@cX.blue}ralph@amissah.com#{@cX.off}>
<#{@cX.blue}ralph.amissah@gmail.com#{@cX.off}>
-WOK
+ WOK
end
def standards
- print <<WOK
+ print <<-WOK
* SiSU uses:
* Standard SiSU markup syntax,
@@ -1834,7 +1800,7 @@ Copyright (C) Ralph Amissah 1997, current 2013.
All Rights Reserved.
Information on these may be obtained from:
- http://www.jus.uio.no/sisu
+ <#{@cX.blue}http://sisudoc.org#{@cX.off}>
More information to be provided later.
@@ -1843,10 +1809,10 @@ More information to be provided later.
* Ralph Amissah ralph@amissah.com
Ralph Amissah ralph.amissah@gmail.com
-WOK
+ WOK
end
def conversion
- print <<WOK
+ print <<-WOK
sisu_convert does the initial conversion from a couple of file formats to SiSU file format, currently only html and word97
#{@cX.cyan}sisu_convert#{@cX.off} [keyword]
sisu [keyword]
@@ -1854,10 +1820,10 @@ sisu_convert does the initial conversion from a couple of file formats to SiSU f
------------------------------------------
Preparing Documents for SiSU
#{@cX.green}--word97#{@cX.off} sisu --help markup (an incomplete overview)
-WOK
+ WOK
end
def external_programs
- puts <<WOK
+ puts <<-WOK
external ruby programs
@@ -1877,10 +1843,10 @@ WOK
#{@cX.brown}suggested/recommended#{@cX.off}
tidy (xml, xhtml well formed check)
trang (relaxng, rnc to dtd conversion)
-WOK
+ WOK
end
def scratch
- print <<WOK
+ print <<-WOK
Types of tag,
then there are various tags which occur within the document.
@@ -1907,7 +1873,7 @@ This makes citation a lot easier... regardless of the form of output that is bei
It also permits the building of various addons, like the concordance feature which identifies each word and the paragraphs in which the word appears with links to the paragraph...
Urls are automatically turned to live links in the html and pdf files created...
-WOK
+ WOK
end
end
end
diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v5/html.rb
index 340b81e9..d3122670 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -93,29 +93,37 @@ module SiSU_HTML
@fnb=@md.fnb
@env=@particulars.env
loc=@env.url.output_tell
+ primary_output_file=(@opt.act[:html_seg][:set]==:on) \
+ ? (@md.file.output_path.html_seg.dir + '/' + @md.file.base_filename.html_segtoc)
+ : (@md.file.output_path.html_scroll.dir + '/' + @md.file.base_filename.html_scroll)
unless @opt.cmd =~/q/
tool=(@opt.cmd =~/[MVvz]/) \
- ? ("#{@env.program.web_browser} file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}")
+ ? ("#{@env.program.web_browser} file://#{primary_output_file}")
: ("[#{@opt.f_pth[:lng_is]}] #{@opt.fno}")
@opt.cmd=~/[MVvz]/ \
? SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_hi_blue
: SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_title_hi
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}").flow if @opt.cmd =~/[MV]/
+ SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{primary_output_file}").flow if @opt.cmd =~/[MV]/
end
- SiSU_Env::InfoSkin.new(@md).select
data=nil
tuned_file_array=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
data=tuned_file_array
- scr_endnotes=SiSU_HTML::Source::Endnotes.new(data,@md).scroll
+ if @opt.act[:html_scroll][:set]==:on
+ scr_endnotes=SiSU_HTML::Source::Endnotes.new(data,@md).scroll
+ end
toc=SiSU_HTML::Source::Toc.new(@md,data).songsheet
links_guide=SiSU_HTML::Source::LinksGuide.new(data,@md).toc
data=tuned_file_array
scr_toc=SiSU_HTML::Source::ScrollHeadAndSegToc.new(@md,toc,links_guide).in_common #watch
- SiSU_HTML::Source::Seg.new(@md,data).songsheet
+ if @opt.act[:html_seg][:set]==:on
+ SiSU_HTML::Source::Seg.new(@md,data).songsheet
+ end
data=tuned_file_array
- scr=SiSU_HTML::Source::Scroll.new(@md,data,scr_endnotes).songsheet
- scroll=SiSU_HTML::Source::ScrollOutput.new(scr_toc,scr[:body],scr[:metadata],scr[:owner_details],scr[:tails],@md).publish
- SiSU_HTML::Source::Output.new(scroll,@md).scroll
+ if @opt.act[:html_scroll][:set]==:on
+ scr=SiSU_HTML::Source::Scroll.new(@md,data,scr_endnotes).songsheet
+ scroll=SiSU_HTML::Source::ScrollOutput.new(scr_toc,scr[:body],scr[:metadata],scr[:owner_details],scr[:tails],@md).publish
+ SiSU_HTML::Source::Output.new(scroll,@md).scroll
+ end
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -142,7 +150,7 @@ module SiSU_HTML
def initialize(particulars)
@particulars=particulars
@md,@env=particulars.md,particulars.env
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env,@css=particulars.env,SiSU_Style::CSS.new
end
def tuned_file_instructions
@@ -224,7 +232,7 @@ module SiSU_HTML
@@firstseg=nil
def initialize(md=nil,data='')
@data,@md=data,md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@tell=SiSU_Screen::Ansi.new(@md.opt.cmd) if @md
end
def songsheet #extracts toc for scroll & seg
@@ -516,7 +524,7 @@ WOK
class ScrollHeadAndSegToc < Toc
def initialize(md='',toc='',links_guide_toc='')
@md,@toc,@links_guide_toc=md,toc,links_guide_toc
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@make=SiSU_Env::ProcessingSettings.new(@md)
end
def in_common
@@ -594,7 +602,9 @@ WOK
ads=SiSU_HTML_Promo::Ad.new(@md)
@segtoc << format_head_toc.seg_navigation_tail << ads.div.close << ads.display << format_head_toc.html_close
@segtoc=@segtoc.flatten.compact #watch
- SiSU_HTML::Source::Output.new(@segtoc,@md).segtoc
+ if @md.opt.act[:html_seg][:set]==:on
+ SiSU_HTML::Source::Output.new(@segtoc,@md).segtoc
+ end
@segtoc=[]
@toc[:scr],@toc[:seg]=[],[]
toc_shared
@@ -623,54 +633,58 @@ WOK
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
end
def scroll
- begin
- @filename_html_scroll=@file.write_file.html_scroll
- @data.each do |para|
- para=para.strip.
- gsub(/<:.+?>/,'').
- gsub(Xx[:html_relative2],@file.path_rel_links.html_scroll_2).
- gsub(Xx[:html_relative1],@file.path_rel_links.html_scroll_1).
- #gsub(/#{Xx[:html_relative]}/,@file.path_rel_links.html_scroll).
- gsub(/#{Rx[:mx_fa_clean]}/,'')
- unless para =~/\A\s*\Z/
- @filename_html_scroll.puts para,"\n"
+ if @md.opt.act[:html_scroll][:set]==:on
+ begin
+ @filename_html_scroll=@file.write_file.html_scroll
+ @data.each do |para|
+ para=para.strip.
+ gsub(/<:.+?>/,'').
+ gsub(Xx[:html_relative2],@file.path_rel_links.html_scroll_2).
+ gsub(Xx[:html_relative1],@file.path_rel_links.html_scroll_1).
+ #gsub(/#{Xx[:html_relative]}/,@file.path_rel_links.html_scroll).
+ gsub(/#{Rx[:mx_fa_clean]}/,'')
+ unless para =~/\A\s*\Z/
+ @filename_html_scroll.puts para,"\n"
+ end
end
+ rescue
+ SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ @filename_html_scroll.close
end
- rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
- __LINE__.to_s + ':' + __FILE__
- end
- ensure
- @filename_html_scroll.close
end
end
def segtoc
- begin
- @filename_html_segtoc=@file.write_file.html_segtoc
- @data.each do |para|
- para=para.strip.
- gsub(/<!.+?!>/,'').
- gsub(Xx[:html_relative2],@file.path_rel_links.html_seg_2).
- gsub(Xx[:html_relative1],@file.path_rel_links.html_seg_1)
- unless para =~/\A\s*\Z/
- @filename_html_segtoc.puts para,"\n"
+ if @md.opt.act[:html_seg][:set]==:on
+ begin
+ @filename_html_segtoc=@file.write_file.html_segtoc
+ @data.each do |para|
+ para=para.strip.
+ gsub(/<!.+?!>/,'').
+ gsub(Xx[:html_relative2],@file.path_rel_links.html_seg_2).
+ gsub(Xx[:html_relative1],@file.path_rel_links.html_seg_1)
+ unless para =~/\A\s*\Z/
+ @filename_html_segtoc.puts para,"\n"
+ end
end
+ rescue
+ SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ @filename_html_segtoc.close
+ pwd_set=Dir.pwd
+ idx_lnk=(@o_str.dump_or_redirect?) \
+ ? @file.base_filename.manifest
+ : @file.base_filename.html_segtoc
+ mlnk=@file.base_filename.html_seg_index
+ Dir.chdir(@file.output_path.html_seg.dir)
+ FileUtils::rm_f(mlnk)
+ FileUtils::ln_s(idx_lnk,mlnk)
+ Dir.chdir(pwd_set)
end
- rescue
- SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.fns).error do
- __LINE__.to_s + ':' + __FILE__
- end
- ensure
- @filename_html_segtoc.close
- pwd_set=Dir.pwd
- idx_lnk=(@o_str.dump_or_redirect?) \
- ? @file.base_filename.manifest
- : @file.base_filename.html_segtoc
- mlnk=@file.base_filename.html_seg_index
- Dir.chdir(@file.output_path.html_seg.dir)
- FileUtils::rm_f(mlnk)
- FileUtils::ln_s(idx_lnk,mlnk)
- Dir.chdir(pwd_set)
end
end
end
diff --git a/lib/sisu/v3/html_format.rb b/lib/sisu/v5/html_format.rb
index da67a296..3c8bc465 100644
--- a/lib/sisu/v3/html_format.rb
+++ b/lib/sisu/v5/html_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,30 +67,28 @@ module SiSU_HTML_Format
@ocn ||=''
end
def ocn_display
- @make=SiSU_Env::ProcessingSettings.new(@md)
- if @make.build.ocn?
+ make=SiSU_Env::ProcessingSettings.new(@md)
+ if make.build.ocn?
ocn_class='ocn'
- if @ocn.to_i==0
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}"><a name="#{@ocn}">&nbsp;</a></label>})
+ if @ocn.to_i==0 \
+ or @ocn.empty?
+ %{<label class="ocn_off">&nbsp;</label>}
else
@ocn.gsub(/^(\d+|)$/,
%{<label class="#{ocn_class}"><a name="#{@ocn}" href="##{@ocn}" class="lnk#{ocn_class}">\\1</a></label>})
end
else
- ocn_class='ocn_off'
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}">&nbsp;</label>})
+ %{<label class="ocn_off">&nbsp;</label>}
end
end
def name
- %{<a name="#{@ocn}"></a>}
+ (@ocn==nil || @ocn.empty?) ? '' : %{<a name="#{@ocn}"></a>}
end
def id #w3c? "tidy" complains about numbers as identifiers ! annoying
- %{id="o#{@ocn}"}
+ (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"}
end
def goto
- %{<a href="##{@ocn}">}
+ (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn}">}
end
end
class HeadInformation
@@ -101,15 +99,14 @@ module SiSU_HTML_Format
def initialize(md)
@md=md
# DublinCore 1 - title
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@seg_name_html=(SiSU_HTML::Source::Seg.new.seg_name_html || [])
@seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || [])
- @metalink='#metadata'
@tocband_scroll,@tocband_segtoc=nil,nil
@stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
- @index='index'
- @toc="#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}"
+ @index,@metalink='index','#metadata'
+ @toc=@md.file.base_filename.html_segtoc
end
def url_path_image_sys
(@o_str.dump_or_redirect?) \
@@ -158,14 +155,13 @@ module SiSU_HTML_Format
end
self
end
- def doc_types #used in toc & seg_nav_band
- scroll=seg=''
+ def doc_types(page=:seg) #used in toc & seg_nav_band
wgt=SiSU_HTML_Format::Widget.new(@md)
%{
<table summary="segment navigation available documents types: toc,doc,pdf,concordance" border="0" cellpadding="3" cellspacing="0">
<tr>
<td align="center" bgcolor=#{@vz.color_band2}>
- #{wgt.manifest}
+ #{wgt.manifest(page)}
#{wgt.search}
</tr></table>}
end
@@ -181,16 +177,25 @@ module SiSU_HTML_Format
%{ </font>
#{@vz.table_close}}
end
- def buttons_home
- %{<!- home and index buttons -!>
- #{@vz.banner_home_and_index_buttons}
-<!- home and index buttons -!>}
- end
- def copyat
- %{#{@vz.paragraph_font_tiny}copy @
- <a href="#{@vz.url_home}">
- #{@vz.txt_home}
- </a></h1>}
+ def button_home(page=:seg)
+ button=%{ <table summary="home button / home information" border="0" cellpadding="3" cellspacing="0">\n <tr><td align="left" bgcolor="#ffffff">\n}
+ if @md.make.home_button_image.is_a?(Hash)
+ image_path=if page==:manifest
+ @md.file.output_path.manifest.rel_image
+ elsif page==:scroll
+ @md.file.output_path.html_scroll.rel_image
+ else
+ @md.file.output_path.html_seg.rel_image
+ end
+ dir=SiSU_Env::FileOp.new(@md)
+ button +=%{ <p class="tiny_left"><a href="#{@md.make.home_button_image[:link]}" target="_top"><img border="0" src="#{image_path}/#{@md.make.home_button_image[:home_button]}" width="#{@md.make.home_button_image[:w]}" height="#{@md.make.home_button_image[:h]}" alt="home icon --&gt;" /></a></p>\n}
+ elsif @md.home_button_links.is_a?(Array)
+ @md.home_button_links.each do |links|
+ button +=%{ <p class="tiny_left"><a href="#{links[:url]}/" target="_top">\n #{links[:say]}\n </a></p>\n}
+ end
+ end
+ button +=%{ </td></tr>\n </table>}
+ button
end
def html_close #moved
%{</body>
@@ -239,7 +244,7 @@ module SiSU_HTML_Format
else ''
end
end
- def manifest
+ def manifest(page=:seg)
if @make.build.links_to_manifest? \
and not @o_str.dump_or_redirect?
manifest_lnk=if @file.output_dir_structure.by_language_code? \
@@ -247,11 +252,21 @@ module SiSU_HTML_Format
"#{Xx[:html_relative1]}manifest/#{@file.base_filename.manifest}"
else @file.base_filename.manifest
end
- %{<td align="center" bgcolor=#{@vz.color_band2}>
+ if page==:manifest
+ manifest_lnk="#{@md.file.output_path.manifest.url}/#{@file.base_filename.manifest}"
+ brace_url=SiSU_Viz::Defaults.new.url_decoration
+ %{<td align="center" bgcolor=#{@vz.color_band2}>
+ <font face="#{@vz.font_fonts}" size="2">
+ #{brace_url.xml_open}<a href="#{manifest_lnk}" target="_top">#{@md.file.output_path.manifest.url}/#{@file.base_filename.manifest}</a>#{brace_url.xml_close}
+ </font>
+</td>}
+ else
+ %{<td align="center" bgcolor=#{@vz.color_band2}>
<a href="#{manifest_lnk}" target="_top">
#{@vz.nav_txt_manifest}
</a>
</td>}
+ end
else ''
end
end
@@ -282,6 +297,7 @@ module SiSU_HTML_Format
@md=md
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
@make=SiSU_Env::ProcessingSettings.new(@md)
+ @file=SiSU_Env::FileOp.new(@md)
end
def scroll_head_navigation_band
if @make.build.html_top_band?
@@ -292,8 +308,11 @@ module SiSU_HTML_Format
WOK
%{<table summary="table of contents scroll navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}>
<tr><td width="20%">
- #{@vz.banner_band}
-</td>#{search_and_manifest}
+ #{button_home(:scroll)}
+</td>
+<td width="75%" align="center">
+ #{doc_types}
+</td>
<td width="20%">
&nbsp;
#{@vz.table_close}
@@ -301,13 +320,16 @@ WOK
else ''
end
end
- def concordance_navigation_band(type='')
+ def concordance_navigation_band
if @make.build.html_top_band?
%{<table summary="concordance navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}>
<tr><td width="20%">
- #{@vz.banner_band}
+ #{button_home}
+</td>
+<td width="75%" align="center">
+ #{doc_types}
</td>
-<td width="20%" align="right">
+<td width="5%" align="right">
&nbsp;<a href="toc.html" target="_top" alt="-&gt;">
#{png_nav.toc}
</a>&nbsp;
@@ -316,16 +338,24 @@ WOK
else ''
end
end
- def seg_head_navigation_band(type='')
- firstseg=%{<a href="#{@md.firstseg}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top" alt="-&gt;">
- #{png_nav.nxt}
- </a>} if @md.firstseg =~/\S+/
+ def seg_head_navigation_band(page=:seg)
+ if page==:manifest
+ nxt=(@file.output_dir_structure.by_language_code? \
+ || @file.output_dir_structure.by_filetype?) \
+ ? "../html/#{@md.fnb}/toc#{@md.lang_code_insert}#{Sfx[:html]}"
+ : "toc#{@md.lang_code_insert}#{Sfx[:html]}"
+ firstseg=%{<a href="#{nxt}" target="_top" alt="-&gt;">
+ #{png_nav.nxt}</a>}
+ elsif @md.firstseg =~/\S+/
+ firstseg=%{<a href="#{@md.firstseg}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top" alt="-&gt;">
+ #{png_nav.nxt}</a>}
+ end
%{<table summary="table of contents segment navigation band" id="toc" width="100%" bgcolor=#{@vz.color_band1}>
<tr><td width="20%">
- #{@vz.banner_band}
+#{button_home(page)}
</td>
<td width="75%" align="center">
- #{doc_types}
+ #{doc_types(page)}
</td>
<td width="5%" align="right">
&nbsp;#{firstseg}&nbsp;
@@ -494,15 +524,13 @@ WOK
%{<p class="small_left">Prefix: #{@md.prefix_b}<p />}
end
def scroll_head_title_banner_open
- %{<center>
-#{@md.icon}
-</center>
+ icon=@md.icon ? %{<center>\n#{@md.icon}\n</center>} : ''
+ %{#{icon}
#{@vz.banner_instrument_cover_band_scr}}
end
def seg_head_title_banner_open
- %{<center>
- #{@md.icon}
-</center>
+ icon=@md.icon ? %{<center>\n#{@md.icon}\n</center>} : ''
+ %{#{icon}
#{@vz.banner_instrument_cover_band_seg}}
end
def make_scroll
@@ -596,8 +624,6 @@ WOK
<a name="stop" id="stop"></a>
<a name="credits"></a>
</div>
-</div>
-</div>
}
end
def seg_navigation_tail #this is a bug area, look up and "tidy"
@@ -766,7 +792,7 @@ WOK
def navigation_band(segtocband,seg_table_top_control) #change name to navigation_band_banner
%{<table summary="segment navigation band with banner" bgcolor=#{@vz.color_band1} width="100%"><tr>
<td width="20%" align="left">
-#{@vz.banner_band}
+#{button_home}
</td>
<td width="75%" align="center">
#{doc_types}
@@ -865,7 +891,7 @@ WOK
end
end
class FormatTextObject
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
attr_accessor :md,:t_o,:txt,:ocn,:format,:table,:link,:linkname,:paranum,:p_num,:headname,:banner,:url
def initialize(md,t_o)
@md,@t_o=md,t_o
@@ -897,7 +923,7 @@ WOK
@txt=@txt.gsub(/#{Mx[:mk_o]}[-~]##{Mx[:mk_c]}/,'')
end
@p_num=ParagraphNumber.new(@md,@ocn)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@make=SiSU_Env::ProcessingSettings.new(@md)
end
def nametags_scroll(dob)
@@ -1006,7 +1032,7 @@ WOK
end
def heading_normal(tag,attrib)
section_break=(tag=~/h[1-4]/) \
- ? '<p><hr width=90% /></p>'
+ ? '<br /><hr width=90% /><br />'
: ''
%{#{section_break}
<div class="substance">
@@ -1145,7 +1171,7 @@ WOK
class FormatScroll < FormatTextObject
def initialize(md,txt)
super(md,txt)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
end
class FormatSeg < FormatTextObject
@@ -1211,7 +1237,6 @@ WOK
def clean(txt)
txt=txt.gsub(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/,'').
gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/,'')
- txt
end
def subtoc_lev(tag,attrib)
@txt=clean(@txt)
diff --git a/lib/sisu/v3/html_minitoc.rb b/lib/sisu/v5/html_minitoc.rb
index 8158c48d..bd9835dd 100644
--- a/lib/sisu/v3/html_minitoc.rb
+++ b/lib/sisu/v5/html_minitoc.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_minitoc.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_minitoc.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/html_promo.rb b/lib/sisu/v5/html_promo.rb
index c2a8462d..a76a15fa 100644
--- a/lib/sisu/v3/html_promo.rb
+++ b/lib/sisu/v5/html_promo.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_promo.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_promo.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -66,9 +66,9 @@ module SiSU_HTML_Promo
def initialize(md)
@md=md
@env=SiSU_Env::InfoEnv.new(@md.fns,@md)
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
- @ad=SiSU_Env::GetInit.instance.ads
- @vz=SiSU_Env::GetInit.instance.skin
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
+ @ad=SiSU_Env::GetInit.new.ads
+ @vz=SiSU_Viz::Defaults.new
@flag=@env.widget.promo?
@make=SiSU_Env::ProcessingSettings.new(@md)
end
@@ -99,7 +99,7 @@ module SiSU_HTML_Promo
&& @flag[:ad]
ads=if @md.promo && @md.promo.length > 0 #promo set in document
promo_array=@md.promo
- elsif @flag[:sk] #promo set in associated skin
+ elsif @flag[:sk] #promo set
promo_array=@vz.widget_promo
elsif @flag[:rc] #promo set in rc file
promo_array=if @rc['html']['promo'].is_a?(String)
diff --git a/lib/sisu/v3/html_scroll.rb b/lib/sisu/v5/html_scroll.rb
index 3180586c..fa183f46 100644
--- a/lib/sisu/v3/html_scroll.rb
+++ b/lib/sisu/v5/html_scroll.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_scroll.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_scroll.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -67,7 +67,7 @@ module SiSU_HTML_Scroll
class Scroll
def initialize(md='',data='',endnotes='')
@md,@data,@endnotes=md,data,endnotes
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def songsheet
begin
@@ -129,7 +129,7 @@ module SiSU_HTML_Scroll
end
elsif dob.is==:break \
and dob.from==:markup
- '<p><hr width=90% /></p>'
+ '<br /><hr width=90% /><br />'
elsif dob.is==:heading_insert
x=if dob.ln==1
unless dob.obj.empty?
diff --git a/lib/sisu/v3/html_segments.rb b/lib/sisu/v5/html_segments.rb
index 7c90c53e..9efa2067 100644
--- a/lib/sisu/v3/html_segments.rb
+++ b/lib/sisu/v5/html_segments.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_segments.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_segments.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -153,7 +153,7 @@ module SiSU_HTML_Seg
attr_reader :seg_name_html,:seg_name_html_tracker
def initialize(md=nil,data='')
@md,@data=md,data
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@seg_name_html=@@seg_name_html || nil
@seg_name_html_tracker=@@tracker || nil
@env=SiSU_Env::InfoEnv.new(@md.fns) if @md
@@ -480,7 +480,7 @@ module SiSU_HTML_Seg
sto.table
elsif dob.is==:break \
and dob.from==:markup
- '<p><hr width=90% /></p>'
+ '<br /><hr width=90% /><br />'
end
if @md.flag_separate_endnotes
dob.obj=dob.obj.gsub(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type
diff --git a/lib/sisu/v3/html_table.rb b/lib/sisu/v5/html_table.rb
index 7713a66f..8c9b76d0 100644
--- a/lib/sisu/v3/html_table.rb
+++ b/lib/sisu/v5/html_table.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_table.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_table.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v5/html_tune.rb
index 23fa586e..9f81e8cd 100644
--- a/lib/sisu/v3/html_tune.rb
+++ b/lib/sisu/v5/html_tune.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/html_tune.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_tune.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -116,11 +116,11 @@ module SiSU_HTML_Tune
class Tune
def initialize(data,md)
@data,@md=data,md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env=SiSU_Env::InfoEnv.new(@md.fns)
@sys=SiSU_Env::SystemCall.new
@env=SiSU_Env::InfoEnv.new(@md.fns)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def songsheet
begin
diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v5/hub.rb
index 2421a50c..6f0d0b63 100644
--- a/lib/sisu/v3/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/hub.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -146,11 +146,9 @@ module SiSU
number_of_files={}
@opt.files.each_with_index do |fns,i|
fn=fns.gsub(/(?:~(?:#{@r}))?\.ss[tm]$/,'')
- if number_of_files[fn].is_a?(Array)
- number_of_files[fn] << i
- else
- number_of_files.store(fn,[i])
- end
+ (number_of_files[fn].is_a?(Array)) \
+ ? (number_of_files[fn] << i)
+ : (number_of_files.store(fn,[i]))
end
files_translated_idx=[]
number_of_files.each do |x|
@@ -191,22 +189,22 @@ module SiSU
@@n_do=0
end
def remote_put_base_site_rsync # -CR
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).rsync_base
end
def remote_put_base_site_rsync_match # -CCRZ
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).rsync_base_sync
end
def remote_put_base_site # -Cr
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).scp_base
end
def remote_put_base_site_all # -CCr
-p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:cyan) if @opt.act[:maintenance][:set] ==:on
require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).scp_base_all
end
@@ -256,11 +254,14 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
attr_accessor :op
def initialize(opt)
@opt=opt
- @@env=SiSU_Env::InfoEnv.new
+ @@env=@env=SiSU_Env::InfoEnv.new
@msg,@msgs='',nil
@tell=lambda { SiSU_Screen::Ansi.new(@opt.cmd,@msg,"#{@msgs.inspect if @msgs}") }
end
def do_loops
+ if @opt.act[:zap][:set]==:on #% --zap, -Z
+ do_loop_files_on_given_option_pre
+ end
do_each_file_loop_options
do_loop_files_on_given_option_post
end
@@ -307,6 +308,15 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
if @opt.act[:html][:set]==:on #% --html, -h
require_relative 'html' # -h -H html.rb
SiSU_HTML::Source.new(@opt).read
+ else
+ if @opt.act[:html_seg][:set]==:on #% --html-seg
+ require_relative 'html' # -h -H html.rb
+ SiSU_HTML::Source.new(@opt).read
+ end
+ if @opt.act[:html_scroll][:set]==:on #% --html-scroll
+ require_relative 'html' # -h -H html.rb
+ SiSU_HTML::Source.new(@opt).read
+ end
end
if @opt.act[:concordance][:set]==:on #% --concordance, -w
require_relative 'concordance' # -w concordance.rb
@@ -332,7 +342,9 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
require_relative 'xml_dom' # -X xml_dom.rb
SiSU_XML_DOM::Source.new(@opt).read
end
- if @opt.act[:pdf][:set]==:on #% --pdf, -p latex/ texpdf
+ if @opt.act[:pdf][:set]==:on \
+ or @opt.act[:pdf_p][:set]==:on \
+ or @opt.act[:pdf_l][:set]==:on #% --pdf-l --pdf, -p latex/ texpdf
require_relative 'texpdf' # -p texpdf.rb
SiSU_TeX::Source.new(@opt).read
end
@@ -345,25 +357,28 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
SiSU_TexInfo::Source.new(@opt).read
end
if @opt.act[:sqlite_discrete][:set]==:on #% --sqlite, -d DB sqlite
- require_relative 'dbi_discrete' # -d dbi_discrete.rb
+ require_relative 'dbi_discrete' # -d dbi_discrete.rb
SiSU_DBI_Discrete::SQL.new(@opt).build
end
if @opt.act[:manifest][:set]==:on #% --manifest, -y
require_relative 'manifest' # -y manifest.rb
- SiSU_Manifest::Source.new(@opt).read
+ ((@opt.act[:sisupod][:set]==:on \
+ || @opt.act[:share_source][:set]==:on) \
+ && @opt.files.length < 2 ) \
+ ? nil
+ : SiSU_Manifest::Source.new(@opt).read
end
end
end
- def loop_files_on_given_option_pre_do
- if @opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
- require_relative 'sisupod_make' # -S sisupod_make.rb
- begin
+ def do_loop_files_on_given_option_pre
+ begin
+ if @opt.act[:zap][:set]==:on #% --zap, -Z
OptionLoopFiles.new(@opt).loop_files_on_given_option do
- SiSU_Doc::Source.new(@opt).read
+ require_relative 'zap'
+ SiSU_Zap::Source.new(@opt).read # -Z zap.rb
end
- ensure
- SiSU_Doc::Source.new(@opt).sisupod_tar_xz
end
+ ensure
end
end
def do_loop_files_on_given_option_post
@@ -406,11 +421,21 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
end
end
end
+ if (@opt.act[:sisupod][:set]==:on \
+ || @opt.act[:share_source][:set]==:on) \
+ and @opt.act[:manifest][:set]==:on #% --manifest, -y
+ require_relative 'manifest' # -y manifest.rb
+ begin
+ ensure
+ OptionLoopFiles.new(@opt).loop_files_on_given_option_bundle do
+ SiSU_Manifest::Source.new(@opt).read
+ end
+ end
+ end
ensure
path_pod=@env.processing_path.processing_sisupod(@opt).paths
unless @opt.cmd =~/M/
FileUtils::rm_rf("#{path_pod[:sisupod]}/*") if FileTest.directory?(path_pod[:sisupod])
- #FileUtils::rm_rf("#{path_pod[:fnb]}/*") if FileTest.directory?(path_pod[:fnb])
end
end
end
@@ -444,50 +469,18 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
end
SiSU::Operations.new.counter
end
- if @opt.cmd =~/k/ #% -k temporary tests
- OptionLoopFiles.new(@opt).loop_files_on_given_option do
- #require_relative 'xml_scaffold'
- #fix
- end
- end
if @opt.act[:psql][:set]==:on #% --pg, -D DB postgresql
require_relative 'dbi'
- if @opt.files.length > 0 #switch test to actual commands
- OptionLoopFiles.new(@opt).loop_files_on_given_option do
- SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
- end
- else
- SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
+ OptionLoopFiles.new(@opt).loop_files_on_given_option do
+ SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
end
end
if @opt.act[:sqlite][:set]==:on #% --sqlite, -d DB sqlite
require_relative 'dbi'
- if @opt.files.length > 0 #switch test to actual commands
- OptionLoopFiles.new(@opt).loop_files_on_given_option do
- SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
- end
- else
- SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
+ OptionLoopFiles.new(@opt).loop_files_on_given_option do
+ SiSU_DBI::SQL.new(@opt).connect # -D -d dbi.rb
end
end
- if @opt.act[:dal][:set]==:on #% --dal, -m embedded content
- # OptionLoopFiles.new(@opt).loop_files_on_given_option do
- # require_relative 'embedded'
- # SiSU_Embedded::Source.new(@opt).read # -m embedded.rb (image and other content) #check
- # end
- end
- if @opt.act[:zap][:set]==:on #% --zap, -Z
- # OptionLoopFiles.new(@opt).loop_files_on_given_option do
- # require_relative 'zap'
- # SiSU_Zap::Source.new(@opt).read # -Z zap.rb
- # end
- end
- if @opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
- # OptionLoopFiles.new(@opt).loop_files_on_given_option do
- # require_relative 'sisupod_make'
- # SiSU_Doc::Source.new(@opt).read # -S sisupod_make.rb
- # end
- end
if @opt.act[:manifest][:set]==:on #% --manifest, -y
require_relative 'manifest'
OptionLoopFiles.new(@opt).manifest_on_files_translated do
@@ -583,15 +576,10 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
if @opt.act[:webrick][:set]==:on #% --webrick, -W webrick
SiSU::Operations.new(@opt).webrick
end
- if @opt.act[:zap][:set]==:on #% --zap -Z wipe previous output clean DUPLICATE
- #require_relative 'zap'
- #SiSU_Zap::Source.new(@opt).read # -Z zap.rb
- end
if @opt.act[:dal][:set]==:on
@retry_count= -1
begin
path_image='./_sisu/processing/external_document/image'
- path_skin='./_sisu/processing/external_document/skin/doc'
@get_s,@get_p,@get_pl=[],[],[]
re_s=/(\S+?\.-sst)$/
re_p3=/((?:https?|file):\/\/\S+?(?:\/\S+?\.ss[mt]\.txz|sisupod(?:\.txz)?|\.ssp))/
@@ -625,35 +613,93 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
ensure
end
end
- if @opt.act[:site_init][:set]==:on #% -C
- require_relative 'conf' # -s conf.rb
- SiSU_Initialize::Source.new(@opt).read
- end
end
def actions
if @opt.act[:profile][:set]==:on
require 'profile'
end
+ action_on_file_ =if @opt.act[:rsync][:set]==:on \
+ && @opt.act[:site_init][:set]==:on
+ :false
+ elsif @opt.act[:rsync][:set]==:on \
+ && @opt.act[:site_init][:set] !=:on
+ :true
+ elsif ((@opt.act[:psql][:set]==:on \
+ or @opt.act[:sqlite][:set]==:on) \
+ and @opt.mod.join(';') =~/--(?:createdb|init(?:ialize)?|create(?:all)?|createtables|recreate|drop(?:all))/)
+ :false
+ else
+ (@opt.act[:dal][:set]==:on \
+ || @opt.act[:manpage][:set]==:on \
+ || @opt.act[:texinfo][:set]==:on \
+ || @opt.act[:txt][:set]==:on \
+ || @opt.act[:html][:set]==:on \
+ || @opt.act[:html_scroll][:set]==:on \
+ || @opt.act[:html_seg][:set]==:on \
+ || @opt.act[:concordance][:set]==:on \
+ || @opt.act[:xhtml][:set]==:on \
+ || @opt.act[:epub][:set]==:on \
+ || @opt.act[:odt][:set]==:on \
+ || @opt.act[:xml_sax][:set]==:on \
+ || @opt.act[:xml_dom][:set]==:on \
+ || @opt.act[:pdf][:set]==:on \
+ || @opt.act[:pdf_p][:set]==:on \
+ || @opt.act[:pdf_l][:set]==:on \
+ || @opt.act[:psql][:set]==:on \
+ || @opt.act[:sqlite][:set]==:on \
+ || @opt.act[:sqlite_discrete][:set]==:on \
+ || @opt.act[:share_source][:set]==:on \
+ || @opt.act[:sisupod][:set]==:on \
+ || @opt.act[:qrcode][:set]==:on \
+ || @opt.act[:hash_digests][:set]==:on \
+ || @opt.act[:manifest][:set]==:on \
+ || @opt.act[:scp][:set]==:on \
+ || @opt.act[:webrick][:set]==:on \
+ || @opt.act[:zap][:set]==:on) \
+ ? (:true)
+ : (:false)
+ end
if @opt.act[:harvest][:set]==:on
require_relative 'harvest' # harvest.rb
SiSU_Harvest::Source.new(@opt).read # -h -H html.rb
elsif @opt.mod.inspect =~/--convert|--to|--from/
require_relative 'sst_convert_markup' # sst_convert_markup.rb
- elsif @opt.cmd =~/([abCcDdeFGgHhIjikLMmNnoPpQqRrSsTtUuVvWwXxYyZ_0-9])/ \
- and @opt.cmd =~/^-/ \
- and @opt.mod.inspect !~/--(?:sitemaps|query|identify)/ \
- or @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/
+ elsif action_on_file_ == :false \
+ and (@opt.act[:psql][:set]==:on \
+ or @opt.act[:sqlite][:set]==:on)
+ if @opt.act[:psql][:set]==:on
+ require_relative 'dbi'
+ SiSU_DBI::SQL.new(@opt).connect
+ end
+ if @opt.act[:sqlite][:set]==:on
+ require_relative 'dbi'
+ SiSU_DBI::SQL.new(@opt).connect
+ end
+ elsif action_on_file_ == :true \
+ or (
+ @opt.cmd =~/^-/ \
+ and @opt.cmd =~/([abCcDdeFGgHhIjikLMmNnoPpQqRrSsTtUuVvWwXxYyZ_0-9])/ \
+ and @opt.mod.inspect !~/--(?:sitemaps|query|identify)/ \
+ or @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/
+ )
do_initialization
- do_loops
- @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.act[:quiet][:set] ==:on
- @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty?
- if defined? @@env.processing_path.processing \
- and @@env.user \
- and FileTest.directory?(@@env.processing_path.processing) \
- and @@env.processing_path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area
- FileUtils::cd(@@env.processing_path.processing_base_tmp) do
- FileUtils::rm_rf(@@env.user) unless @opt.act[:maintenance][:set] ==:on
+ if action_on_file_ == :true \
+ and @opt.files.length > 0
+ do_loops
+ @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil if @opt.cmd =~/[vVM]/
+ @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty?
+ if defined? @@env.processing_path.processing \
+ and @@env.user \
+ and FileTest.directory?(@@env.processing_path.processing) \
+ and @@env.processing_path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area
+ FileUtils::cd(@@env.processing_path.processing_base_tmp) do
+ FileUtils::rm_rf(@@env.user) unless @opt.act[:maintenance][:set] ==:on
+ end
end
+ elsif action_on_file_ == :true \
+ and @opt.files.length == 0
+ STDERR.puts %{requested action requires valid sisu markup file filename (.sst .ssm) or wildcard (that includes a valid filame)}
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia) if @opt.cmd =~/[MV]/
end
elsif @opt.mod.inspect =~/--query/
require_relative 'sst_identify_markup' # sst_identify_markup.rb
diff --git a/lib/sisu/v3/i18n.rb b/lib/sisu/v5/i18n.rb
index 9e61fbdf..b635af15 100644
--- a/lib/sisu/v3/i18n.rb
+++ b/lib/sisu/v5/i18n.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/i18n.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/i18n.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v5/manifest.rb
index 225c235d..75d8233d 100644
--- a/lib/sisu/v3/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/manifest.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manifest.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -83,7 +83,6 @@ module SiSU_Manifest
begin
@env=SiSU_Env::InfoEnv.new(@opt.fns)
@md=SiSU_Param::Parameters.new(@opt).get
- SiSU_Env::InfoSkin.new(@md).select
xbrowser=@env.program.web_browser
browser=@env.program.console_web_browser
# webserv_url=@env.path.url.output_tell #fix in sysenv
@@ -114,19 +113,20 @@ module SiSU_Manifest
@fnb=md.fnb
@base_url="#{@env.url.root}/#{@fnb}"
@o_str=SiSU_Env::FileOp.new(md).output_dir_structure
- @image_path=if @o_str.dump_or_redirect?
- './image'
- else
- %{#{@f.path_rel_links.html_scroll_2}_sisu/image_sys}
- end
+ @image_path=(@o_str.dump_or_redirect?) \
+ ? './image'
+ : %{#{@f.path_rel_links.html_scroll_2}_sisu/image_sys}
@base_path=@f.output_path.manifest.dir
@@dg ||=SiSU_Env::InfoEnv.new.digest.type
@dg=@@dg
l=SiSU_Env::StandardiseLanguage.new(md.opt.lng).language
@language=l[:n]
@translate=SiSU_Translate::Source.new(md,@language)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
+ @fn_lng=(@f.output_dir_structure.by_language_code?) \
+ ? ''
+ : ('.' + md.opt.lng)
end
def output
manifest=@f.write_file.manifest
@@ -451,12 +451,15 @@ module SiSU_Manifest
end
end
def qrc_image
- fn=@md.fnb
- pth=(@o_str.dump_or_redirect?) \
+ fn=(@f.output_dir_structure.by_filename?) \
+ ? 'sisu_manifest'
+ : @md.fnb
+ pth=((@o_str.dump_or_redirect?) \
+ || (@f.output_dir_structure.by_filename?)) \
? '.'
: 'qrcode'
- img_md="#{pth}/#{fn}.md.png"
- img_title="#{pth}/#{fn}.title.png"
+ img_md="#{pth}/#{fn}#{@fn_lng}.md.png"
+ img_title="#{pth}/#{fn}#{@fn_lng}.title.png"
if FileTest.file?(@f.place_file.qrcode_md.dir)==true
@manifest[:html] <<<<WOK
<tr><td class="left">
@@ -498,7 +501,7 @@ WOK
end
if FileTest.file?(@f.place_file.sisupod.dir)==true
pth=@f.output_path.sisupod.dir
- rel=@f.output_path.sisupod.ab_pod
+ rel=@f.output_path.sisupod.rel_sm
url=@f.output_path.sisupod.url
id,file='SiSU doc (tar.xz)',@f.base_filename.sisupod
summarize_sources(id,file,pth,rel,url)
@@ -512,77 +515,58 @@ WOK
end
end
def metadata_tests
- if defined? @md.title.full \
- and @md.title.full=~/\S+/
- id,info=@translate.full_title,@md.title.full
- metadata(id,info)
- end
- if defined? @md.creator.author \
- and @md.creator.author=~/\S+/
- id,info=@translate.author,@md.creator.author
- metadata(id,info)
- end
- if defined? @md.creator.editor \
- and @md.creator.editor=~/\S+/
- id,info=@translate.editor,@md.creator.editor
- metadata(id,info)
- end
- if defined? @md.creator.contributor \
- and @md.creator.contributor=~/\S+/
- id,info=@translate.contributor,@md.creator.contributor
- metadata(id,info)
- end
- if defined? @md.creator.translator \
- and @md.creator.translator=~/\S+/
- id,info=@translate.translator,@md.creator.translator
- metadata(id,info)
- end
- if defined? @md.creator.illustrator \
- and @md.creator.illustrator=~/\S+/
- id,info=@translate.illustrator,@md.creator.illustrator
- metadata(id,info)
- end
- if defined? @md.publisher \
- and @md.publisher=~/\S+/ #dc
- id,info=@translate.publisher,@md.publisher
- metadata(id,info)
- end
- if defined? @md.creator.prepared_by \
- and @md.creator.prepared_by=~/\S+/
- id,info=@translate.prepared_by,@md.creator.prepared_by
- metadata(id,info)
- end
- if defined? @md.creator.digitized_by \
- and @md.creator.digitized_by=~/\S+/
- id,info=@translate.digitized_by,@md.creator.digitized_by
- metadata(id,info)
- end
- if defined? @md.classify.subject \
- and @md.classify.subject=~/\S+/
- id,info=@translate.subject,@md.classify.subject
- metadata(id,info)
- end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/
- id,info=@translate.description,@md.notes.description
- metadata(id,info)
- end
- if defined? @md.notes.abstract \
- and @md.notes.abstract=~/\S+/
- id,info=@translate.abstract,@md.notes.abstract
- metadata(id,info)
+ if defined? @md.title #%
+ if defined? @md.title.full \
+ and @md.title.full=~/\S+/
+ id,info=@translate.full_title,@md.title.full
+ metadata(id,info)
+ end
end
- if defined? @md.type \
- and @md.type=~/\S+/ #dc
- id,info=@translate.type,@md.type
- metadata(id,info)
+ if defined? @md.creator #%
+ if defined? @md.creator.author \
+ and @md.creator.author=~/\S+/
+ id,info=@translate.author,@md.creator.author
+ metadata(id,info)
+ end
+ if defined? @md.creator.editor \
+ and @md.creator.editor=~/\S+/
+ id,info=@translate.editor,@md.creator.editor
+ metadata(id,info)
+ end
+ if defined? @md.creator.contributor \
+ and @md.creator.contributor=~/\S+/
+ id,info=@translate.contributor,@md.creator.contributor
+ metadata(id,info)
+ end
+ if defined? @md.creator.translator \
+ and @md.creator.translator=~/\S+/
+ id,info=@translate.translator,@md.creator.translator
+ metadata(id,info)
+ end
+ if defined? @md.creator.illustrator \
+ and @md.creator.illustrator=~/\S+/
+ id,info=@translate.illustrator,@md.creator.illustrator
+ metadata(id,info)
+ end
+ if defined? @md.creator.prepared_by \
+ and @md.creator.prepared_by=~/\S+/
+ id,info=@translate.prepared_by,@md.creator.prepared_by
+ metadata(id,info)
+ end
+ if defined? @md.creator.digitized_by \
+ and @md.creator.digitized_by=~/\S+/
+ id,info=@translate.digitized_by,@md.creator.digitized_by
+ metadata(id,info)
+ end
end
- if defined? @md.rights.all \
- and @md.rights.all=~/\S+/ #dc
- id,info=@translate.rights,@md.rights.all
- metadata(id,info)
+ if defined? @md.rights
+ if defined? @md.rights.all \
+ and @md.rights.all=~/\S+/ #dc
+ id,info=@translate.rights,@md.rights.all
+ metadata(id,info)
+ end
end
- if defined? @md.date.published
+ if defined? @md.date #%
if defined? @md.date.published \
and @md.date.published=~/\S+/ #dc
id,info=@translate.date,@md.date.published
@@ -614,108 +598,136 @@ WOK
metadata(id,info)
end
end
- if defined? @md.title.language \
- and @md.title.language=~/\S+/
- id,info=@translate.language,@md.title.language
- metadata(id,info)
- end
- if defined? @md.original.language \
- and @md.original.language=~/\S+/
- id,info=@translate.language_original,@md.original.language
- metadata(id,info)
- end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/
- id,info=@transate.format,@md.classify.format
- metadata(id,info)
- end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/
- id,info=@translate.identifier,@md.classify.identifier
- metadata(id,info)
- end
- if defined? @md.original.source \
- and @md.original.source=~/\S+/
- id,info=@translate.source,@md.original.source
- metadata(id,info)
- end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/
- id,info=@translate.relation,@md.classify.relation
- metadata(id,info)
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/
- id,info=@translate.coverage,@md.classify.coverage
- metadata(id,info)
- end
- if defined? @md.classify.keywords \
- and @md.classify.keywords=~/\S+/
- id,info=@translate.keywords,@md.classify.keywords
- metadata(id,info)
- end
- if defined? @md.notes.comment \
- and @md.notes.comment=~/\S+/
- id,info=@translate.comments,@md.notes.comment
- metadata(id,info)
- end
- if defined? @md.classify.loc \
- and @md.classify.loc=~/\S+/
- id,info=@translate.cls_loc,@md.classify.loc
- metadata(id,info)
- end
- if defined? @md.classify.dewey \
- and @md.classify.dewey=~/\S+/
- id,info=@translate.cls_dewey,@md.classify.dewey
- metadata(id,info)
- end
- if defined? @md.classify.oclc \
- and @md.classify.oclc=~/\S+/
- id,info=@translate.cls_oclc,@md.classify.oclc
- @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{id}:</p></th><td>\n}
- @manifest[:html] << %{<p class="left"><a href="http://worldcat.org/oclc/#{info}">#{info}</a></p>\n}
- @manifest[:html] << %{</td></tr>\n}
- end
- if defined? @md.classify.pg \
- and @md.classify.pg=~/\S+/
- id,info=@translate.cls_gutenberg,@md.classify.pg
- metadata(id,info)
- end
- if defined? @md.classify.isbn \
- and @md.classify.isbn=~/\S+/
- id,info=@translate.cls_isbn,@md.classify.isbn
+ if defined? @md.publisher \
+ and @md.publisher=~/\S+/ #dc
+ id,info=@translate.publisher,@md.publisher
metadata(id,info)
end
- if defined? @md.notes.prefix_a \
- and @md.notes.prefix_a=~/\S+/
- id,info=@translate.prefix_a,@md.notes.prefix_a
- metadata(id,info)
+ if defined? @md.notes #%
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/
+ id,info=@translate.description,@md.notes.description
+ metadata(id,info)
+ end
+ if defined? @md.notes.abstract \
+ and @md.notes.abstract=~/\S+/
+ id,info=@translate.abstract,@md.notes.abstract
+ metadata(id,info)
+ end
+ if defined? @md.notes.comment \
+ and @md.notes.comment=~/\S+/
+ id,info=@translate.comments,@md.notes.comment
+ metadata(id,info)
+ end
+ if defined? @md.notes.prefix_a \
+ and @md.notes.prefix_a=~/\S+/
+ id,info=@translate.prefix_a,@md.notes.prefix_a
+ metadata(id,info)
+ end
+ if defined? @md.notes.prefix_b \
+ and @md.notes.prefix_b=~/\S+/
+ id,info=@translate.prefix_b,@md.notes.prefix_b
+ metadata(id,info)
+ end
end
- if defined? @md.notes.prefix_b \
- and @md.notes.prefix_b=~/\S+/
- id,info=@translate.prefix_b,@md.notes.prefix_b
- metadata(id,info)
+ if defined? @md.title #%
+ if defined? @md.title.language \
+ and @md.title.language=~/\S+/
+ id,info=@translate.language,@md.title.language
+ metadata(id,info)
+ end
+ if defined? @md.original.language \
+ and @md.original.language=~/\S+/
+ id,info=@translate.language_original,@md.original.language
+ metadata(id,info)
+ end
end
- if defined? @md.topic_register_array \
- and @md.topic_register_array.length > 0
- @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{@translate.topic_register}:</p></th><td>\n}
- @md.topic_register_array.each do |t|
- t.each_with_index do |st,i|
- if st.is_a?(Array)
- st.each do |v|
- if v.is_a?(Array)
- v.each do |w,i|
- @manifest[:html] << %{<p class="it#{i}">#{w}</p>\n}
+ if defined? @md.classify #%
+ if defined? @md.topic_register_array \
+ and @md.topic_register_array.length > 0
+ @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{@translate.topic_register}:</p></th><td>\n}
+ @md.topic_register_array.each do |t|
+ t.each_with_index do |st,i|
+ if st.is_a?(Array)
+ st.each do |v|
+ if v.is_a?(Array)
+ v.each do |w,i|
+ @manifest[:html] << %{<p class="it#{i}">#{w}</p>\n}
+ end
+ else
+ @manifest[:html] << %{<p class="it#{i}">#{v}</p>\n}
end
- else
- @manifest[:html] << %{<p class="it#{i}">#{v}</p>\n}
end
+ else @manifest[:html] << %{<p class="it#{i}">#{st}</p>\n}
end
- else @manifest[:html] << %{<p class="it#{i}">#{st}</p>\n}
end
end
+ @manifest[:html] << %{</td></tr>\n}
+ end
+ if defined? @md.classify.subject \
+ and @md.classify.subject=~/\S+/
+ id,info=@translate.subject,@md.classify.subject
+ metadata(id,info)
+ end
+ if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ id,info=@translate.keywords,@md.classify.keywords
+ metadata(id,info)
+ end
+ if defined? @md.classify.loc \
+ and @md.classify.loc=~/\S+/
+ id,info=@translate.cls_loc,@md.classify.loc
+ metadata(id,info)
+ end
+ if defined? @md.classify.dewey \
+ and @md.classify.dewey=~/\S+/
+ id,info=@translate.cls_dewey,@md.classify.dewey
+ metadata(id,info)
+ end
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/
+ id,info=@translate.coverage,@md.notes.coverage
+ metadata(id,info)
+ end
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/
+ id,info=@translate.relation,@md.notes.relation
+ metadata(id,info)
+ end
+ if defined? @md.notes.type \
+ and @md.notes.type=~/\S+/ #dc
+ id,info=@translate.type,@md.notes.type
+ metadata(id,info)
+ end
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/
+ id,info=@transate.format,@md.notes.format
+ metadata(id,info)
+ end
+ end
+ if defined? @md.identifier #%
+ if defined? @md.identifier.oclc \
+ and @md.identifier.oclc=~/\S+/
+ id,info=@translate.cls_oclc,@md.identifier.oclc
+ @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{id}:</p></th><td>\n}
+ @manifest[:html] << %{<p class="left"><a href="http://worldcat.org/oclc/#{info}">#{info}</a></p>\n}
+ @manifest[:html] << %{</td></tr>\n}
+ end
+ if defined? @md.identifier.pg \
+ and @md.identifier.pg=~/\S+/
+ id,info=@translate.cls_gutenberg,@md.identifier.pg
+ metadata(id,info)
+ end
+ if defined? @md.identifier.isbn \
+ and @md.identifier.isbn=~/\S+/
+ id,info=@translate.cls_isbn,@md.identifier.isbn
+ metadata(id,info)
end
- @manifest[:html] << %{</td></tr>\n}
+ end
+ if defined? @md.original.source \
+ and @md.original.source=~/\S+/
+ id,info=@translate.source,@md.original.source
+ metadata(id,info)
end
if @md.fns
id,info=@translate.sourcefile,@md.fns
@@ -773,31 +785,14 @@ WOK
end
def check_output(data)
begin
+ make=SiSU_Env::ProcessingSettings.new(@md)
minitoc=SiSU_HTML_MiniToc::TocMini.new(@md,data).songsheet.join("\n")
id,file='',''
- vz=SiSU_Env::GetInit.instance.skin
- search_form=if @f.build.search_form?
- "<td>#{@env.widget_static.search_form}</td>"
- else ''
- end
- banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \
- and vz.banner_home_button_only !~ /sisu\.home\.png/
-<<WOK
-<table summary="band" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="left" width="15%" bgcolor="#ffffff">#{vz.banner_band}</td>
-<td width="70%"><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td>
-#{search_form}</tr>
-</table>
-WOK
- else
-<<WOK
-<table summary="band" border="0" cellpadding="3" cellspacing="0">
-<tr><td align="left" bgcolor="#ffffff"><a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" src="#{vz.url_path_image_sys}/sisu.png" alt="SiSU --&gt;" /></a></td>
-<td><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{file}">#{@base_url}/#{file}</a>#{@brace_url.xml_close}</p></td>
-#{search_form}</tr>
-</table>
-WOK
- end
+ vz=SiSU_Viz::Defaults.new
+ search_form=(make.build.search_form?) \
+ ? "<td>#{@env.widget_static.search_form}</td>"
+ : ''
+ format_head_toc=SiSU_HTML_Format::HeadToc.new(@md)
@manifest[:html] <<<<WOK
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -813,9 +808,9 @@ SiSU manifest: #{@md.title.full}
#{@stylesheet.css_head}
</head>
<body bgcolor="#ffffff" text="#000000" link="#003090" lang="en" xml:lang="en">
-#{banner_table}
+#{format_head_toc.seg_head_navigation_band(:manifest)}
WOK
- if @f.build.manifest_minitoc?
+ if make.build.manifest_minitoc?
if @o_str.dump_or_redirect?
elsif @f.output_dir_structure.by_language_code? \
or @f.output_dir_structure.by_filetype?
@@ -834,10 +829,35 @@ WOK
<div>
WOK
end
+ if @o_str.dump_or_redirect?
+ elsif @f.output_dir_structure.by_language_code? \
+ or @f.output_dir_structure.by_filetype?
+ pth_local=@f.output_path.manifest.dir
+ pth_rel='.'
+ else
+ pth_local=@f.output_path.base.dir
+ pth_rel='..'
+ end
+ pth_rel_home=if @env.output_dir_structure.by? == :language
+ '../..'
+ elsif @env.output_dir_structure.by? == :filetype
+ '..'
+ elsif @env.output_dir_structure.by? == :filename
+ '..'
+ else '..'
+ end
+ harvest=(FileTest.file?("#{pth_local}/authors#{@fn_lng}.html") \
+ && FileTest.file?("#{pth_local}/topics#{@fn_lng}.html")) \
+ ? %{<p class="small"><a href="#{pth_rel_home}/index.html">.:</a> other document manifests: [<a href="#{pth_rel}/authors#{@fn_lng}.html">authors</a>] [<a href="#{pth_rel}/topics#{@fn_lng}.html">topics</a>]</p>}
+ : ''
+ manifest_title=%{<p class="bold">#{@translate.manifest_description}</p>#{harvest}}
@manifest[:html] <<<<WOK
-<h1 class="small">#{@translate.manifest_description}</h1>
-<h2 class="small">#{@md.title.full}</h2>
+<div id="horizontal_links">
+#{manifest_title}
+</div>
+<h1 class="small">#{@md.title.full}</h1>
<p class="bold">#{@md.author}</p>
+<div id="horizontal_links"><p class="bold">
<p class="small">
&nbsp;&nbsp;<a href="#output">Document, Available Filetypes</a>
</p>
@@ -847,6 +867,7 @@ WOK
<p class="tiny">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="#links">metadata suggested links (if any)</a>
</p>
+</div>
<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
WOK
published_versions
diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v5/manpage.rb
index 8be6ecdc..0873e3f3 100644
--- a/lib/sisu/v3/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/manpage.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -97,7 +97,6 @@ module SiSU_Manpage
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
- SiSU_Env::InfoSkin.new(@md).select #watch
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -113,8 +112,8 @@ module SiSU_Manpage
@@endnotes={ para: [], end: [] }
def initialize(md,data)
@md,@data=md,data
- @brace_url=SiSU_Viz::Skin.new.url_decoration
- @vz=SiSU_Env::GetInit.instance.skin
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
+ @vz=SiSU_Viz::Defaults.new
@tab="\t"
@br="\n"
@@notes=:end
@@ -171,8 +170,7 @@ GSUB
@manpage[:metadata]=SiSU_Metadata::Summary.new(@md).manpage.metadata
end
def manpage_tail
- SiSU_Env::InfoSkin.new(@md).select
- vz=SiSU_Env::GetInit.instance.skin
+ vz=SiSU_Viz::Defaults.new
generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
@@ -183,21 +181,26 @@ GSUB
@manpage[:tail] <<<<WOK
#{@br}
.TP
-Other versions of this document:
+.SH SEE ALSO
+ sisu(1),
+ sisu-epub(1),
+ sisu-harvest(1),
+ sisu-html(1),
+ sisu-odf(1),
+ sisu-pdf(1),
+ sisu-pg(1),
+ sisu-sqlite(1),
+ sisu-txt(1).
+ sisu_vim(7)
.TP
- manifest: <#{@md.file.output_path.digest.url}/#{@md.file.base_filename.digest}>
+.SH HOMEPAGE
+ More information about SiSU can be found at <http://www.sisudoc.org/> or <http://www.jus.uio.no/sisu/>
.TP
-at: <#{vz.url_site}>
+.SH SOURCE
+ <http://sources.sisudoc.org/>
.TP
-#{sc}
-.TP
-* #{generator}
-.TP
-* #{rubyv}
-.TP
-* #{lastdone}
-.TP
-* SiSU #{vz.url_sisu}
+.SH AUTHOR
+ SiSU is written by Ralph Amissah <ralph@amissah.com>
WOK
end
def manpage_structure(dob='',hname='') #% Used to extract the structure of a document
@@ -309,27 +312,27 @@ WOK
gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©')
else
dob.obj=dob.obj.gsub(/\\/,'\e').
- gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n") # watch
+ gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n") # watch
end
- dob.obj=dob.obj.gsub(/(^|&nbsp;|#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*'). #man page requires
+ dob.obj=dob.obj.gsub(/(^|&nbsp;|#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*'). #man page requires
gsub(/┆/,'|').
- gsub(/^(\.\S{3,})/m,' \1') # ^\. used by interpreter, disable when use not intended
+ gsub(/^(\.\S{3,})/m,' \1') # ^\. used by interpreter, disable when use not intended
dob.obj=dob.obj.gsub(/&#126;/,'~') if dob.obj #manpages use this
if dob.is ==:code
dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
gsub(/(^|[^}])_([<>])/m,'\1\2'). # _<_<
- gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+(\s*)/m,"\n\\1"). # watch
+ gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+(\s*)/m,"\n\\1"). # watch
gsub(/\A(.+?)\s*\Z/m,".nf\n\\1\n.fi")
end
- dob.obj=dob.obj.gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n\n") # watch
+ dob.obj=dob.obj.gsub(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n\n") # watch
blit=dob.obj.scan(/\[[^\]]+\]|[^\[]+/)
blit_array=[]
- dob.obj=dob.obj.gsub(/#{Mx[:gl_o]}:name#\S+?#{Mx[:gl_c]}/mi,''). #added
- gsub(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,''). # remove page breaks
+ dob.obj=dob.obj.gsub(/#{Mx[:gl_o]}:name#\S+?#{Mx[:gl_c]}/mi,''). #added
+ gsub(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}|#{Mx[:br_page_line]}/,''). # remove page breaks, you may wish to have a line across the page break instead
gsub(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1\2').
gsub(/<a href=".+?">(.+?)<\/a>/m,'\1').
- gsub(/#{Mx[:mk_o]}name#\S+?#{Mx[:mk_c]}/,''). # remove name links
- gsub(/&nbsp;|#{Mx[:nbsp]}/,' '). # decide on
+ gsub(/#{Mx[:mk_o]}name#\S+?#{Mx[:mk_c]}/,''). # remove name links
+ gsub(/&nbsp;|#{Mx[:nbsp]}/,' '). # decide on
gsub(/(?:^|[^_\\])#{Mx[:lnk_o]}\s*(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/,' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
gsub(/(?:^|[^_\\])#{Mx[:lnk_o]}\s*(\S+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
gsub(/^(?:^|[^_\\])#{Mx[:lnk_o]}\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*#{Mx[:lnk_c]}\S+/,'[image: "\1"]')
diff --git a/lib/sisu/v3/manpage_format.rb b/lib/sisu/v5/manpage_format.rb
index bd07a0bc..ce54fdb7 100644
--- a/lib/sisu/v3/manpage_format.rb
+++ b/lib/sisu/v5/manpage_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/manpage_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -82,7 +82,7 @@ module SiSU_ManpageFormat
@md,@dob=md,dob
rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
@dob.obj.gsub!(rgx,'\1') if @dob.obj =~rgx
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def scr_endnote_body
"<endnote>#{@dob.obj}</endnote> "
diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v5/odf.rb
index 71cbcca5..671cc350 100644
--- a/lib/sisu/v3/odf.rb
+++ b/lib/sisu/v5/odf.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/odf.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -92,7 +92,6 @@ module SiSU_ODF
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").flow if @opt.cmd =~/[MV]/
end
SiSU_ODF::Source::Scroll.new(@particulars).songsheet
- SiSU_Env::InfoSkin.new(@md).select
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -110,9 +109,9 @@ module SiSU_ODF
@@fns=nil
def initialize(particulars)
@md,@env,@dal_array=particulars.md,particulars.env,particulars.dal_array
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@tab="\t"
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@br=(@md.opt.cmd =~/M/) ? '' : ''
#@br=(@md.opt.cmd =~/M/) ? "\n" : ''
end
@@ -192,9 +191,11 @@ module SiSU_ODF
@@fns=@md.fns
end
unless @@docstart
- breakpage=if (@md.pagenew or @md.pagebreak) \
- and (@md.pagenew =~ m or @md.pagebreak =~m)
+ breakpage=if (@md.pagenew || @md.pagebreak) \
+ and (@md.pagenew =~m or @md.pagebreak =~m)
'<text:p text:style-name="P_normal_page_new"> </text:p>'
+ elsif @md.pageline \
+ and @md.pageline =~m #fix
else ''
end
end
@@ -527,6 +528,8 @@ module SiSU_ODF
if dob.obj==Mx[:br_page] \
or dob.obj==Mx[:br_page_new]
dob=br.br_page
+ elsif dob.obj==Mx[:br_page_line]
+ dob=br.br_page_line
elsif dob.obj==Mx[:br_obj]
dob=br.obj_sep
end
@@ -726,6 +729,8 @@ WOK
breakpage=if @md.pagenew \
or @md.pagebreak
' fo:break-before="page"'
+ elsif @md.pageline ##fix
+ ''
else ''
end
x=<<WOK
diff --git a/lib/sisu/v3/odf_format.rb b/lib/sisu/v5/odf_format.rb
index 9c5f37ce..8abff36f 100644
--- a/lib/sisu/v3/odf_format.rb
+++ b/lib/sisu/v5/odf_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/odf_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -139,7 +139,7 @@ module SiSU_ODF_Format
end
rgx=/#{Mx[:en_a_o]}\d+\s+(.+?)#{Mx[:en_a_c]}/
@txt=@txt.gsub(rgx,'\1') if @txt =~rgx
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def scr_endnote_body
"<endnote>#{@txt}</endnote> "
@@ -164,7 +164,7 @@ module SiSU_ODF_Format
def initialize(md,dob,p_num)
@md,@dob,@p_num=md,dob,p_num
@txt=dob.obj
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
if @md.fns != @@fns
@@table_counter=0
@@fns=@md.fns
@@ -650,6 +650,11 @@ WOK
@t_o.obj='<text:p text:style-name="P_page_break"> </text:p>'
@t_o
end
+ def br_page_line
+ sep='_'
+ @t_o.obj=%{<text:p text:style-name="P_normal">#{sep*60}</text:p>}
+ @t_o
+ end
def obj_sep #center later
sep='--- '
@t_o.obj=%{<text:p text:style-name="P_normal">#{sep*20}</text:p>}
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v5/options.rb
index f44b5505..2133a812 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v5/options.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/options.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/options.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -63,9 +63,81 @@
module SiSU_Commandline
require 'pathname'
require_relative 'sysenv' # sysenv.rb
- @@base_path=nil
+ require_relative 'param_make' # param_make.rb
+ @@sisu_call_origin_path=nil
+ class HeaderCommon
+ def initialize(make_instruct_array)
+ @make_instruct_array=make_instruct_array
+ end
+ def sisu_document_make_instructions
+ @pagenew=@pagebreak=@pageline=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@num_top=@i18n=@man_section=@emphasis_set_to=@bold_match_list=@italics_match_list=@substitution_match_list=@footer_links=@home_button_links=@links=nil
+ @makeset=false
+ if @make_instruct_array
+ @make_instruct_array.each do |para| #% scan document
+ if para =~/^(?:@make:|@links:)[+-]?\s/
+ case para
+ when /^@make:(.+)/m #% header processing - make
+ @env=SiSU_Env::InfoEnv.new
+ @make=SiSU_Param_Make::MdMake.new($1.strip,@opt,@env).make
+ makes=SiSU_Param_Make::MakeHead.new(@make).make_instruct
+ @makeset=true
+ @pagenew=makes[:pagenew]
+ @pagebreak=makes[:pagenew]
+ @pageline=makes[:pageline]
+ @toc=makes[:toc]
+ @lv1=makes[:lv1]
+ @lv2=makes[:lv2]
+ @lv3=makes[:lv3]
+ @lv4=makes[:lv4]
+ @lv5=makes[:lv5]
+ @lv6=makes[:lv6]
+ @num_top=makes[:num_top]
+ @i18n=makes[:i18n]
+ @man_section=makes[:man_section]
+ @emphasis_set_to=makes[:emphasis_set_to]
+ @bold_match_list=makes[:bold_match_list]
+ @italics_match_list=makes[:italics_match_list]
+ @substitution_match_list=makes[:substitution_match_list]
+ @footer_links=makes[:footer_links]
+ @home_button_links=makes[:home_button_links]
+ @home_button_image=makes[:home_button_image]
+ @cover_image=makes[:cover_image]
+ when /^@links:(.+)/m #% header processing - make
+ make_links=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make_links
+ @links,@links_append=make_links.links,make_links.append?
+ end
+ end
+ end #% here endeth the common header loop
+ end
+ { makeset: @makeset,
+ pagenew: @pagenew,
+ pagebreak: @pagebreak,
+ pageline: @pageline,
+ toc: @toc,
+ lv1: @lv1,
+ lv2: @lv2,
+ lv3: @lv3,
+ lv4: @lv4,
+ lv5: @lv5,
+ lv6: @lv6,
+ num_top: @num_top,
+ i18n: @i18n,
+ man_section: @man_section,
+ emphasis_set_to: @emphasis_set_to,
+ bold_match_list: @bold_match_list,
+ italics_match_list: @italics_match_list,
+ substitution_match_list: @substitution_match_list,
+ footer_links: @footer_links,
+ home_button_links: @home_button_links,
+ home_button_image: @home_button_image,
+ cover_image: @cover_image,
+ links: @links,
+ links_append: @links_append
+ }
+ end
+ end
class Options
- attr_accessor :cmd,:mod,:act,:dir_structure_by,:f_pths,:files,:files_mod,:base_path,:base_stub,:sub_location,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what
+ attr_accessor :cmd,:mod,:act,:dir_structure_by,:f_pths,:files,:files_mod,:base_path,:base_stub,:sub_location,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what,:make_instructions,:make_instructions_pod
@@act=nil
def initialize(a)
@cmd,@f_pth,@pth,@fno,@fns,@fnb,@fnc,@fng,@fncb,@what,@lng,@lng_base,@base_path,@base_stub,@sub_location='','','','','','','','','','','','','',''
@@ -73,13 +145,16 @@ module SiSU_Commandline
@env=SiSU_Env::InfoEnv.new
@lng_base=@env.language_default_set
@dir_structure_by=SiSU_Env::EnvCall.new.output_dir_structure.by?
- @@base_path ||=Dir.pwd
- @base_path=@@base_path
+ @@sisu_call_origin_path ||=Dir.pwd
+ @base_path=@@sisu_call_origin_path
r=Px[:lng_lst_rgx]
u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
@base_stub=@base_path.gsub(u,'\1')
@a=sisu_glob_rules(a)
@a.freeze
+ make_instruct_array=SiSU_Env::GetInit.new.sisu_document_make.makefile_read
+ @make_instructions=HeaderCommon.new(make_instruct_array).sisu_document_make_instructions
+ @make_instructions_pod=nil
init
end
def find_all(find_flag,opt)
@@ -185,13 +260,13 @@ module SiSU_Commandline
@lngs = q[:lngs]
if @files.length > 0 \
and @cmd.empty? \
- and @mod.length==0 #% if no other action called on filename given, default is sisu --v3 -0 [filename(s)] configured as flag default
+ and @mod.length==0 #% if no other action called on filename given, default is sisu --v4 -0 [filename(s)] configured as flag default
shortcut=SiSU_Env::InfoProcessingFlag.new
- @mod=['--v3']
+ @mod=['--v4']
@cmd=shortcut.cf_0 + 'm'
end
if @cmd =~/[vVM]/ \
- && @cmd !~/-vu?$/
+ && @cmd !~/-[ku]*v[ku]*$/
SiSU_Screen::Ansi.new(@cmd,"\tsisu " + @cmd + ' ' + @mod.join(' ') + ' ' + @files.join(' ') + "\n").print_brown
end
end
@@ -200,6 +275,22 @@ module SiSU_Commandline
@files
self
end
+ def sisu_document_make_pod
+ def makefile_name
+ SiSU_Env::GetInit.new.sisu_document_make.makefile_name
+ end
+ def makefile(pod_make_path)
+ "#{pod_make_path}/#{makefile_name}"
+ end
+ def makefile_read(pod_make_path)
+ f=if FileTest.file?(makefile(pod_make_path))
+ sisu_doc_makefile=IO.read(makefile(pod_make_path), mode: 'r:utf-8')
+ sisu_doc_makefile.split(/\s*\n\s*\n/m)
+ else nil
+ end
+ end
+ self
+ end
def set_files_and_paths_and_general_extract(s)
c,w='',''
m,f,pth,z,lng,lngs=[],[],[],[],[],[]
@@ -224,6 +315,10 @@ module SiSU_Commandline
fullname=@env.processing_path.processing + '/sisupod/' + fn_pod
pt=Pathname.new(fullname)
FileUtils::mkdir_p(pt.to_s)
+ pod_make_path=fullname + '/sisupod/doc/_sisu'
+ pod_make_path_file=pod_make_path
+ make_instruct_array=sisu_document_make_pod.makefile_read(pod_make_path)
+ @make_instructions_pod=HeaderCommon.new(make_instruct_array).sisu_document_make_instructions
Dir.chdir(pt.realpath)
options=s.gsub(/(\s+--?\S+)+.+/,'\1')
system("
@@ -373,46 +468,85 @@ module SiSU_Commandline
end
def opt_cmd_and_mod_adjust(c,m)
cmd,mod,files=@cmd,@mod,@files
+ if not m.empty? \
+ and m.inspect =~/"--pdf-/
+ ps,psa='',[]
+ mod << '--pdf'
+ m.each do |m|
+ if m =~ /^--pdf-(?:(?:l|landscape)(?:-(?:a4|letter|a5|b5|legal))?|(?:a4|letter|a5|b5|legal)-(?:l|landscape))$/
+ mod << '--landscape'
+ end
+ if m =~ /^--pdf-(?:(?:p|portrait)(?:-(?:a4|letter|a5|b5|legal))?|(?:a4|letter|a5|b5|legal)-(?:p|portrait))$/
+ mod << '--portrait'
+ end
+ if m =~ /^--pdf(?:-(?:a4|letter|a5|b5|legal)(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))(?:-(?:a4|letter|a5|b5|legal)))$/
+ if m =~ /^--pdf(?:-a4(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))-a4)$/
+ mod << '--papersize-a4'
+ end
+ if m =~ /^--pdf(?:-a5(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))-a5)$/
+ mod << '--papersize-a5'
+ end
+ if m =~ /^--pdf(?:-b5(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))-b5)$/
+ mod << '--papersize-b5'
+ end
+ if m =~ /^--pdf(?:-letter(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))-letter)$/
+ mod << '--papersize-letter'
+ end
+ if m =~ /^--pdf(?:-legal(?:-(?:[lp]|landscape|portrait))?|(?:-(?:[lp]|landscape|portrait))-legal)$/
+ mod << '--papersize-legal'
+ end
+ end
+ end
+ mod=mod.uniq
+ end
unless m.empty?
m.each do |m|
case m
- when /^--(?:color-toggle)$/; c=c+'c'
- when /^--(?:configure|init-site)$/; c=c+'CC'
- when /^--(?:dal?|machine|abstraction|abs)$/; c=c+'m'
- when /^--(?:txt|text|plaintext)$/; c=c+'t'
- when /^--(?:html)$/; c=c+'h'
- when /^--(?:epub)$/; c=c+'e'
- when /^--(?:od[ft])$/; c=c+'o'
- when /^--(?:pdf)$/; c=c+'p'
- when /^--(?:concordance|wordmap)$/; c=c+'w'
- when /^--(?:manpage|man)$/; c=c+'i'
- when /^--(?:texinfo)$/; c=c+'I'
- when /^--(?:xhtml)$/; c=c+'b'
- when /^--(?:xml-sax)$/; c=c+'x'
- when /^--(?:xml-dom)$/; c=c+'X'
- when /^--(?:images)$/; c=c+'j'
- when /^--(?:hash-digests)$/; c=c+'N'
- when /^--(?:po4a|pot?)$/; c=c+'P'
- when /^--(?:termsheet)$/; c=c+'T'
- when /^--(?:manifest)$/; c=c+'y'
- when /^--(?:qrcode)$/; c=c+'Q'
- when /^--(?:sqlite)$/; c=c+'d'
- when /^--(?:pg|pg?sql|postgresql)$/; c=c+'D'
- when /^--(?:remote|rsync)$/; c=c+'R'
- when /^--(?:scp)$/; c=c+'r'
- when /^--(?:source)$/; c=c+'s'
- when /^--(?:sisupod|pod)$/; c=c+'S'
- when /^--(?:git)$/; c=c+'g'
- when /^--(?:urls)$/; c=c+'U'
- when /^--(?:zap|delete)$/; c=c+'Z'
- when /^--(?:sample-search-form)$/; c=c+'F'
- when /^--(?:webserv|webrick)$/; c=c+'W'
- when /^--(?:profile)$/; c=c+'E'
- when /^--(?:maintenance|keep-processing-files)$/; c=c+'M'
- when /^--(?:verbose[=-]3)$/; c=c+'VM'
- when /^--(?:verbose[=-]2|Verbose|VERBOSE)$/; c=c+'V'
- when /^--(?:verbose(?:[=-]1)?)$/; c=c+'v'
- when /^--(?:verbose[=-]0|quiet|silent)$/; c=c+'q'
+ when /^--(?:color-toggle)$/; c=c+'c'
+ when /^--(?:color-off)$/; c=c+'k'
+ when /^--(?:conf|config|configure|init|initialize|init-site)$/; c=c+'CC'
+ when /^--(?:dal?|machine|abstraction|abs)$/; c=c+'m'
+ when /^--(?:txt|text|plaintext)$/; c=c+'t'
+ when /^--(?:html)$/; c=c+'h'
+ when /^--(?:html-scroll|html-seg)$/; c=c+'H'
+ mod << m
+ when /^--(?:epub)$/; c=c+'e'
+ when /^--(?:od[ft])$/; c=c+'o'
+ when /^--(?:pdf)$/; c=c+'p'
+ when /^--pdf-(?:a4|a5|b5|legal|letter)$/; c=c+'p'
+ when /^--pdf-(?:p|l|portrait|landscape)$/; c=c+'L'
+ when /^--pdf-(?:p(?:ortrait)?|l(?:andscape)?)-(?:a4|letter|a5|b5|legal)$/; c=c+'L'
+ when /^--pdf-(?:a4|letter|a5|b5|legal)-(?:p(?:ortrait)?|l(?:andscape)?)$/; c=c+'L'
+ when /^--(?:concordance|wordmap)$/; c=c+'w'
+ when /^--(?:manpage|man)$/; c=c+'i'
+ when /^--(?:texinfo)$/; c=c+'I'
+ when /^--(?:xhtml)$/; c=c+'b'
+ when /^--(?:xml-sax)$/; c=c+'x'
+ when /^--(?:xml-dom)$/; c=c+'X'
+ when /^--(?:images)$/; c=c+'j'
+ when /^--(?:hash-digests)$/; c=c+'N'
+ when /^--(?:po4a|pot?)$/; c=c+'P'
+ when /^--(?:termsheet)$/; c=c+'T'
+ when /^--(?:manifest)$/; c=c+'y'
+ when /^--(?:qrcode)$/; c=c+'Q'
+ when /^--(?:sqlite)$/; c=c+'d'
+ when /^--(?:pg|pg?sql|postgresql)$/; c=c+'D'
+ when /^--(?:remote|rsync)$/; c=c+'R'
+ when /^--(?:scp)$/; c=c+'r'
+ when /^--(?:source)$/; c=c+'s'
+ when /^--(?:sisupod|pod)$/; c=c+'S'
+ when /^--(?:git)$/; c=c+'g'
+ when /^--(?:urls)$/; c=c+'U'
+ when /^--(?:zap|delete)$/; c=c+'Z'
+ when /^--(?:sample-search-form)$/; c=c+'F'
+ when /^--(?:webserv|webrick)$/; c=c+'W'
+ when /^--(?:profile)$/; c=c+'E'
+ when /^--(?:maintenance|keep-processing-files)$/; c=c+'M'
+ when /^--(?:verbose[=-]3)$/; c=c+'VM'
+ when /^--(?:verbose[=-]2|Verbose|VERBOSE)$/; c=c+'V'
+ when /^--(?:verbose(?:[=-]1)?)$/; c=c+'v'
+ when /^--(?:version)$/; c=c+'v'
+ when /^--(?:verbose[=-]0|quiet|silent)$/; c=c+'q'
else mod << m #mod only contains command modifiers; commands converted to character
end
end
@@ -425,7 +559,7 @@ module SiSU_Commandline
end
extra=''
if cmd !~/[mn]/
- extra+=if cmd =~/[abegHhIiNOoPpQTtwXxyz]/ \
+ extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
and cmd !~/[mn]/
'm' #% add dal
elsif ((cmd =~/[Dd]/ \
@@ -468,12 +602,11 @@ module SiSU_Commandline
@act=@@act
else
act={}
- act[:license]=(cmd =~/L/ \
- || mod.inspect =~/"--license/) \
+ act[:license]=(mod.inspect =~/"--license/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:site_init]=(cmd =~/C/ \
- || mod.inspect =~/"--init-site"|"--configure"/) \
+ || mod.inspect =~/"--init"|"--initialize"|"--init-site"|"--conf"|"--config"|"--configure"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:rc]=if mod.inspect =~/"--rc=/
@@ -520,7 +653,8 @@ module SiSU_Commandline
: { bool: false, set: :na }
act[:color_state]=if mod.inspect =~/"--color-on"|"--color"/
{ bool: true, set: :on }
- elsif mod.inspect =~/"--color-off"/
+ elsif (cmd =~/k/ \
+ || mod.inspect =~/"--color-off"/)
{ bool: false, set: :off }
else { bool: true, set: :na } #fix default color
end
@@ -584,6 +718,9 @@ module SiSU_Commandline
end
act[:links_to_manifest]=if mod.inspect =~/"--inc-links-to-manifest"|"--inc-manifest-links"/
{ bool: true, set: :on }
+ elsif mod.inspect =~/"--(?:exc|no)-manifest"/ \
+ || act[:switch][:off].inspect =~/"manifest"/ #place lower
+ { bool: false, set: :off }
elsif mod.inspect =~/"--(?:exc|no)-links-to-manifest"|"--(?:exc|no)-manifest-links"/ \
|| act[:switch][:off].inspect =~/"links_to_manifest"|"manifest_links"|"--(?:exc|no)-manifest"/ \
|| mod.inspect =~/"--(?:redirect|dump)/
@@ -665,10 +802,20 @@ module SiSU_Commandline
|| mod.inspect =~/"--dal"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:html]=(cmd =~/h/ \
- || mod.inspect =~/"--html"/) \
- ? { bool: true, set: :on }
- : { bool: false, set: :na }
+ act[:html]=if (cmd =~/h/ \
+ || mod.inspect =~/"--html"/)
+ act[:html_scroll]={ bool: true, set: :on }
+ act[:html_seg]={ bool: true, set: :on }
+ { bool: true, set: :on }
+ else
+ act[:html_scroll]=(mod.inspect =~/"--html-scroll"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
+ act[:html_seg]=(mod.inspect =~/"--html-seg"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
+ { bool: false, set: :na }
+ end
act[:concordance]=(cmd =~/w/ \
|| mod.inspect =~/"--concordance"/) \
? { bool: true, set: :on }
@@ -677,10 +824,65 @@ module SiSU_Commandline
|| mod.inspect =~/"--images"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:pdf]=(cmd =~/p/ \
- || mod.inspect =~/"--pdf"/) \
- ? { bool: true, set: :on }
- : { bool: false, set: :na }
+ if (cmd =~/p/ \
+ || mod.inspect =~/"--pdf"/)
+ if mod.inspect =~/"--portrait"/
+ act[:pdf]= { bool: false, set: :na }
+ act[:pdf_l]={ bool: false, set: :na }
+ act[:pdf_p]={ bool: true, set: :on }
+ elsif mod.inspect =~/"--landscape"/
+ act[:pdf]= { bool: false, set: :na }
+ act[:pdf_l]={ bool: true, set: :on }
+ act[:pdf_p]={ bool: false, set: :na }
+ else
+ act[:pdf]= { bool: true, set: :on }
+ act[:pdf_l]={ bool: true, set: :on }
+ act[:pdf_p]={ bool: true, set: :on }
+ end
+ else
+ act[:pdf]= { bool: false, set: :na }
+ act[:pdf_p]= { bool: false, set: :na }
+ act[:pdf_l]= { bool: false, set: :na }
+ act[:pdf_a4]= { bool: false, set: :na }
+ act[:pdf_a5]= { bool: false, set: :na }
+ act[:pdf_b5]= { bool: false, set: :na }
+ act[:pdf_letter]={ bool: false, set: :na }
+ act[:pdf_legal]= { bool: false, set: :na }
+ end
+ if act[:pdf][:set]==:on \
+ or act[:pdf_p][:set]==:on \
+ or act[:pdf_l][:set]==:on
+ act[:pdf_a4]=if mod.inspect =~/"--a4"|--papersize-a4"/ \
+ or mod.inspect =~/"--papersize=\S*a4\b\S*"/ #--papersize=a4,a5
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
+ act[:pdf_a5]=if mod.inspect =~/"--a5"|"--papersize-a5"/ \
+ or mod.inspect =~/"--papersize=\S*a5\b\S*"/ #--papersize=a4,a5
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
+ act[:pdf_b5]=if mod.inspect =~/"--b5"|"--papersize-b5"/ \
+ or mod.inspect =~/"--papersize=\S*b5\b\S*"/
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
+ act[:pdf_letter]=if mod.inspect =~/"--letter"|"--papersize-letter"/ \
+ or mod.inspect =~/"--papersize=\S*letter\b\S*"/
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
+ act[:pdf_legal]=if mod.inspect =~/"--legal"|"--papersize-legal"/ \
+ or mod.inspect =~/"--papersize=\S*legal\b\S*"/
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
+ end
act[:epub]=(cmd =~/e/ \
|| mod.inspect =~/"--epub"/) \
? { bool: true, set: :on }
@@ -743,10 +945,6 @@ module SiSU_Commandline
|| mod.inspect =~/"--git"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:zap]=(cmd =~/Z/ \
- || mod.inspect =~/"--zap"|"--delete"/) \
- ? { bool: true, set: :on }
- : { bool: false, set: :na }
act[:hash_digests]=(cmd =~/N/ \
|| mod.inspect =~/"--hash-digests"/) \
? { bool: true, set: :on }
@@ -775,8 +973,8 @@ module SiSU_Commandline
|| mod.inspect =~/"--rsync"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:delete_output]=(cmd =~/z/ \
- || mod.inspect =~/"--delete"|"--zap"/) \
+ act[:zap]=(cmd =~/Z/ \
+ || mod.inspect =~/"--zap"|"--delete"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:urls_all]=(cmd =~/U/ \
@@ -813,7 +1011,6 @@ module SiSU_Commandline
def files_mod
files_mod=files
@files_mod=files_mod
- @files_mod
end
def f_pth
@f_pth
@@ -831,46 +1028,38 @@ module SiSU_Commandline
@lng_base
end
def fno
- @fno=if @fno \
- and not @fno.empty?
- @fno
- else
- fns[/(.+?(?:sst|ssm))(?:\.sst)?/,1]
- end
+ @fno=(fns.nil? || fns.empty?) \
+ ? '' \
+ : (fns[/(.+?(?:sst|ssm))(?:\.sst)?/,1])
end
def fng
- @fng=if @fng \
- and not @fng.empty?
- @fng
- else
- fno.gsub(/(?:~(?:#{Px[:lng_lst_rgx]}))?(\.ss[tm])$/,'\1')
- end
+ @fng=(fno.nil? || fno.empty?) \
+ ? '' \
+ : (fno.gsub(/(?:~(?:#{Px[:lng_lst_rgx]}))?(\.ss[tm])$/,'\1'))
end
def fns
@fns
end
def fnl
- x=@fns.gsub(/(\S+?)((?:\.ssm)?\.sst)/,"\\1.#{lng}\\2")
+ @fns.gsub(/(\S+?)((?:\.ssm)?\.sst)/,"\\1.#{lng}\\2")
end
def what
@what
end
def fnb
- unless fns.empty?
- fns[/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/,1]
- end
+ (fns.nil? || fns.empty?) \
+ ? '' \
+ : (fns[/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/,1])
end
def fnc
- @fnc=if @fns =~/\.(?:ssm\.sst|ssm)$/
- fnb + '.ssm.sst'
- else @fns
- end
+ @fnc=(@fns =~/\.(?:ssm\.sst|ssm)$/) \
+ ? fnb + '.ssm.sst'
+ : @fns
end
def fncb
- @fncb=if @fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/
- fnb + '.ssm.sst'
- else @fns.gsub(/(?:\~\S{2,3})?(\.sst)$/,'\1')
- end
+ @fncb=(@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/) \
+ ? fnb + '.ssm.sst'
+ : @fns.gsub(/(?:\~\S{2,3})?(\.sst)$/,'\1')
end
end
end
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v5/param.rb
index 0d882874..b2ced415 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/param.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/param.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -64,6 +64,7 @@ module SiSU_Param
require 'pstore'
require_relative 'sysenv' # sysenv.rb
include SiSU_Env
+ require_relative 'param_make' # param_make.rb
require_relative 'param_identify_markup' # param_identify_markup.rb
require_relative 'help' # help.rb
include SiSU_Help
@@ -163,6 +164,8 @@ module SiSU_Param
self
end
end
+ class MdMake < SiSU_Param_Make::MdMake
+ end
class Md
def initialize(str,opt,env)
@s,@opt,@env=str,opt,env
@@ -609,62 +612,52 @@ module SiSU_Param
end
self
end
- def classify
- a=@s.split(/(\n%\s.+?$|[ ]*)(?:\n[ ]*(?=:)|\Z)/m)
+ def identifier
+ a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
@h=build_hash(a)
- def coverage
- s=@h['coverage']
- l,n=Db[:col_classify_short],'classify.coverage'
+ def oclc
+ s=@h['oclc']
+ l,n=Db[:col_library],'identifier.oclc'
validate_length(s,l,n)
end
- def relation
- s=@h['relation']
- l,n=Db[:col_classify_short],'classify.short'
+ def isbn
+ s=@h['isbn']
+ l,n=Db[:col_small],'identifier.isbn'
validate_length(s,l,n)
end
- def subject
- s=@h['subject']
- l,n=Db[:col_classify_txt_short],'classify.subject'
+ def pg
+ s=@h['pg']
+ l,n=Db[:col_small],'identifier.pg'
validate_length(s,l,n)
end
+ self
+ end
+ def classify
+ a=@s.split(/(\n%\s.+?$|[ ]*)(?:\n[ ]*(?=:)|\Z)/m)
+ @h=build_hash(a)
def topic_register
s=@h['topic_register']
l,n=Db[:col_info_note],'classify.topic_register'
validate_length(s,l,n)
end
- def type
- s=@h['type']
- l,n=Db[:col_classify_txt_short],'classify.type'
+ def subject
+ s=@h['subject']
+ l,n=Db[:col_txt_long],'classify.subject'
validate_length(s,l,n)
end
- def identifier
- s=@h['identifier']
- l,n=Db[:col_classify_identify],'classify.identifier'
+ def keywords
+ s=@h['keywords']
+ l,n=Db[:col_txt_long],'classify.keywords'
validate_length(s,l,n)
end
def loc
s=@h['loc']
- l,n=Db[:col_classify_library],'classify.loc'
+ l,n=Db[:col_library],'classify.loc'
validate_length(s,l,n)
end
def dewey
s=@h['dewey']
- l,n=Db[:col_classify_library],'classify.dewey'
- validate_length(s,l,n)
- end
- def oclc
- s=@h['oclc']
- l,n=Db[:col_classify_library],'classify.oclc'
- validate_length(s,l,n)
- end
- def pg
- s=@h['pg']
- l,n=Db[:col_classify_small],'classify.pg'
- validate_length(s,l,n)
- end
- def isbn
- s=@h['isbn']
- l,n=Db[:col_classify_small],'classify.isbn'
+ l,n=Db[:col_library],'classify.dewey'
validate_length(s,l,n)
end
self
@@ -741,262 +734,6 @@ module SiSU_Param
# end
# self
#end
- def make
- a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
- @h=build_hash(a)
- def headings
- lv=[]
- x=@h['headings']
- x=((x =~/;/) ? (x.split(/;\s*/)) : [ x ])
- lv[0]=x
- lv1=x[0] ||='1~ ' #some arbitrary changes made
- lv[1]=/^#{lv1}/
- lv2=x[1] ||='2~ '
- lv[2]=/^#{lv2}/
- lv3=x[2] ||='3~ '
- lv[3]=/^#{lv3}/
- lv4=x[3] ||='4~ '
- lv[4]=/^#{lv4}/
- lv5=x[4] ||='5~ '
- lv[5]=/^#{lv5}/
- lv6=x[5] ||='6~ '
- lv[6]=/^#{lv6}/
- lv
- end
- def num_top
- @h['num_top']
- end
- def breaks
- pagebreaks=((@h['breaks'] =~/;/) \
- ? (@h['breaks'].split(/;\s*/))
- : [ @h['breaks'] ])
- page_new,page_break=nil,nil
- pagebreaks.each do |x|
- page_new=x[/(:?[\dA-C],?)+/] if x=~/new|clear/
- page_break=x[/(:?[\dA-C],?)+/] if x =~/break/
- end
- { page_new: page_new, page_break: page_break }
- end
- def language
- l=if @h['language'] && (@h['language']=~/\S{2,}/)
- ((@h['language'] =~/,/) \
- ? (@h['language'].split(/,\s*/))
- : [ @h['language'] ])
- else [ 'en' ]
- end
- end
- def bold
- m=@h['bold']
- i=(m=~/\/i$/)? 'i' : ''
- z=if m
- x=m.gsub(/^\/(.+?)\/i?/,'\1').
- gsub(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided
- rgx='\b(' + x + ')\b'
- y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/))
- { str: '\b(?:' + x + ')\b', regx: y, i: i }
- else nil
- end
- end
- def italics
- m=@h['italics']
- i=((m=~/\/i$/) ? 'i' : '')
- z=if m
- x=m.gsub(/^\/(.+?)\/i?/,'\1').
- gsub(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided
- rgx='\b(' + x + ')\b'
- y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/))
- { str: '\b(?:' + x + ')\b', regx: y, i: i }
- else nil
- end
- end
- def emphasis
- if @h['emphasis'] =~/bold/ then 'bold'
- elsif @h['emphasis'] =~/italics?/ then 'italics'
- elsif @h['emphasis'] =~/under(?:line|score)/ then 'underscore'
- else nil
- end
- end
- def substitute
- m=@h['substitute']
- z=if m
- w=m.scan(/\/(.+?)\/(i?,)\s*'(.+?)'(?:\s+|\s*;\s*|$)/)
- arr_hash=[]
- matches=''
- w.each do |x|
- c=(x[1] =~/[i],/) ? :i : :s
- matches=matches + x[0].gsub(/([${}])/,'\\\\\1') + '|'
- arr_hash << {
- match: x[0].gsub(/([${}])/,'\\\\\1'),
- replace: x[2],
- case_s: c
- }
- end
- matches.chop!
- { match_and_replace: arr_hash, matches: matches }
- else nil
- end
- end
- def plaintext_wrap
- if @h['plaintext_wrap'].to_s =~/\d\d+/ \
- and @h['plaintext_wrap'].to_i > 19 \
- and @h['plaintext_wrap'].to_i < 201
- @h['plaintext_wrap'].to_i
- else nil
- end
- end
- def omit
- m=@h['omit']
- @m=m ? (m.split(/,\s+/)) : nil
- def list
- @m
- end
- self
- end
- def ocn?
- (omit.list.inspect =~/"ocn"/) \
- ? :off
- : :na
- end
- def toc?
- (omit.list.inspect =~/"toc"/) \
- ? :off
- : :na
- end
- def manifest?
- (omit.list.inspect =~/"manifest"/) \
- ? :off
- : :na
- end
- def links_to_manifest?
- (omit.list.inspect =~/"manifest_links"|"links_to_manifest"/) \
- ? :off
- : :na
- end
- def metadata?
- (omit.list.inspect =~/"metadata"/) \
- ? :off
- : :na
- end
- def minitoc?
- (omit.list.inspect =~/"minitoc"/) \
- ? :off
- : :na
- end
- def html_minitoc?
- (omit.list.inspect =~/"html_minitoc"/) \
- ? :off
- : :na
- end
- def html_top_band?
- (omit.list.inspect =~/"html_top_band"/) \
- ? :off
- : :na
- end
- def html_navigation?
- (omit.list.inspect =~/"html_navigation"/) \
- ? :off
- : :na
- end
- def html_navigation_bar?
- (omit.list.inspect =~/"html_navigation_bar"/) \
- ? :off
- : :na
- end
- def segsubtoc?
- (omit.list.inspect =~/"segsubtoc"/) \
- ? :off
- : :na
- end
- def search_form?
- (omit.list.inspect =~/"search_form"/) \
- ? :off
- : :na
- end
- def html_search_form?
- (omit.list.inspect =~/"html_search_form"/) \
- ? :off
- : :na
- end
- def html_right_pane?
- (omit.list.inspect =~/"html_right_column"|"html_right_pane"/) \
- ? :off
- : :na
- end
- def manifest_minitoc?
- (omit.list.inspect =~/"manifest_minitoc"/) \
- ? :off
- : :na
- end
- def texpdf_font
- def main
- @h['texpdf_font'] \
- && (@h['texpdf_font']=~/\S{3,}/) \
- ? @h['texpdf_font']
- : @env.font.texpdf.main
- end
- def sans # not used
- @h['texpdf_font_sans'] \
- && (@h['texpdf_font_sans']=~/\S{3,}/) \
- ? @h['texpdf_font_sans']
- : @env.font.texpdf.sans
- end
- def serif # not used
- @h['texpdf_font_serif'] \
- && (@h['texpdf_font_serif']=~/\S{3,}/) \
- ? @h['texpdf_font_serif']
- : @env.font.texpdf.serif
- end
- def mono
- @h['texpdf_font_mono'] \
- && (@h['texpdf_font_mono']=~/\S{3,}/) \
- ? @h['texpdf_font_mono']
- : @env.font.texpdf.mono
- end
- self
- end
- def skin
- @h['skin']
- end
- def promo
- @h['promo']
- end
- def ad
- @h['ad']
- end
- def manpage
- manpage={}
- if @h['manpage']
- if @h['manpage'] =~/;/m
- man=@h['manpage'].split(/;/m)
- man.each do |x|
- m=(x=~/=/m) ? x.split(/=/m) : nil
- if m
- manpage[m[0].strip] = m[1].split(/ \. /)
- end
- end
- end
- end
- if manpage['name']
- manpage['name']=manpage['name'].join("\n.br\n").
- gsub(/(-)/m,"\\\\\\1").
- gsub(/\A/,"\n.br\n.SH NAME\n.br\n")
- else
- manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]'
- end
- if manpage['synopsis']
- manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n").
- gsub(/(-)/m,"\\\\\\1").
- gsub(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n")
- else
- manpage['synopsis']=''
- end
- unless manpage['section']
- manpage['section']=1
- end
- manpage
- end
- self
- end
def current_publisher
@s
end
@@ -1035,23 +772,53 @@ module SiSU_Param
end
self
end
- def links
- a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
- end
def notes
a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
@h=build_hash(a)
+ def description
+ s=@h['description']
+ l,n=Db[:col_info_note],'notes.description'
+ validate_length(s,l,n)
+ end
def abstract
- @h['abstract']
+ s=@h['abstract']
+ l,n=Db[:col_info_note],'notes.abstract'
+ validate_length(s,l,n)
end
def comment
- @h['comment']
+ s=@h['comment']
+ l,n=Db[:col_info_note],'notes.comment'
+ validate_length(s,l,n)
end
- def description
- @h['description']
+ def coverage
+ s=@h['coverage']
+ l,n=Db[:col_info_note],'notes.coverage'
+ validate_length(s,l,n)
+ end
+ def relation
+ s=@h['relation']
+ l,n=Db[:col_info_note],'notes.relation'
+ validate_length(s,l,n)
+ end
+ def source
+ s=@h['source']
+ l,n=Db[:col_txt_long],'notes.source'
+ validate_length(s,l,n)
end
def history
- @h['history']
+ s=@h['history']
+ l,n=Db[:col_txt_long],'notes.history'
+ validate_length(s,l,n)
+ end
+ def type
+ s=@h['type']
+ l,n=Db[:col_txt_long],'notes.relation'
+ validate_length(s,l,n)
+ end
+ def format
+ s=@h['format']
+ l,n=Db[:col_txt_short],'notes.format'
+ validate_length(s,l,n)
end
def prefix
@h['prefix']
@@ -1063,9 +830,9 @@ module SiSU_Param
@doc={ lv: [] }
@doc[:fns],@doc[:fnb],@doc[:scr_suffix]='','',''
@@publisher='SiSU scribe'
- attr_accessor :make,:env,:path,:file,:fn,:fns,:fno,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:site_skin,:sisu,:sisu_version,:ruby_version,:title,:subtitle,:full_title,:html_title,:subtitle_tex,:creator,:classify,:author_home,:author,:author_title,:author_nationality,:authors,:authorship,:translator,:illustrator,:prepared_by,:digitized_by,:subject,:description,:publisher,:current_publisher,:contributor,:date,:date_created,:date_issued,:date_available,:date_valid,:date_modified,:date_translated,:date_added_to_site,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:type,:format,:identifier,:source,:language,:language_original,:relation,:coverage,:rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:lvs,:pagenew,:pagebreak,:num_top,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:markup,:markup_instruction,:markup_version,:markup_declared,:flag_tables,:vocabulary,:doc_skin,:doc_css,:yaml,:lnk,:links,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:filesize,:user,:home,:hostname,:pwd,:firstseg,:programs,:author_copymark,:i18n,:lang,:lang_code_insert,:en,:notes,:dgst,:dgst_skin,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:ec,:opt,:sem_tag,:book_idx,:topic_register,:topic_register_array,:original,:writing_focus,:audio,:daisy
+ attr_accessor :make,:env,:path,:file,:fn,:fns,:fno,:fnb,:fnn,:fnt,:fnl,:flv,:fnz,:fnstex,:ocn,:sfx_src,:pdf,:file_type,:dir_out,:dir_tex,:dir_lout,:txt_path,:sisu,:sisu_version,:ruby_version,:title,:subtitle,:full_title,:html_title,:subtitle_tex,:creator,:classify,:author_home,:author,:author_title,:author_nationality,:authors,:authorship,:translator,:illustrator,:prepared_by,:digitized_by,:subject,:description,:publisher,:current_publisher,:contributor,:date,:date_created,:date_issued,:date_available,:date_valid,:date_modified,:date_translated,:date_added_to_site,:date_scheme,:date_created_scheme,:date_issued_scheme,:date_available_scheme,:date_valid_scheme,:date_modified_scheme,:type,:format,:identifier,:source,:language,:language_original,:relation,:coverage,:rights,:keywords,:comments,:abstract,:cls_loc,:cls_dewey,:cls_pg,:cls_isbn,:papersize,:papersize_array,:toc,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:lvs,:pagenew,:pagebreak,:pageline,:num_top,:bold_match_list,:italics_match_list,:substitution_match_list,:emphasis_set_to,:toc_lev_limit,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:markup,:markup_instruction,:markup_version,:markup_declared,:flag_tables,:vocabulary,:doc_css,:yaml,:lnk,:links,:prefix_a,:prefix_b,:suffix,:information,:contact,:icon,:image,:ad_url,:ad_png,:ad_alt,:ad_began,:flag_promo,:promo,:ad_home,:stmp,:stmpd,:sc_filename,:sc_number,:sc_date,:sc_time,:sc_info,:yamladdr,:locale,:wc_lines,:wc_words,:wc_bytes,:file_encoding,:filesize,:user,:home,:hostname,:pwd,:firstseg,:programs,:author_copymark,:i18n,:lang,:lang_code_insert,:en,:notes,:dgst,:generated,:tags,:tag_array,:concord_make,:seg_names,:seg_autoname_safe,:set_header_title,:set_heading_top,:set_heading_seg,:heading_seg_first,:heading_seg_first_flag,:base_program,:ec,:opt,:sem_tag,:book_idx,:topic_register,:topic_register_array,:original,:writing_focus,:audio,:daisy,:home_button_image,:home_button_links,:footer_links,:cover_image,:man_section
def initialize(fns_array,opt)
- @env=@path,@file=@fn=@fns=@fno=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@make=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@site_skin=@sisu=@sisu_version=@ruby_version=@title=@subtitle=@full_title=@html_title=@subtitle_tex=@creator=@classify=@author_home=@author=@author_title=@author_nationality=@translator=@illustrator=@prepared_by=@digitized_by=@subject=@description=@publisher=@current_publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@date_translated=@date_added_to_site=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@type=@format=@identifier=@source=@language=@language_original=@relation=@coverage=@rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@num_top=@toc_lev_limit=@flag_tables=@vocabulary=@doc_skin=@doc_css=@yaml=@lnk=@links=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@filesize=@firstseg=@programs=@author_copymark=@i18n=@lang=@lang_code_insert=@en=@notes=@dgst=@dgst_skin=@generated=@heading_seg_first=@base_program=@topic_register=@original=@writing_focus=@audio=nil
+ @env=@path,@file=@fn=@fns=@fno=@fnb=@fnn=@fnt=@fnl=@flv=@fnz=@fnstex=@ocn=@sfx_src=@pdf=@file_type=@dir_out=@dir_tex=@dir_lout=@txt_path=@make=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@sisu=@sisu_version=@ruby_version=@title=@subtitle=@full_title=@html_title=@subtitle_tex=@creator=@classify=@author_home=@author=@author_title=@author_nationality=@translator=@illustrator=@prepared_by=@digitized_by=@subject=@description=@publisher=@current_publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@date_translated=@date_added_to_site=@date_scheme=@date_created_scheme=@date_issued_scheme=@date_available_scheme=@date_valid_scheme=@date_modified_scheme=@type=@format=@identifier=@source=@language=@language_original=@relation=@coverage=@rights=@keywords=@comments=@abstract=@cls_loc=@cls_dewey=@cls_pg=@cls_isbn=@papersize=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@pagenew=@pagebreak=@pageline=@num_top=@bold_match_list=@italics_match_list=@substitution_match_list=@emphasis_set_to=@toc_lev_limit=@flag_tables=@vocabulary=@doc_css=@yaml=@lnk=@links=@prefix_a=@prefix_b=@suffix=@information=@contact=@icon=@ad_url=@ad_png=@ad_alt=@ad_began=@promo=@ad_home=@stmp=@stmpd=@sc_filename=@sc_number=@sc_date=@sc_time=@sc_info=@yamladdr=@locale=@wc_lines=@wc_words=@wc_bytes=@file_encoding=@filesize=@firstseg=@programs=@author_copymark=@i18n=@lang=@lang_code_insert=@en=@notes=@dgst=@generated=@heading_seg_first=@base_program=@topic_register=@original=@writing_focus=@audio=@home_button_image=@home_button_links=@cover_image=@man_section=nil
@data,@path,@fns,@fno,@opt=fns_array,opt.pth,opt.fns,opt.fno,opt #@data used as data
@flag_tables,@set_header_title,@set_heading_top,@set_heading_seg,@heading_seg_first_flag,@flag_promo,@book_idx=false,false,false,false,false,false,false
@seg_autoname_safe=true
@@ -1076,6 +843,7 @@ module SiSU_Param
@flv,@lang,@seg_names,@tags,@tag_array,@tag_a,@ec[:image],@ec[:audio],@ec[:multimedia]=Array.new(9){[]}
@authors,@topic_register_array,@papersize_array=[],[],[]
@lvs=[nil,0,0,0,0,0,0]
+ @emphasis_set_to='bold'
@lang_code_insert=if @opt.act[:output_by][:set]==:language
''
elsif @opt.act[:output_by][:set]==:filetype \
@@ -1086,6 +854,7 @@ module SiSU_Param
else
".#{@opt.lng}"
end
+ @footer_links= { left: { say: '', url: '' }, center: { say: '', url: '' } }
@rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m
@rgx_audio=/\{\s*(\S+?\.(?:mp3|ogg))/
@rgx_mm=/\{\s*(\S+?\.(?:ogg|mpeg))/ #expand and distinguish ogg
@@ -1097,18 +866,39 @@ module SiSU_Param
end
ensure
end
- end
- #protected
- def determine_papersize(l)
- l=case l
- when /eu|europe|uk/i; 'A4' #European default, SiSU default
- when /(?:us-)?legal|legal/i; 'US_legal' #U.S. alternative
- when /(?:us-)?letter|u.s.|us/i; 'US_letter' #U.S. default
- when /book_a5|a5/i; 'book_a5'
- when /book_b5|b5|book/i; 'book_b5' #book default - larger
- else 'A4'
+ @header_make_links_append=:no
+ common_makes=(defined? @opt.make_instructions_pod) \
+ && @opt.make_instructions_pod !=nil \
+ && @opt.make_instructions_pod[:makeset]==true \
+ ? @opt.make_instructions_pod
+ : @opt.make_instructions
+ if common_makes[:makeset]
+ @pagenew=common_makes[:pagenew]
+ @pagebreak=common_makes[:pagebreak]
+ @pageline=common_makes[:pageline]
+ @toc=common_makes[:toc]
+ @lv1=common_makes[:lv1]
+ @lv2=common_makes[:lv2]
+ @lv3=common_makes[:lv3]
+ @lv4=common_makes[:lv4]
+ @lv5=common_makes[:lv5]
+ @lv6=common_makes[:lv6]
+ @num_top=common_makes[:num_top]
+ @i18n=common_makes[:i18n]
+ @man_section=common_makes[:man_section]
+ @emphasis_set_to=common_makes[:emphasis_set_to]
+ @bold_match_list=common_makes[:bold_match_list]
+ @italics_match_list=common_makes[:italics_match_list]
+ @substitution_match_list=common_makes[:substitution_match_list]
+ @footer_links=common_makes[:footer_links]
+ @home_button_links=common_makes[:home_button_links]
+ @home_button_image=common_makes[:home_button_image]
+ @cover_image=common_makes[:cover_image]
+ @lnk=@links=common_makes[:links]
+ @header_make_links_append=common_makes[:links_append]
end
end
+ #protected
def extract
@user,@home,@hostname,@pwd=ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD']
@programs,@wc,@language,@language_original={},{},{},{}
@@ -1234,61 +1024,76 @@ module SiSU_Param
@rights=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).rights
when /^@classify:(.+)/m; classify=$1 #% * header metadata - classify
@classify=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).classify
+ when /^@identifier:(.+)/m; identify=$1 #% * header metadata - identifier
+ @identifier=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).identifier
when /^@original:(.+)/m #% * header metadata - original (document)
@original=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).original
@source=@original.source
when /^@notes?:\s(.+)\Z/m #% * header metadata - notes
@notes=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).notes
when /^@links:\s+(.+?)\Z/m #% * header metadata - links
- doc_links=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).links
- a_idx=0
- @links=[]
- doc_links.each do |doc_link|
- if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
- @links[a_idx]={}
- @links[a_idx][:say],@links[a_idx][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
- a_idx +=1
- end
+ links=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make_links.links
+ @lnk=@links=if @header_make_links_append == :yes
+ (links) \
+ ? (links + @links)
+ : @links
+ else
+ (links) \
+ ? (links)
+ : @links
end
- @lnk=@links
when /^@make:(.+)/m #% * header processing - make
- @make=SiSU_Param::Parameters::Md.new($1.strip,@opt,@env).make
- if defined? @make.breaks \
- and @make.breaks[:page_new] #clearpage
- @pagenew=@make.breaks[:page_new]
- end
- if defined? @make.breaks \
- and @make.breaks[:page_break] #newpage
- @pagebreak=@make.breaks[:page_break]
- end
- if defined? @make.headings \
- and @make.headings
- @toc=@make.headings[0]
- @lv1=@make.headings[1]
- @lv2=@make.headings[2]
- @lv3=@make.headings[3]
- @lv4=@make.headings[4]
- @lv5=@make.headings[5]
- @lv6=@make.headings[6]
- end
- if defined? @make.num_top \
- and @make.num_top
- @num_top=@make.num_top # remove @num_top
- end
- if defined? @make.language \
- and @make.language[0]
- @i18n=@make.language
- end
- if defined? @make.skin \
- and @make.skin
- @doc_skin=@make.skin
- end
- if defined? @make.manpage \
- and @make.manpage
- @man_section=(defined? @make.manpage.section) \
- ? @make.manpage.section
- : 1
- end
+ @make=SiSU_Param::Parameters::MdMake.new($1.strip,@opt,@env).make
+ makes=SiSU_Param_Make::MakeHead.new(@make).make_instruct
+ @pagenew=(makes[:pagenew]) \
+ ? (makes[:pagenew]) \
+ : @pagenew
+ @pagebreak=(makes[:pagebreak]) \
+ ? (makes[:pagebreak]) \
+ : @pagebreak
+ @pageline=(makes[:pageline]) \
+ ? (makes[:pageline]) \
+ : @pageline
+ @toc=(makes[:toc]) ? (makes[:toc]) : @toc
+ @lv1=(makes[:lv1]) ? (makes[:lv1]) : @lv1
+ @lv2=(makes[:lv2]) ? (makes[:lv2]) : @lv2
+ @lv3=(makes[:lv3]) ? (makes[:lv3]) : @lv3
+ @lv4=(makes[:lv4]) ? (makes[:lv4]) : @lv4
+ @lv5=(makes[:lv5]) ? (makes[:lv5]) : @lv5
+ @lv6=(makes[:lv6]) ? (makes[:lv6]) : @lv6
+ @num_top=(makes[:num_top]) \
+ ? (makes[:num_top]) \
+ : @num_top
+ @substitution_match_list=(makes[:substitution_match_list]) \
+ ? (makes[:substitution_match_list]) \
+ : @substitution_match_list
+ @bold_match_list=(makes[:bold_match_list]) \
+ ? (makes[:bold_match_list]) \
+ : @bold_match_list
+ @italics_match_list=(makes[:italics_match_list]) \
+ ? (makes[:italics_match_list]) \
+ : @italics_match_list
+ @emphasis_set_to=(makes[:emphasis_set_to]) \
+ ? (makes[:emphasis_set_to]) \
+ : @emphasis_set_to
+ @i18n=(makes[:i18n]) \
+ ? (makes[:i18n]) \
+ : @i18n
+ @man_section=(makes[:man_section]) \
+ ? (makes[:man_section]) \
+ : @man_section
+ @footer_links=(makes[:footer_links]) \
+ ? (makes[:footer_links]) \
+ : @footer_links
+ @home_button_links=(makes[:home_button_links]) \
+ ? (makes[:home_button_links]) \
+ : @home_button_links
+ @home_button_image=(makes[:home_button_image]) \
+ ? (makes[:home_button_image]) \
+ : @home_button_image
+ @cover_image=(makes[:cover_image]) \
+ ? (makes[:cover_image]) \
+ : @cover_image
end
@lv1 ||=/^1~/
@lv2 ||=/^2~/
@@ -1349,8 +1154,13 @@ module SiSU_Param
tf="@title: #{tf}"
@title=SiSU_Param::Parameters::Md.new(tf.strip,@opt,@env).title
end
- @html_title=@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
- SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',@html_title).txt_grey if @opt.cmd =~/v/
+ creator=(@creator.is_a?(SiSU_Param::Parameters::Md) \
+ && defined? @creator.author \
+ && @creator.author.is_a?(String)) \
+ ? " #{@creator.author}"
+ : ''
+ title=%{"#{@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')}",}
+ SiSU_Screen::Ansi.new(@opt.cmd,'Parameters',%{#{title}#{creator}}).txt_grey if @opt.cmd =~/v/
end
if not @book_idx \
and para =~/^=\{(.+?)\}\s*$/
@@ -1412,7 +1222,19 @@ module SiSU_Param
if @opt.cmd =~/[VM]/
SiSU_Screen::Ansi.new(@opt.cmd,'@make:','header absent').warn
end
- @make=SiSU_Param::Parameters::Md.new('@make: ',@opt,@env).make
+ @make=SiSU_Param::Parameters::MdMake.new('@make: ',@opt,@env).make
+ end
+ if @cover_image \
+ and @cover_image.is_a?(Hash) \
+ and (@cover_image[:cover] =~@rgx_image \
+ or @cover_image[:cover] =~/\S+?.(?:jpg|png|gif)/)
+ @ec[:image] << @cover_image[:cover]
+ end
+ if @home_button_image \
+ and @home_button_image.is_a?(Hash) \
+ and (@home_button_image =~@rgx_image \
+ or @home_button_image =~/\S+?\.(?:jpg|png|gif)/)
+ @ec[:image] << @home_button_image
end
if @ec[:image].length > 0
@ec[:image]=@ec[:image].flatten.uniq
@@ -1455,7 +1277,7 @@ module SiSU_Param
end
if @markup_version.determined >= 0.38 #convert values in headers to internal representation
translated=[]
- translate_list=[@pagenew,@pagebreak,@num_top,@toc_lev_limit]
+ translate_list=[@pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit]
translate_list.each do |t|
translate=t.to_s if t
translated << if translate
@@ -1478,35 +1300,40 @@ module SiSU_Param
else nil
end
end
- @pagenew,@pagebreak,@num_top,@toc_lev_limit=translated
+ @pagenew,@pagebreak,@pageline,@num_top,@toc_lev_limit=translated
@markup=@markup.gsub(/page_new\s*=\s*([\dA-C])/,"page_new=#{@pagenew}").
gsub(/page_break\s*=\s*([\dA-C])/,"page_break=#{@pagebreak}").
+ gsub(/page_line\s*=\s*([\dA-C])/,"page_line=#{@pageline}").
gsub(/num_top\s*=\s*([\dA-C])/,"num_top=#{@num_top}").
gsub(/toc_lev_limit\s*=\s*([\dA-C])/,"toc_lev_limit=#{@toc_lev_limit}")
end
- if @opt.mod.inspect =~/--papersize[=-]\S+|--pdf[=-]\S+/ \
- or @opt.mod.inspect =~/--(?:a4|letter|legal|book|a5|b5)\b/i #command line config/header override
- @papersize=determine_papersize(@opt.mod.inspect)
- end
- @papersize_array=@papersize.scan(/(?:a4|letter|legal|book|a5|b5)/i)
+ papersize_array_rc=@papersize.downcase.scan(/(?:a4|letter|legal|book|a5|b5)/)
+ papersize_array_opt=[
+ ((@opt.act[:pdf_a4][:set]==:on) ? 'a4' : ''),
+ ((@opt.act[:pdf_a5][:set]==:on) ? 'a5' : ''),
+ ((@opt.act[:pdf_b5][:set]==:on) ? 'b5' : ''),
+ ((@opt.act[:pdf_letter][:set]==:on) ? 'letter' : ''),
+ ((@opt.act[:pdf_legal][:set]==:on) ? 'legal' : ''),
+ ] - [""]
+ @papersize_array=(papersize_array_opt.length > 0) \
+ ? papersize_array_opt
+ : papersize_array_rc
fn=@opt.fno #decide what to do a filesize on .ssm tells very little about actual document size
@filesize=(File.size(fn)).to_s
- if @sys.openssl !=false
- skin=@doc_skin \
- ? (SiSU_Env::InfoSkin.new(@opt,@doc_skin).select)
- : SiSU_Env::InfoSkin.new(@opt).select
- @dgst,@dgst_skin=[],[]
+ if @sys.openssl !=false \
+ and FileTest.file?(@env.source_file_with_path)
+ @dgst=[]
if @env.digest.type =~/sha256/
dgst=@sys.sha256(@env.source_file_with_path)
@dgst=dgst[1].length==64 ? dgst : nil
puts 'check document (sha256) digest' if not @dgst
- @dgst_skin=skin ? (@sys.sha256(skin)) : nil
else
dgst=@sys.md5(@env.source_file_with_path)
@dgst=dgst[1].length==32 ? dgst : nil
puts 'check document (md5) digest' if not @dgst
- @dgst_skin=skin ? (@sys.md5(skin)) : nil
end
+ elsif not FileTest.file?(@env.source_file_with_path)
+ #puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
end
@publisher ||= "#{@@publisher} (this copy)"
fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
@@ -1521,19 +1348,8 @@ module SiSU_Param
@language[:name]=fn_set_lang[:n]
end
@fnl=@env.i18n.lang_filename(fn_set_lang[:c])
-#fix
-# @flv.each do |l|
-# lang=SiSU_Env::StandardiseLanguage.new.file_to_language(l)
-# c={ a: '', b: '', c: '' }
-# if @fnl[:pre] =~/\S/ then c[:a]="#{lang[:c]}."
-# elsif @fnl[:mid] =~/\S/ then c[:b]=".#{lang[:c]}"
-# elsif @fnl[:post] =~/\S/ then c[:c]=".#{lang[:c]}"
-# end
-# @lang << [lang[:n],"#{c[:a]}sisu_manifest#{c[:b]}.html#{c[:c]}"]
-# end if @flv
@lang=@lang.uniq
@fn=SiSU_Env::EnvCall.new(@fns).lang(fn_set_lang[:c])
- @identifier="#{@env.url.root}/#{@fnb}/#{@fn[:toc]}" #DC note constructed dc identifier
if @en[:note] > 0 \
and @en[:sum] > 0
if @en[:sum] > 0
@@ -1628,9 +1444,6 @@ module SiSU_Param
@lv4 ||=/^4~/
@lv5 ||=/^5~/
@lv6 ||=/^6~/
- if @doc_skin
- SiSU_Screen::Ansi.new(@opt.cmd,"doc_skin <- #{@doc_skin}").txt_grey if @opt.cmd =~/v/
- end
@data=nil #else whole file's contents are stored in md pstore & is not required to be... big waste actually
@file=SiSU_Env::FileOp.new(self) #watch
Store.new(self,@env).store #% pstore
diff --git a/lib/sisu/v3/param_identify_markup.rb b/lib/sisu/v5/param_identify_markup.rb
index 6449759b..148c73d5 100644
--- a/lib/sisu/v3/param_identify_markup.rb
+++ b/lib/sisu/v5/param_identify_markup.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/param_identify_markup.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/param_identify_markup.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v5/param_make.rb b/lib/sisu/v5/param_make.rb
new file mode 100644
index 00000000..24a4dbb7
--- /dev/null
+++ b/lib/sisu/v5/param_make.rb
@@ -0,0 +1,646 @@
+# encoding: utf-8
+=begin
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+ SiSU, a framework for document structuring, publishing and search
+
+ Copyright (C) Ralph Amissah
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Lic/home/ralph/live-manual/build/manual/manifest/live-manual.ca.htmlense for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+
+ If you have Internet connection, the latest version of the GPL should be
+ available at these locations:
+ <http://www.fsf.org/licensing/licenses/gpl.html>
+ <http://www.gnu.org/licenses/gpl.html>
+
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+
+ * SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
+
+ * Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
+
+ * Download:
+ <http://www.sisudoc.org/sisu/en/SiSU/download.html>
+
+ * Git
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/param_make.rb;hb=HEAD>
+
+ * Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+ ** Description: make parameters extracted for program use
+
+=end
+
+module SiSU_Param_Make
+ class MdMake
+ def initialize(str,opt,env)
+ @s,@opt,@env=str,opt,env
+ end
+ def validate_length(s,l,n)
+ #s=(s.length <= l) ? s : nil
+ s=if s.is_a?(String) \
+ and s.length <= l
+ s
+ elsif s.is_a?(NilClass)
+ nil
+ elsif s.class !=String
+ STDERR.puts "#{n} is #{s.class}: programming error, String expected #{__FILE__}:#{__LINE__}"
+ s
+ else
+ SiSU_Screen::Ansi.new('v',"*WARN* #{n} length #{s.length} exceeds set db field length #{l}, metadata dropped",@opt.fns).warn unless @opt.cmd =~/q/
+ nil
+ end
+ end
+ def name_format(name)
+ if name
+ name=name.strip
+ @name_a_h=[]
+ authors=name.scan(/[^;]+/)
+ authors.each_with_index do |a,i|
+ b=((a =~/\s*\|\s*/) ? (a.split(/\|/)) : [a])
+ if b[0] =~/"(.+?)"/
+ @name_a_h << { the: $1 }
+ else
+ x=b[0].scan(/[^,]+/)
+ if x.length==1
+ @name_a_h << { the: x[0].strip }
+ elsif x.length==2
+ @name_a_h << { the: x[0].strip, others: x[1].strip }
+ else #p x.length
+ end
+ end
+ b.delete_at(0)
+ b.each do |d|
+ k,c=nil
+ k,c=/^(\S+)\s+(.*)/.match(d)[1,2] if d
+ @name_a_h[i][:hon]=c.strip if k=='hon'
+ @name_a_h[i][:affiliation]=c.strip if k=='affiliation'
+ @name_a_h[i][:nationality]=c.strip if k=='nationality'
+ end
+ end
+ l=@name_a_h.length
+ name_str=''
+ @name_a_h.each_with_index do |a,i|
+ name_str += if a[:others]
+ z=(((l - i) > 1) ? ', ' : '')
+ "#{a[:others].strip} #{a[:the].strip}" + z
+ else
+ z=(((l - i) > 2) ? ', ' : '')
+ "#{a[:the].strip}" + z
+ end
+ end
+ { name_a_h: @name_a_h, name_str: name_str }
+ else nil
+ end
+ end
+ def build_hash(arr)
+ @h={}
+ arr.each_with_index do |x,i|
+ a,b=nil,nil
+ if x =~/^%[:\s]/ #ignore comment
+ elsif x =~/:(\S+?):\s+(.+)/
+ a,b=/:(\S+?):\s+(.+)\Z/m.match(x)[1,2]
+ elsif i == 0
+ a='main'
+ b=x
+ else
+ end
+ @h[a]=b
+ end
+ @h
+ end
+ def make
+ a=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
+ @h=build_hash(a)
+ def headings
+ lv=[]
+ x=@h['headings']
+ x=((x =~/;/) ? (x.split(/;\s*/)) : [ x ])
+ lv[0]=x
+ lv1=x[0] ||='1~ ' #some arbitrary changes made
+ lv[1]=/^#{lv1}/
+ lv2=x[1] ||='2~ '
+ lv[2]=/^#{lv2}/
+ lv3=x[2] ||='3~ '
+ lv[3]=/^#{lv3}/
+ lv4=x[3] ||='4~ '
+ lv[4]=/^#{lv4}/
+ lv5=x[4] ||='5~ '
+ lv[5]=/^#{lv5}/
+ lv6=x[5] ||='6~ '
+ lv[6]=/^#{lv6}/
+ lv
+ end
+ def num_top
+ @h['num_top']
+ end
+ def breaks
+ pagebreaks=((@h['breaks'] =~/;/) \
+ ? (@h['breaks'].split(/;\s*/))
+ : [ @h['breaks'] ])
+ page_new,page_break,page_line=nil,nil,nil
+ pagebreaks.each do |x|
+ page_new=x[/(:?[\dA-C],?)+/] if x=~/new|clear/
+ page_break=x[/(:?[\dA-C],?)+/] if x =~/break/
+ page_line=x[/(:?[\dA-C],?)+/] if x =~/line/
+ end
+ { page_new: page_new, page_break: page_break, page_line: page_line }
+ end
+ def language
+ l=if @h['language'] && (@h['language']=~/\S{2,}/)
+ ((@h['language'] =~/,/) \
+ ? (@h['language'].split(/,\s*/))
+ : [ @h['language'] ])
+ else [ 'en' ]
+ end
+ end
+ def bold
+ m=@h['bold']
+ i=(m=~/\/i$/)? 'i' : ''
+ z=if m
+ x=m.gsub(/^\/(.+?)\/i?/,'\1').
+ gsub(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided
+ rgx='\b(' + x + ')\b'
+ y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/))
+ { str: '\b(?:' + x + ')\b', regx: y, i: i }
+ else nil
+ end
+ end
+ def italics
+ m=@h['italics']
+ i=((m=~/\/i$/) ? 'i' : '')
+ z=if m
+ x=m.gsub(/^\/(.+?)\/i?/,'\1').
+ gsub(/\((?:\?:)?/,'(?:') # avoid need to escape use of brackets within regex provided
+ rgx='\b(' + x + ')\b'
+ y=((i =~/i/) ? (/#{rgx}/i) : (/#{rgx}/))
+ { str: '\b(?:' + x + ')\b', regx: y, i: i }
+ else nil
+ end
+ end
+ def emphasis
+ if @h['emphasis'] =~/bold/ then 'bold'
+ elsif @h['emphasis'] =~/italics?/ then 'italics'
+ elsif @h['emphasis'] =~/under(?:line|score)/ then 'underscore'
+ else nil
+ end
+ end
+ def substitute
+ m=@h['substitute']
+ z=if m
+ w=m.scan(/\/(.+?)\/(i?,)\s*'(.+?)'(?:\s+|\s*;\s*|$)/)
+ arr_hash=[]
+ matches=''
+ w.each do |x|
+ c=(x[1] =~/[i],/) ? :i : :s
+ matches=matches + x[0].gsub(/([${}])/,'\\\\\1') + '|'
+ arr_hash << {
+ match: x[0].gsub(/([${}])/,'\\\\\1'),
+ replace: x[2],
+ case_s: c
+ }
+ end
+ matches.chop!
+ { match_and_replace: arr_hash, matches: matches }
+ else nil
+ end
+ end
+ def plaintext_wrap
+ if @h['plaintext_wrap'].to_s =~/\d\d+/ \
+ and @h['plaintext_wrap'].to_i > 19 \
+ and @h['plaintext_wrap'].to_i < 201
+ @h['plaintext_wrap'].to_i
+ else nil
+ end
+ end
+ def omit
+ m=@h['omit']
+ @m=m ? (m.split(/,\s+/)) : nil
+ def list
+ @m
+ end
+ self
+ end
+ def ocn?
+ (omit.list.inspect =~/"ocn"/) \
+ ? :off
+ : :na
+ end
+ def toc?
+ (omit.list.inspect =~/"toc"/) \
+ ? :off
+ : :na
+ end
+ def manifest?
+ (omit.list.inspect =~/"manifest"/) \
+ ? :off
+ : :na
+ end
+ def links_to_manifest?
+ (omit.list.inspect =~/"manifest_links"|"links_to_manifest"/) \
+ ? :off
+ : :na
+ end
+ def metadata?
+ (omit.list.inspect =~/"metadata"/) \
+ ? :off
+ : :na
+ end
+ def minitoc?
+ (omit.list.inspect =~/"minitoc"/) \
+ ? :off
+ : :na
+ end
+ def html_minitoc?
+ (omit.list.inspect =~/"html_minitoc"/) \
+ ? :off
+ : :na
+ end
+ def html_top_band?
+ (omit.list.inspect =~/"html_top_band"/) \
+ ? :off
+ : :na
+ end
+ def html_navigation?
+ (omit.list.inspect =~/"html_navigation"/) \
+ ? :off
+ : :na
+ end
+ def html_navigation_bar?
+ (omit.list.inspect =~/"html_navigation_bar"/) \
+ ? :off
+ : :na
+ end
+ def segsubtoc?
+ (omit.list.inspect =~/"segsubtoc"/) \
+ ? :off
+ : :na
+ end
+ def search_form?
+ (omit.list.inspect =~/"search_form"/) \
+ ? :off
+ : :na
+ end
+ def html_search_form?
+ (omit.list.inspect =~/"html_search_form"/) \
+ ? :off
+ : :na
+ end
+ def html_right_pane?
+ (omit.list.inspect =~/"html_right_column"|"html_right_pane"/) \
+ ? :off
+ : :na
+ end
+ def manifest_minitoc?
+ (omit.list.inspect =~/"manifest_minitoc"/) \
+ ? :off
+ : :na
+ end
+ def cover_image?
+ (omit.list.inspect =~/"cover_image"/) \
+ ? :off
+ : :na
+ end
+ def home_button_image?
+ (omit.list.inspect =~/"home_button_image"/) \
+ ? :off
+ : :na
+ end
+ def texpdf_font
+ def main
+ @h['texpdf_font'] \
+ && (@h['texpdf_font']=~/\S{3,}/) \
+ ? @h['texpdf_font']
+ : @env.font.texpdf.main
+ end
+ def sans # not used
+ @h['texpdf_font_sans'] \
+ && (@h['texpdf_font_sans']=~/\S{3,}/) \
+ ? @h['texpdf_font_sans']
+ : @env.font.texpdf.sans
+ end
+ def serif # not used
+ @h['texpdf_font_serif'] \
+ && (@h['texpdf_font_serif']=~/\S{3,}/) \
+ ? @h['texpdf_font_serif']
+ : @env.font.texpdf.serif
+ end
+ def mono
+ @h['texpdf_font_mono'] \
+ && (@h['texpdf_font_mono']=~/\S{3,}/) \
+ ? @h['texpdf_font_mono']
+ : @env.font.texpdf.mono
+ end
+ self
+ end
+ def promo
+ @h['promo']
+ end
+ def ad
+ @h['ad']
+ end
+ def manpage
+ manpage={}
+ if @h['manpage']
+ if @h['manpage'] =~/;/m
+ man=@h['manpage'].split(/;/m)
+ man.each do |x|
+ m=(x=~/=/m) ? x.split(/=/m) : nil
+ if m
+ manpage[m[0].strip] = m[1].split(/ \. /)
+ end
+ end
+ end
+ end
+ if manpage['name']
+ manpage['name']=manpage['name'].join("\n.br\n").
+ gsub(/(-)/m,"\\\\\\1").
+ gsub(/\A/,"\n.br\n.SH NAME\n.br\n")
+ else
+ manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]'
+ end
+ if manpage['synopsis']
+ manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n").
+ gsub(/(-)/m,"\\\\\\1").
+ gsub(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n")
+ else
+ manpage['synopsis']=''
+ end
+ unless manpage['section']
+ manpage['section']=1
+ end
+ manpage
+ end
+ def get_image_dimensions(img)
+ imgk=SiSU_Env::SystemCall.new.imagemagick
+ gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ img_pth={
+ sst: @env.path.image_source_include,
+ pod: File.expand_path("../../../sisupod/image" )
+ }
+ path_img=if FileTest.file?("#{img_pth[:pod]}/#{img}")
+ "#{img_pth[:pod]}/#{img}"
+ elsif FileTest.file?("#{img_pth[:sst]}/#{img}")
+ "#{img_pth[:sst]}/#{img}"
+ else nil
+ end
+ if path_img
+ if imgk or gmgk
+ if imgk
+ imgsys=`identify #{path_img}`.strip #system call
+ elsif gmgk
+ imgsys=`gm identify #{path_img}`.strip #system call
+ end
+ w,h=/(\d+)x(\d+)/m.match(imgsys)[1,2]
+ else
+ w,h='600','800'
+ end
+ else
+ w,h=nil,nil
+ end
+ {w: w, h: h}
+ end
+ def home_button_text
+ s=if @h['home_button_text']
+ @h['home_button_text'].split(/\s*;\s*/)
+ else nil
+ end
+ #l,n=Db[:home_button],'make.home_button_text'
+ #validate_length(s,l,n)
+ end
+ def home_button_image
+ s=nil
+ s=if @h['home_button_image']
+ s=@h['home_button_image'].split(/\s*;\s*/)
+ s0=s[0] #if
+ image={}
+ s=if s0 =~/{(\S+\.(?:jpg|png|gif))(?:\s+(\d+x\d+))?\s*}(?:(http:\/\/\S+)|image)/
+ image[:home_button]=$1
+ if $2
+ image[:dimensions]=$2
+ image[:w],image[:h]=/(\d+)x(\d+)/m.match(image[:dimensions])[1,2]
+ else
+ d=get_image_dimensions(image[:home_button])
+ image[:w],image[:h]=d[:w],d[:h]
+ image[:dimensions]="#{d[:w]}x#{d[:h]}"
+ end
+ image[:link]=$3
+ image
+ end
+ else nil
+ end
+ end
+ def cover_image
+ s=nil
+ if @h['cover_image']
+ s=@h['cover_image'].split(/\s*;\s*/)
+ s=s[0] #if
+ image={}
+ if s =~/{\s*(\S+\.(?:jpg|png|gif))(?:\s+(\d+x\d+))?(?:\s+"(.+?)")?\s*}image/
+ image[:cover]=$1
+ if $2
+ image[:dimensions]=$2
+ image[:w],image[:h]=/(\d+)x(\d+)/m.match(image[:dimensions])[1,2]
+ else
+ d=get_image_dimensions(image[:cover])
+ image[:w],image[:h]=d[:w],d[:h]
+ image[:dimensions]="#{d[:w]}x#{d[:h]}"
+ end
+ image[:note]=$3
+ elsif s =~/(\S+\.(?:jpg|png|gif))/
+ image[:cover]=$1
+ d=get_image_dimensions(image[:cover])
+ image[:w],image[:h]=d[:w],d[:h]
+ image[:dimensions]="#{d[:w]}x#{d[:h]}"
+ image[:note]=nil
+ end
+ image
+ else nil
+ end
+ end
+ def footer
+ s=if @h['footer']
+ @h['footer'].split(/\s*;\s*/)
+ else nil
+ end
+ end
+ self
+ end
+ def make_links
+ @doc_links=@s.split(/\n%\s.+?$|[ ]*\n[ ]*/m)
+ def links
+ lnks,a_idx=[],0
+ @doc_links.each do |doc_link|
+ if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+ say,url=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
+ lnks[a_idx]={ say: say, url: url }
+ a_idx +=1
+ end
+ end
+ lnks
+ end
+ def append?
+ (@doc_links[0]=='+') \
+ ? :yes
+ : :no
+ end
+ self
+ end
+ end
+ class MakeHead
+ attr_accessor :pagenew,:pagebreak,:pageline,:toc,:lv1,:lv2,:lv3,:lv4,:lv5,:lv6,:num_top,:i18n,:man_section,:substitution_match_list,:bold_match_list,:italics_match_list,:emphasis_set_to,:footer_links,:home_button_links,:home_button_image,:cover_image
+ def initialize(make)
+ @make=make
+ end
+ def clear
+ @pagenew=@pagebreak=@pageline=@toc=@lv1=@lv2=@lv3=@lv4=@lv5=@lv6=@num_top=@i18n=@man_section=@footer_links=@substitution_match_list=@bold_match_list=@italics_match_list=@emphasis_set_to=@home_button_links=@home_button_image=@cover_image=nil
+ end
+ def make_instruct
+ clear
+ if defined? @make.breaks \
+ and @make.breaks[:page_new] #clearpage
+ @pagenew=@make.breaks[:page_new]
+ end
+ if defined? @make.breaks \
+ and @make.breaks[:page_break] #newpage
+ @pagebreak=@make.breaks[:page_break]
+ end
+ if defined? @make.breaks \
+ and @make.breaks[:page_line] #page line across
+ @pagebreak=@make.breaks[:page_line]
+ end
+ if defined? @make.headings \
+ and @make.headings
+ @toc=@make.headings[0]
+ @lv1=@make.headings[1]
+ @lv2=@make.headings[2]
+ @lv3=@make.headings[3]
+ @lv4=@make.headings[4]
+ @lv5=@make.headings[5]
+ @lv6=@make.headings[6]
+ end
+ if defined? @make.num_top \
+ and @make.num_top
+ @num_top=@make.num_top # remove @num_top
+ end
+ if defined? @make.language \
+ and @make.language[0]
+ @i18n=@make.language
+ end
+ if defined? @make.manpage \
+ and @make.manpage
+ @man_section=(defined? @make.manpage.section) \
+ ? @make.manpage.section
+ : 1
+ end
+ if defined? @make.substitute \
+ and @make.substitute
+ @substitution_match_list=@make.substitute
+ end
+ if defined? @make.bold \
+ and @make.bold
+ @bold_match_list=@make.bold
+ end
+ if defined? @make.italics \
+ and @make.italics
+ @italics_match_list=@make.italics
+ end
+ if defined? @make.emphasis \
+ and @make.emphasis
+ @emphasis_set_to=@make.emphasis
+ end
+ if defined? @make.footer \
+ and @make.footer.is_a?(Array)
+ @footer_links= { left: { say: '', url: '' }, center: { say: '', url: '' } } #already set
+ @footer_links[:left]=if @make.footer[0]=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+ say,url=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(@make.footer[0])[1,2]
+ { say: say, url: url }
+ else
+ { say: '', url: '' }
+ end
+ @footer_links[:center]=if @make.footer[1]=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+ say,url=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(@make.footer[1])[1,2]
+ { say: say, url: url }
+ else
+ { say: '', url: '' }
+ end
+ @footer_links
+ else #already set
+ @footer_links= { left: { say: '', url: '' }, center: { say: '', url: '' } }
+ end
+ if defined? @make.home_button_text \
+ and @make.home_button_text.is_a?(Array)
+ a_idx=0
+ @home_button_links=[]
+ @make.home_button_text.each do |doc_link|
+ if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+ say,url=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
+ @home_button_links[a_idx]= { say: say, url: url }
+ a_idx +=1
+ end
+ end
+ @home_button_links
+ end
+ if defined? @make.home_button_image \
+ and @make.home_button_image.is_a?(Hash)
+ @home_button_image=@make.home_button_image
+ end
+ if defined? @make.cover_image \
+ and @make.cover_image.is_a?(Hash)
+ @cover_image=@make.cover_image
+ end
+ { pagenew: @pagenew,
+ pagebreak: @pagebreak,
+ pageline: @pageline,
+ toc: @toc,
+ lv1: @lv1,
+ lv2: @lv2,
+ lv3: @lv3,
+ lv4: @lv4,
+ lv5: @lv5,
+ lv6: @lv6,
+ num_top: @num_top,
+ i18n: @i18n,
+ emphasis_set_to: @emphasis_set_to,
+ bold_match_list: @bold_match_list,
+ italics_match_list: @italics_match_list,
+ substitution_match_list: @substitution_match_list,
+ man_section: @man_section,
+ footer_links: @footer_links,
+ home_button_links: @home_button_links,
+ home_button_image: @home_button_image,
+ cover_image: @cover_image,
+ }
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v3/particulars.rb b/lib/sisu/v5/particulars.rb
index ca77074c..7cc54737 100644
--- a/lib/sisu/v3/particulars.rb
+++ b/lib/sisu/v5/particulars.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/particulars.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/particulars.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -207,8 +207,14 @@ module SiSU_Particulars
@nametags_map=SiSU_DAL::Source.new(opt).get_map_nametags
self
rescue
- SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
- __LINE__.to_s + ':' + __FILE__
+ if @md
+ SiSU_Errors::InfoError.new($!,$@,@md.opt.cmd,@md.opt.fnl).error do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ else
+ SiSU_Errors::InfoError.new($!,$@,opt.cmd,opt.fnl).error do
+ __LINE__.to_s + ':' + __FILE__
+ end
end
end
end
diff --git a/lib/sisu/v3/plaintext.rb b/lib/sisu/v5/plaintext.rb
index 898b355c..9980b170 100644
--- a/lib/sisu/v3/plaintext.rb
+++ b/lib/sisu/v5/plaintext.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/plaintext.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -77,7 +77,7 @@ module SiSU_Plaintext
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
- puts "#{sf} not a processed file type"
+ puts "#{sf} not a processed file type"
end
end
def read
@@ -105,7 +105,6 @@ module SiSU_Plaintext
end
#wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
SiSU_Plaintext::Source::Scroll.new(md,dal_array,wrap_width).songsheet
- SiSU_Env::InfoSkin.new(md).select #watch
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -122,7 +121,7 @@ module SiSU_Plaintext
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@env=SiSU_Env::InfoEnv.new(@md.fns)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@tab="\t"
@@endnotes_=case md.opt.mod.inspect
when /--footnote/; false
@@ -188,9 +187,8 @@ WOK
end
end
def plaintext_tail
- SiSU_Env::InfoSkin.new(@md).select
# env=SiSU_Env::InfoEnv.new(@md.fns)
- vz=SiSU_Env::GetInit.instance.skin
+ vz=SiSU_Viz::Defaults.new
base_url="#{@env.url.root}/#{@md.fnb}"
generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
lastdone="Last Generated on: #{Time.now}"
@@ -365,7 +363,8 @@ WOK
sp=' '
ln='-'
@plaintext[:body] <<=if dob.obj==Mx[:br_page] \
- or dob.obj==Mx[:br_page_new]
+ or dob.obj==Mx[:br_page_new] \
+ or dob.obj==Mx[:br_page_line]
"#{@br}#{ln*40}#{@br*2}"
elsif dob.obj ==Mx[:br_obj]
"#{@br}#{sp*20}* * *#{@br*2}"
diff --git a/lib/sisu/v3/plaintext_format.rb b/lib/sisu/v5/plaintext_format.rb
index 0761260a..2d7850e0 100644
--- a/lib/sisu/v3/plaintext_format.rb
+++ b/lib/sisu/v5/plaintext_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/plaintext_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -92,7 +92,7 @@ module SiSU_PlaintextFormat
@txt=@txt.gsub(rgx,'') if @txt =~rgx
rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
@txt=@txt.gsub(rgx,'\1') if @txt =~rgx
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def scr_endnote_body
"<endnote>#{@txt}</endnote> "
diff --git a/lib/sisu/v3/po4a.rb b/lib/sisu/v5/po4a.rb
index 6ea61e10..b3bcc81f 100644
--- a/lib/sisu/v3/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/po4a.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -153,7 +153,6 @@ module SiSU_Po4a
else 78
end
SiSU_Po4a::Source::Scroll.new(fn,@dal_array_lang_src,@dal_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
- SiSU_Env::InfoSkin.new(md).select #watch
end
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
@@ -173,8 +172,8 @@ module SiSU_Po4a
@md=(md_trn.nil?) \
? md_src
: md_trn
- @brace_url=SiSU_Viz::Skin.new.url_decoration
- @vz=SiSU_Env::GetInit.instance.skin
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
+ @vz=SiSU_Viz::Defaults.new
@tab="\t"
@@endnotes_=(@md.opt.mod.inspect =~/--endnote/) ? true : false # --footnote
@br=(@md.opt.mod.inspect =~/--dos/) ? "\r\n" : "\n" # --unix
@@ -294,15 +293,14 @@ GSUB
"#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
'msgid ""',
meta_src.metadata_tags.classify.head,
- meta_src.metadata_tags.classify.relation,
meta_src.metadata_tags.classify.subject,
meta_src.metadata_tags.classify.topic_register,
- meta_src.metadata_tags.classify.type,
- meta_src.metadata_tags.classify.identifier,
meta_src.metadata_tags.classify.loc,
meta_src.metadata_tags.classify.dewey,
- meta_src.metadata_tags.classify.oclc,
- meta_src.metadata_tags.classify.isbn,
+ meta_src.metadata_tags.notes.relation,
+ meta_src.metadata_tags.notes.type,
+ meta_src.metadata_tags.identifier.oclc,
+ meta_src.metadata_tags.identifier.isbn,
'msgstr ""',
]
w << [
@@ -331,7 +329,6 @@ GSUB
meta_src.processing_tags.make.bold,
meta_src.processing_tags.make.italics,
meta_src.processing_tags.make.texpdf_font,
- meta_src.processing_tags.make.skin,
'msgstr ""',
]
w.each do |y|
@@ -424,26 +421,24 @@ GSUB
"#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
'msgid ""',
meta_src.metadata_tags.classify.head,
- meta_src.metadata_tags.classify.relation,
meta_src.metadata_tags.classify.subject,
meta_src.metadata_tags.classify.topic_register,
- meta_src.metadata_tags.classify.type,
- meta_src.metadata_tags.classify.identifier,
meta_src.metadata_tags.classify.loc,
meta_src.metadata_tags.classify.dewey,
- meta_src.metadata_tags.classify.oclc,
- meta_src.metadata_tags.classify.isbn,
+ meta_src.metadata_tags.notes.relation,
+ meta_src.metadata_tags.notes.type,
+ meta_src.metadata_tags.identifier.oclc,
+ meta_src.metadata_tags.identifier.isbn,
'msgstr ""',
meta_trn.metadata_tags.classify.head,
- meta_trn.metadata_tags.classify.relation,
meta_trn.metadata_tags.classify.subject,
meta_trn.metadata_tags.classify.topic_register,
- meta_trn.metadata_tags.classify.type,
- meta_trn.metadata_tags.classify.identifier,
meta_trn.metadata_tags.classify.loc,
meta_trn.metadata_tags.classify.dewey,
- meta_trn.metadata_tags.classify.oclc,
- meta_trn.metadata_tags.classify.isbn,
+ meta_trn.metadata_tags.notes.relation,
+ meta_trn.metadata_tags.notes.type,
+ meta_trn.metadata_tags.identifier.oclc,
+ meta_trn.metadata_tags.identifier.isbn,
]
w << [
"#. #{@po4a_identify_type} - metadata: date",
@@ -479,7 +474,6 @@ GSUB
meta_src.processing_tags.make.bold,
meta_src.processing_tags.make.italics,
meta_src.processing_tags.make.texpdf_font,
- meta_src.processing_tags.make.skin,
'msgstr ""',
meta_trn.processing_tags.make.language,
meta_trn.processing_tags.make.headings,
@@ -489,7 +483,6 @@ GSUB
meta_trn.processing_tags.make.bold,
meta_trn.processing_tags.make.italics,
meta_trn.processing_tags.make.texpdf_font,
- meta_trn.processing_tags.make.skin,
]
w.each do |y|
z=''
diff --git a/lib/sisu/v3/po4a_set.rb b/lib/sisu/v5/po4a_set.rb
index 594c62bc..042bbaa0 100644
--- a/lib/sisu/v3/po4a_set.rb
+++ b/lib/sisu/v5/po4a_set.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/po4a_set.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a_set.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -255,7 +255,6 @@ WOK
when /^#{Mx[:meta_o]}(bold)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(italics|itali[sz]e)#{Mx[:meta_c]}\s*(.+?)$/; header('italicize',$2,'process','instruct')
when /^#{Mx[:meta_o]}(vocabulary|wordlist)#{Mx[:meta_c]}\s*(.+?)$/; header('vocabulary',$2,'process','instruct')
- when /^#{Mx[:meta_o]}(skin)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(css|stylesheet)#{Mx[:meta_c]}\s*(.+?)$/; header('css',$2,'process','instruct')
when /^#{Mx[:meta_o]}(links)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(prefix)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct') #add a & b
diff --git a/lib/sisu/v3/prog_text_translation.rb b/lib/sisu/v5/prog_text_translation.rb
index ee481d10..b35741c1 100644
--- a/lib/sisu/v3/prog_text_translation.rb
+++ b/lib/sisu/v5/prog_text_translation.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/prog_text_translation.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/prog_text_translation.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/qrcode.rb b/lib/sisu/v5/qrcode.rb
index a730b832..6d93cd64 100644
--- a/lib/sisu/v3/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/qrcode.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/qrcode.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -81,7 +81,6 @@ module SiSU_QRcode
begin
@env=SiSU_Env::InfoEnv.new(@opt.fns)
@md=SiSU_Param::Parameters.new(@opt).get
- SiSU_Env::InfoSkin.new(@md).select
xbrowser=@env.program.web_browser
browser=@env.program.console_web_browser
unless @opt.cmd =~/q/
@@ -115,7 +114,7 @@ module SiSU_QRcode
l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
@language=l[:n]
@translate=SiSU_Translate::Source.new(@md,@language)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@f.make_path(@f.output_path.qrcode.dir)
end
def output_metadata
@@ -529,26 +528,6 @@ WOK
id,info=@translate.digitized_by,@md.creator.digitized_by
metadata(id,info)
end
- if defined? @md.classify.subject \
- and @md.classify.subject=~/\S+/
- id,info=@translate.subject,@md.classify.subject
- metadata(id,info)
- end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/
- id,info=@translate.description,@md.notes.description
- metadata(id,info)
- end
- if defined? @md.notes.abstract \
- and @md.notes.abstract=~/\S+/
- id,info=@translate.abstract,@md.notes.abstract
- metadata(id,info)
- end
- if defined? @md.type \
- and @md.type=~/\S+/ #dc
- id,info=@translate.type,@md.type
- metadata(id,info)
- end
if defined? @md.rights.all \
and @md.rights.all=~/\S+/ #dc
id,info=@translate.rights,@md.rights.all
@@ -597,34 +576,34 @@ WOK
id,info=@translate.language_original,@md.original.language
metadata(id,info)
end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/
- id,info=@transate.format,@md.classify.format
+ if defined? @md.classify.subject \
+ and @md.classify.subject=~/\S+/
+ id,info=@translate.subject,@md.classify.subject
metadata(id,info)
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/
- id,info=@translate.identifier,@md.classify.identifier
+ if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ id,info=@translate.keywords,@md.classify.keywords
metadata(id,info)
end
- if defined? @md.original.source \
- and @md.original.source=~/\S+/
- id,info=@translate.source,@md.original.source
+ if defined? @md.classify.loc \
+ and @md.classify.loc=~/\S+/
+ id,info=@translate.cls_loc,@md.classify.loc
metadata(id,info)
end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/
- id,info=@translate.relation,@md.classify.relation
+ if defined? @md.classify.dewey \
+ and @md.classify.dewey=~/\S+/
+ id,info=@translate.cls_dewey,@md.classify.dewey
metadata(id,info)
end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/
- id,info=@translate.coverage,@md.classify.coverage
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/
+ id,info=@translate.description,@md.notes.description
metadata(id,info)
end
- if defined? @md.classify.keywords \
- and @md.classify.keywords=~/\S+/
- id,info=@translate.keywords,@md.classify.keywords
+ if defined? @md.notes.abstract \
+ and @md.notes.abstract=~/\S+/
+ id,info=@translate.abstract,@md.notes.abstract
metadata(id,info)
end
if defined? @md.notes.comment \
@@ -632,30 +611,34 @@ WOK
id,info=@translate.comments,@md.notes.comment
metadata(id,info)
end
- if defined? @md.classify.loc \
- and @md.classify.loc=~/\S+/
- id,info=@translate.cls_loc,@md.classify.loc
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/
+ id,info=@translate.coverage,@md.notes.coverage
metadata(id,info)
end
- if defined? @md.classify.dewey \
- and @md.classify.dewey=~/\S+/
- id,info=@translate.cls_dewey,@md.classify.dewey
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/
+ id,info=@translate.relation,@md.notes.relation
metadata(id,info)
end
- if defined? @md.classify.oclc \
- and @md.classify.oclc=~/\S+/
- id,info=@translate.cls_oclc,@md.classify.oclc
- @manifest[:txt] << %{#{id}:\n}
- @manifest[:txt] << %{#{info}\n}
- end
- if defined? @md.classify.pg \
- and @md.classify.pg=~/\S+/
- id,info=@translate.cls_gutenberg,@md.classify.pg
+ #if defined? @md.notes.source \
+ #and @md.notes.source=~/\S+/
+ # id,info=@translate.source,@md.notes.source
+ # metadata(id,info)
+ #end
+ #if defined? @md.notes.history \
+ #and @md.notes.history=~/\S+/
+ # id,info=@translate.history,@md.notes.history
+ # metadata(id,info)
+ #end
+ if defined? @md.notes.type \
+ and @md.notes.type=~/\S+/ #dc
+ id,info=@translate.type,@md.type
metadata(id,info)
end
- if defined? @md.classify.isbn \
- and @md.classify.isbn=~/\S+/
- id,info=@translate.cls_isbn,@md.classify.isbn
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/
+ id,info=@transate.format,@md.notes.format
metadata(id,info)
end
if defined? @md.notes.prefix_a \
@@ -668,6 +651,22 @@ WOK
id,info=@translate.prefix_b,@md.notes.prefix_b
metadata(id,info)
end
+ if defined? @md.original.source \
+ and @md.original.source=~/\S+/
+ id,info=@translate.source,@md.original.source
+ metadata(id,info)
+ end
+ if defined? @md.identifier.oclc \
+ and @md.identifier.oclc=~/\S+/
+ id,info=@translate.cls_oclc,@md.identifier.oclc
+ @manifest[:txt] << %{#{id}:\n}
+ @manifest[:txt] << %{#{info}\n}
+ end
+ if defined? @md.identifier.isbn \
+ and @md.identifier.isbn=~/\S+/
+ id,info=@translate.cls_isbn,@md.identifier.isbn
+ metadata(id,info)
+ end
if defined? @md.topic_register_array \
and @md.topic_register_array.length > 0
@manifest[:txt] << %{#{@translate.topic_register}:\n}
@@ -711,7 +710,7 @@ WOK
def check_output(data)
begin
id,file='',''
- vz=SiSU_Env::GetInit.instance.skin
+ vz=SiSU_Viz::Defaults.new
@f=SiSU_Env::FileOp.new(@md) #.base_filename
url=@f.output_path.base.url
@en_manifest=if @env.output_dir_structure.by_language_code?
diff --git a/lib/sisu/v3/relaxng.rb b/lib/sisu/v5/relaxng.rb
index 0981692e..39d6bde9 100644
--- a/lib/sisu/v3/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/relaxng.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/relaxng.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -984,7 +984,6 @@ start =
| element links { text }
| element markup { text }
| element rights { text }
- | element skin { xsd:NCName }
| element subject { text }
| element title { text }
| element type { xsd:NCName }
@@ -1035,7 +1034,6 @@ start =
| element links { text }
| element markup { text }
| element rights { text }
- | element skin { xsd:NCName }
| element subject { text }
| element title { text }
| element type { xsd:NCName }
@@ -1108,7 +1106,6 @@ start =
| element links { text }
| element markup { text }
| element rights { text }
- | element skin { xsd:NCName }
| element subject { text }
| element title { text }
| element type { xsd:NCName }
diff --git a/lib/sisu/v3/remote.rb b/lib/sisu/v5/remote.rb
index 4eecac50..3a560ae1 100644
--- a/lib/sisu/v3/remote.rb
+++ b/lib/sisu/v5/remote.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/remote.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/remote.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -68,9 +68,9 @@ module SiSU_Remote
@opt=opt
@dir=SiSU_Env::InfoEnv.new(@opt.fns)
@put=(@opt.fns =~/\.ssm\.sst$/) \
- ? @opt.fns.gsub(/(.+)?\.ssm\.sst$/,'\1.ssm')
- : @opt.fns
- @remote=SiSU_Env::InfoRemote.new(@opt)
+ ? opt.fns.gsub(/(.+)?\.ssm\.sst$/,'\1.ssm')
+ : opt.fns
+ @remote=SiSU_Env::InfoRemote.new(opt)
end
def rsync
SiSU_Screen::Ansi.new(@opt.cmd,'Remote placement ->',@put).dark_grey_title_hi unless @opt.cmd =~/q/
@@ -90,7 +90,7 @@ module SiSU_Remote
end
def rsync_harvest
SiSU_Screen::Ansi.new(@opt.cmd,'Remote placement metadata harvest ->','rsync_harvest').dark_grey_title_hi unless @opt.cmd =~/q/
- @remote.rsync_harvest
+ @remote.rsync.site_harvest
end
def scp
SiSU_Screen::Ansi.new(@opt.cmd,'Remote placement ->',@put).dark_grey_title_hi unless @opt.cmd =~/q/
@@ -116,7 +116,6 @@ module SiSU_Remote
require 'pp'
require_relative 'composite' # composite.rb
@rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
- @rgx_skin=/@skin:\s+(\S+)/
threads=[]
for requested_page in @get_s
re_fnb=/((?:https?|file):\/\/[^\/ ]+?\/[^\/ ]+?)\/\S+?\/([^\/]+?)\.ss(t)/ #revisit and remove DO
@@ -125,14 +124,11 @@ module SiSU_Remote
raise "#{url} not found" unless f
base_uri,fnb,instr=re_fnb.match(url)[1..3] if re_fnb
imagedir=base_uri + '/_sisu/image' #check on
- doc_skin_dir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.sst$/.match(url).captures.join + '/_sisu/skin/doc'
downloaded_file=File.new("#{fnb}.-sst",'w+')
image_download_url=SiSU_Assemble::RemoteImage.new.image(imagedir)
images=[]
- skin=SiSU_Assemble::RemoteImage.new.image(doc_skin_dir)
f.collect.each do |r| # work area
unless r =~/^%+\s/
- skin << r.scan(@rgx_skin).uniq if r =~@rgx_skin
if r !~/^%+\s/ \
and r =~@rgx_image
images << r.scan(@rgx_image).uniq
@@ -140,10 +136,6 @@ module SiSU_Remote
end
downloaded_file << r
end
- if skin \
- and skin.length > 0
- SiSU_Assemble::RemoteImage.new.download_doc_skin(skin)
- end
if images \
and images.length > 1
images=images.flatten.uniq
diff --git a/lib/sisu/v3/response.rb b/lib/sisu/v5/response.rb
index a4849840..6d167ab6 100644
--- a/lib/sisu/v3/response.rb
+++ b/lib/sisu/v5/response.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/response.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/response.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/rexml.rb b/lib/sisu/v5/rexml.rb
index 4aedfe23..5a30734f 100644
--- a/lib/sisu/v3/rexml.rb
+++ b/lib/sisu/v5/rexml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/rexml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/rexml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/screen_text_color.rb b/lib/sisu/v5/screen_text_color.rb
index dde1d338..ebd954ae 100644
--- a/lib/sisu/v3/screen_text_color.rb
+++ b/lib/sisu/v5/screen_text_color.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/screen_text_color.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/screen_text_color.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -72,12 +72,12 @@ module SiSU_Screen
@cmd,@txt=cmd,txt
@color_instruct=txt[0]
flag=SiSU_Env::InfoProcessingFlag.new
- if @cmd
+ if cmd
#set default colors on or off -c acts as toggle against this default, if default is off -c turns on, if default is on -c turns off
@use_color=(flag.color) \
- ? ((@cmd =~/c/) ? false : true)
- : ((@cmd =~/c/) ? true : false)
- if @cmd =~/k/ then @use_color=false # useful color off switch, however, k may be used for something else in future
+ ? ((cmd =~/c/) ? false : true)
+ : ((cmd =~/c/) ? true : false)
+ if cmd =~/k/ then @use_color=false # useful color off switch, however, k may be used for something else in future
end
else @use_color=false
end
@@ -337,6 +337,9 @@ module SiSU_Screen
def green_hi_blue
puts %{#{@cX.green_hi}#{@cX.black}#{@txt[0]}#{@cX.off*2} #{@cX.blue}#{@txt[1]}#{@cX.off}}
end
+ def blue_title_hi
+ puts %{#{@cX.blue_hi}#{@txt[0]}#{@cX.off*2} #{@cX.blue}#{@txt[1]}#{@cX.off}}
+ end
def grey_title_hi
puts %{#{@cX.grey_hi}#{@cX.black}#{@txt[0]}#{@cX.off*2} #{@cX.blue}#{@txt[1]}#{@cX.off}}
end
@@ -349,6 +352,9 @@ module SiSU_Screen
def cyan_title_hi
puts %{#{@cX.cyan_hi}#{@cX.black}#{@txt[0]}#{@cX.off*2} #{@cX.blue}#{@txt[1]}#{@cX.off}}
end
+ def cyan_hi_blue
+ puts %{#{@cX.cyan_hi}#{@cX.black}#{@txt[0]}#{@cX.off*2} #{@cX.blue}#{@txt[1]}#{@cX.off}}
+ end
def dbi_title
puts %{#{@cX.blue_hi}#{@cX.black}#{@txt[0]}#{@cX.off*2} #{@cX.cyan}#{@cX.grey}#{@txt[1]}#{@cX.off*2} #{@cX.green}#{@txt[2]}#{@cX.off}}
end
diff --git a/lib/sisu/v3/share_src.rb b/lib/sisu/v5/share_src.rb
index 3f8965c9..cb93dee2 100644
--- a/lib/sisu/v3/share_src.rb
+++ b/lib/sisu/v5/share_src.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/share_src.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/share_src.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -64,7 +64,6 @@ module SiSU_Markup
include SiSU_Source
require_relative 'sysenv' # sysenv.rb
include SiSU_Env
- pwd=Dir.pwd
class Source < SiSU_Source::SiSUpodSource
def initialize(opt,build=nil,place=nil)
super(opt,build,place)
@@ -73,15 +72,19 @@ module SiSU_Markup
def read
unless @opt.cmd =~/q/
@opt.cmd=~/[MVvz]/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'Share Document Source!',@opt.fns).green_hi_blue
- : SiSU_Screen::Ansi.new(@opt.cmd,'Share Document Source!',@opt.fns).green_title_hi
- SiSU_Screen::Ansi.new(@opt.cmd,"Copy sisu markup file to output directory","#{@opt.fno} -> #{@file.output_path.src.dir}").warn if @opt.cmd =~/[MVv]/
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'Share document markup text source',@opt.fns).cyan_hi_blue
+ : SiSU_Screen::Ansi.new(@opt.cmd,'Share document markup text source',@opt.fns).cyan_title_hi
end
if FileTest.directory?(@path_pod[:fnb])
FileUtils::mkdir_p(@file.output_path.src.dir) unless FileTest.directory?(@file.output_path.src.dir)
v=(@opt.cmd =~/M/) ? 'v' : ''
system(%{
rsync -a#{v} #{@path_pod[:fnb]} #{@file.output_path.sisupod.dir}
+ chbk=`pwd`
+ cd #{@file.output_path.sisupod.dir}
+ for I in `find -type d` ; do chmod 755 $I ; done
+ for I in `find -type f` ; do chmod 644 $I ; done
+ cd ${chbk}
})
else
SiSU_Screen::Ansi.new('',"#{@opt.fno} not available").blue_tab if @opt.cmd=~/[MVv]/
diff --git a/lib/sisu/v3/share_src_kdissert.rb b/lib/sisu/v5/share_src_kdissert.rb
index ccd76e1a..e91a3cf3 100644
--- a/lib/sisu/v3/share_src_kdissert.rb
+++ b/lib/sisu/v5/share_src_kdissert.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/share_src_kdissert.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/share_src_kdissert.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/shared_html.rb b/lib/sisu/v5/shared_html.rb
index 6e897cf6..84c89ecf 100644
--- a/lib/sisu/v3/shared_html.rb
+++ b/lib/sisu/v5/shared_html.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_html.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_html.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/shared_html_lite.rb b/lib/sisu/v5/shared_html_lite.rb
index d7302212..c01ec086 100644
--- a/lib/sisu/v3/shared_html_lite.rb
+++ b/lib/sisu/v5/shared_html_lite.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_html_lite.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_html_lite.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -81,9 +81,9 @@ module SiSU_FormatShared
else @@hname
end
@tab="\t"
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@@tablehead,@@tablefoot=[],[]
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@env=SiSU_Env::InfoEnv.new(@md.fns)
@base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html"
end
diff --git a/lib/sisu/v3/shared_images.rb b/lib/sisu/v5/shared_images.rb
index d71710df..1dc44121 100644
--- a/lib/sisu/v3/shared_images.rb
+++ b/lib/sisu/v5/shared_images.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_images.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_images.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -77,9 +77,6 @@ module SiSU_Images
def songsheet
images_set.select_sisu_base
images_set.select_with_document
- if @md.opt.cmd =~/h/
- images_set.select_with_document_skin
- end
end
def images_set
@pwd=(/(\S+?)(?:\/(?:#{Px[:lng_lst_rgx]}))?$/).match(Dir.pwd)[1]
@@ -130,39 +127,6 @@ module SiSU_Images
dest=dest_path(:image)
copy(src_path,dest,images)
end
- def select_with_document_skin
- rgx_rb_image=/["']\S*?([a-zA-Z0-9_-]+?\.(?:png|jpg|gif))["']/
- skin_source=SiSU_Env::InfoSkin.new(@md).apply
- docskin=nil
- if skin_source \
- and skin_source[:type] == :dir
- docskin_with_path="#{docskin_place}/skin_#{@env.stub_pwd}.rb"
- docskin=[docskin_with_path.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')]
- #docskin='skin_sisupod'
- end
- images=[]
- if skin_source \
- and skin_source[:name_path] #imperfect, revisit
- unless (skin_source[:name_path].nil? \
- or skin_source[:name_path].empty?)
- skinfile_array=IO.readlines(skin_source[:name_path],'')
- skinfile_array.each do |f| #% work area
- unless f =~/^%+ / #hmmm
- images << f.scan(rgx_rb_image).uniq if f =~rgx_rb_image
- #does not really discriminate, may duplicate images in sisu file, and may take images from default image pool
- end
- end
- end
- end
- src_path=unless @md.opt.f_pth[:pth] =~/\/\S+?\/sisupod\/\S+?\/sisupod\/doc/
- "#{@pwd}/_sisu/image"
- else #sisupod
- pt=/(\/\S+?\/sisupod\/\S+?\/sisupod)\/doc/.match(@md.opt.f_pth[:pth])[1]
- pt + '/image'
- end
- dest=dest_path(:image)
- copy(src_path,dest,images.flatten)
- end
def select_sisu_base
images=%w[arrow_next_red.png arrow_prev_red.png arrow_up_red.png dot_clear.png dot_white.png b_doc.png b_epub.png b_odf.png b_pdf.png b_toc.png]
src_path="#{@env.path.share}/image"
diff --git a/lib/sisu/v3/shared_markup_alt.rb b/lib/sisu/v5/shared_markup_alt.rb
index 9bceeb17..e0fec924 100644
--- a/lib/sisu/v3/shared_markup_alt.rb
+++ b/lib/sisu/v5/shared_markup_alt.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_markup_alt.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_markup_alt.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/shared_metadata.rb b/lib/sisu/v5/shared_metadata.rb
index 6fd66291..5c8c225d 100644
--- a/lib/sisu/v3/shared_metadata.rb
+++ b/lib/sisu/v5/shared_metadata.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_metadata.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_metadata.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -108,6 +108,11 @@ module SiSU_Metadata
@tag,@inf,@class=tr.digitized_by,@md.creator.digitized_by,'ext'
meta << self.meta_para
end
+ if defined? @md.creator.contributor \
+ and @md.creator.contributor=~/\S+/
+ @tag,@inf,@class=tr.contributor,@md.creator.contributor,'dc' #6
+ meta << self.meta_para
+ end
if defined? @md.rights.all \
and @md.rights.all=~/\S+/
@tag,@inf,@class=tr.rights,@md.rights.all,'dc' #15
@@ -118,24 +123,24 @@ module SiSU_Metadata
@tag,@inf,@class=tr.subject,@md.classify.subject,'dc' #3
meta << self.meta_para
end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/
- @tag,@inf,@class=tr.description,@md.notes.description,'dc' #4
+ if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ @tag,@inf,@class=tr.keywords,@md.classify.keywords,'ext'
meta << self.meta_para
end
- if defined? @md.publisher \
- and @md.publisher=~/\S+/
- @tag,@inf,@class=tr.publisher,@md.publisher,'dc' #5
+ if defined? @md.classify.loc \
+ and @md.classify.loc=~/\S+/
+ @tag,@inf,@class=tr.cls_loc,@md.classify.loc,'id'
meta << self.meta_para
end
- if defined? @md.creator.contributor \
- and @md.creator.contributor=~/\S+/
- @tag,@inf,@class=tr.contributor,@md.creator.contributor,'dc' #6
+ if defined? @md.classify.dewey \
+ and @md.classify.dewey=~/\S+/
+ @tag,@inf,@class=tr.cls_dewey,@md.classify.dewey,'id'
meta << self.meta_para
end
- if defined? @md.notes.abstract \
- and @md.notes.abstract=~/\S+/
- @tag,@inf,@class=tr.abstract,@md.notes.abstract,'ext'
+ if defined? @md.publisher \
+ and @md.publisher=~/\S+/
+ @tag,@inf,@class=tr.publisher,@md.publisher,'dc' #5
meta << self.meta_para
end
if defined? @md.date.created \
@@ -168,29 +173,24 @@ module SiSU_Metadata
@tag,@inf,@class=tr.date,@md.date.published,'dc' #7
meta << self.meta_para
end
- if defined? @md.type \
- and @md.date=~/\S+/
- @tag,@inf,@class=tr.type,@md.type,'dc' #8
+ if defined? @md.identifier.isbn \
+ and @md.identifier.isbn=~/\S+/
+ @tag,@inf,@class=tr.cls_isbn,@md.identifier.isbn,'id'
meta << self.meta_para
end
- if defined? @md.classify.loc \
- and @md.classify.loc=~/\S+/
- @tag,@inf,@class=tr.cls_loc,@md.classify.loc,'id'
+ if defined? @md.identifier.oclc \
+ and @md.identifier.oclc=~/\S+/
+ @tag,@inf,@class=tr.cls_oclc,@md.identifier.oclc,'id'
meta << self.meta_para
end
- if defined? @md.classify.dewey \
- and @md.classify.dewey=~/\S+/
- @tag,@inf,@class=tr.cls_dewey,@md.classify.dewey,'id'
- meta << self.meta_para
- end
- if defined? @md.classify.pg \
- and @md.classify.pg=~/\S+/
- @tag,@inf,@class=tr.cls_gutenberg,@md.classify.pg,'id'
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/
+ @tag,@inf,@class=tr.description,@md.notes.description,'dc' #4
meta << self.meta_para
end
- if defined? @md.classify.isbn \
- and @md.classify.isbn=~/\S+/
- @tag,@inf,@class=tr.cls_isbn,@md.classify.isbn,'id'
+ if defined? @md.notes.abstract \
+ and @md.notes.abstract=~/\S+/
+ @tag,@inf,@class=tr.abstract,@md.notes.abstract,'ext'
meta << self.meta_para
end
if defined? @md.notes.comment \
@@ -198,6 +198,36 @@ module SiSU_Metadata
@tag,@inf,@class=tr.comments,@md.notes.comment,'ext'
meta << self.meta_para
end
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/
+ @tag,@inf,@class=tr.coverage,@md.notes.coverage,'dc' #14
+ meta << self.meta_para
+ end
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/
+ @tag,@inf,@class=tr.relation,@md.notes.relation,'dc' #13
+ meta << self.meta_para
+ end
+ #if defined? @md.notes.source \
+ #and @md.notes.source=~/\S+/
+ # @tag,@inf,@class=tr.source,@md.notes.source,'dc' #11
+ # meta << self.meta_para
+ #end
+ if defined? @md.notes.history \
+ and @md.notes.history=~/\S+/
+ @tag,@inf,@class=tr.type,@md.notes.history,'dc' #8
+ meta << self.meta_para
+ end
+ if defined? @md.notes.type \
+ and @md.notes.type=~/\S+/
+ @tag,@inf,@class=tr.type,@md.notes.type,'dc' #8
+ meta << self.meta_para
+ end
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/
+ @tag,@inf,@class=tr.format,@md.notes.format,'dc' #9
+ meta << self.meta_para
+ end
if defined? @md.notes.prefix_a \
and @md.notes.prefix_a=~/\S+/
@tag,@inf,@class=tr.prefix_a,@md.notes.prefix_a,'inf'
@@ -208,11 +238,6 @@ module SiSU_Metadata
@tag,@inf,@class=tr.prefix_b,@md.notes.prefix_b,'inf'
meta << self.meta_para
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/
- @tag,@inf,@class=tr.identifier,@md.classify.identifier,'dc' #10
- meta << self.meta_para
- end
if defined? @md.original.source \
and @md.original.source=~/\S+/
@tag,@inf,@class=tr.source,@md.original.source,'dc' #11
@@ -228,26 +253,6 @@ module SiSU_Metadata
@tag,@inf,@class=tr.language_original,@md.original.language,'ext'
meta << self.meta_para
end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/
- @tag,@inf,@class=tr.format,@md.classify.format,'dc' #9
- meta << self.meta_para
- end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/
- @tag,@inf,@class=tr.relation,@md.classify.relation,'dc' #13
- meta << self.meta_para
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/
- @tag,@inf,@class=tr.coverage,@md.classify.coverage,'dc' #14
- meta << self.meta_para
- end
- if defined? @md.classify.keywords \
- and @md.classify.keywords=~/\S+/
- @tag,@inf,@class=tr.keywords,@md.classify.keywords,'ext'
- meta << self.meta_para
- end
if @display_heading
@tag,@inf=%{<b><u>Version Information</u></b>},''
meta << self.meta_para
@@ -267,11 +272,6 @@ module SiSU_Metadata
@tag,@inf,@class='Source Digest',"#{@md.dgst[0]} #{@md.dgst[1]}",'src'
meta << self.meta_para
end
- if defined? @md.dgst_skin \
- and @md.dgst_skin.is_a?(Array)
- @tag,@inf,@class='Skin Digest',"#{@md.dgst_skin[0]} #{@md.dgst_skin[1]}",'src'
- meta << self.meta_para
- end
if @display_heading
@tag,@inf=%{<b><u>Generated</u></b>},''
meta << self.meta_para
@@ -362,13 +362,6 @@ module SiSU_Metadata
else nil
end
end
- def skin
- if defined? @md.make.skin \
- and @md.make.skin
- ' :skin: ' + @md.make.skin
- else nil
- end
- end
self
end
self
@@ -736,107 +729,19 @@ module SiSU_Metadata
end
def char_enc(str)
@s=str
+ def amp
+ if @s \
+ and @s.is_a?(String)
+ @s=@s.gsub(/&/u,'&amp;')
+ end
+ @s
+ end
def utf8
if @s \
and @s.is_a?(String)
@s=@s.gsub(/<br(?: \/)?>/u,Mx[:br_paragraph]).
- gsub(/</um,'&#60;'). # '&lt;' # &#060;
- gsub(/</um,'&#60;'). # '&lt;' # &#060;
- gsub(/>/um,'&#62;'). # '&gt;' # &#062;
- gsub(/¢/um,'&#162;'). # '&cent;' # &#162;
- gsub(/£/um,'&#163;'). # '&pound;' # &#163;
- gsub(/¥/um,'&#165;'). # '&yen;' # &#165;
- gsub(/§/um,'&#167;'). # '&sect;' # &#167;
- gsub(/©/um,'&#169;'). # '&copy;' # &#169;
- gsub(/ª/um,'&#170;'). # '&ordf;' # &#170;
- gsub(/«/um,'&#171;'). # '&laquo;' # &#171;
- gsub(/®/um,'&#174;'). # '&reg;' # &#174;
- gsub(/°/um,'&#176;'). # '&deg;' # &#176;
- gsub(/±/um,'&#177;'). # '&plusmn;' # &#177;
- gsub(/²/um,'&#178;'). # '&sup2;' # &#178;
- gsub(/³/um,'&#179;'). # '&sup3;' # &#179;
- gsub(/µ/um,'&#181;'). # '&micro;' # &#181;
- gsub(/¶/um,'&#182;'). # '&para;' # &#182;
- gsub(/¹/um,'&#185;'). # '&sup1;' # &#185;
- gsub(/º/um,'&#186;'). # '&ordm;' # &#186;
- gsub(/»/um,'&#187;'). # '&raquo;' # &#187;
- gsub(/¼/um,'&#188;'). # '&frac14;' # &#188;
- gsub(/½/um,'&#189;'). # '&frac12;' # &#189;
- gsub(/¾/um,'&#190;'). # '&frac34;' # &#190;
- gsub(/×/um,'&#215;'). # '&times;' # &#215;
- gsub(/÷/um,'&#247;'). # '&divide;' # &#247;
- gsub(/¿/um,'&#191;'). # '&iquest;' # &#191;
- gsub(/À/um,'&#192;'). # '&Agrave;' # &#192;
- gsub(/Á/um,'&#193;'). # '&Aacute;' # &#193;
- gsub(/Â/um,'&#194;'). # '&Acirc;' # &#194;
- gsub(/Ã/um,'&#195;'). # '&Atilde;' # &#195;
- gsub(/Ä/um,'&#196;'). # '&Auml;' # &#196;
- gsub(/Å/um,'&#197;'). # '&Aring;' # &#197;
- gsub(/Æ/um,'&#198;'). # '&AElig;' # &#198;
- gsub(/Ç/um,'&#199;'). # '&Ccedil;' # &#199;
- gsub(/È/um,'&#200;'). # '&Egrave;' # &#200;
- gsub(/É/um,'&#201;'). # '&Eacute;' # &#201;
- gsub(/Ê/um,'&#202;'). # '&Ecirc;' # &#202;
- gsub(/Ë/um,'&#203;'). # '&Euml;' # &#203;
- gsub(/Ì/um,'&#204;'). # '&Igrave;' # &#204;
- gsub(/Í/um,'&#205;'). # '&Iacute;' # &#205;
- gsub(/Î/um,'&#206;'). # '&Icirc;' # &#206;
- gsub(/Ï/um,'&#207;'). # '&Iuml;' # &#207;
- gsub(/Ð/um,'&#208;'). # '&ETH;' # &#208;
- gsub(/Ñ/um,'&#209;'). # '&Ntilde;' # &#209;
- gsub(/Ò/um,'&#210;'). # '&Ograve;' # &#210;
- gsub(/Ó/um,'&#211;'). # '&Oacute;' # &#211;
- gsub(/Ô/um,'&#212;'). # '&Ocirc;' # &#212;
- gsub(/Õ/um,'&#213;'). # '&Otilde;' # &#213;
- gsub(/Ö/um,'&#214;'). # '&Ouml;' # &#214;
- gsub(/Ø/um,'&#216;'). # '&Oslash;' # &#216;
- gsub(/Ù/um,'&#217;'). # '&Ugrave;' # &#217;
- gsub(/Ú/um,'&#218;'). # '&Uacute;' # &#218;
- gsub(/Û/um,'&#219;'). # '&Ucirc;' # &#219;
- gsub(/Ü/um,'&#220;'). # '&Uuml;' # &#220;
- gsub(/Ý/um,'&#221;'). # '&Yacute;' # &#221;
- gsub(/Þ/um,'&#222;'). # '&THORN;' # &#222;
- gsub(/ß/um,'&#223;'). # '&szlig;' # &#223;
- gsub(/à/um,'&#224;'). # '&agrave;' # &#224;
- gsub(/á/um,'&#225;'). # '&aacute;' # &#225;
- gsub(/â/um,'&#226;'). # '&acirc;' # &#226;
- gsub(/ã/um,'&#227;'). # '&atilde;' # &#227;
- gsub(/ä/um,'&#228;'). # '&auml;' # &#228;
- gsub(/å/um,'&#229;'). # '&aring;' # &#229;
- gsub(/æ/um,'&#230;'). # '&aelig;' # &#230;
- gsub(/ç/um,'&#231;'). # '&ccedil;' # &#231;
- gsub(/è/um,'&#232;'). # '&egrave;' # &#232;
- gsub(/é/um,'&#233;'). # '&acute;' # &#233;
- gsub(/ê/um,'&#234;'). # '&circ;' # &#234;
- gsub(/ë/um,'&#235;'). # '&euml;' # &#235;
- gsub(/ì/um,'&#236;'). # '&igrave;' # &#236;
- gsub(/í/um,'&#237;'). # '&acute;' # &#237;
- gsub(/î/um,'&#238;'). # '&icirc;' # &#238;
- gsub(/ï/um,'&#239;'). # '&iuml;' # &#239;
- gsub(/ð/um,'&#240;'). # '&eth;' # &#240;
- gsub(/ñ/um,'&#241;'). # '&ntilde;' # &#241;
- gsub(/ò/um,'&#242;'). # '&ograve;' # &#242;
- gsub(/ó/um,'&#243;'). # '&oacute;' # &#243;
- gsub(/ô/um,'&#244;'). # '&ocirc;' # &#244;
- gsub(/õ/um,'&#245;'). # '&otilde;' # &#245;
- gsub(/ö/um,'&#246;'). # '&ouml;' # &#246;
- gsub(/ø/um,'&#248;'). # '&oslash;' # &#248;
- gsub(/ù/um,'&#250;'). # '&ugrave;' # &#250;
- gsub(/ú/um,'&#251;'). # '&uacute;' # &#251;
- gsub(/û/um,'&#252;'). # '&ucirc;' # &#252;
- gsub(/ü/um,'&#253;'). # '&uuml;' # &#253;
- gsub(/þ/um,'&#254;'). # '&thorn;' # &#254;
- gsub(/ÿ/um,'&#255;'). # '&yuml;' # &#255;
- gsub(/‘/um,'&#8216;'). # '&lsquo;' # &#8216;
- gsub(/’/um,'&#8217;'). # '&rsquo;' # &#8217;
- gsub(/“/um,'&#8220;'). # &ldquo; # &#8220;
- gsub(/”/um,'&#8221;'). # &rdquo; # &#8221;
- gsub(/–/um,'&#8211;'). # &ndash; # &#8211;
- gsub(/—/um,'&#8212;'). # &mdash; # &#8212;
- gsub(/∝/um,'&#8733;'). # &prop; # &#8733;
- gsub(/∞/um,'&#8734;'). # &infin; # &#8734;
- gsub(/™/um,'&#8482;'). # &trade; # &#8482;
- gsub(/✠/um,'&#10016;'). # &cross; # &#10016;
+ gsub(/</um,'&lt;').gsub(/>/um,'&gt;').
+ #gsub(/</um,'&#60;').gsub(/>/um,'&#62;').
gsub(/ /um,' '). # space identify
gsub(/ /um,' '). # space identify
gsub(/#{Mx[:br_paragraph]}/u,'<br />')
@@ -899,7 +804,8 @@ WOK
end
def xhtml_display
def meta_para
- inf_xml=char_enc(@inf).utf8
+ inf_xml=char_enc(@inf).amp
+ inf_xml=char_enc(inf_xml).utf8
%{<p class="norm">
<b>#{@tag}</b>: #{inf_xml}
</p>}
@@ -911,7 +817,7 @@ WOK
end
def odf
def meta_para
- url_brace=SiSU_Viz::Skin.new.url_decoration
+ url_brace=SiSU_Viz::Defaults.new.url_decoration
if @inf.is_a?(String)
@inf=@inf.gsub(/</,'&lt;').gsub(/>/,'&gt;').
gsub(/&lt;br(?: \/)?&gt;/,'<br />')
@@ -1204,14 +1110,6 @@ WOK
tag,inf='Source Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\}\\-\\begin\{scriptsize\}#{dgst}\\end\{scriptsize\}"
meta << meta_para(tag,inf,false)
end
- if defined? @md.dgst_skin \
- and @md.dgst_skin.is_a?(Array)
- hash_of=spec_char(@md.dgst_skin[0])
- hash_of=word_break_points(hash_of)
- dgst=number_break_points(@md.dgst_skin[1])
- tag,inf='Skin Digest',"\\begin\{footnotesize\}#{hash_of}\\end\{footnotesize\}\\-\\begin\{scriptsize\}#{dgst}\\end\{scriptsize\}"
- meta << meta_para(tag,inf,false)
- end
meta << %{#{@br}\\begin\{bfseries\}Generated \\end\{bfseries\}}
if defined? @md.generated \
and @md.generated.is_a?(Time)
@@ -1328,7 +1226,6 @@ if @md.make
@md.make.emphasis,
@md.make.plaintext_wrap,
@md.make.texpdf_font,
- @md.make.skin,
@md.make.promo,
@md.make.ad,
@md.make.manpage
diff --git a/lib/sisu/v3/shared_sem.rb b/lib/sisu/v5/shared_sem.rb
index 041448ab..4a30e26d 100644
--- a/lib/sisu/v3/shared_sem.rb
+++ b/lib/sisu/v5/shared_sem.rb
@@ -51,7 +51,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_sem.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_sem.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/shared_sisupod_source.rb b/lib/sisu/v5/shared_sisupod_source.rb
index f1eb048f..f35287de 100644
--- a/lib/sisu/v3/shared_sisupod_source.rb
+++ b/lib/sisu/v5/shared_sisupod_source.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_sisupod_source.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_sisupod_source.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -68,13 +68,13 @@ module SiSU_Source
@opt=opt
m=/.+\/(?:src\/)?(\S+)/im
@date=SiSU_Env::InfoDate.new.dt
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
+ @env=SiSU_Env::InfoEnv.new(opt.fns)
@ver=SiSU_Env::InfoVersion.instance.get_version
- @v=(@opt.cmd =~/[VM]/) ? 'v' : ''
+ @v=(opt.cmd =~/[VM]/) ? 'v' : ''
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
@file=@particulars.file
@local_path="#{@file.output_path.sisupod.dir}"
- processing_sisupod=@env.processing_path.processing_sisupod(@opt)
+ processing_sisupod=@env.processing_path.processing_sisupod(opt)
processing_sisupod.make
path_pod=processing_sisupod.paths[:sisupod]
path_pod_fnb=processing_sisupod.paths[:fnb]
@@ -82,11 +82,10 @@ module SiSU_Source
@path_pod={
fnb: path_pod_fnb,
pod: path_pod,
- doc: path_pod + '/' + Gt[:doc] + '/' + @opt.lng,
- po: path_pod + '/' + Gt[:po] + '/' + @opt.lng,
+ doc: path_pod + '/' + Gt[:doc] + '/' + opt.lng,
+ po: path_pod + '/' + Gt[:po] + '/' + opt.lng,
pot: path_pod + '/' + Gt[:pot],
conf: path_pod + '/' + Gt[:conf],
- skin: path_pod + '/' + Gt[:skin],
image: path_pod + '/' + Gt[:image],
audio: path_pod + '/' + Gt[:audio],
video: path_pod + '/' + Gt[:video],
@@ -104,33 +103,7 @@ module SiSU_Source
end
end
def directories
- SiSU_Env::InfoEnv.new.sisupod_v3(@opt)
- end
- def select_skin(skin='') #skin loading logic here
- load "#{SiSU_lib}/defaults.rb"
- @skin={}
- skin_path = [
- "#{@opt.base_path}/_sisu/skin",
- "#{@env.path.home}/.sisu/skin",
- '/etc/sisu/skin',
- "#{@path_pod[:pod]}/external_document/skin" #CHECK
- ]
- sk_doc,sk_dir="#{Gt[:doc]}/#{skin}.rb","dir/skin_#{@env.stub_pwd}.rb"
- skin_path.each do |v| #document skin priority 1
- if FileTest.file?("#{v}/#{sk_doc}")
- @skin={ name_path: "#{v}/#{sk_doc}", type: :doc }
- break
- end
- end
- unless @skin.length > 0
- skin_path.each do |v| #directory skin priority 2
- if FileTest.file?("#{v}/#{sk_dir}")
- @skin={ name_path: "#{v}/#{sk_dir}", type: :dir }
- break
- end
- end
- end
- @skin
+ SiSU_Env::InfoEnv.new.sisupod_v4(@opt)
end
def images_extract(f,images) # consider using param info
rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m
@@ -144,14 +117,12 @@ module SiSU_Source
@pwd=Dir.pwd
@rgx_rb_image=/["']\S*?([a-zA-Z0-9_-]+?\.(?:png|jpg|gif))["']/
@rgx_image=/(?:^|[^_\\])\{\s*(\S+?\.(?:png|jpg|gif))/
- @rgx_skin=/^\s+:skin:\s+(\S+)/
@rgx_doc_import=/^<<\s*(\S+?\.ss[ti])/
file_array=IO.readlines(@opt.fno,'')
- skin,images,doc_import=[],[],[]
+ images,doc_import=[],[]
doc_import_dir=@opt.sub_location
file_array.each do |f| #% work area
if f !~/^%+\s/
- skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
f=f.gsub(/<:=(\S+?)>/,'{ c_\1.png 14x14 }image') # embedded symbol (image)
if f !~/^%+\s/ \
and f =~@rgx_image
@@ -174,41 +145,15 @@ module SiSU_Source
end
end
end
- docskin=nil
- if skin \
- and skin.length > 0
- docskin=skin.pop.flatten.join
- skin_source=select_skin(docskin)
- else
- skin_source=select_skin
- end
- docskin_place="#{@path_pod[:skin]}/#{skin_source[:type].to_s}"
- FileUtils::mkdir_p(docskin_place)
- if skin_source[:type] == :dir
- docskin_with_path="#{docskin_place}/skin_#{@env.stub_pwd}.rb"
- docskin=[docskin_with_path.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')]
- docskin='skin_sisupod'
- end
- if skin_source \
- and skin_source[:name_path]
- unless skin_source[:name_path].nil? \
- or skin_source[:name_path].empty?
- if FileTest.file?(skin_source[:name_path])
- FileUtils::cp(skin_source[:name_path],"#{docskin_place}/#{docskin}.rb")
- skinfile_array=IO.readlines(skin_source[:name_path],'')
- para_images=[]
- skinfile_array.each do |f| #% work area
- unless f =~/^%+ / #hmmm
- images << f.scan(@rgx_rb_image).uniq if f =~@rgx_rb_image
- #does not really discriminate, may duplicate images in sisu file, and may take images from default image pool
- end
- end
- else STDERR.puts %{\t*WARN* did not find - "#{skin_source[:name_path]}" [#{__FILE__}:#{__LINE__}]}
- end
+ gi=SiSU_Env::GetInit.new
+ unless FileTest.file?("#{@path_pod[:conf]}/#{gi.makefile_name}")
+ if gi.makefile \
+ && FileTest.file?(gi.makefile)
+ FileUtils::mkdir_p(@path_pod[:conf]) unless FileTest.directory?(@path_pod[:conf])
+ FileUtils::cp(gi.makefile,"#{@path_pod[:conf]}/#{gi.makefile_name}")
end
+ #get images from makefile, consider placing in param
end
- #1. mapping in doc dir?
- #2. need images used by skin, scan skin??
if images \
and images.length > 1
images=images.flatten.uniq
@@ -231,7 +176,7 @@ module SiSU_Source
images=images.uniq
images.each do |i|
if FileTest.file?("#{images_pwd}/#{i}")
- FileUtils::cp("#{images_pwd}/#{i}","#{@path_pod[:image]}/#{i}") if FileTest.file?("#{images_pwd}/#{i}")
+ FileUtils::cp("#{images_pwd}/#{i}","#{@path_pod[:image]}/#{i}")
else STDERR.puts %{\t*WARN* did not find image - "#{images_pwd}/#{i}" [#{__FILE__}:#{__LINE__}]}
end
end
@@ -266,11 +211,9 @@ module SiSU_Source
cpy= :no
cpy=if f[:f] =~ /^#{@opt.f_pth[:lng_is]}\// \
or f[:f] =~ /~#{@opt.f_pth[:lng_is]}\.sst/
- p "#{@opt.base_path}/#{f[:f]} --> #{@path_pod[:doc]}/#{f[:n]}"
:yes
elsif f[:f] !~ /^(?:#{Px[:lng_lst_rgx]})\/|~(?:#{Px[:lng_lst_rgx]})\.sst/ \
and @opt.f_pth[:lng_is] == 'en'
- p "#{@opt.base_path}/#{f[:f]} --> #{@path_pod[:doc]}/#{f[:n]}"
:yes
else :no
end
@@ -294,11 +237,9 @@ module SiSU_Source
cpy= :no
cpy=if f[:f] =~ /^#{@opt.f_pth[:lng_is]}\// \
or f[:f] =~ /~#{@opt.f_pth[:lng_is]}\.sst/
- p "#{@opt.base_path}/#{f[:f]} --> #{@path_pod[:doc]}/#{f[:n]}"
:yes
elsif f[:f] !~ /^(?:#{Px[:lng_lst_rgx]})\/|~(?:#{Px[:lng_lst_rgx]})\.sst/ \
and @opt.f_pth[:lng_is] == 'en'
- p "#{@opt.base_path}/#{f[:f]} --> #{@path_pod[:doc]}/#{f[:n]}"
:yes
else :no
end
@@ -321,8 +262,6 @@ question?: should you permit the packing of multiple documents
open @opt.fns, parse file
extract from file content:
images and copy each image from whatever image source to _sisu/sisupod/sisu/_sisu/image
- skin and copy active skin from whatever source to _sisu/sisupod/sisu/_sisu/skin/doc
- extract from skin images required by skin
remove previously existing contents of _/sisu/sisupod &
make directory structure:
@@ -336,8 +275,6 @@ v3 -->
fr/content.sst
_sisu
conf
- skin/
- doc [relevant skin if any other than default]
image (ln -s ../../image)
audio (ln -s ../../audio)
video (ln -s ../../video)
@@ -351,19 +288,11 @@ v2 -->
content.sst [file content]
filename.sst [link to content.sst]
_sisu/
- skin/
- doc [relevant skin if any other than default]
image/ [all images for specific document gathered here]
sisu
_sisu
sisurc.yml
- skin/
- dir/
- doc/
- misc/
- site/
- yaml/
convert/
standard_terms/
image
diff --git a/lib/sisu/v3/shared_txt.rb b/lib/sisu/v5/shared_txt.rb
index 1ebefdd5..3401b05b 100644
--- a/lib/sisu/v3/shared_txt.rb
+++ b/lib/sisu/v5/shared_txt.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_txt.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_txt.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -207,7 +207,6 @@ module SiSU_TextUtils
when /^#{Mx[:meta_o]}(bold)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(italics|itali[sz]e)#{Mx[:meta_c]}\s*(.+?)$/; header('italicize',$2,'process','instruct')
when /^#{Mx[:meta_o]}(vocabulary|wordlist)#{Mx[:meta_c]}\s*(.+?)$/; header('vocabulary',$2,'process','instruct')
- when /^#{Mx[:meta_o]}(skin)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(css|stylesheet)#{Mx[:meta_c]}\s*(.+?)$/; header('css',$2,'process','instruct')
when /^#{Mx[:meta_o]}(links)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct')
when /^#{Mx[:meta_o]}(prefix)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'process','instruct') #add a & b
diff --git a/lib/sisu/v3/shared_xhtml.rb b/lib/sisu/v5/shared_xhtml.rb
index bb2de86c..c9534823 100644
--- a/lib/sisu/v3/shared_xhtml.rb
+++ b/lib/sisu/v5/shared_xhtml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_xhtml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_xhtml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/shared_xml.rb b/lib/sisu/v5/shared_xml.rb
index 00312a66..fe4be74e 100644
--- a/lib/sisu/v3/shared_xml.rb
+++ b/lib/sisu/v5/shared_xml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/shared_xml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_xml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -65,7 +65,7 @@ module SiSU_XML_Munge
@md=md
@sys=SiSU_Env::SystemCall.new
@dir=SiSU_Env::InfoEnv.new(@md.fns)
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
if @md.sem_tag
@ab ||=semantic_tags.default
end
@@ -376,6 +376,7 @@ module SiSU_XML_Munge
dob.obj=dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'<br />') unless dob.is==:table
dob.obj=dob.obj.gsub(/#{Mx[:br_page]}\s*/,'').
gsub(/#{Mx[:br_page_new]}\s*/,'').
+ gsub(/#{Mx[:br_page_line]}\s*/,'').
gsub(/#{Mx[:pa_non_object_no_heading]}|#{Mx[:pa_non_object_dummy_heading]}/,'').
gsub(/<[-~]#>/,'').
gsub(/href="#{Xx[:segment]}/m,'href="').
@@ -542,18 +543,6 @@ module SiSU_XML_Tags #Format
content=meta_content_clean(@md.creator.author)
@author=%{ <meta name="dc.author" content="#{content}" />\n}
end
- if defined? @md.classify.subject \
- and @md.classify.subject=~/\S+/ # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
- @rdf_subject=%{ dc.subject="#{@md.classify.subject}"\n}
- content=meta_content_clean(@md.classify.subject)
- @subject=%{ <meta name="dc.subject" content="#{content}" />\n}
- end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/ # DublinCore 4 - description
- @rdf_description=%{ dc.description="#{@md.notes.description}"\n}
- content=meta_content_clean(@md.notes.description)
- @description=%{ <meta name="dc.description" content="#{content}" />\n}
- end
if defined? @md.publisher \
and @md.publisher # DublinCore 5 - publisher (current copy published by)
@rdf_publisher=%{ dc.publisher="#{@md.publisher}"\n}
@@ -596,24 +585,54 @@ module SiSU_XML_Tags #Format
@rdf_date_modified=%{ dc.date.modified="#{@md.date.modified}"\n}
@date_modified=%{ <meta name="dc.date.modified" content="#{@md.date.modified}" #{@md.date_scheme} />\n}
end
- if defined? @md.type \
- and @md.type # DublinCore 8 - type (genre eg. report, convention etc)
- @rdf_type=%{ dc.type="#{@md.type}"\n}
- content=meta_content_clean(@md.type)
+ if defined? @md.rights.all \
+ and @md.rights.all # DublinCore 15 - rights
+ @rdf_rights=%{ dc.rights="#{@md.rights.all}"\n}
+ content=meta_content_clean(@md.rights.all)
+ @rights=%{ <meta name="dc.rights" content="#{content}" />\n}
+ end
+ if defined? @md.classify.subject \
+ and @md.classify.subject=~/\S+/ # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
+ @rdf_subject=%{ dc.subject="#{@md.classify.subject}"\n}
+ content=meta_content_clean(@md.classify.subject)
+ @subject=%{ <meta name="dc.subject" content="#{content}" />\n}
+ end
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/ # DublinCore 4 - description
+ @rdf_description=%{ dc.description="#{@md.notes.description}"\n}
+ content=meta_content_clean(@md.notes.description)
+ @description=%{ <meta name="dc.description" content="#{content}" />\n}
+ end
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/ # DublinCore 14 - coverage
+ @rdf_coverage=%{ dc.coverage="#{@md.notes.coverage}"\n}
+ content=meta_content_clean(@md.notes.coverage)
+ @coverage=%{ <meta name="dc.coverage" content="#{content}" />\n}
+ end
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/ # DublinCore 13 - relation
+ @rdf_relation=%{ dc.relation="#{@md.notes.relation}"\n}
+ content=meta_content_clean(@md.notes.relation)
+ @relation=%{ <meta name="dc.relation" content="#{content}" />\n}
+ end
+ if defined? @md.notes.type \
+ and @md.notes.type # DublinCore 8 - type (genre eg. report, convention etc)
+ @rdf_type=%{ dc.type="#{@md.notes.type}"\n}
+ content=meta_content_clean(@md.notes.type)
@type=%{ <meta name="dc.type" content="#{content}" />\n}
end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/ # DublinCore 9 - format (use your mime type)
- @rdf_format=%{ dc.format="#{@md.classify.format}"\n}
- content=meta_content_clean(@md.classify.format)
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/ # DublinCore 9 - format (use your mime type)
+ @rdf_format=%{ dc.format="#{@md.notes.format}"\n}
+ content=meta_content_clean(@md.notes.format)
@format=%{ <meta name="dc.format" content="#{content}" />\n}
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/ # DublinCore 10 - identifier (your identifier, could use urn which is free)
- @rdf_identifier=%{ dc.identifier="#{@md.classify.identifier}"\n}
- content=meta_content_clean(@md.classify.identifier)
- @identifier=%{ <meta name="dc.identifier" content="#{content}" />\n}
- end
+ #if defined? @md.identifier.sisupod \
+ #and @md.identifier.sisupod=~/\S+/ # DublinCore 10 - identifier (your identifier, could use urn which is free)
+ # @rdf_identifier=%{ dc.identifier="#{@md.identifier.sisupod}"\n}
+ # content=meta_content_clean(@md.identifier.sisupod)
+ # @identifier=%{ <meta name="dc.identifier" content="#{content}" />\n}
+ #end
if defined? @md.original.source \
and @md.original.source=~/\S+/ # DublinCore 11 - source (document source)
@rdf_source=%{ dc.source="#{@md.original.source}"\n}
@@ -630,27 +649,9 @@ module SiSU_XML_Tags #Format
@rdf_language_original=%{ dc.language="#{@md.original.language}"\n}
@language_original=%{ <meta name="dc.language" content="#{@md.original.language}" />\n}
end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/ # DublinCore 13 - relation
- @rdf_relation=%{ dc.relation="#{@md.classify.relation}"\n}
- content=meta_content_clean(@md.classify.relation)
- @relation=%{ <meta name="dc.relation" content="#{content}" />\n}
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/ # DublinCore 14 - coverage
- @rdf_coverage=%{ dc.coverage="#{@md.classify.coverage}"\n}
- content=meta_content_clean(@md.classify.coverage)
- @coverage=%{ <meta name="dc.coverage" content="#{content}" />\n}
- end
- if defined? @md.rights.all \
- and @md.rights.all # DublinCore 15 - rights
- @rdf_rights=%{ dc.rights="#{@md.rights.all}"\n}
- content=meta_content_clean(@md.rights.all)
- @rights=%{ <meta name="dc.rights" content="#{content}" />\n}
- end
content=meta_content_clean(@md.keywords)
@keywords=%{ <meta name="keywords" content="#{content}" />\n} if @md.keywords
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def meta_content_clean(content='')
content
diff --git a/lib/sisu/v3/sisupod_make.rb b/lib/sisu/v5/sisupod_make.rb
index 75182aba..d4341abf 100644
--- a/lib/sisu/v3/sisupod_make.rb
+++ b/lib/sisu/v5/sisupod_make.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sisupod_make.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sisupod_make.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -69,9 +69,11 @@ module SiSU_Doc
def initialize(opt,build=nil,place=nil)
super(opt,build,place)
@zipfile=@opt.fno.gsub(/(?:\~\S{2,3})?(\.ss[tm])$/,'\1')
- @ans=SiSU_Response::Response.new
- if @opt.cmd=~/[MVv]/
- SiSU_Screen::Ansi.new(@opt.cmd,'Assemble source for sisu document',"#{@opt.fns} -> file://#{@file.output_path.sisupod.dir}/#{@zipfile}.txz").warn
+ unless @opt.cmd =~/q/
+ pthinfo="#{@file.output_path.sisupod.dir}/#{@zipfile}.txz"
+ @opt.cmd=~/[MVv]/ \
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'Assemble source for sisu document',"#{@opt.fns} -> file://#{pthinfo}").cyan_hi_blue
+ : SiSU_Screen::Ansi.new(@opt.cmd,'Assemble source for sisu document',pthinfo).cyan_title_hi
end
end
def sisupod_tar_xz
@@ -106,8 +108,6 @@ question?: should you permit the packing of multiple documents
open @opt.fns, parse file
extract from file content:
images and copy each image from whatever image source to _sisu/sisupod/sisu/_sisu/image
- skin and copy active skin from whatever source to _sisu/sisupod/sisu/_sisu/skin/doc
- extract from skin images required by skin
remove previously existing contents of _/sisu/sisupod &
make directory structure:
@@ -121,8 +121,6 @@ v3 -->
fr/content.sst
_sisu
conf
- skin/
- doc [relevant skin if any other than default]
image (ln -s ../../image)
audio (ln -s ../../audio)
video (ln -s ../../video)
@@ -136,19 +134,11 @@ v2 -->
content.sst [file content]
filename.sst [link to content.sst]
_sisu/
- skin/
- doc [relevant skin if any other than default]
image/ [all images for specific document gathered here]
sisu
_sisu
sisurc.yml
- skin/
- dir/
- doc/
- misc/
- site/
- yaml/
convert/
standard_terms/
image
diff --git a/lib/sisu/v3/sitemaps.rb b/lib/sisu/v5/sitemaps.rb
index 8eff9792..fcdfe883 100644
--- a/lib/sisu/v3/sitemaps.rb
+++ b/lib/sisu/v5/sitemaps.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sitemaps.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sitemaps.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/spell.rb b/lib/sisu/v5/spell.rb
index ce881619..8f10e3be 100644
--- a/lib/sisu/v3/spell.rb
+++ b/lib/sisu/v5/spell.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/spell.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/spell.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/sst_convert_markup.rb b/lib/sisu/v5/sst_convert_markup.rb
index 7c83fd93..cbf40f24 100644
--- a/lib/sisu/v3/sst_convert_markup.rb
+++ b/lib/sisu/v5/sst_convert_markup.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sst_convert_markup.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_convert_markup.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index d989c95e..08dd9f4f 100644
--- a/lib/sisu/v3/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/set_do_inline_footnotes.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/set_do_inline_footnotes.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -176,7 +176,6 @@ module SiSU_ConvertFootnotes
@md,@data=md,data
@@word_mode=[]
@env=SiSU_Env::InfoEnv.new(@md.fns)
- @skin=SiSU_Env::InfoSkin.new(@md)
l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
@language=l[:n]
@translate=SiSU_Translate::Source.new(@md,@language)
@@ -278,7 +277,6 @@ module SiSU_ConvertFootnotes
end
if para =~/<:insert\d+!?>/ \
and para !~/^%\s+/
- @skin.select
ins=SiSU_Viz::Inserts.new
case para
when /^\s*<:insert1>\s*$/
diff --git a/lib/sisu/v3/sst_from_xml.rb b/lib/sisu/v5/sst_from_xml.rb
index 8346ce16..9d9f90ce 100644
--- a/lib/sisu/v3/sst_from_xml.rb
+++ b/lib/sisu/v5/sst_from_xml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sst_from_xml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_from_xml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/sst_identify_markup.rb b/lib/sisu/v5/sst_identify_markup.rb
index 6cc1a589..248aa207 100644
--- a/lib/sisu/v3/sst_identify_markup.rb
+++ b/lib/sisu/v5/sst_identify_markup.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sst_identify_markup.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_identify_markup.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index ccc518d4..3276d1fc 100644
--- a/lib/sisu/v3/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sst_to_s_xml_sax.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_to_s_xml_sax.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -143,7 +143,7 @@ module SiSU_SimpleXML_ModelSax
@@xml={ body: [], open: [], close: [], head: [] }
def initialize(data='',particulars='')
@data,@env,@md=data,particulars.env,particulars.md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@regx=/^(?:#{Mx[:mk_o]}:p[bn]#{Mx[:mk_c]}\s*)?(?:#{Mx[:lv_o]}[1-9]:(\S*)#{Mx[:lv_c]})?(.+)/
@tab="\t"
if @md
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v5/sysenv.rb
index 9e03406d..25984397 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/sysenv.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sysenv.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -64,6 +64,7 @@
@@lang_info=nil
module SiSU_Env
require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
require 'fileutils'
include FileUtils::Verbose
require 'singleton'
@@ -94,9 +95,8 @@ module SiSU_Env
YEAR
end
end
- class InfoSystem
+ class InfoSystemGen
require 'rbconfig'
- include Singleton
@@user,@@home,@@hostname,@@pwd,@@sisu_etc,@@host,@@arch,@@rbver,@@dir_arch,@@dir_sitearch,@@dir_bin,@@locale,@@rc,@@sisurc_path,@@ad=ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],Config::CONFIG['sysconfdir'] + '/sisu',Config::CONFIG['host'],Config::CONFIG['arch'],%x{ruby -v}.strip,Config::CONFIG['archdir'],Config::CONFIG['sitearchdir'],Config::CONFIG['bindir'],%x{locale charmap}.strip,nil,nil,{} # %x{ruby -v}.strip # Config::CONFIG['rb_ver']
out=Config::CONFIG['localstatedir']
etc=Config::CONFIG['sysconfdir'] + '/sisu'
@@ -218,31 +218,21 @@ module SiSU_Env
}
@@default_dir=DEFAULT_DIR
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
- stub_pwd=@@pwd[m,1]
- @@rc_path=[
- "#{@@pwd}/.sisu/#{SiSU_version_dir}",
- "#{@@pwd}/.sisu",
- "#{@@pwd}/_sisu/#{SiSU_version_dir}",
- "#{@@pwd}/_sisu",
- "#{@@home}/.sisu/#{SiSU_version_dir}",
- "#{@@home}/.sisu",
- "#{@@sisu_etc}/#{SiSU_version_dir}",
- ]
- @@ad_path=(stub_pwd !~/^sisupod$/) \
- ? ([
- "#{@@pwd}/.sisu/skin/yml",
- "#{@@pwd}/_sisu/skin/yml",
- "#{@@home}/.sisu/skin/yml",
- "#{@@sisu_etc}/skin/yml",
- ])
- : ["#{@@home}/.sisu",@@sisu_etc]
+ @@pwd=@pwd=SiSU_Utils::Path.new.base_markup
+ stub_pwd=@pwd[m,1]
attr_accessor :user,:home,:hostname,:pwd,:host,:arch,:rbver,:dir_arch,:dir_sitearch,:dir_bin,:locale,:webserv_path,:webserv_host_cgi,:webserv_port_cgi,:default_dir,:rc_path,:ad_path
def initialize
- @user,@home,@hostname,@pwd,@sisu_etc,@host,@arch,@rbver,@dir_arch,@dir_sitearch,@dir_bin,@locale,@default_dir,@rc_path,@ad_path=\
- @@user,@@home,@@hostname,@@pwd,@@sisu_etc,@@host,@@arch,@@rbver,@@dir_arch,@@dir_sitearch,@@dir_bin,@@locale,@@default_dir,@@rc_path,@@ad_path
+ @user,@home,@hostname,@pwd,@sisu_etc,@host,@arch,@rbver,@dir_arch,@dir_sitearch,@dir_bin,@locale,@default_dir=\
+ @@user,@@home,@@hostname,@@pwd,@@sisu_etc,@@host,@@arch,@@rbver,@@dir_arch,@@dir_sitearch,@@dir_bin,@@locale,@@default_dir
#note rbver is duplicated in InfoVersion
end
end
+ class InfoSystem < InfoSystemGen
+ include Singleton
+ def initialize
+ super()
+ end
+ end
class Load
def initialize(prog,mandatory=false)
@prog,@mandatory=prog,mandatory
@@ -279,44 +269,87 @@ module SiSU_Env
load_prog
end
end
- class GetInit < InfoSystem
- include Singleton
+ class GetInit < InfoSystemGen
@@noyaml=false
- @@rc,@@sisurc_path,@@vz,@@tx=nil,nil,nil,nil
+ @@rc,@@sisu_doc_makefile,@@sisurc_path,@@tx=nil,nil,nil,nil
@@ad={ promo: nil, promo_list: nil, flag_promo: false }
+ @@sdmd=nil
attr_accessor :yaml
def initialize
super()
- end
- def skin
- @@vz ||=SiSU_Viz::Skin.new
+ @markup_dir_changed_=if @@sdmd==$sisu_document_markup_directory
+ false
+ else
+ @@sdmd=$sisu_document_markup_directory
+ true
+ end
end
def tex
@@tx ||=SiSU_Viz::TeX.new
end
+ def rc_path_options
+ @rc_path=[
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
+ "#{@@home}/.sisu/#{SiSU_version_dir}",
+ "#{@@home}/.sisu",
+ "#{@@sisu_etc}/#{SiSU_version_dir}",
+ "#{@@sisu_etc}",
+ ]
+ end
+ def sisu_document_make
+ def makefile_name
+ S_CONF[:header_make]
+ end
+ def makefile
+ #if @markup_dir_changed_
+ rc_path_options.each do |v|
+ if FileTest.exist?("#{v}/#{makefile_name}")
+ @sisu_make_path=v
+ break
+ end
+ end
+ #end
+ @sisu_make_file_path=@sisu_make_path \
+ ? "#{@sisu_make_path}/#{makefile_name}"
+ : nil
+ end
+ def makefile_read
+ if makefile
+ sisu_doc_makefile=IO.read(makefile, mode: 'r:utf-8')
+ @sisu_doc_makefile=sisu_doc_makefile.split(/\s*\n\s*\n/m)
+ end
+ @sisu_doc_makefile
+ end
+ self
+ end
def sisu_yaml
def rc
- unless @@rc
- @rc_path.each do |v|
+ if @markup_dir_changed_
+ rc_path_options.each do |v|
if @@noyaml \
or FileTest.exist?("#{v}/noyaml")
STDERR.puts "WARNING - YAML loading switched off, to enable delete the file:\n\t#{v}/noyaml\n\n" unless @@noyaml
@@noyaml=true
break
else
- f='sisurc.yml'
- if FileTest.exist?("#{v}/#{f}")
+ f=S_CONF[:rc_yml]
+ p_f="#{v}/#{f}"
+ if FileTest.exist?(p_f)
require 'yaml'
- @@sisurc_path="#{v}/#{f}"
- @@rc=YAML::load(File::open(@@sisurc_path))
+ @@sisurc_path=v
+ @@rc=YAML::load(File::open(p_f))
break
end
unless @@rc
f='sisurc.yaml'
- if FileTest.exist?("#{v}/#{f}")
+ p_f="#{v}/#{f}"
+ if FileTest.exist?(p_f)
require 'yaml'
- @@sisurc_path="#{v}/#{f}"
- @@rc=YAML::load(File::open(@@sisurc_path))
+ @@sisurc_path=v
+ @@rc=YAML::load(File::open(p_f))
break
end
end
@@ -333,40 +366,52 @@ module SiSU_Env
end
def ads #WORK AREA
tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:'
- @ad_path.each do |v|
- if @@noyaml \
- or FileTest.exist?("#{v}/noyaml")
- puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml
- @@noyaml=true
- break
- else
- if FileTest.exist?("#{v}/list.yml")
- unless @@ad[:promo_list]
- require 'yaml'
- @@ad[:promo_list] ||= YAML::load(File::open("#{v}/list.yml"))
- end
- @@ad[:flag_promo]=true
+ if @markup_dir_changed_
+ @ad_path=[
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml",
+ "#{@@home}/.sisu/#{SiSU_version_dir}/skin/yml",
+ "#{@@home}/.sisu/skin/yml",
+ "#{@@sisu_etc}/#{SiSU_version_dir}/skin/yml",
+ "#{@@sisu_etc}/skin/yml",
+ ]
+ @ad_path.each do |v|
+ if @@noyaml \
+ or FileTest.exist?("#{v}/noyaml")
+ puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml
+ @@noyaml=true
break
+ else
+ if FileTest.exist?("#{v}/list.yml")
+ unless @@ad[:promo_list]
+ require 'yaml'
+ @@ad[:promo_list] ||= YAML::load(File::open("#{v}/list.yml"))
+ end
+ @@ad[:flag_promo]=true
+ break
+ end
+ @@ad[:flag_promo]=false
end
- @@ad[:flag_promo]=false
end
- end
- @ad_path.each do |v|
- if @@noyaml \
- or FileTest.exist?("#{v}/noyaml")
- puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml
- @@noyaml=true
- break
- else
- if FileTest.exist?("#{v}/promo.yml")
- unless @@ad[:promo]
- require 'yaml'
- @@ad[:promo] ||= YAML::load(File::open("#{v}/promo.yml"))
- end
- @@ad[:flag_promo]=true
+ @ad_path.each do |v|
+ if @@noyaml \
+ or FileTest.exist?("#{v}/noyaml")
+ puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml
+ @@noyaml=true
break
+ else
+ if FileTest.exist?("#{v}/promo.yml")
+ unless @@ad[:promo]
+ require 'yaml'
+ @@ad[:promo] ||= YAML::load(File::open("#{v}/promo.yml"))
+ end
+ @@ad[:flag_promo]=true
+ break
+ end
+ @@ad[:flag_promo]=false
end
- @@ad[:flag_promo]=false
end
end
@@ad
@@ -377,11 +422,11 @@ module SiSU_Env
@@ad={}
attr_accessor :rc,:fnn,:fnb,:fnt,:fnv,:fnz,:ad
def initialize(fns='')
- super()
@fns=fns
@sys=InfoSystem.instance
- @rc=GetInit.instance.sisu_yaml.rc
- @ad=GetInit.instance.ads
+ get_init=SiSU_Env::GetInit.new
+ @rc=get_init.sisu_yaml.rc
+ @ad=get_init.ads
if @fns \
and @fns != '' \
and @fns !=@@fns
@@ -427,9 +472,11 @@ module SiSU_Env
or ((defined? @rc['output_structure']['by_filename']) \
&& @rc['output_structure']['by_filename'] ==true)
:filename
- else #recheck current default
+ else #set default
:language
end
+ else #set default
+ :language
end
end
def dump?
@@ -611,8 +658,11 @@ module SiSU_Env
end
class SystemCall
@@locale_flag=false
- def initialize(input='',output='',cmd='')
- @input,@output,@cmd=input,output,cmd
+ def initialize(input='',output='',opt_or_cmd='')
+ @input,@output=input,output
+ (opt_or_cmd.is_a?(SiSU_Commandline::Options)) \
+ ? (@cmd,@opt=opt_or_cmd.cmd,opt_or_cmd)
+ : (@cmd,@opt=opt_or_cmd,nil) #cmd.is_a?(String)
@prog=SiSU_Env::InfoProgram.new
@sys=InfoSystem.instance
end
@@ -746,14 +796,14 @@ module SiSU_Env
program='identify'
program_ref="\n\t\tsee <http://www.imagemagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def graphicksmagick #graphicsmagick is a image manipulation program
program='gm'
program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def well_formed? #tidy - check for well formed xml xhtml etc.
@@ -828,19 +878,23 @@ module SiSU_Env
elsif @cmd =~/v/; 'v'
else ''
end
- msg=''
- msg=" && echo 'OK: #{@input} -> #{@output}'" unless @cmd =~/q/
+ cX=SiSU_Screen::Ansi.new(@cmd).cX
+ msg=(@cmd =~/q/) ? '' : %{ && echo " #{cX.grey}OK: #{@input} -> #{@output}#{cX.off}"}
+ amp=(@opt \
+ && @opt.files.length > 1) \
+ ? ''
+ : ((@cmd =~/[vVM]/) ? '' : '&')
rsync_cmd="rsync -az#{vb} #{action} #{@input} #{@output}"
puts rsync_cmd if @cmd =~/[vVM]/
dir_change,dir_return='',''
- if chdir \
+ if not chdir.nil? \
&& chdir != Dir.pwd
dir_change=Dir.chdir(chdir)
dir_return=Dir.pwd
end
dir_change
system("
- #{rsync_cmd} #{msg}
+ #{rsync_cmd} #{msg} #{amp}
")
dir_return
else STDERR.puts "\t*WARN* #{program} not found"
@@ -980,6 +1034,7 @@ module SiSU_Env
@@fb,@@man_path=nil,nil
def initialize(fns='',md=nil)
super() #you may not want to re-execute this static info so frequently!
+ @init=SiSU_Env::GetInit.new
@fns,@md=fns,md
@env=SiSU_Env::EnvCall.new(fns) if fns
fnb=if @md \
@@ -1027,6 +1082,9 @@ module SiSU_Env
pt.split[-1].to_s
elsif output_dir_structure.by_filename?
''
+ else
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuschia)
+ puts 'set output type, by: language, filetype or filename'
end
@stub_set_manifest=stub + '/manifest'
end
@@ -1101,6 +1159,52 @@ module SiSU_Env
def stub_pod
@stub_pod
end
+ def sisupod_v4(opt)
+ #processing_path.processing
+ # sisupod
+ # doc/
+ # manifest.txt
+ # en/content.sst [file content]
+ # fr/content.sst
+ # _sisu
+ # sisu_document_make
+ # image@ (ln -s ../../image)
+ # audio@ (ln -s ../../audio)
+ # video@ (ln -s ../../video)
+ # image/ [all images for specific document gathered here]
+ # audio/
+ # video/
+ spp="#{processing_path.processing}/#{Gt[:sisupod]}"
+ sppc="#{spp}/doc/_sisu"
+ lng_dirs=[]
+ if FileTest.directory?(spp) \
+ or FileTest.file?(spp)
+ FileUtils::rm_rf(spp)
+ end
+ paths=[]
+ flv=SiSU_Env::EnvCall.new(opt.fns).document_language_versions_found
+ flv[:f].each {|l| lng_dirs << l[:l] }
+ lng_dirs.uniq.each do |lng|
+ paths << "#{spp}/doc/#{lng}"
+ end
+ paths \
+ << "#{spp}/image"
+ #<< "#{spp}/audio" \
+ #<< "#{spp}/video" \
+ paths.each do |x|
+ unless FileTest.directory?(x)
+ FileUtils::mkdir_p(x)
+ end
+ end
+ if FileTest.directory?(sppc)
+ pwd=Dir.pwd
+ Dir.chdir(sppc)
+ FileUtils::ln_s('../../image', 'image')
+ #FileUtils::ln_s('../../audio', 'audio')
+ #FileUtils::ln_s('../../video', 'video')
+ Dir.chdir(pwd)
+ end
+ end
def sisupod_v3(opt)
#processing_path.processing
# sisupod
@@ -1378,9 +1482,9 @@ module SiSU_Env
: false
end
def widget #needs (md) #move
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
- @ad=SiSU_Env::GetInit.instance.ads
- @vz=SiSU_Env::GetInit.instance.skin
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
+ @ad=SiSU_Env::GetInit.new.ads
+ @vz=SiSU_Viz::Defaults.new
@flag={ ad: false, md: false, sk: false, rc: false }
def promo?
@flag[:ad]=if @md.flag_promo && @ad[:flag_promo]
@@ -1453,7 +1557,7 @@ module SiSU_Env
end
end
def search_form(type='sisusearch',action=nil,db=nil,table=false)
- rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ rc=SiSU_Env::GetInit.new.sisu_yaml.rc
create_form_sisu=if action \
and db \
and action =~/https?:\/\// \
@@ -1509,7 +1613,7 @@ WOK
form
end
def search_form_static(action=nil,db=nil)
- rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ rc=SiSU_Env::GetInit.new.sisu_yaml.rc
create_form=if rc['search']['sisu']['flag']==true \
and action \
and db \
@@ -1557,8 +1661,8 @@ WOK
self
end
def widget_static
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
- @vz=SiSU_Env::GetInit.instance.skin
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
+ @vz=SiSU_Viz::Defaults.new
@flag={ ad: false, md: false, sk: false, rc: false }
def search?
flag=if defined? @rc['search'] \
@@ -1566,8 +1670,6 @@ WOK
and defined? @rc['search']['sisu']['action'] \
and @rc['search']['sisu']['action'] =~/https?:\/\// \
and defined? @rc['search']['sisu']['db'] \
- and @rc['search']['sisu']['db'] =~/\S+/ \
- and defined? @rc['search']['sisu']['db'] \
and @rc['search']['sisu']['db'] =~/\S+/
flag=if defined? @vz.widget_search \
and @vz.widget_search==true
@@ -1605,7 +1707,7 @@ WOK
end
end
def search_form(action=nil,db=nil)
- rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ rc=SiSU_Env::GetInit.new.sisu_yaml.rc
create_form=if defined? rc['search']['sisu']['flag'] \
and rc['search']['sisu']['flag']==true \
and action \
@@ -1742,22 +1844,28 @@ WOK
end
self
end
+ def read_source_file_array(fns)
+ fns_array=(fns !~/\.ssm.sst$/) \
+ ? (IO.readlines(fns, mode: 'r:utf-8', cr_newline: true))
+ : (IO.readlines("#{processing_path.composite_file}/#{fns}", mode: 'r:utf-8', cr_newline: true))
+ end
def read_source_file(fns)
- fns_array=unless fns =~/\.ssm.sst$/
- IO.readlines(fns, mode: 'r:utf-8', cr_newline: true)
- else
- IO.readlines("#{processing_path.composite_file}/#{fns}", mode: 'r:utf-8', cr_newline: true)
- end
+ read_source_file_array(fns)
+ end
+ def read_source_file_string(fns)
+ fns_str=(fns !~/\.ssm.sst$/) \
+ ? (IO.read(fns, mode: 'r:utf-8', cr_newline: true))
+ : (IO.read("#{processing_path.composite_file}/#{fns}", mode: 'r:utf-8', cr_newline: true))
end
def source_file_processing_array(fns)
- sf=read_source_file(fns).join.split(/\s*\n\s*\n/m)
+ sf=read_source_file_string(fns).split(/\s*\n\s*\n/m)
end
def path #dir
def home
@sys.home
end
def sisurc_path
- GetInit.instance.sisu_yaml.rc_path
+ GetInit.new.sisu_yaml.rc_path
end
def pwd
@sys.pwd
@@ -1825,10 +1933,10 @@ WOK
defaults[:sample_data_path]
end
def rc
- @sys.rc_path
+ @init.rc_path
end
def yamlrc
- GetInit.instance.sisu_yaml.rc_path
+ GetInit.new.sisu_yaml.rc_path
end
def man #check use
(defined? @rc['webserv']['man']) \
@@ -1842,7 +1950,11 @@ WOK
man_path=if @@man_path.nil?
man_path=if defined? @rc['webserv']['path'] \
and @rc['webserv']['path'] =~/\S\S+/
+ pwd=Dir.pwd
+ Dir.chdir(SiSU_Utils::Path.new.base_markup)
man_path=@@man_path=File.expand_path(@rc['webserv']['path'])
+ Dir.chdir(pwd)
+ man_path
else defaults[:webserv_path]
end
else @@man_path
@@ -1922,7 +2034,8 @@ WOK
and defined? @rc['image']['public']
pth="#{@rc['image']['path']}"
"#{pth}/#{@rc['image']['public']}"
- else "#{share}/image"
+ else
+ "#{share}/image"
end
end
def image_source_sisu_includes
@@ -1935,6 +2048,8 @@ WOK
"#{@rc['image']['path']}/#{@rc['image']['public']}"
elsif FileTest.directory?("#{@@pwd}/#{defaults[:image_stub]}")==true
"#{@@pwd}/#{defaults[:image_stub]}"
+ elsif FileTest.directory?("#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}")==true
+ "#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}"
else
"#{share}/image"
end
@@ -2036,7 +2151,6 @@ WOK
else
sisupod_processing_path + '/' + Gt[:doc]
end
-#p sisup od_processing_path_lng
unless FileTest.directory?(sisupod_processing_path_lng)
#puts "a processing directory (#{sisupod_processing_path_lng}) is being created for use by sisu"
FileUtils::mkdir_p(sisupod_processing_path_lng)
@@ -2280,7 +2394,7 @@ WOK
end
end
def webserv_cgi #web url for local webserv (localhost, or hostname)
- if defined? @rc['webserv_cgi']['host'] \
+ http=if defined? @rc['webserv_cgi']['host'] \
and @rc['webserv_cgi']['host'].is_a?(String)
http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://') #check https? missing
if port.webserv_port_cgi
@@ -2294,9 +2408,10 @@ WOK
else "#{http}#{webserv_host_base}/#{@stub_pwd}"
end
end
+ http=http.strip
end
def webserv_base_cgi #web url for local webserv (localhost, or hostname)
- if defined? @rc['webserv_cgi']['host'] \
+ http=if defined? @rc['webserv_cgi']['host'] \
and @rc['webserv_cgi']['host'].is_a?(String)
http=((@rc['webserv_cgi']['host'] =~ /https?:\/\//) ? '' : 'http://')
if port.webserv_port_cgi
@@ -2310,6 +2425,7 @@ WOK
else "#{http}#{webserv_host_base}"
end
end
+ http=http.strip
end
def webrick #must have a port #REMOVE
if defined? @rc['webserv_cgi']['host'] \
@@ -2365,12 +2481,13 @@ WOK
else webserv_base_cgi
end
end
- def sample_search_form_title
- if defined? @rc['search']['sisu']['title'] \
+ def sample_search_form_title(organised_by=:language)
+ title=if defined? @rc['search']['sisu']['title'] \
and @rc['search']['sisu']['title'] =~/\S+/
@rc['search']['sisu']['title']
- else %{(SiSU (generated sample) search form}
+ else %{SiSU (generated sample) search form}
end
+ title=title + " (content organised by #{organised_by})"
end
def output_tell #BROKEN Revisit 2011-02
output_type=if defined? @rc['show_output_on'] \
@@ -2728,7 +2845,7 @@ WOK
class InfoProcessingFlag
attr_accessor :color,:cf_0,:cf_1,:cf_2,:cf_3,:cf_4,:cf_5
def initialize
- @rc=GetInit.instance.sisu_yaml.rc
+ @rc=GetInit.new.sisu_yaml.rc
end
def color #processing flag shortcuts
(defined? @rc['flag']['color']) ? @rc['flag']['color'] : false
@@ -2796,121 +2913,124 @@ WOK
@env=(@opt.fns && !(@opt.fns.empty?) \
? (SiSU_Env::InfoEnv.new(@opt.fns))
: (SiSU_Env::InfoEnv.new('dummy.sst')))
- if @opt.cmd =~/m/; @md=SiSU_Param::Parameters.new(@opt).get
- end
ft=[]
- if @md \
- and defined? @md.fn \
- and @md.fn # used for by_language_code?
- if @md.opt.cmd =~ /[hH]/
- ft << @md.fn[:html]
- end
- if @md.opt.cmd =~ /w/ \
- and @md.opt.cmd !~ /[hH]/
- ft << @md.fn[:concordance]
- end
- if @md.opt.cmd =~ /y/ \
- and @md.opt.cmd !~ /[hH]/
- ft << @md.fn[:manifest]
- end
- if @md.opt.cmd =~ /[at]/; ft << @md.fn[:plain]
- end
- if @md.opt.cmd =~ /b/; ft << @md.fn[:xhtml]
- end
- if @md.opt.cmd =~ /e/; ft << @md.fn[:epub]
- end
- if @md.opt.cmd =~ /g/; ft << @md.fn[:wiki]
- end
- if @md.opt.cmd =~ /i/; ft << @md.fn[:manpage]
- end
- if @md.opt.cmd =~ /N/; ft << @md.fn[:digest]
- end
- if @md.opt.cmd =~ /o/; ft << @md.fn[:odf]
- end
- if @md.opt.cmd =~ /O/; ft << @md.fn[:oai_pmh]
- end
- if @md.opt.cmd =~ /p/; ft << @md.fn[:pdf_l] << @md.fn[:pdf_p]
- end
- if @md.opt.cmd =~ /s/; ft << @md.fns
- end
- if @md.opt.cmd =~ /S/; ft << @md.fn[:sisupod] << '.kdi'
- end
- if @md.opt.cmd =~ /x/; ft << @md.fn[:sax]
- end
- if @md.opt.cmd =~ /X/; ft << @md.fn[:dom]
- end
- if @md.opt.cmd =~ /G/; ft << @md.fn[:pot]
- end
- @fnb=@md.fnb
- else # still needed where/when param is not parsed
- if @opt.cmd =~ /[hH]/; ft << '.html' << '.html.??'
- end
- if @opt.cmd =~ /w/ \
- and @opt.cmd !~ /[hH]/
- ft << 'concordance.html' << '??.concordance.html' << 'concordance.??.html'
- end
- if @opt.cmd =~ /y/ \
- and @opt.cmd !~ /[hH]/
- ft << 'sisu_manifest.html' << '??.sisu_manifest.html' << 'sisu_manifest.??.html'
- end
- if @opt.cmd =~ /a/; ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
- end
- if @opt.cmd =~ /b/; ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
- end
- if @opt.cmd =~ /e/; ft << @fnb << '.epub'
- end
- if @opt.cmd =~ /g/; ft << 'wiki.txt' << '??.wiki.txt' << 'wiki.??.txt'
- end
- if @opt.cmd =~ /i/; ft << '.1' << '??.man.1' << 'man.??.1'
- end
- if @opt.cmd =~ /N/; ft << 'digest.txt' << '??.digest.txt' << 'digest.??.txt'
- end
- if @opt.cmd =~ /o/; ft << 'opendocument.odt' << '??.opendocument.odt' << 'opendocument.??.odt'
- end
- if @opt.cmd =~ /O/; ft << 'oai_pmh.xml'
- end
- if @opt.cmd =~ /p/; ft << 'landscape.pdf' << 'portrait.pdf' << '.pdf'
- end
- if @opt.cmd =~ /s/; ft << '.sst' << '.ssi' << '.ssm'
- end
- if @opt.cmd =~ /S/; ft << '.zip' << '.kdi'
- end
- if @opt.cmd =~ /x/; ft << 'sax.xml' << '??.sax.xml' << 'sax.??.xml'
- end
- if @opt.cmd =~ /X/; ft << 'dom.xml' << '??.dom.xml' << 'dom.??.xml'
- end
- if @opt.mod.inspect =~ /sxm|sxs|xml/; ft << @fnb << '.sxs.xml'
- end
- if @opt.mod.inspect =~ /sxd/; ft << @fnb << '.sxd.xml'
- end
- if @opt.mod.inspect =~ /sxn/; ft << @fnb << '.sxn.xml'
+ if @opt.act[:dal][:set]==:on
+ @md=SiSU_Param::Parameters.new(@opt).get
+ if @md \
+ and defined? @md.fn \
+ and @md.fn # used for by_language_code?
+ if @md.opt.cmd =~ /[hH]/
+ ft << @md.fn[:html]
+ end
+ if @md.opt.cmd =~ /w/ \
+ and @md.opt.cmd !~ /[hH]/
+ ft << @md.fn[:concordance]
+ end
+ if @md.opt.cmd =~ /y/ \
+ and @md.opt.cmd !~ /[hH]/
+ ft << @md.fn[:manifest]
+ end
+ if @md.opt.cmd =~ /[at]/; ft << @md.fn[:plain]
+ end
+ if @md.opt.cmd =~ /b/; ft << @md.fn[:xhtml]
+ end
+ if @md.opt.cmd =~ /e/; ft << @md.fn[:epub]
+ end
+ if @md.opt.cmd =~ /g/; ft << @md.fn[:wiki]
+ end
+ if @md.opt.cmd =~ /i/; ft << @md.fn[:manpage]
+ end
+ if @md.opt.cmd =~ /N/; ft << @md.fn[:digest]
+ end
+ if @md.opt.cmd =~ /o/; ft << @md.fn[:odf]
+ end
+ if @md.opt.cmd =~ /O/; ft << @md.fn[:oai_pmh]
+ end
+ if @md.opt.cmd =~ /p/; ft << @md.fn[:pdf_l] << @md.fn[:pdf_p]
+ end
+ if @md.opt.cmd =~ /s/; ft << @md.fns
+ end
+ if @md.opt.cmd =~ /S/; ft << @md.fn[:sisupod] << '.kdi'
+ end
+ if @md.opt.cmd =~ /x/; ft << @md.fn[:sax]
+ end
+ if @md.opt.cmd =~ /X/; ft << @md.fn[:dom]
+ end
+ if @md.opt.cmd =~ /G/; ft << @md.fn[:pot]
+ end
+ @fnb=@md.fnb
+ else # still needed where/when param is not parsed
+ if @opt.cmd =~ /[hH]/; ft << '.html' << '.html.??'
+ end
+ if @opt.cmd =~ /w/ \
+ and @opt.cmd !~ /[hH]/
+ ft << 'concordance.html' << '??.concordance.html' << 'concordance.??.html'
+ end
+ if @opt.cmd =~ /y/ \
+ and @opt.cmd !~ /[hH]/
+ ft << 'sisu_manifest.html' << '??.sisu_manifest.html' << 'sisu_manifest.??.html'
+ end
+ if @opt.cmd =~ /a/; ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
+ end
+ if @opt.cmd =~ /b/; ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
+ end
+ if @opt.cmd =~ /e/; ft << @fnb << '.epub'
+ end
+ if @opt.cmd =~ /g/; ft << 'wiki.txt' << '??.wiki.txt' << 'wiki.??.txt'
+ end
+ if @opt.cmd =~ /i/; ft << '.1' << '??.man.1' << 'man.??.1'
+ end
+ if @opt.cmd =~ /N/; ft << 'digest.txt' << '??.digest.txt' << 'digest.??.txt'
+ end
+ if @opt.cmd =~ /o/; ft << 'opendocument.odt' << '??.opendocument.odt' << 'opendocument.??.odt'
+ end
+ if @opt.cmd =~ /O/; ft << 'oai_pmh.xml'
+ end
+ if @opt.cmd =~ /p/; ft << 'landscape.pdf' << 'portrait.pdf' << '.pdf'
+ end
+ if @opt.cmd =~ /s/; ft << '.sst' << '.ssi' << '.ssm'
+ end
+ if @opt.cmd =~ /S/; ft << '.zip' << '.kdi'
+ end
+ if @opt.cmd =~ /x/; ft << 'sax.xml' << '??.sax.xml' << 'sax.??.xml'
+ end
+ if @opt.cmd =~ /X/; ft << 'dom.xml' << '??.dom.xml' << 'dom.??.xml'
+ end
+ if @opt.mod.inspect =~ /sxm|sxs|xml/; ft << @fnb << '.sxs.xml'
+ end
+ if @opt.mod.inspect =~ /sxd/; ft << @fnb << '.sxd.xml'
+ end
+ if @opt.mod.inspect =~ /sxn/; ft << @fnb << '.sxn.xml'
+ end
end
+ ft=ft.uniq
+ filetypes=ft.join(',')
+ @filetypes=if filetypes !~/..+/; '' # -r called alone, copy all
+ elsif @opt.cmd =~/u/; '' # -u added, copy all, (used to create remote directory tree see output path), not the usual function of -u
+ elsif filetypes =~/\S+?,\S+/; '*{' + filetypes + '}' # more than one relevant file type
+ else '*' + filetypes # one relevant file type
+ end
+ @source_path=(@fnb && !(@fnb.empty?) \
+ ? "#{@env.path.output}/#{@fnb}"
+ : @env.path.output)
+ @source_path_epub=(@fnb && !(@fnb.empty?) \
+ ? "#{@env.path.output}/epub"
+ : @env.path.output_epub)
+ @source_path_src=(@fnb && !(@fnb.empty?) \
+ ? "#{@env.path.output}/src"
+ : @env.path.output_src)
+ @source_path_pod=(@fnb && !(@fnb.empty?) \
+ ? "#{@env.path.output}/pod"
+ : @env.path.output_pod)
+ @source_path_harvest=(@fnb && !(@fnb.empty?) \
+ ? "#{@env.path.output}/manifest"
+ : @env.path.output_harvest)
+ @local_sisu_source=(@filetypes =~/\S/) \
+ ? "#{@source_path}/#{@filetypes}"
+ : @source_path
+ end
+ if @opt.act[:rsync][:set]==:on
end
- ft=ft.uniq
- filetypes=ft.join(',')
- @filetypes=if filetypes !~/..+/; '' # -r called alone, copy all
- elsif @opt.cmd =~/u/; '' # -u added, copy all, (used to create remote directory tree see output path), not the usual function of -u
- elsif filetypes =~/\S+?,\S+/; '*{' + filetypes + '}' # more than one relevant file type
- else '*' + filetypes # one relevant file type
- end
- @source_path=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/#{@fnb}"
- : @env.path.output)
- @source_path_epub=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/epub"
- : @env.path.output_epub)
- @source_path_src=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/src"
- : @env.path.output_src)
- @source_path_pod=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/pod"
- : @env.path.output_pod)
- @source_path_harvest=(@fnb && !(@fnb.empty?) \
- ? "#{@env.path.output}/manifest"
- : @env.path.output_harvest)
- @local_sisu_source=(@filetypes =~/\S/) \
- ? "#{@source_path}/#{@filetypes}"
- : @source_path
end
end
class CleanOutput
@@ -2918,52 +3038,78 @@ WOK
include FileUtils::Verbose
def initialize(opt)
@opt=opt
- z=SiSU_Env::FileMap.new(@opt)
- @zap=z.local_sisu_source
- if @opt.cmd =~ /[hH]/
- @zap=Dir.glob(@zap).join(' ')
- @zap=if @opt.cmd !~ /w/
- @zap.gsub(/#{@source_path}\/concordance.html/,'')
- else @zap
+ z=SiSU_Env::FileMap.new(opt)
+ zap=z.local_sisu_source
+ if opt.cmd =~ /h/i
+ zap=Dir.glob(zap).join(' ')
+ @zap=if opt.cmd !~ /w/
+ zap.gsub(/#{@source_path}\/concordance.html/,'')
+ else zap
end
end
@env=SiSU_Env::InfoEnv.new
end
def zap
- def main_output
- (@zap !~/\/\//) \
- ? (FileUtils::rm_rf(@zap) if FileTest.directory?(@zap))
- : (puts 'suspect zap request, ignored')
- end
- def site_map
- if @opt.fnb \
- and not @opt.fnb.empty?
- sm="#{@env.path.output}/sitemaps/sitemap_#{@opt.fnb}.xml"
- FileUtils::rm(sm) if FileTest.file?(sm)
- end
- end
- def epub
- if @opt.fnb \
- and not @opt.fnb.empty?
- sm="#{@env.path.output}/epub/#{@opt.fnb}.epub"
- FileUtils::rm(sm) if FileTest.file?(sm)
- end
- end
- def src # consider
- if @opt.fnb \
- and not @opt.fnb.empty?
- sm="#{@env.path.output}/src/pod/#{@opt.fns}.txz"
- FileUtils::rm(sm) if FileTest.file?(sm)
- sm="#{@env.path.output}/src/#{@opt.fns}"
- FileUtils::rm(sm) if FileTest.file?(sm)
- end
+ def deletion(fn)
+ if FileTest.file?(fn)==true
+ File.delete(fn)
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns, 'remove: ' + fn)
+ tell.warn unless @opt.cmd =~/q/
+ end
+ end
+ def remove_output
+ if @opt.act[:maintenance][:set] == :on
+ m=InfoFile.new(@opt.fnc)
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns, 'remove maintenance files from: ' + @env.processing_path.dal)
+ tell.warn unless @opt.cmd =~/q/
+ deletion(m.marshal.dal_content)
+ deletion(m.marshal.dal_idx_sst_rel_html_seg)
+ deletion(m.dal_idx_sst_rel)
+ deletion(m.dal_idx_html)
+ deletion(m.dal_idx_xhtml)
+ deletion(m.dal_metadata)
+ deletion(m.dal_map_nametags)
+ deletion(m.dal_map_ocn_htmlseg)
+ deletion(m.html_tune)
+ end
+ md=SiSU_Param::Parameters.new(@opt).get
+ f=SiSU_Env::FileOp.new(md)
+ deletion(f.place_file.html_segtoc.dir)
+ deletion(f.place_file.html_scroll.dir)
+ deletion(f.place_file.html_book_index.dir)
+ deletion(f.place_file.html_concordance.dir)
+ deletion(f.place_file.epub.dir)
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_letter}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_l_letter}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_a4}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_l_a4}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_a5}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_l_a5}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_b5}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_l_b5}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_legal}")
+ deletion("#{f.output_path.pdf.dir}/#{f.base_filename.pdf_p_legal}")
+ deletion(f.place_file.odt.dir)
+ deletion(f.place_file.xhtml.dir)
+ deletion(f.place_file.xml_sax.dir)
+ deletion(f.place_file.xml_dom.dir)
+ deletion(f.place_file.info.dir)
+ deletion(f.place_file.manpage.dir)
+ deletion(f.place_file.sqlite_discrete.dir)
+ deletion(f.place_file.txt.dir)
+ deletion(f.place_file.hash_digest.dir)
+ deletion(f.place_file.manifest.dir)
+ deletion(f.place_file.qrcode_md.dir)
+ deletion(f.place_file.qrcode_title.dir)
+ deletion(f.place_file.src.dir)
+ deletion(f.place_file.sisupod.dir)
end
self
end
end
class InfoRemoteHost
def initialize
- @rc=GetInit.instance.sisu_yaml.rc
+ @rc=GetInit.new.sisu_yaml.rc
end
def remote_host #see InfoRemote remote_host_base_general
r=[]
@@ -3047,7 +3193,7 @@ WOK
def initialize(opt)
super(opt) #
@opt=opt
- @rc=GetInit.instance.sisu_yaml.rc
+ @rc=GetInit.new.sisu_yaml.rc
end
def remote_host_base_general
SiSU_Env::InfoRemoteHost.new.remote_host
@@ -3149,194 +3295,195 @@ WOK
end
self
end
- def images_from_skin
- skin=SiSU_Env::InfoSkin.new(@md).select
- skin_array=nil
- skin_images_array=[]
- if skin
- skin_array=IO.readlines(skin,"\n")
- skin_array.each do |l|
- if l !~/^#/
- if l =~/([a-z0-9._-]+\.(?:png|jpg|gif))/i
- skin_images_array << $1
+ def rsync
+ def document
+ f=(@opt.act[:dal][:set]==:on) \
+ ? SiSU_Env::FileOp.new(@md)
+ : nil
+ if f
+ self.remote_host_base.each do |remote_conn|
+ local_gen=@source_path
+ #local_gen_image="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
+ #local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
+ remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
+ remote_rel=remote_conn[:name] + '/' + f.output_path.stub.rcp
+ src_txt=@opt.fnc
+ if (local_gen =~/\S/ \
+ and local_gen !~/\/\//) \
+ and (remote_gen =~/\S/ \
+ and remote_gen !~/\/\//) \
+ and @@flag_remote==true \
+ and @opt.cmd !~/U/
+# SiSU_Env::SystemCall.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync
+ delete_extra_files='--delete' # '--delete-after'
+ inp=[]
+ if (@opt.act[:html][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.html_scroll.dir)
+ inp << f.output_path.html_seg.rel << f.place_file.html_scroll.rel
+ end
+ if (@opt.act[:concordance][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.html_concordance.dir)
+ inp << f.place_file.html_concordance.rel
+ end
+ if (@opt.act[:epub][:set]==:on \
+ || @opt.cmd =~/^-R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.epub.dir)
+ inp << f.place_file.epub.rel
+ end
+ if (@opt.act[:odt][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.odt.dir)
+ inp << f.place_file.odt.rel
+ end
+ if (@opt.act[:xhtml][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.xhtml.dir)
+ inp << f.place_file.xhtml.rel
+ end
+ if (@opt.act[:xml_sax][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.xml_sax.dir)
+ inp << f.place_file.xml_sax.rel
+ end
+ if (@opt.act[:xml_dom][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.xml_dom.dir)
+ inp << f.place_file.xml_dom.rel
+ end
+ if (@opt.act[:txt][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.txt.dir)
+ inp << f.place_file.txt.rel
+ end
+ if (@opt.act[:manpage][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*i[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.manpage.dir)
+ inp << f.place_file.manpage.rel
+ end
+ if (@opt.act[:texinfo][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*I[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.info.dir)
+ inp << f.place_file.info.rel
+ end
+ if (@opt.act[:hash_digests][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.hash_digest.dir)
+ inp << f.place_file.hash_digest.rel
+ end
+ if (@opt.act[:share_source][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.src.dir)
+ inp << f.place_file.src.rel
+ end
+ if (@opt.act[:sisupod][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.sisupod.dir)
+ inp << f.place_file.sisupod.rel
+ end
+ if (@opt.act[:pdf][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/)
+ inp <<=(@opt.dir_structure_by == :filename) \
+ ? (f.output_path.pdf.rel + '/*.pdf')
+ : (f.output_path.pdf.rel + '/' + @opt.fnb + '*.pdf')
+ end
+ if (@opt.act[:sqlite_discrete][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.sqlite_discrete.dir)
+ inp << f.place_file.sqlite_discrete.rel
+ end
+ if (@opt.act[:qrcode][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.qrcode_md.dir)
+ inp << f.place_file.qrcode_md.rel << f.place_file.qrcode_title.rel
+ end
+ if (@opt.act[:manifest][:set]==:on \
+ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
+ && FileTest.file?(f.place_file.manifest.dir)
+ inp << f.place_file.manifest.rel
+ end
+ local_gen=if inp.length > 0
+ inp.join(' ')
+ else ''
+ end
+ local_css,images,images_external,images_system='','','',''
+ images_gen=images=images_skin=images_system=local_css=''
+ if @opt.cmd =~/[hwbxX]/ \
+ && (defined? @md.ec[:image]) \
+ && (@md.ec[:image].length > 0)
+ images=f.place_file.images.rel + '/' + @md.ec[:image].join(" #{f.output_path.images.rel}/")
+ end
+ if @opt.cmd =~/[yhwbxX]/ \
+ && (defined? @md.ec[:image]) \
+ && (@md.ec[:image].length > 0)
+ local_css=f.output_path.css.rel
+ images_system='_sisu/image_sys'
+ end
+ begin
+ ##create file structure without copying files?:
+ ##rsync -av -f"+ */" -f"- *" f.output_path.base.dir remote:./path/.
+ #local_dirs=%{-f"+ */" -f"- *" #{f.output_path.base.dir}/*}
+ #SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
+ local=local_gen + ' ' + images + ' ' + images_skin + ' ' + images_system + ' ' + local_css
+ SiSU_Env::SystemCall.new(local,remote_rel,@opt.cmd).rsync('--relative',f.output_path.base.dir)
+ rescue
+ p __LINE__.to_s + ':' + __FILE__
+ local_dirs=%{--include='*/' --exclude='*' #{f.output_path.base.dir}}
+ SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
+ end
+ elsif @opt.cmd =~/U/
+ puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
+ puts "#{local_gen} -> #{remote_gen}"
+ if FileTest.file?("#{local_src}/#{src_doc}") \
+ or FileTest.file?("#{local_src}/#{src_doc}.txz")
+ puts "#{local_src}/#{src_doc}* -> #{remote_src}"
+ end
+ else
+ puts 'suspect rsync request, ignored'
+ puts "#{local_gen} -> #{remote_gen} remote flag: #{@@flag_remote}"
+ puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
end
end
end
end
- skin_images_array
- end
- def rsync
- @f=SiSU_Env::FileOp.new(@md)
- def document
+ def site_harvest
self.remote_host_base.each do |remote_conn|
- local_gen=@source_path
- #local_gen_image="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
- #local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
- remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
- remote_rel=remote_conn[:name] + '/' + @f.output_path.stub.rcp
- src_txt=@opt.fnc
- if (local_gen =~/\S/ \
- and local_gen !~/\/\//) \
- and (remote_gen =~/\S/ \
- and remote_gen !~/\/\//) \
- and @@flag_remote==true \
- and @opt.cmd !~/U/
-# SiSU_Env::SystemCall.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync
- delete_extra_files='--delete' # '--delete-after'
- inp=[]
- if (@opt.act[:html][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.html_scroll.dir)
- inp << @f.output_path.html_seg.rel << @f.place_file.html_scroll.rel
- end
- if (@opt.act[:concordance][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.html_concordance.dir)
- inp << @f.place_file.html_concordance.rel
- end
- if (@opt.act[:epub][:set]==:on \
- || @opt.cmd =~/^-R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.epub.dir)
- inp << @f.place_file.epub.rel
- end
- if (@opt.act[:odt][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.odt.dir)
- inp << @f.place_file.odt.rel
- end
- if (@opt.act[:xhtml][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.xhtml.dir)
- inp << @f.place_file.xhtml.rel
- end
- if (@opt.act[:xml_sax][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.xml_sax.dir)
- inp << @f.place_file.xml_sax.rel
- end
- if (@opt.act[:xml_dom][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.xml_dom.dir)
- inp << @f.place_file.xml_dom.rel
- end
- if (@opt.act[:txt][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.txt.dir)
- inp << @f.place_file.txt.rel
- end
- if (@opt.act[:manpage][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*i[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.manpage.dir)
- inp << @f.place_file.manpage.rel
- end
- if (@opt.act[:texinfo][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*I[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.info.dir)
- inp << @f.place_file.info.rel
- end
- if (@opt.act[:hash_digests][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.hash_digest.dir)
- inp << @f.place_file.hash_digest.rel
- end
- if (@opt.act[:share_source][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.src.dir)
- inp << @f.place_file.src.rel
- end
- if (@opt.act[:sisupod][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.sisupod.dir)
- inp << @f.place_file.sisupod.rel
- end
- if (@opt.act[:pdf][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/)
- inp << @f.output_path.pdf.rel + '/' + @opt.fnb + '*'
- end
- if (@opt.act[:sqlite_discrete][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.sqlite_discrete.dir)
- inp << @f.place_file.sqlite_discrete.rel
- end
- if (@opt.act[:qrcode][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.qrcode_md.dir)
- inp << @f.place_file.qrcode_md.rel << @f.place_file.qrcode_title.rel
- end
- if (@opt.act[:manifest][:set]==:on \
- || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \
- && FileTest.file?(@f.place_file.manifest.dir)
- inp << @f.place_file.manifest.rel
- end
- local_gen=if inp.length > 0
- inp.join(' ')
- else ''
- end
- local_css,images,images_external,images_system='','','',''
- images_gen=images=images_skin=images_system=local_css=''
- if @opt.cmd =~/[hwbxX]/ \
- && (defined? @md.ec[:image]) \
- && (@md.ec[:image].length > 0)
- images=@f.place_file.images.rel + '/' + @md.ec[:image].join(" #{@f.output_path.images.rel}/")
- end
- if @opt.cmd =~/[yhwbxX]/ \
- && (defined? @md.ec[:image]) \
- && (@md.ec[:image].length > 0)
- local_css=@f.output_path.css.rel
- images_system='_sisu/image_sys'
- if @f.output_path.images.rel.length > 0 \
- && images_from_skin.length > 0
- images_skin=@f.place_file.images.rel + '/' + images_from_skin.join(" #{@f.output_path.images.rel}/")
- end
- end
- begin
- ##create file structure without copying files?:
- ##rsync -av -f"+ */" -f"- *" @f.output_path.base.dir remote:./path/.
- #local_dirs=%{-f"+ */" -f"- *" #{@f.output_path.base.dir}/*}
- #SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
- local=local_gen + ' ' + images + ' ' + images_skin + ' ' + images_system + ' ' + local_css
- SiSU_Env::SystemCall.new(local,remote_rel,@opt.cmd).rsync('--relative',@f.output_path.base.dir)
- rescue
- p __LINE__.to_s + ':' + __FILE__
- local_dirs=%{--include='*/' --exclude='*' #{@f.output_path.base.dir}}
- SiSU_Env::SystemCall.new(local_dirs,remote_gen,@opt.cmd).rsync
- end
+ local=@source_path_harvest
+ l_rel="#{@env.path.webserv}/#{@env.path.stub_pwd}"
+ lng='en'
+ if @env.output_dir_structure.by? == :language
+ ldest="#{lng}/manifest"
+ files="#{ldest}/authors.html #{ldest}/topics.html"
+ elsif @env.output_dir_structure.by? == :filetype
+ ldest="manifest"
+ files="#{ldest}/authors.#{lng}.html #{ldest}/topics.#{lng}.html"
+ elsif @env.output_dir_structure.by? == :filename
+ files="#{l_rel}/authors.#{lng}.html #{l_rel}/topics.#{lng}.html"
+ end
+ remote="#{remote_conn[:name]}/#{@opt.base_stub}"
+ if @opt.act[:harvest][:set] \
+ && @opt.act[:rsync][:set]
+ (@env.output_dir_structure.by? == :filename) \
+ ? (SiSU_Env::SystemCall.new(files,remote).rsync)
+ : (SiSU_Env::SystemCall.new(ldest,remote).rsync('--relative',l_rel))
elsif @opt.cmd =~/U/
puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
- puts "#{local_gen} -> #{remote_gen}"
- if FileTest.file?("#{local_src}/#{src_doc}") \
- or FileTest.file?("#{local_src}/#{src_doc}.txz")
- puts "#{local_src}/#{src_doc}* -> #{remote_src}"
- end
- else
- puts 'suspect rsync request, ignored'
- puts "#{local_gen} -> #{remote_gen} remote flag: #{@@flag_remote}"
- puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
+ puts "rsync_harvest: #{local} -> #{remote}"
+ else puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
end
end
end
def site_base #base site
- ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu"
+ ldest='_sisu/*'
+ l_rel="#{@env.path.webserv}/#{@env.path.stub_pwd}"
image_sys="#{@env.path.webserv}/_sisu/image_sys"
images="#{@env.path.webserv}/_sisu/image"
self.remote_host_base.each do |remote_conn|
- remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
+ remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}"
remote_conf="#{remote_conn[:name]}/_sisu"
- if defined? @rc['permission_set']['remote_base_site'] \
- and @rc['permission_set']['remote_base_site'] \
- and @@flag_remote==true \
- and @opt.cmd !~/U/
- SiSU_Env::SystemCall.new("#{image_sys}","#{remote_conf}").rsync
- SiSU_Env::SystemCall.new("#{images}","#{remote_conf}").rsync
- SiSU_Env::SystemCall.new("#{ldest}","#{remote}").rsync
- elsif @opt.cmd =~/U/
- puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
- puts "rsync_base: #{local} -> #{remote}"
- puts "#{local}/_sisu/image -> #{remote}"
- puts "#{local}/_sisu/image_sys/ -> #{remote}"
- puts "#{local}/#{@env.path.style}/ -> #{remote}"
- else puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
- end
+ SiSU_Env::SystemCall.new(image_sys,remote_conf).rsync
+ SiSU_Env::SystemCall.new(ldest,remote).rsync('--relative',l_rel)
end
end
def site_base_sync
@@ -3378,32 +3525,22 @@ WOK
end
end
end
- def rsync_harvest
- self.remote_host_base.each do |remote_conn|
- local=@source_path_harvest
- remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
- if @@flag_remote
- delete_extra_files='--delete' # '--delete-after'
- SiSU_Env::SystemCall.new(local,remote).rsync(delete_extra_files)
- elsif @opt.cmd =~/U/
- puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
- puts "rsync_sitemaps: #{local} -> #{remote}"
- else puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
- end
- end
- end
end
class InfoVersion <InfoEnv
include Singleton
require 'rbconfig'
+ require 'yaml'
@@lib_path=nil
def get_version
@version={}
@pwd=ENV['PWD']
- yst_ver="#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml"
+ yst_ver=SiSU_path_specified_Version_ \
+ ? SiSU_path_specified_Version_
+ : "#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml"
lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':')
@@lib_path ||=lib_path
- if File.exist?(yst_ver); @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
+ if File.exist?(yst_ver)
+ @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
end
@version
end
@@ -3497,7 +3634,7 @@ WOK
@md=md
end
def cnf_rc #sisurc.yml
- @rc=SiSU_Env::GetInit.instance.sisu_yaml.rc
+ @rc=SiSU_Env::GetInit.new.sisu_yaml.rc
end
def env_rc #env rc (including sisurc.yml)
@env_rc ||=SiSU_Env::InfoEnv.new(@md.fns)
@@ -3516,8 +3653,9 @@ WOK
true
elsif cmd_rc_act[:ocn][:set]==:off
false
- elsif defined? @md.make.ocn? \
- and @md.make.ocn? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.ocn? \
+ and doc_rc.toc? ==:off
false
elsif env_rc.build.ocn? ==:off
false
@@ -3530,8 +3668,9 @@ WOK
true
elsif cmd_rc_act[:toc][:set]==:off
false
- elsif defined? @md.make.toc? \
- and @md.make.toc? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.toc? \
+ and doc_rc.toc? ==:off
false
elsif env_rc.build.toc? ==:off
false
@@ -3544,8 +3683,9 @@ WOK
true
elsif cmd_rc_act[:manifest][:set]==:off
false
- elsif defined? @md.make.manifest? \
- and @md.make.manifest? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.manifest? \
+ and doc_rc.manifest? ==:off
false
elsif env_rc.build.manifest? ==:off
false
@@ -3558,8 +3698,9 @@ WOK
true
elsif cmd_rc_act[:links_to_manifest][:set]==:off
false
- elsif defined? @md.make.links_to_manifest? \
- and @md.make.links_to_manifest? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.links_to_manifest? \
+ and doc_rc.links_to_manifest? ==:off
false
elsif env_rc.build.links_to_manifest? ==:off
false
@@ -3572,8 +3713,9 @@ WOK
true
elsif cmd_rc_act[:metadata][:set]==:off
false
- elsif defined? @md.make.metadata? \
- and @md.make.metadata? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.metadata? \
+ and doc_rc.metadata? ==:off
false
elsif env_rc.build.metadata? ==:off
false
@@ -3588,8 +3730,9 @@ WOK
true
elsif cmd_rc_act[:minitoc][:set]==:off
false
- elsif defined? @md.make.minitoc? \
- and @md.make.minitoc? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.minitoc? \
+ and doc_rc.minitoc? ==:off
false
elsif env_rc.build.minitoc? ==:off
false
@@ -3606,9 +3749,10 @@ WOK
elsif cmd_rc_act[:manifest_minitoc][:set]==:off \
|| cmd_rc_act[:minitoc][:set]==:off
false
- elsif defined? @md.make.manifest_minitoc? \
- and (@md.make.manifest_minitoc? ==:off \
- || @md.make.minitoc? ==:off)
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.manifest_minitoc? \
+ and (doc_rc.manifest_minitoc? ==:off \
+ || doc_rc.minitoc? ==:off)
false
elsif env_rc.build.manifest_minitoc? ==:off \
|| env_rc.build.minitoc? ==:off
@@ -3628,9 +3772,10 @@ WOK
elsif cmd_rc_act[:html_minitoc][:set]==:off \
|| cmd_rc_act[:minitoc][:set]==:off
false
- elsif defined? @md.make.html_minitoc? \
- and (@md.make.html_minitoc? ==:off \
- || @md.make.minitoc? ==:off)
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_minitoc? \
+ and (doc_rc.html_minitoc? ==:off \
+ || doc_rc.minitoc? ==:off)
false
elsif env_rc.build.html_minitoc? ==:off \
|| env_rc.build.minitoc? ==:off
@@ -3646,8 +3791,9 @@ WOK
true
elsif cmd_rc_act[:html_top_band][:set]==:off
false
- elsif defined? @md.make.html_top_band? \
- and @md.make.html_top_band? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_top_band? \
+ and doc_rc.html_top_band? ==:off
false
elsif env_rc.build.html_top_band? ==:off
false
@@ -3660,8 +3806,9 @@ WOK
true
elsif cmd_rc_act[:html_navigation][:set]==:off
false
- elsif defined? @md.make.html_navigation? \
- and @md.make.html_navigation? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_navigation? \
+ and doc_rc.html_navigation? ==:off
false
elsif env_rc.build.html_navigation? ==:off
false
@@ -3674,8 +3821,9 @@ WOK
true
elsif cmd_rc_act[:html_navigation_bar][:set]==:off
false
- elsif defined? @md.make.html_navigation_bar? \
- and @md.make.html_navigation_bar? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_navigation_bar? \
+ and doc_rc.html_navigation_bar? ==:off
false
elsif env_rc.build.html_navigation_bar? ==:off
false
@@ -3688,8 +3836,9 @@ WOK
true
elsif cmd_rc_act[:search_form][:set]==:off
false
- elsif defined? @md.make.html_search_form? \
- and @md.make.search_form? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_search_form? \
+ and doc_rc.search_form? ==:off
false
elsif env_rc.build.search_form? ==:off
false
@@ -3704,9 +3853,10 @@ WOK
elsif cmd_rc_act[:html_search_form][:set]==:off \
|| cmd_rc_act[:search_form][:set]==:off
false
- elsif defined? @md.make.html_search_form? \
- and (@md.make.html_search_form? ==:off \
- || @md.make.search_form? ==:off)
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_search_form? \
+ and (doc_rc.html_search_form? ==:off \
+ || doc_rc.search_form? ==:off)
false
elsif env_rc.build.html_search_form? ==:off \
|| env_rc.build.search_form? ==:off
@@ -3722,8 +3872,9 @@ WOK
true
elsif cmd_rc_act[:html_right_pane][:set]==:off
false
- elsif defined? @md.make.html_right_pane? \
- and @md.make.html_right_pane? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.html_right_pane? \
+ and doc_rc.html_right_pane? ==:off
false
elsif env_rc.build.html_right_pane? ==:off
false
@@ -3736,8 +3887,9 @@ WOK
true
elsif cmd_rc_act[:segsubtoc][:set]==:off
false
- elsif defined? @md.make.segsubtoc? \
- and @md.make.segsubtoc? ==:off
+ elsif doc_rc.is_a?(Method) \
+ and defined? doc_rc.segsubtoc? \
+ and doc_rc.segsubtoc? ==:off
false
elsif env_rc.build.segsubtoc? ==:off
false
@@ -3827,14 +3979,13 @@ WOK
class InfoDb < InfoEnv
@@rc=nil
def initialize
- @@pwd ||=Dir.pwd
- @pwd=Dir.pwd
+ @@pwd=@pwd=SiSU_Utils::Path.new.base_markup
@env=SiSU_Env::InfoEnv.new
pt=Pathname.new(@pwd)
r=Px[:lng_lst_rgx]
u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
@pwd_stub=pt.realpath.to_s[u,1]
- @rc=@@rc ||=GetInit.instance.sisu_yaml.rc
+ @rc=@@rc ||=GetInit.new.sisu_yaml.rc
@defaults=SiSU_Env::InfoEnv.new.defaults
end
def share_source?
@@ -4099,7 +4250,7 @@ WOK
@@filename_html_scroll=File.new(p_fn,'w+')
end
def html_seg_index
- pth=((by_filename?) \
+ pth=((output_dir_structure.by_filename?) \
|| (output_dir_structure.dump?)) \
? "#{output_path.html.dir}"
: "#{output_path.html.dir}/#{@md.fnb}"
@@ -4109,7 +4260,7 @@ WOK
@@filename_html_index=File.new(p_fn,'w+')
end
def html_segtoc
- pth=((by_filename?) \
+ pth=((output_dir_structure.by_filename?) \
|| (output_dir_structure.dump?) \
|| (output_dir_structure.redirect?)) \
? "#{output_path.html.dir}"
@@ -4818,7 +4969,7 @@ WOK
if output_dir_structure.dump_or_redirect?
'.'
elsif output_dir_structure.by_language_code?
- "../../#{@ft}/#{@md.opt.lng}"
+ "../../#{@ft}"
else
"../#{@ft}"
end
@@ -5303,6 +5454,17 @@ WOK
def rel
set_path(ft).rel.abc
end
+ def rel_image
+ if output_dir_structure.dump_or_redirect?
+ './image'
+ elsif output_dir_structure.by_language_code?
+ '../../_sisu/image'
+ elsif output_dir_structure.by_filetype?
+ '../_sisu/image'
+ else
+ '../_sisu/image'
+ end
+ end
def rcp
set_path(ft).rcp.abc
end
@@ -5549,6 +5711,10 @@ WOK
filename_index="#{@pth}/#{Ep[:d_oebps]}/index.xhtml"
File.new(filename_index,'w+')
end
+ def xhtml_cover_image
+ filename_index="#{@pth}/#{Ep[:d_oebps]}/cover_image.xhtml"
+ File.new(filename_index,'w+')
+ end
def xhtml_segtoc
filename_segtoc="#{@pth}/#{Ep[:d_oebps]}/toc.xhtml"
File.new(filename_segtoc,'w+')
@@ -5627,98 +5793,6 @@ WOK
@editor,@wc,@tidy,@rexml,@pdflatex,@postgresql,@sqlite=prog.text_editor,prog.wc,prog.tidy,prog.rexml,prog.pdflatex,prog.postgresql,prog.sqlite
end
end
- class InfoSkin
- def initialize(md=nil,skin=nil)
- @md=md
- @d_sk=if skin.is_a?(String)
- skin
- elsif defined? md.doc_skin \
- and md.doc_skin
- md.doc_skin
- else nil
- end
- @home,@pwd=ENV['HOME'],ENV['PWD']
- m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
- @pwd_stub=@pwd[m,1]
- @env=SiSU_Env::InfoEnv.new
- end
- def apply
- if @m.respond_to?(:make) \
- and @md.make.respond_to(:skin)
- skin_path=unless @md.opt.f_pth[:pth] =~/\/\S+?\/#{Gt[:sisupod]}\/\S+?\/#{Gt[:pod]}\/#{Gt[:doc]}/
- [
- "#{@env.path.pwd}/_sisu/skin",
- "#{@env.path.home}/.sisu/skin",
- '/etc/sisu/skin',
- "#{@env.processing_path.processing_sisupod(@md.opt)}/external_document/skin"
- ]
- else #sisupod
- pt=/(\/\S+?\/#{Gt[:sisupod]}\/\S+?\/#{Gt[:pod]}\/#{Gt[:doc]})/.match(@md.opt.f_pth[:pth])[1]
- [ "#{pt}/_sisu/skin" ]
- end
- sk_doc,sk_dir="doc/#{@md.make.skin}.rb","dir/skin_#{@env.stub_pwd}.rb"
- skin_path.each do |v| #document skin priority 1
- if FileTest.file?("#{v}/#{sk_doc}")
- @skin_apply={ name: @md.make.skin, name_path: "#{v}/#{sk_doc}", type: :doc }
- break
- end
- end
- unless @skin_apply.length > 0
- skin_path.each do |v| #directory skin priority 2
- if FileTest.file?("#{v}/#{sk_dir}")
- @skin_apply={ name: "skin_#{@env.stub_pwd}.rb", name_path: "#{v}/#{sk_dir}", type: :dir }
- break
- end
- end
- end
- else nil
- end
- @skin_apply
- end
- def select # skin loading logic here
- load "#{SiSU_lib}/defaults.rb"
- skin_path=[]
- @env.sys.rc_path.each {|x| skin_path << "#{x}/skin"}
- skin_path << "#{@env.processing_path.processing}/external_document/skin"
- skin=if @pwd_stub =~/^(?:doc|sisupod)$/ \
- and ((! @md.nil?) \
- && (defined? @md.opt) \
- && (defined? @md.opt.mod) \
- && @md.opt.mod.inspect !~/--trust/)
- true # security only run skins on sisupod if --trust flag is provided
- elsif @pwd_stub =~/^(?:doc|sisupod)$/ # consider/reconsider doc
- false
- else true
- end
- doc_skin,dir_skin=nil,nil
- if skin
- unless @d_sk.nil?
- sk_doc="doc/#{@d_sk}.rb"
- skin_path.each do |v| # document skin priority 1
- if FileTest.file?("#{v}/#{sk_doc}")
- doc_skin="#{v}/#{sk_doc}"
- load doc_skin
- break
- end
- end
- end
- unless doc_skin
- sk_dir="dir/skin_#{@pwd_stub}.rb"
- skin_path.each do |v| # directory skin priority 2
- if FileTest.file?("#{v}/#{sk_dir}")
- dir_skin="#{v}/#{sk_dir}"
- load dir_skin
- break
- end
- end
- end
- end
- sk=if doc_skin; doc_skin
- elsif dir_skin; dir_skin
- else nil
- end
- end
- end
class CSS_Default
def html
'html.css'
@@ -5823,13 +5897,16 @@ WOK
@file=SiSU_Env::FileOp.new(@md)
end
def html
- %{ <link rel="stylesheet" href="#{@file.path_rel_links.html_scroll_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+ stylesheet="#{@file.path_rel_links.html_scroll_css}#{@env.path.style}/#{@css.html}"
+ %{ <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
end
def html_seg
- %{ <link rel="stylesheet" href="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+ stylesheet="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}"
+ %{ <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
end
def html_tables
- %{ <link rel="stylesheet" href="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}" type="text/css" />}
+ stylesheet="#{@file.path_rel_links.html_seg_css}#{@env.path.style}/#{@css.html}"
+ %{ <link rel="stylesheet" href="#{stylesheet}" type="text/css" />}
end
def xhtml_epub
%{ <link rel="stylesheet" href="css/xhtml.css" type="text/css" />}
@@ -5838,13 +5915,16 @@ WOK
xhtml_epub
end
def xhtml
- %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xhtml_css}#{@env.path.style}/#{@css.xhtml}"?>}
+ stylesheet="#{@file.path_rel_links.xhtml_css}#{@env.path.style}/#{@css.xhtml}"
+ %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
end
def xml_sax
- %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_sax}"?>}
+ stylesheet="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_sax}"
+ %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
end
def xml_dom
- %{<?xml-stylesheet type="text/css" href="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_dom}"?>}
+ stylesheet="#{@file.path_rel_links.xml_css}#{@env.path.style}/#{@css.xml_dom}"
+ %{<?xml-stylesheet type="text/css" href="#{stylesheet}"?>}
end
end
class CreateSite < InfoEnv
@@ -5853,36 +5933,37 @@ WOK
def initialize(cmd)
@cmd=cmd
@env=SiSU_Env::InfoEnv.new
+ @init=SiSU_Env::GetInit.new
@home,@pwd=ENV['HOME'],ENV['PWD'] #@pwd=Dir.pwd
- @rc=GetInit.instance.sisu_yaml.rc
- @vz=SiSU_Env::GetInit.instance.skin
+ @rc=GetInit.new.sisu_yaml.rc
+ @vz=SiSU_Viz::Defaults.new
@vz_home=SiSU_Viz::Home.new
end
- def homepage
- home_pages_manually_created=nil
- @env.sys.rc_path.each do |v|
- home_pages_manually_created=Dir.glob("#{v}/home/*.html")
- if home_pages_manually_created.length > 0
- break
- end
+ def create_default_sisu_homepage(action=:none)
+ if action==:none
+ puts %{ place your homepages in directory:\n "#{@env.path.rc}/home/*.html"\n (no action taken)}
+ else
+ puts %{ place your homepages in directory:\n "#{@env.path.rc}/home/*.html"\n (in order to replace default sisu homepage)}
+ filename_homepage="#{@env.path.webserv}/#{@env.path.stub_pwd}/index.html"
+ filename_home_toc="#{@env.path.webserv}/#{@env.path.stub_pwd}/toc.html"
+ file_homepage=File.new(filename_homepage,'w')
+ file_home_toc=File.new(filename_home_toc,'w')
+ file_homepage << @vz_home.homepage
+ file_home_toc << @vz_home.homepage
+ file_homepage.close
+ file_home_toc.close
end
+ end
+ def homepage
+ home_pages_manually_created=Dir.glob("#{@env.path.rc}/home/*.html")
FileUtils::mkdir_p("#{@env.path.webserv}/#{@env.path.stub_pwd}") unless FileTest.directory?("#{@env.path.webserv}/#{@env.path.stub_pwd}")
- if home_pages_manually_created
- FileUtils.cp(home_pages_manually_created,"#{@env.path.webserv}/#{@env.path.stub_pwd}")
- else
- doc_skin=nil
- sk_doc='doc/skin_sisu.rb'
- @env.sys.rc_path.each do |v| #document skin priority 1
- if FileTest.file?("#{v}/skin/#{sk_doc}")
- doc_skin="#{v}/skin/#{sk_doc}"
- load doc_skin
- break
- end
+ if home_pages_manually_created.length > 0
+ home_pages_manually_created.each do |homepage|
+ FileUtils.cp(homepage,"#{@env.path.webserv}/#{@env.path.stub_pwd}")
end
- filename_homepage=File.new("#{@env.path.webserv}/#{@env.path.stub_pwd}/index.html",'w')
- filename_homepage_toc=File.new("#{@env.path.webserv}/#{@env.path.stub_pwd}/toc.html",'w')
- filename_homepage << @vz_home.homepage
- filename_homepage_toc << @vz_home.homepage
+ else
+ create_default_sisu_homepage(:none)
+ #create_default_sisu_homepage(:default)
end
end
def cp_images(src_path,dest_path)
@@ -5930,7 +6011,9 @@ WOK
cp_images(src,dest) if FileTest.directory?(src)
end
def cp_base_images #fix images
- src="#{@env.path.share}/image"
+ src=SiSU_path_base \
+ ? SiSU_path_base + '/data/sisu/image'
+ : "#{@env.path.share}/image"
dest_arr=[
"#{@env.path.webserv}/_sisu/image_sys",
"#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_sys"
diff --git a/lib/sisu/v3/termsheet.rb b/lib/sisu/v5/termsheet.rb
index d6f18987..e25673b4 100644
--- a/lib/sisu/v3/termsheet.rb
+++ b/lib/sisu/v5/termsheet.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/termsheet.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/termsheet.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/texinfo.rb b/lib/sisu/v5/texinfo.rb
index d2a96844..069d9166 100644
--- a/lib/sisu/v3/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/texinfo.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -82,7 +82,7 @@ module SiSU_TexInfo
@opt=opt
@md=SiSU_Param::Parameters.new(@opt).get
@env=SiSU_Env::InfoEnv.new(@opt.fns)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def directories
begin
@@ -138,7 +138,7 @@ module SiSU_TexInfo
def initialize(md,data)
@md,@data=md,data
@env=SiSU_Env::InfoEnv.new(@md.fns)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@f=SiSU_Env::FileOp.new(@md)
end
def songsheet
diff --git a/lib/sisu/v3/texinfo_format.rb b/lib/sisu/v5/texinfo_format.rb
index af968cac..e4efdb3b 100644
--- a/lib/sisu/v3/texinfo_format.rb
+++ b/lib/sisu/v5/texinfo_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/texinfo_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -77,7 +77,7 @@ module SiSU_TexInfoFormat
p dob.class
p caller
end
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def head
t=Time.now
@@ -175,14 +175,6 @@ WOK
and @md.creator.author=~/\S+/
author=spec_char(@md.creator.author)
end
- if defined? @md.classify.subject \
- and @md.classify.subject=~/\S+/
- subject=spec_char(@md.classify.subject)
- end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/
- description=spec_char(@md.description)
- end
if defined? @md.publisher \
and @md.publisher=~/\S+/
publisher=spec_char(@md.publisher)
@@ -215,15 +207,31 @@ WOK
and @md.date.modified=~/\S+/
date_modified=spec_char(@md.date.modified)
end
- type=spec_char(@md.type) if @md.type #dc
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/
- format=spec_char(@md.classify.format)
+ if defined? @md.classify.subject \
+ and @md.classify.subject=~/\S+/
+ subject=spec_char(@md.classify.subject)
+ end
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/
+ description=spec_char(@md.description)
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/
- identifier=spec_char(@md.classify.identifier)
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/
+ coverage=spec_char(@md.notes.coverage)
end
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/
+ relation=spec_char(@md.notes.relation)
+ end
+ #type=spec_char(@md.type) if @md.type #dc
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/
+ format=spec_char(@md.notes.format)
+ end
+ #if defined? @md.identifier.sisupod \
+ #and @md.identifier.sisupod=~/\S+/
+ # identifier=spec_char(@md.identifier.sisupod)
+ #end
if defined? @md.original.source \
and @md.original.source=~/\S+/
source=spec_char(@md.original.source)
@@ -232,14 +240,6 @@ WOK
and @md.title.language=~/\S+/
language=spec_char(@md.title.language)
end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/
- relation=spec_char(@md.classify.relation)
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/
- coverage=spec_char(@md.classify.coverage)
- end
if defined? @md.rights.all \
and @md.rights.all=~/\S+/
rights=spec_char(@md.rights.all)
diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 1221d818..7a98d9fa 100644
--- a/lib/sisu/v3/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/texpdf.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -113,14 +113,17 @@ module SiSU_TeX
SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").green_title_hi unless @opt.cmd =~/q/
if @opt.cmd =~/[MVv]/
path=@env.url.output_tell
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").flow
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@opt.fns} #{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow
+ if @md.opt.act[:pdf_l][:set]==:on
+ SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").flow
+ end
+ if @md.opt.act[:pdf_p][:set]==:on
+ SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@opt.fns} #{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow
+ end
end
@md=@particulars.md
$flag=@md.opt.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format
directories
#% needed needs to be reprogrammed !!!
- SiSU_Env::InfoSkin.new(@md).select
dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_TeX::Source::LaTeXcreate.new(@particulars).songsheet
dal_array=''
@@ -162,27 +165,35 @@ module SiSU_TeX
def latex_do(texfilename,papersize)
@texfilename=texfilename
@@n_lpdf=@@n_lpdf+1
- SiSU_Screen::Ansi.new(@md.opt.cmd,"#{papersize} portrait ->").dark_grey_title_hi if @md.opt.cmd =~/[MVv]/
tex_fn_base=@texfilename.gsub(/\.tex$/,'')
- cmd=SiSU_Env::SystemCall.new("#{tex_fn_base}.tex",'',@md.opt.cmd)
tell=SiSU_Screen::Ansi.new(@md.opt.cmd)
- tell.grey_open if @md.opt.cmd =~/[MVv]/
- if "#{tex_fn_base}" =~/\w+/ \
- and "#{papersize}" =~/\w+/
- 2.times { |i| cmd.latex2pdf(@md,papersize) } #comment out to skip processing of latex portrait
- end
- tell.p_off if @md.opt.cmd =~/[MVv]/
- SiSU_Screen::Ansi.new(@md.opt.cmd,"#{papersize} landscape ->").dark_grey_title_hi if @md.opt.cmd =~/[MVv]/
- cmd=SiSU_Env::SystemCall.new("#{tex_fn_base}.landscape.tex",'',@md.opt.cmd)
- tell.grey_open if @md.opt.cmd =~/[MVv]/
- if "#{tex_fn_base}" =~/\w+/ \
- and "#{papersize}" =~/\w+/
- 2.times { |i| cmd.latex2pdf(@md,papersize) } #comment out to skip processing of latex landscape
- end
- tell.p_off if @md.opt.cmd =~/[MVv]/
+ if @md.opt.act[:pdf_p][:set]==:on
+ SiSU_Screen::Ansi.new(@md.opt.cmd,"#{papersize} portrait ->").dark_grey_title_hi if @md.opt.cmd =~/[MVv]/
+ cmd=SiSU_Env::SystemCall.new("#{tex_fn_base}.tex",'',@md.opt.cmd)
+ tell.grey_open if @md.opt.cmd =~/[MVv]/
+ if "#{tex_fn_base}" =~/\w+/ \
+ and "#{papersize}" =~/\w+/
+ 2.times { |i| cmd.latex2pdf(@md,papersize) } #comment out to skip processing of latex portrait
+ end
+ tell.p_off if @md.opt.cmd =~/[MVv]/
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ SiSU_Screen::Ansi.new(@md.opt.cmd,"#{papersize} landscape ->").dark_grey_title_hi if @md.opt.cmd =~/[MVv]/
+ cmd=SiSU_Env::SystemCall.new("#{tex_fn_base}.landscape.tex",'',@md.opt.cmd)
+ tell.grey_open if @md.opt.cmd =~/[MVv]/
+ if "#{tex_fn_base}" =~/\w+/ \
+ and "#{papersize}" =~/\w+/
+ 2.times { |i| cmd.latex2pdf(@md,papersize) } #comment out to skip processing of latex landscape
+ end
+ tell.p_off if @md.opt.cmd =~/[MVv]/
+ end
pwd=Dir.pwd
- portrait_pdf="#{pwd}/#{tex_fn_base}.pdf"
- landscape_pdf="#{pwd}/#{tex_fn_base}.landscape.pdf"
+ if @md.opt.act[:pdf_p][:set]==:on
+ portrait_pdf="#{pwd}/#{tex_fn_base}.pdf"
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ landscape_pdf="#{pwd}/#{tex_fn_base}.landscape.pdf"
+ end
case papersize
when /a4/; pdf_p=@f.pdf_p_a4; pdf_l=@f.pdf_l_a4
when /a5/; pdf_p=@f.pdf_p_a5; pdf_l=@f.pdf_l_a5
@@ -192,15 +203,24 @@ module SiSU_TeX
else pdf_p=@f.pdf_p_a4; pdf_l=@f.pdf_l_a4
end
FileUtils::mkdir_p(@md.file.output_path.pdf.dir) unless FileTest.directory?(@md.file.output_path.pdf.dir)
- if FileTest.file?(portrait_pdf)
- FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}")
- FileUtils::rm(portrait_pdf)
- else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/
+ cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
+ if @md.opt.act[:pdf_p][:set]==:on
+ if FileTest.file?(portrait_pdf)
+ FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}")
+ FileUtils::rm(portrait_pdf)
+ else
+ STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{portrait_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+ STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/
+ end
end
- if FileTest.file?(landscape_pdf)
- FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}")
- FileUtils::rm(landscape_pdf)
- else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/
+ if @md.opt.act[:pdf_l][:set]==:on
+ if FileTest.file?(landscape_pdf)
+ FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}")
+ FileUtils::rm(landscape_pdf)
+ else
+ STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{landscape_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+ STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/
+ end
end
SiSU_Screen::Ansi.new(@md.opt.cmd,@@n_lpdf,'processed (SiSU LaTeX to pdf - using pdfetex aka. pdftex or pdflatex)').generic_number if @md.opt.cmd =~/[MVv]/
end
@@ -219,13 +239,18 @@ module SiSU_TeX
Dir.chdir(@env.processing_path.tex)
texfile=@md.fns.gsub(/$/,".#{ps}.tex").
gsub(/~/,'-')
- if File.exist?(texfile) \
- and File.size(texfile) > 0
- @tex_f_no+=1
- #p "#{__FILE__}:#{__LINE__} texpdf generation disabled" if @md.opt.cmd.inspect =~/M/ #%% disable temporarily, re-enable
+ if @md.opt.act[:pdf_p][:set]==:on \
+ or @md.opt.act[:pdf_l][:set]==:on
latex_do(texfile,ps)
- else
- puts "\tzero file size #{@env.processing_path.tex}/#{texfile}"
+ if @md.opt.act[:pdf_p][:set]==:on
+ if File.exist?(texfile) \
+ and File.size(texfile) > 0
+ #@tex_f_no+=1
+ else
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
+ puts "\tzero file size #{@env.processing_path.tex}/#{texfile}"
+ end
+ end
end
end
end
@@ -239,31 +264,33 @@ module SiSU_TeX
when /legal/; pdf_p=@f.pdf_p_legal; pdf_l=@f.pdf_l_legal
else pdf_p=@f.pdf_p_a4; pdf_l=@f.pdf_l_a4
end
- if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{pdf_p}")
- mklnk=if @md.file.output_dir_structure.by_language_code? \
- or @md.file.output_dir_structure.by_filetype?
- "#{@md.fnb}.portrait.pdf"
- else 'portrait.pdf'
+ if @md.opt.act[:pdf_p][:set]==:on
+ if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{pdf_p}")
+ mklnk=((@md.file.output_dir_structure.by_language_code?) \
+ || (@md.file.output_dir_structure.by_filetype?)) \
+ ? "#{@md.fnb}.portrait.pdf"
+ : 'portrait.pdf'
+ if FileTest.directory?(@md.file.output_path.pdf.dir)
+ pwd=Dir.pwd
+ Dir.chdir(@md.file.output_path.pdf.dir)
+ FileUtils::rm_f(mklnk)
+ FileUtils::ln_s(pdf_p, mklnk)
+ Dir.chdir(pwd)
+ end
end
- if FileTest.directory?(@md.file.output_path.pdf.dir)
- pwd=Dir.pwd
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{pdf_l}")
+ mklnk=((@md.file.output_dir_structure.by_language_code?) \
+ || (@md.file.output_dir_structure.by_filetype?)) \
+ ? "#{@md.fnb}.landscape.pdf"
+ : 'landscape.pdf'
+ pwd_set=Dir.pwd
Dir.chdir(@md.file.output_path.pdf.dir)
FileUtils::rm_f(mklnk)
- FileUtils::ln_s(pdf_p, mklnk)
- Dir.chdir(pwd)
- end
- end
- if FileTest.file?("#{@md.file.output_path.pdf.dir}/#{pdf_l}")
- mklnk=if @md.file.output_dir_structure.by_language_code? \
- or @md.file.output_dir_structure.by_filetype?
- "#{@md.fnb}.landscape.pdf"
- else 'landscape.pdf'
+ FileUtils::ln_s(pdf_l, mklnk)
+ Dir.chdir(pwd_set)
end
- pwd_set=Dir.pwd
- Dir.chdir(@md.file.output_path.pdf.dir)
- FileUtils::rm_f(mklnk)
- FileUtils::ln_s(pdf_l, mklnk)
- Dir.chdir(pwd_set)
end
else
SiSU_Screen::Ansi.new(@md.opt.cmd,"*WARN* FILE NOT FOUND: << #{@md.fns} >> - requested latex system processing skipped").warn
@@ -294,9 +321,9 @@ module SiSU_TeX
@data=@particulars.dal_array # dal file drawn here
@st={ tex: {} }
@tex_ml=SiSU_TeX_Pdf::UseTeX.new(@md)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@dp=@@dp ||=SiSU_Env::InfoEnv.new.digest.pattern
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
@language=l[:n]
@translate=SiSU_Translate::Source.new(@md,@language)
@@ -308,7 +335,18 @@ module SiSU_TeX
data=@data
@@tex_footnote_array=[]
@@rights=nil
- SiSU_Screen::Ansi.new(@md.opt.cmd,"pdfTex portrait & landscape").txt_grey if @md.opt.cmd=~/[MVvz]/
+ txt_gen=if @md.opt.act[:pdf_l][:set]==:on \
+ and @md.opt.act[:pdf_p][:set]==:on
+ 'pdfTex portrait & landscape'
+ elsif @md.opt.act[:pdf_l][:set]==:on
+ 'pdfTex landscape'
+ elsif @md.opt.act[:pdf_p][:set]==:on
+ 'pdfTex portrait'
+ else
+ puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
+ 'error: neither landscape nor portrait'
+ end
+ SiSU_Screen::Ansi.new(@md.opt.cmd,txt_gen).txt_grey if @md.opt.cmd=~/[MVvz]/
if defined? @md.rights.all \
and not @md.rights.all.empty?
rght=@md.rights #.author.dup #dup is necessary, else contents of :rights changed
@@ -365,6 +403,7 @@ module SiSU_TeX
elsif dob.is ==:break
if dob.obj==Mx[:br_page]; dob.tmp='\newpage'
elsif dob.obj==Mx[:br_page_new]; dob.tmp='\clearpage'
+ elsif dob.obj==Mx[:br_page_line]; dob.tmp=' \\ \hline \\ '
elsif dob.obj==Mx[:br_obj]; dob.tmp='\parasep'
end
elsif dob.is==:comment \
@@ -612,7 +651,7 @@ module SiSU_TeX
dob
end
def tex_box_listings
- <<WOK
+ <<-WOK
\\definecolor{listinggray}{gray}{0.9}
\\definecolor{lbcolor}{rgb}{0.9,0.9,0.9}
\\lstset{
@@ -637,10 +676,10 @@ module SiSU_TeX
commentstyle=\\color[rgb]{0.133,0.545,0.133},
stringstyle=\\color[rgb]{0.627,0.126,0.941},
}
-WOK
+ WOK
end
def tex_box_boites
- <<WOK
+ <<-WOK
\\def\\codeblockboitebox{%
\\def\\bkvz@before@breakbox{\\ifhmode\\par\\fi\\vskip\\breakboxskip\\relax}%
\\def\\bkvz@set@linewidth{\\advance\\linewidth -2\\fboxrule
@@ -658,7 +697,7 @@ WOK
\\def\\bkvz@bottom{\\hrule\\@height\\fboxrule}%
\\breakbox}
\\def\\endcodeblockboitebox{\\endbreakbox}
-WOK
+ WOK
end
def tex_codeblock
codeblock_box=if @codeblock_box=='listings'
@@ -676,14 +715,18 @@ WOK
home=@vz.txt_home.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}|#{Mx[:br_paragraph]}|\\\\/,' - ') #no line splitting in heading neither html nor latex
title=@md.title.full.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}|#{Mx[:br_paragraph]}|\\\\/,' - ') #no line splitting in heading neither html nor latex
@md.papersize_array.each do |ps|
- txt_obj={ txt: "#{home}: - #{title}", paper_size: ps, orientation: 'portrait' }
- orient_portrait=SiSU_TeX_Pdf::FormatHead.new(@md,txt_obj)
- txt_obj={ txt: "#{home}: - #{title}", paper_size: ps, orientation: 'landscape' }
- orient_landscape=SiSU_TeX_Pdf::FormatHead.new(@md,txt_obj)
- @@tex_head[ps][:p]=orient_portrait.document_head_with_orientation(@codeblock_box)
- @@tex_head[ps][:l]=orient_landscape.document_head_with_orientation(@codeblock_box)
- end
- @tex_file <<<<WOK
+ if @md.opt.act[:pdf_p][:set]==:on
+ txt_obj={ txt: "#{home}: - #{title}", paper_size: ps, orientation: 'portrait' }
+ orient_portrait=SiSU_TeX_Pdf::FormatHead.new(@md,txt_obj)
+ @@tex_head[ps][:p]=orient_portrait.document_head_with_orientation(@codeblock_box)
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ txt_obj={ txt: "#{home}: - #{title}", paper_size: ps, orientation: 'landscape' }
+ orient_landscape=SiSU_TeX_Pdf::FormatHead.new(@md,txt_obj)
+ @@tex_head[ps][:l]=orient_landscape.document_head_with_orientation(@codeblock_box)
+ end
+ end
+ @tex_file <<<<-WOK
#{@tex_ml.header}#{@tex_ml.footer}
\\tolerance=300
\\clubpenalty=300
@@ -713,15 +756,19 @@ WOK
% (tilde hash amp affected by http)
% \\sloppy
\\begin{document}
-WOK
+ WOK
sisu_rc_footnote=if @md.sc_info then @tex_ml.doc_sc_info_footnote_full
else @tex_ml.doc_sc_info_footnote_brief
end
@copymark='' #check and remove as now is superflous
x={}
txt_obj={ title: @md.title.full }
- x[:l]=SiSU_TeX_Pdf::FormatTextObject.new(@md,txt_obj).title_landscape
- x[:p]=SiSU_TeX_Pdf::FormatTextObject.new(@md,txt_obj).title_portrait
+ if @md.opt.act[:pdf_l][:set]==:on
+ x[:l]=SiSU_TeX_Pdf::FormatTextObject.new(@md,txt_obj).title_landscape
+ end
+ if @md.opt.act[:pdf_p][:set]==:on
+ x[:p]=SiSU_TeX_Pdf::FormatTextObject.new(@md,txt_obj).title_portrait
+ end
@tex_file << x
x=nil
if defined? @md.creator.author \
@@ -729,20 +776,34 @@ WOK
sp_char=SiSU_TeX_Pdf::SpecialCharacters.new(@md,@md.creator.author)
author=sp_char.special_characters
@tex_file << if @md.author_home
- <<WOK
+ <<-WOK
\\author{\\href{#{@md.author_home}}{#{@copymark} \\textnormal{#{author}}}}
-WOK
+ WOK
else "\n\\author{#{@copymark} \\textnormal{#{author}}}"
end
end
- @tex_file << unless @md.fnb =~/^mail\s*$/; @tex_ml.site
- else '\date'
+ if defined? @md.make.cover_image \
+ and not @md.make.cover_image.nil? \
+ and @md.make.cover_image[:cover] =~/\S+/
+ x={}
+ dir=SiSU_Env::InfoEnv.new(@md.fns)
+ x[:l] =<<-WOK
+\\titlepic{\\includegraphics[width=0.3\\textwidth]{#{dir.path.image_source_include}/#{@md.make.cover_image[:cover]}}}
+ WOK
+ x[:p] =<<-WOK
+\\titlepic{\\includegraphics[width=0.6\\textwidth]{#{dir.path.image_source_include}/#{@md.make.cover_image[:cover]}}}
+ WOK
+ @tex_file << x
+ x=nil
end
- @tex_file <<<<WOK
+ @tex_file << unless @md.fnb =~/^mail\s*$/ then @tex_ml.site
+ else '\date'
+ end
+ @tex_file <<<<-WOK
\\pagenumbering{roman}\\maketitle
\\pagestyle{fancy}
-WOK
+ WOK
if defined? @md.rights.all \
and @md.rights.all
@tex_file << "\\newpage\n"
@@ -751,24 +812,27 @@ WOK
end
x={}
if (@make.build.toc?)
- toc=<<WOK
+ toc=<<-WOK
\\renewcommand{\\contentsname}{#{@translate.contents}}
\\tableofcontents
-WOK
+ WOK
toc_pb={ l: @tex_ml.newpage('landscape'), p: @tex_ml.newpage('portrait') }
else
toc=''
toc_pb={ l: '', p: '' }
end
- x[:l] =<<WOK
+ if @md.opt.act[:pdf_l][:set]==:on
+ x[:l] =<<-WOK
#{@tex_ml.newpage('landscape')}
\\pagestyle{fancy}
#{toc}#{toc_pb[:l]}
\\pagenumbering{arabic}
#{@tex_ml.paraskip_normal}
#{@tex_ml.newpage('landscape')}
-WOK
- x[:p] =<<WOK
+ WOK
+ end
+ if @md.opt.act[:pdf_p][:set]==:on
+ x[:p] =<<-WOK
#{@tex_ml.newpage('portrait')}
\\pagestyle{fancy}
#{toc}#{toc_pb[:p]}
@@ -776,7 +840,8 @@ WOK
\\pagenumbering{arabic}
#{@tex_ml.paraskip_normal}
#{@tex_ml.newpage('portrait')}
-WOK
+ WOK
+ end
@tex_file << x
x=nil
data.each do |dob| #% case follows with levels 1-6 indents & graphics
@@ -888,59 +953,77 @@ WOK
def output_morph_hash(o)
ps,h,fn=o[:ps],o[:h],o[:filename]
if h[ps] \
- and (h[ps][:p] and h[ps][:l])
- if h[ps][:p]
- h[ps][:p]=h[ps][:p].gsub(/[ ]+$/m,'').
- gsub(/\n\n\n+/m,"\n\n")
- end
- if h[ps][:l]
- h[ps][:l]=h[ps][:l].gsub(/[ ]+$/m,'').
- gsub(/\n\n\n+/m,"\n\n")
- end
- #h[ps][:p].gsub!(/(?:^[ ]+|[ ]+$)/m,'') if h[ps][:p]
- #h[ps][:l].gsub!(/(?:^[ ]+|[ ]+$)/m,'') if h[ps][:l]
- if h[ps][:p] !~/\A\s*\Z/
- fn[:portrait].puts h[ps][:p],"\n"
- end
- if h[ps][:l] !~/\A\s*\Z/
- fn[:landscape].puts h[ps][:l],"\n"
- end
- elsif (h[:p] and h[:l])
- if h[:p]
- h[:p]=h[:p].gsub(/[ ]+$/m,'').
- gsub(/\n\n\n+/m,"\n\n")
+ and (h[ps][:p] or h[ps][:l])
+ if @md.opt.act[:pdf_p][:set]==:on
+ if h[ps][:p]
+ h[ps][:p]=h[ps][:p].gsub(/[ ]+$/m,'').
+ gsub(/\n\n\n+/m,"\n\n")
+ end
+ if h[ps][:p] !~/\A\s*\Z/
+ fn[:portrait].puts h[ps][:p],"\n"
+ end
end
- if h[:l]
- h[:l]=h[:l].gsub(/[ ]+$/m,'').
- gsub(/\n\n\n+/m,"\n\n")
+ if @md.opt.act[:pdf_l][:set]==:on
+ if h[ps][:l]
+ h[ps][:l]=h[ps][:l].gsub(/[ ]+$/m,'').
+ gsub(/\n\n\n+/m,"\n\n")
+ end
+ if h[ps][:l] !~/\A\s*\Z/
+ fn[:landscape].puts h[ps][:l],"\n"
+ end
end
- #h[:p].gsub!(/(?:^[ ]+|[ ]+$)/m,'') if h[:p]
- #h[:l].gsub!(/(?:^[ ]+|[ ]+$)/m,'') if h[:l]
- if h[:p] !~/\A\s*\Z/
- fn[:portrait].puts h[:p],"\n"
+ elsif (h[:p] or h[:l])
+ if @md.opt.act[:pdf_p][:set]==:on
+ if h[:p]
+ h[:p]=h[:p].gsub(/[ ]+$/m,'').
+ gsub(/\n\n\n+/m,"\n\n")
+ end
+ if h[:p] !~/\A\s*\Z/
+ fn[:portrait].puts h[:p],"\n"
+ end
end
- if h[:l] !~/\A\s*\Z/
- fn[:landscape].puts h[:l],"\n"
+ if @md.opt.act[:pdf_l][:set]==:on
+ if h[:l]
+ h[:l]=h[:l].gsub(/[ ]+$/m,'').
+ gsub(/\n\n\n+/m,"\n\n")
+ end
+ if h[:l] !~/\A\s*\Z/
+ fn[:landscape].puts h[:l],"\n"
+ end
end
else p "#{__FILE__}:#{__LINE__}" if @md.opt.cmd.inspect =~/M/
end
end
def output(array)
@array=array=array.flatten.compact
- fns_l=@md.fns.gsub(/~/,'-') #this is a sorry fix, but necessary as it appears latex programs like not ~
+ fns=@md.fns.gsub(/~/,'-') #this is a sorry fix, but necessary as it appears latex programs like not ~
@md.papersize_array.each do |ps|
+ texfile_landscape=(@md.opt.act[:pdf_l][:set]==:on) \
+ ? (File.new("#{@env.processing_path.tex}/#{fns}.#{ps}.landscape.tex",'w+'))
+ : nil
+ texfile_portrait=(@md.opt.act[:pdf_p][:set]==:on) \
+ ? (File.new("#{@env.processing_path.tex}/#{fns}.#{ps}.tex",'w+'))
+ : nil
file={
- landscape: File.new("#{@env.processing_path.tex}/#{fns_l}.#{ps}.landscape.tex",'w+'),
- portrait: File.new("#{@env.processing_path.tex}/#{fns_l}.#{ps}.tex",'w+')
+ landscape: texfile_landscape,
+ portrait: texfile_portrait
}
- file[:portrait] << @@tex_head[ps][:p]
- file[:landscape] << @@tex_head[ps][:l]
+ if @md.opt.act[:pdf_p][:set]==:on
+ file[:portrait] << @@tex_head[ps][:p]
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ file[:landscape] << @@tex_head[ps][:l]
+ end
array.each do |morph|
if morph.is_a?(String)
#morph.gsub!(/^\s+/,'')
if morph !~/\A\s*\Z/
- file[:portrait].puts morph,"\n"
- file[:landscape].puts morph,"\n"
+ if @md.opt.act[:pdf_p][:set]==:on
+ file[:portrait].puts morph,"\n"
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ file[:landscape].puts morph,"\n"
+ end
end
elsif morph.class.inspect =~ /SiSU_DAL_DocumentStructure/ \
and morph.tmp \
@@ -952,8 +1035,12 @@ WOK
end
if (morph.tmp !~/\A\s*\Z/) \
|| morph.is==:code
- file[:portrait].puts morph.tmp,"\n"
- file[:landscape].puts morph.tmp,"\n"
+ if @md.opt.act[:pdf_p][:set]==:on
+ file[:portrait].puts morph.tmp,"\n"
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ file[:landscape].puts morph.tmp,"\n"
+ end
end
elsif morph.is_a?(Hash) #inserted headers and the like, only
h={ ps: ps, h: morph, filename: file }
@@ -964,8 +1051,12 @@ WOK
end
end
array=@array
- file[:portrait].close
- file[:landscape].close
+ if @md.opt.act[:pdf_p][:set]==:on
+ file[:portrait].close
+ end
+ if @md.opt.act[:pdf_l][:set]==:on
+ file[:landscape].close
+ end
end
@@tex_head={
'a4'=> { p: nil, l: nil },
diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v5/texpdf_format.rb
index 30ccc862..df6c5a25 100644
--- a/lib/sisu/v3/texpdf_format.rb
+++ b/lib/sisu/v5/texpdf_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/texpdf_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -65,7 +65,7 @@ module SiSU_TeX_Pdf
class BareUrls
def initialize(md,dob=nil)
@md,@dob=md,dob
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def bare_urls
@dob.obj=@dob.obj.gsub(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,
@@ -103,8 +103,8 @@ module SiSU_TeX_Pdf
else @center_begin,@center_end='',''
end
@start_table=''
- @tx=SiSU_Env::GetInit.instance.tex
- @brace_rel=SiSU_Viz::Skin.new.rel_decoration
+ @tx=SiSU_Env::GetInit.new.tex
+ @brace_rel=SiSU_Viz::Defaults.new.rel_decoration
@env ||=SiSU_Env::InfoEnv.new(@md.fns)
@tex2pdf=@@tex3pdf ||=SiSU_Env::SystemCall.new.tex2pdf_engine
@make ||=SiSU_Env::ProcessingSettings.new(@md)
@@ -733,8 +733,8 @@ module SiSU_TeX_Pdf
p t_o.class
p caller
end
- @tx=SiSU_Env::GetInit.instance.tex
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @tx=SiSU_Env::GetInit.new.tex
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@tex2pdf=@@tex3pdf ||=SiSU_Env::SystemCall.new.tex2pdf_engine
@ps=@txt if @txt=~/(?:a4|letter|legal|book|a5|b5)/i
@lang ||=SiSU_i18n::Languages.new #.list[@md.opt.lng][:xlp]
@@ -802,7 +802,7 @@ module SiSU_TeX_Pdf
# fc-list :outline -f "%{family}\n"
case @tex2pdf
when /xe/
- <<WOK
+ <<-WOK
\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode}
\\setmainlanguage{#{tex_head_lang[:mainlang]}}
\\setotherlanguage{#{tex_head_lang[:otherlang]}}
@@ -810,19 +810,19 @@ module SiSU_TeX_Pdf
\\setmonofont[Scale=0.85]{#{texpdf_font_mono}}
% \\setsansfont{#{texpdf_font_sans}}
% \\setromanfont{#{texpdf_font_serif}}
-WOK
+ WOK
when /pdf/
if @md.file_encoding =~ /iso-?8859/i #% iso8859
- <<WOK
+ <<-WOK
% \\usepackage[latin1]{inputenc}
\\usepackage{fontspec}
-WOK
+ WOK
else #% utf-8 assumed
- <<WOK
+ <<-WOK
\\usepackage{babel}
\\usepackage{ucs}
\\usepackage[utf8x]{inputenc}
-WOK
+ WOK
end
end
end
@@ -830,18 +830,18 @@ WOK
generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
- <<WOK
+ <<-WOK
%% SiSU (Linux & Ruby - \"better ways\") LaTeX output
%% #{generator}
%% #{rubyv}
%% LaTeX output
%% #{lastdone}
%% SiSU http://www.jus.uio.no/sisu
-WOK
+ WOK
end
def tex_head_paper_portrait(d)
multicol=(@md.book_idx ? '\usepackage{multicol}' : '')
- <<WOK
+ <<-WOK
#{tex_head_info}
\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl} %with titlepage
\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm}
@@ -851,10 +851,10 @@ WOK
\\setlength{\\marginparsep}{#{d[:marginparsep]}}
\\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
#{multicol}
-WOK
+ WOK
end
def tex_head_paper_landscape(d)
- <<WOK
+ <<-WOK
#{tex_head_info}
\\documentclass[#{d[:fontsize]},#{d[:papertype]},landscape,titlepage,twocolumn]{scrartcl} %with titlepage
\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm}
@@ -864,10 +864,10 @@ WOK
\\setlength{\\columnsep}{#{d[:columnsep]}}
\\setlength{\\marginparsep}{#{d[:marginparsep]}}
\\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
-WOK
+ WOK
end
def tex_head_paper_portrait_dvi(d)
- <<WOK
+ <<-WOK
#{tex_head_info}
\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl} %with titlepage
\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm}
@@ -876,7 +876,7 @@ WOK
\\setlength{\\headsep}{#{d[:headsep]}}
\\setlength{\\marginparsep}{#{d[:marginparsep]}}
\\setlength{\\marginparwidth}{#{d[:marginparwidth]}}
-WOK
+ WOK
end
def tex_head_paper_dimensions
d={}
@@ -950,22 +950,22 @@ WOK
def tex_head_pdftex_dvi
color=case @layout
when /portrait/
- <<WOK
+ <<-WOK
colorlinks=true,
urlcolor=myblack,
filecolor=myblack,
linkcolor=myblack,
-WOK
+ WOK
when /landscape/
- <<WOK
+ <<-WOK
colorlinks=true,
urlcolor=myblue, % \\href{...}{...} external url
filecolor=mygreen, % \\href{...} local file
linkcolor=myred, % \\href{...} and \\pageref{...}
-WOK
+ WOK
end
if @layout =~/portrait|landscape/
- <<WOK
+ <<-WOK
\\usepackage{alltt}
\\usepackage{thumbpdf}
\\usepackage[#{@tex2pdf},
@@ -1004,9 +1004,9 @@ WOK
\\definecolor{mywhite}{rgb}{1,1,1}
\\usepackage{url}
%\\usepackage{breakurl}
-WOK
+ WOK
elsif @txt =~/dvi/
- <<WOK
+ <<-WOK
\\usepackage{alltt}
#{color.strip}
pageanchor=true,
@@ -1025,16 +1025,16 @@ WOK
\\definecolor{mywhite}{rgb}{1,1,1}
\\usepackage{url}
%\\usepackage{breakurl}
-WOK
+ WOK
end
end
def tex_head_codeblock(codeblock_box_type)
codeblock_box=if codeblock_box_type=='listings'
- <<WOK
+ <<-WOK
\\usepackage{listings}
\\usepackage{color}
\\usepackage{textcomp}
-WOK
+ WOK
elsif codeblock_box_type=='boites'
"\\usepackage{boites}"
else
@@ -1043,24 +1043,25 @@ WOK
codeblock_box
end
def tex_head_misc
- <<WOK
+ <<-WOK
\\usepackage{textcomp}
\\usepackage[parfill]{parskip}
\\usepackage[normalem]{ulem}
\\usepackage{soul}
\\usepackage{longtable}
+\\usepackage[tc]{titlepic}
\\usepackage{graphicx}
\\makeatletter
\\parindent0pt
%\\usepackage{mathptmx}
\\usepackage{amssymb}
% amssymb used for backslash
-WOK
+ WOK
end
def document_head_with_orientation(codeblock_box_type)
- endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/)||'' #not implemented see also def endnotes
+ endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/) || '' #not implemented see also def endnotes
@lang.list[@md.i18n[0]][:xlp]
- <<WOK
+ <<-WOK
#{tex_head_paper}
#{tex_head_encode}
#{tex_head_pdftex_dvi}
@@ -1137,7 +1138,7 @@ WOK
{\\normalfont\\normalsize\\itshape\\raggedright}}
% \\makeatother
\\selectlanguage{#{@lang.list[@md.i18n[0]][:xlp]}}
-WOK
+ WOK
end
def a4generic
end
@@ -1145,7 +1146,7 @@ WOK
class SpecialCharacters
def initialize(md,str,is=:default)
@md,@txt,@is=md,str,is
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
@tex2pdf=@@tex3pdf ||=SiSU_Env::SystemCall.new.tex2pdf_engine
end
def xetex_code_listings(str,is=:default) # ~ ^ $ & % _ { } #LaTeX special characters - KEEP list
@@ -1194,7 +1195,6 @@ WOK
gsub(/\\copy(right|mark)?/,'<=copymark>') # ok problem with superscript
end
def xetex_special_characters_1(str,is=:default) # ~ ^ $ & % _ { } #LaTeX special characters - KEEP list
- #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) # `require': iconv will be deprecated in the future, use String#encode instead.
word=str.scan(/\S+|\n/) #unless line =~/^(?:@\S|%+\s)/
para_array=[]
str=if word
@@ -1388,10 +1388,10 @@ WOK
attr_accessor :url,:txt,:date
def initialize(md)
@md=md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@date=SiSU_Env::InfoDate.new # #{@date.year}
@copymark='{\\begin{footnotesize}\\raisebox{1ex}{\\copyright}\\end{footnotesize}}'
- @brace_url=SiSU_Viz::Skin.new.url_decoration
+ @brace_url=SiSU_Viz::Defaults.new.url_decoration
end
def skip
"\n\\vspace*{\\smallskipamount} \n"
@@ -1425,21 +1425,14 @@ WOK
"\\rhead[ ]{ }\n"
end
def footer
- base_prog_txt=if @md.base_program
- case @md.base_program
- when /kdissert/i; " \\\\ \\href{http://freehackers.org/~tnagy/kdissert/}{Kdissert}"
- else ''
- end
- else ''
- end
- "\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{#{@vz.url_footer_signature}}{#{@vz.txt_signature}}#{base_prog_txt}}\n" +
- "\\cfoot[\\href{#{@vz.url_home}}{#{@vz.url_txt}}]{\\href{#{@vz.url_home}}{#{@vz.url_txt}}}\n" +
- "\\rfoot[\\tiny \\href{#{@vz.url_sisu}}{#{@vz.txt_signature}}]{\\textrm{\\thepage}}\n"
+ f="\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{#{@md.footer_links[:left][:url]}}{#{@md.footer_links[:left][:say]}}}\n" +
+ "\\cfoot{\\href{#{@md.footer_links[:center][:url]}}{#{@md.footer_links[:center][:say]}}}\n" +
+ "\\rfoot[\\tiny \\href{}{}]{\\textrm{\\thepage}}\n"
end
def site
if not @vz.url_home.empty? \
and not @vz.url_txt.empty?
- "\n\\date{\\begin{footnotesize} copy @ \\href{#{@vz.url_home}}{#{@vz.url_txt}} \\end{footnotesize}}"
+ "\n\\date{\\begin{tiny} \\end{tiny}}"
else ''
end
end
@@ -1453,13 +1446,13 @@ WOK
def newpage(orientation)
case orientation
when /landscape/ # using longtable latex package
-<<WOK
+ <<-WOK
\\clearpage
-WOK
+ WOK
when /portrait/
-<<WOK
+ <<-WOK
\\newpage
-WOK
+ WOK
end
end
def sisu_rights
@@ -1471,7 +1464,7 @@ WOK
end
else ''
end
-<<WOK
+ <<-WOK
\\\\ ~
{\\begin{footnotesize}#{base_prog_txt}
\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v[:project]} #{v[:version]} of #{v[:date_stamp]} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu}
@@ -1480,19 +1473,19 @@ WOK
\\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{@brace_url.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{@brace_url.tex_close}.
{\\end{footnotesize}
\\\\
-WOK
+ WOK
end
def doc_sc_info_footnote_full
-<<WOK
+ <<-WOK
\\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU \\ www.jus.uio.no/sisu }\\ \\newline \\scriptsize{Document version information: \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}}}}
-WOK
+ WOK
end
def doc_sc_info_footnote_brief
" \\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\ \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu} \\newline \\href{http://www.sisudoc.org}{www.sisudoc.org} \\\n}"
end
def doc_sc_info
v=SiSU_Env::InfoVersion.instance.get_version
-<<WOK
+ <<-WOK
\\\\
{\\begin{footnotesize}
Document version information: \\\\
@@ -1500,11 +1493,11 @@ Document version information: \\\\
Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- version information: \\\\
\\uline{ #{v[:project]} #{v[:version]} of #{v[:date_stamp]}}
\\end{footnotesize}}&
-WOK
+ WOK
end
def doc_no_sc_info
v=SiSU_Env::InfoVersion.instance.get_version
-<<WOK
+ <<-WOK
\\\\
{\\begin{small}
Document information: \\\\
@@ -1513,15 +1506,15 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\
\\uline{ #{v[:project]} #{v[:version]} of #{v[:date_stamp]}}
\\end{small}}&
-WOK
+ WOK
end
def endnotes #not used should be inserted before MetaData section which preceeds doc_tail, but is "part of document"
-<<WOK
+ <<-WOK
\\subsection*{Endnotes}
\\addcontentsline{toc}{section}{Endnotes}
\\
\\listofendnotes
-WOK
+ WOK
end
def doc_tail
dir=SiSU_Env::InfoEnv.new(@md.fns)
@@ -1534,7 +1527,7 @@ WOK
" SiSU "
end
url=@md.fnb.gsub(/(?:\\)*([$&~%_#}{^])/,'\\\\\1')
-<<WOK
+ <<-WOK
\\begin{english}[variant=british]
\\subsection*{Information on this document copy and an unofficial List of Some web related information and sources}
\\addcontentsline{toc}{section}{Information on this document copy and an unofficial List of Some web related information and sources}
@@ -1561,11 +1554,11 @@ WOK
#{sitename} found at: \\begin{scriptsize}#{site}\\end{scriptsize}\\subsubsection*{Links that may be of interest at #{@vz.txt_home} and elsewhere:}
\\addcontentsline{toc}{subsection}{Links that may be of interest}
\\end{english}
-WOK
+ WOK
end
def mail_tail #not retested, the old mail_tail is commented out and appended to this program
dir=SiSU_Env::InfoEnv.new(@md.fns)
-<<WOK
+ <<-WOK
\\subsection*{Mail sender details}
\\addcontentsline{toc}{subsection}{Mail sender details}
\\\\
@@ -1576,7 +1569,7 @@ Mail from: ralph@amissah.com\\\\
\"Support Open Standards and Open Sources for the Information Technology Infrastructure\" RA
\\subsubsection*{Information on this document copy #{site}\\copyright}
Presentations' look and feel generated by \\href{http://www.jus.uio.no/sisu/}{SiSU Scribe} \\href{http://www.jus.uio.no/sisu/}{http://www.jus.uio.no/sisu/} programmed in Ruby on Debian/Gnu/Linux by Copyright \\copyright Ralph Amissah, W3 since October 3 1993 \\href{http://www.jus.uio.no/sisu/}{\\includegraphics*[width=35pt]{#{dir.path.image_source_include}/sisu.png}}for #{sitename}. SiSU Scribe (sisu information structuring unit) produces Electronic Documents, i.e. it generates structured output for use in a number of file formats, including the pdf file produced here.
-WOK
+ WOK
end
end
end
diff --git a/lib/sisu/v3/update.rb b/lib/sisu/v5/update.rb
index 039dace8..c311b77c 100644
--- a/lib/sisu/v3/update.rb
+++ b/lib/sisu/v5/update.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/update.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/update.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v5/urls.rb
index d04225cc..0a583f99 100644
--- a/lib/sisu/v3/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/urls.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/urls.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -320,11 +320,17 @@ module SiSU_Urls
show.epub(x)
end
if x=~/--html\b/ \
- and @opt.act[:html][:set]==:on
+ and (@opt.act[:html][:set]==:on \
+ or @opt.act[:html_scroll][:set]==:on \
+ or @opt.act[:html_seg][:set]==:on)
if x =~/scroll/
- show.html.scroll(x)
+ if @opt.act[:html_scroll][:set]==:on
+ show.html.scroll(x)
+ end
else
- show.html.toc(x)
+ if @opt.act[:html_seg][:set]==:on
+ show.html.toc(x)
+ end
end
end
if x=~/--texinfo\b/ \
@@ -353,11 +359,17 @@ module SiSU_Urls
end
end
if x=~/--pdf\b/ \
- and @opt.act[:pdf][:set]==:on
+ and (@opt.act[:pdf][:set]==:on \
+ or @opt.act[:pdf_p][:set]==:on \
+ or @opt.act[:pdf_l][:set]==:on)
if x =~/portrait/
- show.pdf.portrait(x)
+ if @opt.act[:pdf_p][:set]==:on
+ show.pdf.portrait(x)
+ end
else
- show.pdf.landscape(x)
+ if @opt.act[:pdf_l][:set]==:on
+ show.pdf.landscape(x)
+ end
end
end
if x=~/--sisupod\b/ \
diff --git a/lib/sisu/v3/utils.rb b/lib/sisu/v5/utils.rb
index 260e1883..eb707ee9 100644
--- a/lib/sisu/v3/utils.rb
+++ b/lib/sisu/v5/utils.rb
@@ -48,10 +48,9 @@
* Download:
<http://www.sisudoc.org/sisu/en/SiSU/download.html>
-
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/utils.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -60,8 +59,8 @@
** Description: system environment, debug related
=end
-module SiSU_Debug
- class Mark
+module SiSU_Utils
+ class CodeMarker
def initialize(line,file,color=:red)
@line,@file,@color=line.to_s,file,color
end
@@ -104,6 +103,17 @@ module SiSU_Debug
@file.gsub(/([^\/]+$)/,"#{c[:on]}\\1#{c[:off]}")
end
end
+ class Path
+ def initialize(dir=Dir.pwd)
+ @dir=dir
+ end
+ def base_markup
+ (/(\S+?)(?:\/(?:#{Px[:lng_lst_rgx]}))?$/).match(Dir.pwd)[1]
+ end
+ def bmd
+ base_markup
+ end
+ end
end
__END__
puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:red)
diff --git a/lib/sisu/v3/webrick.rb b/lib/sisu/v5/webrick.rb
index 7efc5414..67c44d50 100644
--- a/lib/sisu/v3/webrick.rb
+++ b/lib/sisu/v5/webrick.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/webrick.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/webrick.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index f7267705..e9ada3be 100644
--- a/lib/sisu/v3/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/wikispeak.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/wikispeak.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -88,7 +88,6 @@ module SiSU_Wikispeak
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:wiki]}").flow if @opt.cmd =~/[MV]/
@dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
SiSU_Wikispeak::Source::Scroll.new(@dal_array,@md).songsheet
- SiSU_Env::InfoSkin.new(@md).select #watch
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
__LINE__.to_s + ':' + __FILE__
@@ -153,7 +152,7 @@ module SiSU_Wikispeak
@@dp=nil
def initialize(data,md)
@data,@md=data,md
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@dp=@@dp ||=SiSU_Env::InfoEnv.new.digest.pattern
@regx=/^(?:(?:#{Mx[:br_line]}\s*|#{Mx[:br_nl]}\s*)?#{Mx[:lv_o]}\d:(\S*?)#{Mx[:lv_c]}\s*)?(.+)/ #fix Mx[:lv_o] #m # 2004w18 pb pn removal added
@tab="\t"
@@ -181,8 +180,7 @@ WOK
end
end
def wiki_tail
- SiSU_Env::InfoSkin.new(@md).select
- vz=SiSU_Env::GetInit.instance.skin
+ vz=SiSU_Viz::Defaults.new
generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version]
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v5/xhtml.rb
index 95d5ab56..2b972e0e 100644
--- a/lib/sisu/v3/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xhtml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -93,7 +93,7 @@ module SiSU_XHTML
else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
end
@opt.cmd=~/[MVvz]/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_hi_blue
: SiSU_Screen::Ansi.new(@opt.cmd,'XHTML',tool).green_title_hi
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"/#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}").flow if @opt.cmd =~/[MV]/
end
@@ -133,7 +133,7 @@ module SiSU_XHTML
@@xml={ body: [], sisu: [], open: [], close: [], head: [] }
def initialize(particulars)
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@tab="\t"
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
diff --git a/lib/sisu/v3/xhtml_table.rb b/lib/sisu/v5/xhtml_table.rb
index c3bb84c4..1431306d 100644
--- a/lib/sisu/v3/xhtml_table.rb
+++ b/lib/sisu/v5/xhtml_table.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xhtml_table.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_table.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -65,7 +65,7 @@ module SiSU_XHTML_Table
@@tablehead=0
@@tablefoot=[] #watch
def initialize(table)
- @table_obj,@vz=table,SiSU_Env::GetInit.instance.skin
+ @table_obj,@vz=table,SiSU_Viz::Defaults.new
end
def table
table_obj=@table_obj
diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v5/xml.rb
index 101b30d0..913d1afc 100644
--- a/lib/sisu/v3/xml.rb
+++ b/lib/sisu/v5/xml.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -91,7 +91,7 @@ module SiSU_XML_SAX
else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
end
@opt.cmd=~/[MVvz]/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_hi_blue
: SiSU_Screen::Ansi.new(@opt.cmd,'XML SAX',tool).green_title_hi
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").flow if @opt.cmd =~/[MV]/
end
@@ -132,7 +132,7 @@ module SiSU_XML_SAX
@@xml={ body: [], open: [], close: [], head: [] }
def initialize(particulars)
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
end
diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index bc2affa5..80dc397d 100644
--- a/lib/sisu/v3/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_dom.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_dom.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -92,7 +92,7 @@ module SiSU_XML_DOM
else "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
end
@opt.cmd=~/[MVvz]/ \
- ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML DOM',tool).colorize
+ ? SiSU_Screen::Ansi.new(@opt.cmd,'XML DOM',tool).green_hi_blue
: SiSU_Screen::Ansi.new(@opt.cmd,'XML DOM',tool).green_title_hi
SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}").flow if @opt.cmd =~/[MV]/
end
@@ -131,7 +131,7 @@ module SiSU_XML_DOM
@@xml={ body: [], open: [], close: [], head: [], sc: [] }
def initialize(particulars)
@env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
end
diff --git a/lib/sisu/v3/xml_fictionbook.rb b/lib/sisu/v5/xml_fictionbook.rb
index 7082d98d..6d0073c1 100644
--- a/lib/sisu/v3/xml_fictionbook.rb
+++ b/lib/sisu/v5/xml_fictionbook.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_fictionbook.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_fictionbook.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/xml_format.rb b/lib/sisu/v5/xml_format.rb
index 0e76d40a..cccfc59f 100644
--- a/lib/sisu/v3/xml_format.rb
+++ b/lib/sisu/v5/xml_format.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_format.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_format.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -153,21 +153,31 @@ module SiSU_XML_Format
@rdf_date_modified=%{ dc.date.modified="#{@md.date.modified}"\n}
@date_modified=%{<meta name="dc.date.modified" content="#{@md.date.modified}" #{@md.date_modified_scheme} />\n}
end
- if defined? @md.type \
- and @md.type # DublinCore 8 - type (genre eg. report, convention etc)
- @rdf_type=%{ dc.type="#{@md.type}"\n}
- @type=%{<meta name="dc.type" content="#{@md.type}" />\n}
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/ # DublinCore 14 - coverage
+ @rdf_coverage=%{ dc.coverage="#{@md.notes.coverage}"\n}
+ @coverage=%{<meta name="dc.coverage" content="#{@md.notes.coverage}" />\n}
end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/ # DublinCore 9 - format (use your mime type)
- @rdf_format=%{ dc.format="#{@md.classify.format}"\n}
- @format=%{<meta name="dc.format" content="#{@md.classify.format}" />\n}
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/ # DublinCore 13 - relation
+ @rdf_relation=%{ dc.relation="#{@md.notes.relation}"\n}
+ @relation=%{<meta name="dc.relation" content="#{@md.notes.relation}" />\n}
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/ # DublinCore 10 - identifier (your identifier, could use urn which is free)
- @rdf_identifier=%{ dc.identifier="#{@md.classify.identifier}"\n}
- @identifier=%{<meta name="dc.identifier" content="#{@md.identifier}" />\n}
+ if defined? @md.notes.type \
+ and @md.notes.type # DublinCore 8 - type (genre eg. report, convention etc)
+ @rdf_type=%{ dc.type="#{@md.notes.type}"\n}
+ @type=%{<meta name="dc.type" content="#{@md.notes.type}" />\n}
end
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/ # DublinCore 9 - format (use your mime type)
+ @rdf_format=%{ dc.format="#{@md.notes.format}"\n}
+ @format=%{<meta name="dc.format" content="#{@md.notes.format}" />\n}
+ end
+ #if defined? @md.identifier.sisupod \
+ #and @md.identifier.sisupod=~/\S+/ # DublinCore 10 - identifier (your identifier, could use urn which is free)
+ # @rdf_identifier=%{ dc.identifier="#{@md.identifier.sisupod}"\n}
+ # @identifier=%{<meta name="dc.identifier" content="#{@md.identifier.sisupod}" />\n}
+ #end
if defined? @md.original.source \
and @md.original.source=~/\S+/ # DublinCore 11 - source (document source)
@rdf_source=%{ dc.source="#{@md.original.source}"\n}
@@ -178,16 +188,6 @@ module SiSU_XML_Format
@rdf_language=%{ dc.language="#{@md.original.title}"\n}
@language=%{<meta name="dc.language" content="#{@md.language[:name]}" />\n}
end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/ # DublinCore 13 - relation
- @rdf_relation=%{ dc.relation="#{@md.classify.relation}"\n}
- @relation=%{<meta name="dc.relation" content="#{@md.classify.relation}" />\n}
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/ # DublinCore 14 - coverage
- @rdf_coverage=%{ dc.coverage="#{@md.classify.coverage}"\n}
- @coverage=%{<meta name="dc.coverage" content="#{@md.classify.coverage}" />\n}
- end
if defined? @md.rights.all \
and @md.rights.all=~/\S+/ # DublinCore 15 - rights
@rdf_rights=%{ dc.rights="#{@md.rights.all}"\n}
@@ -196,7 +196,7 @@ module SiSU_XML_Format
@copyright=%{<meta name="copyright" content="#{@md.rights.copyright.all}" />\n} if @md.rights.copyright.all # possibly redundant see dc.rights
@owner=%{<meta name="owner" content="#{@md.owner}" />\n} if @md.owner
@keywords=%{<meta name="keywords" content="#{@md.keywords}" />\n} if @md.keywords
- @vz=SiSU_Env::GetInit.instance.skin #margin,paragraph,table,banner,url,png,txt,color,font,nav_txt,nav_png,credits,js,php
+ @vz=SiSU_Viz::Defaults.new #margin,paragraph,table,banner,url,png,txt,color,font,nav_txt,nav_png,credits,js,php
@index='index'
end
def table_close
@@ -283,7 +283,7 @@ WOK
@lnk_url=@lnk_url.gsub(rgx,'') if @lnk_url =~rgx
rgx=/~\{\d+\s+(.+?)\}~/
@lnk_url=@lnk_url.gsub(rgx,'\1') if @lnk_url =~rgx
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def scr_endnote_body
"<endnote>#{@txt}</endnote> "
@@ -361,7 +361,7 @@ WOK
@md=md
@rdf=SiSU_XML_Tags::RDF.new(md)
# DublinCore 1 - title
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
@stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
@seg_name_html=(SiSU_HTML::Source::Seg.new.seg_name_html || [])
@seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || [])
@@ -977,7 +977,7 @@ WOK
end
end
class FormatTextObject
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
attr_accessor :md,:dob,:txt,:ocn,:format,:table,:link,:linkname,:paranum,:p_num,:headname,:banner,:url
def initialize(md,t_o)
@md,@t_o=md,t_o
@@ -1023,7 +1023,7 @@ WOK
end
end
@dob=t_o if defined? t_o.is
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
def endnote_body
%{
@@ -1200,7 +1200,7 @@ WOK
class FormatScroll < FormatTextObject
def initialize(md,txt)
super(md,txt)
- @vz=SiSU_Env::GetInit.instance.skin
+ @vz=SiSU_Viz::Defaults.new
end
end
class FormatSeg < FormatTextObject
diff --git a/lib/sisu/v3/xml_md_oai_pmh_dc.rb b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
index 81b22d16..e5857fb1 100644
--- a/lib/sisu/v3/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/v5/xml_md_oai_pmh_dc.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_md_oai_pmh_dc.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_md_oai_pmh_dc.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -94,95 +94,96 @@ WOK
@oai_pmh << %{ <dc:author>#{txt}</dc:author>\n}
end
if defined? @md.classify.subject \
- and @md.classify.subject=~/\S+/ # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
+ and @md.classify.subject=~/\S+/ # DublinCore 3 - subject (us library of congress, eric or udc, or schema???)
txt=meta_content_clean(@md.classify.subject)
@oai_pmh << %{ <dc:subject>#{txt}</dc:subject>\n}
end
- if defined? @md.notes.description \
- and @md.notes.description=~/\S+/ # DublinCore 4 - description
- txt=meta_content_clean(@md.notes.description)
- @oai_pmh << %{ <dc:description>#{txt}</dc:description>\n}
+ if defined? @md.classify.keywords \
+ and @md.classify.keywords=~/\S+/
+ txt=meta_content_clean(@md.classify.keywords)
+ @oai_pmh << %{ <dc:keywords>#{txt}</dc:keywords>\n}
end
- if @md.publisher # DublinCore 5 - publisher (current copy published by)
+ if @md.publisher # DublinCore 5 - publisher (current copy published by)
txt=meta_content_clean(@md.publisher)
@oai_pmh << %{ <dc:publisher>#{txt}</dc:publisher>\n}
end
if defined? @md.creator.contributor \
- and @md.creator.contributor=~/\S+/ # DublinCore 6 - contributor
+ and @md.creator.contributor=~/\S+/ # DublinCore 6 - contributor
txt=meta_content_clean(@md.creator.contributor)
@oai_pmh << %{ <dc:contributor>#{txt}</dc:contributor>\n}
end
if defined? @md.date.published \
- and @md.date.published=~/\S+/ # DublinCore 7 - date year-mm-dd
+ and @md.date.published=~/\S+/ # DublinCore 7 - date year-mm-dd
@oai_pmh << %{ <dc:date>#{@md.date.published}</dc:date>\n}
end
if defined? @md.date.created \
- and @md.date.created=~/\S+/ # DublinCore 7 - date.created
+ and @md.date.created=~/\S+/ # DublinCore 7 - date.created
@oai_pmh << %{ <dc:date_created>#{@md.date.created}</dc:date_created>\n}
end
if defined? @md.date.issued \
- and @md.date.issued=~/\S+/ # DublinCore 7 - date.issued
+ and @md.date.issued=~/\S+/ # DublinCore 7 - date.issued
@oai_pmh << %{ <dc:date_issued>#{@md.date.issued}</dc:date_issued>\n}
end
if defined? @md.date.available \
- and @md.date.available=~/\S+/ # DublinCore 7 - date.available
+ and @md.date.available=~/\S+/ # DublinCore 7 - date.available
@oai_pmh << %{ <dc:date_available>#{@md.date.available}</dc:date_available>\n}
end
if defined? @md.date.valid \
- and @md.date.valid=~/\S+/ # DublinCore 7 - date.valid
+ and @md.date.valid=~/\S+/ # DublinCore 7 - date.valid
@oai_pmh << %{ <dc:date_valid>#{@md.date.valid}</dc:date_valid>\n}
end
if defined? @md.date.modified \
- and @md.date.modified=~/\S+/ # DublinCore 7 - date.modified
+ and @md.date.modified=~/\S+/ # DublinCore 7 - date.modified
@oai_pmh << %{ <dc:date_modified>#{@md.date.modified}</dc:date_modified>\n}
end
- if @md.type # DublinCore 8 - type
- txt=meta_content_clean(@md.type)
+ if defined? @md.notes.description \
+ and @md.notes.description=~/\S+/ # DublinCore 4 - description
+ txt=meta_content_clean(@md.notes.description)
+ @oai_pmh << %{ <dc:description>#{txt}</dc:description>\n}
+ end
+ if defined? @md.notes.coverage \
+ and @md.notes.coverage=~/\S+/ # DublinCore 14 - coverage
+ txt=meta_content_clean(@md.notes.coverage)
+ @oai_pmh << %{ <dc:coverage>#{txt}</dc:coverage>\n}
+ end
+ if defined? @md.notes.relation \
+ and @md.notes.relation=~/\S+/ # DublinCore 13 - relation
+ txt=meta_content_clean(@md.notes.relation)
+ @oai_pmh << %{ <dc:relation>#{txt}</dc:relation>\n}
+ end
+ if defined? @md.notes.type \
+ and @md.notes.type=~/\S+/ # DublinCore 8 - type
+ txt=meta_content_clean(@md.notes.type)
@oai_pmh << %{ <dc:type>#{txt}</dc:type>\n}
end
- if defined? @md.classify.format \
- and @md.classify.format=~/\S+/ # DublinCore 9 - format
- txt=meta_content_clean(@md.classify.format)
+ if defined? @md.notes.format \
+ and @md.notes.format=~/\S+/ # DublinCore 9 - format
+ txt=meta_content_clean(@md.notes.format)
@oai_pmh << %{ <dc:format>#{txt}</dc:format>\n}
end
- if defined? @md.classify.identifier \
- and @md.classify.identifier=~/\S+/ # DublinCore 10 - identifier
- txt=meta_content_clean(@md.classify.identifier)
- @oai_pmh << %{ <dc:identifier>#{txt}</dc:identifier>\n}
- end
+ #if defined? @md.identifier.sisupod \
+ #and @md.identifier.sisupod=~/\S+/ # DublinCore 10 - identifier
+ # txt=meta_content_clean(@md.identifier.sisupod)
+ # @oai_pmh << %{ <dc:identifier>#{txt}</dc:identifier>\n}
+ #end
if defined? @md.original.source \
- and @md.original.source=~/\S+/ # DublinCore 11 - source
+ and @md.original.source=~/\S+/ # DublinCore 11 - source
txt=meta_content_clean(@md.original.source)
@oai_pmh << %{ <dc:source>#{txt}</dc:source>\n}
end
if defined? @md.title.language \
- and @md.title.language=~/\S+/ # DublinCore 12 - language (English)
+ and @md.title.language=~/\S+/ # DublinCore 12 - language (English)
@oai_pmh << %{ <dc:language>#{@md.title.language}</dc:language>\n}
end
if defined? @md.original.language \
and @md.original.language=~/\S+/
@oai_pmh << %{ <dc:language>#{@md.original.language}</dc:language>\n}
end
- if defined? @md.classify.relation \
- and @md.classify.relation=~/\S+/ # DublinCore 13 - relation
- txt=meta_content_clean(@md.relation)
- @oai_pmh << %{ <dc:relation>#{txt}</dc:relation>\n}
- end
- if defined? @md.classify.coverage \
- and @md.classify.coverage=~/\S+/ # DublinCore 14 - coverage
- txt=meta_content_clean(@md.classify.coverage)
- @oai_pmh << %{ <dc:coverage>#{txt}</dc:coverage>\n}
- end
if defined? @md.rights.all \
- and @md.rights.all=~/\S+/ # DublinCore 15 - rights
+ and @md.rights.all=~/\S+/ # DublinCore 15 - rights
txt=meta_content_clean(@md.rights.all)
@oai_pmh << %{ <dc:rights>#{txt}</dc:rights>\n}
end
- if defined? @md.classify.keywords \
- and @md.classify.keywords=~/\S+/
- txt=meta_content_clean(@md.classify.keywords)
- @oai_pmh << %{ <dc:keywords>#{txt}</dc:keywords>\n}
- end
@oai_pmh
end
def meta_content_clean(content='')
diff --git a/lib/sisu/v3/xml_scaffold.rb b/lib/sisu/v5/xml_scaffold.rb
index 352779f3..5b038edf 100644
--- a/lib/sisu/v3/xml_scaffold.rb
+++ b/lib/sisu/v5/xml_scaffold.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_scaffold.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_scaffold.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
diff --git a/lib/sisu/v3/xml_tables.rb b/lib/sisu/v5/xml_tables.rb
index 4f1ada1b..9cbf259b 100644
--- a/lib/sisu/v3/xml_tables.rb
+++ b/lib/sisu/v5/xml_tables.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/xml_tables.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_tables.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -66,7 +66,7 @@ module SiSU_Tables
@@tablehead=0
@@tablefoot=[] #watch #bug??? #check was @@tablefoot
def initialize(one,ocn='')
- @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::GetInit.instance.skin
+ @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Viz::Defaults.new
end
def table_split #% used but, no longer operational, revisit
@new_content=[]
@@ -81,7 +81,7 @@ module SiSU_Tables
@@tablehead=0
@@tablefoot=[]
def initialize(one,ocn='')
- @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Env::GetInit.instance.skin
+ @one,@parablock,@ocn,@vz=one,one,ocn,SiSU_Viz::Defaults.new
end
def table
m=@parablock[/<!f(.+?)!>/,1]
@@ -125,7 +125,7 @@ module SiSU_Tables
@@tablehead=0
@@tablefoot=[]
def initialize(one)
- @one,@parablock,@vz=one,one,SiSU_Env::GetInit.instance.skin
+ @one,@parablock,@vz=one,one,SiSU_Viz::Defaults.new
end
def table_head(inf)
%{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">
diff --git a/lib/sisu/v3/zap.rb b/lib/sisu/v5/zap.rb
index 86022abc..cc542f97 100644
--- a/lib/sisu/v3/zap.rb
+++ b/lib/sisu/v5/zap.rb
@@ -50,7 +50,7 @@
* Git
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v3/zap.rb;hb=HEAD>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/zap.rb;hb=HEAD>
* Ralph Amissah
<ralph@amissah.com>
@@ -66,20 +66,23 @@ module SiSU_Zap
class Source
def initialize(opt)
@opt=opt
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
- @zap_path="#{@env.path.output}/#{@env.fnb}"
- @zap=SiSU_Env::CleanOutput.new(@opt)
+ @env=SiSU_Env::InfoEnv.new(opt.fns)
end
def read
+ zap_path="#{@env.path.output}/#{@env.fnb}"
+ z=SiSU_Env::CleanOutput.new(@opt)
if SiSU_Env::InfoSettings.new.permission?('zap')
- tell=SiSU_Screen::Ansi.new(@opt.cmd,"Clean files related to processing #{@opt.cmd} ->","#{@opt.fns} -> #{@zap_path}")
- @zap.zap.main_output
- @zap.zap.site_map
- @zap.zap.epub
- @zap.zap.src
- else tell=SiSU_Screen::Ansi.new(@opt.cmd,'use of -Z (zap) has not enabled in sisurc.yml')
+ unless @opt.cmd =~/q/
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,"Clean files related to processing #{@opt.cmd} ->","#{@opt.fns} -> #{zap_path}")
+ tell.warn
+ end
+ z.zap.remove_output
+ else
+ unless @opt.cmd =~/q/
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,'use of -Z (zap) has not enabled in sisurc.yml')
+ tell.warn
+ end
end
- tell.warn unless @opt.cmd =~/q/
end
end
end
diff --git a/man/man1/sisu3.1 b/man/man1/sisu5.1
index 09708b31..09708b31 120000
--- a/man/man1/sisu3.1
+++ b/man/man1/sisu5.1