aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-04-25 13:50:40 -0400
committerRalph Amissah <ralph@amissah.com>2015-04-25 13:50:40 -0400
commitaeb7754510ffacc207b17e5d7512ff5f14debcc3 (patch)
treee2f17e3ad2ee4e1ea81287febe5049ce6fb82147
parentadded patch jessie_bugfix_767761 (diff)
parentversion & changelog, tag for release (diff)
Merge tag 'sisu_5.8.0' into debian/sid
SiSU 5.8.0 Conflicts: .gitignore data/doc/sisu/CHANGELOG_v5 data/doc/sisu/CHANGELOG_v6 data/sisu/v5/v/version.yml data/sisu/v6/v/version.yml setup/sisu_version.rb
-rw-r--r--.gitignore11
-rw-r--r--CHANGELOG2
-rw-r--r--README199
-rw-r--r--bin/sisu256
-rw-r--r--bin/sisu-misc-utils228
-rw-r--r--data/doc/sisu/CHANGELOG_v11903
-rw-r--r--data/doc/sisu/CHANGELOG_v2116
-rw-r--r--data/doc/sisu/CHANGELOG_v3757
-rw-r--r--data/doc/sisu/CHANGELOG_v4957
-rw-r--r--data/doc/sisu/CHANGELOG_v51678
-rw-r--r--data/doc/sisu/CHANGELOG_v6943
-rw-r--r--data/doc/sisu/markup-samples/manual/en/sisu_download.ssi10
-rw-r--r--data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst52
-rw-r--r--data/doc/sisu/markup-samples/manual/en/sisu_markup.sst95
-rw-r--r--data/doc/sisu/markup-samples/manual/languages_source_and_targets2
-rwxr-xr-xdata/doc/sisu/markup-samples/manual/sisu_po4a124
-rw-r--r--data/doc/sisu/markup-samples/manual/sisu_po4a_libs.rb439
-rw-r--r--data/doc/sisu/markup-samples/manual/translation_languages1
-rw-r--r--data/doc/sisu/org/bugs/sisu_bugs.org403
-rw-r--r--data/doc/sisu/org/done/sisu-done.org (renamed from data/doc/sisu/sisu-done.org)0
-rw-r--r--data/doc/sisu/org/in_progress/sisu_asciidoc.org140
-rw-r--r--data/doc/sisu/org/in_progress/sisu_docbook.org77
-rw-r--r--data/doc/sisu/org/in_progress/sisu_fictionbook.org86
-rw-r--r--data/doc/sisu/org/in_progress/sisu_markdown.org139
-rw-r--r--data/doc/sisu/org/in_progress/sisu_rst.org236
-rw-r--r--data/doc/sisu/org/in_progress/sisu_todo.org192
-rw-r--r--data/doc/sisu/org/sisu.org853
-rw-r--r--data/doc/sisu/org/sisu_packaging.org269
-rw-r--r--data/doc/sisu/sisu.org1546
-rw-r--r--data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el17
-rw-r--r--data/sisu/v5/v/version.yml5
-rw-r--r--data/sisu/v6/v/version.yml5
-rw-r--r--data/sisu/version/current.yml5
-rw-r--r--data/sisu/version/develop.yml5
-rw-r--r--lib/sisu/current/air.rb80
-rw-r--r--lib/sisu/current/ao.rb (renamed from lib/sisu/v5/ao.rb)118
-rw-r--r--lib/sisu/current/ao_character_check.rb (renamed from lib/sisu/v6/ao_character_check.rb)77
-rw-r--r--lib/sisu/current/ao_composite.rb (renamed from lib/sisu/v5/ao_composite.rb)79
-rw-r--r--lib/sisu/current/ao_doc_objects.rb (renamed from lib/sisu/v6/ao_doc_objects.rb)77
-rw-r--r--lib/sisu/current/ao_doc_str.rb (renamed from lib/sisu/v6/ao_doc_str.rb)767
-rw-r--r--lib/sisu/current/ao_endnotes.rb (renamed from lib/sisu/v5/ao_endnotes.rb)77
-rw-r--r--lib/sisu/current/ao_expand_insertions.rb (renamed from lib/sisu/v6/ao_expand_insertions.rb)77
-rw-r--r--lib/sisu/current/ao_hash_digest.rb (renamed from lib/sisu/v6/ao_hash_digest.rb)77
-rw-r--r--lib/sisu/current/ao_idx.rb (renamed from lib/sisu/v6/ao_idx.rb)77
-rw-r--r--lib/sisu/current/ao_images.rb (renamed from lib/sisu/v6/ao_images.rb)81
-rw-r--r--lib/sisu/current/ao_metadata.rb86
-rw-r--r--lib/sisu/current/ao_misc_arrange.rb (renamed from lib/sisu/v5/ao_misc_arrange.rb)77
-rw-r--r--lib/sisu/current/ao_numbering.rb (renamed from lib/sisu/v6/ao_numbering.rb)87
-rw-r--r--lib/sisu/current/ao_syntax.rb (renamed from lib/sisu/v6/ao_syntax.rb)87
-rw-r--r--lib/sisu/current/cgi.rb84
-rw-r--r--lib/sisu/current/cgi_pgsql.rb (renamed from lib/sisu/v6/cgi_pgsql.rb)77
-rw-r--r--lib/sisu/current/cgi_sql_common.rb (renamed from lib/sisu/v5/cgi_sql_common.rb)83
-rw-r--r--lib/sisu/current/cgi_sqlite.rb (renamed from lib/sisu/v6/cgi_sqlite.rb)77
-rw-r--r--lib/sisu/current/conf.rb (renamed from lib/sisu/v6/conf.rb)77
-rw-r--r--lib/sisu/current/constants.rb (renamed from lib/sisu/v5/constants.rb)86
-rw-r--r--lib/sisu/current/css.rb (renamed from lib/sisu/v5/css.rb)95
-rw-r--r--lib/sisu/current/db_columns.rb (renamed from lib/sisu/v5/db_columns.rb)85
-rw-r--r--lib/sisu/current/db_create.rb (renamed from lib/sisu/v5/db_create.rb)78
-rw-r--r--lib/sisu/current/db_dbi.rb (renamed from lib/sisu/v5/db_dbi.rb)78
-rw-r--r--lib/sisu/current/db_drop.rb (renamed from lib/sisu/v5/db_drop.rb)78
-rw-r--r--lib/sisu/current/db_import.rb (renamed from lib/sisu/v6/db_import.rb)78
-rw-r--r--lib/sisu/current/db_indexes.rb (renamed from lib/sisu/v5/db_indexes.rb)78
-rw-r--r--lib/sisu/current/db_load_tuple.rb (renamed from lib/sisu/v5/db_load_tuple.rb)78
-rw-r--r--lib/sisu/current/db_remove.rb (renamed from lib/sisu/v6/db_remove.rb)78
-rw-r--r--lib/sisu/current/db_select.rb (renamed from lib/sisu/v6/db_select.rb)78
-rw-r--r--lib/sisu/current/db_sqltxt.rb (renamed from lib/sisu/v5/db_sqltxt.rb)78
-rw-r--r--lib/sisu/current/db_tests.rb (renamed from lib/sisu/v5/db_tests.rb)78
-rw-r--r--lib/sisu/current/dbi.rb (renamed from lib/sisu/v6/dbi.rb)77
-rw-r--r--lib/sisu/current/dbi_discrete.rb (renamed from lib/sisu/v6/dbi_discrete.rb)77
-rw-r--r--lib/sisu/current/digests.rb (renamed from lib/sisu/v6/digests.rb)77
-rw-r--r--lib/sisu/current/dp.rb (renamed from lib/sisu/v5/dp.rb)131
-rw-r--r--lib/sisu/current/dp_identify_markup.rb (renamed from lib/sisu/v6/dp_identify_markup.rb)81
-rw-r--r--lib/sisu/current/dp_make.rb (renamed from lib/sisu/v6/dp_make.rb)79
-rw-r--r--lib/sisu/current/embedded.rb (renamed from lib/sisu/v6/embedded.rb)77
-rw-r--r--lib/sisu/current/errors.rb84
-rw-r--r--lib/sisu/current/generic_parts.rb131
-rw-r--r--lib/sisu/current/git.rb (renamed from lib/sisu/v6/git.rb)83
-rw-r--r--lib/sisu/current/html.rb (renamed from lib/sisu/v5/html.rb)77
-rw-r--r--lib/sisu/current/html_concordance.rb (renamed from lib/sisu/v5/html_concordance.rb)78
-rw-r--r--lib/sisu/current/html_format.rb (renamed from lib/sisu/v6/html_format.rb)83
-rw-r--r--lib/sisu/current/html_harvest.rb109
-rw-r--r--lib/sisu/current/html_harvest_author_format.rb111
-rw-r--r--lib/sisu/current/html_harvest_authors.rb (renamed from lib/sisu/v6/html_harvest_authors.rb)78
-rw-r--r--lib/sisu/current/html_harvest_topics.rb (renamed from lib/sisu/v5/html_harvest_topics.rb)80
-rw-r--r--lib/sisu/current/html_lite_shared.rb (renamed from lib/sisu/v5/html_lite_shared.rb)79
-rw-r--r--lib/sisu/current/html_manifest.rb (renamed from lib/sisu/v6/html_manifest.rb)77
-rw-r--r--lib/sisu/current/html_minitoc.rb (renamed from lib/sisu/v5/html_minitoc.rb)78
-rw-r--r--lib/sisu/current/html_parts.rb (renamed from lib/sisu/v6/html_parts.rb)77
-rw-r--r--lib/sisu/current/html_promo.rb (renamed from lib/sisu/v6/html_promo.rb)77
-rw-r--r--lib/sisu/current/html_scroll.rb (renamed from lib/sisu/v6/html_scroll.rb)77
-rw-r--r--lib/sisu/current/html_segments.rb (renamed from lib/sisu/v6/html_segments.rb)77
-rw-r--r--lib/sisu/current/html_shared.rb62
-rw-r--r--lib/sisu/current/html_table.rb64
-rw-r--r--lib/sisu/current/html_tune.rb (renamed from lib/sisu/v6/html_tune.rb)77
-rw-r--r--lib/sisu/current/hub.rb (renamed from lib/sisu/v6/hub.rb)82
-rw-r--r--lib/sisu/current/hub_actions.rb (renamed from lib/sisu/v6/hub_actions.rb)78
-rw-r--r--lib/sisu/current/hub_loop_markup_files.rb (renamed from lib/sisu/v6/hub_loop_markup_files.rb)78
-rw-r--r--lib/sisu/current/hub_options.rb (renamed from lib/sisu/v6/hub_options.rb)110
-rw-r--r--lib/sisu/current/i18n.rb (renamed from lib/sisu/v5/i18n.rb)77
-rw-r--r--lib/sisu/current/manpage.rb (renamed from lib/sisu/v5/manpage.rb)78
-rw-r--r--lib/sisu/current/manpage_format.rb85
-rw-r--r--lib/sisu/current/po4a.rb (renamed from lib/sisu/v5/po4a.rb)424
-rw-r--r--lib/sisu/current/po4a_set.rb (renamed from lib/sisu/v5/po4a_set.rb)77
-rw-r--r--lib/sisu/current/prog_text_translation.rb (renamed from lib/sisu/v5/prog_text_translation.rb)77
-rw-r--r--lib/sisu/current/qrcode.rb (renamed from lib/sisu/v6/qrcode.rb)77
-rw-r--r--lib/sisu/current/relaxng.rb (renamed from lib/sisu/v6/relaxng.rb)77
-rw-r--r--lib/sisu/current/remote.rb (renamed from lib/sisu/v5/remote.rb)77
-rw-r--r--lib/sisu/current/rexml.rb (renamed from lib/sisu/v5/rexml.rb)81
-rw-r--r--lib/sisu/current/se.rb (renamed from lib/sisu/v5/se.rb)77
-rw-r--r--lib/sisu/current/se_cleanoutput.rb (renamed from lib/sisu/v6/se_cleanoutput.rb)77
-rw-r--r--lib/sisu/current/se_clear.rb106
-rw-r--r--lib/sisu/current/se_createsite.rb (renamed from lib/sisu/v5/se_createsite.rb)79
-rw-r--r--lib/sisu/current/se_css.rb (renamed from lib/sisu/v5/se_css.rb)77
-rw-r--r--lib/sisu/current/se_date.rb92
-rw-r--r--lib/sisu/current/se_db.rb (renamed from lib/sisu/v6/se_db.rb)77
-rw-r--r--lib/sisu/current/se_envcall.rb (renamed from lib/sisu/v5/se_envcall.rb)77
-rw-r--r--lib/sisu/current/se_file_op.rb (renamed from lib/sisu/v6/se_file_op.rb)105
-rw-r--r--lib/sisu/current/se_filemap.rb (renamed from lib/sisu/v5/se_filemap.rb)77
-rw-r--r--lib/sisu/current/se_get_init.rb (renamed from lib/sisu/v5/se_get_init.rb)93
-rw-r--r--lib/sisu/current/se_hub_particulars.rb (renamed from lib/sisu/v6/se_hub_particulars.rb)78
-rw-r--r--lib/sisu/current/se_info_env.rb (renamed from lib/sisu/v6/se_info_env.rb)126
-rw-r--r--lib/sisu/current/se_info_port.rb70
-rw-r--r--lib/sisu/current/se_info_system.rb (renamed from lib/sisu/v6/se_info_system.rb)89
-rw-r--r--lib/sisu/current/se_load.rb108
-rw-r--r--lib/sisu/current/se_processing.rb (renamed from lib/sisu/v6/se_processing.rb)77
-rw-r--r--lib/sisu/current/se_programs.rb (renamed from lib/sisu/v6/se_programs.rb)81
-rw-r--r--lib/sisu/current/se_remotes.rb (renamed from lib/sisu/v5/se_remotes.rb)77
-rw-r--r--lib/sisu/current/se_standardise_lang.rb (renamed from lib/sisu/v5/se_standardise_lang.rb)77
-rw-r--r--lib/sisu/current/se_version.rb (renamed from lib/sisu/v6/se_version.rb)88
-rw-r--r--lib/sisu/current/shared_images.rb (renamed from lib/sisu/v5/shared_images.rb)78
-rw-r--r--lib/sisu/current/shared_markup_alt.rb (renamed from lib/sisu/v6/shared_markup_alt.rb)77
-rw-r--r--lib/sisu/current/shared_metadata.rb (renamed from lib/sisu/v6/shared_metadata.rb)77
-rw-r--r--lib/sisu/current/shared_sem.rb (renamed from lib/sisu/v6/shared_sem.rb)78
-rw-r--r--lib/sisu/current/sisu_thor_lib.rb407
-rw-r--r--lib/sisu/current/sitemaps.rb (renamed from lib/sisu/v6/sitemaps.rb)77
-rw-r--r--lib/sisu/current/src_kdissert_share.rb102
-rw-r--r--lib/sisu/current/src_share.rb109
-rw-r--r--lib/sisu/current/src_shared.rb (renamed from lib/sisu/v6/src_shared.rb)77
-rw-r--r--lib/sisu/current/src_sisupod_make.rb (renamed from lib/sisu/v5/src_sisupod_make.rb)77
-rw-r--r--lib/sisu/current/sst_convert_markup.rb (renamed from lib/sisu/v6/sst_convert_markup.rb)81
-rw-r--r--lib/sisu/current/sst_do_inline_footnotes.rb (renamed from lib/sisu/v6/sst_do_inline_footnotes.rb)79
-rw-r--r--lib/sisu/current/sst_from_xml.rb (renamed from lib/sisu/v5/sst_from_xml.rb)78
-rw-r--r--lib/sisu/current/sst_identify_markup.rb (renamed from lib/sisu/v6/sst_identify_markup.rb)81
-rw-r--r--lib/sisu/current/sst_to_s_xml_sax.rb (renamed from lib/sisu/v6/sst_to_s_xml_sax.rb)77
-rw-r--r--lib/sisu/current/termsheet.rb (renamed from lib/sisu/v5/termsheet.rb)82
-rw-r--r--lib/sisu/current/texinfo.rb (renamed from lib/sisu/v5/texinfo.rb)77
-rw-r--r--lib/sisu/current/texinfo_format.rb (renamed from lib/sisu/v6/texinfo_format.rb)77
-rw-r--r--lib/sisu/current/texpdf.rb (renamed from lib/sisu/v6/texpdf.rb)77
-rw-r--r--lib/sisu/current/texpdf_format.rb (renamed from lib/sisu/v6/texpdf_format.rb)77
-rw-r--r--lib/sisu/current/texpdf_parts.rb (renamed from lib/sisu/v5/texpdf_parts.rb)77
-rw-r--r--lib/sisu/current/txt_asciidoc.rb (renamed from lib/sisu/v5/txt_asciidoc.rb)77
-rw-r--r--lib/sisu/current/txt_markdown.rb (renamed from lib/sisu/v6/txt_markdown.rb)77
-rw-r--r--lib/sisu/current/txt_plain.rb (renamed from lib/sisu/v6/txt_plain.rb)78
-rw-r--r--lib/sisu/current/txt_rst.rb (renamed from lib/sisu/v6/txt_rst.rb)77
-rw-r--r--lib/sisu/current/txt_shared.rb (renamed from lib/sisu/v6/txt_shared.rb)77
-rw-r--r--lib/sisu/current/txt_textile.rb (renamed from lib/sisu/v6/txt_textile.rb)77
-rw-r--r--lib/sisu/current/update.rb (renamed from lib/sisu/v6/update.rb)77
-rw-r--r--lib/sisu/current/urls.rb (renamed from lib/sisu/v5/urls.rb)77
-rw-r--r--lib/sisu/current/utils.rb (renamed from lib/sisu/v5/utils.rb)83
-rw-r--r--lib/sisu/current/utils_response.rb113
-rw-r--r--lib/sisu/current/utils_screen_text_color.rb (renamed from lib/sisu/v5/utils_screen_text_color.rb)77
-rw-r--r--lib/sisu/current/utils_spell.rb99
-rw-r--r--lib/sisu/current/webrick.rb (renamed from lib/sisu/v6/webrick.rb)79
-rw-r--r--lib/sisu/current/wikispeak.rb (renamed from lib/sisu/v5/wikispeak.rb)76
-rw-r--r--lib/sisu/current/xhtml.rb (renamed from lib/sisu/v5/xhtml.rb)79
-rw-r--r--lib/sisu/current/xhtml_epub2.rb (renamed from lib/sisu/v6/xhtml_epub2.rb)77
-rw-r--r--lib/sisu/current/xhtml_epub2_concordance.rb (renamed from lib/sisu/v5/xhtml_epub2_concordance.rb)78
-rw-r--r--lib/sisu/current/xhtml_epub2_format.rb (renamed from lib/sisu/v6/xhtml_epub2_format.rb)77
-rw-r--r--lib/sisu/current/xhtml_epub2_segments.rb (renamed from lib/sisu/v5/xhtml_epub2_segments.rb)103
-rw-r--r--lib/sisu/current/xhtml_epub2_tune.rb (renamed from lib/sisu/v6/xhtml_epub2_tune.rb)77
-rw-r--r--lib/sisu/current/xhtml_parts.rb (renamed from lib/sisu/v5/xhtml_parts.rb)77
-rw-r--r--lib/sisu/current/xhtml_shared.rb62
-rw-r--r--lib/sisu/current/xhtml_table.rb98
-rw-r--r--lib/sisu/current/xml_docbook5.rb (renamed from lib/sisu/v5/xml_docbook5.rb)77
-rw-r--r--lib/sisu/current/xml_dom.rb (renamed from lib/sisu/v6/xml_dom.rb)78
-rw-r--r--lib/sisu/current/xml_fictionbook2.rb (renamed from lib/sisu/v5/xml_fictionbook2.rb)77
-rw-r--r--lib/sisu/current/xml_format.rb (renamed from lib/sisu/v6/xml_format.rb)79
-rw-r--r--lib/sisu/current/xml_md_oai_pmh_dc.rb (renamed from lib/sisu/v5/xml_md_oai_pmh_dc.rb)77
-rw-r--r--lib/sisu/current/xml_odf_odt.rb (renamed from lib/sisu/v6/xml_odf_odt.rb)77
-rw-r--r--lib/sisu/current/xml_odf_odt_format.rb (renamed from lib/sisu/v6/xml_odf_odt_format.rb)77
-rw-r--r--lib/sisu/current/xml_parts.rb (renamed from lib/sisu/v5/xml_parts.rb)77
-rw-r--r--lib/sisu/current/xml_sax.rb (renamed from lib/sisu/v5/xml_sax.rb)77
-rw-r--r--lib/sisu/current/xml_scaffold_structure_collapsed.rb (renamed from lib/sisu/v6/xml_scaffold_structure_collapsed.rb)77
-rw-r--r--lib/sisu/current/xml_scaffold_structure_sisu.rb (renamed from lib/sisu/v6/xml_scaffold_structure_sisu.rb)77
-rw-r--r--lib/sisu/current/xml_shared.rb (renamed from lib/sisu/v5/xml_shared.rb)76
-rw-r--r--lib/sisu/current/xml_tables.rb (renamed from lib/sisu/v6/xml_tables.rb)77
-rw-r--r--lib/sisu/current/zap.rb90
-rw-r--r--lib/sisu/develop/air.rb80
-rw-r--r--lib/sisu/develop/ao.rb (renamed from lib/sisu/v6/ao.rb)222
-rw-r--r--lib/sisu/develop/ao_character_check.rb102
-rw-r--r--lib/sisu/develop/ao_composite.rb (renamed from lib/sisu/v6/ao_composite.rb)109
-rw-r--r--lib/sisu/develop/ao_doc_objects.rb (renamed from lib/sisu/v5/ao_doc_objects.rb)89
-rw-r--r--lib/sisu/develop/ao_doc_str.rb (renamed from lib/sisu/v5/ao_doc_str.rb)1173
-rw-r--r--lib/sisu/develop/ao_endnotes.rb (renamed from lib/sisu/v6/ao_endnotes.rb)92
-rw-r--r--lib/sisu/develop/ao_expand_insertions.rb (renamed from lib/sisu/v5/ao_expand_insertions.rb)93
-rw-r--r--lib/sisu/develop/ao_hash_digest.rb (renamed from lib/sisu/v5/ao_hash_digest.rb)85
-rw-r--r--lib/sisu/develop/ao_idx.rb (renamed from lib/sisu/v5/ao_idx.rb)102
-rw-r--r--lib/sisu/develop/ao_images.rb (renamed from lib/sisu/v5/ao_images.rb)87
-rw-r--r--lib/sisu/develop/ao_metadata.rb86
-rw-r--r--lib/sisu/develop/ao_misc_arrange.rb (renamed from lib/sisu/v6/ao_misc_arrange.rb)85
-rw-r--r--lib/sisu/develop/ao_numbering.rb (renamed from lib/sisu/v5/ao_numbering.rb)103
-rw-r--r--lib/sisu/develop/ao_persist.rb194
-rw-r--r--lib/sisu/develop/ao_references.rb502
-rw-r--r--lib/sisu/develop/ao_syntax.rb (renamed from lib/sisu/v5/ao_syntax.rb)109
-rw-r--r--lib/sisu/develop/cgi.rb84
-rw-r--r--lib/sisu/develop/cgi_pgsql.rb (renamed from lib/sisu/v5/cgi_pgsql.rb)77
-rw-r--r--lib/sisu/develop/cgi_sql_common.rb (renamed from lib/sisu/v6/cgi_sql_common.rb)103
-rw-r--r--lib/sisu/develop/cgi_sqlite.rb (renamed from lib/sisu/v5/cgi_sqlite.rb)77
-rw-r--r--lib/sisu/develop/conf.rb (renamed from lib/sisu/v5/conf.rb)77
-rw-r--r--lib/sisu/develop/constants.rb (renamed from lib/sisu/v6/constants.rb)119
-rw-r--r--lib/sisu/develop/css.rb (renamed from lib/sisu/v6/css.rb)95
-rw-r--r--lib/sisu/develop/db_columns.rb (renamed from lib/sisu/v6/db_columns.rb)85
-rw-r--r--lib/sisu/develop/db_create.rb (renamed from lib/sisu/v6/db_create.rb)78
-rw-r--r--lib/sisu/develop/db_dbi.rb (renamed from lib/sisu/v6/db_dbi.rb)78
-rw-r--r--lib/sisu/develop/db_drop.rb (renamed from lib/sisu/v6/db_drop.rb)86
-rw-r--r--lib/sisu/develop/db_import.rb (renamed from lib/sisu/v5/db_import.rb)78
-rw-r--r--lib/sisu/develop/db_indexes.rb (renamed from lib/sisu/v6/db_indexes.rb)78
-rw-r--r--lib/sisu/develop/db_load_tuple.rb (renamed from lib/sisu/v6/db_load_tuple.rb)78
-rw-r--r--lib/sisu/develop/db_remove.rb (renamed from lib/sisu/v5/db_remove.rb)78
-rw-r--r--lib/sisu/develop/db_select.rb (renamed from lib/sisu/v5/db_select.rb)78
-rw-r--r--lib/sisu/develop/db_sqltxt.rb (renamed from lib/sisu/v6/db_sqltxt.rb)102
-rw-r--r--lib/sisu/develop/db_tests.rb (renamed from lib/sisu/v6/db_tests.rb)78
-rw-r--r--lib/sisu/develop/dbi.rb (renamed from lib/sisu/v5/dbi.rb)77
-rw-r--r--lib/sisu/develop/dbi_discrete.rb (renamed from lib/sisu/v5/dbi_discrete.rb)77
-rw-r--r--lib/sisu/develop/digests.rb (renamed from lib/sisu/v5/digests.rb)77
-rw-r--r--lib/sisu/develop/dp.rb (renamed from lib/sisu/v6/dp.rb)180
-rw-r--r--lib/sisu/develop/dp_identify_markup.rb (renamed from lib/sisu/v5/dp_identify_markup.rb)81
-rw-r--r--lib/sisu/develop/dp_make.rb (renamed from lib/sisu/v5/dp_make.rb)79
-rw-r--r--lib/sisu/develop/embedded.rb (renamed from lib/sisu/v5/embedded.rb)77
-rw-r--r--lib/sisu/develop/errors.rb84
-rw-r--r--lib/sisu/develop/generic_parts.rb131
-rw-r--r--lib/sisu/develop/git.rb (renamed from lib/sisu/v5/git.rb)155
-rw-r--r--lib/sisu/develop/html.rb (renamed from lib/sisu/v6/html.rb)96
-rw-r--r--lib/sisu/develop/html_concordance.rb (renamed from lib/sisu/v6/html_concordance.rb)78
-rw-r--r--lib/sisu/develop/html_format.rb (renamed from lib/sisu/v5/html_format.rb)131
-rw-r--r--lib/sisu/develop/html_harvest.rb109
-rw-r--r--lib/sisu/develop/html_harvest_author_format.rb111
-rw-r--r--lib/sisu/develop/html_harvest_authors.rb (renamed from lib/sisu/v5/html_harvest_authors.rb)80
-rw-r--r--lib/sisu/develop/html_harvest_topics.rb (renamed from lib/sisu/v6/html_harvest_topics.rb)88
-rw-r--r--lib/sisu/develop/html_lite_shared.rb (renamed from lib/sisu/v6/html_lite_shared.rb)82
-rw-r--r--lib/sisu/develop/html_manifest.rb (renamed from lib/sisu/v5/html_manifest.rb)458
-rw-r--r--lib/sisu/develop/html_minitoc.rb (renamed from lib/sisu/v6/html_minitoc.rb)83
-rw-r--r--lib/sisu/develop/html_parts.rb (renamed from lib/sisu/v5/html_parts.rb)87
-rw-r--r--lib/sisu/develop/html_persist.rb237
-rw-r--r--lib/sisu/develop/html_promo.rb (renamed from lib/sisu/v5/html_promo.rb)77
-rw-r--r--lib/sisu/develop/html_scroll.rb (renamed from lib/sisu/v5/html_scroll.rb)77
-rw-r--r--lib/sisu/develop/html_segments.rb (renamed from lib/sisu/v5/html_segments.rb)433
-rw-r--r--lib/sisu/develop/html_shared.rb62
-rw-r--r--lib/sisu/develop/html_table.rb64
-rw-r--r--lib/sisu/develop/html_tune.rb (renamed from lib/sisu/v5/html_tune.rb)92
-rw-r--r--lib/sisu/develop/hub.rb (renamed from lib/sisu/v5/hub.rb)88
-rw-r--r--lib/sisu/develop/hub_actions.rb (renamed from lib/sisu/v5/hub_actions.rb)270
-rw-r--r--lib/sisu/develop/hub_loop_markup_files.rb (renamed from lib/sisu/v5/hub_loop_markup_files.rb)81
-rw-r--r--lib/sisu/develop/hub_options.rb (renamed from lib/sisu/v5/hub_options.rb)187
-rw-r--r--lib/sisu/develop/i18n.rb (renamed from lib/sisu/v6/i18n.rb)77
-rw-r--r--lib/sisu/develop/manpage.rb (renamed from lib/sisu/v6/manpage.rb)181
-rw-r--r--lib/sisu/develop/manpage_format.rb85
-rw-r--r--lib/sisu/develop/object_munge.rb307
-rw-r--r--lib/sisu/develop/prog_text_translation.rb (renamed from lib/sisu/v6/prog_text_translation.rb)77
-rw-r--r--lib/sisu/develop/qrcode.rb (renamed from lib/sisu/v5/qrcode.rb)77
-rw-r--r--lib/sisu/develop/relaxng.rb (renamed from lib/sisu/v5/relaxng.rb)77
-rw-r--r--lib/sisu/develop/remote.rb (renamed from lib/sisu/v6/remote.rb)77
-rw-r--r--lib/sisu/develop/rexml.rb (renamed from lib/sisu/v6/rexml.rb)81
-rw-r--r--lib/sisu/develop/se.rb (renamed from lib/sisu/v6/se.rb)77
-rw-r--r--lib/sisu/develop/se_cleanoutput.rb (renamed from lib/sisu/v5/se_cleanoutput.rb)77
-rw-r--r--lib/sisu/develop/se_clear.rb105
-rw-r--r--lib/sisu/develop/se_createsite.rb (renamed from lib/sisu/v6/se_createsite.rb)79
-rw-r--r--lib/sisu/develop/se_css.rb (renamed from lib/sisu/v6/se_css.rb)77
-rw-r--r--lib/sisu/develop/se_date.rb92
-rw-r--r--lib/sisu/develop/se_db.rb (renamed from lib/sisu/v5/se_db.rb)77
-rw-r--r--lib/sisu/develop/se_envcall.rb (renamed from lib/sisu/v6/se_envcall.rb)77
-rw-r--r--lib/sisu/develop/se_file_op.rb (renamed from lib/sisu/v5/se_file_op.rb)221
-rw-r--r--lib/sisu/develop/se_filemap.rb (renamed from lib/sisu/v6/se_filemap.rb)83
-rw-r--r--lib/sisu/develop/se_get_init.rb (renamed from lib/sisu/v6/se_get_init.rb)129
-rw-r--r--lib/sisu/develop/se_hub_particulars.rb (renamed from lib/sisu/v5/se_hub_particulars.rb)78
-rw-r--r--lib/sisu/develop/se_info_env.rb (renamed from lib/sisu/v5/se_info_env.rb)136
-rw-r--r--lib/sisu/develop/se_info_port.rb70
-rw-r--r--lib/sisu/develop/se_info_system.rb (renamed from lib/sisu/v5/se_info_system.rb)89
-rw-r--r--lib/sisu/develop/se_load.rb108
-rw-r--r--lib/sisu/develop/se_processing.rb (renamed from lib/sisu/v5/se_processing.rb)77
-rw-r--r--lib/sisu/develop/se_programs.rb (renamed from lib/sisu/v5/se_programs.rb)91
-rw-r--r--lib/sisu/develop/se_remotes.rb (renamed from lib/sisu/v6/se_remotes.rb)77
-rw-r--r--lib/sisu/develop/se_standardise_lang.rb (renamed from lib/sisu/v6/se_standardise_lang.rb)77
-rw-r--r--lib/sisu/develop/se_version.rb183
-rw-r--r--lib/sisu/develop/shared_images.rb (renamed from lib/sisu/v6/shared_images.rb)78
-rw-r--r--lib/sisu/develop/shared_markup_alt.rb (renamed from lib/sisu/v5/shared_markup_alt.rb)80
-rw-r--r--lib/sisu/develop/shared_metadata.rb (renamed from lib/sisu/v5/shared_metadata.rb)117
-rw-r--r--lib/sisu/develop/shared_sem.rb (renamed from lib/sisu/v5/shared_sem.rb)78
-rw-r--r--lib/sisu/develop/sisu_thor_lib.rb407
-rw-r--r--lib/sisu/develop/sitemaps.rb (renamed from lib/sisu/v5/sitemaps.rb)77
-rw-r--r--lib/sisu/develop/src_kdissert_share.rb102
-rw-r--r--lib/sisu/develop/src_po4a_share.rb309
-rw-r--r--lib/sisu/develop/src_po4a_shelf.rb1217
-rw-r--r--lib/sisu/develop/src_po4a_shelf_set.rb (renamed from lib/sisu/v6/po4a_set.rb)85
-rw-r--r--lib/sisu/develop/src_po4a_sst_ao_sst.rb893
-rw-r--r--lib/sisu/develop/src_po4a_sst_ao_sst_set.rb284
-rw-r--r--lib/sisu/develop/src_po4a_sstm.rb135
-rw-r--r--lib/sisu/develop/src_shared.rb (renamed from lib/sisu/v5/src_shared.rb)179
-rw-r--r--lib/sisu/develop/src_sisupod_make.rb (renamed from lib/sisu/v6/src_sisupod_make.rb)77
-rw-r--r--lib/sisu/develop/src_sisupod_sstm.rb109
-rw-r--r--lib/sisu/develop/sst_convert_markup.rb (renamed from lib/sisu/v5/sst_convert_markup.rb)86
-rw-r--r--lib/sisu/develop/sst_do_inline_footnotes.rb (renamed from lib/sisu/v5/sst_do_inline_footnotes.rb)79
-rw-r--r--lib/sisu/develop/sst_from_xml.rb (renamed from lib/sisu/v6/sst_from_xml.rb)80
-rw-r--r--lib/sisu/develop/sst_identify_markup.rb (renamed from lib/sisu/v5/sst_identify_markup.rb)81
-rw-r--r--lib/sisu/develop/sst_to_s_xml_sax.rb (renamed from lib/sisu/v5/sst_to_s_xml_sax.rb)79
-rw-r--r--lib/sisu/develop/termsheet.rb (renamed from lib/sisu/v6/termsheet.rb)82
-rw-r--r--lib/sisu/develop/texinfo.rb (renamed from lib/sisu/v6/texinfo.rb)77
-rw-r--r--lib/sisu/develop/texinfo_format.rb (renamed from lib/sisu/v5/texinfo_format.rb)79
-rw-r--r--lib/sisu/develop/texpdf.rb (renamed from lib/sisu/v5/texpdf.rb)77
-rw-r--r--lib/sisu/develop/texpdf_format.rb (renamed from lib/sisu/v5/texpdf_format.rb)85
-rw-r--r--lib/sisu/develop/texpdf_parts.rb (renamed from lib/sisu/v6/texpdf_parts.rb)77
-rw-r--r--lib/sisu/develop/txt_asciidoc.rb (renamed from lib/sisu/v6/txt_asciidoc.rb)314
-rw-r--r--lib/sisu/develop/txt_asciidoc_decorate.rb207
-rw-r--r--lib/sisu/develop/txt_markdown.rb (renamed from lib/sisu/v5/txt_markdown.rb)317
-rw-r--r--lib/sisu/develop/txt_markdown_decorate.rb207
-rw-r--r--lib/sisu/develop/txt_orgmode.rb376
-rw-r--r--lib/sisu/develop/txt_orgmode_decorate.rb186
-rw-r--r--lib/sisu/develop/txt_output.rb86
-rw-r--r--lib/sisu/develop/txt_plain.rb (renamed from lib/sisu/v5/txt_plain.rb)319
-rw-r--r--lib/sisu/develop/txt_plain_decorate.rb189
-rw-r--r--lib/sisu/develop/txt_read.rb109
-rw-r--r--lib/sisu/develop/txt_rst.rb (renamed from lib/sisu/v5/txt_rst.rb)293
-rw-r--r--lib/sisu/develop/txt_rst_decorate.rb186
-rw-r--r--lib/sisu/develop/txt_shared.rb (renamed from lib/sisu/v5/txt_shared.rb)77
-rw-r--r--lib/sisu/develop/txt_textile.rb (renamed from lib/sisu/v5/txt_textile.rb)315
-rw-r--r--lib/sisu/develop/txt_textile_decorate.rb186
-rw-r--r--lib/sisu/develop/update.rb (renamed from lib/sisu/v5/update.rb)77
-rw-r--r--lib/sisu/develop/urls.rb (renamed from lib/sisu/v6/urls.rb)92
-rw-r--r--lib/sisu/develop/utils.rb (renamed from lib/sisu/v6/utils.rb)83
-rw-r--r--lib/sisu/develop/utils_composite.rb115
-rw-r--r--lib/sisu/develop/utils_response.rb114
-rw-r--r--lib/sisu/develop/utils_screen_text_color.rb (renamed from lib/sisu/v6/utils_screen_text_color.rb)77
-rw-r--r--lib/sisu/develop/utils_spell.rb99
-rw-r--r--lib/sisu/develop/webrick.rb (renamed from lib/sisu/v5/webrick.rb)79
-rw-r--r--lib/sisu/develop/wikispeak.rb (renamed from lib/sisu/v6/wikispeak.rb)80
-rw-r--r--lib/sisu/develop/xhtml.rb (renamed from lib/sisu/v6/xhtml.rb)199
-rw-r--r--lib/sisu/develop/xhtml_epub2.rb (renamed from lib/sisu/v5/xhtml_epub2.rb)555
-rw-r--r--lib/sisu/develop/xhtml_epub2_concordance.rb (renamed from lib/sisu/v6/xhtml_epub2_concordance.rb)78
-rw-r--r--lib/sisu/develop/xhtml_epub2_format.rb (renamed from lib/sisu/v5/xhtml_epub2_format.rb)84
-rw-r--r--lib/sisu/develop/xhtml_epub2_persist.rb278
-rw-r--r--lib/sisu/develop/xhtml_epub2_segments.rb (renamed from lib/sisu/v6/xhtml_epub2_segments.rb)454
-rw-r--r--lib/sisu/develop/xhtml_epub2_tune.rb (renamed from lib/sisu/v5/xhtml_epub2_tune.rb)77
-rw-r--r--lib/sisu/develop/xhtml_parts.rb (renamed from lib/sisu/v6/xhtml_parts.rb)79
-rw-r--r--lib/sisu/develop/xhtml_shared.rb62
-rw-r--r--lib/sisu/develop/xhtml_table.rb97
-rw-r--r--lib/sisu/develop/xml_docbook5.rb (renamed from lib/sisu/v6/xml_docbook5.rb)77
-rw-r--r--lib/sisu/develop/xml_dom.rb (renamed from lib/sisu/v5/xml_dom.rb)212
-rw-r--r--lib/sisu/develop/xml_fictionbook2.rb (renamed from lib/sisu/v6/xml_fictionbook2.rb)81
-rw-r--r--lib/sisu/develop/xml_format.rb (renamed from lib/sisu/v5/xml_format.rb)79
-rw-r--r--lib/sisu/develop/xml_md_oai_pmh_dc.rb (renamed from lib/sisu/v6/xml_md_oai_pmh_dc.rb)77
-rw-r--r--lib/sisu/develop/xml_odf_odt.rb (renamed from lib/sisu/v5/xml_odf_odt.rb)125
-rw-r--r--lib/sisu/develop/xml_odf_odt_format.rb (renamed from lib/sisu/v5/xml_odf_odt_format.rb)81
-rw-r--r--lib/sisu/develop/xml_parts.rb (renamed from lib/sisu/v6/xml_parts.rb)77
-rw-r--r--lib/sisu/develop/xml_persist.rb126
-rw-r--r--lib/sisu/develop/xml_sax.rb (renamed from lib/sisu/v6/xml_sax.rb)222
-rw-r--r--lib/sisu/develop/xml_scaffold_structure_collapsed.rb (renamed from lib/sisu/v5/xml_scaffold_structure_collapsed.rb)77
-rw-r--r--lib/sisu/develop/xml_scaffold_structure_sisu.rb (renamed from lib/sisu/v5/xml_scaffold_structure_sisu.rb)77
-rw-r--r--lib/sisu/develop/xml_shared.rb (renamed from lib/sisu/v6/xml_shared.rb)78
-rw-r--r--lib/sisu/develop/xml_tables.rb (renamed from lib/sisu/v5/xml_tables.rb)77
-rw-r--r--lib/sisu/develop/zap.rb90
-rw-r--r--lib/sisu/v5/air.rb83
-rw-r--r--lib/sisu/v5/ao_character_check.rb106
-rw-r--r--lib/sisu/v5/ao_metadata.rb89
-rw-r--r--lib/sisu/v5/cgi.rb88
-rw-r--r--lib/sisu/v5/errors.rb87
-rw-r--r--lib/sisu/v5/generic_parts.rb134
-rw-r--r--lib/sisu/v5/html_harvest.rb114
-rw-r--r--lib/sisu/v5/html_harvest_author_format.rb114
-rw-r--r--lib/sisu/v5/html_shared.rb65
-rw-r--r--lib/sisu/v5/html_table.rb67
-rw-r--r--lib/sisu/v5/manpage_format.rb88
-rw-r--r--lib/sisu/v5/se_clear.rb109
-rw-r--r--lib/sisu/v5/se_date.rb95
-rw-r--r--lib/sisu/v5/se_info_port.rb73
-rw-r--r--lib/sisu/v5/se_load.rb111
-rw-r--r--lib/sisu/v5/se_version.rb155
-rw-r--r--lib/sisu/v5/src_kdissert_share.rb105
-rw-r--r--lib/sisu/v5/src_share.rb112
-rw-r--r--lib/sisu/v5/utils_response.rb76
-rw-r--r--lib/sisu/v5/utils_spell.rb102
-rw-r--r--lib/sisu/v5/xhtml_shared.rb65
-rw-r--r--lib/sisu/v5/xhtml_table.rb101
-rw-r--r--lib/sisu/v5/zap.rb93
-rw-r--r--lib/sisu/v6/air.rb83
-rw-r--r--lib/sisu/v6/ao_metadata.rb89
-rw-r--r--lib/sisu/v6/cgi.rb88
-rw-r--r--lib/sisu/v6/errors.rb87
-rw-r--r--lib/sisu/v6/generic_parts.rb134
-rw-r--r--lib/sisu/v6/html_harvest.rb114
-rw-r--r--lib/sisu/v6/html_harvest_author_format.rb114
-rw-r--r--lib/sisu/v6/html_shared.rb65
-rw-r--r--lib/sisu/v6/html_table.rb67
-rw-r--r--lib/sisu/v6/manpage_format.rb88
-rw-r--r--lib/sisu/v6/po4a.rb984
-rw-r--r--lib/sisu/v6/se_clear.rb109
-rw-r--r--lib/sisu/v6/se_date.rb95
-rw-r--r--lib/sisu/v6/se_info_port.rb73
-rw-r--r--lib/sisu/v6/se_load.rb111
-rw-r--r--lib/sisu/v6/src_kdissert_share.rb105
-rw-r--r--lib/sisu/v6/src_share.rb112
-rw-r--r--lib/sisu/v6/utils_response.rb76
-rw-r--r--lib/sisu/v6/utils_spell.rb102
-rw-r--r--lib/sisu/v6/xhtml_shared.rb65
-rw-r--r--lib/sisu/v6/xhtml_table.rb101
-rw-r--r--lib/sisu/v6/zap.rb93
-rw-r--r--man/man1/sisu.1178
-rwxr-xr-xqi181
-rw-r--r--setup/qi_libs.rb320
-rw-r--r--setup/qi_libs_base.rb6
-rw-r--r--setup/rbuild_libs.rb33
-rw-r--r--setup/sisu_version.rb10
l---------sisu.org2
412 files changed, 32046 insertions, 24382 deletions
diff --git a/.gitignore b/.gitignore
index e1a03103..2811a579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
# git ls-files --others --exclude-from=.git/info/exclude
*~
+*_
\#*
-.pc
+*.\#*
+*.tmp
+*_tmp
*.gem
*.gemspec
-*.qi
-*.qi.rb
+*_.rb
+*.rb_
+.pc
+0???-*.patch
diff --git a/CHANGELOG b/CHANGELOG
index f8b47b0d..87616dc5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,7 @@
* ./debian/changelog (in debian/sid branch)
* README
-* sisu.org
+* ./data/doc/sisu/org/sisu.org
* sisu-markup-samples source:
<http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary>
diff --git a/README b/README
index 51d49f7d..ad3434e7 100644
--- a/README
+++ b/README
@@ -37,15 +37,20 @@ Homepages:
INSTALL OR RUN WITHOUT INSTALLATION
***********************************
-SOURCE TARBALL
---------------
+SOURCE TREE
+-----------
RUN OFF SOURCE PACKAGE DIRECTORY TREE (WITHOUT INSTALLING)
..........................................................
-1. Download the latest source
+Download & unpack the latest source tarball
-2. Unpack the source
+or
+
+Git clone the latest source, to clone the latest source without the repo
+history:
+
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
Provided you have *Ruby*, *SiSU* can be run without installation straight from
the source package directory tree. Run ruby against the full path to bin/sisu
@@ -55,14 +60,36 @@ Note however, that additional external package dependencies, such as texlive
(for pdfs), sqlite3 or postgresql (for search) should you desire to use them
are not taken care of for you.
-GEM INSTALL (WITH RAKE)
-.......................
+GEM INSTALL
+...........
Gem install, you need to:
(i) create the gemspec; (ii) build the gem (from the gemspec); (iii) install
the gem
+
+----------------------------------------
+
+GEM INSTALL WITH QI (QUICK INSTALL) SCRIPT
+..........................................
+
+(This requires that ruby -thor is installed).
+
+qi (quick install) can go through the steps required to install the gem:
+
+ qi gem --create --build --install --stable
+
+or
+
+ qi gem --create --build --install --unstable
+
+
+----------------------------------------
+
+GEM INSTALL WITH RAKE
+.....................
+
Provided you have ruby & rake, this can be done with the single command:
rake gem_create_build_install # (to build and install sisu v5 & sisu v6,
@@ -79,7 +106,21 @@ separate gems are made/installed for sisu v5 & sisu v6 contained in source:
for individual steps (create, build, install) see rake options, rake -T to
specify sisu version for sisu installed via gem
- gem search sisu
+For a list of alternative actions you may type:
+
+ rake help
+
+ rake -T
+
+Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
+
+
+----------------------------------------
+
+MISC GEM
+........
+
+gem search sisu
sisu _5.6.2_ --version
@@ -89,15 +130,21 @@ to uninstall sisu installed via gem
sudo gem uninstall --verbose sisu
-For a list of alternative actions you may type:
+DIRECT INSTALLATION WITH QI (QUICK INSTALL) SCRIPT
+..................................................
- rake help
+(This requires that ruby -thor is installed).
- rake -T
+Root will be requested as required:
-Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
+ qi setup --bin --lib --conf --data --share --man
-Rant: <http://make.rubyforge.org/> <http://rubyforge.org/frs/?group_id=615>
+or
+
+ qi setup --all
+
+You may wish to do a dryrun to see where files would be installed without
+copying them, to do so add the flag --dryrun
INSTALLATION WITH SETUP.RB
..........................
@@ -2048,6 +2095,129 @@ page (break) line across page (dividing paragraphs):
-..-
+BIBLIOGRAPHY / REFERENCES
+.........................
+
+There are three ways to prepare a bibliography using sisu: (i) manually
+preparing and marking up as regular text in sisu a list of references; (ii)
+(tagging citations for inclusion) using a restricted form for citations and
+marking them up to identify them as such (which sisu then parses and attempts
+to build a bibliography from), or; (iii) preparing a bibliography, using
+metadata tags for author: title: year: and the like, including an id: and
+shortname: the id can be inserted in footnotes in place of the citation, and it
+will be substituted there by the short title for the work.
+
+For the heading/section sequence: endnotes, bibliography then book index to
+occur, the name biblio or bibliography must be given to the bibliography
+section, like so:
+
+1~biblio Bibliography
+
+
+----------------------------------------
+
+A MARKUP TAGGED METADATA BIBLIOGRAPHY SECTION
+.............................................
+
+Here instead of writing your full citations directly in footnotes, each time
+you have new material to cite, you add it to your bibliography section (if it
+has not been added yet) providing the information you need against an available
+list of tags. At the time of writing, for articles: au|author; ti|title;
+lng|language; jo|journal; vo|volume; edr|editor; yr|year; pst|publisher_state;
+url; note; sn|shortname; id; and
+for books: au|author; ti|title; st|subtitle; lng|language; pb|publisher;
+edn|edition; yr|year; pst|publisher_state; url; note; sn|shortname; id.
+
+The required tags are au: ti: and year: [^10] an short quick example might be
+as follows:
+
+1~biblio Bibliography
+
+au: von Hippel, E.
+ti: Perspective: User Toolkits for Innovation
+lng: (language)
+jo: Journal of Product Innovation Management
+vo: 18
+edr: (editor)
+yr: 2001
+note:
+sn: Hippel, /{User Toolkits}/ (2001)
+id: vHippel_2001
+% form:
+
+au: Benkler, Yochai
+ti: The Wealth of Networks
+st: How Social Production Transforms Markets and Freedom
+lng: (language)
+pb: Harvard University Press
+edn: (edition)
+yr: 2006
+pst: U.S.
+url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+note:
+sn: Benkler, /{Wealth of Networks}/ (2006)
+id: Benkler2006
+
+au: Quixote, Don; Panza, Sancho
+ti: Taming Windmills, Keeping True
+jo: Imaginary Journal
+yr: 1605
+url: https://en.wikipedia.org/wiki/Don_Quixote
+note: made up to provide an example of author markup for an article with two authors
+sn: Quixote and Panza, /{Taming Windmills}/ (1605)
+id: quixote1605
+
+Note that the section name biblio (or bibliography) is required for the
+bibliography to be recognized as such, parsed correctly, and placed after the
+auto-generated endnote section.
+
+Using this method, work goes into preparing the bibliography, which will be
+automatically sorted by surname and presented, under the References or
+Bibliography section using the format for books:
+
+ number, author (firstname & initials, surname), fulltitle, publisher, year,
+ url (if any)
+
+and for articles:
+
+ number, author (firstname & initials, surname), title, journal, volume, year,
+ url (if any)
+
+The metadata tags may include shortname and id, if provided, every time the
+given id is found within the text it will be replaced by the given short title
+of the work (it is for this reason the short title has sisu markup to italicize
+the title), it should work with any page numbers to be added, the short title
+should be one that can easily be used to look up the full description in the
+bibliography.
+
+The following footnote~{ quixote1605, pp 1000 - 1001, also Benkler2006 p 1. }~
+
+would be presented as:
+
+Quixote and Panza, /Taming Windmills/ (1605), pp 1000 - 1001 also, Benkler,
+/Wealth of Networks/, (2006) p 1 or rather[^11]
+
+
+----------------------------------------
+
+TAGGING CITATIONS FOR INCLUSION IN THE BIBLIOGRAPHY
+...................................................
+
+Here whenever you make a citation that you wish be included in the
+bibliography, you tag the citation as such using special delimiters (which are
+subsequently removed from the final text produced by sisu)
+
+Here you would write something like the following, either in regular text or a
+footnote
+
+See .: Quixote, Don; Panza, Sancho /{Taming Windmills, Keeping True}/ (1605) :.
+
+*SiSU* will parse for a number of patterns within the delimiters to try make
+out the authors, title, date etc. and from that create a Bibliography. This is
+more limited than the previously described method of preparing a tagged
+bibliography, and using an id within text to identify the work, which also
+lends itself to greater consistency.
+
BOOK INDEX
..........
@@ -2179,3 +2349,8 @@ Configure substitution in _sisu/sisu_document_make
[9]: Table from the Wealth of Networks by Yochai Benkler
<http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler>
+
+ [10]: for which you may alternatively use the full form author: title: and year:
+
+ [11]: Quixote and Panza, /Taming Windmills/ (1605), pp 1000 - 1001 also, Benkler,
+ /Wealth of Networks/ (2006), p 1
diff --git a/bin/sisu b/bin/sisu
index a8ecb70e..9bb41736 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# encoding: utf-8
-#SiSU: copyright (C) 1997 - 2014 Ralph Amissah; License GPL 3, see appended program information
+#SiSU: copyright (C) 1997 - 2015 Ralph Amissah; License GPL 3, see appended program information
class Orient
require 'singleton'
include Singleton
@@ -18,17 +18,23 @@ class Orient
def default
stable
end
+ def current
+ 'current'
+ end
+ def next
+ 'next'
+ end
self
end
def sisu_called_from_directory
@@sisu_called_from_directory ||= Dir.pwd
end
- def sisu_run_from
- if processing.called_as == processing.file_full_path \
- and File.dirname(processing.file_full_path) != Config::CONFIG['bindir']
+ def sisu_run_from?
+ if processing.called_as == processing.sisu_runtime_path \
+ and File.dirname(processing.sisu_runtime_path) != RbConfig::CONFIG['bindir']
:full_path_to_sisu_bin_in_sisu_dir_tree
- elsif processing.file_full_path =~/\/gems\// \
- and processing.file_full_path \
+ elsif processing.sisu_runtime_path =~/\/gems\// \
+ and processing.sisu_runtime_path \
=~ /\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
:gem_install
else
@@ -45,7 +51,7 @@ class Orient
def argv_str
argv.inspect
end
- def file_full_path
+ def sisu_runtime_path
__FILE__
end
def stable
@@ -57,6 +63,12 @@ class Orient
def default
'v' + version.default
end
+ def current
+ 'current'
+ end
+ def next
+ 'develop'
+ end
def stable_bin_file_regex
%r{\bsisu#{version.stable}$}
end
@@ -70,15 +82,15 @@ class Orient
%r{\/sisu-#{version.unstable}\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
end
def stable_modifier_regex
- %r{"(?:--v#{version.stable}|--current|--stable)"}
+ %r{"(?:--v#{version.stable}|--current|--stable|--release)"}
end
def unstable_modifier_regex
- %r{"(?:--v#{version.unstable}|--current|--stable)"}
+ %r{"(?:--v#{version.unstable}|--next|--unstable|--dev)"}
end
self
end
def sisu_lib
- "sisu/#{select_version_check}"
+ "sisu/#{branch_name_}"
end
def sisu_path_lib
if sisu_path_specified_lib \
@@ -88,11 +100,33 @@ class Orient
end
end
def sisu_version_info_path
- "#{sisu_path_base_system_data}/#{select_version_check}/v/version.yml"
+ "#{sisu_path_base_system_data}/version/#{branch_name?}.yml"
+ end
+ def branch_name_
+ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \
+ or sisu_run_from? == :system_install
+ case processing.called_as
+ when processing.stable_bin_file_regex then processing.current
+ when processing.unstable_bin_file_regex then processing.next
+ else
+ case processing.argv_str
+ when processing.stable_modifier_regex then processing.current
+ when processing.unstable_modifier_regex then processing.next
+ else processing.current
+ end
+ end
+ elsif sisu_run_from? == :gem_install
+ case processing.sisu_runtime_path
+ when processing.stable_gem_regex then processing.current
+ when processing.unstable_gem_regex then processing.next
+ else processing.current
+ end
+ else processing.current
+ end
end
- def select_version_check
- if sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
- or sisu_run_from == :system_install
+ def branch_version_
+ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \
+ or sisu_run_from? == :system_install
case processing.called_as
when processing.stable_bin_file_regex then processing.stable
when processing.unstable_bin_file_regex then processing.unstable
@@ -100,39 +134,58 @@ class Orient
case processing.argv_str
when processing.stable_modifier_regex then processing.stable
when processing.unstable_modifier_regex then processing.unstable
- else processing.default
+ else processing.stable
end
end
- elsif sisu_run_from == :gem_install
- case processing.file_full_path
+ elsif sisu_run_from? == :gem_install
+ case processing.sisu_runtime_path
when processing.stable_gem_regex then processing.stable
when processing.unstable_gem_regex then processing.unstable
- else processing.default
+ else processing.stable
end
- else processing.default
+ else processing.stable
end
end
def paths_set
- if sisu_run_from == :system_install \
+ if sisu_run_from? == :system_install \
and processing.called_as \
- =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
+ =~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
:set_path_system
- elsif sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
+ elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \
and processing.called_as \
- !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
+ !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
&& File.expand_path(processing.called_as) \
=~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \
&& FileTest.file?(processing.called_as)
:set_dir_tree_full_path
- elsif sisu_run_from==:gem_install
+ elsif sisu_run_from? ==:gem_install
:set_gem_path
else nil
end
end
+ def git_version
+ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \
+ && FileTest.file?('/usr/bin/git') \
+ && FileTest.directory?(processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'/.git'))
+ bin_base=processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'')
+ pwd=Dir.pwd
+ Dir.chdir(bin_base)
+ x=`git describe --long --tags 2>&1`.strip.
+ gsub(/^[a-z_-]*([0-9.]+)/,'\1').
+ gsub(/([^-]*-g)/,'r\1').
+ gsub(/-/,'.')
+ x=(x=~/^[0-9]+\.[0-9]+\.[0-9]+\.r[0-9]+\.g[0-9a-f]{7}/) \
+ ? x
+ : nil
+ Dir.chdir(pwd)
+ x
+ else nil
+ end
+ end
def sisu_path_base
case paths_set
when :set_path_system
- Config::CONFIG['datadir'] + '/sisu'
+ RbConfig::CONFIG['datadir'] + '/sisu'
when :set_dir_tree_full_path
File.expand_path(processing.called_as).
sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')
@@ -144,7 +197,7 @@ class Orient
def sisu_path_base_system_data
case paths_set
when :set_path_system
- Config::CONFIG['datadir'] + '/sisu'
+ RbConfig::CONFIG['datadir'] + '/sisu'
when :set_dir_tree_full_path
File.expand_path(processing.called_as).
sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')
@@ -155,7 +208,7 @@ class Orient
end
def sisu_path_specified_lib
if (processing.called_as \
- !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
+ !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
File.expand_path(processing.called_as).
sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')
else nil
@@ -171,17 +224,50 @@ class Orient
self
end
def sisu_is
- {
- run_from: sisu_run_from,
- version_dir: select_version_check,
- path_base: sisu_path_base,
- path_base_system_data: sisu_path_base_system_data,
- path_lib: sisu_path_lib,
- version_info_path: sisu_version_info_path,
- language_list: language_list.codes,
- language_list_regex: language_list.regex,
- called_from: sisu_called_from_directory,
- }
+ def runtime_path?
+ sisu_runtime_path
+ end
+ def runtime_type?
+ sisu_run_from?
+ end
+ def called_from?
+ sisu_called_from_directory
+ end
+ def branch_name?
+ branch_name_
+ end
+ def branch_version?
+ branch_version_
+ end
+ def path_base?
+ sisu_path_base
+ end
+ def path_base_system_data?
+ sisu_path_base_system_data
+ end
+ def path_lib?
+ sisu_path_lib
+ end
+ def version_info_path?
+ sisu_version_info_path
+ end
+ def language_list?
+ language_list.codes
+ end
+ def language_list_regex?
+ language_list.regex
+ end
+ def git_version_info?
+ git_version
+ end
+ def runtime?
+ {
+ call_path: called_from?,
+ runtime_path: runtime_path?,
+ runtime_type: runtime_type?,
+ }
+ end
+ self
end
def get_processing_info
def sortout
@@ -223,7 +309,7 @@ class Orient
self
end
def control
- require "#{sisu_is[:path_lib]}/hub"
+ require "#{sisu_is.path_lib?}/hub"
sisu_called_from_directory
begin
if get_processing_info.processing_files.length > 0
@@ -236,7 +322,7 @@ class Orient
Dir.chdir(markup_dir)
$sisu_document_markup_directory_base_fixed_path=
Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
- SiSU::HubMaster.new(argv_sub,sisu_called_from_directory)
+ SiSU::HubMaster.new(argv_sub,sisu_is.runtime?)
elsif markup_dir =~/https?:/
markup_file.each do |mf|
(FileTest.file?(mf)) \
@@ -247,7 +333,7 @@ class Orient
$sisu_document_markup_directory_base_fixed_path=
Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
argv_sub=command_line_modifiers + markup_file
- SiSU::HubMaster.new(argv_sub,sisu_called_from_directory)
+ SiSU::HubMaster.new(argv_sub,sisu_is.runtime?)
else p "Error directory specified #{markup_dir} not found"
end
ensure
@@ -259,7 +345,7 @@ class Orient
$sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
$sisu_document_markup_directory_base_fixed_path=
Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
- SiSU::HubMaster.new(processing.argv,sisu_called_from_directory)
+ SiSU::HubMaster.new(processing.argv,sisu_is.runtime?)
end
rescue
ensure
@@ -285,10 +371,10 @@ rescue #% -
puts %{
#{%x{ruby -v}.strip.to_s}
#{RUBY_VERSION}
- ruby version: #{Config::CONFIG['RUBY_PROGRAM_VERSION']}p#{Config::CONFIG['PATCHLEVEL']}
- ruby named: #{Config::CONFIG['ruby_version']}
- rubylib: #{Config::CONFIG['rubylibdir']}
- rubylib local: #{Config::CONFIG['sitelibdir']}
+ ruby version: #{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}p#{RbConfig::CONFIG['PATCHLEVEL']}
+ ruby named: #{RbConfig::CONFIG['ruby_version']}
+ rubylib: #{RbConfig::CONFIG['rubylibdir']}
+ rubylib local: #{RbConfig::CONFIG['sitelibdir']}
gem dir: #{Gem.dir}
gem path: #{Gem.path}
}
@@ -299,58 +385,56 @@ rescue #% -
end
__END__
- * Name: SiSU
-
- * Description: a framework for document structuring, publishing and search
+* Name: SiSU
- * Author: Ralph Amissah
+** Description: documents, structuring, processing, publishing, search
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- Copyright (C) Ralph Amissah
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- 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.
+ 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.
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ 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>
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Download:
- <http://www.sisudoc.org/sisu/en/SiSU/download.html>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
+** Download:
+ <http://www.sisudoc.org/sisu/en/SiSU/download.html>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils
new file mode 100644
index 00000000..47d8f32b
--- /dev/null
+++ b/bin/sisu-misc-utils
@@ -0,0 +1,228 @@
+#!/usr/bin/env ruby
+begin
+ require 'thor'
+rescue LoadError
+ puts 'thor (package ruby-thor) not found'
+end
+require 'find'
+require 'fileutils'
+ include FileUtils
+require 'pathname'
+require 'rbconfig.rb'
+module SiSUconf
+ class LanguageCodes
+ def language_list
+ def codes
+ %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh]
+ end
+ def regex
+ codes.join('|')
+ end
+ self
+ end
+ end
+ class DetermineLibsPath
+ def version
+ def stable
+ '5'
+ end
+ def unstable
+ '6'
+ end
+ self
+ end
+ def processing
+ def called_as
+ $0
+ #$called_as
+ end
+ def called_as_exe
+ File.basename(called_as)
+ end
+ def called_as_exe_strip_current_develop
+ File.basename(called_as).gsub(/-(?:current|develop)/,'')
+ end
+ def argv
+ $*
+ #$argv
+ end
+ def argv_str
+ argv.inspect
+ end
+ def file_full_path
+ __FILE__
+ end
+ def current
+ 'current'
+ end
+ def next
+ 'develop'
+ end
+ def stable_bin_file_regex
+ %r{\bsisu#{version.stable}$}
+ end
+ def unstable_bin_file_regex
+ %r{\bsisu#{version.unstable}$}
+ end
+ def stable_modifier_regex
+ %r{"(?:--v#{version.stable}|--current|--stable)"}
+ end
+ def unstable_modifier_regex
+ %r{"(?:--v#{version.unstable}|--next|--unstable)"}
+ end
+ def lib_filename
+ 'sisu_thor_lib'
+ end
+ self
+ end
+ def sisu_run_from?
+ if processing.called_as == processing.file_full_path \
+ and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir']
+ :full_path_to_sisu_bin_in_sisu_dir_tree
+ elsif processing.file_full_path =~/\/gems\// \
+ and processing.file_full_path \
+ =~ /\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
+ :gem_install
+ else
+ :system_install
+ end
+ end
+ def branch_name_
+ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \
+ or sisu_run_from? == :system_install
+ case processing.called_as
+ when processing.stable_bin_file_regex then processing.current
+ when processing.unstable_bin_file_regex then processing.next
+ else
+ case processing.argv_str
+ when processing.stable_modifier_regex then processing.current
+ when processing.unstable_modifier_regex then processing.next
+ else processing.current
+ end
+ end
+ elsif sisu_run_from? == :gem_install
+ case processing.file_full_path
+ when processing.stable_gem_regex then processing.current
+ when processing.unstable_gem_regex then processing.next
+ else processing.current
+ end
+ else processing.current
+ end
+ end
+ def sisu_path_specified_lib
+ if (processing.called_as \
+ !~ /^#{RbConfig::CONFIG['bindir']}\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/)
+ File.expand_path(processing.called_as).
+ sub(/bin\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/,'lib')
+ else nil
+ end
+ end
+ def sisu_lib
+ "sisu/#{branch_name_}"
+ end
+ def sisu_path_lib
+ if sisu_path_specified_lib \
+ && FileTest.file?("#{sisu_path_specified_lib}/#{sisu_lib}/#{lib_filename}.rb")
+ "#{sisu_path_specified_lib}/#{sisu_lib}"
+ else sisu_lib
+ end
+ end
+ end
+ class Configure < Thor
+ $SiSU_Language_Codes=LanguageCodes.new
+ paths= DetermineLibsPath.new
+ #p "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}"
+ require "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}" # sisu_thor_lib.rb
+ @@source=@@targets=nil
+ include SiSU_Po4a_Actions
+ class_option :verbose, :type => :boolean
+# rake help clean default distclean make manpage readme rebuild
+ desc 'po4a',
+ 'place SiSU translations under po4a management' \
+ + 'assist with having sisu markup files managed by po4a' \
+ + 'create configuration files, and language directories and' \
+ + 'populate them with po4a pot & po files for translation and' \
+ + 'from those (as translated) create translated sisu markup' \
+ + '.ssm .sst & .ssi files in corresponding language sub-directories' \
+ + '*WARNING* creates, destroys, overwrites directories not managed by po4a'
+ options \
+ :help => :boolean,
+ :clean => :boolean,
+ #:default => :boolean,
+ :distclean => :boolean,
+ :make => :boolean,
+ :lang_source => :string,
+ :lang_targets => :array,
+ :manpage => :boolean,
+ :readme => :boolean,
+ :rebuild => :boolean,
+ :current => :string,
+ :next => :string,
+ :stable => :string,
+ :unstable => :string
+ def po4a
+ @@source=source=if options[:lang_source] \
+ and not options[:lang_source].empty?
+ options[:lang_source]
+ else nil
+ end
+ @@targets=targets=if options[:lang_targets]
+ options[:lang_targets]
+ else nil
+ end
+ language.translation_languages_selected(targets)
+ language.source_language_selected(source)
+ if options[:help]
+ notice.project_help
+ end
+ if options[:clean]
+ notice.default(:clean)
+ project.clean
+ end
+ #if options[:default]
+ # notice.project_help
+ #end
+ if options[:distclean]
+ notice.default(:distclean)
+ project.distclean
+ end
+ if options[:make]
+ notice.default(:make)
+ project.make
+ end
+ if options[:manpage]
+ generate.manpage
+ end
+ if options[:readme]
+ generate.readme
+ end
+ if options[:rebuild]
+ notice.default(:rebuild)
+ project.distclean
+ project.make
+ end
+ end
+ end
+end
+begin
+ require 'rbconfig'
+ $called_as,$argv=$0,$*
+ SiSUconf::Configure.start(ARGV)
+rescue
+end
+__END__
+
+** Description:
+
+** Homepage: <http://www.jus.uio.no/sisu/SiSU>
+ <http://search.sisudoc.org>
+** Download: <http://www.jus.uio.no/sisu/download>
+
+** Copyright: (C) 2007 - 2015 Ralph Amissah
+
+** License: GPL3+
+
+** Ralph Amissah <ralph@amissah.com>
+ Ralph Amissah <ralph.amissah@gmail.com>
+
+#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
diff --git a/data/doc/sisu/CHANGELOG_v1 b/data/doc/sisu/CHANGELOG_v1
index 5fd063cb..009334f8 100644
--- a/data/doc/sisu/CHANGELOG_v1
+++ b/data/doc/sisu/CHANGELOG_v1
@@ -4,28 +4,28 @@ v1 branch is legacy: v2 branch supersedes & replaces it
v1 sisu pretty mature in operation and syntax
v1 branch removed from sisu 3.0 available in sisu =< 2.7
-* 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_v1 CHANGELOG_v2 README data/doc/sisu/
+ * 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_v1 CHANGELOG_v2 README data/doc/sisu/
Reverse Chronological:
-%% Legacy Branch, Reference
+* Legacy Branch, Reference
-%% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
-http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
+** 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
sisu_1.0.3.orig.tar.gz
sisu_1.0.3-1.dsc
sisu_1.0.3-1.diff.gz
* sysenv, version.yml moved to /usr/share/sisu/v1/v (from /etc/sisu)
-%% 2.0.0.orig.tar.gz (2010-03-06:09/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
+** 2.0.0.orig.tar.gz (2010-03-06:09/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
sisu_2.0.0.orig.tar.gz
sisu_2.0.0-1.dsc
sisu_2.0.0-1.diff.gz
@@ -36,8 +36,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
* version 2 series changes will be mentioned in this changelog only insofar
as there are changes to sisu v1
-%% 1.0.3.orig.tar.gz (2010-02-17:07/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
+** 1.0.3.orig.tar.gz (2010-02-17:07/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
beaa4fc88a13eef203947d8ca5ce9aff246760c673fd84cac96322a9c8991c18 1558232 sisu_1.0.3.orig.tar.gz
b805ee728b69f5e41cf92e0c87170bb65eb085b61e49ce05a5519959a3d04ba8 1145 sisu_1.0.3-1.dsc
b6c030050816f6cfbe82422804dd901644a9ed37097bc713362a88d401059a2f 152714 sisu_1.0.3-1.diff.gz
@@ -47,8 +47,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
* document sample skins, utf-8 specified (in some cases needed by ruby 1.9.1)
-%% 1.0.2.orig.tar.gz (2010-02-10:06/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
+** 1.0.2.orig.tar.gz (2010-02-10:06/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
158f3eda47d22eb23ca9fb5e383ae57d366974e3e4c4dec2326021228413a66d 1556982 sisu_1.0.2.orig.tar.gz
3e32dd8d1dd75042d31897ef961907b52f5e72ca28a1a909ceb041f284b6c1de 1145 sisu_1.0.2-1.dsc
5e7349e1d51dad712eeab694fcb1237790156ffb51178edeecd4d0ec9e8fc91a 152552 sisu_1.0.2-1.diff.gz
@@ -56,8 +56,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.2.orig.tar.gz
* Free as in Freedom (on RMS), Sam Williams, markup sample, markup variation,
affects numbering
-%% 1.0.1.orig.tar.gz (2010-02-08:06/1)
-http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
+** 1.0.1.orig.tar.gz (2010-02-08:06/1)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
0318822b712d4b748d18be4211e3266a2c2689e0809d85219855c7314f2b5942 1556988 sisu_1.0.1.orig.tar.gz
94d0d66971d0316587f300a20bfb1346f27361d94dedc1c746670707e984aecd 1145 sisu_1.0.1-1.dsc
dd9f08f02ae09624bde4314472815eed3be205b001587193c76484b36d8cd68c 152471 sisu_1.0.1-1.diff.gz
@@ -68,8 +68,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
* markup samples directory structure, minor adjustments, (and no longer
shared by package sisu_markup_samples, about which, see that package)
-%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
+** 1.0.0.orig.tar.gz (2009-12-19:50/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
7bec7f47f6ad5b816226af0489bc2ae81d4c9092b8870ba939e9f58800245dfd 1554276 sisu_1.0.0.orig.tar.gz
b64f406766c6289edabf97d225bf9eedbba26c8c413091c9bdc7cca9ec7912e5 1145 sisu_1.0.0-1.dsc
002051ea41e5584d463719f9ac560fad3d0de985916b76e403c060f1bda8e21c 152286 sisu_1.0.0-1.diff.gz
@@ -92,8 +92,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
* documentation, modified description of command flags -m and -n (in line
with communication on Debian bug #555496, closing it)
-%% sisu_0.71.4.orig.tar.gz (2009-08-29:34/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
+** sisu_0.71.4.orig.tar.gz (2009-08-29:34/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
a9accd67316fcc21fa289dd3923641b182023ee3e038ee7c3324b6e71b129a68 1551081 sisu_0.71.4.orig.tar.gz
1014c3807a2ba159682b8f52c2b287a7858bd83acf4ffa041d99f759dcebd310 1151 sisu_0.71.4-1.dsc
c3566cb294440482526bc10f3bee45ff5eeae7ed6ec39178f1fd3785c6b3d1dd 151444 sisu_0.71.4-1.diff.gz
@@ -101,8 +101,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz
* sql, fix, different solutions for postgresql and sqlite to populate
database using ruby-dbi
-%% sisu_0.71.3.orig.tar.gz (2009-08-28:34/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.3.orig.tar.gz
+** sisu_0.71.3.orig.tar.gz (2009-08-28:34/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.3.orig.tar.gz
edeb7b5e4ea192a193f95dcbcf468102839cf3b9a18ee0e700e58eea37e739dd 1549708 sisu_0.71.3.orig.tar.gz
5688f8fe14ba77f236a8bd4cb11bffa72d6e0f12b4474852ed54b6256c223eb3 1151 sisu_0.71.3-1.dsc
98754efd995c57995ff2962dbdc391cfe1c6050468da73bb45fcbf3fea08628a 151405 sisu_0.71.3-1.diff.gz
@@ -110,8 +110,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.3.orig.tar.gz
* fix to use imagemagick directly (when imagemagick is available and rmagick
declares versions not in sync)
-%% sisu_0.71.2.orig.tar.gz (2009-08-02:30/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.2.orig.tar.gz
+** sisu_0.71.2.orig.tar.gz (2009-08-02:30/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.2.orig.tar.gz
220199cbc435ec6d246af4ac43a2ef6a3e05f649847c4ee04b831af1e8ad4902 1548875 sisu_0.71.2.orig.tar.gz
ec3fae1599112343d69f2843a09acb583653bc174e65589f4c3bbc52ef66d4fb 1151 sisu_0.71.2-1.dsc
bbc4264049d4e6c147dd77b9b41774bcb421ce5bffeb5801872f5520f9967fba 151350 sisu_0.71.2-1.diff.gz
@@ -120,8 +120,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.2.orig.tar.gz
* html book index, batch processing fix, re-initialize variable after use
* sysenv, sha256 use fix, need to set variable with pwd
-%% sisu_0.71.1.orig.tar.gz (2009-07-24:29/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz
+** sisu_0.71.1.orig.tar.gz (2009-07-24:29/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz
2027a8b6690a6e82cb6c6bc5b594fd6214d215ee09989e0c58a8f5abfbd306fd 1549323 sisu_0.71.1.orig.tar.gz
044d623f1d158bbe43e0755eeebc11496000edfab1ddca49128ca1ff1ee2da45 1151 sisu_0.71.1-1.dsc
628af933efd0fdda7694c9f0e31c79dc9e5f9282648a8dd75c5d91a8482c8dac 151315 sisu_0.71.1-1.diff.gz
@@ -134,8 +134,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz
* html seg, navigation band buttons placement
-%% sisu_0.71.0.orig.tar.gz (2009-07-09:27/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz
+** sisu_0.71.0.orig.tar.gz (2009-07-09:27/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz
5fa480544ae30d2e2e21064cb505e3c72a467a4ca8018fd1c51ec485ff5b668e 1548373 sisu_0.71.0.orig.tar.gz
25f9c4109b361153f325b97e6e48baae702cd889aa7535c2efa3070867117243 1151 sisu_0.71.0-1.dsc
7f718b681da6aa18c826586337f793c9d05e5c9e6d39b0856420d021096594d5 151143 sisu_0.71.0-1.diff.gz
@@ -160,8 +160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz
* dal_idx, book_idx_html, match sysenv
* xml related minor touches
-%% sisu_0.70.6.orig.tar.gz (2009-07-01:26/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.6.orig.tar.gz
+** sisu_0.70.6.orig.tar.gz (2009-07-01:26/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.6.orig.tar.gz
218ece8c5b813ebf40eb43af2e9272a166675da4b7235f85c96c414a654054de 1546958 sisu_0.70.6.orig.tar.gz
6c03a1a5da119f8f7e8db493ae985af59d562f166fb1e0a676094d83904e307b 1151 sisu_0.70.6-1.dsc
340cdeb299eeb327308c4293c19e57d2b8ca5bdb40add2519ce379ed57f4c896 151084 sisu_0.70.6-1.diff.gz
@@ -172,8 +172,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.6.orig.tar.gz
* minor touches
-%% sisu_0.70.5.orig.tar.gz (2009-01-18:02/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.5.orig.tar.gz
+** sisu_0.70.5.orig.tar.gz (2009-01-18:02/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.5.orig.tar.gz
5ab95108c9f1734fbb6dcca795d6c6e34445625adb296e797d97f0af1e73f985 1546846 sisu_0.70.5.orig.tar.gz
dc95471b171637fd3cbc9e627283254d1f71b655d1a7c2a24eb904cd4539d790 1151 sisu_0.70.5-1.dsc
9ef6f7891eafc10ec13f6e6bcfa23d993b7126e299b8b4db700621f9c35be95a 146964 sisu_0.70.5-1.diff.gz
@@ -197,8 +197,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.5.orig.tar.gz
* debian/copyright use machine parseable format
-%% sisu_0.70.4.orig.tar.gz (2008-12-31:52/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.4.orig.tar.gz
+** sisu_0.70.4.orig.tar.gz (2008-12-31:52/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.4.orig.tar.gz
2c2e4f20be91e3c575c5d2560044a5c60609330ee012e6a0f3eba0e868b0572b 1546812 sisu_0.70.4.orig.tar.gz
1098392a4566bc4f37b3329e84a77f0be9037b28923182aabd343624df73896b 1159 sisu_0.70.4-1.dsc
f030c05cbc81d6d25f6300fb35a269ffc583af9d492bd7cf812387e9b13db591 147279 sisu_0.70.4-1.diff.gz
@@ -207,8 +207,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.4.orig.tar.gz
workaround), similar to issue with "bullet" noted in sisu 0.70.1
[may be necessary to do an inventory of special characters?]
-%% sisu_0.70.3.orig.tar.gz (2008-12-24:51/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.3.orig.tar.gz
+** sisu_0.70.3.orig.tar.gz (2008-12-24:51/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.3.orig.tar.gz
adb3dbe85004a6bc10443d60029b6a2b0a11b9f7aad10a170f5b278f0a73d5e4 1546917 sisu_0.70.3.orig.tar.gz
1e4e5d84c410ef635c0a97542ad0ed12e47ec1e06178975804571c9c43f9040b 1159 sisu_0.70.3-1.dsc
09c0192dc4f7e89c352bb5e15c24e2c0ca42cace 147188 sisu_0.70.3-1.diff.gz
@@ -228,8 +228,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.3.orig.tar.gz
generation process
* postgresql, much shared code, however, operation should be unchanged
-%% sisu_0.70.2.orig.tar.gz (2008-12-16:50/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.2.orig.tar.gz
+** sisu_0.70.2.orig.tar.gz (2008-12-16:50/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.2.orig.tar.gz
c4ec17c3f50b629a33afcb3d343e111172bf56b656fa892d82936f86dfde281a 1545482 sisu_0.70.2.orig.tar.gz
14575b369a85da01d09fd8fe52d0d9054e21f0c3fd732f6f5b6c316a73bb9db3 1159 sisu_0.70.2-1.dsc
b915ffecd148fdc115deab0d1ea2f50a598d00f589866f5645783dc12c71ee91 147123 sisu_0.70.2-1.diff.gz
@@ -241,8 +241,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.2.orig.tar.gz
* manpage, help include: sisu --harvest *.ss[tm]
-%% sisu_0.70.1.orig.tar.gz (2008-12-14:49/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.1.orig.tar.gz
+** sisu_0.70.1.orig.tar.gz (2008-12-14:49/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.1.orig.tar.gz
9a04b4d7e89b1ff39a8745f4a1ad31841200f8f880508a56806e1b7ad45e7623 1544135 sisu_0.70.1.orig.tar.gz
c4298135b16e03a0691f767a9bc7f3d4c43ea4a833b6ef8e272170872bd4bbdc 1159 sisu_0.70.1-1.dsc
6ff6a4d739cfe4763526a3fc3b4b4175490f9cba130e2b14478366b299565caf 147093 sisu_0.70.1-1.diff.gz
@@ -282,8 +282,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.1.orig.tar.gz
* emacs syntax highlighter update (metadata fields)
-%% sisu_0.70.0.orig.tar.gz (2008-12-03:48/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.0.orig.tar.gz
+** sisu_0.70.0.orig.tar.gz (2008-12-03:48/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.0.orig.tar.gz
51e4d5c2ac3c490332d8468de2400abcf454b55ac1e21ec625680a346fb41e4a 1540091 sisu_0.70.0.orig.tar.gz
19639ff718204575e66da774fa90a18644c964535c4a94ddc9d76651cac36539 1159 sisu_0.70.0-1.dsc
8b489270ea44f006c4406182d3d24f6ec5480f3f7379d4e6ce53d65bba8474aa 147054 sisu_0.70.0-1.diff.gz
@@ -333,8 +333,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.70.0.orig.tar.gz
[date changed, built just after midnight]
-%% sisu_0.69.4.orig.tar.gz (2008-11-02:43/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz
+** sisu_0.69.4.orig.tar.gz (2008-11-02:43/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz
06ba062400396d234334beb72bf171e580a6bd78d8200e316606456529930165 1532819 sisu_0.69.4.orig.tar.gz
8fa64cbcb28d80d2c0c81885eaa9f71dbd45964a7546c94b085e2d359868d1bc 1159 sisu_0.69.4-1.dsc
a81b6bccdd085f197f3a26f8014ddcc5155cb173 146961 sisu_0.69.4-1.diff.gz
@@ -353,8 +353,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.4.orig.tar.gz
* minor touches
-%% sisu_0.69.3.orig.tar.gz (2008-10-10:40/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz
+** sisu_0.69.3.orig.tar.gz (2008-10-10:40/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz
33783d161293756f33e22867de5c00d02ce8743a19c65846622a272e3c0b8cd3 1527253 sisu_0.69.3.orig.tar.gz
8c77872852c6efedf17146394032c3281c79e15e86283abd6f906909268ea69b 1159 sisu_0.69.3-1.dsc
3b8cd23a772e4a8d77f5f7d044e6f084c7769788a9f8974dd5b9227f23a2bd18 146916 sisu_0.69.3-1.diff.gz
@@ -363,8 +363,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz
* manifest, reporting of sisupod, [path fix in sysenv]
-%% sisu_0.69.2.orig.tar.gz (2008-09-19:37/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.2.orig.tar.gz
+** sisu_0.69.2.orig.tar.gz (2008-09-19:37/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.2.orig.tar.gz
dde55e10c47a2fc556113bd051a76877d53fdfe9133562cd9c4a41c4c817a4cb 1526475 sisu_0.69.2.orig.tar.gz
e9cfeb0de6fdb20a63f7f071804ecb7fcecace65be47d735fc6d16dc3bb52353 1159 sisu_0.69.2-1.dsc
bd5b0a760ef61aafefe4949aa87d194e77f227bfae9c6b87d5ac1898ee4f159b 146853 sisu_0.69.2-1.diff.gz
@@ -373,16 +373,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.2.orig.tar.gz
* identify markup helpers updated
-%% sisu_0.69.1.orig.tar.gz (2008-09-17:37/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.1.orig.tar.gz
+** sisu_0.69.1.orig.tar.gz (2008-09-17:37/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.1.orig.tar.gz
9f44c7f37f272a1cd48717785d9579053dd069c551b826dee36333fb33148ad0 1520236 sisu_0.69.1.orig.tar.gz
51d3b7aadba7f1e487774f739d5cd7eec725960eaaa9d5870dd390f75585d00f 1159 sisu_0.69.1-1.dsc
514da38bca18016d4a50889eb02cf294fef8a3ddca8bd39636baf48061ce77b4 146755 sisu_0.69.1-1.diff.gz
* dal fix, dal_substitutions_and_insertions get skin info
-%% sisu_0.69.0.orig.tar.gz (2008-09-16:37/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
+** sisu_0.69.0.orig.tar.gz (2008-09-16:37/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
87f10686f20d02ba969a186db4333f25b4c063f13fc2d7824e6a8db7da41a4f1 1519352 sisu_0.69.0.orig.tar.gz
082a19e5676940723bc033de75f11e1592aefdbe2b698b24e274f01c3586d08c 1159 sisu_0.69.0-1.dsc
477af2b3d2a7e9b6aa7f5fa8952d5e8d90cf607a235483bf7482834af9d7610a 146757 sisu_0.69.0-1.diff.gz
@@ -426,8 +426,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
* vim syntax file updated to include syntax for book index
-%% sisu_0.68.0.orig.tar.gz (2008-07-22:29/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
+** sisu_0.68.0.orig.tar.gz (2008-07-22:29/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
cecae8b828aa187b22354f2ee9e8a8b5244dd9f4 1509605 sisu_0.68.0.orig.tar.gz
f7dc610a710d9818901909d8c4dc110019f39417 1159 sisu_0.68.0-1.dsc
fc5f2f8e22e02c165f92adcb31a9c328feb487e9 146736 sisu_0.68.0-1.diff.gz
@@ -449,8 +449,8 @@ Not without risk but should be easier to maintain.
* many small fixes
-%% sisu_0.67.5.orig.tar.gz (2008-07-12:27/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.5.orig.tar.gz
+** sisu_0.67.5.orig.tar.gz (2008-07-12:27/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.5.orig.tar.gz
f07a6b01c52c178c4ed57d31eb3a9162e8d59aa643b7cfb8f4250c307c0fa019 1500535 sisu_0.67.5.orig.tar.gz
b4b01d9d3bd0b82e9c946cd2a1586b5b550912ed24f01b634f0f9c441ba72c77 1159 sisu_0.67.5-1.dsc
c5cf3905985e8545d4b87958ed0d8bd1ed72a93051117a8c9631a4cded41da2a 146710 sisu_0.67.5-1.diff.gz
@@ -459,8 +459,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.5.orig.tar.gz
* texpdf A5 size landscape pdf, tex document header, fix
-%% sisu_0.67.4.orig.tar.gz (2008-07-12:27/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz
+** sisu_0.67.4.orig.tar.gz (2008-07-12:27/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz
ec905056760f7be8db639d053be4ada9118bfb2c66832206ab92eccf6d8239a7 1500229 sisu_0.67.4.orig.tar.gz
df5e57639213a641075500f57a57eb1ecdb2453afef3a2c0c71093ccdee6c91a 1159 sisu_0.67.4-1.dsc
7fe5a938eb2faa721ec70aea3c3a0b3af66546dcbf55deef16044b862c40b354 146675 sisu_0.67.4-1.diff.gz
@@ -472,8 +472,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz
* manifest minor changes to document information displayed
-%% sisu_0.67.3.orig.tar.gz (2008-07-03:26/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz
+** sisu_0.67.3.orig.tar.gz (2008-07-03:26/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz
f8c57f0e1992a5a829c321b5648dd53d31e65067d1b9464969a4e33afa9be2be 1500468 sisu_0.67.3.orig.tar.gz
c4aeb2f843980dde75611e305eb51618540f0223d5e5e969a9590c49980998de 1159 sisu_0.67.3-1.dsc
055b1afa5f6f3e3c08135417e7f512f7a6e3bed9d42635f42b7754fd4d318136 146632 sisu_0.67.3-1.diff.gz
@@ -482,16 +482,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz
* texpdf (sysenv), papersize re-fixed (xetex landscape pdf fix fixed)
-%% sisu_0.67.2.orig.tar.gz (2008-07-02:26/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.2.orig.tar.gz
+** sisu_0.67.2.orig.tar.gz (2008-07-02:26/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.2.orig.tar.gz
36a97294563c59827bc88b9187dd824ee5c66b62cbf59d4a53e806a6a0e9f8e1 1500273 sisu_0.67.2.orig.tar.gz
d83ac907c803de304503afb0cb877bd514228010e47155c652aac8be1aa18e8f 1159 sisu_0.67.2-1.dsc
ba7838ca7406157bdf430ad31b21665b20e89184d86b1b7cf5e33322a87e5396 146591 sisu_0.67.2-1.diff.gz
* texpdf (sysenv), fix required for xetex landscape pdfs
-%% sisu_0.67.1.orig.tar.gz (2008-05-27:21/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.1.orig.tar.gz
+** sisu_0.67.1.orig.tar.gz (2008-05-27:21/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.1.orig.tar.gz
d05698e4e9421e15f9924ea5c019696996fc10ec396c245ea9dfc375a539868a 1498489 sisu_0.67.1.orig.tar.gz
48925d7f6ba9cbdea92766cb34a222a6ac532fe41588b4eb17d8ff2a9259e0c7 146501 sisu_0.67.1-1.dsc
9a6b16316cf0f16562624ced16627fd0093598e6cd955a1c4c72f21c5eb95dde 1151 sisu_0.67.1-1.diff.gz
@@ -501,8 +501,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.1.orig.tar.gz
* debian/vim-addon-manager, fix vim-sisu.yaml (closes: #464824)
-%% sisu_0.67.0.orig.tar.gz (2008-05-22:20/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
+** sisu_0.67.0.orig.tar.gz (2008-05-22:20/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
a543f310b8452b5d7477f1491d6d0510efd0293408dfa3fe2697ae586bbc98aa 1498054 sisu_0.67.0.orig.tar.gz
759277657882aee6b02f8c0956e9d848fbeb4ac3b41345a2d1d3bcbaa1289aec 1151 sisu_0.67.0-1.dsc
e688b0b1dc0b51c742f4e5d0274969172e8975793c4aa95d9ff15bef474117ac 146427 sisu_0.67.0-1.diff.gz
@@ -514,8 +514,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz
* debian, vim-addon-manager
-%% sisu_0.66.3.orig.tar.gz (2008-05-11:18/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
+** sisu_0.66.3.orig.tar.gz (2008-05-11:18/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
6d5b61e6a37d9564d8d83d7eb9eb665a65da4c79 1497613 sisu_0.66.3.orig.tar.gz
02d116186c960051d0f37af42d86539293391d8b 1151 sisu_0.66.3-1.dsc
f7d51e83761b3ffb66cf30a6662d1bef471b2a1b 146244 sisu_0.66.3-1.diff.gz
@@ -540,8 +540,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz
* debian/control introduce vcs info git repo, browser
-%% sisu_0.66.2.orig.tar.gz (2008-04-25:16/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.2.orig.tar.gz
+** sisu_0.66.2.orig.tar.gz (2008-04-25:16/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.2.orig.tar.gz
6af989ae3bc57889ce0e02eaa8d45d384fdec7ef 1496216 sisu_0.66.2.orig.tar.gz
989f5cde491ee3890ce083461d0dbf769371c306 1003 sisu_0.66.2-1.dsc
d76cede86c178164c37a1f1b8f441c2ed48cf2fa 146135 sisu_0.66.2-1.diff.gz
@@ -552,8 +552,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.2.orig.tar.gz
* debian, sisu-sqlite ruby-dbi dependencies refer to version 1.8
-%% sisu_0.66.1.orig.tar.gz (2008-03-30:12/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1.orig.tar.gz
+** sisu_0.66.1.orig.tar.gz (2008-03-30:12/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1.orig.tar.gz
1b858e7650f8011205734cc20f36c628 1495277 sisu_0.66.1.orig.tar.gz
bde3cfd63bfa6ba2c65dbcb2d3c7cb4d 629 sisu_0.66.1-1.dsc
d97f2831470c8aeb86f9b896a20aa6fb 146395 sisu_0.66.1-1.diff.gz
@@ -566,8 +566,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.1.orig.tar.gz
* debian (control, compat), debhelper >= 6, (6 in lenny)
-%% sisu_0.66.0.orig.tar.gz (2008-02-24:07/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.0.orig.tar.gz
+** sisu_0.66.0.orig.tar.gz (2008-02-24:07/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.0.orig.tar.gz
b45d81d949590a9b24924589bc98032b 1492653 sisu_0.66.0.orig.tar.gz
3d02ba34822075bea890eaa3ff666ef9 629 sisu_0.66.0-1.dsc
161a19d61d48713be4890bc9d00bed18 146339 sisu_0.66.0-1.diff.gz
@@ -591,8 +591,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.0.orig.tar.gz
* replace HiLink with "hi def link"
* semantic tag matching, (may prune matches later)
-%% sisu_0.65.0.orig.tar.gz (2008-02-16:06/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0.orig.tar.gz
+** sisu_0.65.0.orig.tar.gz (2008-02-16:06/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0.orig.tar.gz
ef65b612268491857934bc4160ea0238 1488645 sisu_0.65.0.orig.tar.gz
dd2bf992db6a5f0a5faeb62cbea3bd33 629 sisu_0.65.0-1.dsc
ba8d19c3221430bc1a9d8c89f55ca3d6 146323 sisu_0.65.0-1.diff.gz
@@ -600,16 +600,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.65.0.orig.tar.gz
* semantic tag, match refinement related, (consider a possible extension)
[version bump for tags]
-%% sisu_0.64.4.orig.tar.gz (2008-02-14:06/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.4.orig.tar.gz
+** sisu_0.64.4.orig.tar.gz (2008-02-14:06/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.4.orig.tar.gz
2ab102057702aaf35ec96b9a082fb2d9 1488644 sisu_0.64.4.orig.tar.gz
62604c78e2574f80a4e13cb38e1374cd 629 sisu_0.64.4-1.dsc
b797bf7f165be762ff97d50914a5b102 146562 sisu_0.64.4-1.diff.gz
* markup tag, semantic tag added
-%% sisu_0.64.3.orig.tar.gz (2008-02-06:05/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
+** sisu_0.64.3.orig.tar.gz (2008-02-06:05/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
8af7f396c0aeb231869fa0d12c5429c2 1486648 sisu_0.64.3.orig.tar.gz
6b2f4554afe0a328f7861d3be943ea8d 629 sisu_0.64.3-1.dsc
4300eac4651ed7ae3788f7d7c22fb8dc 146267 sisu_0.64.3-1.diff.gz
@@ -626,8 +626,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.3.orig.tar.gz
[(side note) ramaze looks good, search form re-done (cgi search form
re-engineered)]
-%% sisu_0.64.2.orig.tar.gz (2008-01-19:02/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.2.orig.tar.gz
+** sisu_0.64.2.orig.tar.gz (2008-01-19:02/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.2.orig.tar.gz
4b0e97e4387c84ac4017128ef7718cf2 1485265 sisu_0.64.2.orig.tar.gz
7fec34740202920c7182d39eeb55b7dc 629 sisu_0.64.2-1.dsc
ee2fe7d3dd57a7d98f3689e8e6bd6e97 146200 sisu_0.64.2-1.diff.gz
@@ -638,8 +638,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.2.orig.tar.gz
install of current ruby (running remains stopped for the time being in
bin/sisu, bin/sisu_webrick, bin/sisu_termsheet [details remain])
-%% sisu_0.64.1.orig.tar.gz (2008-01-09:01/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
+** sisu_0.64.1.orig.tar.gz (2008-01-09:01/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
995ef406d13cdfd441f8d4a32860f505 1485298 sisu_0.64.1.orig.tar.gz
256f13e488c62d81da56cbaf8e00d693 629 sisu_0.64.1-1.dsc
22b55a852eed3831426ab3314cd3beb7 146151 sisu_0.64.1-1.diff.gz
@@ -647,8 +647,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
* odf output bug (preliminary) fix, related to angle-brackets in markup
(reported by Jason Corfman)
-%% sisu_0.64.0.orig.tar.gz (2008-01-02:00/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
+** sisu_0.64.0.orig.tar.gz (2008-01-02:00/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
f00c9aac4e1a4fab41219bd08a98b9aa 1485082 sisu_0.64.0.orig.tar.gz
5ce9ebce50796cbb82d83626541d3be1 629 sisu_0.64.0-1.dsc
d2383e720a783f53b3508f9d44f56c5d 146129 sisu_0.64.0-1.diff.gz
@@ -672,8 +672,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
#454372 (reported by Kumar Appaiah), [thank you, and sorry for not having
acknowledged this earlier]
-%% sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
+** sisu_0.63.0.orig.tar.gz (2007-12-20:51/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
280792a14893ba5a912a7d300a9c2d74 1484075 sisu_0.63.0.orig.tar.gz
27523129a29d1d27e8b3b343f525a5d6 629 sisu_0.63.0-1.dsc
958736cfeaf188806a0933c775de1294 145944 sisu_0.63.0-1.diff.gz
@@ -696,8 +696,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.63.0.orig.tar.gz
sisu -3 http://www.jus.uio.no/sisu/pod/free_culture.lawrence_lessig.sst.zip
]
-%% sisu_0.62.4.orig.tar.gz (2007-12-14:50/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.4.orig.tar.gz
+** sisu_0.62.4.orig.tar.gz (2007-12-14:50/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.4.orig.tar.gz
94d262be57e2990c975e6532d258ce7f 1482977 sisu_0.62.4.orig.tar.gz
dcf18077108e6a94842a4eda41bacf1b 629 sisu_0.62.4-1.dsc
86e7fadaef232a08161bb3204f61bd27 145841 sisu_0.62.4-1.diff.gz
@@ -719,8 +719,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.4.orig.tar.gz
* gpg/pgp signature used changed (now B98F62B1 before BD76E77F)
-%% sisu_0.62.3.orig.tar.gz (2007-11-27:48/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
+** sisu_0.62.3.orig.tar.gz (2007-11-27:48/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
46511173fc0e3d75982debc37206fa6e 1481806 sisu_0.62.3.orig.tar.gz
494386aa1e44ebd9ea4d2c7bcfd41ba3 606 sisu_0.62.3-1.dsc
d7a5222e99c53c7bd561b1e322b8a490 145532 sisu_0.62.3-1.diff.gz
@@ -751,8 +751,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
[dpkg does not yet recognize Dm-Upload-Allowed field unless prefixed by
XS-]
-%% sisu_0.62.2.orig.tar.gz (2007-11-03:44/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.2.orig.tar.gz
+** sisu_0.62.2.orig.tar.gz (2007-11-03:44/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.2.orig.tar.gz
0d7cd5f953ac457dc96a7edd5892ee72 1480947 sisu_0.62.2.orig.tar.gz
5246cbaf7021c7fb4bb876e5c1f64578 606 sisu_0.62.2-1.dsc
fea5b46c410ab11228f25a5c1618c04f 145557 sisu_0.62.2-1.diff.gz
@@ -769,16 +769,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.2.orig.tar.gz
* debian/control Homepage: header
(for the time being lintian override necessary)
-%% sisu_0.62.1.orig.tar.gz (2007-10-22:43/1)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.1.orig.tar.gz
+** sisu_0.62.1.orig.tar.gz (2007-10-22:43/1)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.1.orig.tar.gz
5a9226473b409a8a9345781deeca12b8 1480117 sisu_0.62.1.orig.tar.gz
59e50685bb42eedfcad1540227aa1c9c 606 sisu_0.62.1-1.dsc
dd147d5f2d978a7e2195ba3ccbe8c827 145468 sisu_0.62.1-1.diff.gz
* db common and cgi, regex to match new composite file filename (.ssm.sst)
-%% sisu_0.62.0.orig.tar.gz (2007-10-20:42/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
+** sisu_0.62.0.orig.tar.gz (2007-10-20:42/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
5b46f6959c1190cdf92eee2b53b05b21 1479805 sisu_0.62.0.orig.tar.gz
66256160d7bcb4611ede4a1e67d0da2c 606 sisu_0.62.0-1.dsc
e0ec09c1e7608316dd2daa2dd1f5149e 145435 sisu_0.62.0-1.diff.gz
@@ -856,8 +856,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
with ruby 1.9, there are still issues with 1.9 (at the C stack level, and
probably some in sisu compatibility/updating as well)
-%% sisu_0.61.0.orig.tar.gz (2007-10-12:41/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
+** sisu_0.61.0.orig.tar.gz (2007-10-12:41/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
3a2329726d49945247b1f4340482c895 1474630 sisu_0.61.0.orig.tar.gz
c02eb65a86eac49e5735253a05b86c57 606 sisu_0.61.0-1.dsc
f68431c83e37939fd4cfa7fa085ed31a 144888 sisu_0.61.0-1.diff.gz
@@ -890,8 +890,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
* special character exceptions, some fixes
-%% sisu_0.60.1.orig.tar.gz (2007-10-07:40/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
+** sisu_0.60.1.orig.tar.gz (2007-10-07:40/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
264736a1f2ccf4b87fa784fa46cf19b1 1474279 sisu_0.60.1.orig.tar.gz
a0f4ff4d2b7d9ff6e0929b9dd1580f84 606 sisu_0.60.1-1.dsc
8920341e8e13e65ec50134ee51fbcc6d 144767 sisu_0.60.1-1.diff.gz
@@ -907,8 +907,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.1.orig.tar.gz
* sisu_manual, link to markup and book examples updated/corrected
-%% sisu_0.60.0.orig.tar.gz (2007-10-03:40/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
+** sisu_0.60.0.orig.tar.gz (2007-10-03:40/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
1d8d5b58c96bf403961fd4f5b78a5e7d 1474187 sisu_0.60.0.orig.tar.gz
615658601df61d81c7e6fc6c5e3660f2 606 sisu_0.60.0-1.dsc
b71f3678d87952081bd04e4a00dd3e28 144715 sisu_0.60.0-1.diff.gz
@@ -988,8 +988,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
again in 0.60)
* sisu-pdf sub-package (now) suggests alternative pdf viewers
-%% sisu_0.59.1.orig.tar.gz (2007-09-25:39/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
+** sisu_0.59.1.orig.tar.gz (2007-09-25:39/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
cf512ec871aeb7cdabc0b3b35b7e6d05 10952059 sisu_0.59.1.orig.tar.gz
a260c1dbec59c78cd0e330b5cd790f6a 617 sisu_0.59.1-1.dsc
55837afd842d274afc2180fca519d260 141832 sisu_0.59.1-1.diff.gz
@@ -1008,8 +1008,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
links, made smaller
* cosmetic fix for rights and prefix appearing with toc
-%% sisu_0.59.0.orig.tar.gz (2007-09-23:38/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.0.orig.tar.gz
+** sisu_0.59.0.orig.tar.gz (2007-09-23:38/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.0.orig.tar.gz
1f2497d2ac39ed9af24c0747b536e50e 10705420 sisu_0.59.0.orig.tar.gz
e11a8663fd274521ab63e6afe6a4d9f4 617 sisu_0.59.0-1.dsc
255fefe11ea4747f8347268880ffdd1f 141833 sisu_0.59.0-1.diff.gz
@@ -1067,8 +1067,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.0.orig.tar.gz
* sisu-doc new sub-package for sisu documentation
debian/control and sisu-doc.install
-%% sisu_0.58.3.orig.tar.gz (2007-09-06:36/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.3.orig.tar.gz
+** sisu_0.58.3.orig.tar.gz (2007-09-06:36/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.3.orig.tar.gz
e9a20a06ffee8d633b8ce525017d89ba 1278987 sisu_0.58.3.orig.tar.gz
b8330f8b97a15e6eaecba8f2616acb10 606 sisu_0.58.3-1.dsc
90ed14ac9e04203bcce80e4de86a3b55 142642 sisu_0.58.3-1.diff.gz
@@ -1079,16 +1079,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.3.orig.tar.gz
* html & texpdf, cosmetic, 'copy @' reduced to smaller font size, consider
removing
-%% sisu_0.58.2.orig.tar.gz (2007-09-05:36/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.2.orig.tar.gz
+** sisu_0.58.2.orig.tar.gz (2007-09-05:36/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.2.orig.tar.gz
43826c427add52938ee89b38c5ae266f 1278561 sisu_0.58.2.orig.tar.gz
f2d89f587acb970c624ab59d7bb38edb 606 sisu_0.58.2-1.dsc
e231f416be57da710aada71e695c8144 142625 sisu_0.58.2-1.diff.gz
* code-block exceptions for composite documents
-%% sisu_0.58.1.orig.tar.gz (2007-09-04:36/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.1.orig.tar.gz
+** sisu_0.58.1.orig.tar.gz (2007-09-04:36/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.1.orig.tar.gz
2b46ddfcfd9985c13535733eb822cdbd 1277392 sisu_0.58.1.orig.tar.gz
bba9a0473873b693be702c6d41e991ec 606 sisu_0.58.1-1.dsc
382cea2504c7e40574916e8252554891 142591 sisu_0.58.1-1.diff.gz
@@ -1101,8 +1101,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.1.orig.tar.gz
fixed and set to footnotesize
* angle bracket exceptions
-%% sisu_0.58.0.orig.tar.gz (2007-09-03:36/1)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.0.orig.tar.gz
+** sisu_0.58.0.orig.tar.gz (2007-09-03:36/1)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.0.orig.tar.gz
dffd47831df42ca96e77940936d04c8b 1276544 sisu_0.58.0.orig.tar.gz
859e21f81c9ac012db126ecf1b72529f 606 sisu_0.58.0-1.dsc
66480197b3b04d255a104a94d32628dc 142555 sisu_0.58.0-1.diff.gz
@@ -1120,8 +1120,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.58.0.orig.tar.gz
* debian/control moved trang and kdissert to suggests
-%% sisu_0.57.0.orig.tar.gz (2007-08-22:34/3)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.57.0.orig.tar.gz
+** sisu_0.57.0.orig.tar.gz (2007-08-22:34/3)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.57.0.orig.tar.gz
1f730ef349606c02cd90c8cd7cb6b790 1274006 sisu_0.57.0.orig.tar.gz
a15133ca987525273886116797ba271b 606 sisu_0.57.0-1.dsc
7cc5aaebbf3b9954b0d3dd138e825f87 142479 sisu_0.57.0-1.diff.gz
@@ -1147,8 +1147,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.57.0.orig.tar.gz
* html scroll, fix to document information link in table of contents
-%% sisu_0.56.3.orig.tar.gz (2007-08-19:33/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.3.orig.tar.gz
+** sisu_0.56.3.orig.tar.gz (2007-08-19:33/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.3.orig.tar.gz
6e799836a6e6aa226f34134b44815ae7 1272888 sisu_0.56.3.orig.tar.gz
2bfcea560911c8395d9b65bf11760712 606 sisu_0.56.3-1.dsc
42f08cf062dd8bd2d0deae459620671c 142408 sisu_0.56.3-1.diff.gz
@@ -1168,8 +1168,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.3.orig.tar.gz
* initialize site structure, make copy site images default (sisu -CC)
-%% sisu_0.56.2.orig.tar.gz (2007-07-31:31/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.2.orig.tar.gz
+** sisu_0.56.2.orig.tar.gz (2007-07-31:31/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.2.orig.tar.gz
f9f1091e846cdaf9df4c53eb537dcf85 1272237 sisu_0.56.2.orig.tar.gz
5c440179db51bbf2d061233fdc16c5e6 606 sisu_0.56.2-1.dsc
8cfc0d4d0c2cdeb72ace91cf80a5430e 142387 sisu_0.56.2-1.diff.gz
@@ -1177,16 +1177,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.2.orig.tar.gz
* odf, a few regex matches, a new fix (url), and an old one (grouped text
with change to fontface)
-%% sisu_0.56.1.orig.tar.gz (2007-07-31:31/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.1.orig.tar.gz
+** sisu_0.56.1.orig.tar.gz (2007-07-31:31/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.1.orig.tar.gz
6740ed538a5558cead0228315b811d9f 1272026 sisu_0.56.1.orig.tar.gz
1270f327c735cca3ea077950e5229f25 606 sisu_0.56.1-1.dsc
87e12b0b18192346e4a98c3127a73968 142382 sisu_0.56.1-1.diff.gz
* dal, endnote / url matching refinement
-%% sisu_0.56.0.orig.tar.gz (2007-07-31:31/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.0.orig.tar.gz
+** sisu_0.56.0.orig.tar.gz (2007-07-31:31/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.0.orig.tar.gz
66cf639776d75a30377f9f94d5c1c492 1271730 sisu_0.56.0.orig.tar.gz
5018746e3bed9bc100a38b80a988ac65 606 sisu_0.56.0-1.dsc
a92042ff94487f516315a722348db633 142363 sisu_0.56.0-1.diff.gz
@@ -1197,8 +1197,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.56.0.orig.tar.gz
related to dc identifier, (which is automatically constructed and used to
populate the database, (and is too small) as of 0.55.6)]
-%% sisu_0.55.7.orig.tar.gz (2007-07-31:31/2)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.7.orig.tar.gz
+** sisu_0.55.7.orig.tar.gz (2007-07-31:31/2)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.7.orig.tar.gz
aba322573410f19ae2ca2d85021e9585 1271464 sisu_0.55.7.orig.tar.gz
046ba140d3f443974c9b88cc5ce3b9f5 606 sisu_0.55.7-1.dsc
4e7774a80b1938b19218dd0d3657559f 142284 sisu_0.55.7-1.diff.gz
@@ -1219,8 +1219,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.7.orig.tar.gz
* some unintended tabs replaced with spaces
-%% sisu_0.55.6.orig.tar.gz (2007-07-28:30/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
+** sisu_0.55.6.orig.tar.gz (2007-07-28:30/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
69368f8eb4da28d07f3a1ee1ea5b89f3 1271022 sisu_0.55.6.orig.tar.gz
1d5fa22bdad75c1c27c2171d2a054d66 606 sisu_0.55.6-1.dsc
6fc6d8abf18aef047bb15e0079ae0f1c 142211 sisu_0.55.6-1.diff.gz
@@ -1242,8 +1242,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.6.orig.tar.gz
* added recommends vim-addon-manager
(thanks zack)
-%% sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
+** sisu_0.55.5.orig.tar.gz (2007-07-22:29/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
cb4e98ced1d11f4ac8c84d80b773fe92 1268030 sisu_0.55.5.orig.tar.gz
38da598ad949b3efc623b676f9826fe1 606 sisu_0.55.5-1.dsc
c5a9dacc9f8993553e0a78f927af2147 142162 sisu_0.55.5-1.diff.gz
@@ -1264,8 +1264,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.5.orig.tar.gz
* debian vim, syntax and ftplugin install moved to /usr/share/vim-scripts
(syntax file synced with Bram, thanks)
-%% sisu_0.55.4.orig.tar.gz (2007-07-20:29/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
+** sisu_0.55.4.orig.tar.gz (2007-07-20:29/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
1d7bcf423b2e13a457d6565bfec74f20 1267367 sisu_0.55.4.orig.tar.gz
a75609387bc894181ccf36a42b79517c 606 sisu_0.55.4-1.dsc
1d7bcf423b2e13a457d6565bfec74f20 1267367 sisu_0.55.4-1.diff.gz
@@ -1279,8 +1279,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.4.orig.tar.gz
[manually re-closed bug #406280, actually closed in February in version
sisu-0.48.11, back-ported to sisu-0.48.8-7 freeze branch]
-%% sisu_0.55.3.orig.tar.gz (2007-07-14:28/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.3.orig.tar.gz
+** sisu_0.55.3.orig.tar.gz (2007-07-14:28/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.3.orig.tar.gz
d540a4f656393449c5f4ad5b7a5b5245 1267096 sisu_0.55.3.orig.tar.gz
a0c2e3c6ab5e59c9e675ae48ed2582cb 606 sisu_0.55.3-1.dsc
9e0ae70f83fa29c10aaf8a9626aaed8e 142063 sisu_0.55.3-1.diff.gz
@@ -1320,8 +1320,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.3.orig.tar.gz
* debian install, correctly map moved vim directory
-%% sisu_0.55.2.orig.tar.gz (2007-07-07:27/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.2.orig.tar.gz
+** sisu_0.55.2.orig.tar.gz (2007-07-07:27/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.2.orig.tar.gz
510b2648ada09f60241f0a6f7cb8d180 1265392 sisu_0.55.2.orig.tar.gz
bfa9b434842a47eb1596da9a72c28924 606 sisu_0.55.2-1.dsc
6cae596e51f7f94a320c211c7088f259 142013 sisu_0.55.2-1.diff.gz
@@ -1350,8 +1350,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.2.orig.tar.gz
* sisu-install (install ruby rant script renamed) and permissions set to
executable
-%% sisu_0.55.1.orig.tar.gz (2007-07-02:27/1)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.1.orig.tar.gz
+** sisu_0.55.1.orig.tar.gz (2007-07-02:27/1)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.1.orig.tar.gz
cabdec70ded52ea7a0f3da45987169de 1265187 sisu_0.55.1.orig.tar.gz
a4dbcb3257385fedb30d5e8d2ac7a9e5 606 sisu_0.55.1-1.dsc
e34248f7ab594dae50faafe189ef26a5 144647 sisu_0.55.1-1.diff.gz
@@ -1366,8 +1366,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.1.orig.tar.gz
* debian documents skins
* html indent levels, regular and bulleted text
-%% sisu_0.55.0.orig.tar.gz (2007-07-01:26/7)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.0.orig.tar.gz
+** sisu_0.55.0.orig.tar.gz (2007-07-01:26/7)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.0.orig.tar.gz
51b9b2a70d12409a809ae66d960d43a9 1264881 sisu_0.55.0.orig.tar.gz
11ac0b88d73a800d13ab70681c580ed1 606 sisu_0.55.0-1.dsc
f7dab91917ad0ce4c87e3f838cbe8d15 150729 sisu_0.55.0-1.diff.gz
@@ -1396,8 +1396,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.55.0.orig.tar.gz
* debian make lib available to ruby1.9
-%% sisu_0.54.1.orig.tar.gz (2007-06-15:24/5)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.1.orig.tar.gz
+** sisu_0.54.1.orig.tar.gz (2007-06-15:24/5)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.1.orig.tar.gz
716601a80e8942d8cdc953e5cfa33237 1258642 sisu_0.54.1.orig.tar.gz
a095bf0e84858e2e31a6fe474d1ab2b3 606 sisu_0.54.1-1.dsc
8696690cc0dc9776b374754fa12777b8 150532 sisu_0.54.1-1.diff.gz
@@ -1405,8 +1405,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.1.orig.tar.gz
* cgi script (for search matching), fix (imperfect), match highlighting is
now ignored in paragraphs with urls
-%% sisu_0.54.0.orig.tar.gz (2007-06-14:24/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.0.orig.tar.gz
+** sisu_0.54.0.orig.tar.gz (2007-06-14:24/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.0.orig.tar.gz
e1a98feb15d72e669d3726dbc9cc81da 1258857 sisu_0.54.0.orig.tar.gz
0be75fc5cdf10fdf7d8073490bec4fe6 606 sisu_0.54.0-1.dsc
d1e9622e5835641c00eb65d248535adb 149716 sisu_0.54.0-1.diff.gz
@@ -1432,8 +1432,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.54.0.orig.tar.gz
* conversion script in data/sisu/conf/convert/sisu_convert
-%% sisu_0.53.0.orig.tar.gz (2007-06-02:22/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.53.0.orig.tar.gz
+** sisu_0.53.0.orig.tar.gz (2007-06-02:22/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.53.0.orig.tar.gz
b8f28c2cade1f95956f5cdaef7af7fbd 1254059 sisu_0.53.0.orig.tar.gz
2a741d1fbe95f25a06b6d10ee709514a 606 sisu_0.53.0-1.dsc
65b8d4638cb0df8a8d8bcd33e20482b4 182847 sisu_0.53.0-1.diff.gz
@@ -1453,24 +1453,24 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.53.0.orig.tar.gz
(from a combination of mercurial and dars + darcs-buildpackage, [don't ask,
it served me quite well though])
-%% sisu_0.52.7.orig.tar.gz (2007-05-17:20/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.7.orig.tar.gz
+** sisu_0.52.7.orig.tar.gz (2007-05-17:20/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.7.orig.tar.gz
a9513dea06487a4e588f160f3d2491e8 1283842 sisu_0.52.7.orig.tar.gz
5e0cfa4abf66318161819331d6b0f5af 606 sisu_0.52.7-1.dsc
0e5c9ddcf696aae9026d8b881a3dc7d7 148706 sisu_0.52.7-1.diff.gz
* texpdf, related to special characters
-%% sisu_0.52.6.orig.tar.gz (2007-05-14:20/1)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.6.orig.tar.gz
+** sisu_0.52.6.orig.tar.gz (2007-05-14:20/1)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.6.orig.tar.gz
3255ec945b0583a01af963dde3f76f1d 1283482 sisu_0.52.6.orig.tar.gz
f466b68b3093e2c95fed13e4ebf0d495 606 sisu_0.52.6-1.dsc
aafb3b715fe2566f88c2def746d73099 148689 sisu_0.52.6-1.diff.gz
* texpdf, a url representation fix, escape of special characters
-%% sisu_0.52.5.orig.tar.gz (2007-05-10:19/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.5.orig.tar.gz
+** sisu_0.52.5.orig.tar.gz (2007-05-10:19/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.5.orig.tar.gz
e01dd9390785e8b087140a7166cc6a5e 1283393 sisu_0.52.5.orig.tar.gz
1bc960b5ce02d58153579d32bfbb2bd0 606 sisu_0.52.5-1.dsc
d6ab36fca512d494a4ce6fe0feec217a 148667 sisu_0.52.5-1.diff.gz
@@ -1487,8 +1487,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.5.orig.tar.gz
sisurc.yml (check what the correct value should be [on my system the
default was set to 5433 for 8.2, "ls -la /var/run/postgresql/" may help])
-%% sisu_0.52.4.orig.tar.gz (2007-05-05:18/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.4.orig.tar.gz
+** sisu_0.52.4.orig.tar.gz (2007-05-05:18/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.4.orig.tar.gz
8712a6162633f27dce36f57bc60599a5 1282392 sisu_0.52.4.orig.tar.gz
fd5618da795883fbeb1d53076783f80a 606 sisu_0.52.4-1.dsc
7f6b377e5f0bdc0ea805a7af5f21f2bb 148482 sisu_0.52.4-1.diff.gz
@@ -1503,8 +1503,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.4.orig.tar.gz
* [very rough wiki text output/assist (-g), may remove, not documented]
-%% sisu_0.52.3.orig.tar.gz (2007-04-26:17/4)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.3.orig.tar.gz
+** sisu_0.52.3.orig.tar.gz (2007-04-26:17/4)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.3.orig.tar.gz
d71332c68a8ed6b01f358f1e5ae45875 1279017 sisu_0.52.3.orig.tar.gz
4dd90c7e7790ea75be3017577759a128 606 sisu_0.52.3-1.dsc
a82c2c62106475640b25fefb38e9a6a4 148442 sisu_0.52.3-1.diff.gz
@@ -1518,8 +1518,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.3.orig.tar.gz
both versions of postgresql were installed, 0.52.2 was not uploaded to the
debian repository]
-%% sisu_0.52.2.orig.tar.gz (2007-04-21:16/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.2.orig.tar.gz
+** sisu_0.52.2.orig.tar.gz (2007-04-21:16/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.2.orig.tar.gz
96a2d9628e14e997bd93edd817b04996 1278391 sisu_0.52.2.orig.tar.gz
b3ed14988e1deed59ba13e0cfaae0b35 606 sisu_0.52.2-1.dsc
fb9ec4798fd769320873dbbc7ff145f8 148322 sisu_0.52.2-1.diff.gz
@@ -1530,8 +1530,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.2.orig.tar.gz
* debian/control, postgresql dependency update, [intended to close: #419294]
[thank you for report Martin Pitt]
-%% sisu_0.52.1.orig.tar.gz (2007-04-14:15/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.1.orig.tar.gz
+** sisu_0.52.1.orig.tar.gz (2007-04-14:15/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.1.orig.tar.gz
24faea8c8565af2a24fb02c4499cb287 1280993 sisu_0.52.1.orig.tar.gz
46a488ef619227fd02426a7311e86927 606 sisu_0.52.1-1.dsc
b0286f72ebcbb9a8443ae99bb905407a 141510 sisu_0.52.1-1.diff.gz
@@ -1540,8 +1540,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.1.orig.tar.gz
* cleanup of some unused code, re-introduce if needed
-%% sisu_0.52.0.orig.tar.gz (2007-04-07:14/6)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.0.orig.tar.gz
+** sisu_0.52.0.orig.tar.gz (2007-04-07:14/6)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.0.orig.tar.gz
e8767ea85c9e4f0941a8019f184031f3 1273211 sisu_0.52.0.orig.tar.gz
991acda3465d5a8a043da7f327d8d020 606 sisu_0.52.0-1.dsc
731cb9af8e47d4ebcd4a93c98286ac15 1391220 sisu_0.52.0-1.diff.gz
@@ -1593,8 +1593,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.52.0.orig.tar.gz
* gpl3 draft3 included as document markup sample
(requires the ODF and XML escape fixes made in this release version)
-%% sisu_0.51.0.orig.tar.gz (2007w13/6 | 2007-03-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.51.0.orig.tar.gz
+** sisu_0.51.0.orig.tar.gz (2007w13/6 | 2007-03-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.51.0.orig.tar.gz
a5e68fd38f2e35d9d18e0fdbcb5e13cb 1260579 sisu_0.51.0.orig.tar.gz
2f7a0cd2b8866c1b92cdd09ff307ed5e 606 sisu_0.51.0-1.dsc
bd3565eabc814d2c457302bb0d88a0c2 141851 sisu_0.51.0-1.diff.gz
@@ -1609,8 +1609,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.51.0.orig.tar.gz
* xml representations of sisu markup, small a touch
-%% sisu_0.50.4.orig.tar.gz (2007w12/6 | 2007-03-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.4.orig.tar.gz
+** sisu_0.50.4.orig.tar.gz (2007w12/6 | 2007-03-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.4.orig.tar.gz
9582c43e6a8b888865ffa756f5b897c5 1269202 sisu_0.50.4.orig.tar.gz
606947b8081fc7d7bbfb299c258e2f19 606 sisu_0.50.4-1.dsc
c194ae084a143b8b7e586bac152f3486 141639 sisu_0.50.4-1.diff.gz
@@ -1621,8 +1621,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.4.orig.tar.gz
* feature: db select range can be set from url (limit and offset)
* cosmetic: text adjustments
-%% sisu_0.50.3.orig.tar.gz (2007w11/6 | 2007-03-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.3.orig.tar.gz
+** sisu_0.50.3.orig.tar.gz (2007w11/6 | 2007-03-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.3.orig.tar.gz
fd6c335ea792bdec34dafd22112a28cc 1266710 sisu_0.50.3.orig.tar.gz
ab6e0d4e85f9bbe4ccbf73c13050a76b 606 sisu_0.50.3-1.dsc
ab3d87396df3cf4c4319d84ce86e30ef 141612 sisu_0.50.3-1.diff.gz
@@ -1635,8 +1635,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.3.orig.tar.gz
* html navigation band, need more space with search widget, descriptions
shortened
-%% sisu_0.50.2.orig.tar.gz (2007w11/6 | 2007-03-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.2.orig.tar.gz
+** sisu_0.50.2.orig.tar.gz (2007w11/6 | 2007-03-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.2.orig.tar.gz
a8775153ce7e36b900c93b2d21108592 1266482 sisu_0.50.2.orig.tar.gz
0fdfc5112033dd0477757193bda1e732 606 sisu_0.50.2-1.dsc
a7f5598bc317e18694777cca32eeb277 141599 sisu_0.50.2-1.diff.gz
@@ -1666,8 +1666,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.2.orig.tar.gz
* initial tests with ruby-1.8.6 passed
-%% sisu_0.50.1.orig.tar.gz (2007w10/6 | 2007-03-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.1.orig.tar.gz
+** sisu_0.50.1.orig.tar.gz (2007w10/6 | 2007-03-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.1.orig.tar.gz
51f2236f3612bce6fa2bbcb0cf9545ed 1263537 sisu_0.50.1.orig.tar.gz
25a1a4adf387c11d66b985dc2cf47623 606 sisu_0.50.1-1.dsc
ae312bda6b54e9e1b8cfaece0f03e1b4 141521 sisu_0.50.1-1.diff.gz
@@ -1684,8 +1684,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.1.orig.tar.gz
* yaml sample files promo.yml and list.yml updated
(removed from conf (/etc/sisu) copy in document samples)
-%% sisu_0.50.0.orig.tar.gz (2007w10/2 | 2007-03-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.0.orig.tar.gz
+** sisu_0.50.0.orig.tar.gz (2007w10/2 | 2007-03-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.0.orig.tar.gz
76844391967ef202a748fa1be9d16a23 1265163 sisu_0.50.0.orig.tar.gz
af406857bf7cf1d91ddf0ff1249fe174 606 sisu_0.50.0-1.dsc
6b0f5e2a44d8f2dc130efb075601834c 141436 sisu_0.50.0-1.diff.gz
@@ -1708,8 +1708,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.0.orig.tar.gz
formats
* promo/advertise, html, permits division into a major and a minor pane
- (left) which is available for promotional material, links etc. the content of
- which is currently controlled header @promo: and yaml files promo.yml and
+ (left) which is available for promotional material, links etc. the content
+ of which is currently controlled header @promo: and yaml files promo.yml and
list/yml usual path = = = _sisu/skin/yml ~/.sisu/skin/yml /etc/sisu/skin/yml
added sample of promo.yml and list.yml and an edited out header for promo
inclusion in "Free as in Freedom" and "GPL" document samples (these are
@@ -1719,8 +1719,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.50.0.orig.tar.gz
[.gh 50th anniversary commemorative edition - "Freedom and Justice"]
-%% sisu_0.49.2.orig.tar.gz (2007w08/6 | 2007-02-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.2.orig.tar.gz
+** sisu_0.49.2.orig.tar.gz (2007w08/6 | 2007-02-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.2.orig.tar.gz
10795b62c129f99645dd100a2fe52ddc 1263418 sisu_0.49.2.orig.tar.gz
9983da392f16660e9e580b4d92197239 606 sisu_0.49.2-1.dsc
0a13214e9ac2aba566c1f7bcd030c1ec 141340 sisu_0.49.2-1.diff.gz
@@ -1733,8 +1733,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.2.orig.tar.gz
* description, less mention of document management, more on lightweight
markup, text structuring, publishing and search
-%% sisu_0.49.1.orig.tar.gz (2007w06/6 | 2007-02-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.1.orig.tar.gz
+** sisu_0.49.1.orig.tar.gz (2007w06/6 | 2007-02-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.1.orig.tar.gz
4c2f96d5236d389384599899ed524bdb 1261990 sisu_0.49.1.orig.tar.gz
e9d3028830f44afb1ddd91fa08022bfe 606 sisu_0.49.1-1.dsc
4dd3d53ca4b881e62654b871c9cf0957 141247 sisu_0.49.1-1.diff.gz
@@ -1748,8 +1748,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.1.orig.tar.gz
navigation, the scroll bar is usually on the right, also more consistent
presentation (placement as in toc))
* removed two sets of html segment navigation bands, from very top and
- under title (cleaner presentation without reduction in functionality, (also
- for console clients))
+ under title (cleaner presentation without reduction in functionality,
+ (also for console clients))
* remote placement, rsync, simplify mapping used, should be a bit more robust
@@ -1762,10 +1762,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.1.orig.tar.gz
(instead of 0-6)
[consider object numbering rule change, re: paragraph/line consisting
- solely of * * * or ***, should these be un-numbered?, currently are numbered]
+ solely of * * * or ***, should these be un-numbered?, currently are
+ numbered]
-%% sisu_0.49.0.orig.tar.gz (2007w04/5 | 2007-01-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.0.orig.tar.gz
+** sisu_0.49.0.orig.tar.gz (2007w04/5 | 2007-01-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.0.orig.tar.gz
b628ed7a7b50cb6af37b7072c1ebff3a 1262979 sisu_0.49.0.orig.tar.gz
a4d610ca440369ee6bfec28d386f6490 606 sisu_0.49.0-1.dsc
56903630d97439f290de51622941dfe1 141237 sisu_0.49.0-1.diff.gz
@@ -1781,8 +1782,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.49.0.orig.tar.gz
post freeze (Etch), and the development routine should be
more regular]]
-%% sisu_0.48.12.orig.tar.gz (2007w04/3 | 2007-01-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.12.orig.tar.gz
+** sisu_0.48.12.orig.tar.gz (2007w04/3 | 2007-01-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.12.orig.tar.gz
9b5798e5452624ee051b6a2e1c3cbee5 1262380 sisu_0.48.12.orig.tar.gz
0984bb76407ffeb2ed320e2fe54dd370 609 sisu_0.48.12-1.dsc
5781b7838cc7eb0a442e99b65713ef74 141210 sisu_0.48.12-1.diff.gz
@@ -1819,8 +1820,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.12.orig.tar.gz
* html, toc cosmetic correction
-%% sisu_0.48.11.orig.tar.gz (2007w04/3 | 2007-01-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.11.orig.tar.gz
+** sisu_0.48.11.orig.tar.gz (2007w04/3 | 2007-01-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.11.orig.tar.gz
341b2cebe2efdba4ae776f2752e9ce1b 1259351 sisu_0.48.11.orig.tar.gz
66f3abd74a14f671af92074e7e6ea0fd 609 sisu_0.48.11-1.dsc
0d416f48777c99c2b13f2c98a330fd13 141583 sisu_0.48.11-1.diff.gz
@@ -1839,8 +1840,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.11.orig.tar.gz
* sisu-0.48.8-7 equivalent, which includes a fix to the sample cgi search
form [0.48.8-4 introduced a bug]
-%% sisu_0.48.10.orig.tar.gz (2007w04/3 | 2007-01-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.10.orig.tar.gz
+** sisu_0.48.10.orig.tar.gz (2007w04/3 | 2007-01-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.10.orig.tar.gz
42b50dac775cbad84ebc394ec415986d 1259007 sisu_0.48.10.orig.tar.gz
d23694f1466e2af8766e61109fa97fcc 609 sisu_0.48.10-1.dsc
9ea670634d088c996642ad4f2ec95c4d 141560 sisu_0.48.10-1.diff.gz
@@ -1910,19 +1911,19 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.10.orig.tar.gz
* doc/sisu/html keep copy of homepage
[introduced in 0.48.9]
-%% sisu_0.48.9.orig.tar.gz (2007w04/3 | 2007-01-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.9.orig.tar.gz
+** sisu_0.48.9.orig.tar.gz (2007w04/3 | 2007-01-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.9.orig.tar.gz
1ad6d950454583d0130430664fc982ec 1258128 sisu_0.48.9.orig.tar.gz
f727321854bdf95cbb12e40bc247dd7f 606 sisu_0.48.9-1.dsc
957f1438013ec99bc9a6c5010ca5ea1c 141430 sisu_0.48.9-1.diff.gz
* [NOTE rebuild of the 0.48.9 of (2006w52/1 | 20061225) to merge branch in
- version control, chronological break in sequence, this build is substantially
- the same as 0.48.8-2, subsequent versions of 48.8 are more recent
- (Etch freeze is at 0.48.8), the latest being 0.48.8-8]
+ version control, chronological break in sequence, this build is
+ substantially the same as 0.48.8-2, subsequent versions of 48.8 are more
+ recent (Etch freeze is at 0.48.8), the latest being 0.48.8-8]
Originally released as:
- %% sisu_0.48.9.orig.tar.gz (2006w52/1 | 20061225)
+*** sisu_0.48.9.orig.tar.gz (2006w52/1 | 20061225)
237b2bae3e343e4b4c2f781d554f7df8 1254360 sisu_0.48.9.orig.tar.gz
8dc727e95913688179b7808592e1c4e9 606 sisu_0.48.9-1.dsc
f53b18bbc0919121040cf4c022356e35 140080 sisu_0.48.9-1.diff.gz
@@ -1953,8 +1954,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.9.orig.tar.gz
* debian control, sisu-pdf depends for tetex | texlive, take on board
suggestion by Frank Küster (see #402807)
-%% sisu_0.48.8.orig.tar.gz (2006w48/1 | 20061127) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
+** sisu_0.48.8.orig.tar.gz (2006w48/1 | 20061127)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
556de4a3025156e0e7010210a0ddc32f 1248719 sisu_0.48.8.orig.tar.gz
e32d8183b0c1dde1020ecf3eced25dff 606 sisu_0.48.8-1.dsc
b054905ec4d964f73ccb0c705d593e63 139568 sisu_0.48.8-1.diff.gz
@@ -1968,7 +1970,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* [sisu-markup-samples_1.0.4 contains "The Wealth of Networks", Yochai
Benkler]
-%% sisu_0.48.8-2 (2006w50/4 | 20061214) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-2 (2006w50/4 | 20061214)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
0eba8d5dd3086bd2d1fa830c6c19527c 606 sisu_0.48.8-2.dsc
42662b8bf9a83321edbbab0b3b3db554 145527 sisu_0.48.8-2.diff.gz
@@ -1989,7 +1992,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* debian control, adds mention of editors other than vim for which there is
some kind of syntax support, kate, kwrite, gedit, diakonos
-%% sisu_0.48.8-3 (2006w52/5 | 20061229) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-3 (2006w52/5 | 20061229)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
0f5acb28c8e9fdd21c29db7fbc7e1d3c 606 sisu_0.48.8-3.dsc
669875a8ca8102e5772df258b0665ba8 147220 sisu_0.48.8-3.diff.gz
@@ -2014,7 +2018,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* documentation/help on initially creating postgresql database for use if
necessary
-%% sisu_0.48.8-4 (2006w52/7 | 20061231) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-4 (2006w52/7 | 20061231)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
20337413c61bc87b8a9b3e8a2e843b81 606 sisu_0.48.8-4.dsc
b440173ffabe147a851ecb25b20db6a2 148820 sisu_0.48.8-4.diff.gz
@@ -2031,7 +2036,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* debian/control Recommends libfcgi-ruby1.8 moved to sisu-postgresql and
sisu-sqlite (only used in this context)
-%% sisu_0.48.8-5 (2007w01/2 | 2007-01-02) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-5 (2007w01/2 | 2007-01-02)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
07964ec823ae5d96a04ff6c88f5a7f66 606 sisu_0.48.8-5.dsc
90aa76b6061e10e715726c51e5b08a70 153491 sisu_0.48.8-5.diff.gz
@@ -2039,7 +2045,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* rollover year 2006 to 2007
-%% sisu_0.48.8-6 (2007w01/3 | 2007-01-03) [Etch related fixes, uploaded by Daniel Baumann (Medium), cleared/unblocked by Marc 'HE' Brockschmidt]
+** sisu_0.48.8-6 (2007w01/3 | 2007-01-03)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium), cleared/unblocked by
+ Marc 'HE' Brockschmidt]
4c95034d6d9bbe67cd2d008e561a78cc 606 sisu_0.48.8-6.dsc
02bda8e1da0ef74396b1e85ac8ce9e6e 154145 sisu_0.48.8-6.diff.gz
@@ -2048,7 +2056,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
http://lists.debian.org/debian-tex-maint/2007/01/msg00034.html
http://lists.debian.org/debian-tex-maint/2007/01/msg00033.html
-%% sisu_0.48.8-7 (2007w02/3 | 2007-01-10) [Etch related fixes, uploaded by Daniel Baumann (Medium), cleared/unblocked by Marc 'HE' Brockschmidt]
+** sisu_0.48.8-7 (2007w02/3 | 2007-01-10)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium), cleared/unblocked by
+ Marc 'HE' Brockschmidt]
fd6e2df63f7b75bc3ad7aa5c34f606fd 606 sisu_0.48.8-7.dsc
2e2fc97a23a4550ed279f94f85ea7378 157623 sisu_0.48.8-7.diff.gz
@@ -2063,7 +2073,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* sisu html man page regenerated (from man page)
-%% sisu_0.48.8-8 (2007w03/7 | 2007-01-21) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-8 (2007w03/7 | 2007-01-21)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
0ba3e2e6efecd2c57dccf6457200e945 606 sisu_0.48.8-8.dsc
2fb929cfa2fd00366cda7b38f2dea4dd 168554 sisu_0.48.8-8.diff.gz
@@ -2086,7 +2097,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* html, toc cosmetic correction
-%% sisu_0.48.8-9 (2007w04/1 | 2007-01-22) [Etch related fixes, uploaded by Daniel Baumann (Medium)]
+** sisu_0.48.8-9 (2007w04/1 | 2007-01-22)
+ [Etch related fixes, uploaded by Daniel Baumann (Medium)]
8ba3e0a9ba6b9b0f4966e020cbcee865 606 sisu_0.48.8-9.dsc
1ac6537c065807c1459e63a4122f9d79 145898 sisu_0.48.8-9.diff.gz
@@ -2095,13 +2107,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
* minor further adjustments to xml processing
-%% sisu_0.48.8-10 (2007w04/2 | 2007-01-23) [Etch related fixes]
+** sisu_0.48.8-10 (2007w04/2 | 2007-01-23)
+ [Etch related fixes]
ccc192b7615235f56c9e5b122089d50d 608 sisu_0.48.8-10.dsc
64732549e20c98a6958a3544770343fb 146148 sisu_0.48.8-10.diff.gz
* xml and xhtml adjustment of regex match of urls for xlink
-%% sisu_0.48.8-11 (2007w07/5 | 2007-02-16) [Etch related fixes]
+** sisu_0.48.8-11 (2007w07/5 | 2007-02-16)
+ [Etch related fixes]
0f3e22d6fd4cfab955f47f9cb5840d7a 608 sisu_0.48.8-11.dsc
825404e40bfbe54999c0ae4ec90fa682 162284 sisu_0.48.8-11.diff.gz
@@ -2114,8 +2128,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
navigation, the scroll bar is usually on the right, also more consistent
presentation (placement as in toc))
* removed two sets of html segment navigation bands, from very top and
- under title (cleaner presentation without reduction in functionality, (also
- for console clients))
+ under title (cleaner presentation without reduction in functionality,
+ (also for console clients))
* remote placement, rsync, simplify mapping used, should be a bit more robust
@@ -2134,8 +2148,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.8.orig.tar.gz
[this build is based on 0.49.1 which is "stable" in its major parts]
-%% sisu_0.48.7.orig.tar.gz (2006w46/7 | 2006-11-19) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.7.orig.tar.gz
+** sisu_0.48.7.orig.tar.gz (2006w46/7 | 2006-11-19)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.7.orig.tar.gz
2bbc89da7fa28de1193ea64fd98bb522 1248263 sisu_0.48.7.orig.tar.gz
94adac2227718f4a6c1c2437c883e939 606 sisu_0.48.7-1.dsc
f53871fe2aad4fc8ddfb9b3b1817d677 100806 sisu_0.48.7-1.diff.gz
@@ -2155,8 +2170,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.7.orig.tar.gz
* remote, placement of sitemaps directory to remote server, rsync
-%% sisu_0.48.6.orig.tar.gz (2006w45/6 | 2006-11-11) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.6.orig.tar.gz
+** sisu_0.48.6.orig.tar.gz (2006w45/6 | 2006-11-11)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.6.orig.tar.gz
82b8dd63a4626fcef222d039820827cc 1245728 sisu_0.48.6.orig.tar.gz
25be6c97cfa020a1b2971e02bc32b715 606 sisu_0.48.6-1.dsc
1c682265850177ec5eb32a3cfe1fc3cd 100704 sisu_0.48.6-1.diff.gz
@@ -2171,8 +2187,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.6.orig.tar.gz
* vim syntax highlighting updated for {table} match
-%% sisu_0.48.5.orig.tar.gz (2006w45/3 | 2006-11-08) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.5.orig.tar.gz
+** sisu_0.48.5.orig.tar.gz (2006w45/3 | 2006-11-08)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.5.orig.tar.gz
208f47dcc87802fcd14b64e9c1aa2a52 1245103 sisu_0.48.5.orig.tar.gz
1664f21a14fa2311d7cb115e8d31fc88 606 sisu_0.48.5-1.dsc
428fe256c0dd063d362baa751866ede8 100632 sisu_0.48.5-1.diff.gz
@@ -2190,8 +2207,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.5.orig.tar.gz
* minor checks, minor editing, e.g. man pages
-%% sisu_0.48.4.orig.tar.gz (2006w45/1 | 2006-11-06) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.4.orig.tar.gz
+** sisu_0.48.4.orig.tar.gz (2006w45/1 | 2006-11-06)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.4.orig.tar.gz
eee656e88462c4dc2f338dadb26fc97a 1244746 sisu_0.48.4.orig.tar.gz
70bd0670b8b21130856e87d32644102c 606 sisu_0.48.4-1.dsc
f72edba97792bc72f07b5b66223761fc 100603 sisu_0.48.4-1.diff.gz
@@ -2207,16 +2225,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.4.orig.tar.gz
* minor adjustment to sisupod directory name...
-%% sisu_0.48.3.orig.tar.gz (2006w44/2 | 2006-10-31) [Debian Release snapshot, uploaded by Daniel Baumann (High)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.3.orig.tar.gz
+** sisu_0.48.3.orig.tar.gz (2006w44/2 | 2006-10-31)
+ [Debian Release snapshot, uploaded by Daniel Baumann (High)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.3.orig.tar.gz
8c3fffc9a7da73220e15d15cfba968bf 1243334 sisu_0.48.3.orig.tar.gz
6a75a4a2d5817914f274388237ddcf4d 606 sisu_0.48.3-1.dsc
eea089e0690c3aa6c7a4baae8c4b5f54 100547 sisu_0.48.3-1.diff.gz
* one file omitted in sisu 0.48.2 fix, see comments there.
-%% sisu_0.48.2.orig.tar.gz (2006w44/2 | 2006-10-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.2.orig.tar.gz
+** sisu_0.48.2.orig.tar.gz (2006w44/2 | 2006-10-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.2.orig.tar.gz
a9a876acb9cdf3501cd3d7bfe09db9d0 1243141 sisu_0.48.2.orig.tar.gz
ae29c18dfb96d898e608ff50b1d20512 606 sisu_0.48.2-1.dsc
e16685b9fe00f5e6096f72386d699ff7 100497 sisu_0.48.2-1.diff.gz
@@ -2227,8 +2246,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.2.orig.tar.gz
versions of sisu. [Further code review is necessary to ascertain that this
does not occur anywhere else within sisu code base]
-%% sisu_0.48.1.orig.tar.gz (2006w43/7 | 2006-10-29) [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.1.orig.tar.gz
+** sisu_0.48.1.orig.tar.gz (2006w43/7 | 2006-10-29)
+ [Debian Release snapshot, uploaded by Daniel Baumann (Medium)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.1.orig.tar.gz
cda3082de5c359737bfdfd23474fee2b 1242845 sisu_0.48.1.orig.tar.gz
badc4a6d1e6bc77956ec603a5278bbea 606 sisu_0.48.1-2.dsc
a95c14570a0e5ebd46a588c7181151f5 101129 sisu_0.48.1-2.diff.gz
@@ -2237,8 +2257,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.1.orig.tar.gz
* metaverse, indicate image missing if a requested image is not found
- * processing directories default location moved to be placed under home or /tmp
- from pwd
+ * processing directories default location moved to be placed under home or
+ /tmp from pwd
* (-1) debian/control, recommends hyperestraier removed as appears to cause
issues (also rename and pgaccess)
@@ -2246,8 +2266,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.1.orig.tar.gz
* (-2) debian/control recommends hyperestraier (sisu and sisu-complete) put
back
-%% sisu_0.48.0.orig.tar.gz (2006w43/6 | 2006-10-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.0.orig.tar.gz
+** sisu_0.48.0.orig.tar.gz (2006w43/6 | 2006-10-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.0.orig.tar.gz
5e7bc1752828347d0f43e7eb8403cfec 1241476 sisu_0.48.0.orig.tar.gz
79cce16683c3da3f70e9cc205710feb1 606 sisu_0.48.0-1.dsc
748830590639ab2e8097b8c0820b37a4 100197 sisu_0.48.0-1.diff.gz
@@ -2295,16 +2315,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.48.0.orig.tar.gz
* sysenv, url path reporting fix, (broken by renaming in 0.47.7)
- * processing directories default location moved to be placed under home or /tmp
- from pwd, likewise sisupod creation directory moved
+ * processing directories default location moved to be placed under home or
+ /tmp from pwd, likewise sisupod creation directory moved
[processing directory]/sisupod from ./_sisu/sisu_doc
* extra testing, numerous small fixes, (several related to method renaming in
sisu-0.47.7, also checks against both ruby 1.8.5 and current 1.9, $KCONV set
to UTF-8 rather than rely on environment and many more also as above)
-%% sisu_0.47.8.orig.tar.gz (2006w42/4 | 2006-10-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.8.orig.tar.gz
+** sisu_0.47.8.orig.tar.gz (2006w42/4 | 2006-10-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.8.orig.tar.gz
53c131f5c569d96ff60ecfdeb1a1f3d5 1237476 sisu_0.47.8.orig.tar.gz
a39620a910612684a0dc31b3b5559eda 606 sisu_0.47.8-1.dsc
8570a26f39ec44b3c8c539d0dcf63a99 100075 sisu_0.47.8-1.diff.gz
@@ -2313,8 +2333,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.8.orig.tar.gz
regard to new syntax shortcut markup for listing multiple available output
types produced by SiSU (introduced in 0.47.6)
-%% sisu_0.47.7.orig.tar.gz (2006w41/6 | 2006-10-14) [Debian Release snapshot, uploaded by Daniel Baumann]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.7.orig.tar.gz
+** sisu_0.47.7.orig.tar.gz (2006w41/6 | 2006-10-14)
+ [Debian Release snapshot, uploaded by Daniel Baumann]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.7.orig.tar.gz
6bb28ad3f783184876c455c91cf9ef22 1236983 sisu_0.47.7.orig.tar.gz
c8bf85fb300d6260176ad459c2f6e3a0 606 sisu_0.47.7-2.dsc
8eaeebb43b6de5ca727995d681d36b1c 102531 sisu_0.47.7-2.diff.gz
@@ -2335,8 +2356,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.7.orig.tar.gz
the default font in texlive)
http://lists.debian.org/debian-tex-maint/2006/10/msg00620.html
-%% sisu_0.47.6.orig.tar.gz (2006w40/6 | 2006-10-07) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.6.orig.tar.gz
+** sisu_0.47.6.orig.tar.gz (2006w40/6 | 2006-10-07)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.6.orig.tar.gz
7e319ebd2f8265f6ca7e46a4c74bd211 1236547 sisu_0.47.6.orig.tar.gz
bf4602222c37f9e288284e1573ebd034 609 sisu_0.47.6-1.dsc
9741957517f66d825d952e309d231152 99839 sisu_0.47.6-1.diff.gz
@@ -2352,16 +2374,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.6.orig.tar.gz
* [package structure, vim directory moved to data/sisu/conf/vim from
data/vim]
-%% sisu_0.47.5.orig.tar.gz (2006w39/7 | 2006-10-01) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.5.orig.tar.gz
+** sisu_0.47.5.orig.tar.gz (2006w39/7 | 2006-10-01)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.5.orig.tar.gz
40d50d1db5e6f1ca4750dec82fc7aad8 1234759 sisu_0.47.5.orig.tar.gz
e3555bb320920eb25e62c820961105e7 609 sisu_0.47.5-1.dsc
a030d4f4dd052009ce36ab14dec29ed3 99796 sisu_0.47.5-1.diff.gz
* sisupod, fix creation of, change of library name caused break in 0.47.4
-%% sisu_0.47.4.orig.tar.gz (2006w39/5 | 2006-09-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.4.orig.tar.gz
+** sisu_0.47.4.orig.tar.gz (2006w39/5 | 2006-09-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.4.orig.tar.gz
71ae6429e675fdbfb6a8ab507c3e6989 1233691 sisu_0.47.4.orig.tar.gz
c0968784d14ac2ff6b7754dc5de6024a 609 sisu_0.47.4-1.dsc
a0ccb2abcee55dd60529b2cc88c73454 99693 sisu_0.47.4-1.diff.gz
@@ -2373,8 +2396,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.4.orig.tar.gz
removed non dfsg compliant firefox icon
(also removed other browser related icons)
-%% sisu_0.47.3.orig.tar.gz (2006w38/6 | 2006-09-23) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.3.orig.tar.gz
+** sisu_0.47.3.orig.tar.gz (2006w38/6 | 2006-09-23)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.3.orig.tar.gz
18ac94ea4ab58060873ba22d37d03bd0 1268844 sisu_0.47.3.orig.tar.gz
3c2fac012a174f930e9030863e92f065 609 sisu_0.47.3-1.dsc
c075392d392665de4d5054f438352f2f 99612 sisu_0.47.3-1.diff.gz
@@ -2382,16 +2406,18 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.3.orig.tar.gz
* minor code review
[takes care of RAM issue experienced with some forms of batch processing]
-%% sisu_0.47.2.orig.tar.gz (2006w38/5 | 2006-09-22) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.2.orig.tar.gz
+** sisu_0.47.2.orig.tar.gz (2006w38/5 | 2006-09-22)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.2.orig.tar.gz
5afc268f78ab72b17c387469e2ae5caf 1268744 sisu_0.47.2.orig.tar.gz
334056e0cdd87dc2887baf99a638e3d1 609 sisu_0.47.2-1.dsc
8e468cc4052b0f28fb3b22ef5dfbf4c2 99580 sisu_0.47.2-1.diff.gz
* metaverse, a line of code needed changing for ruby-1.8.5
-%% sisu_0.47.1.orig.tar.gz (2006w38/1 | 2006-09-18) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.1.orig.tar.gz
+** sisu_0.47.1.orig.tar.gz (2006w38/1 | 2006-09-18)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.1.orig.tar.gz
77d77e7888ee1f97a38012233d5d4d90 1268488 sisu_0.47.1.orig.tar.gz
c7e9cd3ee27bba16684651bda463124c 609 sisu_0.47.1-1.dsc
596bb6380b8355d4b5420aa5ddb2008f 99556 sisu_0.47.1-1.diff.gz
@@ -2404,8 +2430,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.1.orig.tar.gz
* plaintext minor adjustments, and a batch processing information sync fix
-%% sisu_0.47.0.orig.tar.gz (2006w37/7 | 2006-09-17) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.0.orig.tar.gz
+** sisu_0.47.0.orig.tar.gz (2006w37/7 | 2006-09-17)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.0.orig.tar.gz
c8eb3908d4b6fb6e6bc199118a0ef897 1268127 sisu_0.47.0.orig.tar.gz
42836c37c783d9c7aee87085127cd87c 609 sisu_0.47.0-1.dsc
e02895ae383af556ebc50d7832c7d20a 99541 sisu_0.47.0-1.diff.gz
@@ -2428,18 +2455,20 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.47.0.orig.tar.gz
* conversion, prefer --to- to --to=, keep both, man page and help updated to
use --to-[conversion] (also minor cleaning of screen output)
- * debian/control depends zip and unzip added, used for sisupod.zip and ODF output
+ * debian/control depends zip and unzip added, used for sisupod.zip and ODF
+ output
-%% sisu_0.46.5.orig.tar.gz (2006w36/6 | 2006-09-09) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.5.orig.tar.gz
+** sisu_0.46.5.orig.tar.gz (2006w36/6 | 2006-09-09)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.5.orig.tar.gz
bea9a0eddb1ea8746de416a7bdd22e2e 1265848 sisu_0.46.5.orig.tar.gz
87e99256d31497c23509811e122b6ea2 609 sisu_0.46.5-1.dsc
5b4caafec6ac1ebc5314f7fa44e8f677 99342 sisu_0.46.5-1.diff.gz
* documentation adjustments
-%% sisu_0.46.4.orig.tar.gz (2006w36/3 | 2006-09-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.4.orig.tar.gz
+** sisu_0.46.4.orig.tar.gz (2006w36/3 | 2006-09-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.4.orig.tar.gz
506bc266f4618eea88c7c005f21c2bf4 1269441 sisu_0.46.4.orig.tar.gz
6fbd0e2e7f2915725feb03e3ea0f977f 609 sisu_0.46.4-1.dsc
a7fcd22b852f90ab4af04c56143a8aa2 99242 sisu_0.46.4-1.diff.gz
@@ -2447,8 +2476,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.4.orig.tar.gz
* defaults html text/ accompanying blurb removed some Ruby / Debian / Linux /
Unix text
-%% sisu_0.46.3.orig.tar.gz (2006w36/1 | 2006-09-04)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.3.orig.tar.gz
+** sisu_0.46.3.orig.tar.gz (2006w36/1 | 2006-09-04)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.3.orig.tar.gz
c41d41e0771e66c236b2832c8798a1d8 1269233 sisu_0.46.3.orig.tar.gz
74458da231e6e4628996c48eb915344d 609 sisu_0.46.3-1.dsc
f7ab7c92526bfecd71331a69ef069d44 99223 sisu_0.46.3-1.diff.gz
@@ -2476,8 +2505,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.3.orig.tar.gz
* [debian/control build does not permit changing ruby version to 1.8.4]
-%% sisu_0.46.2.orig.tar.gz (2006w34/5 | 2006-08-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.2.orig.tar.gz
+** sisu_0.46.2.orig.tar.gz (2006w34/5 | 2006-08-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.2.orig.tar.gz
852d865e66fd37e1902d3940cd460e55 1265122 sisu_0.46.2.orig.tar.gz
9931d0d05ea5e37134fb063c31caa66e 609 sisu_0.46.2-1.dsc
6a52a52ede5cf3158cd4bd843f737295 99124 sisu_0.46.2-1.diff.gz
@@ -2504,8 +2533,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.2.orig.tar.gz
(released today), so (the aesthetically more pleasing) colons switched with
semi-colons.
-%% sisu_0.46.1.orig.tar.gz (2006w33/3 | 2006-08-16) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
+** sisu_0.46.1.orig.tar.gz (2006w33/3 | 2006-08-16)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
26bef582eb5da7fe39b578e9296ceb19 1263026 sisu_0.46.1.orig.tar.gz
37ebebd9bf56e2e5fd57b0b1411771be 609 sisu_0.46.1-1.dsc
3537949d88ec6749698fd04d21a30d96 99119 sisu_0.46.1-1.diff.gz
@@ -2524,8 +2554,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
due to vim policy) both now removed and replaced by default installation,
control file modified accordingly for sisu-vim
-%% sisu_0.46.0.orig.tar.gz (2006w32/6 | 2006-08-12) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
+** sisu_0.46.0.orig.tar.gz (2006w32/6 | 2006-08-12)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
84d863f4f41ff2e328530930890f7160 1259520 sisu_0.46.0.orig.tar.gz
9d04df245c99431649f40f58d5022c40 609 sisu_0.46.0-1.dsc
6b027cbd9d063eae67010ee072a6fc28 99068 sisu_0.46.0-1.diff.gz
@@ -2543,8 +2574,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.46.1.orig.tar.gz
* debian/rules compression mentioned twice, one removed
-%% sisu_0.45.0.orig.tar.gz (2006w31/7 | 2006-08-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.45.1.orig.tar.gz
+** sisu_0.45.0.orig.tar.gz (2006w31/7 | 2006-08-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.45.1.orig.tar.gz
dbdcdd947aa6357492ac50a5bb5b81af 1242290 sisu_0.45.0.orig.tar.gz
9ac37f27c19ff8696631396627919806 609 sisu_0.45.0-1.dsc
7426d8ba2f1e2aa709a0aeccd4596f4d 99025 sisu_0.45.0-1.diff.gz
@@ -2562,8 +2593,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.45.1.orig.tar.gz
* NB. only emergency maintenance on this branch, development is on 0.44
-%% sisu_0.44.0.orig.tar.gz (2006w31/7 | 2006-08-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.44.1.orig.tar.gz
+** sisu_0.44.0.orig.tar.gz (2006w31/7 | 2006-08-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.44.1.orig.tar.gz
4ce1f4946ce12180bf257d46f5ab6ff0 1256908 sisu_0.44.0.orig.tar.gz
f976a5e8494184696c70c45b240933ee 609 sisu_0.44.0-1.dsc
a8fd211fff73a01beb17433707bb1e04 98941 sisu_0.44.0-1.diff.gz
@@ -2611,8 +2642,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.44.1.orig.tar.gz
* debian/lintian/sisu added lintian override for man page and non-executables
-%% sisu_0.43.0.orig.tar.gz (2006w29/6 | 2006-07-22) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.43.0.orig.tar.gz
+** sisu_0.43.0.orig.tar.gz (2006w29/6 | 2006-07-22)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.43.0.orig.tar.gz
09127f189334eef57363875bb2fb2a4d 1241138 sisu_0.43.0.orig.tar.gz
11692249f8ae03a4ead59fb1f0e00514 609 sisu_0.43.0-1.dsc
e3307627de717fca49c9fbec988c8cc2 99392 sisu_0.43.0-1.diff.gz
@@ -2667,8 +2699,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.43.0.orig.tar.gz
reasonably handle the utf-8 characters involved, and document structure is
ok]
-%% sisu_0.42.4.orig.tar.gz (2006w29/1 | 2006-07-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.4.orig.tar.gz
+** sisu_0.42.4.orig.tar.gz (2006w29/1 | 2006-07-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.4.orig.tar.gz
dccd6a56bcd2217d3bb0f1be5211ed57 1230468 sisu_0.42.4.orig.tar.gz
a6814ae0311a22d1f0ca89208629e2ac 609 sisu_0.42.4-1.dsc
bdebad3bdcda48423bdb4a021224c04b 99255 sisu_0.42.4-1.diff.gz
@@ -2695,8 +2727,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.4.orig.tar.gz
sisu -3v [filename]
[database tests omitted, relevant ruby drivers not on system]
-%% sisu_0.42.3.orig.tar.gz (2006w28/2 | 2006-07-11) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.3.orig.tar.gz
+** sisu_0.42.3.orig.tar.gz (2006w28/2 | 2006-07-11)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.3.orig.tar.gz
d3ab92e9f20ef48de711512d10fd3fe7 1230428 sisu_0.42.3.orig.tar.gz
33088e3d51a612cf73a64afe239eb8f5 609 sisu_0.42.3-1.dsc
28a4652fdade40b19ddb88df4344242f 99164 sisu_0.42.3-1.diff.gz
@@ -2706,8 +2739,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.3.orig.tar.gz
* sysenv, fix for when sisu sql related packages are not
installed, should not then be loading rb dbi module
-%% sisu_0.42.2.orig.tar.gz (2006w27/6 | 2006-07-08) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.2.orig.tar.gz
+** sisu_0.42.2.orig.tar.gz (2006w27/6 | 2006-07-08)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.2.orig.tar.gz
cf5b6605089179140da52f5bde655ebd 1229996 sisu_0.42.2.orig.tar.gz
081c37f65a4fbb5ed7d3a2ed1a02c423 609 sisu_0.42.2-1.dsc
19f7878a951fa966acb5ab3c5d38f6c8 99115 sisu_0.42.2-1.diff.gz
@@ -2749,8 +2783,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.2.orig.tar.gz
(verify that descriptions are satisfactory before closing: #377208)
[submitted:myon]
-%% sisu_0.42.1.orig.tar.gz (2006w27/4 | 2006-07-06) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.1.orig.tar.gz
+** sisu_0.42.1.orig.tar.gz (2006w27/4 | 2006-07-06)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.1.orig.tar.gz
7d6bcb9a4be5ded17e71522b37a2af5a 1227649 sisu_0.42.1.orig.tar.gz
734e48c69096c912cbd60f38b8961bd0 632 sisu_0.42.1-1.dsc
bb107345477000cc540fb08a73df4379 99097 sisu_0.42.1-1.diff.gz
@@ -2766,8 +2801,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.1.orig.tar.gz
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=377086
(Closes: #377086) [submitted:luk]
-%% sisu_0.42.0.orig.tar.gz (2006w27/4 | 2006-07-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.0.orig.tar.gz
+** sisu_0.42.0.orig.tar.gz (2006w27/4 | 2006-07-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.0.orig.tar.gz
297702e8c44b95f0ac16c656b798812d 1227287 sisu_0.42.0.orig.tar.gz
065d70ba326d517401f2b62fe5c837c4 632 sisu_0.42.0-2.dsc
0ad5a4471a31f4968a7b900a17c43ac7 99754 sisu_0.42.0-2.diff.gz
@@ -2808,8 +2843,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.42.0.orig.tar.gz
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=374873
(Closes: #374873) [submitted: Jens Seidel]
-%% sisu_0.41.8.orig.tar.gz (2006w25/6 | 2006-06-24) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.8.orig.tar.gz
+** sisu_0.41.8.orig.tar.gz (2006w25/6 | 2006-06-24)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.8.orig.tar.gz
ea76d18d8c58bb444f4be71c4e9a3185 1225229 sisu_0.41.8.orig.tar.gz
283d46cf2196e667e5416327a19659c5 632 sisu_0.41.8-1.dsc
1fe0b2f06aed3d3f8a272340dcabef9c 98810 sisu_0.41.8-1.diff.gz
@@ -2817,8 +2853,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.8.orig.tar.gz
* kdissert, texpdf, accept sisu page break and new page marker, used for
LaTeX/pdf
-%% sisu_0.41.7.orig.tar.gz (2006w25/6 | 2006-06-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.7.orig.tar.gz
+** sisu_0.41.7.orig.tar.gz (2006w25/6 | 2006-06-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.7.orig.tar.gz
792ed0b0e57e78cf88ec37102fd3de8a 1225007 sisu_0.41.7.orig.tar.gz
77b90465be946edcdb57c31b8fc3cd10 632 sisu_0.41.7-1.dsc
0f568b819dd5b18a5637d77c220beaf5 98795 sisu_0.41.7-1.diff.gz
@@ -2851,16 +2887,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.7.orig.tar.gz
* Debian rules, .ssm and .ssi files added to list of not compressed file
types (/usr/share/doc/sisu)
-%% sisu_0.41.6.orig.tar.gz (2006w25/2 | 2006-06-20) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.6.orig.tar.gz
+** sisu_0.41.6.orig.tar.gz (2006w25/2 | 2006-06-20)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.6.orig.tar.gz
ff6217bb156f2ab803bf87367fb327e4 671142 sisu_0.41.6.orig.tar.gz
594e27b60ceb415bdd3504929a7adb0f 631 sisu_0.41.6-1.dsc
3ba8aecfd904844b40ef2a26a6379aec 98359 sisu_0.41.6-1.diff.gz
* sisu_manifest, added possibility of sharing of kdissert source, see sample:
http://www.jus.uio.no/sisu/kdissert.kdi/sisu_manifest
- and note the kdissert source file on which sisu markup and outputs are based:
- http://www.jus.uio.no/sisu/kdissert.kdi/kdissert.kdi
+ and note the kdissert source file on which sisu markup and outputs are
+ based: http://www.jus.uio.no/sisu/kdissert.kdi/kdissert.kdi
* kdissert fixes to make the following true:
@@ -2875,8 +2912,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.6.orig.tar.gz
* [issue spotted with rsync, new output directories, fix later]
-%% sisu_0.41.5.orig.tar.gz (2006w25/1 | 2006-06-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.5.orig.tar.gz
+** sisu_0.41.5.orig.tar.gz (2006w25/1 | 2006-06-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.5.orig.tar.gz
da50cd8f993761e8011386afcd8d2636 669069 sisu_0.41.5.orig.tar.gz
33e2fc91260a5131e60588729cbf0c67 631 sisu_0.41.5-1.dsc
d63fd861450216b66acf0295100c754d 98313 sisu_0.41.5-1.diff.gz
@@ -2892,8 +2929,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.5.orig.tar.gz
* renamed a couple of libraries related to file conversion
-%% sisu_0.41.4.orig.tar.gz (2006w24/7 | 2006-06-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.4.orig.tar.gz
+** sisu_0.41.4.orig.tar.gz (2006w24/7 | 2006-06-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.4.orig.tar.gz
4182ed0cd4d32beaa71e53028fdd17c5 667716 sisu_0.41.4.orig.tar.gz
4d1c95b8e8734adfa72ed7ca3dca443d 631 sisu_0.41.4-1.dsc
210daf7fd979a41b1a34db3918a68dbc 98286 sisu_0.41.4-1.diff.gz
@@ -2904,8 +2941,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.4.orig.tar.gz
Thomas Nagy is a topic/mind mapping tool for the preparation of documents
http://freehackers.org/~tnagy/kdissert/ )
-%% sisu_0.41.3.orig.tar.gz (2006w24/3 | 2006-06-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.3.orig.tar.gz
+** sisu_0.41.3.orig.tar.gz (2006w24/3 | 2006-06-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.3.orig.tar.gz
fc5f119deefab7cab8c226d8724d4f99 666605 sisu_0.41.3.orig.tar.gz
a64f86b41186e6edc039c960a41c2e1b 631 sisu_0.41.3-2.dsc [2006-06-15]
e3bab2d070567bed6e0c72762beb594b 98885 sisu_0.41.3-2.diff.gz
@@ -2921,8 +2958,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.3.orig.tar.gz
* info related to share source file and sisudoc, bug fix
-%% sisu_0.41.2.orig.tar.gz (2006w23/5 | 2006-06-09) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.2.orig.tar.gz
+** sisu_0.41.2.orig.tar.gz (2006w23/5 | 2006-06-09)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.2.orig.tar.gz
e98068cf061df4f428b40cfee984f593 666123 sisu_0.41.2.orig.tar.gz
55896e6fd677475b3af56b19d20fc33a 631 sisu_0.41.2-1.dsc
d66cc73ca8fa3103a5de58903e99626c 98220 sisu_0.41.2-1.diff.gz
@@ -2938,8 +2976,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.2.orig.tar.gz
* plaintext, small fix, document metadata
-%% sisu_0.41.1.orig.tar.gz (2006w23/3 | 2006-06-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.1.orig.tar.gz
+** sisu_0.41.1.orig.tar.gz (2006w23/3 | 2006-06-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.1.orig.tar.gz
e8c3381acb10e678e167755181380091 665743 sisu_0.41.1.orig.tar.gz
116ee32633631a305307f59eef4f32e9 631 sisu_0.41.1-1.dsc
fef43880a4b0c0ce68ca269b19108216 98204 sisu_0.41.1-1.diff.gz
@@ -2956,8 +2994,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.1.orig.tar.gz
sisu --convert=to38 -h autonomy_markup0.sst gpl2.fsf.sst
-%% sisu_0.41.0.orig.tar.gz (2006w22/6 | 2006-06-03)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.0.orig.tar.gz
+** sisu_0.41.0.orig.tar.gz (2006w22/6 | 2006-06-03)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.0.orig.tar.gz
b35ae1c9380d3ec94db8f97950e32a82 665634 sisu_0.41.0.orig.tar.gz
bd2e6542cd3dba16d0489155d1b4e7d5 631 sisu_0.41.0-1.dsc
e1d2948368753d4880c8ba9efcb2a651 98182 sisu_0.41.0-1.diff.gz
@@ -2988,8 +3026,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.0.orig.tar.gz
* texpdf, command line parameter may be used to change paper size output
sisu -p --papersize='book' [filename]
- preset sizes include: 'A4', U.S. 'letter' and 'legal' and 'book' sizes 'A5'
- and 'B5' (system defaults to A4).
+ preset sizes include: 'A4', U.S. 'letter' and 'legal' and 'book' sizes
+ 'A5' and 'B5' (system defaults to A4).
* texpdf, image resizing for different paper sizes
(useful when offering on the fly alternative document dimension processing)
@@ -3006,8 +3044,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.41.0.orig.tar.gz
selection of whatever size over-writes the other, as they are saved to the
same file-name]
-%% sisu_0.40.4.orig.tar.gz (2006w21/7 | 2006-05-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.4.orig.tar.gz
+** sisu_0.40.4.orig.tar.gz (2006w21/7 | 2006-05-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.4.orig.tar.gz
4266b03409162c68322b054fda599134 664267 sisu_0.40.4.orig.tar.gz
009e41731e25ddfde8e685998432d795 631 sisu_0.40.4-1.dsc
4469b7acab1e00ac9b4fcdf5ae384edb 98011 sisu_0.40.4-1.diff.gz
@@ -3016,8 +3054,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.4.orig.tar.gz
* package source directory renamed with underscore instead of hyphen
-%% sisu_0.40.3.orig.tar.gz (2006w21/3 | 2006-05-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.3.orig.tar.gz
+** sisu_0.40.3.orig.tar.gz (2006w21/3 | 2006-05-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.3.orig.tar.gz
f67f66e42617dd2c0cd8d28cfa95e217 663690 sisu_0.40.3.orig.tar.gz
2280c18cbb60c671a06e0b2dced435af 631 sisu_0.40.3-1.dsc
84cb50d042b87fc19e42b156a27480a4 97951 sisu_0.40.3-1.diff.gz
@@ -3027,8 +3065,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.3.orig.tar.gz
* rant installer checked, removed sisu-examples, and post install routine as
document samples are now packaged separately as sisu-markup-samples
-%% sisu_0.40.2.orig.tar.gz (2006w21/3 | 2006-05-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.2.orig.tar.gz
+** sisu_0.40.2.orig.tar.gz (2006w21/3 | 2006-05-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.2.orig.tar.gz
e792de16cb6acbe2cabe3c650eef47ce 665085 sisu_0.40.2.orig.tar.gz
76c87061052e430d8d8ac0cfad4a2168 631 sisu_0.40.2-1.dsc
eee774779cb3a15cb164c032de5ae4cc 97904 sisu_0.40.2-1.diff.gz
@@ -3039,8 +3077,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.2.orig.tar.gz
* correction to apt sources.list information provided in this document for
0.40.1, and updated in README
-%% sisu_0.40.1.orig.tar.gz (2006w21/1 | 2006-05-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.1.orig.tar.gz
+** sisu_0.40.1.orig.tar.gz (2006w21/1 | 2006-05-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.1.orig.tar.gz
86b2c25a8bccb0ecb38f0e1fe11aa522 664295 sisu_0.40.1.orig.tar.gz
3a2a198b18847ebf6ccf30278848e354 631 sisu_0.40.1-1.dsc
85d6478dd001f19f7e3d126a47d85aea 97880 sisu_0.40.1-1.diff.gz
@@ -3058,8 +3096,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.1.orig.tar.gz
deb-src http://www.jus.uio.no/sisu/pkg_priv ./src/
]
-%% sisu_0.40.0.orig.tar.gz (2006w20/7 | 2006-05-21)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.0.orig.tar.gz
+** sisu_0.40.0.orig.tar.gz (2006w20/7 | 2006-05-21)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.0.orig.tar.gz
cfaa83c0f7a55a143b50865d72338442 663916 sisu_0.40.0.orig.tar.gz
5d0801b203e3d76f46b676676226d537 631 sisu_0.40.0-1.dsc
68e6d68b871920b372a20ca8ba479b55 97850 sisu_0.40.0-1.diff.gz
@@ -3082,8 +3120,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.40.0.orig.tar.gz
* [mention of use of reprepro in this release was premature, see sisu-0.40.1]
-%% sisu_0.39.3.orig.tar.gz (2006w19/7 | 2006-05-14) [Debian Release snapshot, uploaded by Wookey (at Debconf 6, in Queue new till replaced)]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.3.orig.tar.gz
+** sisu_0.39.3.orig.tar.gz (2006w19/7 | 2006-05-14)
+ [Debian Release snapshot, uploaded by Wookey (at Debconf 6, in Queue new till
+ replaced)]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.3.orig.tar.gz
6eadfbf37cbaf43fbae49dc2b71209d2 3406768 sisu_0.39.3.orig.tar.gz
cfca428562370b9b2672fc8f7f0b7840 647 sisu_0.39.3-1.dsc
8338ef32ecb203bf0328f7f4eb71857a 95295 sisu_0.39.3-1.diff.gz
@@ -3092,8 +3132,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.3.orig.tar.gz
the introduction of some undesirable artifacts, (actually a change in
sequence, some risk of need for further modification)
-%% sisu_0.39.2.orig.tar.gz (2006w19/5 | 2006-05-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.2.orig.tar.gz
+** sisu_0.39.2.orig.tar.gz (2006w19/5 | 2006-05-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.2.orig.tar.gz
e80aae7a5733dbbee6545cb7ff0f9633 3406402 sisu_0.39.2.orig.tar.gz
adde80ce35b3258feb199a65ccb5be88 647 sisu_0.39.2-1.dsc
f8ffdfb51016cae9f150e95b7d92f177 95226 sisu_0.39.2-1.diff.gz
@@ -3109,8 +3149,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.2.orig.tar.gz
vim 7 in debian includes filetypes, syntax, and color, removed
vim-sisu includes ftplugin
-%% sisu_0.39.1.orig.tar.gz (2006w19/1 | 2006-05-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.1.orig.tar.gz
+** sisu_0.39.1.orig.tar.gz (2006w19/1 | 2006-05-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.1.orig.tar.gz
bb72b981ace449a4803aaad879398266 3405744 sisu_0.39.1.orig.tar.gz
acc111aae4ebf5485e3ae4740ebeab52 647 sisu_0.39.1-1.dsc
9094b6e51890fbeb2789365add613143 95128 sisu_0.39.1-1.diff.gz
@@ -3120,8 +3160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.1.orig.tar.gz
as local or remote, some regexes did not take into account this change, one
in metaverse also addressed, (issue likely from 0.38.8 till this fix)]
-%% sisu_0.39.0.orig.tar.gz (2006w19/1 | 2006-05-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.0.orig.tar.gz
+** sisu_0.39.0.orig.tar.gz (2006w19/1 | 2006-05-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.0.orig.tar.gz
3c043d2f1356527686a72cd82858d7be 3405229 sisu_0.39.0.orig.tar.gz
e1d17b525cf81dceefbb0c81d27aca76 647 sisu_0.39.0-1.dsc
3657f7538d1cbd23c8b40d3e32862afd 95097 sisu_0.39.0-1.diff.gz
@@ -3146,20 +3186,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.39.0.orig.tar.gz
* debian policy standards-version back 3.7.0 ... (should be 3.7.2 but
lintian and linda not up to date this instant)
-%% sisu_0.38.10.orig.tar.gz (2006w18/5 | 2006-05-05) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.10.orig.tar.gz
-3bc28f808280673e2f8b86dfe071a53a 3402660 sisu_0.38.10.orig.tar.gz
-6c930e4ea4e3b41388bb61c9b6aad7ac 650 sisu_0.38.10-2.dsc
-43717b69a0bf29cbd810a0c36066fb2e 95761 sisu_0.38.10-2.diff.gz
+** sisu_0.38.10.orig.tar.gz (2006w18/5 | 2006-05-05)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.10.orig.tar.gz
+ 3bc28f808280673e2f8b86dfe071a53a 3402660 sisu_0.38.10.orig.tar.gz
+ 6c930e4ea4e3b41388bb61c9b6aad7ac 650 sisu_0.38.10-2.dsc
+ 43717b69a0bf29cbd810a0c36066fb2e 95761 sisu_0.38.10-2.diff.gz
* rebuilt using debian standards version 3.7.2
(previous build used 3.7.0)
-%% sisu_0.38.10.orig.tar.gz (2006w18/4 | 2006-05-04)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.10.orig.tar.gz
-3bc28f808280673e2f8b86dfe071a53a 3402660 sisu_0.38.10.orig.tar.gz
-26c4ae2cca2e1b22e826834fcd4c135b 650 sisu_0.38.10-1.dsc
-2e17298545f1afb64d6258fb7f732be8 94904 sisu_0.38.10-1.diff.gz
+** sisu_0.38.10.orig.tar.gz (2006w18/4 | 2006-05-04)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.10.orig.tar.gz
+ 3bc28f808280673e2f8b86dfe071a53a 3402660 sisu_0.38.10.orig.tar.gz
+ 26c4ae2cca2e1b22e826834fcd4c135b 650 sisu_0.38.10-1.dsc
+ 2e17298545f1afb64d6258fb7f732be8 94904 sisu_0.38.10-1.diff.gz
* minor fixes, need resulting from default removal of ._sst temporary files
(master documents:processed composite documents:temporary files)
@@ -3173,11 +3214,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.10.orig.tar.gz
* vim ftplugin, minor irritation with vim folds sorted
-%% sisu_0.38.9.orig.tar.gz (2006w18/3 | 2006-05-03)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.9.orig.tar.gz
-f513d112435ff923e5197a5f5875c58a 3402148 sisu_0.38.9.orig.tar.gz
-317ff04be060a534cc9ddaf356ebbe79 647 sisu_0.38.9-1.dsc
-1b389daf0e1f52c6c1cc88bb48aaba0c 94879 sisu_0.38.9-1.diff.gz
+** sisu_0.38.9.orig.tar.gz (2006w18/3 | 2006-05-03)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.9.orig.tar.gz
+ f513d112435ff923e5197a5f5875c58a 3402148 sisu_0.38.9.orig.tar.gz
+ 317ff04be060a534cc9ddaf356ebbe79 647 sisu_0.38.9-1.dsc
+ 1b389daf0e1f52c6c1cc88bb48aaba0c 94879 sisu_0.38.9-1.diff.gz
* sisupod/ sisu_doc, .ssm, renamed sisupod.tgz. Master document pod now
contains the composite elements of the master, .ssm and .ssi files rather
@@ -3215,16 +3256,16 @@ f513d112435ff923e5197a5f5875c58a 3402148 sisu_0.38.9.orig.tar.gz
* debian 'Standards' version changed to 3.7.0
-NOTE DISCARDED BUILD -{6d2149ba45d601347d9562edc2995fe7 3401901
-sisu_0.38.9.orig.tar.gz}- -{b96ce1d8b5801c1e2ffa12eddbb1850a 647
-sisu_0.38.9-1.dsc}- -{ee7182ffdca58bd94dec3d07d4ccb9f8 94874
-sisu_0.38.9-1.diff.gz}-
+ NOTE DISCARDED BUILD -{6d2149ba45d601347d9562edc2995fe7 3401901
+ sisu_0.38.9.orig.tar.gz}- -{b96ce1d8b5801c1e2ffa12eddbb1850a 647
+ sisu_0.38.9-1.dsc}- -{ee7182ffdca58bd94dec3d07d4ccb9f8 94874
+ sisu_0.38.9-1.diff.gz}-
-%% sisu_0.38.8.orig.tar.gz (2006w17/6 | 2006-04-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.8.orig.tar.gz
-9c1df6c4524fa3a047ca566b779f6600 3398443 sisu_0.38.8.orig.tar.gz
-7514ebf71f95c0d3dd99d2355ad65fc0 647 sisu_0.38.8-1.dsc
-63ae62d331f23a5f79819656e345ef8f 94794 sisu_0.38.8-1.diff.gz
+** sisu_0.38.8.orig.tar.gz (2006w17/6 | 2006-04-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.8.orig.tar.gz
+ 9c1df6c4524fa3a047ca566b779f6600 3398443 sisu_0.38.8.orig.tar.gz
+ 7514ebf71f95c0d3dd99d2355ad65fc0 647 sisu_0.38.8-1.dsc
+ 63ae62d331f23a5f79819656e345ef8f 94794 sisu_0.38.8-1.diff.gz
* images, in particular to do with remote sisu markup source
e.g. sisu -3
@@ -3240,11 +3281,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.8.orig.tar.gz
* (html_tune, some renaming which could cause breaks)
-%% sisu_0.38.7.orig.tar.gz (2006w17/4 | 2006-04-27)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.7.orig.tar.gz
-39bf0e31035f4a97259e2b077835b7bc 3397454 sisu_0.38.7.orig.tar.gz
-b37cba6a7ef7436dc9b4f95648d12a0d 647 sisu_0.38.7-1.dsc
-75aa4afefc0bf8867de5498c6b9642fe 94763 sisu_0.38.7-1.diff.gz
+** sisu_0.38.7.orig.tar.gz (2006w17/4 | 2006-04-27)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.7.orig.tar.gz
+ 39bf0e31035f4a97259e2b077835b7bc 3397454 sisu_0.38.7.orig.tar.gz
+ b37cba6a7ef7436dc9b4f95648d12a0d 647 sisu_0.38.7-1.dsc
+ 75aa4afefc0bf8867de5498c6b9642fe 94763 sisu_0.38.7-1.diff.gz
* sisu, code rearrangement, relatively minor, /usr/bin contains require only
@@ -3255,11 +3296,11 @@ b37cba6a7ef7436dc9b4f95648d12a0d 647 sisu_0.38.7-1.dsc
* (html, sub_toc fix for pg texts)
-%% sisu_0.38.6.orig.tar.gz (2006w17/2 | 2006-04-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.6.orig.tar.gz
-d01345fe0748ea24af2e206648be1df0 3397003 sisu_0.38.6.orig.tar.gz
-a3819708b447aa1391c923847bc5f868 647 sisu_0.38.6-1.dsc
-fa4f965f92835dccbdcadfbabc29528e 94717 sisu_0.38.6-1.diff.gz
+** sisu_0.38.6.orig.tar.gz (2006w17/2 | 2006-04-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.6.orig.tar.gz
+ d01345fe0748ea24af2e206648be1df0 3397003 sisu_0.38.6.orig.tar.gz
+ a3819708b447aa1391c923847bc5f868 647 sisu_0.38.6-1.dsc
+ fa4f965f92835dccbdcadfbabc29528e 94717 sisu_0.38.6-1.diff.gz
* a glance forward at ruby 1.9, some early tests passed
[ruby 1.9.0 (2006-04-21)]
@@ -3270,11 +3311,11 @@ fa4f965f92835dccbdcadfbabc29528e 94717 sisu_0.38.6-1.diff.gz
* concordance, wordmaps renamed
-%% sisu_0.38.5.orig.tar.gz (2006w16/7 | 2006-04-23)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.5.orig.tar.gz
-b9eae129c6a86c89398a3af5170a22a8 3396296 sisu_0.38.5.orig.tar.gz
-8a559bc917ef9bb082c46949cc77ac53 647 sisu_0.38.5-1.dsc
-2f4ea49bd593d5557b9043b354335181 94686 sisu_0.38.5-1.diff.gz
+** sisu_0.38.5.orig.tar.gz (2006w16/7 | 2006-04-23)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.5.orig.tar.gz
+ b9eae129c6a86c89398a3af5170a22a8 3396296 sisu_0.38.5.orig.tar.gz
+ 8a559bc917ef9bb082c46949cc77ac53 647 sisu_0.38.5-1.dsc
+ 2f4ea49bd593d5557b9043b354335181 94686 sisu_0.38.5-1.diff.gz
* primarily a new debian build as lintian 1.23.17 "published"
yesterday, complains about existing builds
@@ -3282,11 +3323,12 @@ b9eae129c6a86c89398a3af5170a22a8 3396296 sisu_0.38.5.orig.tar.gz
* vim ftplugin, folds, another minor modification
[without which would have been built as 0.38.4-2]
-%% sisu_0.38.4.orig.tar.gz (2006w16/5 | 2006-04-21) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.4.orig.tar.gz
-84d5e911d17aaf6a360972acd5bb3a3f 3395161 sisu_0.38.4.orig.tar.gz
-60aa30b124edcd87a622f2a895f3c1a5 647 sisu_0.38.4-1.dsc
-7aeae2641bf9b3968a08bb8fb9eeb8e2 94665 sisu_0.38.4-1.diff.gz
+** sisu_0.38.4.orig.tar.gz (2006w16/5 | 2006-04-21)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.4.orig.tar.gz
+ 84d5e911d17aaf6a360972acd5bb3a3f 3395161 sisu_0.38.4.orig.tar.gz
+ 60aa30b124edcd87a622f2a895f3c1a5 647 sisu_0.38.4-1.dsc
+ 7aeae2641bf9b3968a08bb8fb9eeb8e2 94665 sisu_0.38.4-1.diff.gz
* param, fix, correction to a condition for setting markup type to 'rad'
(0.38)
@@ -3297,30 +3339,31 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.4.orig.tar.gz
* vim ftplugin, folds, minor modification
-%% sisu_0.38.3.orig.tar.gz (2006w16/4 | 2006-04-20) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.3.orig.tar.gz
-aacb2696144a0d91da658266bff34010 3394702 sisu_0.38.3.orig.tar.gz
-85ad80241d8be30c15af31979d4ed69e 647 sisu_0.38.3-1.dsc
-8e3044976461dce97d78601f0f073c0a 94622 sisu_0.38.3-1.diff.gz
+** sisu_0.38.3.orig.tar.gz (2006w16/4 | 2006-04-20)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.3.orig.tar.gz
+ aacb2696144a0d91da658266bff34010 3394702 sisu_0.38.3.orig.tar.gz
+ 85ad80241d8be30c15af31979d4ed69e 647 sisu_0.38.3-1.dsc
+ 8e3044976461dce97d78601f0f073c0a 94622 sisu_0.38.3-1.diff.gz
* convert, refinement in 0.37 to 0.38 and back, required.
* sample documents, header 'markup' not very descriptive, 'level' preferred,
but not ideal either..., changed though accordingly
-%% sisu_0.38.2.orig.tar.gz (2006w16/3 | 2006-04-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.2.orig.tar.gz
-b7183828d8debf7dfeb671c44fcf984d 3394425 sisu_0.38.2.orig.tar.gz
-6e4c33da7880dede7de035f53003388e 647 sisu_0.38.2-1.dsc
-1df895d8457cf0e2a90c70536c65a5c9 94598 sisu_0.38.2-1.diff.gz
+** sisu_0.38.2.orig.tar.gz (2006w16/3 | 2006-04-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.2.orig.tar.gz
+ b7183828d8debf7dfeb671c44fcf984d 3394425 sisu_0.38.2.orig.tar.gz
+ 6e4c33da7880dede7de035f53003388e 647 sisu_0.38.2-1.dsc
+ 1df895d8457cf0e2a90c70536c65a5c9 94598 sisu_0.38.2-1.diff.gz
* --identify ; --convert ; --query ; minor adjustments
-%% sisu_0.38.1.orig.tar.gz (2006w16/1 | 2006-04-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.1.orig.tar.gz
-6d6a57fb0671c0740abdd75389c8255e 3393572 sisu_0.38.1.orig.tar.gz
-db731e962a0e6553602a978addc49933 647 sisu_0.38.1-1.dsc
-7601b42bb90e739bdac0c65e4a46d753 94579 sisu_0.38.1-1.diff.gz
+** sisu_0.38.1.orig.tar.gz (2006w16/1 | 2006-04-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.1.orig.tar.gz
+ 6d6a57fb0671c0740abdd75389c8255e 3393572 sisu_0.38.1.orig.tar.gz
+ db731e962a0e6553602a978addc49933 647 sisu_0.38.1-1.dsc
+ 7601b42bb90e739bdac0c65e4a46d753 94579 sisu_0.38.1-1.diff.gz
* sisu --convert [filename/wildcard] converts between 0.38 and 0.37 markup
(which is substantially the same as 0.16 markup, only the file names
@@ -3340,11 +3383,11 @@ db731e962a0e6553602a978addc49933 647 sisu_0.38.1-1.dsc
* vim syntax minor touch
-%% sisu_0.38.0.orig.tar.gz (2006w15/7 | 2006-04-16)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.0.orig.tar.gz
-ed0af7fd0c4b05301642422bd95647cc 3388111 sisu_0.38.0.orig.tar.gz
-e8611c3610409c083c92d76da8c8ef6d 647 sisu_0.38.0-1.dsc
-5b9872b1b278bf8697d76350038bc47b 94504 sisu_0.38.0-1.diff.gz
+** sisu_0.38.0.orig.tar.gz (2006w15/7 | 2006-04-16)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.38.0.orig.tar.gz
+ ed0af7fd0c4b05301642422bd95647cc 3388111 sisu_0.38.0.orig.tar.gz
+ e8611c3610409c083c92d76da8c8ef6d 647 sisu_0.38.0-1.dsc
+ 5b9872b1b278bf8697d76350038bc47b 94504 sisu_0.38.0-1.diff.gz
Summary: there is some scope for breakage. preliminary tests passed new
markup introduced, as alternative, existing markup is not affected - new
@@ -3446,19 +3489,19 @@ e8611c3610409c083c92d76da8c8ef6d 647 sisu_0.38.0-1.dsc
0.37 introduces NEW FILE-NAME EXTENSIONS rename 's/\.s[123]$/\.sst/' *.s{1,2,3}
rename 's/\.r[123]$/\.ssm/' *.r{1,2,3} rename 's/\.si$/\.ssi/' *.si
-%% sisu_0.37.12.orig.tar.gz (2006w14/7 | 2006-04-09)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.12.orig.tar.gz
-cf6d1cc419522f353e8b3e1f0c01afa6 3351564 sisu_0.37.12.orig.tar.gz
-31f19920cceee8a8212c12ba5eb62ffe 650 sisu_0.37.12-1.dsc
-73693cb634ddae10ebef21ddeffb0c26 93059 sisu_0.37.12-1.diff.gz
+** sisu_0.37.12.orig.tar.gz (2006w14/7 | 2006-04-09)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.12.orig.tar.gz
+ cf6d1cc419522f353e8b3e1f0c01afa6 3351564 sisu_0.37.12.orig.tar.gz
+ 31f19920cceee8a8212c12ba5eb62ffe 650 sisu_0.37.12-1.dsc
+ 73693cb634ddae10ebef21ddeffb0c26 93059 sisu_0.37.12-1.diff.gz
* vim syntax highlighting file, further testing
-%% sisu_0.37.11.orig.tar.gz (2006w14/7 | 2006-04-09)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.11.orig.tar.gz
-7004d8060065f8c4f6108a7d8ba3b825 3350939 sisu_0.37.11.orig.tar.gz
-e8ff904f31207140cbc35802c710b3ee 650 sisu_0.37.11-1.dsc
-73a9275c43abfbee672d15b60262eb1c 93046 sisu_0.37.11-1.diff.gz
+** sisu_0.37.11.orig.tar.gz (2006w14/7 | 2006-04-09)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.11.orig.tar.gz
+ 7004d8060065f8c4f6108a7d8ba3b825 3350939 sisu_0.37.11.orig.tar.gz
+ e8ff904f31207140cbc35802c710b3ee 650 sisu_0.37.11-1.dsc
+ 73a9275c43abfbee672d15b60262eb1c 93046 sisu_0.37.11-1.diff.gz
* vim related files, cleaning
(filetype.vim, syntax/sisu.vim ftplugin/sisu.vim & colors/slate.vim)
@@ -3470,31 +3513,31 @@ e8ff904f31207140cbc35802c710b3ee 650 sisu_0.37.11-1.dsc
(and sysenv remote host rescue so works when machine is offline): 'sisu
help env'
-%% sisu_0.37.10.orig.tar.gz (2006w14/4 | 2006-04-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.10.orig.tar.gz
-416094f2d0e04e1a5c38df6a321712e3 3350639 sisu_0.37.10.orig.tar.gz
-d7f836eec596a99db9bcbd8a21ebb885 650 sisu_0.37.10-1.dsc
-a70a47001d321c3429eee72b0e0e7ea6 93016 sisu_0.37.10-1.diff.gz
+** sisu_0.37.10.orig.tar.gz (2006w14/4 | 2006-04-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.10.orig.tar.gz
+ 416094f2d0e04e1a5c38df6a321712e3 3350639 sisu_0.37.10.orig.tar.gz
+ d7f836eec596a99db9bcbd8a21ebb885 650 sisu_0.37.10-1.dsc
+ a70a47001d321c3429eee72b0e0e7ea6 93016 sisu_0.37.10-1.diff.gz
* vim related files, cleaning
(filetype.vim, syntax/sisu.vim ftplugin/sisu.vim & colors/slate.vim)
-%% sisu_0.37.9.orig.tar.gz (2006w13/6 | 2006-04-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.9.orig.tar.gz
-4d546c58a828821baf2463a8fa75d3d9 3350076 sisu_0.37.9.orig.tar.gz
-886fd0492b54340111fead7edb20b250 649 sisu_0.37.9-1.dsc
-d080e93446a7304e6fa699ffaec8cd80 92985 sisu_0.37.9-1.diff.gz
+** sisu_0.37.9.orig.tar.gz (2006w13/6 | 2006-04-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.9.orig.tar.gz
+ 4d546c58a828821baf2463a8fa75d3d9 3350076 sisu_0.37.9.orig.tar.gz
+ 886fd0492b54340111fead7edb20b250 649 sisu_0.37.9-1.dsc
+ d080e93446a7304e6fa699ffaec8cd80 92985 sisu_0.37.9-1.diff.gz
* vim related files, cleaning
(filetype.vim, syntax/sisu.vim ftplugin/sisu.vim & colors/slate.vim)
* db common, fix for table representation
-%% sisu_0.37.8.orig.tar.gz (2006w12/6 | 2006-03-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.8.orig.tar.gz
-60a8f59bb38a43f6de2018a0ce150a60 3353064 sisu_0.37.8.orig.tar.gz
-4782c9516557f93bf8aedea985068e14 649 sisu_0.37.8-1.dsc
-b667a88206342970a051734073f7b791 92945 sisu_0.37.8-1.diff.gz
+** sisu_0.37.8.orig.tar.gz (2006w12/6 | 2006-03-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.8.orig.tar.gz
+ 60a8f59bb38a43f6de2018a0ce150a60 3353064 sisu_0.37.8.orig.tar.gz
+ 4782c9516557f93bf8aedea985068e14 649 sisu_0.37.8-1.dsc
+ b667a88206342970a051734073f7b791 92945 sisu_0.37.8-1.diff.gz
* screen text ansi color turned off by default, (color does not suit all
terms/consoles)
@@ -3521,31 +3564,33 @@ b667a88206342970a051734073f7b791 92945 sisu_0.37.8-1.diff.gz
* help, added a bit of 'environment' information, [expand further as needed]
sisu --help env
-%% sisu_0.37.7.orig.tar.gz (2006w12/4 | 2006-03-23)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.7.orig.tar.gz
-246a94c92f19e0640f6b5cf368ec6bd1 3351292 sisu_0.37.7.orig.tar.gz
-eefac162286ca49563b20692536a6092 649 sisu_0.37.7-1.dsc
-6794d8e1f5593fae1c920e301fd59fd7 92902 sisu_0.37.7-1.diff.gz
+** sisu_0.37.7.orig.tar.gz (2006w12/4 | 2006-03-23)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.7.orig.tar.gz
+ 246a94c92f19e0640f6b5cf368ec6bd1 3351292 sisu_0.37.7.orig.tar.gz
+ eefac162286ca49563b20692536a6092 649 sisu_0.37.7-1.dsc
+ 6794d8e1f5593fae1c920e301fd59fd7 92902 sisu_0.37.7-1.diff.gz
* common_db, fix affecting pgsql for endnotes in heading levels 1-3
[relational db catch-up with footnote fix in 0.36.24]
-%% sisu_0.37.6.orig.tar.gz (2006w12/4 | 2006-03-23) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.6.orig.tar.gz
-f0623474f1635d87f0d5674e0d3ae927 3351023 sisu_0.37.6.orig.tar.gz
-c546a82203c685fe59be60ab5492fa96 649 sisu_0.37.6-1.dsc
-699b594457459248a22e2ed97e56c4f5 92886 sisu_0.37.6-1.diff.gz
+** sisu_0.37.6.orig.tar.gz (2006w12/4 | 2006-03-23)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.6.orig.tar.gz
+ f0623474f1635d87f0d5674e0d3ae927 3351023 sisu_0.37.6.orig.tar.gz
+ c546a82203c685fe59be60ab5492fa96 649 sisu_0.37.6-1.dsc
+ 699b594457459248a22e2ed97e56c4f5 92886 sisu_0.37.6-1.diff.gz
* sisu control, minor cleaning
* gedit/gobby syntax highlighting, very basic start, in:
sisu-examples/config/syntax_hi
-%% sisu_0.37.5.orig.tar.gz (2006w12/3 | 2006-03-22) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.5.orig.tar.gz
-9a03bbcea82c1625bad4a92d6498e408 3351422 sisu_0.37.5.orig.tar.gz
-46dca71f33c206dbff9b798f75733484 649 sisu_0.37.5-1.dsc
-d3c5ed96ca85254870e2500d2e3957a2 92863 sisu_0.37.5-1.diff.gz
+** sisu_0.37.5.orig.tar.gz (2006w12/3 | 2006-03-22)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.5.orig.tar.gz
+ 9a03bbcea82c1625bad4a92d6498e408 3351422 sisu_0.37.5.orig.tar.gz
+ 46dca71f33c206dbff9b798f75733484 649 sisu_0.37.5-1.dsc
+ d3c5ed96ca85254870e2500d2e3957a2 92863 sisu_0.37.5-1.diff.gz
* metaverse, digest: sha256 offered as alternative to md5
(configure in sisurc.yaml, md5 should be sufficient for most purposes and
@@ -3566,32 +3611,34 @@ d3c5ed96ca85254870e2500d2e3957a2 92863 sisu_0.37.5-1.diff.gz
* html, heading tag names #h dropped if heading starts with alphabet so e.g.:
#h1.2 but #linux [consider #h_linux]
-%% sisu_0.37.4.orig.tar.gz (2006w10/4 | 2006-03-09) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.4.orig.tar.gz
-22970c76bd545a4852076b958f288d0b 3350498 sisu_0.37.4.orig.tar.gz
-4add721933eaf0b4418e28b61937c837 647 sisu_0.37.4-1.dsc
-cd31e7f43b70bc8bbff7a53f8b96a540 92832 sisu_0.37.4-1.diff.gz
+** sisu_0.37.4.orig.tar.gz (2006w10/4 | 2006-03-09)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.4.orig.tar.gz
+ 22970c76bd545a4852076b958f288d0b 3350498 sisu_0.37.4.orig.tar.gz
+ 4add721933eaf0b4418e28b61937c837 647 sisu_0.37.4-1.dsc
+ cd31e7f43b70bc8bbff7a53f8b96a540 92832 sisu_0.37.4-1.diff.gz
* w3c compliance in html for: default homepage, document manifest, and
wordmap, (and check that renders properly in lynx, elinks, links2, w3m,
dillo as well as the rest)
-%% sisu_0.37.3.orig.tar.gz (2006w10/4 | 2006-03-09)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.3.orig.tar.gz
-a2f28400c4e741991cbca6c1239003a1 3350055 sisu_0.37.3.orig.tar.gz
-cce7e960ead1ff0fdc2fb4903cdefcd7 647 sisu_0.37.3-1.dsc
-acbada001ba115b5ac1c2f476a5b6d97 92809 sisu_0.37.3-1.diff.gz
+** sisu_0.37.3.orig.tar.gz (2006w10/4 | 2006-03-09)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.3.orig.tar.gz
+ a2f28400c4e741991cbca6c1239003a1 3350055 sisu_0.37.3.orig.tar.gz
+ cce7e960ead1ff0fdc2fb4903cdefcd7 647 sisu_0.37.3-1.dsc
+ acbada001ba115b5ac1c2f476a5b6d97 92809 sisu_0.37.3-1.diff.gz
* default home page, make sure that html is w3c compliant, (and renders in
lynx, elinks, links2, w3m, dillo as well as the rest)
* editors (other than vim already done) filetypes match new filenames
-%% sisu_0.37.2.orig.tar.gz (2006w10/2 | 2006-03-07) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.2.orig.tar.gz
-422703f270dd8a0df5ea6de38097708b 3356778 sisu_0.37.2.orig.tar.gz
-3669c92aa335a335f0e51a4566747862 647 sisu_0.37.2-1.dsc
-db86dcd03b1ca8c3b730331ba1df62b8 92772 sisu_0.37.2-1.diff.gz
+** sisu_0.37.2.orig.tar.gz (2006w10/2 | 2006-03-07)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.2.orig.tar.gz
+ 422703f270dd8a0df5ea6de38097708b 3356778 sisu_0.37.2.orig.tar.gz
+ 3669c92aa335a335f0e51a4566747862 647 sisu_0.37.2-1.dsc
+ db86dcd03b1ca8c3b730331ba1df62b8 92772 sisu_0.37.2-1.diff.gz
* filename extensions, reduce in number and rename processed
secondary/temporary files to make matching of editable files trivial *.ss?
@@ -3621,20 +3668,20 @@ db86dcd03b1ca8c3b730331ba1df62b8 92772 sisu_0.37.2-1.diff.gz
* filetypes.vim made to match (filename extensions)
-%% sisu_0.37.1.orig.tar.gz (2006w10/1 | 2006-03-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.1.orig.tar.gz
-50064bf4ca448ca512f0867342bda977 3355756 sisu_0.37.1.orig.tar.gz
-47cf73b44e96185a59eaf963ae832cf2 647 sisu_0.37.1-1.dsc
-89a542fc1f5eb054ad6f701e368d2829 92500 sisu_0.37.1-1.diff.gz
+** sisu_0.37.1.orig.tar.gz (2006w10/1 | 2006-03-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.1.orig.tar.gz
+ 50064bf4ca448ca512f0867342bda977 3355756 sisu_0.37.1.orig.tar.gz
+ 47cf73b44e96185a59eaf963ae832cf2 647 sisu_0.37.1-1.dsc
+ 89a542fc1f5eb054ad6f701e368d2829 92500 sisu_0.37.1-1.diff.gz
* cgi search forms in sisu-examples, updated to match filename extensions
[and to match 'sisu-F webrick' equivalent]
-%% sisu_0.37.0.orig.tar.gz (2006w09/7 | 2006-03-05)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.0.orig.tar.gz
-24760db51b627f553d57e6b8126a37b5 3355565 sisu_0.37.0.orig.tar.gz
-4cfb6fac0ac6179f1140389c38ef943b 647 sisu_0.37.0-1.dsc
-8ca3ac75f71e776aeffa9727adb6e185 92371 sisu_0.37.0-1.diff.gz
+** sisu_0.37.0.orig.tar.gz (2006w09/7 | 2006-03-05)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.0.orig.tar.gz
+ 24760db51b627f553d57e6b8126a37b5 3355565 sisu_0.37.0.orig.tar.gz
+ 4cfb6fac0ac6179f1140389c38ef943b 647 sisu_0.37.0-1.dsc
+ 8ca3ac75f71e776aeffa9727adb6e185 92371 sisu_0.37.0-1.diff.gz
WARNING: FILE RENAMING NECESSARY as file name extensions have been changed,
(there is scope for program breakage as a result, though preliminary tests
@@ -3712,11 +3759,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.37.0.orig.tar.gz
* cgi search form, postgresql, fix - create canned url etc., in line with
* what sqlite form does
-%% sisu_0.36.25.orig.tar.gz (2006w09/7 | 2006-03-05)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.25.orig.tar.gz
-c614a0f838c46065853ce8a70660df55 3355275 sisu_0.36.25.orig.tar.gz
-14bb8779affa6b1fe88bcdfeb81d2c35 650 sisu_0.36.25-1.dsc
-3091300f2045e946aff51a04beec9b77 91154 sisu_0.36.25-1.diff.gz
+** sisu_0.36.25.orig.tar.gz (2006w09/7 | 2006-03-05)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.25.orig.tar.gz
+ c614a0f838c46065853ce8a70660df55 3355275 sisu_0.36.25.orig.tar.gz
+ 14bb8779affa6b1fe88bcdfeb81d2c35 650 sisu_0.36.25-1.dsc
+ 3091300f2045e946aff51a04beec9b77 91154 sisu_0.36.25-1.diff.gz
[A Fix is Necessary will revisit]
@@ -3731,11 +3778,11 @@ c614a0f838c46065853ce8a70660df55 3355275 sisu_0.36.25.orig.tar.gz
redundant but a fairly common error that is highlighted as such in full),
needed for auto-markup match
-%% sisu_0.36.24.orig.tar.gz (2006w09/2 | 2006-02-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.24.orig.tar.gz
-f2a727ef111585efbb84fad7d131fdb0 3354247 sisu_0.36.24.orig.tar.gz
-109b804513271cc4b0da43d27dcef8ef 650 sisu_0.36.24-1.dsc
-95838c0b653fc987b69d76c4713015cc 91128 sisu_0.36.24-1.diff.gz
+** sisu_0.36.24.orig.tar.gz (2006w09/2 | 2006-02-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.24.orig.tar.gz
+ f2a727ef111585efbb84fad7d131fdb0 3354247 sisu_0.36.24.orig.tar.gz
+ 109b804513271cc4b0da43d27dcef8ef 650 sisu_0.36.24-1.dsc
+ 95838c0b653fc987b69d76c4713015cc 91128 sisu_0.36.24-1.diff.gz
* html, segmented, footnote in heading levels 1, 2, or 3, (deposit in first
segment 4 that follows), and clean heading of the footnote reference marker
@@ -3749,8 +3796,8 @@ f2a727ef111585efbb84fad7d131fdb0 3354247 sisu_0.36.24.orig.tar.gz
requirement are a bit latent and fairly dire..., add configuration file
escape of protection]
-%% sisu_0.36.23.orig.tar.gz (2006w09/1 | 2006-02-27)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.23.orig.tar.gz
+** sisu_0.36.23.orig.tar.gz (2006w09/1 | 2006-02-27)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.23.orig.tar.gz
c0677a4ae79820261fa28dd9e21c01ee 3354053 sisu_0.36.23.orig.tar.gz
65ff2fede20f8aeb10a9f6cd55089e21 650 sisu_0.36.23-1.dsc
51233be83917282cc1d13647902bd0f6 90413 sisu_0.36.23-1.diff.gz
@@ -3778,16 +3825,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.23.orig.tar.gz
* [sisu-examples, free_culture, minor adjustments to text]
-%% sisu_0.36.22.orig.tar.gz (2006w08/4 | 2006-02-23)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.22.orig.tar.gz
+** sisu_0.36.22.orig.tar.gz (2006w08/4 | 2006-02-23)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.22.orig.tar.gz
78d8d224b4db8985072b1806617b5ff0 3352595 sisu_0.36.22.orig.tar.gz
6b8caa7cbf4893111deb30ccd05fc680 650 sisu_0.36.22-1.dsc
b54396f9443c7f77a9c4ef695128a0bc 90388 sisu_0.36.22-1.diff.gz
* odf, footnote fix for url matches
-%% sisu_0.36.21.orig.tar.gz (2006w08/3 | 2006-02-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.21.orig.tar.gz
+** sisu_0.36.21.orig.tar.gz (2006w08/3 | 2006-02-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.21.orig.tar.gz
a8e7a6adf347c9b20965b3d19ad872a7 3352881 sisu_0.36.21.orig.tar.gz
b0ff57766149bf1dd63c002d4cba3a84 650 sisu_0.36.21-1.dsc
089441cf1a4f72e63772f037036a18be 90358 sisu_0.36.21-1.diff.gz
@@ -3797,16 +3844,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.21.orig.tar.gz
* html cosmetic, lower navigation band in scroll (doc.html), fix
-%% sisu_0.36.20.orig.tar.gz (2006w08/3 | 2006-02-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.20.orig.tar.gz
+** sisu_0.36.20.orig.tar.gz (2006w08/3 | 2006-02-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.20.orig.tar.gz
60c3775c4f553906118f01f5976c2d70 3352515 sisu_0.36.20.orig.tar.gz
264cb03dbd7a789568f70d94d117e56f 650 sisu_0.36.20-1.dsc
e4d05f5a543f53bfe4acac5fb7ea3b66 90313 sisu_0.36.20-1.diff.gz
* metaverse, fix required, issue introduced by 0.36.19, affected pdf
-%% sisu_0.36.19.orig.tar.gz (2006w08/3 | 2006-02-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.19.orig.tar.gz
+** sisu_0.36.19.orig.tar.gz (2006w08/3 | 2006-02-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.19.orig.tar.gz
3ff5116481aeb77583c4144a76f41589 3351726 sisu_0.36.19.orig.tar.gz
a096c23f194e748505432b4ea0ae2a2b 650 sisu_0.36.19-1.dsc
b6cedff150ad4a65aa85ad9e507a293b 90281 sisu_0.36.19-1.diff.gz
@@ -3817,8 +3864,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.19.orig.tar.gz
* odf hyperlinked text match, escape brackets within linked text, fix
-%% sisu_0.36.18.orig.tar.gz (2006w08/1 | 2006-02-20) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.18.orig.tar.gz
+** sisu_0.36.18.orig.tar.gz (2006w08/1 | 2006-02-20)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.18.orig.tar.gz
5d1e674fc8d61c703b8479c230abbe21 3351642 sisu_0.36.18.orig.tar.gz
4186636de25bb42888c519cd62891101 650 sisu_0.36.18-1.dsc
6f61755dc6baeb6b09aac52bba504616 90236 sisu_0.36.18-1.diff.gz
@@ -3826,8 +3874,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.18.orig.tar.gz
* cgi sample form, sql search improved
[development iterations necessary]
-%% sisu_0.36.17.orig.tar.gz (2006w07/7 | 2006-02-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.17.orig.tar.gz
+** sisu_0.36.17.orig.tar.gz (2006w07/7 | 2006-02-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.17.orig.tar.gz
3715d971d556c5eb4de10ccb8cae4857 3352507 sisu_0.36.17.orig.tar.gz
2667514040bbdb928c130b2e565aea18 650 sisu_0.36.17-1.dsc
f393dd1f8ba8b344aba976af2c92771e 90212 sisu_0.36.17-1.diff.gz
@@ -3835,8 +3883,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.17.orig.tar.gz
* cgi sample forms (sqlite), match highlighting made case insensitive
character 'i' added to two files in two places
-%% sisu_0.36.16.orig.tar.gz (2006w07/7 | 2006-02-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.16.orig.tar.gz
+** sisu_0.36.16.orig.tar.gz (2006w07/7 | 2006-02-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.16.orig.tar.gz
1d4ab63bb65308f27fc057e2c4f045de 3352304 sisu_0.36.16.orig.tar.gz
2215b97903545574fe57c8b413ac5ba1 650 sisu_0.36.16-1.dsc
5100b3d4bfb0eabf11cc3614e389005a 90196 sisu_0.36.16-1.diff.gz
@@ -3850,8 +3898,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.16.orig.tar.gz
sisu-examples/sample/cgi-bin/sisu_search_pgsql.cgi
sisu-examples/sample/cgi-bin/sisu_search_sqlite.cgi
-%% sisu_0.36.15.orig.tar.gz (2006w07/6 | 2006-02-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.15.orig.tar.gz
+** sisu_0.36.15.orig.tar.gz (2006w07/6 | 2006-02-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.15.orig.tar.gz
7daadfb8ea39c30c0bc2317e24a3ce17 3358917 sisu_0.36.15.orig.tar.gz
13501be6212b0fd7067f4fccd575d22e 650 sisu_0.36.15-1.dsc
12d5fcca3dfedf94d0f3360b06b78ffb 90169 sisu_0.36.15-1.diff.gz
@@ -3860,8 +3908,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.15.orig.tar.gz
order by output esp. for sqlite,
image paths rearranged
-%% sisu_0.36.14.orig.tar.gz (2006w07/6 | 2006-02-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.14.orig.tar.gz
+** sisu_0.36.14.orig.tar.gz (2006w07/6 | 2006-02-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.14.orig.tar.gz
bb206e160026ee8a0804a86191d088fc 3355327 sisu_0.36.14.orig.tar.gz
c3c8df68d3c9dea339fd18afce83f258 650 sisu_0.36.14-1.dsc
dcbdde8b5401d7aa2ea08cf30d2a4202 90155 sisu_0.36.14-1.diff.gz
@@ -3876,8 +3924,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.14.orig.tar.gz
* metaverse, sanitize ’ character
-%% sisu_0.36.13.orig.tar.gz (2006w06/7 | 2006-02-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.13.orig.tar.gz
+** sisu_0.36.13.orig.tar.gz (2006w06/7 | 2006-02-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.13.orig.tar.gz
7a4aa2e929e19df900f18b96ae1d5de6 3286170 sisu_0.36.13.orig.tar.gz
92cde921735e33b3a781c2632470b721 650 sisu_0.36.13-1.dsc
7a4aa2e929e19df900f18b96ae1d5de6 3286170 sisu_0.36.13-1.diff.gz
@@ -3889,8 +3937,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.13.orig.tar.gz
* minor, one spelling correction in free_as_in_freedom
-%% sisu_0.36.12.orig.tar.gz (2006w06/4 | 2006-02-09) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.12.orig.tar.gz
+** sisu_0.36.12.orig.tar.gz (2006w06/4 | 2006-02-09)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.12.orig.tar.gz
0e5ca6878d119dafc6652b4f3dd0fb24 3285735 sisu_0.36.12.orig.tar.gz
01ecb4df7879f576e284339abc6b49e2 650 sisu_0.36.12-1.dsc
8fe27729103af5a5cbddc26a89d7522e 90101 sisu_0.36.12-1.diff.gz
@@ -3901,16 +3950,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.12.orig.tar.gz
* digests/dcc, added info, minor
-%% sisu_0.36.11.orig.tar.gz (2006w06/4 | 2006-02-09)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.11.orig.tar.gz
+** sisu_0.36.11.orig.tar.gz (2006w06/4 | 2006-02-09)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.11.orig.tar.gz
31749714603f3730a5589eb736e26cab 3284870 sisu_0.36.11.orig.tar.gz
49a9807d5b7cf436a303de1c8f7100d1 650 sisu_0.36.11-1.dsc
79301acf6b43364639f34e2baa5697c3 90088 sisu_0.36.11-1.diff.gz
* digest/dcc, further tuning of output presentation (digest.txt)
-%% sisu_0.36.10.orig.tar.gz (2006w06/3 | 2006-02-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.10.orig.tar.gz
+** sisu_0.36.10.orig.tar.gz (2006w06/3 | 2006-02-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.10.orig.tar.gz
672259d2176c1fa5bba0414493d74970 3284698 sisu_0.36.10.orig.tar.gz
da64e5f067408b6db1ffac97649e246b 650 sisu_0.36.10-1.dsc
25000b7faf86e44ccdb65b9c9bc0a42d 90073 sisu_0.36.10-1.diff.gz
@@ -3926,8 +3975,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.10.orig.tar.gz
* home page, in default and skins, minor change
-%% sisu_0.36.9.orig.tar.gz (2006w06/2 | 2006-02-07) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.9.orig.tar.gz
+** sisu_0.36.9.orig.tar.gz (2006w06/2 | 2006-02-07)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.9.orig.tar.gz
e76442aac4a8cdd7492ad167dca41925 3282776 sisu_0.36.9.orig.tar.gz
eedec4d07f05ea60143d87fe0b7a4d98 647 sisu_0.36.9-1.dsc
565b0a6b88f2eda2dcd22284e5d6ff72 90040 sisu_0.36.9-1.diff.gz
@@ -3937,8 +3987,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.9.orig.tar.gz
assumed that param is always parsed]
[solution not elegant, but likely to remain a while]
-%% sisu_0.36.8.orig.tar.gz (2006w06/1 | 2006-02-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.8.orig.tar.gz
+** sisu_0.36.8.orig.tar.gz (2006w06/1 | 2006-02-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.8.orig.tar.gz
9ed1bf836f160a2bc1b731f28603b546 3281967 sisu_0.36.8.orig.tar.gz
6284e201cc9cf8c0eccf7e25ac7d3868 647 sisu_0.36.8-1.dsc
bc6c9675bfc3e14ef1a44b0b93d9cf6f 90003 sisu_0.36.8-1.diff.gz
@@ -3954,8 +4004,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.8.orig.tar.gz
language code all documents are copied, which results in
duplication]
-%% sisu_0.36.7.orig.tar.gz (2006w05/7 | 2006-02-05)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.7.orig.tar.gz
+** sisu_0.36.7.orig.tar.gz (2006w05/7 | 2006-02-05)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.7.orig.tar.gz
b803f347a64d0419965e194f380988fe 3281398 sisu_0.36.7.orig.tar.gz
d07542cb5d8789af37a89db8b5ef2753 647 sisu_0.36.7-1.dsc
9cda1006001769a03a22245499ebc321 89967 sisu_0.36.7-1.diff.gz
@@ -3975,8 +4025,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.7.orig.tar.gz
* skins, minor edits, path to css corrected
-%% sisu_0.36.6.orig.tar.gz (2006w05/6 | 2006-02-04)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.6.orig.tar.gz
+** sisu_0.36.6.orig.tar.gz (2006w05/6 | 2006-02-04)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.6.orig.tar.gz
490413665dc030ac80eafde61d816aa0 3280852 sisu_0.36.6.orig.tar.gz
5823740759b6c1cd7af9f0427f5e5446 647 sisu_0.36.6-1.dsc
fcc375a5464c65be9a665d600b7b775a 89943 sisu_0.36.6-1.diff.gz
@@ -3984,7 +4034,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.6.orig.tar.gz
* html (some w3c compliance steps) [2006-01-15]:
* object "id" number names changed, preceded by letter o
* use of name tag to give objects numbers (instead of id for numeric value)
- * footnote links changed (use of underscore (instead of tilde not permitted))
+ * footnote links changed (use of underscore (instead of tilde not
+ permitted))
* image tags "closed"
* skin adjustment
* finally reinstate w3c transitional xhtml header
@@ -4028,7 +4079,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.6.orig.tar.gz
* texpdf special character vertical bar / pipe, fix [2006-01-23]
- * digests, document content certification, work on multiple images [2006-01-26]
+ * digests, document content certification, work on multiple images
+ [2006-01-26]
* digests, document content certification, (digest info) digest for
document skin digest, and repeat of document digest [2006-01-27]
@@ -4044,8 +4096,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.6.orig.tar.gz
including embedding document parts (within parts)..., may take opportunity
to introduce some substantive tags to sisu that are docbook compatible]
-%% sisu_0.36.5.orig.tar.gz (2006w01/5 | 2006-01-06) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.5.orig.tar.gz
+** sisu_0.36.5.orig.tar.gz (2006w01/5 | 2006-01-06)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.5.orig.tar.gz
e774624280d20e8e7153a5eaf6cfeadd 3271834 sisu_0.36.5.orig.tar.gz
3dc07a05827739b13aebcdb07c777aed 647 sisu_0.36.5-1.dsc
1b15ff3121d71868fcc64a912dd7d5c4 89869 sisu_0.36.5-1.diff.gz
@@ -4059,8 +4112,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.5.orig.tar.gz
* Debian build changed, fewer packages, hope to unify the SiSU development
and SiSU Debian upload builds
-%% sisu_0.36.4.orig.tar.gz (2006w00/7 | 2006-01-01) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.4.orig.tar.gz
+** sisu_0.36.4.orig.tar.gz (2006w00/7 | 2006-01-01)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.4.orig.tar.gz
4fb9343d78745fe582c1d91c5874d8cf 3270301 sisu_0.36.4.orig.tar.gz
d89b702d13d00b1bb34f6aca2a03b77a 691 sisu_0.36.4-1.dsc
c0889387ad3fe063c38d04a7cdcd0695 89581 sisu_0.36.4-1.diff.gz
@@ -4072,20 +4126,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.4.orig.tar.gz
* [some multi-language document markup samples added to debian build in
sisu-examples]
-%% sisu_0.36.3.orig.tar.gz (2005w52/6 | 2005-12-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.3.orig.tar.gz
+** sisu_0.36.3.orig.tar.gz (2005w52/6 | 2005-12-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.3.orig.tar.gz
b2ab154a1f2656edd9032500e757c03e 3261612 sisu_0.36.3.orig.tar.gz
964e4279748cf63526b8963f162f1eaf 691 sisu_0.36.3-1.dsc
ad3b135cb8dd825e56769b0f583b5542 13969 sisu_0.36.3-1.diff.gz
- * adjustments made for consequences of possibility of multi-language documents in sysenv, wmap, sql (psql/sqlite), remote put
+ * adjustments made for consequences of possibility of multi-language
+ documents in sysenv, wmap, sql (psql/sqlite), remote put
* sql prefix column changed to TEXT (from VARCHAR)
* sysenv, change to the initialization of constants [revisit]
-%% sisu_0.36.2.orig.tar.gz (2005w52/5 | 2005-12-30)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.2.orig.tar.gz
+** sisu_0.36.2.orig.tar.gz (2005w52/5 | 2005-12-30)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.2.orig.tar.gz
990dd7e60ecfee3b9dce863a0a28cc4e 3261132 sisu_0.36.2.orig.tar.gz
e2a3e592727eb67eacdc863a817df482 691 sisu_0.36.2-1.dsc
d8e12848dc94f0c0da1a2afa23312e53 13913 sisu_0.36.2-1.diff.gz
@@ -4096,8 +4151,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.2.orig.tar.gz
* wmap use main css, and own styles
-%% sisu_0.36.1.orig.tar.gz (2005w52/4 | 2005-12-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.1.orig.tar.gz
+** sisu_0.36.1.orig.tar.gz (2005w52/4 | 2005-12-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.1.orig.tar.gz
099b3c9735e664d164a42835e157055b 3262472 sisu_0.36.1.orig.tar.gz
646d6b052d0de625badd2ae22551808b 691 sisu_0.36.1-1.dsc
31fc43e92b23ceb2834c8b2fdc4caaf5 13896 sisu_0.36.1-1.diff.gz
@@ -4105,8 +4160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.1.orig.tar.gz
* html batch processing fix, placement of files:
index.html, toc.html and doc.html
-%% sisu_0.36.0.orig.tar.gz (2005w52/4 | 2005-12-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.0.orig.tar.gz
+** sisu_0.36.0.orig.tar.gz (2005w52/4 | 2005-12-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.0.orig.tar.gz
9f81885774e9bccf267ba1bde2d9894b 3261722 sisu_0.36.0.orig.tar.gz
f380ff4f31e1e92c796017bf2636f037 691 sisu_0.36.0-1.dsc
44f61789decda5816cf4b106fade30b2 13864 sisu_0.36.0-1.diff.gz
@@ -4138,8 +4193,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.36.0.orig.tar.gz
[contains a batch processing bug affecting some html output, fix in 0.36.1]
-%% sisu_0.35.0.orig.tar.gz (2005w52/3 | 2005-12-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.35.0.orig.tar.gz
+** sisu_0.35.0.orig.tar.gz (2005w52/3 | 2005-12-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.35.0.orig.tar.gz
f86673b0bf576a82aa73c80540a2303f 3260953 sisu_0.35.0.orig.tar.gz
4db5b9c912b117286460a85b59fd8d8a 691 sisu_0.35.0-1.dsc
362829f8d71ee03eaf47aa1f8b8f3856 13828 sisu_0.35.0-1.diff.gz
@@ -4185,8 +4240,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.35.0.orig.tar.gz
[contains a batch processing bug affecting some html output, fix in 0.36.1]
-%% sisu_0.34.2.orig.tar.gz (2005w51/1 | 2005-12-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.2.orig.tar.gz
+** sisu_0.34.2.orig.tar.gz (2005w51/1 | 2005-12-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.2.orig.tar.gz
db01ece3bc2314c57f0aa88d6ebd2974 3254394 sisu_0.34.2.orig.tar.gz
197f762e774ddb42bc35c922386d3133 691 sisu_0.34.2-1.dsc
2520379d811471ff5a3ca7fab6c4c646 13798 sisu_0.34.2-1.diff.gz
@@ -4197,8 +4252,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.2.orig.tar.gz
* digests, include in header url for set sisu_manifest, and time and version
information at the top of the document
-%% sisu_0.34.1.orig.tar.gz (2005w50/7 | 2005-12-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.1.orig.tar.gz
+** sisu_0.34.1.orig.tar.gz (2005w50/7 | 2005-12-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.1.orig.tar.gz
d42234876268924db8dddd33faecd3b0 3254032 sisu_0.34.1.orig.tar.gz
ba33053014594db6cc36489ccf49b5c1 691 sisu_0.34.1-1.dsc
0d7297accec601ff4e9f93a4746f3cd5 13756 sisu_0.34.1-1.diff.gz
@@ -4207,8 +4262,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.1.orig.tar.gz
* manifest, md5 if markup source is shared, show if -v
-%% sisu_0.34.0.orig.tar.gz (2005w50/6 | 2005-12-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.0.orig.tar.gz
+** sisu_0.34.0.orig.tar.gz (2005w50/6 | 2005-12-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.0.orig.tar.gz
b46664690687cec318848df0f2d663f7 3253826 sisu_0.34.0.orig.tar.gz
2c5cdede22b60b4f71294ca1a2a1e804 691 sisu_0.34.0-1.dsc
1c636c138c29931d6216349f0655a709 13695 sisu_0.34.0-1.diff.gz
@@ -4280,14 +4335,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.34.0.orig.tar.gz
* minor screen display url correction, in sax.xml
-%% sisu_0.33.0.orig.tar.gz (2005w50/4 | 2005-12-15)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.33.0.orig.tar.gz
+** sisu_0.33.0.orig.tar.gz (2005w50/4 | 2005-12-15)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.33.0.orig.tar.gz
8a0907a006a1cb7187b5006db4f5ff7c 3252270 sisu_0.33.0.orig.tar.gz
42b0ac73e9c5d680c70c86d9ee3115c2 691 sisu_0.33.0-1.dsc
2c1a41d51aefa57d3a7c0f4c82356ce5 13649 sisu_0.33.0-1.diff.gz
* processing directory, moved to ./_sisu_processing from ./_sisu/processing
- [reason: makes it easier to backup _sisu [you will almost never want _sisu_processing]]
+ [reason: makes it easier to backup _sisu [you will almost never want
+ _sisu_processing]]
/tmp/_sisu_processing is default and used if the former directory is absent
(instead of /tmp/sisu_processing for consistency)
[reason for local directory processing option if /tmp is default, exists,
@@ -4305,8 +4361,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.33.0.orig.tar.gz
* install (Rantfile and rant: install), a fix required
-%% sisu_0.32.5.orig.tar.gz (2005w50/3 | 2005-12-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.5.orig.tar.gz
+** sisu_0.32.5.orig.tar.gz (2005w50/3 | 2005-12-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.5.orig.tar.gz
aaaa1f0b62a45f5631d6875b8d1c4f60 3250422 sisu_0.32.5.orig.tar.gz
e201e7b1429886cf9b2be3ec14a63f18 691 sisu_0.32.5-1.dsc
01009df572a86b00e2ea1d3ddf7b1211 13627 sisu_0.32.5-1.diff.gz
@@ -4315,19 +4371,22 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.5.orig.tar.gz
orig.tar.gz has not been updated properly since 0.31.4, debian package has
issue with autopackage builder
- * debian package improved, however: diffs started from scratch, information/history abandoned
- Reason: undetermined problem with automated package builder.
- automated package builder (which uses darcs and darcs-buildpackage) builds package
- normally/properly with a pristine directory structure, but not with accumulated debian build history.
- For now, the orig.tar.gz and debian package structure are updated, and debian history is not included.
+ * debian package improved, however: diffs started from scratch,
+
+ information/history abandoned Reason: undetermined problem with automated
+ package builder. automated package builder (which uses darcs and
+ darcs-buildpackage) builds package normally/properly with a pristine
+ directory structure, but not with accumulated debian build history. For now,
+ the orig.tar.gz and debian package structure are updated, and debian history
+ is not included.
* directory named extra removed from source tarball,
extra/debian/man moved to debian/man
* debian, correction of a man page
-%% sisu_0.32.4.orig.tar.gz (2005w50/1 | 2005-12-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.4.orig.tar.gz
+** sisu_0.32.4.orig.tar.gz (2005w50/1 | 2005-12-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.4.orig.tar.gz
bd699b88457a2daf06de35681cd4df47 3265783 sisu_0.32.4.orig.tar.gz
2e8a85326c7e14845481affb4df00fc0 692 sisu_0.32.4-1.dsc
e18913a52d26cf6bd1e5952b288cc08a sisu_0.32.4-1.diff.gz
@@ -4338,24 +4397,24 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.4.orig.tar.gz
* odf (opendocument), sisu document metadata
-%% sisu_0.32.3.orig.tar.gz (2005w49/7 | 2005-12-11)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.3.orig.tar.gz
+** sisu_0.32.3.orig.tar.gz (2005w49/7 | 2005-12-11)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.3.orig.tar.gz
83e69d4ae96e578e8d089e9ad52c53c0 3265897 sisu_0.32.3.orig.tar.gz
e5c79923d0f574b7c9b8c5e36b9cead8 692 sisu_0.32.3-1.dsc
6b95e5e713468c957da365e05bf5b3a7 258645 sisu_0.32.3-1.diff.gz
* html endnote url re-fix
-%% sisu_0.32.2.orig.tar.gz (2005w49/4 | 2005-12-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.2.orig.tar.gz
+** sisu_0.32.2.orig.tar.gz (2005w49/4 | 2005-12-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.2.orig.tar.gz
b95ce4a61d1ad27eca528624fcc582c9 3265864 sisu_0.32.2.orig.tar.gz
8d84f343edb6dc7dd5e4edbc54f5633c 692 sisu_0.32.2-1.dsc
a95ac72c37636ac3ba15f6a9ec6ab4d2 258346 sisu_0.32.2-1.diff.gz
* sqlite, repair
-%% sisu_0.32.1.orig.tar.gz (2005w48/6 | 2005-12-03)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.1.orig.tar.gz
+** sisu_0.32.1.orig.tar.gz (2005w48/6 | 2005-12-03)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.1.orig.tar.gz
568917465359a1324f973929009c6993 3265886 sisu_0.32.1.orig.tar.gz
6f539432cebe4abfeadf87e993416fcb 692 sisu_0.32.1-1.dsc
3420efac3b35079d0ad3197a1e7fb4e0 257563 sisu_0.32.1-1.diff.gz
@@ -4367,8 +4426,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.1.orig.tar.gz
* debian:control a missing comma added to comma delimited depends list
-%% sisu_0.32.0.orig.tar.gz (2005w48/4 | 2005-12-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.0.orig.tar.gz
+** sisu_0.32.0.orig.tar.gz (2005w48/4 | 2005-12-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.0.orig.tar.gz
d9a549c11f77809c874ab664fc24d41f 3265763 sisu_0.32.0.orig.tar.gz
f3605f1094fb587dbc113198054c868f 692 sisu_0.32.0-1.dsc
54f1ebd40f654df574043270e8c939f4 257434 sisu_0.32.0-1.diff.gz
@@ -4380,8 +4439,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.32.0.orig.tar.gz
* -q -v -V -M -u screen information levels better sorted
-%% sisu_0.31.5.orig.tar.gz (2005w48/4 | 2005-12-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.5.orig.tar.gz
+** sisu_0.31.5.orig.tar.gz (2005w48/4 | 2005-12-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.5.orig.tar.gz
9fe95a6f45eb21dabcdf227ccce1dae9 3273030 sisu_0.31.5.orig.tar.gz
a7faf0e8797755a628c055e29e2da34a 691 sisu_0.31.5-1.dsc
fa5e70331f75052e604297d900907f38 13116 sisu_0.31.5-1.diff.gz
@@ -4419,8 +4478,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.5.orig.tar.gz
* Debian package adjustment
-%% sisu_0.31.4.orig.tar.gz (2005w48/2 | 2005-11-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.4.orig.tar.gz
+** sisu_0.31.4.orig.tar.gz (2005w48/2 | 2005-11-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.4.orig.tar.gz
5f9e68079806301e4f32ddc801ffdbd0 3249616 sisu_0.31.4.orig.tar.gz
9bdc2f510a981efbd811194dddb230a4 679 sisu_0.31.4-1.dsc
27db1bffe6571ee571e54961a450775e 11351 sisu_0.31.4-1.diff.gz
@@ -4431,8 +4490,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.4.orig.tar.gz
* sisu-composite together with sisu-examples installs the whole of SiSU
-%% sisu_0.31.3.orig.tar.gz (2005w48/1 | 2005-11-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.3.orig.tar.gz
+** sisu_0.31.3.orig.tar.gz (2005w48/1 | 2005-11-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.3.orig.tar.gz
562d89e8a4346350f749f660eb266a57 3245995 sisu_0.31.3.orig.tar.gz
af095b570f9aa0a7d1472747ea854e8e 10769 sisu_0.31.3-1.diff.gz
68cd0ea97435cc03c893d68d7e70259a 10789 sisu_0.31.3-2.diff.gz
@@ -4440,7 +4499,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.3.orig.tar.gz
* remote url gathering of images re-fixed, e.g.
sisu -Hpv http://www.jus.uio.no/sisu/free_culture.lawrence_lessig/free_culture.lawrence_lessig.s3
- should produce html and pdf of Free Culture from the online marked up file, with the images
+ should produce html and pdf of Free Culture from the online marked up file,
+ with the images
[sisu -CC (to copy downloaded images to the output directory)]
sisu -pHv http://www.jus.uio.no/sisu/sphinx_or_robot.leena_krohn.1996/sphinx_or_robot.leena_krohn.1996.s3
[has even more images, you will have to repeat sisu -CC]
@@ -4462,15 +4522,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.3.orig.tar.gz
* sisu_0.31.3-2 debian:control: Depends: ruby (>=1.8.2)
-%% sisu_0.31.2.orig.tar.gz (2005w47/6 | 2005-11-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.2.orig.tar.gz
+** sisu_0.31.2.orig.tar.gz (2005w47/6 | 2005-11-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.2.orig.tar.gz
e928fc31ce6109f924836c79a3c19027 3245306 sisu_0.31.2.orig.tar.gz
374bbe3ae0ddc53a652c5abcb421d6a7 10726 sisu_0.31.2-1.diff.gz
* debian autobuild fix [external scaffolding]
-%% sisu_0.31.1.orig.tar.gz (2005w47/6 | 2005-11-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.1.orig.tar.gz
+** sisu_0.31.1.orig.tar.gz (2005w47/6 | 2005-11-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.1.orig.tar.gz
b1734e76a39d043010e30722bbb3359c 3245133 sisu_0.31.1.orig.tar.gz
20bbb1f84c34779e55abed80aae7fdf0 10679 sisu_0.31.1-1.diff.gz
@@ -4481,8 +4541,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.1.orig.tar.gz
* [Note: change to automated debian package build procedure]
-%% sisu_0.31.0.orig.tar.gz (2005w47/5 | 2005-11-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.0.orig.tar.gz
+** sisu_0.31.0.orig.tar.gz (2005w47/5 | 2005-11-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.0.orig.tar.gz
e6beae75cda1d00c68dc0d97c67cb540 3244304 sisu_0.31.0.orig.tar.gz
8785cf622dee3fe07eed841b8cfbf8e1 10626 sisu_0.31.0-1.diff.gz
@@ -4491,8 +4551,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.31.0.orig.tar.gz
markup change use regex directly
[results in odf (openoffice) repair of 0.30.9]
-%% sisu_0.30.10.orig.tar.gz (2005w47/5 | 2005-11-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.10.orig.tar.gz
+** sisu_0.30.10.orig.tar.gz (2005w47/5 | 2005-11-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.10.orig.tar.gz
ed89acbe1f406f2f55052651d12f1b78 3242816 sisu_0.30.10.orig.tar.gz
6495690d1611efd7c9a8145a8b0ca73e 10589 sisu_0.30.10-1.diff.gz
@@ -4501,8 +4561,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.10.orig.tar.gz
[new version number 0.31 opened for header use of regex
to italicise and bold]
-%% sisu_0.30.9.orig.tar.gz (2005w47/2 | 2005-11-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.9.orig.tar.gz
+** sisu_0.30.9.orig.tar.gz (2005w47/2 | 2005-11-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.9.orig.tar.gz
70cc77083106e86b98bcf719ec35d657 3242867 sisu_0.30.9.orig.tar.gz
5ab1832552e65f598304baff2e253a88 10499 sisu_0.30.9-1.diff.gz
@@ -4516,8 +4576,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.9.orig.tar.gz
* minor notes on installation in README
-%% sisu_0.30.8.orig.tar.gz (2005w47/2 | 2005-11-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.8.orig.tar.gz
+** sisu_0.30.8.orig.tar.gz (2005w47/2 | 2005-11-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.8.orig.tar.gz
a75adbe1198732ec577c630e4b4e94dd 3229748 sisu_0.30.8.orig.tar.gz
3a4cd20539b968f37d10c1a8383bc315 10595 sisu_0.30.8-1.diff.gz
@@ -4530,8 +4590,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.8.orig.tar.gz
* url (-U) print urls without -v
-%% sisu_0.30.7.orig.tar.gz (2005w47/1 | 2005-11-21)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.7.orig.tar.gz
+** sisu_0.30.7.orig.tar.gz (2005w47/1 | 2005-11-21)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.7.orig.tar.gz
83c56fa696a75a9111295c99c2e5196e 3229287 sisu_0.30.7.orig.tar.gz
2e581d080177a0aa24f7076597676438 10552 sisu_0.30.7-1.diff.gz
@@ -4541,8 +4601,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.7.orig.tar.gz
* composite documents, fix manual closure of file is apparently necessary !
-%% sisu_0.30.6.orig.tar.gz (2005w46/7 | 2005-11-20)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.6.orig.tar.gz
+** sisu_0.30.6.orig.tar.gz (2005w46/7 | 2005-11-20)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.6.orig.tar.gz
c9abcf18916ac55d67308039f01933bb 3228496 sisu_0.30.6.orig.tar.gz
810751b72796f862fe5d9f4cfcbe195b 10510 sisu_0.30.6-1.diff.gz
@@ -4550,8 +4610,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.6.orig.tar.gz
* rsync (-R), screen output minor (what default, verbose and quiet do)
-%% sisu_0.30.5.orig.tar.gz (2005w46/7 | 2005-11-20)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.5.orig.tar.gz
+** sisu_0.30.5.orig.tar.gz (2005w46/7 | 2005-11-20)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.5.orig.tar.gz
e3e08897e4d7c3373c5898f31926c094 3228219 sisu_0.30.5.orig.tar.gz
583723571b8df2aa7717a7872b143227 10497 sisu_0.30.5-1.diff.gz
@@ -4563,8 +4623,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.5.orig.tar.gz
* sisu_doc, drop making of directory _sisu/config
(using _sisu/conf)
-%% sisu_0.30.4.orig.tar.gz (2005w46/6 | 2005-11-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.4.orig.tar.gz
+** sisu_0.30.4.orig.tar.gz (2005w46/6 | 2005-11-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.4.orig.tar.gz
a2a1bf159e3ccfdd7a15baf4f2603fbf 3227828 sisu_0.30.4.orig.tar.gz
895212c9fb09f100674338b7694ad921 10481 sisu_0.30.4-1.diff.gz
@@ -4578,8 +4638,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.4.orig.tar.gz
* moved sisu_changelog out of main SiSU document [has grown large]
-%% sisu_0.30.3.orig.tar.gz (2005w46/6 | 2005-11-19) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.3.orig.tar.gz
+** sisu_0.30.3.orig.tar.gz (2005w46/6 | 2005-11-19)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.3.orig.tar.gz
444a194aae38120f13fd3bf2f9ae505a 3227547 sisu_0.30.3.orig.tar.gz
1d1b49a957cb118a3110574d26bb9304 10413 sisu_0.30.3-1.diff.gz
@@ -4613,22 +4674,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.3.orig.tar.gz
* help, update, sync with man pages
-%% sisu_0.30.2.orig.tar.gz (2005w46/2 | 2005-11-15) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.2.orig.tar.gz
+** sisu_0.30.2.orig.tar.gz (2005w46/2 | 2005-11-15)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.2.orig.tar.gz
d0f8f7dfe1106616e3e0790c034cf190 3228007 sisu_0.30.2.orig.tar.gz
f953aa19d54e99a7a8d4669aaffe87ad 10130 sisu_0.30.2-1.diff.gz
* minor cleaning
-%% sisu_0.30.1.orig.tar.gz (2005w46/1 | 2005-11-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.1.orig.tar.gz
+** sisu_0.30.1.orig.tar.gz (2005w46/1 | 2005-11-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.1.orig.tar.gz
6367fc10883a98452d87044193338062 3227345 sisu_0.30.1.orig.tar.gz
59706eabd49a51394887d4ebb218cd3c 10112 sisu_0.30.1-1.diff.gz
* summary, include plain.txt where available
-%% sisu_0.30.0.orig.tar.gz (2005w45/7 | 2005-11-13)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.0.orig.tar.gz
+** sisu_0.30.0.orig.tar.gz (2005w45/7 | 2005-11-13)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.0.orig.tar.gz
2ab163fbf4a3b2ed31e14328ce69cbac 3227035 sisu_0.30.0.orig.tar.gz
6b0103b794fe8c6c015043b56f7770cd 10096 sisu_0.30.0-1.diff.gz
@@ -4638,7 +4700,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.0.orig.tar.gz
* sisudoc, re-named sisu_doc rather than sisu_ball
- * sisudoc, only -V and -M show verbose tgz of what goes in to sisudoc (previously -v did)
+ * sisudoc, only -V and -M show verbose tgz of what goes in to sisudoc
+ (previously -v did)
* name correction: SiSU is a recursive acronym, and has other
alternative possible expansions, one of which i got wrong,
@@ -4652,8 +4715,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.30.0.orig.tar.gz
and second expansion) i guess this correction calls for a major version
number change! hope no one (else) notices ;-) ]
-%% sisu_0.29.5.orig.tar.gz (2005w45/5 | 2005-11-11)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.5.orig.tar.gz
+** sisu_0.29.5.orig.tar.gz (2005w45/5 | 2005-11-11)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.5.orig.tar.gz
3e0ad7d2f8b02d0f3e61f113b2430269 3223938 sisu_0.29.5.orig.tar.gz
90a2570933de02fabd965fe8218fa354 10060 sisu_0.29.5-1.diff.gz
@@ -4664,8 +4727,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.5.orig.tar.gz
* minor fixes, [regex match of param metadata and copyright sign in odf]
-%% sisu_0.29.4.orig.tar.gz (2005w45/5 | 2005-11-11)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.4.orig.tar.gz
+** sisu_0.29.4.orig.tar.gz (2005w45/5 | 2005-11-11)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.4.orig.tar.gz
0d47f551de9f140d6cabc84614e2b4d8 3223745 sisu_0.29.4.orig.tar.gz
600d5725cd8835ce4cc345a10d074ca2 10035 sisu_0.29.4-1.diff.gz
@@ -4690,8 +4753,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.4.orig.tar.gz
* sysenv, pdfetex, debian renaming, search for pdfetex, pdftex and pdflatex
to generate pdf from SiSU's LaTeX output
-%% sisu_0.29.3.orig.tar.gz (2005w45/2 | 2005-11-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.3.orig.tar.gz
+** sisu_0.29.3.orig.tar.gz (2005w45/2 | 2005-11-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.3.orig.tar.gz
f4b9e6b875e9d01c1c52bfa68f1e3d56 3222790 sisu_0.29.3.orig.tar.gz
da61f9e61a5e5b7538c47d996b24a937 9961 sisu_0.29.3-1.diff.gz
@@ -4714,8 +4777,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.3.orig.tar.gz
* [minor editing of program file headers]
-%% sisu_0.29.2.orig.tar.gz (2005w45/1 | 2005-11-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.2.orig.tar.gz
+** sisu_0.29.2.orig.tar.gz (2005w45/1 | 2005-11-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.2.orig.tar.gz
b8ecd141040e1ffa0820cdf9382304a7 3220476 sisu_0.29.2.orig.tar.gz
3d42aeb8d9648fed4baf837c59cff7a5 9899 sisu_0.29.2-1.diff.gz
@@ -4744,8 +4807,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.2.orig.tar.gz
* [small changes: webserv var rename; cosmetic removal in html and xml of
less-than greater-than on copy @ \<< home \>>]
-%% sisu_0.29.1.orig.tar.gz (2005w44/6 | 2005-11-05)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.1.orig.tar.gz
+** sisu_0.29.1.orig.tar.gz (2005w44/6 | 2005-11-05)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.1.orig.tar.gz
c2a36974bf9c9d04e3c402a01500be68 3214920 sisu_0.29.1.orig.tar.gz
398f1f15f798bb31679ca91cb1b400ab 9802 sisu_0.29.1-1.diff.gz
@@ -4763,8 +4826,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.1.orig.tar.gz
more sense working with favoured used development distributed source
control management systems, mercurial and darcs)]
-%% sisu_0.29.0.orig.tar.gz (2005w44/1 | 2005-10-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.0.orig.tar.gz
+** sisu_0.29.0.orig.tar.gz (2005w44/1 | 2005-10-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.0.orig.tar.gz
a1658902d929eee564c77f061568a677 3214113 sisu_0.29.0.orig.tar.gz
fc3c5c566c307636d23467476d38b5bf 9732 sisu_0.29.0-1.diff.gz
@@ -4772,8 +4835,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.29.0.orig.tar.gz
affecting default html segment naming
[change to metaverse affects downstream processing]
-%% sisu_0.28.4.orig.tar.gz (2005w44/1 | 2005-10-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.4.orig.tar.gz
+** sisu_0.28.4.orig.tar.gz (2005w44/1 | 2005-10-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.4.orig.tar.gz
f3f00e850a17d2fbfbffadf8a0d6ef5d 3213380 sisu_0.28.4.orig.tar.gz
e9e5a3f5a1ed1065b2c02b15d630a213 9718 sisu_0.28.4-1.diff.gz
@@ -4792,15 +4855,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.4.orig.tar.gz
* doc/overview.txt update on things not done in list
-%% sisu_0.28.3.orig.tar.gz (2005w42/7 | 2005-10-23) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.3.orig.tar.gz
+** sisu_0.28.3.orig.tar.gz (2005w42/7 | 2005-10-23)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.3.orig.tar.gz
144e450c59d99c9baa24e1f265e19182 3212941 sisu_0.28.3.orig.tar.gz
bf0ecc4e8a2378acfadee2158005a500 9669 sisu_0.28.3-1.diff.gz
* metaverse, bullets accidentally removed, and put back
-%% sisu_0.28.2.orig.tar.gz (2005w42/6 | 2005-10-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.2.orig.tar.gz
+** sisu_0.28.2.orig.tar.gz (2005w42/6 | 2005-10-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.2.orig.tar.gz
ae92bc6a14600a15f4bfbe5512bf9af2 3213202 sisu_0.28.2.orig.tar.gz
ee23f7ac2122521fe4d802e023921a7f 9644 sisu_0.28.2-1.diff.gz
@@ -4809,8 +4873,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.2.orig.tar.gz
* character encoding touches, e.g. sample files saved as utf-8
-%% sisu_0.28.1.orig.tar.gz (2005w42/6 | 2005-10-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.1.orig.tar.gz
+** sisu_0.28.1.orig.tar.gz (2005w42/6 | 2005-10-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.1.orig.tar.gz
e672ccc483cf48fed084bfce99f87b8d 3212728 sisu_0.28.1.orig.tar.gz
dbe154e00f8421a2f05c67a11c2e7cbc 9618 sisu_0.28.1-1.diff.gz
@@ -4822,8 +4886,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.1.orig.tar.gz
* some database operations visited, (update)
-%% sisu_0.28.0.orig.tar.gz (2005w42/5 | 2005-10-21)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.0.orig.tar.gz
+** sisu_0.28.0.orig.tar.gz (2005w42/5 | 2005-10-21)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.0.orig.tar.gz
12064bd92864441ab8b103f094412c2f 3210000 sisu_0.28.0.orig.tar.gz
22c5452ca4a060ddbb4bcb768a4bd119 9600 sisu_0.28.0-1.diff.gz
@@ -4839,10 +4903,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.28.0.orig.tar.gz
* made note of opendocument format output on sisu home page
[feature not complete]
- * synced skin_sisu.rb files, (there are a bit too many of them, most would normally be syslinks)
+ * synced skin_sisu.rb files, (there are a bit too many of them, most would
+ normally be syslinks)
-%% sisu_0.26.4.orig.tar.gz (2005w42/2 | 2005-10-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.4.orig.tar.gz
+** sisu_0.26.4.orig.tar.gz (2005w42/2 | 2005-10-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.4.orig.tar.gz
6cd9d7bcb42a48a7475d6bd724b766be 3202069 sisu_0.26.4.orig.tar.gz
5f0a0dec3a5819f2e266581d912255ad 9499 sisu_0.26.4-1.diff.gz
@@ -4884,8 +4949,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.4.orig.tar.gz
(iii) removed recommended incorrect libcgi_ruby. libfcgi-ruby1.8, remains;
(iv) have added a basic open document file structure as a tgz file.
-%% sisu_0.26.3.orig.tar.gz (2005w40/5 | 2005-10-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.3.orig.tar.gz
+** sisu_0.26.3.orig.tar.gz (2005w40/5 | 2005-10-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.3.orig.tar.gz
309cbdc9b2ab048a670ca9301aaeee87 3183245 sisu_0.26.3.orig.tar.gz
3dc4a9587427db4819a10958c4adde5c 9342 sisu_0.26.3-1.diff.gz
@@ -4898,7 +4963,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.3.orig.tar.gz
but is a convenient way of packing the contents of a file for sending)
[early days]
- * man1/sisu.1 upadated and html on -B sisu file format (sisu help not yet done)
+ * man1/sisu.1 upadated and html on -B sisu file format (sisu help not yet
+ done)
* cosmetic firefox taken from list of lightweight browsers,
remains very much amongst the heavies
@@ -4906,8 +4972,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.3.orig.tar.gz
* cosmetic correction on info related to librmagick-ruby contained within
sample document free_culture
-%% sisu_0.26.2.orig.tar.gz (2005w39/5 | 2005-09-30)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.2.orig.tar.gz
+** sisu_0.26.2.orig.tar.gz (2005w39/5 | 2005-09-30)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.2.orig.tar.gz
2b5f2c65088a6f95303c2b99d5033386 3179769 sisu_0.26.2.orig.tar.gz
9d2aa597a50af0608c382e6f52f8a873 9322 sisu_0.26.2-1.diff.gz
@@ -4936,19 +5002,20 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.2.orig.tar.gz
sample "Free Culture", Lawrence Lessig. Note this is not necessary from
sisu-0.20.0 onwards, if you have rubymagick installed.
-WARNING ruby 1.8.3 (2005-09-21) [i486-linux] segfaults SiSU
-FIXED in 1.8.3 (2005-09-29) [i486-linux] thank you TS/Guy Decoux
-the new ruby build is not as yet uploaded to Debian unstale
+ WARNING ruby 1.8.3 (2005-09-21) [i486-linux] segfaults SiSU
+ FIXED in 1.8.3 (2005-09-29) [i486-linux] thank you TS/Guy Decoux
+ the new ruby build is not as yet uploaded to Debian unstale
-%% sisu_0.27.0.orig.tar.gz (2005w39/1 | 2005-09-26) %% Emergency Release:
+** sisu_0.27.0.orig.tar.gz (2005w39/1 | 2005-09-26) %% Emergency Release:
-NOTE: this is an emergency version of SiSU that does not segfault with
-problem versions of ruby, see note follwing. It is prepared without Syck/Yaml
+ NOTE: this is an emergency version of SiSU that does not segfault with
+ problem versions of ruby, see note follwing. It is prepared without Syck/Yaml
-Problem ruby versions:
-* ruby 1.8.3 (2005-09-21) and was removed by TS:Guy in ruby 1.8.3 (2005-09-29),
- released as Debian unstable ruby-1.8.2-1, and in
-* ruby 1.8.3 (2005-10-12) and was again removed by TS:Guy in ruby 1.8.3 (2005-10-13).
+ Problem ruby versions:
+ * ruby 1.8.3 (2005-09-21) and was removed by TS:Guy in ruby 1.8.3
+ (2005-09-29), released as Debian unstable ruby-1.8.2-1, and in
+ * ruby 1.8.3 (2005-10-12) and was again removed by TS:Guy in ruby 1.8.3
+ (2005-10-13).
* Temporary Emergency Release
ruby 1.8.3 (2005-09-21) [i486-linux]] segfaults sisu
@@ -4963,8 +5030,8 @@ Problem ruby versions:
ignoring yaml user config files
* does not provide sisu version information
-%% sisu_0.26.1.orig.tar.gz (2005w37/7 | 2005-09-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.1.orig.tar.gz
+** sisu_0.26.1.orig.tar.gz (2005w37/7 | 2005-09-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.1.orig.tar.gz
a6e020a9932d972cc92a8abdcb704238 3156526 sisu_0.26.1.orig.tar.gz
4cbe9d5240b03eea9fc6392ebb2aca46 9304 sisu_0.26.1-1.diff.gz
@@ -4974,8 +5041,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.1.orig.tar.gz
* minor pruning and renaming, small changes
-%% sisu_0.26.0.orig.tar.gz (2005w37/7 | 2005-09-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.0.orig.tar.gz
+** sisu_0.26.0.orig.tar.gz (2005w37/7 | 2005-09-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.0.orig.tar.gz
4d1702c6cb8f162f4c7ece7a236148c6 3159698 sisu_0.26.0.orig.tar.gz
99f922789101f388cf3a7562ec2953c5 9293 sisu_0.26.0-1.diff.gz
@@ -4993,8 +5060,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.26.0.orig.tar.gz
* start enforcing lower case sisu markup tagging
-%% sisu_0.25.11.orig.tar.gz (2005w37/6 | 2005-09-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.11.orig.tar.gz
+** sisu_0.25.11.orig.tar.gz (2005w37/6 | 2005-09-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.11.orig.tar.gz
5330033ca4c32a20424b212d5e15705e 3158745 sisu_0.25.11.orig.tar.gz
bdd533301ed392ec7c27f1e364dc8388 sisu_0.25.11-1.diff.gz
@@ -5020,8 +5087,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.11.orig.tar.gz
* man page, man sisu, updated to include "-S webrick"
-%% sisu_0.25.10.orig.tar.gz (2005w37/5 | 2005-09-15)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.10.orig.tar.gz
+** sisu_0.25.10.orig.tar.gz (2005w37/5 | 2005-09-15)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.10.orig.tar.gz
1b7fa60d23869d33f5d918d5aa1cf424 3157417 sisu_0.25.10.orig.tar.gz
9d4b75bde3f0f138d1e4d31b7964d374 9262 sisu_0.25.10-1.diff.gz
@@ -5031,8 +5098,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.10.orig.tar.gz
* minor code cleaning
-%% sisu_0.25.9.orig.tar.gz (2005w37/3 | 2005-09-14) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.9.orig.tar.gz
+** sisu_0.25.9.orig.tar.gz (2005w37/3 | 2005-09-14)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.9.orig.tar.gz
48249bcd13900d9d68519585a3e825f6 3162000 sisu_0.25.9.orig.tar.gz
2c74d1288dea0c604603185ae71a4421 9247 sisu_0.25.9-1.diff.gz
@@ -5046,8 +5114,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.9.orig.tar.gz
* man pages additions, mostly "man 8 sisu"
-%% sisu_0.25.8.orig.tar.gz (2005w37/3 | 2005-09-14) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.8.orig.tar.gz
+** sisu_0.25.8.orig.tar.gz (2005w37/3 | 2005-09-14)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.8.orig.tar.gz
bd8edf228360f3f3795812c93edfee19 3159743 sisu_0.25.8.orig.tar.gz
17b662d3d2e7f1881c7eebecb6dca192 9232 sisu_0.25.8-1.diff.gz
@@ -5065,8 +5134,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.8.orig.tar.gz
* help, fix help on markup \ escape character (escaped)
-%% sisu_0.25.7.orig.tar.gz (2005w37/2 | 2005-09-13)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.7.orig.tar.gz
+** sisu_0.25.7.orig.tar.gz (2005w37/2 | 2005-09-13)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.7.orig.tar.gz
b86531a1788f6bce8e81328760801fa3 3158773 sisu_0.25.7.orig.tar.gz
a2824de38545b6695eb06ea35bb73fea 9207 sisu_0.25.7-1.diff.gz
@@ -5091,8 +5160,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.7.orig.tar.gz
[extensive testing escaping the full range of special characters is necessary
these include \\ \< \> \{ \} and the contextual * ! / _ \^ , + ]
-%% sisu_0.25.6.orig.tar.gz (2005w37/1 | 2005-09-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.6.orig.tar.gz
+** sisu_0.25.6.orig.tar.gz (2005w37/1 | 2005-09-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.6.orig.tar.gz
c0b6aa1a71a4d139d65c43fb2d21b8b0 3156969 sisu_0.25.6.orig.tar.gz
283c663e1b3e7803217d80709dcc7b73 9186 sisu_0.25.6-1.diff.gz
@@ -5111,24 +5180,24 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.6.orig.tar.gz
* copyright SiSU system, object numbering etc. in pdfs, (reduced font size &
words from previous Debian release, [a bit more than in 0.25.5])
-%% sisu_0.25.5.orig.tar.gz (2005w37/1 | 2005-09-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.5.orig.tar.gz
+** sisu_0.25.5.orig.tar.gz (2005w37/1 | 2005-09-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.5.orig.tar.gz
dadf9ffb77c629189be5f08345f451cf 3154083 sisu_0.25.5.orig.tar.gz
7749d8a2a4ed73e9f0d85e5fae5d9027 9178 sisu_0.25.5-1.diff.gz
* latex/pdf cosmetic reduced size of font related to document
processing information.
-%% sisu_0.25.4.orig.tar.gz (2005w37/1 | 2005-09-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.4.orig.tar.gz
+** sisu_0.25.4.orig.tar.gz (2005w37/1 | 2005-09-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.4.orig.tar.gz
b2bd5bd90ebb3af821f7b60a03cfecaa 3153879 sisu_0.25.4.orig.tar.gz
894ed52890f238a8feab48e80e86aae8 9166 sisu_0.25.4-1.diff.gz
* metaverse, fix related to 0.25.3 (interaction between operation of
bold lines and bold words selected in header).
-%% sisu_0.25.3.orig.tar.gz (2005w37/1 | 2005-09-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.3.orig.tar.gz
+** sisu_0.25.3.orig.tar.gz (2005w37/1 | 2005-09-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.3.orig.tar.gz
079f2c259f8de88e48ce16a6b0eed242 3153671 sisu_0.25.3.orig.tar.gz
1388f9f6183f76b49aa52ccef26bc5bc 9153 sisu_0.25.3-1.diff.gz
@@ -5138,8 +5207,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.3.orig.tar.gz
* changes to text accompanying latex/pdfs, toning down of language,
correction of gpl2 url to fsf.org rather than gnu.org
-%% sisu_0.25.2.orig.tar.gz (2005w36/6 | 2005-09-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.2.orig.tar.gz
+** sisu_0.25.2.orig.tar.gz (2005w36/6 | 2005-09-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.2.orig.tar.gz
de5b7c20ec8e793d131c0f7665a1447a 3153602 sisu_0.25.2.orig.tar.gz
e46bcf337617273e1ef715010c0a7542 9134 sisu_0.25.2-1.diff.gz
@@ -5148,8 +5217,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.2.orig.tar.gz
fix affects processing with the -0 flag (zero), e.g.
sisu -mHp0v [filename].s3
-%% sisu_0.25.1.orig.tar.gz (2005w36/6 | 2005-09-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.1.orig.tar.gz
+** sisu_0.25.1.orig.tar.gz (2005w36/6 | 2005-09-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.1.orig.tar.gz
a82d3a227babf3bc1a6660fafba17ecc 3153326 sisu_0.25.1.orig.tar.gz
5df9ff95789c457566e0fc822449f1ef 9122 sisu_0.25.1-1.diff.gz
@@ -5158,8 +5227,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.1.orig.tar.gz
fix affects
sisu -S
-%% sisu_0.25.0.orig.tar.gz (2005w36/6 | 2005-09-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.0.orig.tar.gz
+** sisu_0.25.0.orig.tar.gz (2005w36/6 | 2005-09-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.0.orig.tar.gz
15d88f5a33da7f3cb427e5a8a0dae573 3153121 sisu_0.25.0.orig.tar.gz
a191b69a92500d8880b764b6c33a4957 9111 sisu_0.25.0-1.diff.gz
@@ -5172,12 +5241,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.25.0.orig.tar.gz
(createall complains if database exists - you may not wish to remove
existing)
- * db/sql: replaced oid table with links table, and provide links to output files,
- affects both pgsql and sqlite
+ * db/sql: replaced oid table with links table, and provide links to output
+ files, affects both pgsql and sqlite
-%% sisu_0.24.2.orig.tar.gz (2005w36/5 | 2005-09-09)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.2.orig.tar.gz
+** sisu_0.24.2.orig.tar.gz (2005w36/5 | 2005-09-09)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.2.orig.tar.gz
924f791aa2ab18e3917451ff09183a3b 3152290 sisu_0.24.2.orig.tar.gz
cbbfdde8fd261b1bfdd47f633c895222 9093 sisu_0.24.2-1.diff.gz
@@ -5187,8 +5256,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.2.orig.tar.gz
http://www.netpromi.com/kirbybase_ruby.html )
hoever, this is a possible way forward should such a table be needed
-%% sisu_0.24.1.orig.tar.gz (2005w36/4 | 2005-09-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.1.orig.tar.gz
+** sisu_0.24.1.orig.tar.gz (2005w36/4 | 2005-09-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.1.orig.tar.gz
328d2c858900bca8594aaf9fdad48687 3154040 sisu_0.24.1.orig.tar.gz
2a8e982a69c58ea39a82c3c1e849fcc3 9083 sisu_0.24.1-1.diff.gz
@@ -5220,8 +5289,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.1.orig.tar.gz
treatment if at start of text, i.e. if actually headers, so can have a
description of a header within text like 0\~level new=1,2,3; break=4
-%% sisu_0.24.0.orig.tar.gz (2005w36/3 | 2005-09-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.0.orig.tar.gz
+** sisu_0.24.0.orig.tar.gz (2005w36/3 | 2005-09-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.0.orig.tar.gz
2270344926ff777132f50dbba0270c11 3153987 sisu_0.24.0.orig.tar.gz
f0bc72f3a3f07984113d7dd21ba7afae 9071 sisu_0.24.0-1.diff.gz
@@ -5293,8 +5362,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.24.0.orig.tar.gz
* loading of skins for inserts
-%% sisu_0.22.1.orig.tar.gz (2005w35/4 | 2005-09-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.1.orig.tar.gz
+** sisu_0.22.1.orig.tar.gz (2005w35/4 | 2005-09-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.1.orig.tar.gz
bd05b8766c923fefe62194ccfb851e40 3106333 sisu_0.22.1.orig.tar.gz
a3c3f1369d34c477db9422de98ed7306 8955 sisu_0.22.1-1.diff.gz
@@ -5303,8 +5372,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.1.orig.tar.gz
* latex/pdf, placement of object numbers re-sorted,
an inelegant fix, revisit later.
-%% sisu_0.22.0.orig.tar.gz (2005w35/3 | 2005-08-31)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.0.orig.tar.gz
+** sisu_0.22.0.orig.tar.gz (2005w35/3 | 2005-08-31)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.0.orig.tar.gz
7a9d78e29a2809767f5510ec8958155d 3105938 sisu_0.22.0.orig.tar.gz
9b7babcf4278dc69a94ec7b9f00609e0 8936 sisu_0.22.0-1.diff.gz
@@ -5326,15 +5395,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.22.0.orig.tar.gz
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
[from: 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]
-%% sisu_0.21.2.orig.tar.gz (2005w34/7 | 2005-08-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.2.orig.tar.gz
+** sisu_0.21.2.orig.tar.gz (2005w34/7 | 2005-08-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.2.orig.tar.gz
b6deafd5e3627851a11b3865c7b54a36 3104604 sisu_0.21.2.orig.tar.gz
db780c3273a6a6dd3b488dc1ee70cf82 8882 sisu_0.21.2-1.diff.gz
* sisu-examples sisu_search.cgi sample correction
-%% sisu_0.21.1.orig.tar.gz (2005w34/7 | 2005-08-28)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.1.orig.tar.gz
+** sisu_0.21.1.orig.tar.gz (2005w34/7 | 2005-08-28)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.1.orig.tar.gz
df503b6de6a98cca07c010ead14c8083 3104417 sisu_0.21.1.orig.tar.gz
4ce92696c4eb3c87434ea6c3984f3054 8870 sisu_0.21.1-1.diff.gz
@@ -5342,8 +5411,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.1.orig.tar.gz
* minor code edits
-%% sisu_0.21.0.orig.tar.gz (2005w34/7 | 2005-08-28) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.0.orig.tar.gz
+** sisu_0.21.0.orig.tar.gz (2005w34/7 | 2005-08-28) [Debian Release snapshot,
+ uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.0.orig.tar.gz
095879ae2f0784868b9506eb09012b41 3105687 sisu_0.21.0.orig.tar.gz
5d0274cb2a1f0e88c22c78d03dd869da 8852 sisu_0.21.0-1.diff.gz
@@ -5367,8 +5437,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.21.0.orig.tar.gz
* sisu manpage updated to take account of changes (help not yet)
-%% sisu_0.20.9.orig.tar.gz (2005w34/5 | 2005-08-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.9.orig.tar.gz
+** sisu_0.20.9.orig.tar.gz (2005w34/5 | 2005-08-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.9.orig.tar.gz
0f267a8fb912193b3714ea573ccaefea 3090429 sisu_0.20.9.orig.tar.gz
8b46fe8954ebdfaa89c5ecb608771b6a 8832 sisu_0.20.9-1.diff.gz
@@ -5379,8 +5449,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.9.orig.tar.gz
output sub-directory, it was relying on other selections for directory
creation [thought done previously] affects flags -a -x -X -b
-%% sisu_0.20.8.orig.tar.gz (2005w34/4 | 2005-08-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.8.orig.tar.gz
+** sisu_0.20.8.orig.tar.gz (2005w34/4 | 2005-08-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.8.orig.tar.gz
2fee766bb3079d7f955dbeb8c7e1c9dd 3089931 sisu_0.20.8.orig.tar.gz
6505b8ad8e6ccdc73676a61b25a466a2 8815 sisu_0.20.8-1.diff.gz
@@ -5388,12 +5458,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.8.orig.tar.gz
postgresql & sqlite logic in same files
[additional testing required]
-%% sisu_0.20.7.orig.tar.gz (2005w34/3 | 2005-08-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.7.orig.tar.gz
+** sisu_0.20.7.orig.tar.gz (2005w34/3 | 2005-08-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.7.orig.tar.gz
1fe53caf785a25d4a59ffb05e7c9c3aa 3098483 sisu_0.20.7.orig.tar.gz
914f8a07adb73f761c42e4c914abd3b2 8799 sisu_0.20.7-1.diff.gz
- * added metadata categories (to the Dublin Core 15) added the following metatags, which seemed appropriate/useful:
+ * added metadata categories (to the Dublin Core 15) added the following
+ metatags, which seemed appropriate/useful:
translator (or translated_by)
illustrator (or illustrated_by)
prepared_by
@@ -5407,8 +5478,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.7.orig.tar.gz
(sisu parses unix ascii, not dos ascii ... consider further,
an issue for example with many(most/all?) Project Gutenberg texts)
-%% sisu_0.20.6.orig.tar.gz (2005w34/1 | 2005-08-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.6.orig.tar.gz
+** sisu_0.20.6.orig.tar.gz (2005w34/1 | 2005-08-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.6.orig.tar.gz
8e50493f947b6c1e0ed77bb1fb4e8ede 3096291 sisu_0.20.6.orig.tar.gz
0636fedf8a38e0cb62dbdf7c0ad9397f 8778 sisu_0.20.6-1.diff.gz
@@ -5418,16 +5489,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.6.orig.tar.gz
* (sisu_search.cgi) sample search form, minor fixes &
improvements, still a mess
-%% sisu_0.20.5.orig.tar.gz (2005w33/5 | 2005-08-19)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.5.orig.tar.gz
+** sisu_0.20.5.orig.tar.gz (2005w33/5 | 2005-08-19)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.5.orig.tar.gz
1df854fd95731c9272c89c62b06ce70a 3095741 sisu_0.20.5.orig.tar.gz
31d98e13292c9ab21b77f77bd4e769df 8763 sisu_0.20.5-1.diff.gz
* fix for old style header links, (broken in 0.20.4 with
introduction of new)
-%% sisu_0.20.4.orig.tar.gz (2005w33/4 | 2005-08-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.4.orig.tar.gz
+** sisu_0.20.4.orig.tar.gz (2005w33/4 | 2005-08-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.4.orig.tar.gz
c65c974dbdef638014c578c8a06d4560 3095378 sisu_0.20.4.orig.tar.gz
bca68a13d322deee67a4e20730c55acb 8741 sisu_0.20.4-1.diff.gz
@@ -5453,16 +5524,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.4.orig.tar.gz
must have been working with a version of ruby older than sisu is written
for]
-%% sisu_0.20.3.orig.tar.gz (2005w32/7 | 2005-08-14) [Debian Release snapshot, uploaded by Wookey]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.3.orig.tar.gz
+** sisu_0.20.3.orig.tar.gz (2005w32/7 | 2005-08-14)
+ [Debian Release snapshot, uploaded by Wookey]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.3.orig.tar.gz
0a1b40b4c00ab6a7b4c9528b0664cba5 3094654 sisu_0.20.3.orig.tar.gz
aea0778abd99cd1f301d059fe83c81e4 8653 sisu_0.20.3-1.diff.gz
* fix sisu -CC removed attempt to create pg db
(this is done rather on -D createall request if does not exist)
-%% sisu_0.20.2.orig.tar.gz (2005w32/7 | 2005-08-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.2.orig.tar.gz
+** sisu_0.20.2.orig.tar.gz (2005w32/7 | 2005-08-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.2.orig.tar.gz
56c7a77c9a78f12cd132e06234ded543 3094356 sisu_0.20.2.orig.tar.gz
774b095fc376f4decde435fd6d32fbc2 8631 sisu_0.20.2-1.diff.gz
@@ -5478,8 +5550,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.2.orig.tar.gz
* debian signing of package against ralph@amissah.com
-%% sisu_0.20.1.orig.tar.gz (2005w32/5 | 2005-08-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.1.orig.tar.gz
+** sisu_0.20.1.orig.tar.gz (2005w32/5 | 2005-08-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.1.orig.tar.gz
1cdbe3739722c877af1095135a7a6f9e 3089912 sisu_0.20.1.orig.tar.gz
90e8a6ac6a1c868d8f7138c8974b2611 8588 sisu_0.20.1-1.diff.gz
@@ -5527,8 +5599,8 @@ tJaIUHauen7hNIoUQXo=
=6US6
-----END PGP PUBLIC KEY BLOCK-----
-%% sisu_0.20.0.orig.tar.gz (2005w32/4 | 2005-08-11)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.0.orig.tar.gz
+** sisu_0.20.0.orig.tar.gz (2005w32/4 | 2005-08-11)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.0.orig.tar.gz
0c0c5ef53a3dd85fcaf5912a971c3b26 3089497 sisu_0.20.0.orig.tar.gz
741731b3d842820cb2b427fdf1197e4a 8517 sisu_0.20.0-1.diff.gz
0b1ea809280f45b293cb5a9ea9453b49 8551 sisu_0.20.0-2.diff.gz
@@ -5550,8 +5622,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.20.0.orig.tar.gz
and to default to search of sisu-examples as this is a standard/common
directory anyone might generate (or rather ./document_samples_sisu_markup)
-%% sisu_0.18.8.orig.tar.gz (2005w32/3 | 2005-08-10)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.8.orig.tar.gz
+** sisu_0.18.8.orig.tar.gz (2005w32/3 | 2005-08-10)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.8.orig.tar.gz
aa7e128202d4e60dfa9b328888406a3d 3087797 sisu_0.18.8.orig.tar.gz
262edbc6bcd7b29cf70d8f3b0fd1a9cf 8404 sisu_0.18.8-1.diff.gz
@@ -5585,8 +5657,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.8.orig.tar.gz
* minor touch to man page and help
-%% sisu_0.18.7.orig.tar.gz (2005w32/2 | 2005-08-09) [Debian Release snapshot, uploaded by Joachim Breitner]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.7.orig.tar.gz
+** sisu_0.18.7.orig.tar.gz (2005w32/2 | 2005-08-09) [Debian Release snapshot,
+ uploaded by Joachim Breitner]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.7.orig.tar.gz
ace9eb421e31f7d3f1d12ba29b00baaf 3086170 sisu_0.18.7.orig.tar.gz
3530196ebba2260a60bfe885ee536731 8393 sisu_0.18.7-1.diff.gz
@@ -5611,8 +5684,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.7.orig.tar.gz
these urls are part of the sentences punctuation http://www.url,
http://www.url.)
-%% sisu_0.18.6.orig.tar.gz (2005w32/1 | 2005-08-08)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.6.orig.tar.gz
+** sisu_0.18.6.orig.tar.gz (2005w32/1 | 2005-08-08)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.6.orig.tar.gz
0687159545781ee1caeb802fd6da9ecf 3085058 sisu_0.18.6.orig.tar.gz
096c5f256ecc1b38642186822c55f137 8377 sisu_0.18.6-1.diff.gz
@@ -5631,8 +5704,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.6.orig.tar.gz
man page and help mention of verbose screen output of digest tree
-%% sisu_0.18.5.orig.tar.gz (2005w31/6 | 2005-08-06)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.5.orig.tar.gz
+** sisu_0.18.5.orig.tar.gz (2005w31/6 | 2005-08-06)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.5.orig.tar.gz
e41ba898a4514b8f951015df3a30e3e2 3084020 sisu_0.18.5.orig.tar.gz
4120df15adf03f14bb58d7fba068c27c 8359 sisu_0.18.5-1.diff.gz
@@ -5645,8 +5718,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.5.orig.tar.gz
{imagename.png}image working for html and pdf again
{imagename.png}image fix also for pdf
-%% sisu_0.18.4.orig.tar.gz (2005w30/2 | 2005-07-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.4.orig.tar.gz
+** sisu_0.18.4.orig.tar.gz (2005w30/2 | 2005-07-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.4.orig.tar.gz
9ee3ba3a68640e060a92beb1ffd4351a 3081850 sisu_0.18.4.orig.tar.gz
3fabff77f7a9db7e8c47ffa6d01c5bc0 8344 sisu_0.18.4-1.diff.gz
@@ -5664,8 +5737,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.4.orig.tar.gz
* (re)moved use of -o flag from old table based html
-%% sisu_0.18.3.orig.tar.gz (2005w30/2 | 2005-07-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.3.orig.tar.gz
+** sisu_0.18.3.orig.tar.gz (2005w30/2 | 2005-07-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.3.orig.tar.gz
76b9a55723151f7dd08437fb9a604813 3079656 sisu_0.18.3.orig.tar.gz
d6ce0c7986a47436843d3a36ba000822 8322 sisu_0.18.3-1.diff.gz
@@ -5675,8 +5748,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.3.orig.tar.gz
image is taken from local directory images where ought to be taken from
general image set, revisit.
-%% sisu_0.18.2.orig.tar.gz (2005w30/1 | 2005-07-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.2.orig.tar.gz
+** sisu_0.18.2.orig.tar.gz (2005w30/1 | 2005-07-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.2.orig.tar.gz
cbb34fcf021158193c6e6f366ae9e645 3077824 sisu_0.18.2.orig.tar.gz
35ac35ae6872d923c3704c45aae867f4 8306 sisu_0.18.2-1.diff.gz
@@ -5688,8 +5761,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.2.orig.tar.gz
* dbi_unicode unused, and removed, (common_db used)
-%% sisu_0.18.1.orig.tar.gz (2005w29/0 | 2005-07-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.1.orig.tar.gz
+** sisu_0.18.1.orig.tar.gz (2005w29/0 | 2005-07-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.1.orig.tar.gz
030ba198b242541bd261ec5fb0776b0a 3086052 sisu_0.18.1.orig.tar.gz
6cd8c2b571c485edbe77946fe7245a14 8301 sisu_0.18.1-1.diff.gz
@@ -5701,8 +5774,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.1.orig.tar.gz
* some writing in man pages
-%% sisu_0.18.0.orig.tar.gz (2005w29/5 | 2005-07-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.0.orig.tar.gz
+** sisu_0.18.0.orig.tar.gz (2005w29/5 | 2005-07-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.0.orig.tar.gz
ff45f2bca98b6e8fbae0714684576571 3086151 sisu_0.18.0.orig.tar.gz
9f0cf2ca1b6e02aea52f9dd22e51c32d 8268 sisu_0.18.0-1.diff.gz
@@ -5737,11 +5810,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.0.orig.tar.gz
* md5 into postgresql and sqlite modules, (including endnotes clean md5
digest)
- * Implemented, but need to be consistent about content of paragraphs on which
- md5 digest is made:
+ * Implemented, but need to be consistent about content of paragraphs on
+ which md5 digest is made:
- 1. clean/stripped text without any markup, paragraph, headings etc. without
- endnotes
+ 1. clean/stripped text without any markup, paragraph, headings etc.
+ without endnotes
2. endnotes clean/stripped text digest only (there may be several endnotes
within a paragraph)
@@ -5784,23 +5857,24 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.18.0.orig.tar.gz
* incorporated two md5 digests for each object, available for use
downstream as desired
-%% sisu_0.16.26.orig.tar.gz (2005w28/6 | 2005-07-16)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.26.orig.tar.gz
+** sisu_0.16.26.orig.tar.gz (2005w28/6 | 2005-07-16)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.26.orig.tar.gz
*** sisu_0.16.26.orig.tar.gz
*** sisu_0.16.26-1.diff.gz
* LaTeX output remove individual /parindent placed in header
-%% sisu_0.16.25.orig.tar.gz (2005w28/6 | 2005-07-16) [First Debian Release, uploaded by Gunnar Wolf]
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.25.orig.tar.gz
+** sisu_0.16.25.orig.tar.gz (2005w28/6 | 2005-07-16)
+ [First Debian Release, uploaded by Gunnar Wolf]
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.25.orig.tar.gz
*** sisu_0.16.25.orig.tar.gz
*** sisu_0.16.25-1.diff.gz
* sisu-examples, Free as in Freedom ... minor touch,
previous markup broken, will check later
-%% sisu_0.16.24.orig.tar.gz (2005w28/2 | 2005-07-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.24.orig.tar.gz
+** sisu_0.16.24.orig.tar.gz (2005w28/2 | 2005-07-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.24.orig.tar.gz
2072677c897ffa9c677b2b4760003396 3081483 sisu_0.16.24.orig.tar.gz
2879560a1af4f0dc27670f519cf5bd94 8211 sisu_0.16.24-1.diff.gz
@@ -5808,8 +5882,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.24.orig.tar.gz
2003, 2004, 2005 ... only question being whether it should not have been
1996.
-%% sisu_0.16.23.orig.tar.gz (2005w28/2 | 2005-07-12)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.23.orig.tar.gz
+** sisu_0.16.23.orig.tar.gz (2005w28/2 | 2005-07-12)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.23.orig.tar.gz
db0052818b106e0d4c47d8039bdb8497 3081204 sisu_0.16.23.orig.tar.gz
f77bab59f3eb7db8ae249411f1685292 8114 sisu_0.16.23-1.diff.gz
@@ -5823,8 +5897,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.23.orig.tar.gz
* cosmetic rearrangement of code
-%% sisu_0.16.22.orig.tar.gz (2005w27/4 | 2005-07-07)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.22.orig.tar.gz
+** sisu_0.16.22.orig.tar.gz (2005w27/4 | 2005-07-07)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.22.orig.tar.gz
4c290986eb68607420a602c3fae4baaf 3087090 sisu_0.16.22.orig.tar.gz
c925bddaee01bb7b5d5a2c241f3f75e0 8089 sisu_0.16.22-1.diff.gz
@@ -5837,15 +5911,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.22.orig.tar.gz
* fix to cgi sample sisu_search.cgi
-%% sisu_0.16.21.orig.tar.gz (2005w26/0 | 2005-07-03)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.21.orig.tar.gz
+** sisu_0.16.21.orig.tar.gz (2005w26/0 | 2005-07-03)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.21.orig.tar.gz
9c4a29a357d1b988a351d2f035f8f8ea 3086501 sisu_0.16.21.orig.tar.gz
c80c80a6a90ea037267c127796a0fde5 7956 sisu_0.16.21-1.diff.gz
* small bugfix (param screen print)
-%% sisu_0.16.20.orig.tar.gz (2005w26/0 | 2005-07-03)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.20.orig.tar.gz
+** sisu_0.16.20.orig.tar.gz (2005w26/0 | 2005-07-03)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.20.orig.tar.gz
df663db73934d980ba484d69a2efc361 3086090 sisu_0.16.20.orig.tar.gz
1aee087cb250a1fbd760ceb53fbc8c2b 7927 sisu_0.16.20-1.diff.gz
@@ -5853,23 +5927,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.20.orig.tar.gz
* touch to syntax highlighting
-%% sisu_0.16.19.orig.tar.gz (2005w26/5 | 2005-07-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.19.orig.tar.gz
+** sisu_0.16.19.orig.tar.gz (2005w26/5 | 2005-07-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.19.orig.tar.gz
bf5a17871dfa7f1322bdaa774d24e4bb 3105899 sisu_0.16.19.orig.tar.gz
be224695722d529a481beaadecd695d3 7860 sisu_0.16.19-1.diff.gz
* small touches to vim syntax highlighting.
-%% sisu_0.16.18.orig.tar.gz (2005w26/5 | 2005-07-01)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.18.orig.tar.gz
+** sisu_0.16.18.orig.tar.gz (2005w26/5 | 2005-07-01)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.18.orig.tar.gz
0d6bc75f1c631a423941bd20b8cb8ea0 3105726 sisu_0.16.18.orig.tar.gz
2265f2449b63b2ba9af39e61a09198c9 7846 sisu_0.16.18-1.diff.gz
* some fixes to syntax highlighing: - changes to markup syntax introduced in
0.16 release broke parts of syntax highlighter, more no doubt to follow.
-%% sisu_0.16.17.orig.tar.gz (2005w26/4 | 2005-06-30)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.17.orig.tar.gz
+** sisu_0.16.17.orig.tar.gz (2005w26/4 | 2005-06-30)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.17.orig.tar.gz
410f1c01c261e2cf2bb25ff782b4c0b8 3105488 sisu_0.16.17.orig.tar.gz
649cbe59bf940d93a74cdac46e59123c 7774 sisu_0.16.17-1.diff.gz
@@ -5877,8 +5951,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.17.orig.tar.gz
me for several years i now call it sisu... perhaps i should stick
with slate as it is pretty appropriate... hmmm, slate
-%% sisu_0.16.16.orig.tar.gz (2005w26/3 | 2005-06-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.16.orig.tar.gz
+** sisu_0.16.16.orig.tar.gz (2005w26/3 | 2005-06-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.16.orig.tar.gz
f5ce8002e6876feba22c276d4e49d3f5 3105731 sisu_0.16.16.orig.tar.gz
251af2096015e193888a429cd69a328d 7576 sisu_0.16.16-1.diff.gz
@@ -5886,8 +5960,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.16.orig.tar.gz
with Debian install... needs testing by someone with different
habits though.
-%% sisu_0.16.15.orig.tar.gz (2005w26/3 | 2005-06-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.15.orig.tar.gz
+** sisu_0.16.15.orig.tar.gz (2005w26/3 | 2005-06-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.15.orig.tar.gz
4de2570843cacd2c665fa8204eaab750 3105521 sisu_0.16.15.orig.tar.gz
c650a78d6b079db9c021a608236a920e 7494 sisu_0.16.15-1.diff.gz
@@ -5895,8 +5969,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.15.orig.tar.gz
have still got color file in ftplugin/sisu.vim file
which is not acceptable
-%% sisu_0.16.14.orig.tar.gz (2005w26/3 | 2005-06-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.14.orig.tar.gz
+** sisu_0.16.14.orig.tar.gz (2005w26/3 | 2005-06-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.14.orig.tar.gz
18e0cfcac265ecb03e9af5f958aad0f7 3105239 sisu_0.16.14.orig.tar.gz
493c64b453dc43ff36565aacacbc0b8c 7441 sisu_0.16.14-1.diff.gz
@@ -5907,8 +5981,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.14.orig.tar.gz
else (non-debian install)
Rantfile places in /usr/share/sisu-examples/config/vim
-%% sisu_0.16.13.orig.tar.gz (2005w26/3 | 2005-06-29)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.13.orig.tar.gz
+** sisu_0.16.13.orig.tar.gz (2005w26/3 | 2005-06-29)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.13.orig.tar.gz
775c33a1e6f0140f5552cb3f2784b00a 3124785 sisu_0.16.13.orig.tar.gz
04242b7e8fec91a0b4f69bd 7328 sisu_0.16.13-1.diff.gz
@@ -5920,8 +5994,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.13.orig.tar.gz
* on_markup.txt quick check & minor update
-%% sisu_0.16.12.orig.tar.gz (2005w26/1 | 2005-06-27)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.12.orig.tar.gz
+** sisu_0.16.12.orig.tar.gz (2005w26/1 | 2005-06-27)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.12.orig.tar.gz
5bdff14e999ea933abdb3f3bfbbc0dcb 3119368 sisu_0.16.12.orig.tar.gz
5a9f5898165c74e60b6292b6e777beba 7105 sisu_0.16.12-1.diff.gz
@@ -5934,8 +6008,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.12.orig.tar.gz
* touch to Rantfile.
-%% sisu_0.16.11.orig.tar.gz (2005w26/1 | 2005-06-27)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.11.orig.tar.gz
+** sisu_0.16.11.orig.tar.gz (2005w26/1 | 2005-06-27)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.11.orig.tar.gz
b14414943ca84f66cde1f646da7a2329 3118990 sisu_0.16.11.orig.tar.gz
742089f905479231a32fb6b4fc62824f 7024 sisu_0.16.11-1.diff.gz
@@ -5948,8 +6022,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.11.orig.tar.gz
/etc/sisu/skin/doc is ignored, breaking expected
search precedence
-%% sisu_0.16.10.orig.tar.gz (2005w25/0 | 2005-06-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.10.orig.tar.gz
+** sisu_0.16.10.orig.tar.gz (2005w25/0 | 2005-06-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.10.orig.tar.gz
73a4f8c6ffedbee7f1a9571b5f9c25da 3118710 sisu_0.16.10.orig.tar.gz
d6307e6e6f42f795d31d6516f6ef48ec 6919 sisu_0.16.10-1.diff.gz
@@ -5960,23 +6034,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.10.orig.tar.gz
depreciated, having or using alternative markup styles is
less tidy)
-%% sisu_0.16.9.orig.tar.gz (2005w25/0 | 2005-06-26)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.9.orig.tar.gz
+** sisu_0.16.9.orig.tar.gz (2005w25/0 | 2005-06-26)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.9.orig.tar.gz
28615d4dcdc00d8342d2d88273f2f5a1 3118488 sisu_0.16.9.orig.tar.gz
00142e23bfd377bc4e1a9d7be287d108 6775 sisu_0.16.9-1.diff.gz
* cleaning up of man pages, largely for html presentation
generated by rman
-%% sisu_0.16.8.orig.tar.gz (2005w25/6 | 2005-06-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.8.orig.tar.gz
+** sisu_0.16.8.orig.tar.gz (2005w25/6 | 2005-06-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.8.orig.tar.gz
d050e1532def2b862843ac653010c97e 3117054 sisu_0.16.8.orig.tar.gz
89fb5d9a06748d1c12da98d7b947e0c9 6696 sisu_0.16.8-1.diff.gz
* minor edits
-%% sisu_0.16.7.orig.tar.gz (2005w25/6 | 2005-06-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.7.orig.tar.gz
+** sisu_0.16.7.orig.tar.gz (2005w25/6 | 2005-06-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.7.orig.tar.gz
c0afd925e862a2d149f642af6e02f231 3116725 sisu_0.16.7.orig.tar.gz
28093c9d63cb5cbdd4bbc9d5cca16020 6678 sisu_0.16.7-1.diff.gz
@@ -5985,8 +6059,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.7.orig.tar.gz
* related rather cosmetic changes
-%% sisu_0.16.6.orig.tar.gz (2005w25/6 | 2005-06-25)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.6.orig.tar.gz
+** sisu_0.16.6.orig.tar.gz (2005w25/6 | 2005-06-25)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.6.orig.tar.gz
23e4aecd915e86191c8e4622cae787bb 3100364 sisu_0.16.6.orig.tar.gz
cf7b0f29ecaba525d0c4f875ee8ba01f 6632 sisu_0.16.6-1.diff.gz
@@ -5994,8 +6068,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.6.orig.tar.gz
command is :F (ruby folds :R)
assuming the file is in place and in use
-%% sisu_0.16.5.orig.tar.gz (2005w25/5 | 2005-06-24)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.5.orig.tar.gz
+** sisu_0.16.5.orig.tar.gz (2005w25/5 | 2005-06-24)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.5.orig.tar.gz
7e7ad7b08a1e6177f6333f699a23b4bb 3099726 sisu_0.16.5.orig.tar.gz
8796ef31f655d9f074af00c352492653 6599 sisu_0.16.5-1.diff.gz
@@ -6012,8 +6086,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.5.orig.tar.gz
* removed from tarball markup samples eu contract law principles
can be found at http://www.jus.uio.no/sisu/sample
-%% sisu_0.16.4.orig.tar.gz (2005w25/4 | 2005-06-23)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.4.orig.tar.gz
+** sisu_0.16.4.orig.tar.gz (2005w25/4 | 2005-06-23)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.4.orig.tar.gz
899e08a81adf3544079e61f058c76388 3125518 sisu_0.16.4.orig.tar.gz
2b70dde1fa067b1b03729be4c1688e2e 6379 sisu_0.16.4-1.diff.gz
@@ -6021,8 +6095,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.4.orig.tar.gz
* an image path adjusted
-%% sisu_0.16.3.orig.tar.gz (2005w25/4 | 2005-06-23)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.3.orig.tar.gz
+** sisu_0.16.3.orig.tar.gz (2005w25/4 | 2005-06-23)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.3.orig.tar.gz
7dc657a1299e3ff831c932eb3975293f 3124710 sisu_0.16.3.orig.tar.gz
93210116080bed4f22356e8ac1bba570 6324 sisu_0.16.3-1.diff.gz
@@ -6032,8 +6106,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.3.orig.tar.gz
xml css naive but done
latex/pdf done
-%% sisu_0.16.2.orig.tar.gz (2005w25/3 | 2005-06-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.2.orig.tar.gz
+** sisu_0.16.2.orig.tar.gz (2005w25/3 | 2005-06-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.2.orig.tar.gz
c3306db32d485d515a4464766d3b81c8 3124314 sisu_0.16.2.orig.tar.gz
e82cc99b1a8a62cb1d590aa3dc65a4eb 6227 sisu_0.16.2-1.diff.gz
@@ -6045,8 +6119,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.2.orig.tar.gz
* rant install options, force specification of root if wish to
proceed as root, (previously was default on ok or continue)
-%% sisu_0.16.1.orig.tar.gz (2005w25/3 | 2005-06-22)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.1.orig.tar.gz
+** sisu_0.16.1.orig.tar.gz (2005w25/3 | 2005-06-22)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.1.orig.tar.gz
ad0220d5d7097833f404f3ffa1301525 3123961 sisu_0.16.1.orig.tar.gz
a7f0bf6bd77746a57f6724d3922bbf2c 6039 sisu_0.16.1-1.diff.gz
@@ -6059,8 +6133,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.1.orig.tar.gz
* fix, one sample document was overlooked in last package
(autonomy_markup2)
-%% sisu_0.16.0.orig.tar.gz (2005w25/2 | 2005-06-21)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.0.orig.tar.gz
+** sisu_0.16.0.orig.tar.gz (2005w25/2 | 2005-06-21)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.0.orig.tar.gz
d6ddb880cf0958893665ca0f0609acea 3123554 sisu_0.16.0.orig.tar.gz
329d30ee875d4d2be75f981a9a875457 5830 sisu_0.16.0-1.diff.gz
@@ -6157,10 +6231,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.16.0.orig.tar.gz
* extensive testing required
-%% Syntax Changes in 0.16 break previous markup
+** Syntax Changes in 0.16 break previous markup
-%% sisu_0.14.6.orig.tar.gz (2005w24/6 | 2005-06-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.6.orig.tar.gz
+** sisu_0.14.6.orig.tar.gz (2005w24/6 | 2005-06-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.6.orig.tar.gz
6c027f44470c313eaae1569a5df8cfb7 3121245 sisu_0.14.6.orig.tar.gz
069eafa4261ffc542172a4fc84d5fa44 4723 sisu_0.14.6-1.diff.gz
@@ -6180,8 +6254,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.6.orig.tar.gz
* (touch to sisu-examples description in debian control file)
-%% sisu_0.14.5.orig.tar.gz (2005w24/6 | 2005-06-18)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.5.orig.tar.gz
+** sisu_0.14.5.orig.tar.gz (2005w24/6 | 2005-06-18)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.5.orig.tar.gz
1d86c68c0e44f835aeeb2d9b89502f1d 3120463 sisu_0.14.5.orig.tar.gz
c3589fc3343d0503e452b846d778f9d3 4412 sisu_0.14.5-1.diff.gz
@@ -6189,8 +6263,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.5.orig.tar.gz
* added reference to abandoned U.S. provisional patent application
-%% sisu_0.14.4.orig.tar.gz (2005w24/5 | 2005-06-17)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.4.orig.tar.gz
+** sisu_0.14.4.orig.tar.gz (2005w24/5 | 2005-06-17)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.4.orig.tar.gz
15ea5387b4cd88717c12c4d1a583d99d 3119833 sisu_0.14.4.orig.tar.gz
10961f292abd7ad47b6c072aad6f525e 4339 sisu_0.14.4-1.diff.gz
@@ -6202,15 +6276,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.4.orig.tar.gz
* bug fix for minor numbering using # mark, and re-calibrating
removed an extraneous tilde (~)
-%% sisu_0.14.3.orig.tar.gz (2005w24/3 | 2005-06-15)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.3.orig.tar.gz
+** sisu_0.14.3.orig.tar.gz (2005w24/3 | 2005-06-15)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.3.orig.tar.gz
7324ba16cdf644bb560a99 3119435 sisu_0.14.3.orig.tar.gz
3988a9ad582121b1972a 4190 sisu_0.14.3-1.diff.gz
* removed files cgi.rb and cgi_supplies.rb as unused.
-%% sisu_0.14.2.orig.tar.gz (2005w24/2 | 2005-06-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.2.orig.tar.gz
+** sisu_0.14.2.orig.tar.gz (2005w24/2 | 2005-06-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.2.orig.tar.gz
90ab342311461a0c7b752df78e43d3b5 3121884 sisu_0.14.2.orig.tar.gz
257f8716e88e0a29aa6853d73520821d 3414 sisu_0.14.2-1.diff.gz
@@ -6218,15 +6292,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.2.orig.tar.gz
-h and -H currently do what -g used to by default
(will revisit)
-%% sisu_0.14.1.orig.tar.gz (2005w23/2 | 2005-06-14)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.1.orig.tar.gz
+** sisu_0.14.1.orig.tar.gz (2005w23/2 | 2005-06-14)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.1.orig.tar.gz
3c1ea0dfcf670316bd2ce49f0a4d65f8 3121529 sisu_0.14.1.orig.tar.gz
b87620429c979c9a85f3cf39911d9347 3463 sisu_0.14.1-1.diff.gz
* documentation related, but minor
-%% sisu_0.14.0.orig.tar.gz (2005w22/6 | 2005-06-04)
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.0.orig.tar.gz
+** sisu_0.14.0.orig.tar.gz (2005w22/6 | 2005-06-04)
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.0.orig.tar.gz
a7ba5eeedad74ba6231f13c3a39535ec 3121235 sisu_0.14.0.orig.tar.gz
fd74f52531699370664657064aed8578 3406 sisu_0.14.0-1.diff.gz
@@ -6245,10 +6319,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.14.0.orig.tar.gz
* Added man page summary of sisu-examples
(and a README for directory which refers you to man page)
-%% sisu_0.12.7.tar.gz (2005w22/3 | 2005-06-01 )
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.7.tar.gz
+** sisu_0.12.7.tar.gz (2005w22/3 | 2005-06-01 )
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.7.tar.gz
MD5(sisu_0.12.7.tar.gz)= 080a45e3e94ed744cca9d0222aa0ae9b
- [(self inflicted) glitch with Debian build, not released together with source tarball.]
+ [(self inflicted) glitch with Debian build, not released together with source
+ tarball.]
* Make SiSU convenient to use to produce other formats (including LaTeX)
without the software necessary to produce pdf, i.e. pdflatex
@@ -6261,8 +6336,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.7.tar.gz
* Removed Debian require dependency on tetex-base and tetex-extra (in which
pdflatex resides).
-%% sisu_0.12.6.orig.tar.gz (2005w21/4 | 2005-05-26 )
-http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.6.orig.tar.gz
+** sisu_0.12.6.orig.tar.gz (2005w21/4 | 2005-05-26 )
+ http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.6.orig.tar.gz
4cb96905865bead50d0a53c8b0f12e91 3118290 sisu_0.12.6.orig.tar.gz
b03f53624fa3030646c5f4e5ff020262 3379 sisu_0.12.6-1.diff.gz
@@ -6276,16 +6351,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.12.6.orig.tar.gz
* removed sisu-[version number] executable, is not necessary, (resulted in
skip from 0.12.6 from 0.12.4) [0.12.6]
-%% sisu_0.12.5.orig.tar.gz
-skipped, synced tarball and deb in 0.12.6
+** sisu_0.12.5.orig.tar.gz
+ skipped, synced tarball and deb in 0.12.6
-%% sisu_0.12.4.orig.tar.gz (2005w21/4 | 2005-05-26 ):
+** sisu_0.12.4.orig.tar.gz (2005w21/4 | 2005-05-26 ):
2ba51878d3e68ac1d268b3aa0294a2ab 3123433 sisu_0.12.4.orig.tar.gz
9c0309ccdce1d13946d1a74c48f07ff4 3300 sisu_0.12.4-1.diff.gz
* sisu_webrick fix, update
-%% sisu_0.12.3.orig.tar.gz (2005w21/3 | 2005-05-25 ):
+** sisu_0.12.3.orig.tar.gz (2005w21/3 | 2005-05-25 ):
ac5e82b8d2a88503d8d004bee12cd979 3123419 sisu_0.12.3.orig.tar.gz
db7b4401a63dea7b9f47b6ead5cf9d4a 3272 sisu_0.12.3-1.diff.gz
@@ -6297,7 +6372,7 @@ skipped, synced tarball and deb in 0.12.6
* touch to sisu_termsheet, colour fix
-%% sisu_0.12.2.orig.tar.gz (2005w21/1 | 2005-05-23 ):
+** sisu_0.12.2.orig.tar.gz (2005w21/1 | 2005-05-23 ):
65d8cc8021579e307f8c2cce31cc988 3119888 sisu_0.12.2.orig.tar.gz
6a13bc64be600e96366ccff0fac66344 3208 sisu_0.12.2-1.diff.gz
@@ -6306,7 +6381,7 @@ skipped, synced tarball and deb in 0.12.6
* switch from using the sha digest to md5
-%% sisu_0.12.1.orig.tar.gz (2005w21/1 | 2005-05-23 ):
+** sisu_0.12.1.orig.tar.gz (2005w21/1 | 2005-05-23 ):
2c877136005c5052921e619d435f0c91 3119846 sisu_0.12.1.orig.tar.gz
28e4022ff40fcfc0c5d8f6d64279ede7 3146 sisu_0.12.0-1.diff.gz
@@ -6315,7 +6390,7 @@ skipped, synced tarball and deb in 0.12.6
* switch from using the sha digest to md5
-%% sisu_0.12.0.orig.tar.gz (2005w20/4 | 2005-05-20 ):
+** sisu_0.12.0.orig.tar.gz (2005w20/4 | 2005-05-20 ):
SHA1(sisu_0.12.0.orig.tar.gz)= ca95d1bc6e601d74bbe17516b2d5abbe09c76c49
MD5(sisu_0.12.0.orig.tar.gz)= 9a2ec914f925b275045d5a0846edab79
9a2ec914f925b275045d5a0846edab79 3101948 sisu_0.12.0.orig.tar.gz
@@ -6328,7 +6403,7 @@ skipped, synced tarball and deb in 0.12.6
* switch from using the sha digest to md5
-%% SiSU version 0.10.9 of 2005w20/2 (2005-05-17):
+** SiSU version 0.10.9 of 2005w20/2 (2005-05-17):
sisu_0.10.9.tar.gz
SHA1(sisu_0.10.9.tar.gz)= bdb1ea25792549e77f88e9dac56442393714cd7c
Debian sisu_0.10.9-1.dsc
@@ -6362,10 +6437,11 @@ skipped, synced tarball and deb in 0.12.6
effort. The Rantfile, or rather install works without
the separate installation of rant.
-%% SiSU version 0.10.8 of 2005w20/1 (2005-05-16):
+** SiSU version 0.10.8 of 2005w20/1 (2005-05-16):
sisu_0.10.8.tar.gz
SHA1(sisu_0.10.8.tar.gz)= 09618366119ae0e7cf047083b860e71fce2cd599
- Debian sisu_0.10.8-1.dsc: 25da3de61eb78d31abf70472022e7a32 3078004 sisu_0.10.8-1.tar.gz
+ Debian sisu_0.10.8-1.dsc: 25da3de61eb78d31abf70472022e7a32 3078004
+ sisu_0.10.8-1.tar.gz
* Package directory structure changed to suit setup.rb default mapping
and applied to Rant and debian builds (Rake not checked)
@@ -6381,10 +6457,11 @@ skipped, synced tarball and deb in 0.12.6
* SiSU version information adjustment, see display e.g.:
sisu -v
-%% SiSU version 0.10.7 of 2005w19/0 (2005-05-15):
+** SiSU version 0.10.7 of 2005w19/0 (2005-05-15):
sisu_0.10.7.tar.gz
SHA1(sisu_0.10.7.tar.gz)= e18a47f07c1627f353bfc3a7c1e9d647c3265cf3
- Debian sisu_0.10.7-1.dsc: d5978970a1e5891e5e9b0b406f503f79 3094556 sisu_0.10.7-1.tar.gz
+ Debian sisu_0.10.7-1.dsc: d5978970a1e5891e5e9b0b406f503f79 3094556
+ sisu_0.10.7-1.tar.gz
* Rantfile for installation, (Stefan Lang's rant)
to install SiSU, in the root directory of the unpacked SiSU as root type:
@@ -6392,32 +6469,33 @@ skipped, synced tarball and deb in 0.12.6
* Rakefile fix to path for sisu-examples
-%% SiSU version 0.10.6 of 2005w19/3 (2005-05-11):
+** SiSU version 0.10.6 of 2005w19/3 (2005-05-11):
sisu_0.10.6.tar.gz
SHA1(sisu_0.10.6.tar.gz)= 55c891acbfe9eb734f96950d4cc646022112eda8
- Debian sisu_0.10.6-1.dsc: 1124ffebc09426d2c16854069c398483 6140896 sisu_0.10.6-1.tar.gz
+ Debian sisu_0.10.6-1.dsc: 1124ffebc09426d2c16854069c398483 6140896
+ sisu_0.10.6-1.tar.gz
* some re-calibration of ocn required.
-%% SiSU version 0.10.5 of 2005w18/0 (2005-05-08):
+** SiSU version 0.10.5 of 2005w18/0 (2005-05-08):
sisu_0.10.5.tar.gz
SHA1(sisu_0.10.5.tar.gz)= 274be3ca806288d7cce5607707c4fd35fe1ecc6c
* version detail [synchronising packaging]
-%% SiSU version 0.10.4 of 2005w18/0 (2005-05-08):
+** SiSU version 0.10.4 of 2005w18/0 (2005-05-08):
sisu_0.10.4.tar.gz
SHA1(sisu_0.10.4.tar.gz)= 3adfc0400055fa45200158c34523486fdede895a
* small fix on reporting, generated by information, metaverse
-%% SiSU version 0.10.3 of 2005w18/0 (2005-05-08):
+** SiSU version 0.10.3 of 2005w18/0 (2005-05-08):
sisu_0.10.3.tar.gz
SHA1(sisu_0.10.3.tar.gz)= ad95cbe339115437f1605e4aa7d7cd4519bb34cb
* cleaning in packages
-%% SiSU version 0.10.2 of 2005w18/0 (2005-05-08):
+** SiSU version 0.10.2 of 2005w18/0 (2005-05-08):
sisu_0.10.2.tar.gz
SHA1(sisu_0.10.2.tar.gz)= 6e02af05df9b32ed3565b2058bb15ab19482c893
@@ -6428,7 +6506,7 @@ skipped, synced tarball and deb in 0.12.6
the time being stick to just sisu
(previous work-names/nick-names included scribbler, and scribe)
-%% SiSU version 0.10.1 of 2005w18/5 (2005-05-06):
+** SiSU version 0.10.1 of 2005w18/5 (2005-05-06):
sisu_0.10.1.tar.gz
SHA1(sisu_0.10.1.tar.gz)= 210f6ba09aa8d78239a5b01ef981c1f615bce1f6
Contains development-branch, version 0.11.1 of 2005w18/5
@@ -6455,7 +6533,7 @@ skipped, synced tarball and deb in 0.12.6
* fix to cgi sample: sisu_search.cgi
related to match linking to endnotes, (#~\d instead of #\d)
-%% SiSU Sabaki, version 0.10.0 of 2005w18/2 (2005-05-03):
+** SiSU Sabaki, version 0.10.0 of 2005w18/2 (2005-05-03):
sisu-sabaki_0.10.0_2005w18-2.tar.gz
SHA1(sisu-sabaki_0.10.0_2005w18-2.tar.gz)=
fe59ad4f07346713e945de0d87b8b4b57b69fd62
@@ -6471,7 +6549,7 @@ skipped, synced tarball and deb in 0.12.6
* looking at debian packaging
synchronise packaging (0.9.7 - 0.9.9)
-%% SiSU Sabaki, version 0.8.4 of 2005w17/6 (2005-04-30):
+** SiSU Sabaki, version 0.8.4 of 2005w17/6 (2005-04-30):
sisu-sabaki_0.8.4_2005w17-6.tar.gz
SHA1(sisu-sabaki_0.8.4_2005w17-6.tar.gz)=
b8385ec8b6cecd4a2cda06fd42151244a3697e5e
@@ -6480,7 +6558,7 @@ skipped, synced tarball and deb in 0.12.6
0.9.7 2005w17/6
* tex/pdf document information
-%% SiSU Sabaki, version 0.8.3 of 2005w17/5 (2005-04-29):
+** SiSU Sabaki, version 0.8.3 of 2005w17/5 (2005-04-29):
sisu-sabaki_0.8.3_2005w17-5.tar.gz
SHA1(sisu-sabaki_0.8.3_2005w17-5.tar.gz)=
5603a862909c24eaec7a65b91f376e581fc76362
@@ -6489,7 +6567,7 @@ skipped, synced tarball and deb in 0.12.6
0.9.5 - 6 2005w17/5
* xml series tables
-%% SiSU Sabaki, version 0.8.2 of 2005w17/5 (2005-04-29):
+** SiSU Sabaki, version 0.8.2 of 2005w17/5 (2005-04-29):
sisu-sabaki_0.8.2_2005w17-5.tar.gz
SHA1(sisu-sabaki_0.8.2_2005w17-5.tar.gz)=
6564d4babe9a04520699bdeaac0f13c0bd723fa3
@@ -6503,7 +6581,7 @@ skipped, synced tarball and deb in 0.12.6
tables not created at present, and removed
revisit, (previous version inserted non-"tidy" xml markup)
-%% SiSU Sabaki, version 0.8.1 of 2005w17/4 (2005-04-28):
+** SiSU Sabaki, version 0.8.1 of 2005w17/4 (2005-04-28):
sisu-sabaki_0.8.1_2005w17-4.tar.gz
SHA1(sisu-sabaki_0.8.1_2005w17-4.tar.gz)=
c3508979690aad04834238354b259ae0c2588bfb
@@ -6513,7 +6591,7 @@ skipped, synced tarball and deb in 0.12.6
* hot on the heels of 0.8.0 some fixes, and more likely to follow.
-%% SiSU Sabaki, version 0.8.0 of 2005w17/4 (2005-04-28):
+** SiSU Sabaki, version 0.8.0 of 2005w17/4 (2005-04-28):
sisu-sabaki_0.8.0_2005w17-4.tar.gz
SHA1(sisu-sabaki_0.8.0_2005w17-4.tar.gz)=
8fcfc3f8d7661a0b3110a3206491581a93e0e920
@@ -6551,7 +6629,7 @@ skipped, synced tarball and deb in 0.12.6
* more fixes needed in libraries using altered ocn/metaverse
-%% SiSU Sabaki, version 0.6.1 of 2005w16/0 (2005-04-24):
+** SiSU Sabaki, version 0.6.1 of 2005w16/0 (2005-04-24):
sisu-sabaki_0.6.1_2005w16-0.tar.gz
SHA1(sisu-sabaki_0.6.1_2005w16-0.tar.gz)=
c824120ade54278b78a82ed535318974b30d3073
@@ -6626,7 +6704,7 @@ skipped, synced tarball and deb in 0.12.6
* table fix...
-%% SiSU Sabaki, version 0.4.3 of 2005w16/1 (2005-04-18):
+** SiSU Sabaki, version 0.4.3 of 2005w16/1 (2005-04-18):
sisu-sabaki_0.4.3_2005w16-1.tar.gz
SHA1(sisu-sabaki_0.4.3_2005w16-1.tar.gz)=
***
@@ -6676,7 +6754,7 @@ skipped, synced tarball and deb in 0.12.6
* dbi fixes from 0.5.8 changes (ansi)
-%% SiSU Sabaki, version 0.4.2 of 2005w15/4 (2005-04-14):
+** SiSU Sabaki, version 0.4.2 of 2005w15/4 (2005-04-14):
sisu-sabaki_0.4.2_2005w15-4.tar.gz
SHA1(sisu-sabaki_0.4.2_2005w15-4.tar.gz)=
d670058fe019a106b385049416db5c914fbf308d
@@ -6690,7 +6768,7 @@ skipped, synced tarball and deb in 0.12.6
* xml, minor touch, image tag, version/revision control info optional
-%% SiSU Sabaki, version 0.4.1 of 2005w15/3 (2005-04-13):
+** SiSU Sabaki, version 0.4.1 of 2005w15/3 (2005-04-13):
sisu-sabaki_0.4.1_2005w15-3.tar.gz
SHA1(sisu-sabaki_0.4.1_2005w15-3.tar.gz)=
0b1c6f10832e114f55e4a7d37f6f98d7c345b55f
@@ -6712,7 +6790,7 @@ skipped, synced tarball and deb in 0.12.6
(to 12,000 for now from inadequate 2712)
both postgresql and sqlite appear to support this
-%% SiSU Sabaki, version 0.4.0 of 2005w15/2 (2005-04-12):
+** SiSU Sabaki, version 0.4.0 of 2005w15/2 (2005-04-12):
sisu-sabaki_0.4.0_2005w15-2.tar.gz
SHA1(sisu-sabaki_0.4.0_2005w15-2.tar.gz)=
832f47c37910dfbac05c401f26865b5f53dea358
@@ -6745,7 +6823,7 @@ skipped, synced tarball and deb in 0.12.6
For description of change see 0.3.1
-%% SiSU Sabaki, version 0.2.0 of 2005w14/0 (2005-04-10):
+** SiSU Sabaki, version 0.2.0 of 2005w14/0 (2005-04-10):
sisu-sabaki_0.2.0_2005w14-0.tar.gz
SHA1(sisu-sabaki_0.2.0_2005w14-0.tar.gz)=
36986ffa6a17651a0d52646c9c91032af33bb32a
@@ -6760,9 +6838,9 @@ skipped, synced tarball and deb in 0.12.6
* replaced config_environment.rb file which had dropped out of stable
tarball. [lesson, test future setup/installs from clean slate]
-%% STABLE MANIFEST (@ 0.1.4 branch)
+** STABLE MANIFEST (@ 0.1.4 branch)
-%% SiSU Sabaki, version 0.1.4-11 of 2005w14/6 (2005-04-09):
+** SiSU Sabaki, version 0.1.4-11 of 2005w14/6 (2005-04-09):
sisu-sabaki-stable_0.1.4-10_2005w14-6.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-11_2005w14-6.tar.gz)=
bdb2b09d467804a6d3a4bd92abb13c015c57d897
@@ -6796,7 +6874,7 @@ skipped, synced tarball and deb in 0.12.6
* alt and group text groupings bugfix
-%% SiSU Sabaki, version 0.1.4-10 of 2005w13/6 (2005-04-02):
+** SiSU Sabaki, version 0.1.4-10 of 2005w13/6 (2005-04-02):
sisu-sabaki-stable_0.1.4-10_2005w13-6.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-10_2005w13-6.tar.gz)=
bdd91b004c456251d6e7074439f6e9b571ae5316
@@ -6829,17 +6907,17 @@ skipped, synced tarball and deb in 0.12.6
0.1.5-51 of 2005w13/4
- * initial xml table logic is in place (logic taken from html unit) [still using
- html type tags but logic is in place]
+ * initial xml table logic is in place (logic taken from html unit) [still
+ using html type tags but logic is in place]
0.1.5-52 of 2005w13/6
* object character numbering of special blocks "code", "poem", "group"
and "alt" finally corrected, in line with "tables". (may introduce a subtle
- variation, between poem and code, or alt and others, numbering the equivalent
- of each verse, but need a bit of time to consider) numbering correct, some
- cosmetic adjustments to follow, e.g. in pdfs, more work necessary in xml
- series.
+ variation, between poem and code, or alt and others, numbering the
+ equivalent of each verse, but need a bit of time to consider) numbering
+ correct, some cosmetic adjustments to follow, e.g. in pdfs, more work
+ necessary in xml series.
0.1.5-53 of 2005w13/6
@@ -6857,7 +6935,7 @@ skipped, synced tarball and deb in 0.12.6
* sisu info improved in latex output
-%% SiSU Sabaki, version 0.1.4-9 of 2005w13/2 (2005-03-29):
+** SiSU Sabaki, version 0.1.4-9 of 2005w13/2 (2005-03-29):
sisu-sabaki-stable_0.1.4-9_2005w13-2.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-9_2005w13-2.tar.gz)=
743b912beddc235ec96456e97fe9350b2a275370
@@ -6866,7 +6944,7 @@ skipped, synced tarball and deb in 0.12.6
* small updates to man page
-%% SiSU Sabaki, version 0.1.4-8 of 2005w13/2 (2005-03-29):
+** SiSU Sabaki, version 0.1.4-8 of 2005w13/2 (2005-03-29):
sisu-sabaki-stable_0.1.4-8_2005w13-1.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-8_2005w13-1.tar.gz)=
f8a7760bbd583e5d8637420d153c178ffafcbf68
@@ -7051,7 +7129,7 @@ skipped, synced tarball and deb in 0.12.6
* man page small update, file name extensions (xhtml and plain-text)
-%% SiSU Sabaki, version 0.1.4-7 of 2005w12/3 (2005-03-23):
+** SiSU Sabaki, version 0.1.4-7 of 2005w12/3 (2005-03-23):
sisu-sabaki-stable_0.1.4-7_2005w12-3.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-7_2005w12-3.tar.gz)=
929875de0658f1adeabd837fa09aca3ae48197e0
@@ -7083,7 +7161,7 @@ skipped, synced tarball and deb in 0.12.6
* expressly close segment files as produced, (else problem remote sending
last metadata file created as is not yet closed)
-%% SiSU Sabaki, version 0.1.4-6 of 2005w12/1 (2005-03-21):
+** SiSU Sabaki, version 0.1.4-6 of 2005w12/1 (2005-03-21):
sisu-sabaki-stable_0.1.4-6_2005w12-1.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-6_2005w12-1.tar.gz)=
3f8ded60f1f43e3ba3e745d9bbc045bb0ab43ffb
@@ -7148,7 +7226,7 @@ skipped, synced tarball and deb in 0.12.6
precedence to .txt extension over .html i.e. when doc is requested doc.txt
rather than doc.html (the sisu preferred default) would be presented.
-%% SiSU Sabaki, version 0.1.4-5 of 2005w11/2 (2005-03-15):
+** SiSU Sabaki, version 0.1.4-5 of 2005w11/2 (2005-03-15):
sisu-sabaki-stable_0.1.4-5_2005w11-2.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-5_2005w11-2.tar.gz)=
25e35edc2f932269d21b17c29890ad72c54510a5
@@ -7159,7 +7237,7 @@ skipped, synced tarball and deb in 0.12.6
* [see 0.1.4-4 for recent changes]
-%% SiSU Sabaki, version 0.1.4-4 of 2005w11/1 (2005-03-14):
+** SiSU Sabaki, version 0.1.4-4 of 2005w11/1 (2005-03-14):
sisu-sabaki-stable_0.1.4-4_2005w11-1.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-4_2005w11-1.tar.gz)=
2ab9fa0a45275ca65a23e5199ef13851f00042f2
@@ -7177,7 +7255,7 @@ skipped, synced tarball and deb in 0.12.6
* some code files moved and renamed
-%% SiSU Sabaki, version 0.1.4-3 of 2005w10/5 (2005-03-11):
+** SiSU Sabaki, version 0.1.4-3 of 2005w10/5 (2005-03-11):
sisu-sabaki-stable_0.1.4-3_2005w10-5.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-3_2005w10-5.tar.gz)=
7e06a3b37e85eaebc74892244f6626ee4f2fcc8a
@@ -7193,7 +7271,7 @@ skipped, synced tarball and deb in 0.12.6
base directory for output on remote server - only sub-directories for each
document produced.
-%% SiSU Sabaki, version 0.1.4-2 of 2005w10/5 (2005-03-11):
+** SiSU Sabaki, version 0.1.4-2 of 2005w10/5 (2005-03-11):
sisu-sabaki-stable_0.1.4-2_2005w10-5.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-2_2005w10-5.tar.gz)=
46ad3b254b5e9293610dccd6274e039e49c5b9a2
@@ -7218,7 +7296,7 @@ skipped, synced tarball and deb in 0.12.6
* an email address update for author
-%% SiSU Sabaki, version 0.1.4-1 of 2005w10/3 (2005-03-09):
+** SiSU Sabaki, version 0.1.4-1 of 2005w10/3 (2005-03-09):
sisu-sabaki-stable_0.1.4-1_2005w10-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki-stable_0.1.4-0_2005w10-3.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-1_2005w10-3.tar.gz)=
@@ -7282,8 +7360,8 @@ skipped, synced tarball and deb in 0.12.6
run SiSU to see what breaks...
* issues detected with LaTeX/pdf and sorted
- * hooks for paper size used by latex/pdf in place currently only default a4 set
- for all available types, sort out LaTeX settings later.
+ * hooks for paper size used by latex/pdf in place currently only default a4
+ set for all available types, sort out LaTeX settings later.
* text version of version manifest included start to provide 2004-02-27
@@ -7301,7 +7379,7 @@ skipped, synced tarball and deb in 0.12.6
* included Debian directory, first attempt at making a deb.
[still only in development directory]
-%% SiSU Sabaki, version 0.1.4-0 of 2005w07/2 (2005-02-15):
+** SiSU Sabaki, version 0.1.4-0 of 2005w07/2 (2005-02-15):
sisu-sabaki-stable_0.1.4-0_2005w07-2.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki-stable_0.1.4-0_2005w07-2.tar.gz
SHA1(sisu-sabaki-stable_0.1.4-0_2005w07-2.tar.gz)=
@@ -7314,7 +7392,7 @@ skipped, synced tarball and deb in 0.12.6
* tables are currently omitted from xml output, and table notes are disabled
for the moment
-%% SiSU Sabaki, version 0.1.2-27 of 2005w05/0 (2005-02-06):
+** SiSU Sabaki, version 0.1.2-27 of 2005w05/0 (2005-02-06):
sisu-sabaki_0.1.2-27_2005w05-0.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-27_2005w05-0.tar.gz
SHA1(sisu-sabaki_0.1.2-27_2005w05-0.tar.gz)=
@@ -7326,7 +7404,7 @@ skipped, synced tarball and deb in 0.12.6
* word map hardlinks ... (.html suffix previously handled by webserver
configuration)
-%% SiSU Sabaki, version 0.1.2-26 of 2005w05/0 (2005-02-06):
+** SiSU Sabaki, version 0.1.2-26 of 2005w05/0 (2005-02-06):
sisu-sabaki_0.1.2-26_2005w05-0.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-26_2005w05-0.tar.gz
SHA1(sisu-sabaki_0.1.2-26_2005w05-0.tar.gz)=
@@ -7335,7 +7413,7 @@ skipped, synced tarball and deb in 0.12.6
* adjustments to Rakefile post installation configuration and generation of
sample file output
-%% SiSU Sabaki, version 0.1.2-25 of 2005w05/5 (2005-02-04):
+** SiSU Sabaki, version 0.1.2-25 of 2005w05/5 (2005-02-04):
sisu-sabaki_0.1.2-25_2005w05-5.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-25_2005w05-5.tar.gz
SHA1(sisu-sabaki_0.1.2-25_2005w05-5.tar.gz)=
@@ -7349,7 +7427,7 @@ skipped, synced tarball and deb in 0.12.6
* As rake has been configured to do post installation setup, it is the
preferred method of installation for the present time.
-%% SiSU Sabaki, version 0.1.2-24 of 2005w05/5 (2005-02-04):
+** SiSU Sabaki, version 0.1.2-24 of 2005w05/5 (2005-02-04):
sisu-sabaki_0.1.2-24_2005w05-5.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-24_2005w05-5.tar.gz
SHA1(sisu-sabaki_0.1.2-24_2005w05-5.tar.gz)=
@@ -7368,8 +7446,8 @@ skipped, synced tarball and deb in 0.12.6
as it is so far only used in SiSU for cosmetic purposes, rexml is ignored if
not found. Caused hiccup if not present in previous version.
- * on Debian testers had to have the following packages installed in addition to
- having ruby1.8 and preferably rake as well:
+ * on Debian testers had to have the following packages installed in addition
+ to having ruby1.8 and preferably rake as well:
tetex-base tetex-bin tetex-extra
libyaml-ruby
other programs used if available
@@ -7379,7 +7457,7 @@ skipped, synced tarball and deb in 0.12.6
Ruby
http://www.rubygarden.org/ruby?RubyOnMacintosh
-%% *Withdrawn* - SiSU Sabaki, version 0.1.2-23 of 2005w05/4 (2005-02-03):
+** *Withdrawn* - SiSU Sabaki, version 0.1.2-23 of 2005w05/4 (2005-02-03):
sisu-sabaki_0.1.2-23_2005w05-4.tar.gz
SHA1(sisu-sabaki_0.1.2-23_2005w05-4.tar.gz)=
771e0a98246162c61618dc941ab9831e57551e9f
@@ -7394,14 +7472,14 @@ skipped, synced tarball and deb in 0.12.6
/etc/sisu/0.1.2/sisurc.yaml.sample_disabled probably best copied to ~/.sisu
and renamed sisurc.yaml)
-%% SiSU Sabaki, version 0.1.2-22 of 2005w05/3 (2005-02-02):
+** SiSU Sabaki, version 0.1.2-22 of 2005w05/3 (2005-02-02):
sisu-sabaki_0.1.2-22_2005w05-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-22_2005w05-3.tar.gz
SHA1(sisu-sabaki_0.1.2-22_2005w05-3.tar.gz)=
b9b51c7f9e5a95f32df91632fb43c96c1a9057a3
- * SiSU's Rakefile configure automation taken a bit further. If using Rake setup
- then after the installation of SiSU, Rake will attempt to do initial
+ * SiSU's Rakefile configure automation taken a bit further. If using Rake
+ setup then after the installation of SiSU, Rake will attempt to do initial
configuration of the sisu document samples output directory, and to
generate multiple output versions of a sample text file (html, ascii, xml
(dom and sax versions), latex, pdf). Will consider whether to keep things
@@ -7411,7 +7489,7 @@ skipped, synced tarball and deb in 0.12.6
* /etc added to sisurc.yaml search path, was previously a sample document.
-%% SiSU Sabaki, version 0.1.2-21 of 2005w05/3 (2005-02-02):
+** SiSU Sabaki, version 0.1.2-21 of 2005w05/3 (2005-02-02):
sisu-sabaki_0.1.2-21_2005w05-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-21_2005w05-3.tar.gz
SHA1(sisu-sabaki_0.1.2-21_2005w05-3.tar.gz)=
@@ -7424,8 +7502,8 @@ skipped, synced tarball and deb in 0.12.6
* sisu -CC from within a document working directory, after install should do
additional things related to initialising output directory
- * system calls were mostly placed in one library/module and the availability of
- the binary tested for with whereis -b, apparently the -b flag for binary
+ * system calls were mostly placed in one library/module and the availability
+ of the binary tested for with whereis -b, apparently the -b flag for binary
only is not available across all Linux/Unix, so the whereis check has been
modified.
@@ -7433,7 +7511,7 @@ skipped, synced tarball and deb in 0.12.6
* Thanks O-E P, and chris2 for help and feedback with Mac OSX installations.
-%% SiSU Sabaki, version 0.1.2-20 of 2005w05/2 (2005-02-01):
+** SiSU Sabaki, version 0.1.2-20 of 2005w05/2 (2005-02-01):
sisu-sabaki_0.1.2-20_2005w05-2.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-20_2005w05-2.tar.gz
SHA1(sisu-sabaki_0.1.2-20_2005w05-2.tar.gz)=
@@ -7454,10 +7532,11 @@ skipped, synced tarball and deb in 0.12.6
SiSU Sabaki: version 0.1.2-19 of 2005w05/1 (2005-01-31) & Ruby: ruby 1.8.2
(2005-01-10) [i386-linux]
-%% SiSU Sabaki, version 0.1.2-19 of 2005w05/1 (2005-01-31):
+** SiSU Sabaki, version 0.1.2-19 of 2005w05/1 (2005-01-31):
sisu-sabaki_0.1.2-19_2005w05-1.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-19_2005w05-1.tar.gz
- SHA1(sisu-sabaki_0.1.2-19_2005w05-1.tar.gz)= eb7ef826f2fa69c4ef8eaf33ff297f3141c1217e
+ SHA1(sisu-sabaki_0.1.2-19_2005w05-1.tar.gz)=
+ eb7ef826f2fa69c4ef8eaf33ff297f3141c1217e
* Rakefile modified, same result ... a few more options
@@ -7491,7 +7570,7 @@ skipped, synced tarball and deb in 0.12.6
contain improvements over previous versions, in the install procedures
which are primarily what is to be looked at.
-%% SiSU Sabaki, version 0.1.2-18 of 2005w04/0 (2005-01-30):
+** SiSU Sabaki, version 0.1.2-18 of 2005w04/0 (2005-01-30):
sisu-sabaki_0.1.2-18_2005w04-0.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-18_2005w04-0.tar.gz
SHA1(sisu-sabaki_0.1.2-18_2005w04-0.tar.gz)=
@@ -7511,7 +7590,7 @@ skipped, synced tarball and deb in 0.12.6
resulting from the extension of features in 0.1.2-14 & 0.1.2-15, which
0.1.2-18 goes some way to address as well.
-%% SiSU Sabaki, version 0.1.2-17 of 2005w04/4 (2005-01-27):
+** SiSU Sabaki, version 0.1.2-17 of 2005w04/4 (2005-01-27):
sisu-sabaki_0.1.2-17_2005w04-4.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-17_2005w04-4.tar.gz
SHA1(sisu-sabaki_0.1.2-17_2005w04-4.tar.gz)=
@@ -7534,14 +7613,15 @@ skipped, synced tarball and deb in 0.12.6
0.1.2-16, incidentally, really should have different maximum values for
landscape and portrait, planned.
-%% *Withdrawn* - SiSU Sabaki, version 0.1.2-16 of 2005w04/4 (2005-01-27):
+** *Withdrawn* - SiSU Sabaki, version 0.1.2-16 of 2005w04/4 (2005-01-27):
sisu-sabaki_0.1.2-16_2005w04-4.tar.gz
SHA1(sisu-sabaki_0.1.2-16_2005w04-4.tar.gz)=
d6ab8845e160821fc41bdd79a5f6b35df0ce236a
- * bugfix release which itself had to be fixed, see bugfix, 0.1.2-17 of 2005w04/4
+ * bugfix release which itself had to be fixed, see bugfix, 0.1.2-17 of
+ 2005w04/4
-%% *Withdrawn* - SiSU Sabaki, version 0.1.2-15 of 2005w04/3 (2005-01-26):
+** *Withdrawn* - SiSU Sabaki, version 0.1.2-15 of 2005w04/3 (2005-01-26):
sisu-sabaki_0.1.2-15_2005w04-3.tar.gz
SHA1(sisu-sabaki_0.1.2-15_2005w04-3.tar.gz)=
5b101f13f4cef41989ace6d801b657ab559f95c5
@@ -7553,7 +7633,7 @@ skipped, synced tarball and deb in 0.12.6
* See bugfix, 0.1.2-17 of 2005w04/4
-%% SiSU Sabaki, version 0.1.2-14 of 2005w04/3 (2005-01-26):
+** SiSU Sabaki, version 0.1.2-14 of 2005w04/3 (2005-01-26):
sisu-sabaki_0.1.2-14_2005w04-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-14_2005w04-3.tar.gz
SHA1(sisu-sabaki_0.1.2-14_2005w04-3.tar.gz)=
@@ -7570,7 +7650,7 @@ skipped, synced tarball and deb in 0.12.6
* documentation updated accordingly
-%% SiSU Sabaki, version 0.1.2-13 of 2005w03/0 (2005-01-23):
+** SiSU Sabaki, version 0.1.2-13 of 2005w03/0 (2005-01-23):
sisu-sabaki_0.1.2-13_2005w03-0.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-13_2005w03-0.tar.gz
SHA1(sisu-sabaki_0.1.2-13_2005w03-0.tar.gz)=
@@ -7578,7 +7658,7 @@ skipped, synced tarball and deb in 0.12.6
* Rakefile updated (rake help)
-%% SiSU Sabaki, version 0.1.2-12 of 2005w03/6 (2005-01-22):
+** SiSU Sabaki, version 0.1.2-12 of 2005w03/6 (2005-01-22):
sisu-sabaki_0.1.2-12_2005w03-6.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-12_2005w03-6.tar.gz
SHA1(sisu-sabaki_0.1.2-12_2005w03-6.tar.gz)=
@@ -7586,7 +7666,7 @@ skipped, synced tarball and deb in 0.12.6
* Rakefile added (sudo rake)
-%% SiSU Sabaki, version 0.1.2-11 of 2005w03/5 (2005-01-21):
+** SiSU Sabaki, version 0.1.2-11 of 2005w03/5 (2005-01-21):
sisu-sabaki_0.1.2-11_2005w03-5.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-11_2005w03-5.tar.gz
SHA1(sisu-sabaki_0.1.2-11_2005w03-5.tar.gz)=
@@ -7595,7 +7675,7 @@ skipped, synced tarball and deb in 0.12.6
* removed install.rb which has been stripped of almost all function (and rely
on setup.rb)
-%% SiSU Sabaki, version 0.1.2-10 of 2005w03/5 (2005-01-21):
+** SiSU Sabaki, version 0.1.2-10 of 2005w03/5 (2005-01-21):
sisu-sabaki_0.1.2-10_2005w03-5.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-10_2005w03-5.tar.gz
SHA1(sisu-sabaki_0.1.2-10_2005w03-5.tar.gz)=
@@ -7611,7 +7691,7 @@ skipped, synced tarball and deb in 0.12.6
(possibly as late as next month) will work towards having a release that
uses setup.rb for installation.
-%% SiSU Sabaki, version 0.1.2-9 of 2005w03/4 (2005-01-20):
+** SiSU Sabaki, version 0.1.2-9 of 2005w03/4 (2005-01-20):
sisu-sabaki_0.1.2-9_2005w03-4.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-9_2005w03-4.tar.gz
SHA1(sisu-sabaki_0.1.2-9_2005w03-4.tar.gz)=
@@ -7619,7 +7699,7 @@ skipped, synced tarball and deb in 0.12.6
* only change is to man pages
-%% SiSU Sabaki, version 0.1.2-8 of 2005w03/3 (2005-01-19):
+** SiSU Sabaki, version 0.1.2-8 of 2005w03/3 (2005-01-19):
sisu-sabaki_0.1.2-8_2005w03-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-8_2005w03-3.tar.gz
SHA1(sisu-sabaki_0.1.2-8_2005w03-3.tar.gz)=
@@ -7633,12 +7713,12 @@ skipped, synced tarball and deb in 0.12.6
* setup.rb included and can be used to install sisu package (bin,lib,data)
apart from the /etc directory
- * install.rb still used for general installation of sisu package (bin,lib,etc),
- it does nothing with data directory
+ * install.rb still used for general installation of sisu package
+ (bin,lib,etc), it does nothing with data directory
* man page updated, and can be "installed" using setup.rb
-%% SiSU Sabaki, version 0.1.2-7 of 2005w03/3 (2005-01-19):
+** SiSU Sabaki, version 0.1.2-7 of 2005w03/3 (2005-01-19):
sisu-sabaki_0.1.2-7_2005w03-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-7_2005w03-3.tar.gz
SHA1(sisu-sabaki_0.1.2-7_2005w03-3.tar.gz)=
@@ -7648,7 +7728,7 @@ skipped, synced tarball and deb in 0.12.6
* directory structure maps that used by setup.rb
-%% SiSU Sabaki, version 0.1.2-6 of 2005w03/3 (2005-01-19):
+** SiSU Sabaki, version 0.1.2-6 of 2005w03/3 (2005-01-19):
sisu-sabaki_0.1.2-6_2005w03-3.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-6_2005w03-3.tar.gz
SHA1(sisu-sabaki_0.1.2-6_2005w03-3.tar.gz)=
@@ -7665,7 +7745,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* no attempt to setup ~/.sisu resource configuration directory, make it
yourself as required.
-%% SiSU Sabaki, version 0.1.2-4 of 2005w03/1 (2005-01-17):
+** SiSU Sabaki, version 0.1.2-4 of 2005w03/1 (2005-01-17):
sisu-sabaki_0.1.2-4_2005w03-1.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-4_2005w03-1.tar.gz
SHA1(sisu-sabaki_0.1.2-4_2005w03-1.tar.gz)=
@@ -7676,7 +7756,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* minor fix made to example cgi search form, front-end for Postgresql db, (a
counter contained a typo, plus cosmetic touches)
-%% SiSU Sabaki, version 0.1.2-3 of 2005w02/4 (2005-01-13):
+** SiSU Sabaki, version 0.1.2-3 of 2005w02/4 (2005-01-13):
sisu-sabaki_0.1.2-3_2005w02-4.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-3_2005w02-4.tar.gz
SHA1(sisu-sabaki_0.1.2-3_2005w02-4.tar.gz)=
@@ -7684,30 +7764,30 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* Installation and configuration issues.
- * does output check on directory permissions, and defaults to home directory if
- web server directory does not have write permission
+ * does output check on directory permissions, and defaults to home directory
+ if web server directory does not have write permission
* can switch off external programs that are unavailable in resource
configuration file
* note in README on which external programs are used
- * bug detected [2005-01-16] in released behaviour of object citation numbering,
- tables should be numbered. Not yet fixed. Unlikely to touch before
- mid-February.
+ * bug detected [2005-01-16] in released behaviour of object citation
+ numbering, tables should be numbered. Not yet fixed. Unlikely to touch
+ before mid-February.
Not certain when behaviour changed. It appears to be pre-introduction of
new table syntax. Each table gets an ocn, required amongst other things for
relational database. Check consistency of ocn elsewhere.
-%% SiSU Sabaki, version 0.1.2-2 of 2005w02/2 (2005-01-11):
+** SiSU Sabaki, version 0.1.2-2 of 2005w02/2 (2005-01-11):
sisu-sabaki_0.1.2-2_2005w02-2.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-2_2005w02-2.tar.gz
SHA1(sisu-sabaki_0.1.2-2_2005w02-2.tar.gz)=
7ca13bb377bb7403cf2b9436984c2c8a1ac629b3
* manual location anchor/marker/tagging provided for html, (at present in html
- only, adds nothing to other output types). Interactive help (and SiSU_MARKUP
- textfile in tar bundle) updated accordingly.
+ only, adds nothing to other output types). Interactive help (and
+ SiSU_MARKUP textfile in tar bundle) updated accordingly.
Very minor code addition, has existed previously, decided is still useful
on some occasions. Use sparingly, the author is currently responsible for
non-duplication of such names. There is a remote possibility it breaks
@@ -7721,7 +7801,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* skins included (now properly marked for revision control - or rather
accidental marking as "boring" removed for darcs).
-%% SiSU Sabaki, version 0.1.2-1 of 2005w02/1 (2005-01-10):
+** SiSU Sabaki, version 0.1.2-1 of 2005w02/1 (2005-01-10):
sisu-sabaki_0.1.2-1_2005w02-1.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-1_2005w02-1.tar.gz
SHA1(sisu-sabaki_0.1.2-1_2005w02-1_sha1)=
@@ -7733,7 +7813,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* also previous version 0.1.2-0 despite its name worked as part of previous
0.1.1 version, directories created etc.
-%% SiSU Sabaki, version 0.1.2-0 of 2005w01/0 (2005-01-09):
+** SiSU Sabaki, version 0.1.2-0 of 2005w01/0 (2005-01-09):
sisu-sabaki_0.1.2-0_2005w01-0.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.2-0_2005w01-0.tar.gz
SHA1(sisu-sabaki_0.1.2-0_2005w01-0_sha1)=
@@ -7749,7 +7829,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* bugfix, metaverse: tables with headings did not previously work with
updated table syntax, in release 0.1.1-2
-%% *Withdrawn* - SiSU Sabaki, version 0.1.1-3 of 2005w01/6 (2005-01-08):
+** *Withdrawn* - SiSU Sabaki, version 0.1.1-3 of 2005w01/6 (2005-01-08):
sisu-sabaki_0.1.1-3_2005w01-6.tar.gz
SHA1(sisu-sabaki_0.1.1-3_2005w01-6.tar.gz)=
21d9591f1c069e7111470b2bc98751a36833030d
@@ -7772,15 +7852,16 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* Quick fixes have been made to the vim syntax file which is provided.
- [Will slow down updates for a while though there are still issues with the install.]
+ [Will slow down updates for a while though there are still issues with the
+ install.]
-%% *Withdrawn* - SiSU Sabaki, version 0.1.1-2 of 2005w01/6 (2005-01-08):
+** *Withdrawn* - SiSU Sabaki, version 0.1.1-2 of 2005w01/6 (2005-01-08):
SHA1(sisu-sabaki_0.1.1-2_2005w01-6.tar.gz)=
6acb02f98d100ff9a7f7a01ad71b88c215488009
* Few lines of code changed from 0.1.1-2, which is withdrawn.
-%% SiSU Sabaki, version 0.1.1-1 of 2005w01/5 (2005-01-07):
+** SiSU Sabaki, version 0.1.1-1 of 2005w01/5 (2005-01-07):
sisu-sabaki_0.1.1-1_2005w01-5.tar.gz
http://www.jus.uio.no/sisu/download/sisu-sabaki_0.1.1-1_2005w01-5.tar.gz
SHA1(sisu-sabaki_0.1.1-1_2005w01-5_sha1)=
@@ -7794,7 +7875,7 @@ SHA1(sisu-sabaki_0.1.2-5_2005w03-2.tar.gz)=
* Manually change ownership on the resource configuration directory
-%% SiSU Sabaki, version 0.1.1-0 of 2005w01/4 (2005-01-06):
+** SiSU Sabaki, version 0.1.1-0 of 2005w01/4 (2005-01-06):
sisu_0.1.1-0_2005w01-4.tgz
http://www.jus.uio.no/sisu/download/sisu_0.1.1-0_2005w01-4.tgz
SHA1(sisu_0.1.1-0_2005w01-4.tgz)=
@@ -7822,52 +7903,52 @@ First release of SiSU - sisu_0.1.0-9_2005w01-2.tgz
public on January 4th 2005. It may be downloaded from:
http://www.jus.uio.no/sisu/download/sisu_0.1.0-9_2005w01-2.tgz
-%% DEVELOPMENT (Merged into STABLE) MANIFEST (@ 0.1.5 branch)
+* DEVELOPMENT (Merged into STABLE) MANIFEST (@ 0.1.5 branch)
-SiSU Sabaki development-branch, version 0.5.8 of 2005w15-0 [==0.4.3]
+ SiSU Sabaki development-branch, version 0.5.8 of 2005w15-0 [==0.4.3]
-SiSU Sabaki development-branch, version 0.5.4 of 2005w15-4 [==0.4.2]
+ SiSU Sabaki development-branch, version 0.5.4 of 2005w15-4 [==0.4.2]
-SiSU Sabaki development-branch, version 0.5.3 of 2005w15-3 [==0.4.1]
+ SiSU Sabaki development-branch, version 0.5.3 of 2005w15-3 [==0.4.1]
-SiSU Sabaki development-branch, version 0.5.0 of 2005w15-2 [==0.4.0]
+ SiSU Sabaki development-branch, version 0.5.0 of 2005w15-2 [==0.4.0]
-SiSU Sabaki development-branch, version 0.3.0 of 2005w14-0 [==0.1.5-58]
-* substantively the same as 0.2.0 [== 0.1.4-11]
+ SiSU Sabaki development-branch, version 0.3.0 of 2005w14-0 [==0.1.5-58]
+ * substantively the same as 0.2.0 [== 0.1.4-11]
-SiSU Sabaki development-branch, version 0.1.5-58 of 2005w14/6
-* substantively the same as 0.1.4-11
+ SiSU Sabaki development-branch, version 0.1.5-58 of 2005w14/6
+ * substantively the same as 0.1.4-11
-SiSU Sabaki development-branch, version 0.1.5-55 of 2005w13/6
-* substantively the same as 0.1.4-10
+ SiSU Sabaki development-branch, version 0.1.5-55 of 2005w13/6
+ * substantively the same as 0.1.4-10
-SiSU Sabaki development-branch, version 0.1.5-46 of 2005w13/2
-* substantively the same as 0.1.4-9
+ SiSU Sabaki development-branch, version 0.1.5-46 of 2005w13/2
+ * substantively the same as 0.1.4-9
-SiSU Sabaki development-branch, version 0.1.5-44 of 2005w13/2
-* substantively the same as 0.1.4-8
+ SiSU Sabaki development-branch, version 0.1.5-44 of 2005w13/2
+ * substantively the same as 0.1.4-8
-SiSU Sabaki development-branch, version 0.1.5-33 of 2005w12/3
-* substantively the same as 0.1.4-7
+ SiSU Sabaki development-branch, version 0.1.5-33 of 2005w12/3
+ * substantively the same as 0.1.4-7
-SiSU Sabaki development-branch, version 0.1.5-29 of 2005w12/1
-* substantively the same as 0.1.4-6
+ SiSU Sabaki development-branch, version 0.1.5-29 of 2005w12/1
+ * substantively the same as 0.1.4-6
-SiSU Sabaki development-branch, version 0.1.5-21 of 2005w11/2
-* substantively the same as 0.1.4-5
+ SiSU Sabaki development-branch, version 0.1.5-21 of 2005w11/2
+ * substantively the same as 0.1.4-5
-SiSU Sabaki development-branch, version 0.1.5-20 of 2005w11/1
-* substantively the same as 0.1.4-4
+ SiSU Sabaki development-branch, version 0.1.5-20 of 2005w11/1
+ * substantively the same as 0.1.4-4
-SiSU Sabaki development-branch, version 0.1.5-15 of 2005w10/4
-* substantively the same as 0.1.4-3
+ SiSU Sabaki development-branch, version 0.1.5-15 of 2005w10/4
+ * substantively the same as 0.1.4-3
-SiSU Sabaki development-branch, version 0.1.5-12 of 2005w10/4
-* substantively the same as 0.1.4-2
+ SiSU Sabaki development-branch, version 0.1.5-12 of 2005w10/4
+ * substantively the same as 0.1.4-2
-SiSU Sabaki development-branch, version 0.1.5-11 of 2005w10/2
-* substantively the same as 0.1.4-1
+ SiSU Sabaki development-branch, version 0.1.5-11 of 2005w10/2
+ * substantively the same as 0.1.4-1
-SiSU Sabaki development-branch, version 0.1.5-0 of 2005w06/4
-* substantively the same as 0.1.4-0
+ SiSU Sabaki development-branch, version 0.1.5-0 of 2005w06/4
+ * substantively the same as 0.1.4-0
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index aa847993..5f4cb6ee 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -15,40 +15,40 @@ v2 branch removed from sisu 4.0; it is available in sisu =< 3.3.2
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
-%% Legacy Branch, Reference
+* Legacy Branch, Reference
-* new middle layer (document abstraction) that uses ruby objects to
+** new middle layer (document abstraction) that uses ruby objects to
represent data (instead of strings)
-* downstream libraries updated to use v2 middle layer
+** downstream libraries updated to use v2 middle layer
-* sisu markup, changes to headers (metadata), input otherwise unchanged
+** sisu markup, changes to headers (metadata), input otherwise unchanged
-* output much the same as for version 1 with some tweaks
+** output much the same as for version 1 with some tweaks
* search, sql table structure changed for version 2, incompatible
* internal linking of documents is once again supported
* LaTeX/pdf book indexes link within the pdf text rather than to HTML
version of document
-* EPUB output introduced using -e flag
+** EPUB output introduced using -e flag
-%% Reverse Chronological:
+* Reverse Chronological:
-%% 2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz]
+** 2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.14-1
-* v2, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
+ * v2, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
<http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
-%% 2.9.11 (2012-01-10:02/2) [see 3.1.11.orig.tar.xz]
+** 2.9.11 (2012-01-10:02/2) [see 3.1.11.orig.tar.xz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.11-1
* modify sisu markup version script
-%% 2.9.10 (2011-10-15:41/6) [see 3.1.1.orig.tar.xz]
+** 2.9.10 (2011-10-15:41/6) [see 3.1.1.orig.tar.xz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.1-1
@@ -56,7 +56,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1
* make odt header changes easier to track
* get rid of (binary changeset) blob
-%% 2.9.9 (2011-10-03:40/1) [see 3.1.0.orig.tar.xz]
+** 2.9.9 (2011-10-03:40/1) [see 3.1.0.orig.tar.xz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.0-1
@@ -65,7 +65,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1
* documentation, small update, see v3 changelog
* sisu source
-%% 2.9.8 (2011-09-24:38/6) [see 3.0.19.orig.tar.gz]
+** 2.9.8 (2011-09-24:38/6) [see 3.0.19.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.19
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.19-1
@@ -73,7 +73,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0
* remote, image source url fix
-%% 2.9.7 (2011-06-26:25/7) [see 3.0.13.orig.tar.gz]
+** 2.9.7 (2011-06-26:25/7) [see 3.0.13.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1
* dal_syntax, linebreak within regular objects is \\ (<br> depreciated)
@@ -89,17 +89,17 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* sisurc.yml, config settings
-%% 2.9.6 (2011-06-07:23/2) [see 3.0.12.orig.tar.gz]
+** 2.9.6 (2011-06-07:23/2) [see 3.0.12.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1
* help, s/Bul garian/Bulgarian/ (Closes: #619068)
-%% 2.9.5 (2011-05-17:20/2) [see 3.0.10.orig.tar.gz]
+** 2.9.5 (2011-05-17:20/2) [see 3.0.10.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.10-1
* copyright (minor) touch, dates for setup.rb
-%% 2.9.4 (2011-05-15:19/7) [see 3.0.9.orig.tar.gz]
+** 2.9.4 (2011-05-15:19/7) [see 3.0.9.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.9-1
* bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
@@ -110,7 +110,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* copyright file, softlink, make more visible in tarball and update
* sisu-mode.el assigned to FSF (GNU EMACS)
-%% 2.9.3 (2011-04-27:17/3) [see 3.0.8.orig.tar.gz]
+** 2.9.3 (2011-04-27:17/3) [see 3.0.8.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1
* bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
@@ -159,7 +159,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* vim colors colorscheme sparse-* frugal-* Slate minor changes
-%% 2.9.2 (2011-04-20:16/3) [see 3.0.7.orig.tar.gz]
+** 2.9.2 (2011-04-20:16/3) [see 3.0.7.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
* options, maintenance -M (--maintenance, new alias --keep-processing-files)
@@ -180,7 +180,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
(GNU EMACS)
* url to sisu git repo source (when possible also track GNU EMACS location)
-%% 2.9.1 (2011-03-30:13/3) [see 3.0.6.orig.tar.gz]
+** 2.9.1 (2011-03-30:13/3) [see 3.0.6.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.6-1
* (ruby 1.9.2 (transition related) fixes)
@@ -199,7 +199,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* for console use color names instead of numbers
* rearrange
-%% 2.9.0 (2011-03-24:12/4) [see 3.0.5.orig.tar.gz]
+** 2.9.0 (2011-03-24:12/4) [see 3.0.5.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.5-1
* move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2
@@ -217,7 +217,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* vim syntax highlighting, fix typo
-%% 2.8.2 (2011-03-11:10/5) [see 3.0.3.orig.tar.gz]
+** 2.8.2 (2011-03-11:10/5) [see 3.0.3.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.3-1
* dal_syntax and affected downstream output modules, revised pattern match
@@ -254,7 +254,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
* vim cleaning sisu.vim
-%% 2.8.1 (2011-03-05:09/6) [see 3.0.2.orig.tar.gz]
+** 2.8.1 (2011-03-05:09/6) [see 3.0.2.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1
* make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2
@@ -270,7 +270,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* tidy
* small fixes
-%% 2.8.0 (2011-02-01:05/2) [see 3.0.0.orig.tar.gz]
+** 2.8.0 (2011-02-01:05/2) [see 3.0.0.orig.tar.gz]
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1
[post Debian Squeeze]
@@ -298,7 +298,7 @@ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0
* represent page break and object separator: plaintext, html, epub, odf,
texpdf (adjust later)
-%% 2.7.9.orig.tar.gz (2010-12-09:49/4)
+** 2.7.9.orig.tar.gz (2010-12-09:49/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
97240b74573904f5f2d120fbb56492179ec501fe8eee111dcace34068b8c960e 2752226 sisu_2.7.9.orig.tar.gz
@@ -342,7 +342,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz
* html search form, configuration check
-%% 2.7.8.orig.tar.gz (2010-10-25:43/1)
+** 2.7.8.orig.tar.gz (2010-10-25:43/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz
@@ -388,7 +388,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
* html, quick_ref, boolean true/false setting (commented out, default
false)
-%% 2.7.7.orig.tar.gz (2010-10-17:41/7)
+** 2.7.7.orig.tar.gz (2010-10-17:41/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz
@@ -417,7 +417,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
* documentation related minor updates and fixes
-%% 2.7.6.orig.tar.gz (2010-10-11:41/1)
+** 2.7.6.orig.tar.gz (2010-10-11:41/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
7cd4c46fa3bcadd9bad5f009836e3f76ba33581f346c20baa750df849e132a4c 2746314 sisu_2.7.6.orig.tar.gz
@@ -436,7 +436,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
* CHANGELOG v2 recount where some requests came from
-%% 2.7.5.orig.tar.gz (2010-10-09:40/6)
+** 2.7.5.orig.tar.gz (2010-10-09:40/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz
@@ -454,7 +454,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz
* param, metadata rights, keep colon separator from interfering with urls
-%% 2.7.4.orig.tar.gz (2010-10-08:40/5)
+** 2.7.4.orig.tar.gz (2010-10-08:40/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
3d36b407f7f2df7b260f0a7932adf520a0539f8578dac59c6ca6de3bbfd03e62 2743433 sisu_2.7.4.orig.tar.gz
@@ -470,7 +470,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
* html (html_tune) scaling of images, fix
* epub (epub_tune) scaling of images, fix
-%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
+** 2.7.3.orig.tar.gz (2010-10-06:40/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
@@ -494,7 +494,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
* sisu_markup.sst, document a fix (v1 & 2)
-%% 2.7.2.orig.tar.gz (2010-10-01:39/5)
+** 2.7.2.orig.tar.gz (2010-10-01:39/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz
@@ -510,7 +510,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz
* texpdf_format, remove a few commented out lines
-%% 2.7.1.orig.tar.gz (2010-10-01:39/5)
+** 2.7.1.orig.tar.gz (2010-10-01:39/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
48383fa9a8e26261b93a8bfc054d328b967557a9fb12b5afb559d40ac8bd1391 2742168 sisu_2.7.1.orig.tar.gz
@@ -540,7 +540,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz
* share_src, hub cleaning
-%% 2.7.0.orig.tar.gz (2010-09-21:38/2)
+** 2.7.0.orig.tar.gz (2010-09-21:38/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.7.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
9e9e9695184e09dcf3fadee20e34d92d031c66419e49394de83a56cddd81bcba 2741663 sisu_2.7.0.orig.tar.gz
@@ -607,7 +607,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz
fixes issue noted with --sample-search-form (-F) (in the selection of
webrick (--webserv-webrick))
-%% 2.6.3.orig.tar.gz (2010-07-28:30/3)
+** 2.6.3.orig.tar.gz (2010-07-28:30/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
cd9b24e386a6b47920aca0e7dce60b46e5fd2adf199ac9f33bb83cf10e6bfd2c 2733908 sisu_2.6.3.orig.tar.gz
@@ -712,7 +712,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
fixes issue noted with --sample-search-form (-F) (in the selection of
webrick (--webserv-webrick))
-%% 2.6.2.orig.tar.gz (2010-07-15:28/4)
+** 2.6.2.orig.tar.gz (2010-07-15:28/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
@@ -740,7 +740,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
* debian/control update ruby1.9 related depends to ruby1.9.1 (libfcgi-ruby1.9.1)
-%% 2.6.1.orig.tar.gz (2010-07-09:27/5)
+** 2.6.1.orig.tar.gz (2010-07-09:27/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
95fe09b870e23f922bf7d02b8aa83827ef9592f06f844ba4df5c808e283c8590 2728806 sisu_2.6.1.orig.tar.gz
@@ -759,7 +759,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.1.orig.tar.gz
* sysenv, default output path, fix
-%% 2.6.0.orig.tar.gz (2010-07-07:27/3)
+** 2.6.0.orig.tar.gz (2010-07-07:27/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.6.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
2a02d475c12398e5cc66e961c96e65f79951c4c2863a5e88f986692563fda983 2770986 sisu_2.6.0.orig.tar.gz
@@ -787,7 +787,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz
* manpages, some additional manpages and some updates
-%% 2.5.1.orig.tar.gz (2010-06-12:23/6)
+** 2.5.1.orig.tar.gz (2010-06-12:23/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
c87a04a3071de4e8388b214fb6bb1a602657c5859a817bd0f001c92a4ce1f98d 2768984 sisu_2.5.1.orig.tar.gz
@@ -797,7 +797,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
* texpdf, ensure programs default font is set (Liberation Sans) if none
configured, (was intended, required fix)
-%% 2.5.0.orig.tar.gz (2010-06-11:23/5)
+** 2.5.0.orig.tar.gz (2010-06-11:23/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.5.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
@@ -821,7 +821,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
* css for html, make right pane when used darker to distinguish from selected
content
-%% 2.4.3.orig.tar.gz (2010-06-05:22/6)
+** 2.4.3.orig.tar.gz (2010-06-05:22/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
bf0e596113b60b873efc738ec2a9ab9a7b2d0687cd7011d27700331faab4e2c5 2767084 sisu_2.4.3.orig.tar.gz
@@ -847,7 +847,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.3.orig.tar.gz
* :F folds on fold patterns for sisu markup (and foldsearch which opens
result of search all else closed)
-%% 2.4.2.orig.tar.gz (2010-06-01:22/2)
+** 2.4.2.orig.tar.gz (2010-06-01:22/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
d5267635ecc99c41b0868ea2eee78b46a9142b76b45608ebe89eff13e3cf291a 2766741 sisu_2.4.2.orig.tar.gz
@@ -861,7 +861,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.2.orig.tar.gz
* remote file processing (url instead of local file), minor fix
(related to reporting "http" file not found)
-%% 2.4.1.orig.tar.gz (2010-05-26:21/3)
+** 2.4.1.orig.tar.gz (2010-05-26:21/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
ee7ac449291c9aff05731fdefc1b31584f4ff6c0d3ec4b7b2250ef05c1d3b343 2765591 sisu_2.4.1.orig.tar.gz
@@ -875,7 +875,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.1.orig.tar.gz
* general extension of regex matches for http: to include https:
* dal_syntax fix, no auto-bold or italics on relative or internal links
-%% 2.4.0.orig.tar.gz (2010-05-26:21/3)
+** 2.4.0.orig.tar.gz (2010-05-26:21/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.4.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
5a7ca024e36d9d08653e2cfe335e83345305c16e531de361d84ba3315739303b 2764579 sisu_2.4.0.orig.tar.gz
@@ -899,7 +899,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.4.0.orig.tar.gz
* sisu markup, documentation on_sisu_markup/sisu_markup.txt added much todo
-%% 2.3.5.orig.tar.gz (2010-05-18:20/2)
+** 2.3.5.orig.tar.gz (2010-05-18:20/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
fb599fc29a6c1f67ae3ed6fe79ed2768045899870717d719d5b91be2a3db56fb 2755625 sisu_2.3.5.orig.tar.gz
@@ -914,7 +914,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.5.orig.tar.gz
* vim templates for .sst .ssm & .ssi
-%% 2.3.4.orig.tar.gz (2010-05-12:19/3)
+** 2.3.4.orig.tar.gz (2010-05-12:19/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
3072d857dd7cda793315d2dd57233bb015cac0fa85fcbaec7c05650e09f27b88 2755570 sisu_2.3.4.orig.tar.gz
@@ -927,7 +927,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
* sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
-%% 2.3.3.orig.tar.gz (2010-05-05:18/3)
+** 2.3.3.orig.tar.gz (2010-05-05:18/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
@@ -942,7 +942,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
* screen output (ansi), control
-%% 2.3.2.orig.tar.gz (2010-05-03:18/1)
+** 2.3.2.orig.tar.gz (2010-05-03:18/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
6f9b95e70dfbd80c793ef6dd7a64cc16f1073b6261a466f388b98ea364daab29 2752926 sisu_2.3.2.orig.tar.gz
@@ -971,7 +971,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz
* dal_numbering, number headings, a fix
-%% 2.3.1.orig.tar.gz (2010-04-28:17/3)
+** 2.3.1.orig.tar.gz (2010-04-28:17/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
03a9912a475a634e4e18024a508c64c67b60337cf0edeab01b96f3d54bc96e4a 2751600 sisu_2.3.1.orig.tar.gz
@@ -980,7 +980,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.1.orig.tar.gz
* param, for topic_register, an additional check required, bug fix, repost
-%% 2.3.0.orig.tar.gz (2010-04-27:17/2)
+** 2.3.0.orig.tar.gz (2010-04-27:17/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.3.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
6acef3da979f59d0e3912c0bd8a13f07b4f047ed2a0f1c196fc3504005b31447 2750663 sisu_2.3.0.orig.tar.gz
@@ -1028,7 +1028,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.0.orig.tar.gz
the future it is intended that it be possible to configure emphasis output
alternatively to be in italics [requested]
-%% 2.2.0.orig.tar.gz (2010-04-20:16/2)
+** 2.2.0.orig.tar.gz (2010-04-20:16/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.2.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
aa487605bc6bf89419c96773ed3738685307353ef4df1ead50d829785910747f 2746848 sisu_2.2.0.orig.tar.gz
@@ -1067,7 +1067,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.2.0.orig.tar.gz
[2.1.1 fix release was not built, changes appear under 2.2.0]
-%% 2.1.0.orig.tar.gz (2010-04-16:15/5)
+** 2.1.0.orig.tar.gz (2010-04-16:15/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.1.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
ceb7fb71ed815f7f64faac98174639f0008d4d7659053f6832cd3023f656a14b 2745619 sisu_2.1.0.orig.tar.gz
@@ -1100,7 +1100,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.1.0.orig.tar.gz
* vim syntax highlighting, minor
-%% 2.0.5.orig.tar.gz (2010-03-31:13/3)
+** 2.0.5.orig.tar.gz (2010-03-31:13/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
8fad44b225512ab436562fc759244752b722c6d8aa4f3df3de3b1b97001fad43 2738182 sisu_2.0.5.orig.tar.gz
@@ -1117,7 +1117,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.5.orig.tar.gz
* harvest, add search form for directory, if configured in sisurc.yml
-%% 2.0.4.orig.tar.gz (2010-03-23:12/2)
+** 2.0.4.orig.tar.gz (2010-03-23:12/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
7fb8b578813fbd6cd4bf441e8eefeb9b52860064d1c66b83889bfc65468c90fd 2737242 sisu_2.0.4.orig.tar.gz
@@ -1130,7 +1130,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.4.orig.tar.gz
* free_as_in_freedom, additional links to available material
-%% 2.0.3.orig.tar.gz (2010-03-22:12/1)
+** 2.0.3.orig.tar.gz (2010-03-22:12/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
5097dc789a6c0717a7e965c1b76cc84f8ccc2cab4bc89873e2fbf85758ce4356 2736571 sisu_2.0.3.orig.tar.gz
@@ -1143,7 +1143,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
breakage]
* xml_dom, behaviours fixes
-%% 2.0.2.orig.tar.gz (2010-03-21:11/7)
+** 2.0.2.orig.tar.gz (2010-03-21:11/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
@@ -1158,7 +1158,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
* vim syntax highlighter, sisu v2 & v1 version and date headers
updated/corrected
-%% 2.0.1.orig.tar.gz (2010-03-17:11/3)
+** 2.0.1.orig.tar.gz (2010-03-17:11/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
364b65b99376303c8bb90e0b8e6709d5b11277280c8fc57d69a71b459f279d06 2736627 sisu_2.0.1.orig.tar.gz
@@ -1175,7 +1175,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.1.orig.tar.gz
* docs, add epub, more to be done
-%% 2.0.0.orig.tar.gz (2010-03-06:09/6)
+** 2.0.0.orig.tar.gz (2010-03-06:09/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/2.0.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.0.orig.tar.gz
4fc214d40542e0d2ba7447e9ff06de3612d857d9015e8233877f9b4f93a9875f 2733550 sisu_2.0.0.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 375b74dd..4ef95814 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -1,4 +1,4 @@
-%% SiSU version 3
+* SiSU version 3
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v3;hb=HEAD>
@@ -16,7 +16,7 @@ v1 branch is removed; it is available in sisu =< 2.7
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
-%% Legacy Branch, Reference
+* Legacy Branch, Reference
Version 3 to be closed on opening of version 4.1.* & v5 branch
@@ -33,203 +33,204 @@ v1 branch is removed; it is available in sisu =< 2.7
(see notes at bottom of file, near EOF)
-%% Reverse Chronological:
+* Reverse Chronological:
-%% 3.3.11.orig.tar.xz (2013-02-20:07/3)
+** 3.3.11.orig.tar.xz (2013-02-20:07/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.11
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.11.orig.tar.xz
sisu_3.3.11.orig.tar.xz
sisu_3.3.11-1.dsc
-* epub, add markup of angle brackets '<' & '>' to early markup of amp. '&'
+ * epub, add markup of angle brackets '<' & '>' to early markup of amp. '&'
-* vim, colorschemes, general housekeeping
+ * vim, colorschemes, general housekeeping
-* b_epub.png, epub icon (for manifest) updated to use official image
+ * b_epub.png, epub icon (for manifest) updated to use official image
-%% 3.3.10.orig.tar.xz (2013-02-10:05/7)
+** 3.3.10.orig.tar.xz (2013-02-10:05/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.10
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.10.orig.tar.xz
sisu_3.3.10.orig.tar.xz
sisu_3.3.10-1.dsc
-* vim, minimal color schemes, minor edits
+ * vim, minimal color schemes, minor edits
-* dbi_discrete, discreet should have been discrete, renames accordingly
+ * dbi_discrete, discreet should have been discrete, renames accordingly
-* lib, bin/sisu, misc, code headers provide url to online git file source
- * e.g. bin/sisu * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
+ * lib, bin/sisu, misc, code headers provide url to online git file source
+ * e.g. bin/sisu * Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
-%% 3.3.9.orig.tar.xz (2013-02-06:05/3)
+** 3.3.9.orig.tar.xz (2013-02-06:05/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.9
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.9.orig.tar.xz
sisu_3.3.9.orig.tar.xz
sisu_3.3.9-1.dsc
-* utils (debug renamed), Utils::CodeMarker (from Debug::Mark)
+ * utils (debug renamed), Utils::CodeMarker (from Debug::Mark)
-%% 3.3.8.orig.tar.xz (2013-02-03:04/7)
+** 3.3.8.orig.tar.xz (2013-02-03:04/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.8
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz
sisu_3.3.8.orig.tar.xz
sisu_3.3.8-1.dsc
-* sysenv, on --redirect, stop creation of redundant dir
+ * sysenv, on --redirect, stop creation of redundant dir
-* html, includes book index fix, rest cosmetic
+ * html, includes book index fix, rest cosmetic
-* css (html & epub) line spacing reduced, paragraph spacing increased
- * may need to tune spacing further to distinguish lines from new paragraphs
- (especially where ocn is not used as the distinction may be less
- clear/obvious) [sync with v4]
+ * css (html & epub) line spacing reduced, paragraph spacing increased
+ * may need to tune spacing further to distinguish lines from new paragraphs
+ (especially where ocn is not used as the distinction may be less
+ clear/obvious) [sync with v4]
-%% 3.3.7.orig.tar.xz (2013-01-31:04/4)
+** 3.3.7.orig.tar.xz (2013-01-31:04/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz
sisu_3.3.7.orig.tar.xz
sisu_3.3.7-1.dsc
-* dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
- [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
+ * dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
+ [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
-* dal (obj), html, br_page* behavior in html depending on origin of break
- (markup specified v auto)
+ * dal (obj), html, br_page* behavior in html depending on origin of break
+ (markup specified v auto)
-%% 3.3.6.orig.tar.xz (2013-01-27:03/7)
+** 3.3.6.orig.tar.xz (2013-01-27:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.6
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.6.orig.tar.xz
sisu_3.3.6.orig.tar.xz
sisu_3.3.6-1.dsc
-* epub some fixing, more documents render in more readers/viewers
- * ncx fix, navpoint_close
+ * epub some fixing, more documents render in more readers/viewers
+ * ncx fix, navpoint_close
-* remove markup-sample of the first edition of FaiF as redundant, the
- markup for the second edition being available (& partly in response to
- Bug#698664 which leads me to think about it), removed:
- free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
- associated skin and associated images
+ * remove markup-sample of the first edition of FaiF as redundant, the
+ markup for the second edition being available (& partly in response to
+ Bug#698664 which leads me to think about it), removed:
+ free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+ associated skin and associated images
-%% 3.3.5.orig.tar.xz (2013-01-23:03/3)
+** 3.3.5.orig.tar.xz (2013-01-23:03/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.5
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.5.orig.tar.xz
sisu_3.3.5.orig.tar.xz
sisu_3.3.5-1.dsc
-* epub
- * remove unnecessary conversion of some utf-8 characters to xhtml
- representation; fix as messed up table of contents, toc.ncx
- (e.g. in calibre) [bug reported by Mikael Böök]
- * provide full depth epub table of contents [request Mikael Böök]
- * cosmetic arrangement of code <<-WOK
- * xhtml structure error, fix missing </div>
- [bug reported by Mikael Böök] (fix of additional detail)
+ * epub
+ * remove unnecessary conversion of some utf-8 characters to xhtml
+ representation; fix as messed up table of contents, toc.ncx
+ (e.g. in calibre) [bug reported by Mikael Böök]
+ * provide full depth epub table of contents [request Mikael Böök]
+ * cosmetic arrangement of code <<-WOK
+ * xhtml structure error, fix missing </div>
+ [bug reported by Mikael Böök] (fix of additional detail)
-* html
- * remove unnecessary conversion of some utf-8 characters to html
- representation
+ * html
+ * remove unnecessary conversion of some utf-8 characters to html
+ representation
-* texpdf_format
- * list of .sty files (and their texlive source within Debian)
- [not part of code]
+ * texpdf_format
+ * list of .sty files (and their texlive source within Debian)
+ [not part of code]
-* param, match possible sisu version, detail
+ * param, match possible sisu version, detail
-%% 3.3.4.orig.tar.xz (2013-01-01:00/2)
+** 3.3.4.orig.tar.xz (2013-01-01:00/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.4
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.4.orig.tar.xz
sisu_3.3.4.orig.tar.xz
sisu_3.3.4-1.dsc
-* html_segments (by_filename by_filetype) internal document links do not
- work filenames need to include lang code, fixed
- [chals on irc, re live-manual, debian-live]
+ * html_segments (by_filename by_filetype) internal document links do not
+ work filenames need to include lang code, fixed
+ [chals on irc, re live-manual, debian-live]
-* plaintext, in code blocks retain a blank empty line, a fix
- [known old bug, affects sisu_manual, fix request from SynrG on irc, re
- live-manual]
+ * plaintext, in code blocks retain a blank empty line, a fix
+ [known old bug, affects sisu_manual, fix request from SynrG on irc, re
+ live-manual]
-* manpage, attempt to improve output (line-spacing)
+ * manpage, attempt to improve output (line-spacing)
-* param, minor change any legacy <br> line break in metadata markup to \\
+ * param, minor change any legacy <br> line break in metadata markup to \\
-* debug (internal code use), color markers for line number & file name
- (colored location markers to show when line passed within running code)
+ * debug (internal code use), color markers for line number & file name
+ (colored location markers to show when line passed within running code)
-%% 3.3.3.orig.tar.xz (2012-10-03:40/3)
+** 3.3.3.orig.tar.xz (2012-10-03:40/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.3
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.3.orig.tar.xz
sisu_3.3.3.orig.tar.xz
sisu_3.3.3-1.dsc
-* cosmetic, code
- * true ? x : y
- * if, else, remove some semicolons (;) replace with newlines
- * if true ; x, remove semicolons replace with "then"
- * .is_a?(X) replaces .class==X (& for some defined? and nil? tests)
- * remove javascript holders js_ (not used)
+ * cosmetic, code
+ * true ? x : y
+ * if, else, remove some semicolons (;) replace with newlines
+ * if true ; x, remove semicolons replace with "then"
+ * .is_a?(X) replaces .class==X (& for some defined? and nil? tests)
+ * remove javascript holders js_ (not used)
-* some fixes, cleaning, removing
+ * some fixes, cleaning, removing
-* sisu -v, provide version information, fix
+ * sisu -v, provide version information, fix
-* options, opt_act, limit calls
- ruby profiler indicates much time spent here, reduce
+ * options, opt_act, limit calls
+ ruby profiler indicates much time spent here, reduce
-* constants, year static (current): YEAR=2012
+ * constants, year static (current): YEAR=2012
-* bin/sisu, hub, reorganize call
+ * bin/sisu, hub, reorganize call
-* dbi, pgsql, report need for instructions when none given, rather than
- fail silently
+ * dbi, pgsql, report need for instructions when none given, rather than
+ fail silently
-* some pre-unicode meddling sorted
- (covers bug reported as middle dot changed to asterisk by chals)
+ * some pre-unicode meddling sorted
+ (covers bug reported as middle dot changed to asterisk by chals)
-* sisupod source, paths fix
+ * sisupod source, paths fix
-* odf, internal links/bookmarks, toc, book index
+ * odf, internal links/bookmarks, toc, book index
-* pdflatex, fixes
- * landscape cover page was botched, came out as portrait
+ * pdflatex, fixes
+ * landscape cover page was botched, came out as portrait
-* pdf, fix
- * group text, bullet
- * group text, hardspaces at start of line (indent)
- * group text, pass through special characters safe
- * poem, bold etc.
+ * pdf, fix
+ * group text, bullet
+ * group text, hardspaces at start of line (indent)
+ * group text, pass through special characters safe
+ * poem, bold etc.
-* html, epub, fix
- * group text, bullet
+ * html, epub, fix
+ * group text, bullet
-* header @classify: :topic_register: provide greater classification "depth"
- * param, manifest
- * harvest_topics
+ * header @classify: :topic_register: provide greater classification "depth"
+ * param, manifest
+ * harvest_topics
-* dal, sysenv
- * markup file processing, change to sourcefile readlines & split of sourcefile array
- * removal of RUBY_VERSION references to older versions of ruby
+ * dal, sysenv
+ * markup file processing, change to sourcefile readlines & split of
+ sourcefile array
+ * removal of RUBY_VERSION references to older versions of ruby
-* dal_syntax, new syntax: =\\= page new & -\\- page break
- alias for <:pn> and <:pb> respectively
+ * dal_syntax, new syntax: =\\= page new & -\\- page break
+ alias for <:pn> and <:pb> respectively
-* db
- * introduce book_idx
- * minor re-arranging
+ * db
+ * introduce book_idx
+ * minor re-arranging
-* cgi search script, minor
+ * cgi search script, minor
-* vim syntax sisu.vim, =\\= page new & -\\- page break
+ * vim syntax sisu.vim, =\\= page new & -\\- page break
-* markup samples, and help, minor updates
+ * markup samples, and help, minor updates
-* vim ftplugin sisu.vim
- * linenumbering: on; relative; off, <leader>nn
- * cursor line & column: on; off, <leader>cu (existing cu+ & cu-)
+ * vim ftplugin sisu.vim
+ * linenumbering: on; relative; off, <leader>nn
+ * cursor line & column: on; off, <leader>cu (existing cu+ & cu-)
-%% 3.3.2.orig.tar.xz (2012-06-30:26/6)
+** 3.3.2.orig.tar.xz (2012-06-30:26/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.3.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.2.orig.tar.xz
@@ -237,9 +238,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.2.orig.tar.xz
921119f0a9da087883e2ecd978ecba03cdd6be66d66885af24c0c63c7d13053e 1382 sisu_3.3.2-1.dsc
0a33ee349bf73a67c1df01909c5836cc0e392168e4803b74f3a6f078dca1f34f 297792 sisu_3.3.2-1.debian.tar.gz
-* texpdf, xetex screen reporting of warnings off unless sisu -pV used
+ * texpdf, xetex screen reporting of warnings off unless sisu -pV used
-%% 3.3.1.orig.tar.xz (2012-06-23:25/6)
+** 3.3.1.orig.tar.xz (2012-06-23:25/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.3.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.1.orig.tar.xz
@@ -256,7 +257,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.1.orig.tar.xz
* hub, some re-arrangement
-%% 3.3.0.orig.tar.xz (2012-06-17:24/7)
+** 3.3.0.orig.tar.xz (2012-06-17:24/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.3.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.3.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.0.orig.tar.xz
@@ -273,7 +274,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.0.orig.tar.xz
directory rather than just markup file [reason for version bump]
NOTE there are no changes to sisu markup (only the sharing of source files)
-%% 3.2.12.orig.tar.xz (2012-06-06:23/3)
+** 3.2.12.orig.tar.xz (2012-06-06:23/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.12
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.12.orig.tar.xz
@@ -281,25 +282,25 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.12.orig.tar.xz
af00de9088c0291f7afa5310bc2e4da6e43dfd8a01fa35e988f42a4e63dd4795 1389 sisu_3.2.12-1.dsc
3005baaad8b61cca00c72f91c602e17524ee99096a103bc38282c863178d2d84 297163 sisu_3.2.12-1.debian.tar.gz
-* hub, post bundles
- * sisupod_make, file selection selection for tar.xz, fix
+ * hub, post bundles
+ * sisupod_make, file selection selection for tar.xz, fix
-* dbi_discreet, screen reporting db location, fix
+ * dbi_discreet, screen reporting db location, fix
-* shared_images, fix
+ * shared_images, fix
-* excludes --exc-html-
- * html (toc & scroll), (html_segments, concordance,) exclude top band, touch
- sisu --exc-top-band --html --concordance filename.sst
- * html_segments, @make.build.html_navigation? fix
+ * excludes --exc-html-
+ * html (toc & scroll), (html_segments, concordance,) exclude top band, touch
+ sisu --exc-top-band --html --concordance filename.sst
+ * html_segments, @make.build.html_navigation? fix
-* sysenv, check @md.make.respond_to?(:skin)
+ * sysenv, check @md.make.respond_to?(:skin)
-* screen reporting, ansi colors, cosmetic
+ * screen reporting, ansi colors, cosmetic
-* Rake, Rant installer sisu installer require ruby >= 1.9.3
+ * Rake, Rant installer sisu installer require ruby >= 1.9.3
-%% 3.2.11.orig.tar.xz (2012-06-03:22/7)
+** 3.2.11.orig.tar.xz (2012-06-03:22/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.11.orig.tar.xz
@@ -307,20 +308,20 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.11.orig.tar.xz
7c680e160932cbce9712c3d23b34044bcd9a6bfaa61bc3e9be73aed48d72a591 1389 sisu_3.2.11-1.dsc
409c2c5c0592643b071a2fd8b6132c45f79f6c0e06bbcebb52137d9ea235b95c 297226 sisu_3.2.11-1.debian.tar.gz
-* images, regular & sisupod
- * shared_images, --html, --xhtml, --xml*
- * sisupod images done: --html including skin images; --epub; --odf; --pdf
- * copy (system link removed)
+ * images, regular & sisupod
+ * shared_images, --html, --xhtml, --xml*
+ * sisupod images done: --html including skin images; --epub; --odf; --pdf
+ * copy (system link removed)
-* manifest, paths, (for command line selection of output type) fix
+ * manifest, paths, (for command line selection of output type) fix
-* urls, sisupod, fix
+ * urls, sisupod, fix
-* warn when files to be copied not found, add
+ * warn when files to be copied not found, add
-* error & warning messages touched, revisit
+ * error & warning messages touched, revisit
-%% 3.2.10.orig.tar.xz (2012-05-28:22/1)
+** 3.2.10.orig.tar.xz (2012-05-28:22/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.10
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.10.orig.tar.xz
@@ -328,38 +329,38 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.10.orig.tar.xz
1d17dea47e3be8b82edd4f1d92c7c0de51d115c784005fcf3ddc8df7cea047fc 1389 sisu_3.2.10-1.dsc
696bba112c638be0af185f1b185709c7a57822d75e31b7aa4cd22321bf786be3 296725 sisu_3.2.10-1.debian.tar.gz
-* hub
- * "requires", fix
- * manifest re-run where related multilingual documents, fix
- BUG breaks mini table of contents (minitoc) manifest for multilingual files,
- better run without manifest minitoc, use --exc-manifest-minitoc
- * share markup source (--source) not available at this time for composite
- files (.ssm), suggest creating a sisupod instead
+ * hub
+ * "requires", fix
+ * manifest re-run where related multilingual documents, fix
+ BUG breaks mini table of contents (minitoc) manifest for multilingual
+ files, better run without manifest minitoc, use --exc-manifest-minitoc
+ * share markup source (--source) not available at this time for composite
+ files (.ssm), suggest creating a sisupod instead
-* options, --init-site, --configure, fix
+ * options, --init-site, --configure, fix
-* code headers, mostly copyright
+ * code headers, mostly copyright
-* options, command line control of output directory structure
- --output-by-language; --output-by-filetype; --output-by-filename, or
- --by-language; --by-filetype; --by-filename
- * documentation update sisu_commands.ssi, manpage sisu.1, man2html
+ * options, command line control of output directory structure
+ --output-by-language; --output-by-filetype; --output-by-filename, or
+ --by-language; --by-filetype; --by-filename
+ * documentation update sisu_commands.ssi, manpage sisu.1, man2html
-* css, ensure css available for generated content (without need for
- --init-site / --configure), checks whether exists if not copies (for
- --init-site / --configure just copies, takes as a re-copy request)
+ * css, ensure css available for generated content (without need for
+ --init-site / --configure), checks whether exists if not copies (for
+ --init-site / --configure just copies, takes as a re-copy request)
-* sisupod.txz processing
- BUG image copying/processing for sisupod
+ * sisupod.txz processing
+ BUG image copying/processing for sisupod
-* html_format, minor cleaning
+ * html_format, minor cleaning
-BUGS
- * broken mini table of contents (minitoc) manifest for multilingual files,
- better run without use --exc-manifest-minitoc
- * sisupood image copying/processing, broken
+ BUGS
+ * broken mini table of contents (minitoc) manifest for multilingual files,
+ better run without use --exc-manifest-minitoc
+ * sisupood image copying/processing, broken
-%% 3.2.9.orig.tar.xz (2012-05-19:20/6)
+** 3.2.9.orig.tar.xz (2012-05-19:20/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.9
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.9.orig.tar.xz
@@ -367,14 +368,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.9.orig.tar.xz
fc1fe3a3112681c903a27e80ecfbba58b27df5b9847128bec74ad23f377ce1e3 1382 sisu_3.2.9-1.dsc
6438a6e29cb81afd678e11fdadbc5b55ec6f225e21dc7b5d53671df9853777da 295991 sisu_3.2.9-1.debian.tar.gz
-* harvest
- * harvest by filename output paths
- * harvest_topics, add level
- * harvest_topics, alternative headings, fix
+ * harvest
+ * harvest by filename output paths
+ * harvest_topics, add level
+ * harvest_topics, alternative headings, fix
-* options, create manifest touched
+ * options, create manifest touched
-%% 3.2.8.orig.tar.xz (2012-05-12:19/6)
+** 3.2.8.orig.tar.xz (2012-05-12:19/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.8
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.8.orig.tar.xz
@@ -382,25 +383,25 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.8.orig.tar.xz
eb828ddde0f9b98e23713d430a6356a756120f624244a9d6acd46a4134867c6f 1382 sisu_3.2.8-1.dsc
b869ef3e9c23ef43dab0321400ba3bd6cb4c8f0ddc3e9cf649db77080a4a5378 296097 sisu_3.2.8-1.debian.tar.gz
-* sisupod make, re-fixed, check again
+ * sisupod make, re-fixed, check again
-* hub, fixes, still a construction zone
+ * hub, fixes, still a construction zone
-* po4a, runs, needs checking
+ * po4a, runs, needs checking
-* misc fixes
- * options, omissions and typo fix
- * particulars, fix, check
- * shared_metadata, fix
+ * misc fixes
+ * options, omissions and typo fix
+ * particulars, fix, check
+ * shared_metadata, fix
-* sst_identify_markup, introduce document header SiSU 3.0,
- pretty much the same as 2.0
+ * sst_identify_markup, introduce document header SiSU 3.0,
+ pretty much the same as 2.0
-* reporting
- * composite file names touched
- * rescue & error warnings, more touched
+ * reporting
+ * composite file names touched
+ * rescue & error warnings, more touched
-%% 3.2.7.orig.tar.xz (2012-05-06:18/7)
+** 3.2.7.orig.tar.xz (2012-05-06:18/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.7
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.7.orig.tar.xz
@@ -408,16 +409,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.7.orig.tar.xz
58253f0cf3ece9b52085a3571b136dd82b79f5602f35a364d77994d95990b074 1382 sisu_3.2.7-1.dsc
07dbe1ee848421339560a09f430321b94d05da9fdac53e493701c92d49b98682 296207 sisu_3.2.7-1.debian.tar.gz
-* hub, options, fixes
- * dbi: pgsql, sqlite
+ * hub, options, fixes
+ * dbi: pgsql, sqlite
-* qrcode, fixes
- * ensure manifest is run
- * urls fix
+ * qrcode, fixes
+ * ensure manifest is run
+ * urls fix
-* rescue & error warnings, some touched
+ * rescue & error warnings, some touched
-%% 3.2.6.orig.tar.xz (2012-05-01:18/2)
+** 3.2.6.orig.tar.xz (2012-05-01:18/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.6
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.6.orig.tar.xz
@@ -425,17 +426,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.6.orig.tar.xz
16ae934e2a55d5c63bcc6bd642c5fe8b60f024288b402a9505e84505ad5643ad 1382 sisu_3.2.6-1.dsc
8d26a58d4314487464efddc673b681997cf4de5f11feba798063352b63a44a84 295541 sisu_3.2.6-1.debian.tar.gz
-* harvest (metadata, site/document summary) fixes
- * harvest_topics, sort fix
- * harvest_authors, minor fix
- * sst content parsing lang dir
- * output file location, currently works for (by?) :language & :filetype
+ * harvest (metadata, site/document summary) fixes
+ * harvest_topics, sort fix
+ * harvest_authors, minor fix
+ * sst content parsing lang dir
+ * output file location, currently works for (by?) :language & :filetype
-* hub (seek finer grained control over what happens when; causes breakage)
- * (primarily) cycle files then options (instead of options then files)
- * manifest re-run on (currently generated) translated files if any
+ * hub (seek finer grained control over what happens when; causes breakage)
+ * (primarily) cycle files then options (instead of options then files)
+ * manifest re-run on (currently generated) translated files if any
-%% 3.2.5.orig.tar.xz (2012-04-22:16/7)
+** 3.2.5.orig.tar.xz (2012-04-22:16/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.5
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.5.orig.tar.xz
@@ -447,7 +448,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.5.orig.tar.xz
SELECT ocn,body FROM doc_objects WHERE t_is='code';
SELECT ocn,clean FROM doc_objects;
-%% 3.2.4.orig.tar.xz (2012-04-21:16/6)
+** 3.2.4.orig.tar.xz (2012-04-21:16/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.4
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.4.orig.tar.xz
@@ -455,16 +456,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.4.orig.tar.xz
256d99071bd4ea95020df777b40451f7bb79cfd6531351f0fd00734cc9133c73 1382 sisu_3.2.4-1.dsc
31bf5091aaf1122906de09c9d17d3b2fccd4fd6cfdc768fad5485b8c0bb98d63 295114 sisu_3.2.4-1.debian.tar.gz
-* db bugfix in maintenance mode (variable name reused)
+ * db bugfix in maintenance mode (variable name reused)
-* sysenv, default processing dir name change
- * distinguish sisu branch, add sisu branch to processing directory name
- * if constants, 'DEVELOPER[:maintenance] == :true' then additionally add
- sisu version number to processing directory name
+ * sysenv, default processing dir name change
+ * distinguish sisu branch, add sisu branch to processing directory name
+ * if constants, 'DEVELOPER[:maintenance] == :true' then additionally add
+ sisu version number to processing directory name
-* rescue reporting
+ * rescue reporting
-%% 3.2.3.orig.tar.xz (2012-04-15:15/7)
+** 3.2.3.orig.tar.xz (2012-04-15:15/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.3
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.3.orig.tar.xz
@@ -472,21 +473,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.3.orig.tar.xz
f9b52350a1dc108696c044927cfd70126857b23b0d3bde5a36af0e2f498b10a4 1382 sisu_3.2.3-1.dsc
a26ac7b58b0af59d1316ff91911c3703bf2b8a2f2fafd1ab0381ea7e84326494 294997 sisu_3.2.3-1.debian.tar.gz
-* param, dal_syntax, document header (simple regex) substitution list
- added, note $ and curly braces are escaped to allow the following:
- @make:\n :substitute: /${linux-distro}/,'Debian' /${stable}/,'Squeeze' \
- /${testing}/,'Wheezy'
- changes are not made within text object types: code-blocks, tables or
- metadata (document headers). Marked up document remains self-referential.
- Note: the substitution list must be written on a single line, without
- line-breaks.
- [Substitutions possibility requested by Debian-live, live-manual (Ben
- Armstrong & Daniel Baumann)]
-
-* vim syntax highlighting, document header added :substitute: (under
- @make:)
-
-%% 3.2.2.orig.tar.xz (2012-04-05:14/4)
+ * param, dal_syntax, document header (simple regex) substitution list
+ added, note $ and curly braces are escaped to allow the following:
+ @make:\n :substitute: /${linux-distro}/,'Debian' /${stable}/,'Squeeze' \
+ /${testing}/,'Wheezy'
+ changes are not made within text object types: code-blocks, tables or
+ metadata (document headers). Marked up document remains self-referential.
+ Note: the substitution list must be written on a single line, without
+ line-breaks.
+ [Substitutions possibility requested by Debian-live, live-manual (Ben
+ Armstrong & Daniel Baumann)]
+
+ * vim syntax highlighting, document header added :substitute: (under
+ @make:)
+
+** 3.2.2.orig.tar.xz (2012-04-05:14/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.2.orig.tar.xz
@@ -501,7 +502,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.2.orig.tar.xz
* sysenv, path.style (a quick fix, review)
-%% 3.2.1.orig.tar.xz (2012-03-21:12/3)
+** 3.2.1.orig.tar.xz (2012-03-21:12/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.1.orig.tar.xz
@@ -509,14 +510,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.1.orig.tar.xz
99de0bf1930f7dae8feec4cc7d0809c81c89ac50c9a7c0e7974d6dc91770d82f 1382 sisu_3.2.1-1.dsc
ef8acf443ac79122fd0da79d25ea94c659bcf8bcd4f631d58e4c1f3b94b2c788 294764 sisu_3.2.1-1.debian.tar.gz
-* documentation sisu_commands, rearranged; update with regard to
- excludes; & discreet sqlite output
- * manpage
- * html (man2html)
+ * documentation sisu_commands, rearranged; update with regard to
+ excludes; & discreet sqlite output
+ * manpage
+ * html (man2html)
-* COPYRIGHT add markup samples "Free as in Freedom"
+ * COPYRIGHT add markup samples "Free as in Freedom"
-%% 3.2.0.orig.tar.xz (2012-03-19:12/1)
+** 3.2.0.orig.tar.xz (2012-03-19:12/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.0.orig.tar.xz
@@ -524,16 +525,16 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.0.orig.tar.xz
8d414b98e1ad9fd6329f3ca541e21bc5cd8b17c1e0479f83206b19768baba273 1382 sisu_3.2.0-1.dsc
58da58c9fcfdf6110aadbb1d3548067fb2537871891a2a2b81c5d27f62fb7161 293953 sisu_3.2.0-1.debian.tar.gz
-* start 3.2: merge v3dv (3.2) into v3 (3.1)
- * conf/sisu/v3dv --> conf/sisu/v3
- * data/sisu/v3dv --> data/sisu/v3
- * lib/sisu/v3dv --> lib/sisu/v3
- * bin/sisu* (change v3dv references to v3)
+ * start 3.2: merge v3dv (3.2) into v3 (3.1)
+ * conf/sisu/v3dv --> conf/sisu/v3
+ * data/sisu/v3dv --> data/sisu/v3
+ * lib/sisu/v3dv --> lib/sisu/v3
+ * bin/sisu* (change v3dv references to v3)
-* COPYRIGHT, format changed, influenced by Machine-readable debian/copyright
- file <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>
+ * COPYRIGHT, format changed, influenced by Machine-readable debian/copyright
+ file <http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/>
-%% 3.1.15.orig.tar.xz (2012-03-12:11/1)
+** 3.1.15.orig.tar.xz (2012-03-12:11/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.15
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.15-1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.15-2
@@ -544,66 +545,66 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.15.orig.tar.xz
4d820d70719e9d2ecf1923a5149c866221780d8ebe7c43443c9d2a8a3d5eb4e9 1389 sisu_3.1.15-2.dsc
a2e1314d1eaea28515d62ad34aeb18304256acfd69fefe11c4c078066a56d5af 293380 sisu_3.1.15-2.debian.tar.gz
-* v3dv: sysenv, ProcessingSettings, start to use hooks to make it possible to
- control (via: the command line; the document markup header, or; the
- configuration file) the likes of: ocn, toc, segsubtoc, minitoc,
- links-to-manifest, search-form, html-navigation, html-navigation-bar,
- html-right-pane, html-top-band; these are switched on by default and may be
- switched off in omit lists within configuration file, the document markup
- header, or command line. The command line takes precedence & may switch on
- or off overriding settings within the document markup header or the sisu
- configuration file.
- * --inc- on by default, but if switched off in doc header or configuration,
- the command line --inc- has precedence; for each possible exclude
- configuration the --inc- switch that overrides configuration settings
- * --exc- == --no-; exclude/switch off feature (but --inc- include has
- precedence)
- * document header @build: :omit: [list output features to be omitted]
- * configuration (sisurc.yml) omit:
- exclude output feature, overrides configuration settings (omit --dev
- development branch modifier once merged back to main)
- --exc-ocn, html (seg, scroll), epub, xml, pdf
- sisu --dev --exc-ocn --html --epub --xml-sax --xml-dom --xhtml -v filename.sst
- --exc-toc, html (scroll), epub, pdf
- sisu --dev --exc-toc --html --epub --pdf -v filename.sst
- --exc-segsubtoc html (seg), epub
- sisu --dev --exc-segsubtoc --html --epub -v filename.sst
- --exc-minitoc, html (seg), concordance, manifest
- sisu --dev --exc-minitoc --html --concordance -v filename.sst
- --exc-manifest-minitoc, manifest
- sisu --dev --exc-manifest-minitoc --html -v filename.sst
- --exc-links_to_manifest, --exc-manifest-links,
- html (seg, scroll)
- sisu --dev --exc-manifest-links --html -v filename.sst
- --exc-search-form, html (seg, scroll), manifest
- sisu --dev --exc-search-form --html -v filename.sst
- --exc-html-minitoc, html (seg), concordance
- sisu --dev --exc-html-minitoc --html --concordance -v filename.sst
- --exc-html-navigation, html (seg, scroll)?
- sisu --dev --exc-html-navigation --html -v filename.sst
- --exc-html-navigation-bar, html (seg)
- sisu --dev --exc-html-navigation-bar --html -v filename.sst
- --exc-html-search-form, html (seg, scroll)
- sisu --dev --exc-html-search-form --html -v filename.sst
- --exc-html-right-pane, html (seg, scroll)
- sisu --dev --exc-html-right-pane --html -v filename.sst
- --exc-html-top-band, html (seg, scroll), concordance
- (minitoc is forced on to provide seg navigation)
- sisu --dev --exc-html-top-band --html --concordance -v filename.sst
-
-* v3dv, vim syntax highlighting, document header added :omit: (under @make:)
- for document output features to be omitted if any
-
-* v3dv, documentation sisu_commands, rearranged; update with regard to
- excludes; & discreet sqlite output
-
-* v3dv, sqlite3 discreet .sql.db file for each document (in addition to
- existing possibility of a shared db in sqlite3 or postgresql)
-
-* texinfo, fix (break holding back 3.2 merge)
- [proposed next version starts 3.2, (merge dev branch after 3.1.15)]
-
-%% 3.1.14.orig.tar.xz (2012-02-14:07/2)
+ * v3dv: sysenv, ProcessingSettings, start to use hooks to make it possible to
+ control (via: the command line; the document markup header, or; the
+ configuration file) the likes of: ocn, toc, segsubtoc, minitoc,
+ links-to-manifest, search-form, html-navigation, html-navigation-bar,
+ html-right-pane, html-top-band; these are switched on by default and may be
+ switched off in omit lists within configuration file, the document markup
+ header, or command line. The command line takes precedence & may switch on
+ or off overriding settings within the document markup header or the sisu
+ configuration file.
+ * --inc- on by default, but if switched off in doc header or configuration,
+ the command line --inc- has precedence; for each possible exclude
+ configuration the --inc- switch that overrides configuration settings
+ * --exc- == --no-; exclude/switch off feature (but --inc- include has
+ precedence)
+ * document header @build: :omit: [list output features to be omitted]
+ * configuration (sisurc.yml) omit:
+ exclude output feature, overrides configuration settings (omit --dev
+ development branch modifier once merged back to main)
+ --exc-ocn, html (seg, scroll), epub, xml, pdf
+ sisu --dev --exc-ocn --html --epub --xml-sax --xml-dom --xhtml -v filename.sst
+ --exc-toc, html (scroll), epub, pdf
+ sisu --dev --exc-toc --html --epub --pdf -v filename.sst
+ --exc-segsubtoc html (seg), epub
+ sisu --dev --exc-segsubtoc --html --epub -v filename.sst
+ --exc-minitoc, html (seg), concordance, manifest
+ sisu --dev --exc-minitoc --html --concordance -v filename.sst
+ --exc-manifest-minitoc, manifest
+ sisu --dev --exc-manifest-minitoc --html -v filename.sst
+ --exc-links_to_manifest, --exc-manifest-links,
+ html (seg, scroll)
+ sisu --dev --exc-manifest-links --html -v filename.sst
+ --exc-search-form, html (seg, scroll), manifest
+ sisu --dev --exc-search-form --html -v filename.sst
+ --exc-html-minitoc, html (seg), concordance
+ sisu --dev --exc-html-minitoc --html --concordance -v filename.sst
+ --exc-html-navigation, html (seg, scroll)?
+ sisu --dev --exc-html-navigation --html -v filename.sst
+ --exc-html-navigation-bar, html (seg)
+ sisu --dev --exc-html-navigation-bar --html -v filename.sst
+ --exc-html-search-form, html (seg, scroll)
+ sisu --dev --exc-html-search-form --html -v filename.sst
+ --exc-html-right-pane, html (seg, scroll)
+ sisu --dev --exc-html-right-pane --html -v filename.sst
+ --exc-html-top-band, html (seg, scroll), concordance
+ (minitoc is forced on to provide seg navigation)
+ sisu --dev --exc-html-top-band --html --concordance -v filename.sst
+
+ * v3dv, vim syntax highlighting, document header added :omit: (under @make:)
+ for document output features to be omitted if any
+
+ * v3dv, documentation sisu_commands, rearranged; update with regard to
+ excludes; & discreet sqlite output
+
+ * v3dv, sqlite3 discreet .sql.db file for each document (in addition to
+ existing possibility of a shared db in sqlite3 or postgresql)
+
+ * texinfo, fix (break holding back 3.2 merge)
+ [proposed next version starts 3.2, (merge dev branch after 3.1.15)]
+
+** 3.1.14.orig.tar.xz (2012-02-14:07/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.14-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.14.orig.tar.xz
@@ -611,42 +612,42 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.14.orig.tar.xz
137ec96c26497d6cfc974247aa6c62c5d3ed51bd3a125fe99afa9c16d50b71d7 1389 sisu_3.1.14-1.dsc
341c4622b170e842a94bea786fcd31e7ea0910aae00730c24064dccc3984e03a 292616 sisu_3.1.14-1.debian.tar.gz
-* v3dv: sysenv, output_dir_structure, rewritten, affected code modified
-
-* v3dv: --redirect (--redirect=dir_path) & --dump (--dump=dir_path)
- * --dump places output in directory specified, if none specified in the
- current directory (pwd).
- * --redirect 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).
- * html, css incorporated into each file (concordance & manifest included)
- * html, xhtml & xmls, css copied into css subdirectory (not used by html as
- embedded)
- * html xmls, images copied to output directory
- * no links to manifest
- * manifest with relative links only
- * longer html filenames given to avoid names clashing (e.g. for toc,
- manifest, concordance)
-
-* v3dv: html, epub, remove manifest toc links
-
-* v3dv: -j copy images associated with file (images used by html & xmls)
- * automatically invoked by --dump & redirect
-
-* v3dv: dal, remove sisu_manifest from document structure & toc (metadata
- retained (provide link to sisu_manifest)), html & epub coding affected
-
-* v3dv: hooks to make it possible to control (via: the command line; the
- document markup header, or; the command line) the likes of: toc, manifest,
- manifest-links, metadata, html-minitoc, html-navigation, html-navigation-bar;
- these are switched on by default and control takes the form of making it
- possible to switch them off.
-
-* v3 v3dv: document --redirect, --dump, -j update sisu_commands.sst
- [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
-
-%% 3.1.13.orig.tar.xz (2012-02-03:05/5)
+ * v3dv: sysenv, output_dir_structure, rewritten, affected code modified
+
+ * v3dv: --redirect (--redirect=dir_path) & --dump (--dump=dir_path)
+ * --dump places output in directory specified, if none specified in the
+ current directory (pwd).
+ * --redirect 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).
+ * html, css incorporated into each file (concordance & manifest included)
+ * html, xhtml & xmls, css copied into css subdirectory (not used by html as
+ embedded)
+ * html xmls, images copied to output directory
+ * no links to manifest
+ * manifest with relative links only
+ * longer html filenames given to avoid names clashing (e.g. for toc,
+ manifest, concordance)
+
+ * v3dv: html, epub, remove manifest toc links
+
+ * v3dv: -j copy images associated with file (images used by html & xmls)
+ * automatically invoked by --dump & redirect
+
+ * v3dv: dal, remove sisu_manifest from document structure & toc (metadata
+ retained (provide link to sisu_manifest)), html & epub coding affected
+
+ * v3dv: hooks to make it possible to control (via: the command line; the
+ document markup header, or; the command line) the likes of: toc, manifest,
+ manifest-links, metadata, html-minitoc, html-navigation, html-navigation-bar;
+ these are switched on by default and control takes the form of making it
+ possible to switch them off.
+
+ * v3 v3dv: document --redirect, --dump, -j update sisu_commands.sst
+ [documents not generated until v3.2.0 (when v3dv branch is merged into v3)]
+
+** 3.1.13.orig.tar.xz (2012-02-03:05/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.13
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.13-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.13.orig.tar.xz
@@ -654,21 +655,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.13.orig.tar.xz
4820b0b4381a827c7a35019848234d6d38c9916cec30f54e6802609e8900e197 1389 sisu_3.1.13-1.dsc
b9a7d7bb59bc903f217cff8d544d666a6df0523caeb444493a03ab6f93d63d8d 291892 sisu_3.1.13-1.debian.tar.gz
-* v3 v3dv, path & url links, updates for multi output directory structure
- possibilities (fixes)
+ * v3 v3dv, path & url links, updates for multi output directory structure
+ possibilities (fixes)
-* v3dv, dal (& code affected as a result), use symbols to identify document
- objects type (is) and group (of)
+ * v3dv, dal (& code affected as a result), use symbols to identify document
+ objects type (is) and group (of)
-* v3dv, epub, html, some cleaning of redundancy
+ * v3dv, epub, html, some cleaning of redundancy
-* v3dv, texinfo BROKEN, since 3.1.12 at least
+ * v3dv, texinfo BROKEN, since 3.1.12 at least
-* v3 v3dv, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
- Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
- <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
+ * v3 v3dv, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
+ Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
+ <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
-%% 3.1.12.orig.tar.xz (2012-01-23:04/1)
+** 3.1.12.orig.tar.xz (2012-01-23:04/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.12
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.12.orig.tar.xz
@@ -676,20 +677,20 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.12.orig.tar.xz
ace21c0aba04d24b20ce3768aad58c93a80481840661ce505b06c3318c0370f1 1389 sisu_3.1.12-1.dsc
6bd103940b907edd6622be163131b21d139e2d301be6b0219fd366c514725bbd 291315 sisu_3.1.12-1.debian.tar.gz
-* texpdf, tampering with "safe" special character transformations, a fix (that
- may introduce new issues, watch) [in response to report of a pdf title bug
- "&" not represented, Timothy Hume]
+ * texpdf, tampering with "safe" special character transformations, a fix (that
+ may introduce new issues, watch) [in response to report of a pdf title bug
+ "&" not represented, Timothy Hume]
-* urls, odt maintenance path fix
+ * urls, odt maintenance path fix
-* v3dv, messing with code, merge back likely to become v3.2
- * call most methods by full name (include associated module & class names)
- * replace most ruby exclamation (!) method actions
+ * v3dv, messing with code, merge back likely to become v3.2
+ * call most methods by full name (include associated module & class names)
+ * replace most ruby exclamation (!) method actions
-* v3dv, sysenv, use "which" instead of "whereis" to locate programs, test
- [suggested by, Timothy Hume, used to get sisu texpdf to work on MacOS]
+ * v3dv, sysenv, use "which" instead of "whereis" to locate programs, test
+ [suggested by, Timothy Hume, used to get sisu texpdf to work on MacOS]
-%% 3.1.11.orig.tar.xz (2012-01-10:02/2)
+** 3.1.11.orig.tar.xz (2012-01-10:02/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.11.orig.tar.xz
@@ -709,7 +710,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.11.orig.tar.xz
* modify.rb, prep script for year update, & changing module & class names
-%% 3.1.10.orig.tar.xz (2011-12-31:52/6)
+** 3.1.10.orig.tar.xz (2011-12-31:52/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.10
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.10.orig.tar.xz
@@ -720,7 +721,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.10.orig.tar.xz
* html, epub, (& xml) codeblocks, treatment of '<<' & '>>', fix
(codeblock, remove legacy match rule, watch)
-%% 3.1.9.orig.tar.xz (2011-12-19:51/1)
+** 3.1.9.orig.tar.xz (2011-12-19:51/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.9
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.9.orig.tar.xz
@@ -741,7 +742,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.9.orig.tar.xz
now prints a message that sub-directories may not be provided for --find or
--glob at this time
-%% 3.1.8.orig.tar.xz (2011-12-13:50/2)
+** 3.1.8.orig.tar.xz (2011-12-13:50/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
@@ -754,7 +755,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
* odf:odt, codeblocks, a match fix, affects e.g. "<<"
-%% 3.1.7.orig.tar.xz (2011-12-08:49/4)
+** 3.1.7.orig.tar.xz (2011-12-08:49/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.7
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
@@ -778,7 +779,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.7.orig.tar.xz
* manpage
* html
-%% 3.1.6.orig.tar.xz (2011-12-02:48/5)
+** 3.1.6.orig.tar.xz (2011-12-02:48/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.6
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.6.orig.tar.xz
@@ -802,7 +803,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.6.orig.tar.xz
* require iconv (depreciated), use String#encode instead
* removed iconv, required a number of places without being used, watch
-%% 3.1.5.orig.tar.xz (2011-11-21:47/1)
+** 3.1.5.orig.tar.xz (2011-11-21:47/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.5
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
@@ -827,7 +828,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.5.orig.tar.xz
* sisu manual, sisu markup, include example of: link shortcut for multiple
versions of a sisu document in the same directory tree
-%% 3.1.4.orig.tar.xz (2011-11-11:45/5)
+** 3.1.4.orig.tar.xz (2011-11-11:45/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.4
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.4.orig.tar.xz
@@ -839,7 +840,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.4.orig.tar.xz
* explicit calls (more verbose, easier to find)
* replace system calls
-%% 3.1.3.orig.tar.xz (2011-11-05:44/6)
+** 3.1.3.orig.tar.xz (2011-11-05:44/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.3
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.3.orig.tar.xz
@@ -850,7 +851,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.3.orig.tar.xz
* header, @make: :bold: :italic: fix necessary, Re (3.1.2): (bold & italic
pattern matching) possibility to ignore case (reinstated)
-%% 3.1.2.orig.tar.xz (2011-10-31:44/1)
+** 3.1.2.orig.tar.xz (2011-10-31:44/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.2.orig.tar.xz
@@ -871,7 +872,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.2.orig.tar.xz
* conf/convert/modify.rb minor fixes
-%% 3.1.1.orig.tar.xz (2011-10-15:41/6)
+** 3.1.1.orig.tar.xz (2011-10-15:41/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.1.orig.tar.xz
@@ -886,7 +887,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.1.orig.tar.xz
* manifest, odt url lnk, fix
-%% 3.1.0.orig.tar.xz (2011-10-03:40/1)
+** 3.1.0.orig.tar.xz (2011-10-03:40/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.0.orig.tar.xz
@@ -919,7 +920,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.0.orig.tar.xz
* manpage
* man2html html
-%% 3.0.19.orig.tar.xz (2011-09-24:38/6)
+** 3.0.19.orig.tar.xz (2011-09-24:38/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.19
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.19-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.19.orig.tar.xz
@@ -944,7 +945,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.19.orig.tar.xz
* param, matching of date, years 1400 - 21\d\d
-%% 3.0.18.orig.tar.xz (2011-01-13:37/2)
+** 3.0.18.orig.tar.xz (2011-01-13:37/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.18
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.18-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.18.orig.tar.xz
@@ -978,7 +979,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.18.orig.tar.xz
* correct .orig.tar.xz name in CHANGELOG_v3 (>=3.0.15)
-%% 3.0.17.orig.tar.xz (2011-01-05:36/1)
+** 3.0.17.orig.tar.xz (2011-01-05:36/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.17
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.17-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.17.orig.tar.xz
@@ -1008,7 +1009,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.17.orig.tar.xz
* Dir.chdir, remove "system cd" (change directory) use Dir.chdir
-%% 3.0.16.orig.tar.xz (2011-08-18:33/4)
+** 3.0.16.orig.tar.xz (2011-08-18:33/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.16
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.16-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.16.orig.tar.xz
@@ -1035,7 +1036,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.16.orig.tar.xz
* concordance, i18n, start adding alternative language alphabets
(Danish, Norwegian, Swedish)
-%% 3.0.15.orig.tar.xz (2011-08-08:32/1)
+** 3.0.15.orig.tar.xz (2011-08-08:32/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu-3.0.15
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.0.15-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.15.orig.tar.xz
@@ -1071,7 +1072,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.15.orig.tar.xz
* objects.txt, removed, cleaning
-%% 3.0.14.orig.tar.gz (2011-07-26:30/2)
+** 3.0.14.orig.tar.gz (2011-07-26:30/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.14-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.14.orig.tar.gz
4c2cfdefcc64c052d65fc8d46e91f1d1a362548c6befef90488cfbd7219e6e25 1954612 sisu_3.0.14.orig.tar.gz
@@ -1132,7 +1133,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.14.orig.tar.gz
* urls, --concordance
-%% 3.0.13.orig.tar.gz (2011-06-26:25/7)
+** 3.0.13.orig.tar.gz (2011-06-26:25/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.13-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz
33d2358a39a69c1be4403b06b52eaeca604e851ee4e32c6f1625399944362fea 1943441 sisu_3.0.13.orig.tar.gz
@@ -1207,7 +1208,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz
* ansi screen reporting include document language code
-%% 3.0.12.orig.tar.gz (2011-06-09:23/4)
+** 3.0.12.orig.tar.gz (2011-06-09:23/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz
87b54e241067766c67233889ac973310d25ae12264ed65e9fd847626c9b95b2a 1943781 sisu_3.0.12.orig.tar.gz
@@ -1251,7 +1252,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz
varied by po4a) & name)
* s/Bul garian/Bulgarian/ (Closes: #619068)
-%% 3.0.11.orig.tar.gz (2011-05-29:21/7)
+** 3.0.11.orig.tar.gz (2011-05-29:21/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.11.orig.tar.gz
b3ff82d967565a35f9693ad95812adcb850ac4f58f60f4cf9e5a9d613d886fcc 1940955 sisu_3.0.11.orig.tar.gz
@@ -1277,7 +1278,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.11.orig.tar.gz
* documentation, minor update, includes --find / --glob
-%% 3.0.10.orig.tar.gz (2011-05-23:21/1)
+** 3.0.10.orig.tar.gz (2011-05-23:21/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.10.orig.tar.gz
8419b1523656789f5946fca32297b9ba58ec107ff52d12efa4698cabc242a3b8 1940966 sisu_3.0.10.orig.tar.gz
@@ -1321,7 +1322,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.10.orig.tar.gz
* defaults, fix path to homepage image (more fixes remain ...)
-%% 3.0.9.orig.tar.gz (2011-05-17:20/2)
+** 3.0.9.orig.tar.gz (2011-05-17:20/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
90694ba44e6412f266fe0501975c3dcdc95824c5099f54729c436284f5948eab 1937861 sisu_3.0.9.orig.tar.gz
@@ -1363,7 +1364,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
* po4a, re-enabled, numerous issues
-%% 3.0.8.orig.tar.gz (2011-05-05:18/4)
+** 3.0.8.orig.tar.gz (2011-05-05:18/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
87b595cc6e108e325d80e7ef78e58463ab3cdd0d7036fd943224114c8eb9b897 1936305 sisu_3.0.8.orig.tar.gz
@@ -1445,7 +1446,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
* *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are
preferred for programming / sisu markup
-%% 3.0.7.orig.tar.gz (2011-04-20:16/3)
+** 3.0.7.orig.tar.gz (2011-04-20:16/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
08474012bd979f4c18881be47d0b2e6c5add9a013b886ea6f7f943464db84825 1929419 sisu_3.0.7.orig.tar.gz
@@ -1511,7 +1512,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
* document existence of new alias for -M (--maintenance)
--keep-maintenance-files (see Bug#622902)
-%% 3.0.6.orig.tar.gz (2011-03-30:13/3)
+** 3.0.6.orig.tar.gz (2011-03-30:13/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
daa6671a08dd4eeb5848f73b3ecff23b05b7fa0e338b91cd9992dee8a005441e 1923985 sisu_3.0.6.orig.tar.gz
@@ -1533,7 +1534,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.6.orig.tar.gz
* for console use color names instead of numbers
* rearrange
-%% 3.0.5.orig.tar.gz (2011-03-24:12/4)
+** 3.0.5.orig.tar.gz (2011-03-24:12/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
9ac4622ff5e27188873d18bc0f92c508b72850eba8aebea25372e18a3c066fb4 1921835 sisu_3.0.5.orig.tar.gz
@@ -1558,7 +1559,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz
* vim syntax highlighting, fix typo
-%% 3.0.4.orig.tar.gz (2011-03-11:10/5)
+** 3.0.4.orig.tar.gz (2011-03-11:10/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz
145c409526b26cb0a14b43f4c46219fb828dc41c8211d8f77bad486a98300678 1920526 sisu_3.0.4.orig.tar.gz
@@ -1567,7 +1568,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.4.orig.tar.gz
* sisu_manual, sisu_download, remove references to versions of sisu
-%% 3.0.3.orig.tar.gz (2011-03-11:10/5)
+** 3.0.3.orig.tar.gz (2011-03-11:10/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
a48f327ccf025582a5301a8e6a754891ff56c154843f5992d6b9d1cac97247be 1920600 sisu_3.0.3.orig.tar.gz
@@ -1614,7 +1615,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz
* emacs sisu headers updated (subheaders omitted for now) sisu-mode.el
* vim cleaning sisu.vim
-%% 3.0.2.orig.tar.gz (2011-03-05:09/6)
+** 3.0.2.orig.tar.gz (2011-03-05:09/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
5211dcb37ab8aeb0889e3faaf567367f40f3b121a60cc6fd01fd78fe5adcd00d 1918497 sisu_3.0.2.orig.tar.gz
@@ -1658,7 +1659,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz
* conf/skin remove less important skins and use syslink to share
doc/skin_sisu.rb
-%% 3.0.1.orig.tar.gz (2011-02-16:07/3)
+** 3.0.1.orig.tar.gz (2011-02-16:07/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
881a1fa51154c706c053c6cf136fbaa7c1f3abe96dd203dc649d42875dd55482 2716285 sisu_3.0.1.orig.tar.gz
@@ -1674,7 +1675,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz
* sysenv & sisurc.yml: libreoffice, default odf reader
-%% 3.0.0.orig.tar.gz (2011-02-07:06/1)
+** 3.0.0.orig.tar.gz (2011-02-07:06/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.0.orig.tar.gz
53b9629bde5d27c504005ebc02c722d5d7d6cc3556e9dbfd1802dac682c52856 2716588 sisu_3.0.0.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index f9e16293..f5a1b2be 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -1,7 +1,7 @@
-%% SiSU version 4
+* SiSU version 4
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v4;hb=HEAD>
-* debian/changelog
+ * debian/changelog
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
v5 development branch
@@ -9,13 +9,13 @@ v4 branch is removed; it is available in sisu < 5.3.0
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/
+ * 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/
initial goals:
* remove/retire "skins"; replace some functionality with headers and/or yml
@@ -23,156 +23,157 @@ v2 branch is removed; it is available in sisu =< 3.3.2
* 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
-%% Reverse Chronological:
+* Reverse Chronological:
-%% 4.2.21.orig.tar.xz (2014-01-26:03/7)
+** 4.2.21.orig.tar.xz (2014-01-26:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.21
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.21-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.21.orig.tar.xz
sisu_4.2.21.orig.tar.xz
sisu_4.2.21-1.dsc
-[closed]
+ [closed]
-* bin/sisu changes to simplify switching to new stable and development branches
+ * bin/sisu changes to simplify switching to new stable and development branches
-%% 4.2.20.orig.tar.xz (2014-01-20:03/1)
+** 4.2.20.orig.tar.xz (2014-01-20:03/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.20
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.20-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.20.orig.tar.xz
sisu_4.2.20.orig.tar.xz
sisu_4.2.20-1.dsc
-[good time to consider rollover: closing v4 branch, replacing it with v5 &
-introducing v6 for development, proposed for this release + 1]
+ [good time to consider rollover: closing v4 branch, replacing it with v5 &
+ introducing v6 for development, proposed for this release + 1]
-* bin/sisu & some related lib changes
+ * bin/sisu & some related lib changes
-* sysenv for texpdf, fix for when tex to pdf generator is absent
+ * sysenv for texpdf, fix for when tex to pdf generator is absent
-%% 4.2.19.orig.tar.xz (2014-01-17:02/5)
+** 4.2.19.orig.tar.xz (2014-01-17:02/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.19
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.19-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.19.orig.tar.xz
sisu_4.2.19.orig.tar.xz
sisu_4.2.19-1.dsc
-* bin/sisu experimentation
- * start preparing for ruby changes
- * work on fix for bug related to gem path & system installed sisu
+ * bin/sisu experimentation
+ * start preparing for ruby changes
+ * work on fix for bug related to gem path & system installed sisu
-%% 4.2.18.orig.tar.xz (2014-01-12:01/7)
+** 4.2.18.orig.tar.xz (2014-01-12:01/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.18
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.18-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.18.orig.tar.xz
sisu_4.2.18.orig.tar.xz
sisu_4.2.18-1.dsc
-* texinfo, fixes
+ * texinfo, fixes
-* texpdf, report on pdf output, provide a working link to a generated file-size
- (multiple document file-sizes may be produced)
+ * texpdf, report on pdf output, provide a working link to a generated file-size
+ (multiple document file-sizes may be produced)
-%% 4.2.17.orig.tar.xz (2014-01-06:01/1)
+** 4.2.17.orig.tar.xz (2014-01-06:01/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.17
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.17-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.17.orig.tar.xz
sisu_4.2.17.orig.tar.xz
sisu_4.2.17-1.dsc
-* bin/sisu
- * (ensure SiSU_version_dir) fix
- * sisu version info, yml info also when installed via ruby gem
- * downstream libs
+ * bin/sisu
+ * (ensure SiSU_version_dir) fix
+ * sisu version info, yml info also when installed via ruby gem
+ * downstream libs
-* fixes
- * ao_doc_str, nodes, possible parents, correction
- * epub, url closure decoration
- * sysenv, qrcode report absent program, minor
- * html scroll toc, clean links where none, exclude metadata
+ * fixes
+ * ao_doc_str, nodes, possible parents, correction
+ * epub, url closure decoration
+ * sysenv, qrcode report absent program, minor
+ * html scroll toc, clean links where none, exclude metadata
-%% 4.2.16.orig.tar.xz (2013-12-15:49/7)
+** 4.2.16.orig.tar.xz (2013-12-15:49/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.16
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.16-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.16.orig.tar.xz
sisu_4.2.16.orig.tar.xz
sisu_4.2.16-1.dsc
-* Rakefile, (installer), reduce actions
+ * Rakefile, (installer), reduce actions
-%% 4.2.15.orig.tar.xz (2013-12-09:49/1)
+** 4.2.15.orig.tar.xz (2013-12-09:49/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.15
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.15-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.15.orig.tar.xz
sisu_4.2.15.orig.tar.xz
sisu_4.2.15-1.dsc
-* Rakefile, (installer) improve, re-arrange
+ * Rakefile, (installer) improve, re-arrange
-[NOTE disk crash (2013-11-28), fairly good but incomplete backup affecting work]
+ [NOTE disk crash (2013-11-28), fairly good but incomplete backup affecting
+ work]
-%% 4.2.14.orig.tar.xz (2013-12-03:48/2)
+** 4.2.14.orig.tar.xz (2013-12-03:48/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.14
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.14-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.14.orig.tar.xz
sisu_4.2.14.orig.tar.xz
sisu_4.2.14-1.dsc
-* rake create build & install sisu gemspec; (.gitignore), work on
- * gemspec adjusted to install only libraries related to a version (v4 or v5)
- * select sisu version to create, build & install
+ * rake create build & install sisu gemspec; (.gitignore), work on
+ * gemspec adjusted to install only libraries related to a version (v4 or v5)
+ * select sisu version to create, build & install
-* bin/sisu, simplify in relation to sisu gem
+ * bin/sisu, simplify in relation to sisu gem
-%% 4.2.13.orig.tar.xz (2013-12-02:48/1)
+** 4.2.13.orig.tar.xz (2013-12-02:48/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.13
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.13-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.13.orig.tar.xz
sisu_4.2.13.orig.tar.xz
sisu_4.2.13-1.dsc
-* rake create build & install sisu gemspec; bin/sisugem (add .gitignore)
- * rake gemcbi #(create build install sisu gem)
- * rake gemspecscreate && \
- rake gembuild && \
- sudo rake geminstall
- * rake gemspecscreate && \
- gem build sisu5.gemspec && \
- sudo gem install --no-rdoc --no-ri \
- sisu-5.1.0.gem
- * bin/sisu updated (modified to take account of gems)
- * bin/sisugem added
- * .gitignore sisu-*.gem sisu*.gemspec
- consider inclusion (& tracking) of rake created sisu4.gemspec sisu5.gemspec
- (as this makes their availability more obvious)
- * once gem is installed: "sisu _5.1.0_ -vM" (to see version, commands
- otherwise as usual) if paths are such that sisu is not available
- "sisugem _5.1.0_ -vM" should work (as it is installed by gemspec, but not
- other sisu installers)
-
-* hub, sisu4 -M (maintenance mode) provide info as to path to hub.rb (i.e. where
- library is being drawn)
-
-%% 4.2.12.orig.tar.xz (2013-11-08:44/5)
+ * rake create build & install sisu gemspec; bin/sisugem (add .gitignore)
+ * rake gemcbi #(create build install sisu gem)
+ * rake gemspecscreate && \
+ rake gembuild && \
+ sudo rake geminstall
+ * rake gemspecscreate && \
+ gem build sisu5.gemspec && \
+ sudo gem install --no-rdoc --no-ri \
+ sisu-5.1.0.gem
+ * bin/sisu updated (modified to take account of gems)
+ * bin/sisugem added
+ * .gitignore sisu-*.gem sisu*.gemspec
+ consider inclusion (& tracking) of rake created sisu4.gemspec
+ sisu5.gemspec (as this makes their availability more obvious)
+ * once gem is installed: "sisu _5.1.0_ -vM" (to see version, commands
+ otherwise as usual) if paths are such that sisu is not available
+ "sisugem _5.1.0_ -vM" should work (as it is installed by gemspec, but not
+ other sisu installers)
+
+ * hub, sisu4 -M (maintenance mode) provide info as to path to hub.rb (i.e.
+ where library is being drawn)
+
+** 4.2.12.orig.tar.xz (2013-11-08:44/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.12
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.12.orig.tar.xz
sisu_4.2.12.orig.tar.xz
sisu_4.2.12-1.dsc
-* rake (& rant) sisu installer
- * do less by default
- * removed rant generated sisu-install
+ * rake (& rant) sisu installer
+ * do less by default
+ * removed rant generated sisu-install
-* vim, ftplugin sisu.vim, fix missing <leader>
+ * vim, ftplugin sisu.vim, fix missing <leader>
-* sisu_manual, minor info addition
+ * sisu_manual, minor info addition
-* bin/sisu-*
- * use option flag full names
- * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
+ * bin/sisu-*
+ * use option flag full names
+ * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
-%% 4.2.11.orig.tar.xz (2013-11-05:44/2)
+** 4.2.11.orig.tar.xz (2013-11-05:44/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.11.orig.tar.xz
@@ -181,106 +182,109 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.11.orig.tar.xz
[5.0.24 changes only]
-%% 4.2.10.orig.tar.xz (2013-11-02:43/6)
+** 4.2.10.orig.tar.xz (2013-11-02:43/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.10
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.10.orig.tar.xz
sisu_4.2.10.orig.tar.xz
sisu_4.2.10-1.dsc
-* constants, ocn output delimiter (where used) changed to 「...」
- (from square brackets [...])
+ * constants, ocn output delimiter (where used) changed to 「...」
+ (from square brackets [...])
-%% 4.2.9.orig.tar.xz (2013-10-27:42/7)
+** 4.2.9.orig.tar.xz (2013-10-27:42/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.9
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.9.orig.tar.xz
sisu_4.2.9.orig.tar.xz
sisu_4.2.9-1.dsc
-* dal, document_structure_check_info
+ * dal, document_structure_check_info
-%% 4.2.8.orig.tar.xz (2013-10-23:42/3)
+** 4.2.8.orig.tar.xz (2013-10-23:42/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.8
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.8.orig.tar.xz
sisu_4.2.8.orig.tar.xz
sisu_4.2.8-1.dsc
-* dal, parent & node info, fix
- (used e.g. for mind map type output (last for kdissert output, no longer
- supported))
+ * dal, parent & node info, fix
+ (used e.g. for mind map type output (last for kdissert output, no longer
+ supported))
-* dal, collapsed levels implemented
- convenience, collapse sisu's dual level document structure for output of
- markup with straight linear structure
+ * dal, collapsed levels implemented
+ convenience, collapse sisu's dual level document structure for output of
+ markup with straight linear structure
-%% 4.2.7.orig.tar.xz (2013-10-17:41/4)
+** 4.2.7.orig.tar.xz (2013-10-17:41/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.7
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.7.orig.tar.xz
sisu_4.2.7.orig.tar.xz
sisu_4.2.7-1.dsc
-* constants, change a couple of internal processing delimiter characters, that
- might be used in ordinary marked up text (to characters even less likely to be
- of use in ordinary (marked up) text)
+ * constants, change a couple of internal processing delimiter characters, that
+ might be used in ordinary marked up text (to characters even less likely to
+ be of use in ordinary (marked up) text)
-%% 4.2.6.orig.tar.xz (2013-10-16:41/3)
+** 4.2.6.orig.tar.xz (2013-10-16:41/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.6
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.6.orig.tar.xz
sisu_4.2.6.orig.tar.xz
sisu_4.2.6-1.dsc
-* constants, change a couple of internal processing delimiter characters, that
- might be used in ordinary marked up text
+ * constants, change a couple of internal processing delimiter characters, that
+ might be used in ordinary marked up text
-* vim, minor updates, not syntax related
+ * vim, minor updates, not syntax related
-* markup sample, update book index markup, appearance, minor
+ * markup sample, update book index markup, appearance, minor
-%% 4.2.5.orig.tar.xz (2013-09-22:37/7)
+** 4.2.5.orig.tar.xz (2013-09-22:37/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.5
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.5.orig.tar.xz
sisu_4.2.5.orig.tar.xz
sisu_4.2.5-1.dsc
-* bin/sisu update language list ja ko zh, fix
+ * bin/sisu update language list ja ko zh, fix
-%% 4.2.4.orig.tar.xz (2013-09-21:37/6)
+** 4.2.4.orig.tar.xz (2013-09-21:37/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.4
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.4.orig.tar.xz
sisu_4.2.4.orig.tar.xz
sisu_4.2.4-1.dsc
-* i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
- * texpdf, has large texlive xetex dependencies (Korean untested)
- * [concordance, untouched does nothing cjk, decide whether to disable]
-
-* sisu_manual, (in markup-samples) move to en/ sub-dir (permitting translations)
- * use of language sub-dir for source sisu markup suited to permitting
- translation management by po4a
- * sisurc.yml minor
- * Rakefile to help place sisu markup in a source language directory under po4a
- management
-
-* Rakefile to assist in placing sisu markup under po4a management (sisu_manual)
- * Provided as an example with sisu_manual
- * fairly generic, but potentially dangerous, can be used to place sisu markup
- source translations under po4a management, but user needs to know what this
- is, (and how to set it up, hence sisu_manual as an example (despite the lack
- of translations)) as can clobber/destroy files that are not managed by po4a.
-
-* dal, objects, store book index as hash (simplify downstream processing), and
- associated downstream processing change from v5
- * db, book index, convert hash back to string
-
-* minor cleaning
-
-%% 4.2.3.orig.tar.xz (2013-09-07:35/6)
+ * i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
+ * texpdf, has large texlive xetex dependencies (Korean untested)
+ * [concordance, untouched does nothing cjk, decide whether to disable]
+
+ * sisu_manual, (in markup-samples) move to en/ sub-dir (permitting
+ translations)
+ * use of language sub-dir for source sisu markup suited to permitting
+ translation management by po4a
+ * sisurc.yml minor
+ * Rakefile to help place sisu markup in a source language directory under
+ po4a management
+
+ * Rakefile to assist in placing sisu markup under po4a management
+ (sisu_manual)
+ * Provided as an example with sisu_manual
+ * fairly generic, but potentially dangerous, can be used to place sisu
+ markup source translations under po4a management, but user needs to know
+ what this is, (and how to set it up, hence sisu_manual as an example
+ (despite the lack of translations)) as can clobber/destroy files that are
+ not managed by po4a.
+
+ * dal, objects, store book index as hash (simplify downstream processing), and
+ associated downstream processing change from v5
+ * db, book index, convert hash back to string
+
+ * minor cleaning
+
+** 4.2.3.orig.tar.xz (2013-09-07:35/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.3
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.3.orig.tar.xz
@@ -289,690 +293,695 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.3.orig.tar.xz
[5.0.16 changes only]
-%% 4.2.2.orig.tar.xz (2013-09-05:35/4)
+** 4.2.2.orig.tar.xz (2013-09-05:35/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.2.orig.tar.xz
sisu_4.2.2.orig.tar.xz
sisu_4.2.2-1.dsc
-* dal, grouped text with fontface spanning newlines, partial solution, merge
- from 5.0.14
+ * dal, grouped text with fontface spanning newlines, partial solution, merge
+ from 5.0.14
-* dal, book index markup, allow spaces on both sides of delimiters, or a space
- before and newline following a delimiter \s+[:|;](\s+|\n)
- [else parses as before no spaces]
+ * dal, book index markup, allow spaces on both sides of delimiters, or a space
+ before and newline following a delimiter \s+[:|;](\s+|\n)
+ [else parses as before no spaces]
-* vim syntax, book index markup, hilight delimeters
+ * vim syntax, book index markup, hilight delimeters
-%% 4.2.1.orig.tar.xz (2013-08-28:34/3)
+** 4.2.1.orig.tar.xz (2013-08-28:34/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz
sisu_4.2.1.orig.tar.xz
sisu_4.2.1-1.dsc
-* config files (by filetype & filename) touched
+ * config files (by filetype & filename) touched
-* manifest, output organised by, info, minor touch
+ * manifest, output organised by, info, minor touch
-* vim syntax, sisu.vim, fix typo
- * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+ * vim syntax, sisu.vim, fix typo
+ * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
-* pdf (latex) tables, bugfix
+ * pdf (latex) tables, bugfix
-* odf:odt, footnotes, fix
+ * odf:odt, footnotes, fix
-* dal, text blocks, tuning
+ * dal, text blocks, tuning
-%% 4.2.0.orig.tar.xz (2013-08-25:33/7)
+** 4.2.0.orig.tar.xz (2013-08-25:33/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.0.orig.tar.xz
sisu_4.2.0.orig.tar.xz
sisu_4.2.0-1.dsc
-* merge v5
- * syntax add
- * switch ocn off and on for a block of content, line containing only
- off: "--~#" (omit headings where possible) "---#" on: "--+#"
- * alternative open and close for blocks using line starting with "```", e.g.
- open code block: "``` code"; close code block: "```"
- start poem: "``` poem"; end poem: "```"
- * remove need for an empty line between opening & closing of a text block
- [note use of "~~" considered but more problematic, (tics not used elsewhere)]
-
-* vim syntax, improve grouped text match, open, close of blocks using tics "```"
- * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
- * grouped text, open, close of blocks using tics "```"
-
-* css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
- review further)
-
-%% 4.1.12.orig.tar.xz (2013-08-21:33/3)
+ * merge v5
+ * syntax add
+ * switch ocn off and on for a block of content, line containing only
+ off: "--~#" (omit headings where possible) "---#" on: "--+#"
+ * alternative open and close for blocks using line starting with "```",
+ e.g. open code block: "``` code"; close code block: "```"
+ start poem: "``` poem"; end poem: "```"
+ * remove need for an empty line between opening & closing of a text block
+ [note use of "~~" considered but more problematic, (tics not used elsewhere)]
+
+ * vim syntax, improve grouped text match, open, close of blocks using tics
+ "```"
+ * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+ * grouped text, open, close of blocks using tics "```"
+
+ * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
+ review further)
+
+** 4.1.12.orig.tar.xz (2013-08-21:33/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.12
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.12.orig.tar.xz
sisu_4.1.12.orig.tar.xz
sisu_4.1.12-1.dsc
-* messages to terminal
- * code marker
- * rescued error messages
- * fuchsia (sp.)
+ * messages to terminal
+ * code marker
+ * rescued error messages
+ * fuchsia (sp.)
-%% 4.1.11.orig.tar.xz (2013-08-08:31/4)
+** 4.1.11.orig.tar.xz (2013-08-08:31/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.11.orig.tar.xz
sisu_4.1.11.orig.tar.xz
sisu_4.1.11-1.dsc
-* dal_expand_insertions, refinement for monolingual output
+ * dal_expand_insertions, refinement for monolingual output
-%% 4.1.10.orig.tar.xz (2013-08-08:31/4)
+** 4.1.10.orig.tar.xz (2013-08-08:31/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.10
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.10.orig.tar.xz
sisu_4.1.10.orig.tar.xz
sisu_4.1.10-1.dsc
-[merge 5.0.10 lib]
-* output structure by, add monolingual alternative for :filetype or :filename
- * filename without language code, if document is in default language
- * set a default language, 'en' or as specified
- * set in rc file or from command line instruction
- * command line e.g.
- sisu -hv --monolingual --by-filename sisu_markup.sst
- sisu -3v --monolingual --by-filetype sisu_manual.ssm
- * sisurc.yml lingual: 'mono' | 'multi'
- lingual: 'mono'
- * note: output by :filetype is roughly equivalent to what monolingual output
- by :language would be
- * allow command line setting of default language using language code
- --default-language='en' --default-lang-en if used together with
- --monolingual and --by-filetype or --by-filename the selected default
- language document will not have a language code in the output filename
- * documentation
-
-* cgi helper script, sample search form
- * single cgi form, (with different internal variables set for output types)
- * monolingual output search form option
-
-%% 4.1.9.orig.tar.xz (2013-08-01:30/4)
+ [merge 5.0.10 lib]
+ * output structure by, add monolingual alternative for :filetype or :filename
+ * filename without language code, if document is in default language
+ * set a default language, 'en' or as specified
+ * set in rc file or from command line instruction
+ * command line e.g.
+ sisu -hv --monolingual --by-filename sisu_markup.sst
+ sisu -3v --monolingual --by-filetype sisu_manual.ssm
+ * sisurc.yml lingual: 'mono' | 'multi'
+ lingual: 'mono'
+ * note: output by :filetype is roughly equivalent to what monolingual output
+ by :language would be
+ * allow command line setting of default language using language code
+ --default-language='en' --default-lang-en if used together with
+ --monolingual and --by-filetype or --by-filename the selected default
+ language document will not have a language code in the output filename
+ * documentation
+
+ * cgi helper script, sample search form
+ * single cgi form, (with different internal variables set for output types)
+ * monolingual output search form option
+
+** 4.1.9.orig.tar.xz (2013-08-01:30/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.9
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.9.orig.tar.xz
sisu_4.1.9.orig.tar.xz
sisu_4.1.9-1.dsc
-%% 4.1.8.orig.tar.xz (2013-07-30:30/2)
+** 4.1.8.orig.tar.xz (2013-07-30:30/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.8
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.8.orig.tar.xz
sisu_4.1.8.orig.tar.xz
sisu_4.1.8-1.dsc
-%% 4.1.7.orig.tar.xz (2013-06-25:25/2)
+** 4.1.7.orig.tar.xz (2013-06-25:25/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.7
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.7.orig.tar.xz
sisu_4.1.7.orig.tar.xz
sisu_4.1.7-1.dsc
-* "general code cleaning" fix
+ * "general code cleaning" fix
-%% 4.1.6.orig.tar.xz (2013-06-25:25/2)
+** 4.1.6.orig.tar.xz (2013-06-25:25/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.6
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.6.orig.tar.xz
sisu_4.1.6.orig.tar.xz
sisu_4.1.6-1.dsc
-* general code cleaning, sync with v5
+ * general code cleaning, sync with v5
-%% 4.1.5.orig.tar.xz (2013-06-22:23/6)
+** 4.1.5.orig.tar.xz (2013-06-22:23/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.5
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.5.orig.tar.xz
sisu_4.1.5.orig.tar.xz
sisu_4.1.5-1.dsc
-* vim
- * colorscheme def, mark current line
- * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
+ * vim
+ * colorscheme def, mark current line
+ * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
-%% 4.1.4.orig.tar.xz (2013-06-06:22/4)
+** 4.1.4.orig.tar.xz (2013-06-06:22/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.4
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.4.orig.tar.xz
sisu_4.1.4.orig.tar.xz
sisu_4.1.4-1.dsc
-* db, population of database (--update), import of master files (.ssm), fix
- (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
- affects construction of unique identifier)
+ * db, population of database (--update), import of master files (.ssm), fix
+ (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
+ affects construction of unique identifier)
-* cgi helper script, sample search form generator
- * file name matching, check
- * cosmetic, drop use of images in sample form
+ * cgi helper script, sample search form generator
+ * file name matching, check
+ * cosmetic, drop use of images in sample form
-* sysenv, requested load warning removed, less screen clutter, consider
+ * sysenv, requested load warning removed, less screen clutter, consider
-%% 4.1.3.orig.tar.xz (2013-05-30:21/4)
+** 4.1.3.orig.tar.xz (2013-05-30:21/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.3
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.3.orig.tar.xz
sisu_4.1.3.orig.tar.xz
sisu_4.1.3-1.dsc
-* sysenv, pgsql db connect fix
+ * sysenv, pgsql db connect fix
-* cgi_pgsql, cgi helper script, sample search form generator, detail
+ * cgi_pgsql, cgi helper script, sample search form generator, detail
-%% 4.1.2.orig.tar.xz (2013-05-29:21/3)
+** 4.1.2.orig.tar.xz (2013-05-29:21/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.2.orig.tar.xz
sisu_4.1.2.orig.tar.xz
sisu_4.1.2-1.dsc
-* help update, concentrate on man pages
- * documentation, manpage update
- * interactive help, out of date, removed
+ * help update, concentrate on man pages
+ * documentation, manpage update
+ * interactive help, out of date, removed
-* document version check, disable
- * automatic check disabled
- * check and correction of pre 0.38 markup removed
+ * document version check, disable
+ * automatic check disabled
+ * check and correction of pre 0.38 markup removed
-* sysenv, version info moved here from help
+ * sysenv, version info moved here from help
-* cgi helper script sample search form generator, adjust/improve, adds settings:
- db type --db-pq or db-sqlite
- webserver for cgi script & db --webserv-search=''
- webserver for sisu ouptut files --webserv-output=''
- cgi search form link name --cgi-search-form-name=''
- db user (pg) --db-user=''
+ * cgi helper script sample search form generator, adjust/improve, adds
+ settings:
+ db type --db-pq or db-sqlite
+ webserver for cgi script & db --webserv-search=''
+ webserver for sisu ouptut files --webserv-output=''
+ cgi search form link name --cgi-search-form-name=''
+ db user (pg) --db-user=''
-%% 4.1.1.orig.tar.xz (2013-05-19:19/7)
+** 4.1.1.orig.tar.xz (2013-05-19:19/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.1.orig.tar.xz
sisu_4.1.1.orig.tar.xz
sisu_4.1.1-1.dsc
-* vim, ftplugin, sisu.vim, statusline
+ * vim, ftplugin, sisu.vim, statusline
-* cgi script for sample search form generator, sqlite, minor fixes (affects
- 'sisu -F')
+ * cgi script for sample search form generator, sqlite, minor fixes (affects
+ 'sisu -F')
-%% 4.1.0.orig.tar.xz (2013-05-08:18/3)
+** 4.1.0.orig.tar.xz (2013-05-08:18/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.0-1
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:
+ * v5 opened
+ * v3 closed
-* defaults, sysenv, simplify default home page (by default is not used)
+ * defaults, sysenv, simplify default home page (by default is not used)
-* cgi script for sample search form, minor fixes
+ * cgi script for sample search form, minor fixes
-%% 4.0.21.orig.tar.xz (2013-05-06:18/1)
+** 4.0.21.orig.tar.xz (2013-05-06:18/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.21
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.21-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.21.orig.tar.xz
sisu_4.0.21.orig.tar.xz
sisu_4.0.21-1.dsc
-* minor sysenv, cgi_sql_common
+ * minor sysenv, cgi_sql_common
-%% 4.0.20.orig.tar.xz (2013-04-11:14/4)
+** 4.0.20.orig.tar.xz (2013-04-11:14/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.20
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.20-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.20.orig.tar.xz
sisu_4.0.20.orig.tar.xz
sisu_4.0.20-1.dsc
-* sisurc.yml, reorganize configuration files
+ * sisurc.yml, reorganize configuration files
-* cgi sample search form, minor
+ * cgi sample search form, minor
-%% 4.0.19.orig.tar.xz (2013-04-08:14/1)
+** 4.0.19.orig.tar.xz (2013-04-08:14/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.19
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.19-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.19.orig.tar.xz
sisu_4.0.19.orig.tar.xz
sisu_4.0.19-1.dsc
-* sysenv, yamlrc, minor
+ * sysenv, yamlrc, minor
-* options, exclude manifest links if no manifest (--no-manifest) selected
+ * options, exclude manifest links if no manifest (--no-manifest) selected
-* zap, delete output files, based on given (existing) source file name
+ * zap, delete output files, based on given (existing) source file name
-%% 4.0.18.orig.tar.xz (2013-03-29:12/5)
+** 4.0.18.orig.tar.xz (2013-03-29:12/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.18
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.18-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.18.orig.tar.xz
sisu_4.0.18.orig.tar.xz
sisu_4.0.18-1.dsc
-* dal, screen_text_color, distinguish doc abstraction as start of processing
+ * dal, screen_text_color, distinguish doc abstraction as start of processing
-* dal, reading/processing composite markup files (.ssm)
- * dbi, import composite files correctly
- * manifest, mini-table of contents, for multi-lingual composite files
+ * dal, reading/processing composite markup files (.ssm)
+ * dbi, import composite files correctly
+ * manifest, mini-table of contents, for multi-lingual composite files
-* cgi, auto-generated sample search form
- * for various sisu output directory structures
- * fixes
+ * cgi, auto-generated sample search form
+ * for various sisu output directory structures
+ * fixes
-%% 4.0.17.orig.tar.xz (2013-03-25:12/1)
+** 4.0.17.orig.tar.xz (2013-03-25:12/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.17
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.17-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.17.orig.tar.xz
sisu_4.0.17.orig.tar.xz
sisu_4.0.17-1.dsc
-* manifest & harvest, links to default site home page index.html
+ * manifest & harvest, links to default site home page index.html
-* sysenv, copy or create homepages, one of the actions taken on --config
- * provide info as to where manually created homepages may be stored
- * do not make default sisu homepage (previously did)
+ * sysenv, copy or create homepages, one of the actions taken on --config
+ * provide info as to where manually created homepages may be stored
+ * do not make default sisu homepage (previously did)
-* param, guard against situation where no document creator/author given
+ * param, guard against situation where no document creator/author given
-* hub, non-verbose terminal info reduced, minor
+ * hub, non-verbose terminal info reduced, minor
-%% 4.0.16.orig.tar.xz (2013-03-18:11/1)
+** 4.0.16.orig.tar.xz (2013-03-18:11/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.16
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.16-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.16.orig.tar.xz
sisu_4.0.16.orig.tar.xz
sisu_4.0.16-1.dsc
-* hub, processing flow, sequence, fix
- * re-run manifests at end of general processing run:
- * where document source shared and more than one markup file processed;
- * where translations of same document exist (determined by filename)
+ * hub, processing flow, sequence, fix
+ * re-run manifests at end of general processing run:
+ * where document source shared and more than one markup file processed;
+ * where translations of same document exist (determined by filename)
-* sysenv, epub images where processing multilingual doc in lang code sub-dir
+ * sysenv, epub images where processing multilingual doc in lang code sub-dir
-%% 4.0.15.orig.tar.xz (2013-03-18:11/1)
+** 4.0.15.orig.tar.xz (2013-03-18:11/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.15
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.15-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.15.orig.tar.xz
sisu_4.0.15.orig.tar.xz
sisu_4.0.15-1.dsc
-* share document source, markup text file &/or sisupod
- * processing flow, correct sequence
- * terminal reporting
+ * share document source, markup text file &/or sisupod
+ * processing flow, correct sequence
+ * terminal reporting
-%% 4.0.14.orig.tar.xz (2013-03-16:10/6)
+** 4.0.14.orig.tar.xz (2013-03-16:10/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.14
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.14-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.14.orig.tar.xz
sisu_4.0.14.orig.tar.xz
sisu_4.0.14-1.dsc
-* harvest, authors, topics, terminal info
+ * harvest, authors, topics, terminal info
-* harvest, links for output_by? filename
+ * harvest, links for output_by? filename
-* manifest, links for output_by? alternatives, harvest & qrcode related
+ * manifest, links for output_by? alternatives, harvest & qrcode related
-* sysenv, rsync remote placement, output_by? alternatives, tuning, including
- * site_harvest
- * pdf fix
- * backround rsync only for processing of single sisu markup files
+ * sysenv, rsync remote placement, output_by? alternatives, tuning, including
+ * site_harvest
+ * pdf fix
+ * backround rsync only for processing of single sisu markup files
-%% 4.0.13.orig.tar.xz (2013-03-13:10/3)
+** 4.0.13.orig.tar.xz (2013-03-13:10/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.13
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.13-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.13.orig.tar.xz
sisu_4.0.13.orig.tar.xz
sisu_4.0.13-1.dsc
-* html_format, manifest red arrow, next (segment), (broken) link fix, to toc
+ * html_format, manifest red arrow, next (segment), (broken) link fix, to toc
-* terminal reporting, cosmetic
+ * terminal reporting, cosmetic
-* manifest, link to harvest authors & topics if available, else cosmeitc
+ * manifest, link to harvest authors & topics if available, else cosmeitc
-* hub, sysenv, remote, work on rsync of document/site build
+ * hub, sysenv, remote, work on rsync of document/site build
-* hub, sql db, fix for actions not requiring files, create, drop, etc.
+ * hub, sql db, fix for actions not requiring files, create, drop, etc.
-%% 4.0.12.orig.tar.xz (2013-03-08:09/5)
+** 4.0.12.orig.tar.xz (2013-03-08:09/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.12
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.12.orig.tar.xz
sisu_4.0.12.orig.tar.xz
sisu_4.0.12-1.dsc
-* share_src, sisu source, permissions, make world readable when shared
+ * share_src, sisu source, permissions, make world readable when shared
-* manifest, sysenv, manifests sisupod relative link for output_by language
+ * manifest, sysenv, manifests sisupod relative link for output_by language
-* bin/sisu, process remote sisu markup file or sisupod, where url provided
+ * bin/sisu, process remote sisu markup file or sisupod, where url provided
-* hub, operations, report if no markup file provided, where required by
- requested action
+ * hub, operations, report if no markup file provided, where required by
+ requested action
-%% 4.0.11.orig.tar.xz (2013-03-06:09/3)
+** 4.0.11.orig.tar.xz (2013-03-06:09/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.11
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.11.orig.tar.xz
sisu_4.0.11.orig.tar.xz
sisu_4.0.11-1.dsc
-* bin/sisu, expand given path for sisu executable
- (where system sisu not called directly)
+ * bin/sisu, expand given path for sisu executable
+ (where system sisu not called directly)
-* sysenv, base images path determined from given path for sisu executable
- (where system sisu not called directly)
+ * sysenv, base images path determined from given path for sisu executable
+ (where system sisu not called directly)
-* options, sisupod, name determination, fix
- * needed for creation of multiple sisupods
+ * options, sisupod, name determination, fix
+ * needed for creation of multiple sisupods
-* html_format, html segment navigation to toc, fix
+ * html_format, html segment navigation to toc, fix
-%% 4.0.10.orig.tar.xz (2013-03-05:09/2)
+** 4.0.10.orig.tar.xz (2013-03-05:09/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.10
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz
sisu_4.0.10.orig.tar.xz
sisu_4.0.10-1.dsc
-* texpdf, report to STDERR when pdf not (successfully) generated, note:
- .tex file is almost certainly produced by sisu, this will be a sisu packaging,
- texlive dependency issue, preventing its conversion to pdf (Closes: #617359)
+ * texpdf, report to STDERR when pdf not (successfully) generated, note:
+ .tex file is almost certainly produced by sisu, this will be a sisu
+ packaging, texlive dependency issue, preventing its conversion to pdf
+ (Closes: #617359)
-* sysenv, set default output (directory layout) type where none configured
- (also turned off reporting where imagemagick & graphicsmagick not installed)
+ * sysenv, set default output (directory layout) type where none configured
+ (also turned off reporting where imagemagick & graphicsmagick not installed)
-* html, epub, minor "cleaning" of output
+ * html, epub, minor "cleaning" of output
-%% 4.0.9.orig.tar.xz (2013-02-22:07/5)
+** 4.0.9.orig.tar.xz (2013-02-22:07/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.9.orig.tar.xz
sisu_4.0.9.orig.tar.xz
sisu_4.0.9-1.dsc
-* dal, line across page divider -..- introduced, an alternative to page
- break -\\- & =\\=, affects pdf and odf most significantly
- * output formats modified to include, (pdf, odf, epub, html, plaintext)
- * vim syntax, sisu.vim
- * emacs, sisu-mode.el
- * documentation, sisu_markup.sst, man page sisu.1, sisu.1.html
+ * dal, line across page divider -..- introduced, an alternative to page
+ break -\\- & =\\=, affects pdf and odf most significantly
+ * output formats modified to include, (pdf, odf, epub, html, plaintext)
+ * vim syntax, sisu.vim
+ * emacs, sisu-mode.el
+ * documentation, sisu_markup.sst, man page sisu.1, sisu.1.html
-%% 4.0.8.orig.tar.xz (2013-02-20:07/3)
+** 4.0.8.orig.tar.xz (2013-02-20:07/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.8
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.8.orig.tar.xz
sisu_4.0.8.orig.tar.xz
sisu_4.0.8-1.dsc
-* epub
- * tinkering with some headers
- * add markup of angle brackets '<' & '>' to early markup of ampersand '&'
+ * epub
+ * tinkering with some headers
+ * add markup of angle brackets '<' & '>' to early markup of ampersand '&'
-* html, modification to markup of angle brackets '<' & '>' and ampersand '&'
+ * html, modification to markup of angle brackets '<' & '>' and ampersand '&'
-* vim, ftplugin & colorschemes housekeeping, scheme "def*" added
- * general housekeeping
- * :colorscheme def256* defined from 256 colors (primarily 16 of them) terminal
- & gui (identical) (terminal scheme based on frugal & extended to cover gui)
- * :colorscheme def* cterm defined primarily using 16 colors (a few from 256)
- (to be usable tweak .Xdefaults) gui provided along with Xdefault settings to
- make cterm match this gui or def256*
+ * vim, ftplugin & colorschemes housekeeping, scheme "def*" added
+ * general housekeeping
+ * :colorscheme def256* defined from 256 colors (primarily 16 of them)
+ terminal & gui (identical) (terminal scheme based on frugal & extended to
+ cover gui)
+ * :colorscheme def* cterm defined primarily using 16 colors (a few from 256)
+ (to be usable tweak .Xdefaults) gui provided along with Xdefault settings
+ to make cterm match this gui or def256*
-* emacs, sisu-mode.el
- * sisu headers update
- * cosmetic code reshuffle
+ * emacs, sisu-mode.el
+ * sisu headers update
+ * cosmetic code reshuffle
-* b_epub.png, epub icon (for manifest) updated to use official image
+ * b_epub.png, epub icon (for manifest) updated to use official image
-%% 4.0.7.orig.tar.xz (2013-02-10:05/7)
+** 4.0.7.orig.tar.xz (2013-02-10:05/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.7
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.7.orig.tar.xz
sisu_4.0.7.orig.tar.xz
sisu_4.0.7-1.dsc
-* vim, minimal color schemes, minor edits
+ * vim, minimal color schemes, minor edits
-* dbi_discrete, discreet should have been discrete, renames accordingly
+ * dbi_discrete, discreet should have been discrete, renames accordingly
-* lib, bin/sisu, misc, code headers provide url to online git file source
- * e.g. bin/sisu * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
+ * lib, bin/sisu, misc, code headers provide url to online git file source
+ * e.g. bin/sisu * Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=bin/sisu;hb=HEAD>
-%% 4.0.6.orig.tar.xz (2013-02-07:05/4)
+** 4.0.6.orig.tar.xz (2013-02-07:05/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.6
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.6.orig.tar.xz
sisu_4.0.6.orig.tar.xz
sisu_4.0.6-1.dsc
-* html, screen reporting for --html-scroll, correctly identify output file
-
-* pdf
- * pdf (options, hub, urls), orientation, portrait & landscape optionally
- discrete, individually callable
- * --pdf-l (--pdf-landscape), --pdf-p (--pdf-portrait)
- * sisu latex output & xetex generation
- * pdf (options, param), papersize, command-line options to override sisurc
- settings, [a4,a5,b5,letter,legal] when --pdf* used:
- * --papersize-a4 --papersize-letter (also --a4 --letter)
- * --papersize=a4,letter
- * --pdf-a4 --pdf-letter (for portrait only --pdf-p-a4 --pdf-p-letter)
- [orientation & papersize options are set independently so calling
- --pdf-p-a4 & --pdf-l-letter would result in landscapes and portraits of
- both a4 & letter (rather than an individual request for a portrait A4 & a
- landscape letter size)]
- * texpdf, cosmetic code
-
-* utils (debug renamed)
- * SiSU_Utils::CodeMarker (from Debug::Mark)
- * SiSU_Utils::Path.new.base_markup provides base markup directory that
- contains sisu markup files, any language sub-directories (with sisu markup
- files) and sisu resource configuration sub-directory, if any (./_sisu)
- (identifies when needed in runtime)
-
-* sysenv, webserv dir (output dir), ensure it is determined from base markup
+ * html, screen reporting for --html-scroll, correctly identify output file
+
+ * pdf
+ * pdf (options, hub, urls), orientation, portrait & landscape optionally
+ discrete, individually callable
+ * --pdf-l (--pdf-landscape), --pdf-p (--pdf-portrait)
+ * sisu latex output & xetex generation
+ * pdf (options, param), papersize, command-line options to override sisurc
+ settings, [a4,a5,b5,letter,legal] when --pdf* used:
+ * --papersize-a4 --papersize-letter (also --a4 --letter)
+ * --papersize=a4,letter
+ * --pdf-a4 --pdf-letter (for portrait only --pdf-p-a4 --pdf-p-letter)
+ [orientation & papersize options are set independently so calling
+ --pdf-p-a4 & --pdf-l-letter would result in landscapes and portraits of
+ both a4 & letter (rather than an individual request for a portrait A4 &
+ a landscape letter size)]
+ * texpdf, cosmetic code
+
+ * utils (debug renamed)
+ * SiSU_Utils::CodeMarker (from Debug::Mark)
+ * SiSU_Utils::Path.new.base_markup provides base markup directory that
+ contains sisu markup files, any language sub-directories (with sisu markup
+ files) and sisu resource configuration sub-directory, if any (./_sisu)
+ (identifies when needed in runtime)
+
+ * sysenv, webserv dir (output dir), ensure it is determined from base markup
dir where relative path provided (remove possibility of it being done from a
language sub-directory), fix
-* documentation
- * sisu_manual/sisu_commands
- * manpage & html
+ * documentation
+ * sisu_manual/sisu_commands
+ * manpage & html
-%% 4.0.5.orig.tar.xz (2013-02-03:04/7)
+** 4.0.5.orig.tar.xz (2013-02-03:04/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.5
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.5.orig.tar.xz
sisu_4.0.5.orig.tar.xz
sisu_4.0.5-1.dsc
-* html (options, hub, urls), scroll & seg optionally discrete, individually
- callable
- * --html (both), --html-scroll, --html-seg
- * [possibly of interest where only one form of html of interest for use &/or
- to cut generation time (roughly to 63% for --html-scroll only)]
+ * html (options, hub, urls), scroll & seg optionally discrete, individually
+ callable
+ * --html (both), --html-scroll, --html-seg
+ * [possibly of interest where only one form of html of interest for use &/or
+ to cut generation time (roughly to 63% for --html-scroll only)]
-* sysenv, on --redirect, stop creation of redundant dir
+ * sysenv, on --redirect, stop creation of redundant dir
-* html, includes book index fix, rest cosmetic
+ * html, includes book index fix, rest cosmetic
-* css (html & epub) line spacing reduced, paragraph spacing increased
- * may need to tune spacing further to distinguish lines from new paragraphs
- (especially where ocn is not used as the distinction may be less
- clear/obvious)
+ * css (html & epub) line spacing reduced, paragraph spacing increased
+ * may need to tune spacing further to distinguish lines from new paragraphs
+ (especially where ocn is not used as the distinction may be less
+ clear/obvious)
-* documentation, include --html-scroll and --html-seg options
- * sisu_manual/sisu_commands
- * manpage & html
+ * documentation, include --html-scroll and --html-seg options
+ * sisu_manual/sisu_commands
+ * manpage & html
-%% 4.0.4.orig.tar.xz (2013-01-31:04/4)
+** 4.0.4.orig.tar.xz (2013-01-31:04/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.4.orig.tar.xz
sisu_4.0.4.orig.tar.xz
sisu_4.0.4-1.dsc
-* param_make, :cover_image: regex, less finicky match of image & details
- * [bug reported by Mikael Böök]
+ * param_make, :cover_image: regex, less finicky match of image & details
+ * [bug reported by Mikael Böök]
-* dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
- * [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
+ * dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix
+ * [bug reported indirectly by Cory Doctorow (discovered in work with
+ markup)]
-* epub, constants, debug alternative for various readers ... work on
+ * epub, constants, debug alternative for various readers ... work on
-* dal (obj), html, br_page* behavior in html depending on origin of break
- (markup specified v auto)
+ * dal (obj), html, br_page* behavior in html depending on origin of break
+ (markup specified v auto)
-%% 4.0.3.orig.tar.xz (2013-01-27:03/7)
+** 4.0.3.orig.tar.xz (2013-01-27:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.3
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.3.orig.tar.xz
sisu_4.0.3.orig.tar.xz
sisu_4.0.3-1.dsc
-* epub some fixing, more documents render in more readers/viewers
- * ncx fix, navpoint_close [bug reported by Mikael Böök, with sample fix toc]
- * check xml representation of characters (& < > in particular)
+ * epub some fixing, more documents render in more readers/viewers
+ * ncx fix, navpoint_close [bug reported by Mikael Böök, with sample fix toc]
+ * check xml representation of characters (& < > in particular)
-* remove markup-sample of the first edition of FaiF as redundant, the
- markup for the second edition being available (& partly in response to
- Bug#698664 which leads me to think about it), removed:
- free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
- and associated images
+ * remove markup-sample of the first edition of FaiF as redundant, the
+ markup for the second edition being available (& partly in response to
+ Bug#698664 which leads me to think about it), removed:
+ free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+ and associated images
-%% 4.0.2.orig.tar.xz (2013-01-23:03/3)
+** 4.0.2.orig.tar.xz (2013-01-23:03/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.2
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.2.orig.tar.xz
sisu_4.0.2.orig.tar.xz
sisu_4.0.2-1.dsc
-* epub
- * remove unnecessary conversion of some utf-8 characters to xhtml
- representation; fix as messed up table of contents, toc.ncx
- (e.g. in calibre)
- * [bug reported by Mikael Böök]
- * provide full depth epub table of contents [request Mikael Böök]
- * cosmetic arrangement of code <<-WOK
- * xhtml structure error, fix missing </div>
- * [bug reported by Mikael Böök] (fix of additional detail)
+ * epub
+ * remove unnecessary conversion of some utf-8 characters to xhtml
+ representation; fix as messed up table of contents, toc.ncx
+ (e.g. in calibre)
+ * [bug reported by Mikael Böök]
+ * provide full depth epub table of contents [request Mikael Böök]
+ * cosmetic arrangement of code <<-WOK
+ * xhtml structure error, fix missing </div>
+ * [bug reported by Mikael Böök] (fix of additional detail)
-* html
- * remove unnecessary conversion of some utf-8 characters to html
- representation
+ * html
+ * remove unnecessary conversion of some utf-8 characters to html
+ representation
-* texpdf_format
- * list of .sty files (and their texlive source within Debian)
- [not part of code]
+ * texpdf_format
+ * list of .sty files (and their texlive source within Debian)
+ [not part of code]
-* param, match possible sisu version, detail
+ * param, match possible sisu version, detail
-* sysenv, debug tag, triggered where output type not set
+ * sysenv, debug tag, triggered where output type not set
-%% 4.0.1.orig.tar.xz (2013-01-01:00/2)
+** 4.0.1.orig.tar.xz (2013-01-01:00/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.1
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.1.orig.tar.xz
sisu_4.0.1.orig.tar.xz
sisu_4.0.1-1.dsc
-* html_segments (by_filename by_filetype) internal document links do not
- work filenames need to include lang code, fixed
- * [chals on irc, re live-manual, debian-live]
+ * html_segments (by_filename by_filetype) internal document links do not
+ work filenames need to include lang code, fixed
+ * [chals on irc, re live-manual, debian-live]
-* bin/sisu & sysenv, rc_path_options, provide fixed path to rc files, (used
- e.g. to load sisurc.yml)
+ * bin/sisu & sysenv, rc_path_options, provide fixed path to rc files, (used
+ e.g. to load sisurc.yml)
-* options, sysenv, check (existing) inclusions & exclusions command line,
- document header, sisurc, fixes
+ * options, sysenv, check (existing) inclusions & exclusions command line,
+ document header, sisurc, fixes
-* plaintext, in code blocks retain a blank empty line, a fix
- * [known old bug, affects sisu_manual, fix request from SynrG on irc, re
- live-manual]
+ * plaintext, in code blocks retain a blank empty line, a fix
+ * [known old bug, affects sisu_manual, fix request from SynrG on irc, re
+ live-manual]
-* manpage, attempt to improve output (line-spacing)
+ * manpage, attempt to improve output (line-spacing)
-* param, minor change any legacy <br> line break in metadata markup to \\
+ * param, minor change any legacy <br> line break in metadata markup to \\
-* debug (internal code use), color markers for line number & file name
- (colored location markers to show when line passed within running code)
+ * debug (internal code use), color markers for line number & file name
+ (colored location markers to show when line passed within running code)
-* control color on/off to screen
- close #622171 sisu: --color flag, which toggles color on/off
- there are various ways to control color output to screen
- * --color-off or -k switches color off
- * --color or --color-on switches color on, which is usually the default
- * --color-toggle or -c toggles the default setting (in most cases)
- * sisurc.yml can set default color state which affects most screen output
- the fix here is specific to color on/off for reporting of sisu version
- sisu -v -k
- sisu --version --color-off
+ * control color on/off to screen
+ close #622171 sisu: --color flag, which toggles color on/off
+ there are various ways to control color output to screen
+ * --color-off or -k switches color off
+ * --color or --color-on switches color on, which is usually the default
+ * --color-toggle or -c toggles the default setting (in most cases)
+ * sisurc.yml can set default color state which affects most screen output
+ the fix here is specific to color on/off for reporting of sisu version
+ sisu -v -k
+ sisu --version --color-off
-* documentation minor updates and regenerated manpage
+ * documentation minor updates and regenerated manpage
-%% 4.0.0.orig.tar.xz (2012-12-12:50/3)
+** 4.0.0.orig.tar.xz (2012-12-12:50/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.0
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.0.orig.tar.xz
sisu_4.0.0.orig.tar.xz
sisu_4.0.0-1.dsc
-* bin/sisu $0 make possible to run sisu command on/within project dir tree
- (previously sisu needed to be correctly installed with system paths honored)
- NOTE: loading of skins turned off
+ * bin/sisu $0 make possible to run sisu command on/within project dir tree
+ (previously sisu needed to be correctly installed with system paths honored)
+ NOTE: loading of skins turned off
-* bin/sisu $*, hub, make possible to specify dir path for markup files
- (previously sisu needed to be invoked and run on files within the selected
- markup file directory)
- run sisu on markup in given path (or relative path), e.g.:
- sisu ~/path1/filename.ssm ~/path2/*.ss[tm]
+ * bin/sisu $*, hub, make possible to specify dir path for markup files
+ (previously sisu needed to be invoked and run on files within the selected
+ markup file directory)
+ run sisu on markup in given path (or relative path), e.g.:
+ sisu ~/path1/filename.ssm ~/path2/*.ss[tm]
-* defaults, some cleaning
+ * defaults, some cleaning
-* skins (remove)
- * remove skins
- * defaults, rename class Defaults (was InfoSkin)
- * sisupod, remove skin, fix path
+ * skins (remove)
+ * remove skins
+ * defaults, rename class Defaults (was InfoSkin)
+ * sisupod, remove skin, fix path
-* db
- * no skin info to store, omitted from structure
- * change prefix name (structure changed)
+ * db
+ * no skin info to store, omitted from structure
+ * change prefix name (structure changed)
-* markup samples, for v4 remove skins, separate (v3 & v4) directories
+ * markup samples, for v4 remove skins, separate (v3 & v4) directories
-* param (header make)
- * epub, pdf, book cover images
- * html, home button
- * text button
- * image/icon button
- * pdf, footer
+ * param (header make)
+ * epub, pdf, book cover images
+ * html, home button
+ * text button
+ * image/icon button
+ * pdf, footer
-* param_make, options, read common make instruction header for documents,
- _sisu/v4/sisu_document_make
- * @make:
- * @links:
+ * param_make, options, read common make instruction header for documents,
+ _sisu/v4/sisu_document_make
+ * @make:
+ * @links:
-* sisupod, use common make instruction header for documents
- * sisupod make instruction header file, write & read
+ * sisupod, use common make instruction header for documents
+ * sisupod make instruction header file, write & read
-* document headers, metadata rearranged, wide-ranging effect
+ * document headers, metadata rearranged, wide-ranging effect
-* vim syntax, sisu.vim, make new headers
+ * vim syntax, sisu.vim, make new headers
-* documentation; markup samples & help
+ * documentation; markup samples & help
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index dba95639..6e68ba5c 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -1,7 +1,8 @@
-%% SiSU version 5
+SiSU CHANGELOG -*- mode: org; -*-
+* SiSU version 5
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v5;hb=HEAD>
-* debian/changelog
+ * debian/changelog
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
v5 stable branch (v6 development branch)
@@ -21,1264 +22,1235 @@ v4 stable branch supersedes & replaces v3 branch
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/
+ * 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:
+* Reverse Chronological:
-%% 5.7.1.orig.tar.xz (2014-10-19:41/7)
+--- HEAD ---
+
+** 5.8.0.orig.tar.xz (2015-04-20:16/1)
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.8.0
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
+ sisu_5.8.0.orig.tar.xz
+
+ * year set 2015 (prepare for the new year)
+
+ * qi, (quick install) header update (also rbuild)
+
+ * sisu-mode.el emacs, outline mode "folding" for sisu
+
+ * CHANGELOGS formatted for viewing as org-mode files
+ indentation, line-breaking, and formatting characters only changes made
+
+ * org files related to sisu
+ * break up and place in own subdir
+ * org files, minor editing
+
+ * code headers reformatted for viewing as org-mode files
+
+ * c&d: project dir structure, libs moved under new branch names
+ * libs & version files under new branch names: current & develop
+ * previously under branch version numbers (v5|v6)
+ * version .yml files moved
+ * associated adjustments made as required, notably to:
+ bin/sisu se* qi* (file headers)
+ * [on dir names, want release to precede next/development,
+ considered (cur|dev) (current|(dev|development|progress|next))
+ (stable|unstable), alpha sorting fail (release|(next|develop))]
+
+ * version & branch info, changes related to move of lib dirs
+
+ * cgi, search form, html ref, remove leading 'o' ocn, bugfix
+ in html (on use of html5), removed leading 'o' before ocn, not
+ reflected in generated cgi, sample search form, so, does not
+ jump to the (otherwise correctly) identified location
+
+ * html,
+ * output by filename, filenames, fix
+ * ocn link back to self reinstated
+ (requested, used as quick means to get object url reference link)
+
+ * po4a, reinstate possibility to initialize po4a management of translated
+ marked up documents, i.e. to place translated versions of a sisu document
+ under po4a management
+
+ * SiSU_is switched to a method (instead of a hash) (bin and lib)
+
+ * use RbConfig instead of Config
+
+ * bin/sisu-misc-utils, sisu_thor_lib, currently only for po4a
+ * uses po4a to create po files with empty translation strings
+ * in appropriately configured directory e.g.
+ "data/doc/sisu/markup-samples/manual" have file named:
+ "languages_source_and_targets" containing e.g.:
+ source: en
+ targets: de fr es ja ru zh
+ command examples:
+ ruby ~snx/bin/sisu-misc-utils po4a --next --clean
+ ruby ~snx/bin/sisu-misc-utils po4a --next --distclean
+ ruby ~snx/bin/sisu-misc-utils po4a --next --make
+
+ * sisu.org addition, modification, consider
+
+ * header regex matches for bold & italics auto match possessives ending in 's
+
+** SiSU "UnFrozen" - prior to end of Debian Freeze
+ (upstream bugfix 5.7.2 intended for Jessie (packaged for Debian as 5.7.1-2)
+ was not accepted)
+
+** 5.7.2.orig.tar.xz (2014-11-02:43/7)
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.2
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.2.orig.tar.xz
+ sisu_5.7.2.orig.tar.xz
+
+ * ao, composite documents, --verbose report to terminal on loading of *.sst,
+ fix without fix sisu reports loading of .ssm & .ssi files but not .sst
+ (sub-documents are imported correctly and resulting document outputs are
+ correct and unaffected, but unless aware of this bug it would seem otherwise
+ until the correct operation of sisu was manually verified e.g. by examining
+ documents produced); (issue somewhat mitigated by not being the most common
+ sisu operation)
+ sisu is in development freeze, this fix is provided for Debian Jessie
+ (Closes: #767761)
+
+** SiSU Frozen - Debian Freeze - ^^ pre Jessie ^^
+
+** 5.7.1.orig.tar.xz (2014-10-19:41/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.7.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.1.orig.tar.xz
sisu_5.7.1.orig.tar.xz
- sisu_5.7.1-1.dsc
-* html
- * html_format, "id"s for objects & footnotes
- * remove trailing backslash for empty linebreak & paragraph, <br> <p>
+ * html
+ * html_format, "id"s for objects & footnotes
+ * remove trailing backslash for empty linebreak & paragraph, <br> <p>
-* db, text search & display field, footnotes moved to end of text object
- * cleaner, more useful search results
- * cleaner text search field
- * separate footnote fields redundant for search purposes
+ * db, text search & display field, footnotes moved to end of text object
+ * cleaner, more useful search results
+ * cleaner text search field
+ * separate footnote fields redundant for search purposes
-* cgi, sample search form, find & display endnotes from parent text object
- * remove dedicated endnote search section (as endnotes found & listed from
- reference text field)
- * cleaner search results
+ * cgi, sample search form, find & display endnotes from parent text object
+ * remove dedicated endnote search section (as endnotes found & listed from
+ reference text field)
+ * cleaner search results
-%% 5.7.0.orig.tar.xz (2014-10-12:40/7)
+** 5.7.0.orig.tar.xz (2014-10-12:40/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.7.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.7.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.7.0.orig.tar.xz
sisu_5.7.0.orig.tar.xz
- sisu_5.7.0-1.dsc
-* '*_parts', remove defaults.rb & some relics related to sisu skins (long gone)
- * old code removed & substituted as required by *_parts
- * attending code changes, fairly wide ranging
+ * '*_parts', remove defaults.rb & some relics related to sisu skins (long gone)
+ * old code removed & substituted as required by *_parts
+ * attending code changes, fairly wide ranging
-* html, epub, set document body language
+ * html, epub, set document body language
-* html_format, label, re: object number object names
+ * html_format, label, re: object number object names
-* constants, remove ocn html leader (resulting hashtag #1 instead of #o1)
+ * constants, remove ocn html leader (resulting hashtag #1 instead of #o1)
-* html, reduce difference with v6
- * removal of some trailing slashes <p> <br>
- * mostly removal of bgcolor
+ * html, reduce difference with v6
+ * removal of some trailing slashes <p> <br>
+ * mostly removal of bgcolor
-* moved files: harvest* to html_harvest*
+ * moved files: harvest* to html_harvest*
-* --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
+ * --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
-* db, --maintenance sql, separated out postgresql & sqlite
- could share "maintenance" db import sql file (as done previously), consider
+ * db, --maintenance sql, separated out postgresql & sqlite
+ could share "maintenance" db import sql file (as done previously), consider
-* fixes, minor
- * qrcode, sha call
- * epub tune, --maintenance related
+ * fixes, minor
+ * qrcode, sha call
+ * epub tune, --maintenance related
-%% 5.6.9.orig.tar.xz (2014-10-03:39/5)
+** 5.6.9.orig.tar.xz (2014-10-03:39/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.9
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.9.orig.tar.xz
sisu_5.6.9.orig.tar.xz
- sisu_5.6.9-1.dsc
-* --act provides info on current --act0 to --act9 settings (makes it easier to
- make use of acts 0 to 9)
+ * --act provides info on current --act0 to --act9 settings (makes it easier to
+ make use of acts 0 to 9)
-* html, tiny first nudge toward html5 (document headers and minor)
+ * html, tiny first nudge toward html5 (document headers and minor)
-%% 5.6.8.orig.tar.xz (2014-09-28:38/7)
+** 5.6.8.orig.tar.xz (2014-09-28:38/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.8
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.8.orig.tar.xz
sisu_5.6.8.orig.tar.xz
- sisu_5.6.8-1.dsc
-* sql, clean searchable text, update for (ao/dal) text representation,
- fix legacy action
+ * sql, clean searchable text, update for (ao/dal) text representation,
+ fix legacy action
-%% 5.6.7.orig.tar.xz (2014-09-19:37/5)
+** 5.6.7.orig.tar.xz (2014-09-19:37/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.7
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.7.orig.tar.xz
sisu_5.6.7.orig.tar.xz
- sisu_5.6.7-1.dsc
-* vim syntax, sisu.vim, update git url and email address
+ * vim syntax, sisu.vim, update git url and email address
-* update urls to git repo
+ * update urls to git repo
-%% 5.6.6.orig.tar.xz (2014-09-12:36/5)
+** 5.6.6.orig.tar.xz (2014-09-12:36/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.6.orig.tar.xz
sisu_5.6.6.orig.tar.xz
- sisu_5.6.6-1.dsc
-
-* ao, auto naming (segment & tag), exceptions, avoidance of name collisions
-
-* ao, feedback on markup document structure (heading level) errors
- adjustment to (existing) provided feedback, based on:
- * level A~ title, required;
- * levels B~ C~ D~ optional sequential document divider headings
- (Part, Section etc. equivalent);
- * level 1~ required, heading level preceding substantive text; followed by
- * levels 2~ 3~ 4~ optional, sequential headings
- (1.1, 1.1.1, 1.1.1.1 equivalents)
-
-* ao, expansion of links to internal filepaths (re: syntax based shortcut)
- (expansion of sisu output filepaths, sync with use of --act0 to --act9)
-
-* se, processing, adjustments to default settings for --act0 to --act9
-
-* se, env, lingual: mono / multi, rc settings
-
-* sisurc, update samples
- * adjustments to default settings for --act0 to --act9 (to match current "se")
- * removed sisurc examples to organize output by
- filetype, filename, monolingual, as one word diff
- output_dir_structure_by: language
- # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
- # language
- # (language and filetype directories);
- # filetype
- # (filetype directories, filename includes language code);
- # filetype_mono (or monolingual)
- # (filetype drectories, no language codes in filenames)
- # filename
- # (directory output similar to v1 v2, filename includes language code);
- # filename_mono
- # (directory output similar to v1 v2, filename without language code);
-
-* hub, /tmp processing directory checks
-
-%% 5.6.5.orig.tar.xz (2014-09-05:35/5)
+
+ * ao, auto naming (segment & tag), exceptions, avoidance of name collisions
+
+ * ao, feedback on markup document structure (heading level) errors
+ adjustment to (existing) provided feedback, based on:
+ * level A~ title, required;
+ * levels B~ C~ D~ optional sequential document divider headings
+ (Part, Section etc. equivalent);
+ * level 1~ required, heading level preceding substantive text; followed by
+ * levels 2~ 3~ 4~ optional, sequential headings
+ (1.1, 1.1.1, 1.1.1.1 equivalents)
+
+ * ao, expansion of links to internal filepaths (re: syntax based shortcut)
+ (expansion of sisu output filepaths, sync with use of --act0 to --act9)
+
+ * se, processing, adjustments to default settings for --act0 to --act9
+
+ * se, env, lingual: mono / multi, rc settings
+
+ * sisurc, update samples
+ * adjustments to default settings for --act0 to --act9 (to match current
+ "se")
+ * removed sisurc examples to organize output by
+ filetype, filename, monolingual, as one word diff
+ output_dir_structure_by: language
+ # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+ # language
+ # (language and filetype directories);
+ # filetype
+ # (filetype directories, filename includes language code);
+ # filetype_mono (or monolingual)
+ # (filetype drectories, no language codes in filenames)
+ # filename
+ # (directory output similar to v1 v2, filename includes language code);
+ # filename_mono
+ # (directory output similar to v1 v2, filename without language code);
+
+ * hub, /tmp processing directory checks
+
+** 5.6.5.orig.tar.xz (2014-09-05:35/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.5.orig.tar.xz
sisu_5.6.5.orig.tar.xz
- sisu_5.6.5-1.dsc
-* ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
- processing document
+ * ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
+ processing document
-* ao_numbering, provide more information on duplicate numbering before stop
+ * ao_numbering, provide more information on duplicate numbering before stop
-* html navigation, enable turn off (nav buttons on remaining html segments)
+ * html navigation, enable turn off (nav buttons on remaining html segments)
-* (for html) set default to navigation bar off
+ * (for html) set default to navigation bar off
-* xml xhtml outputs, &amp; issues
+ * xml xhtml outputs, &amp; issues
-* shared_metadata, requires xml_shared
+ * shared_metadata, requires xml_shared
-* link/path fixes,
- * manifest, link where no "document harvest"
- * html, home button links url (remove slash)
- * harvest_authors, by_filetype, manifest path
+ * link/path fixes,
+ * manifest, link where no "document harvest"
+ * html, home button links url (remove slash)
+ * harvest_authors, by_filetype, manifest path
-%% 5.6.4.orig.tar.xz (2014-09-01:35/1)
+** 5.6.4.orig.tar.xz (2014-09-01:35/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.4.orig.tar.xz
sisu_5.6.4.orig.tar.xz
- sisu_5.6.4-1.dsc
-* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix
+ * cgi_sqlite, allow expansion of variable (default db name), double quotes,
+ fix
-%% 5.6.3.orig.tar.xz (2014-08-29:34/5)
+** 5.6.3.orig.tar.xz (2014-08-29:34/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.3.orig.tar.xz
sisu_5.6.3.orig.tar.xz
- sisu_5.6.3-1.dsc
-* hub, sisu version info, when & what to report
+ * hub, sisu version info, when & what to report
-* dp, texpdf, copyright_and_license, minor fix, used by texpdf
+ * dp, texpdf, copyright_and_license, minor fix, used by texpdf
-%% 5.6.2.orig.tar.xz (2014-08-20:33/3)
+** 5.6.2.orig.tar.xz (2014-08-20:33/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.2.orig.tar.xz
sisu_5.6.2.orig.tar.xz
- sisu_5.6.2-1.dsc
-* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
-* start making use of --no-stop command
+ * hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
+ * start making use of --no-stop command
-* ao
- * book index related
- * ao_expand_insertions, blocked text match, adjust
+ * ao
+ * book index related
+ * ao_expand_insertions, blocked text match, adjust
+ * texpdf, output, copyright & license
-* texpdf, output, copyright & license
-
-* syntax hilighting, restrict heading matches, minor
- * vim
- * emacs
+ * syntax hilighting, restrict heading matches, minor
+ * vim
+ * emacs
-%% 5.6.1.orig.tar.xz (2014-08-12:32/2)
+** 5.6.1.orig.tar.xz (2014-08-12:32/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.1.orig.tar.xz
sisu_5.6.1.orig.tar.xz
- sisu_5.6.1-1.dsc
-* hub, organization & loose ends
- * tweak triggers
- * split file further
- * remove mod
+ * hub, organization & loose ends
+ * tweak triggers
+ * split file further
+ * remove mod
-* webrick, wb.cgi fixed and omitted (use discarded)
+ * webrick, wb.cgi fixed and omitted (use discarded)
-%% 5.6.0.orig.tar.xz (2014-08-08:31/5)
+** 5.6.0.orig.tar.xz (2014-08-08:31/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.0.orig.tar.xz
sisu_5.6.0.orig.tar.xz
- sisu_5.6.0-1.dsc
-
-* merged v6 (6.2.0)
- * some file renames, fairly extensive
- * commandline, --act0 to --act9 & rc-config with act instead of roman numeral
- * configurable command line options increased to 0 - 9 (instead of 0 - 5)
- * use --act0 to --act9
- * default --act0
- * rc config with flag:act0 to flag:act9
- * legacy roman numeral configuration works (for now)
- * internally use opt.act (simplify, cleaner, instead of opt.cmd & opt.mod, now
- removed)
-
-* extend document structure, headings A - D, 1 - 4
- * sql db table structure changed (needs to be rebuilt)
-
-%% 5.5.6.orig.tar.xz (2014-08-08:31/5)
+
+ * merged v6 (6.2.0)
+ * some file renames, fairly extensive
+ * commandline, --act0 to --act9 & rc-config with act instead of roman
+ numeral
+ * configurable command line options increased to 0 - 9 (instead of 0 - 5)
+ * use --act0 to --act9
+ * default --act0
+ * rc config with flag:act0 to flag:act9
+ * legacy roman numeral configuration works (for now)
+ * internally use opt.act (simplify, cleaner, instead of opt.cmd & opt.mod,
+ now removed)
+
+ * extend document structure, headings A - D, 1 - 4
+ * sql db table structure changed (needs to be rebuilt)
+
+** 5.5.6.orig.tar.xz (2014-08-08:31/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.6.orig.tar.xz
sisu_5.5.6.orig.tar.xz
- sisu_5.5.6-1.dsc
-* remains as 5.5.5 changes for easier comparison with v6
- * file renames
- * dp, indentation changed
+ * remains as 5.5.5 changes for easier comparison with v6
+ * file renames
+ * dp, indentation changed
-%% 5.5.5.orig.tar.xz (2014-07-29:30/2)
+** 5.5.5.orig.tar.xz (2014-07-29:30/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.5.orig.tar.xz
sisu_5.5.5.orig.tar.xz
- sisu_5.5.5-1.dsc
-* ensure reset of parsed document directory path
- * needed in the case of html for some subsequent processing
+ * ensure reset of parsed document directory path
+ * needed in the case of html for some subsequent processing
-%% 5.5.4.orig.tar.xz (2014-07-24:29/4)
+** 5.5.4.orig.tar.xz (2014-07-24:29/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.4.orig.tar.xz
sisu_5.5.4.orig.tar.xz
- sisu_5.5.4-1.dsc
-* ao_numbering, auto name segment, tweak to make behave as intended
- (further testing required)
+ * ao_numbering, auto name segment, tweak to make behave as intended
+ (further testing required)
-%% 5.5.3.orig.tar.xz (2014-07-23:29/3)
+** 5.5.3.orig.tar.xz (2014-07-23:29/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.3.orig.tar.xz
sisu_5.5.3.orig.tar.xz
- sisu_5.5.3-1.dsc
-* db, rescue where no tables attempt to initialize db and retry
- (catch db message where no tables and attempt to initialize database)
- * internally run the equivalent of --createall
- * (if successful) permitting completion of --import or --update command
- * make use of action triggers
+ * db, rescue where no tables attempt to initialize db and retry
+ (catch db message where no tables and attempt to initialize database)
+ * internally run the equivalent of --createall
+ * (if successful) permitting completion of --import or --update command
+ * make use of action triggers
-%% 5.5.2.orig.tar.xz (2014-07-22:29/2)
+** 5.5.2.orig.tar.xz (2014-07-22:29/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.2.orig.tar.xz
sisu_5.5.2.orig.tar.xz
- sisu_5.5.2-1.dsc
-* bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
+ * bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
-* html_lite_shared, issue fix
+ * html_lite_shared, issue fix
-* options, sisupod parsing fix
+ * options, sisupod parsing fix
-* db, reorganize action triggers
+ * db, reorganize action triggers
-* db pg import, fix
- * remove dbi from rescue, no longer using ruby-dbi
- * ruby-pg query SELECT MAX
+ * db pg import, fix
+ * remove dbi from rescue, no longer using ruby-dbi
+ * ruby-pg query SELECT MAX
-* sysenv,
- * break up file, multiple se_* files
- * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced in
- 5.5.1) to bring back correct hub (post) processing behavior
- * processing shortcuts, options, adjust (refinement necessary)
+ * sysenv,
+ * break up file, multiple se_* files
+ * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced
+ in 5.5.1) to bring back correct hub (post) processing behavior
+ * processing shortcuts, options, adjust (refinement necessary)
-%% 5.5.1.orig.tar.xz (2014-07-15:28/2)
+** 5.5.1.orig.tar.xz (2014-07-15:28/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.1.orig.tar.xz
sisu_5.5.1.orig.tar.xz
- sisu_5.5.1-1.dsc
-
-* bin/sisu, hub, options, message pass sisu_called_from_directory
-
-* sysenv, general, base_markup_dir_stub (replace pwd_stub)
-* ao_numbering, auto name segment, extract "number" from heading, refine
+ * bin/sisu, hub, options, message pass sisu_called_from_directory
-* src, sisupod, bring back in line
+ * sysenv, general, base_markup_dir_stub (replace pwd_stub)
-* docbook,
- * code & other block markup
- * url links, urls
- * images, an adjustment
- * css (needs work)
- * document header, sisu processing info
- * docbook status, under construction notice removed (still much to do)
+ * ao_numbering, auto name segment, extract "number" from heading, refine
-* general, document parts
- * css
- * base images
- * document images
+ * src, sisupod, bring back in line
-%% 5.5.0.orig.tar.xz (2014-07-11:27/5)
+ * docbook,
+ * code & other block markup
+ * url links, urls
+ * images, an adjustment
+ * css (needs work)
+ * document header, sisu processing info
+ * docbook status, under construction notice removed (still much to do)
+
+ * general, document parts
+ * css
+ * base images
+ * document images
+
+** 5.5.0.orig.tar.xz (2014-07-11:27/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.0.orig.tar.xz
sisu_5.5.0.orig.tar.xz
- sisu_5.5.0-1.dsc
-
-* ao_numbering,
- * auto name segment, extract "number" from heading, fix
- * check that all auto given number based seg names are unique
-
-* ao_composite, nested includes, .ssi (insert) can include .ssi & .sst
-~ .ssm can contain/include .sst or .ssi
- .sst files can be processed independently, they do not contain other files
- .ssi files have been only insertions of text & are not processed independently
- but as part of an ssm
- change proposed:
- .ssm unchanged,
- .sst unchanged,
- .ssi as before, but can include .sst or .ssi, so:
- files are only insertions & are not processed independently but as part of an
- .ssm or another .ssi
- i.e. as before with the addition that it like a .ssm can contain/include
- .sst or .ssi
-~ requested feature, (Closes: #744408)
- User beware. In previous versions there has been a deliberate attempt to keep
- it easy to follow documents & not have to dig through different levels of
- includes, as this is more likely to lead to errors in markup.
- The idea of nested includes has not been attractive (messy for a document),
- however, this is now made possible, use with care
- ~ it is not as easy to see document structure at a glance, and structural
- errors may be introduced and will need to be taken care of (requiring
- document markup debugging)
- ~ allowing .ssi to also include other .ssi or .sst could lead to infinite
- recursion if an .ssi includes another which includes itself; stopping after
- an additional level of includes seems arbitrary, and possibly prone to error
- if you are dealing with many documents
-~ requires testing
-~ version bump, new behavior added to .ssi one of the 3 sisu filetypes
-
-* src, sisupod composite source, nested includes
- follow rules for ao_composite (described above)
-
-%% 5.4.5.orig.tar.xz (2014-07-07:27/1)
+
+ * ao_numbering,
+ * auto name segment, extract "number" from heading, fix
+ * check that all auto given number based seg names are unique
+
+ * ao_composite, nested includes, .ssi (insert) can include .ssi & .sst
+ ~ .ssm can contain/include .sst or .ssi
+ .sst files can be processed independently, they do not contain other files
+ .ssi files have been only insertions of text & are not processed
+ independently but as part of an ssm
+ change proposed:
+ .ssm unchanged,
+ .sst unchanged,
+ .ssi as before, but can include .sst or .ssi, so:
+ files are only insertions & are not processed independently but as part of
+ an .ssm or another .ssi
+ i.e. as before with the addition that it like a .ssm can contain/include
+ .sst or .ssi
+ ~ requested feature, (Closes: #744408)
+ User beware. In previous versions there has been a deliberate attempt to
+ keep it easy to follow documents & not have to dig through different levels
+ of includes, as this is more likely to lead to errors in markup.
+ The idea of nested includes has not been attractive (messy for a document),
+ however, this is now made possible, use with care
+ ~ it is not as easy to see document structure at a glance, and structural
+ errors may be introduced and will need to be taken care of (requiring
+ document markup debugging)
+ ~ allowing .ssi to also include other .ssi or .sst could lead to infinite
+ recursion if an .ssi includes another which includes itself; stopping
+ after an additional level of includes seems arbitrary, and possibly prone
+ to error if you are dealing with many documents
+ ~ requires testing
+ ~ version bump, new behavior added to .ssi one of the 3 sisu filetypes
+
+ * src, sisupod composite source, nested includes
+ follow rules for ao_composite (described above)
+
+** 5.4.5.orig.tar.xz (2014-07-07:27/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.5.orig.tar.xz
sisu_5.4.5.orig.tar.xz
- sisu_5.4.5-1.dsc
-
-* bin/sisu,
- * processing dir related
- e.g. using live-manual/manual as sample, the following should work as
- expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
- sisu --html -v en/live-manual.ssm ja/live-manual.ssm
- or for all available translations:
- sisu --html -v **/live-manual.ssm
- (these previously would have broken after processing the first directory)
- sisu command equivalent for all available translations being (unaffected):
- sisu --html -v --glob live-manual
- * some cosmetic long line breaking
-
-* ao, auto seg naming, adjustments,
- re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
-
-%% 5.4.4.orig.tar.xz (2014-07-04:26/5)
+
+ * bin/sisu,
+ * processing dir related
+ e.g. using live-manual/manual as sample, the following should work as
+ expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
+ sisu --html -v en/live-manual.ssm ja/live-manual.ssm
+ or for all available translations:
+ sisu --html -v **/live-manual.ssm
+ (these previously would have broken after processing the first directory)
+ sisu command equivalent for all available translations being (unaffected):
+ sisu --html -v --glob live-manual
+ * some cosmetic long line breaking
+
+ * ao, auto seg naming, adjustments,
+ re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
+
+** 5.4.4.orig.tar.xz (2014-07-04:26/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.4.orig.tar.xz
sisu_5.4.4.orig.tar.xz
- sisu_5.4.4-1.dsc
-* ao, fix, re seg numbering, fixed width, leading zeros
- (introduced: 5.4.3 / 6.0.9)
- provisional fix (check related issues against 5.4.2 / 6.0.8)
+ * ao, fix, re seg numbering, fixed width, leading zeros
+ (introduced: 5.4.3 / 6.0.9)
+ provisional fix (check related issues against 5.4.2 / 6.0.8)
-%% 5.4.3.orig.tar.xz (2014-07-01:26/2)
+** 5.4.3.orig.tar.xz (2014-07-01:26/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.3.orig.tar.xz
sisu_5.4.3.orig.tar.xz
- sisu_5.4.3-1.dsc
-
-* ao,
- * code cosmetic rearrangement
- * book index, strip white spaces around terms
- (fix uppercase first character where spaces used)
- * quote block, insert text indent markup, exclude book index
- * doc objects, layout group open & close identify is_for
- * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
-
-* code cosmetic rearrangement
- * ao*, param, hub, options, composite
-
-* sysenv, developer _CONSTRUCTION_ZONE warning modified
-* merge what was sisu_6.0.8 into v5
* ao,
- * syntax, able optionally to indicate the language syntax of a code block
- * syntax, introduce box text block/group
- * syntax, introduce tics quotes markup (blockquote equivalent)
- * docbook,
- * ocn & footnote numbers (as xml comments)
- * metadata header (docinfo)
- * quotes (blockquote)
- * tables
- * images
- * code block
- * vim syntax, add
- * code block, language syntax, optional
- * box block
- * quote block
+ * code cosmetic rearrangement
+ * book index, strip white spaces around terms
+ (fix uppercase first character where spaces used)
+ * quote block, insert text indent markup, exclude book index
+ * doc objects, layout group open & close identify is_for
+ * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
-* epub, a fix, double check
-
-%% 5.4.2.orig.tar.xz (2014-06-22:24/7)
+ * code cosmetic rearrangement
+ * ao*, param, hub, options, composite
+
+ * sysenv, developer _CONSTRUCTION_ZONE warning modified
+
+ * merge what was sisu_6.0.8 into v5
+ * ao,
+ * syntax, able optionally to indicate the language syntax of a code block
+ * syntax, introduce box text block/group
+ * syntax, introduce tics quotes markup (blockquote equivalent)
+ * docbook,
+ * ocn & footnote numbers (as xml comments)
+ * metadata header (docinfo)
+ * quotes (blockquote)
+ * tables
+ * images
+ * code block
+ * vim syntax, add
+ * code block, language syntax, optional
+ * box block
+ * quote block
+
+ * epub, a fix, double check
+
+** 5.4.2.orig.tar.xz (2014-06-22:24/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
sisu_5.4.2.orig.tar.xz
- sisu_5.4.2-1.dsc
-* ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6
- ao_doc_str (codeblock)
+ * ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6
+ ao_doc_str (codeblock)
-%% 5.4.1.orig.tar.xz (2014-06-19:24/4)
+** 5.4.1.orig.tar.xz (2014-06-19:24/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.1.orig.tar.xz
sisu_5.4.1.orig.tar.xz
- sisu_5.4.1-1.dsc
-* ao,
- * regex match for tics "```" followed by space tweaked
- * Symbol to match grouped text open & close (instead of String)
- * introduce way of removing unrecognized tic markers
- * turn id numbers (for tags) into a hash
- * code blocks, clean trailing newlines
- * misc, minorish
-
-%% 5.4.0.orig.tar.xz (2014-05-25:20/7)
+ * ao,
+ * regex match for tics "```" followed by space tweaked
+ * Symbol to match grouped text open & close (instead of String)
+ * introduce way of removing unrecognized tic markers
+ * turn id numbers (for tags) into a hash
+ * code blocks, clean trailing newlines
+ * misc, minorish
+
+** 5.4.0.orig.tar.xz (2014-05-25:20/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.0.orig.tar.xz
sisu_5.4.0.orig.tar.xz
- sisu_5.4.0-1.dsc
-
-* v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check
- * ao, document structure check, stop processing on major error
- (with error message & text at location of failure)
- [reason for version bump the addition of structure check]
- * utils, add ok code marker
- * ao, heading with no ocn, distinguish ~# from -#
- * ~# is general & means no ocn (for any object to which it is applied)
- * -# is relevant only for 1~ dummy headings & instructs that they should be
- removed from output where possible
- * applied so far to pdf, odt & plaintext
- * ao_images, reduce warnings when ruby RMagic absent as program used directly
- * reduced dependency on ruby RMagic library (as some time way back had
- issues)
- * ao, document markup structure check, skip processing file on major error
- * with error message & text at location of failure
- * texpdf, urls in creator cause breakage
- * texpdf, mailto markup links set for normal text objects
- * texpdf, '&' in heading breaks toc (now removed from toc (not heading)), bug
- * revisit, bug
- * texpdf, for urls switch to sans serif (small fontsize)
- * instead of typewriter, latex default
- * texpdf, pdf colored hyperlinks configurable
- * --pdf-hyperlinks-color
- --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome
- * ['default']['pdf_hyperlinks']='color'
- (other options switch hyperlink color off 'no-color' 'color-off'
- 'monochrome')
- * texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions)
- * --pdf-fontsize-12 --pdf-fontsize-8
- * default:
- texpdf_fontsize: 12
- * texpdf, headings and table of contents representation
- * fixes 1~ and 2~ result in the same formatting
- 1~ 2~ & 3~ now differentiated, see discussion in sisu.org under #744383
- * fixes :A smaller formatted than :B
- A~ B~ C~ now the same size, see discussion in sisu.org under #744383
- * :B and :C result in the same formatting, issue explained see sisu.org
- * texpdf, (internal coding) fontface, rename texpdf_font texpdf_fontface
- * texpdf, (internal coding) use symbols to identify page orientation
- * param, metadata rights, line-breaks instead of semicolons separating rights
- * fixes remove trailing semicolon after :copyright:
- * digests sha512 option implemented
- * options sha512 sha256 md5
- * command line --sha512
- * rcconf.yml ['defsault']['digest'] = sha512
- * xml object citation numbering (docbook fictionbook)
-
-%% 5.3.6.orig.tar.xz (2014-05-18:19/7)
+
+ * v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check
+ * ao, document structure check, stop processing on major error
+ (with error message & text at location of failure)
+ [reason for version bump the addition of structure check]
+ * utils, add ok code marker
+ * ao, heading with no ocn, distinguish ~# from -#
+ * ~# is general & means no ocn (for any object to which it is applied)
+ * -# is relevant only for 1~ dummy headings & instructs that they should
+ be removed from output where possible
+ * applied so far to pdf, odt & plaintext
+ * ao_images, reduce warnings when ruby RMagic absent as program used
+ directly
+ * reduced dependency on ruby RMagic library (as some time way back had
+ issues)
+ * ao, document markup structure check, skip processing file on major error
+ * with error message & text at location of failure
+ * texpdf, urls in creator cause breakage
+ * texpdf, mailto markup links set for normal text objects
+ * texpdf, '&' in heading breaks toc (now removed from toc (not heading)),
+ bug
+ * revisit, bug
+ * texpdf, for urls switch to sans serif (small fontsize)
+ * instead of typewriter, latex default
+ * texpdf, pdf colored hyperlinks configurable
+ * --pdf-hyperlinks-color
+ --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome
+ * ['default']['pdf_hyperlinks']='color'
+ (other options switch hyperlink color off 'no-color' 'color-off'
+ 'monochrome')
+ * texpdf, pdf default font size configurable (cli & sisurc.yml)
+ (no fractions)
+ * --pdf-fontsize-12 --pdf-fontsize-8
+ * default:
+ texpdf_fontsize: 12
+ * texpdf, headings and table of contents representation
+ * fixes 1~ and 2~ result in the same formatting
+ 1~ 2~ & 3~ now differentiated, see discussion in sisu.org under #744383
+ * fixes :A smaller formatted than :B
+ A~ B~ C~ now the same size, see discussion in sisu.org under #744383
+ * :B and :C result in the same formatting, issue explained see sisu.org
+ * texpdf, (internal coding) fontface, rename texpdf_font texpdf_fontface
+ * texpdf, (internal coding) use symbols to identify page orientation
+ * param, metadata rights, line-breaks instead of semicolons separating
+ rights
+ * fixes remove trailing semicolon after :copyright:
+ * digests sha512 option implemented
+ * options sha512 sha256 md5
+ * command line --sha512
+ * rcconf.yml ['defsault']['digest'] = sha512
+ * xml object citation numbering (docbook fictionbook)
+
+** 5.3.6.orig.tar.xz (2014-05-18:19/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.6.orig.tar.xz
sisu_5.3.6.orig.tar.xz
- sisu_5.3.6-1.dsc
-* db,
- * use symbols to identify sql engine
- * remove require 'dbi' (ruby-dbi)
- * for pg: require 'pg' (use ruby-pg directly)
- * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case]
+ * db,
+ * use symbols to identify sql engine
+ * remove require 'dbi' (ruby-dbi)
+ * for pg: require 'pg' (use ruby-pg directly)
+ * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the
+ case]
-* cgi, sample search form generator
- * remove require 'dbi' (ruby-dbi)
- * for pg: require 'pg' (use ruby-pg directly)
- * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
+ * cgi, sample search form generator
+ * remove require 'dbi' (ruby-dbi)
+ * for pg: require 'pg' (use ruby-pg directly)
+ * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
-%% 5.3.5.orig.tar.xz (2014-05-12:19/1)
+** 5.3.5.orig.tar.xz (2014-05-12:19/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
sisu_5.3.5.orig.tar.xz
- sisu_5.3.5-1.dsc
-* sisu, ensure return to start dir
+ * sisu, ensure return to start dir
-* ao_syntax, address possible manual use of url delimiters「」
+ * ao_syntax, address possible manual use of url delimiters「」
-* composite, fix includes, provide extra newline after inserted comment
- (Closes: #744360) "includes do not work properly"
+ * composite, fix includes, provide extra newline after inserted comment
+ (Closes: #744360) "includes do not work properly"
-* composite (inserts), missing includes doesn't give an error, fix
- (Closes: #744379) see sisu.org for comment
+ * composite (inserts), missing includes doesn't give an error, fix
+ (Closes: #744379) see sisu.org for comment
-* param, metadata add 'Copyright:' tag to output related to copyright
- (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
+ * param, metadata add 'Copyright:' tag to output related to copyright
+ (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
-* metadata, pdf, remove link to manifest page where --no-manifest is used
- (Closes: #744378)
+ * metadata, pdf, remove link to manifest page where --no-manifest is used
+ (Closes: #744378)
-* constants, db table sizes synced with v6, not needed by v5 but keeps tables
- compatible
+ * constants, db table sizes synced with v6, not needed by v5 but keeps tables
+ compatible
-* digests, cleaning
+ * digests, cleaning
-* added sisu.org emacs:evil:org mode notes related to sisu development
+ * added sisu.org emacs:evil:org mode notes related to sisu development
-%% 5.3.4.orig.tar.xz (2014-02-14:06/5)
+** 5.3.4.orig.tar.xz (2014-02-14:06/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.4.orig.tar.xz
sisu_5.3.4.orig.tar.xz
- sisu_5.3.4-1.dsc
-* ocn, object citation numbering
- * add perhaps less cryptic --numbering --no-numbering command-line options
- * plaintext & odt switch default to ocn==true for consistency
+ * ocn, object citation numbering
+ * add perhaps less cryptic --numbering --no-numbering command-line options
+ * plaintext & odt switch default to ocn==true for consistency
-%% 5.3.3.orig.tar.xz (2014-02-08:05/6)
+** 5.3.3.orig.tar.xz (2014-02-08:05/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.3.orig.tar.xz
sisu_5.3.3.orig.tar.xz
- sisu_5.3.3-1.dsc
-* cgi, search form (generator), using cgi ENV variables
+ * cgi, search form (generator), using cgi ENV variables
-* examples
- * nginx conf
- * cgi search forms pgsql & sqlite
+ * examples
+ * nginx conf
+ * cgi search forms pgsql & sqlite
-* documentation, minor update
+ * documentation, minor update
-%% 5.3.2.orig.tar.xz (2014-02-05:05/3)
+** 5.3.2.orig.tar.xz (2014-02-05:05/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.2.orig.tar.xz
sisu_5.3.2.orig.tar.xz
- sisu_5.3.2-1.dsc
-* ao, html book index linking, follow --strict option
+ * ao, html book index linking, follow --strict option
-* utils, code markers & messages, notes/warning/errors, fix
+ * utils, code markers & messages, notes/warning/errors, fix
-* sysenv, concordance redirected paths, watch
+ * sysenv, concordance redirected paths, watch
-* manual Rakefile, README & minor config adjustment
+ * manual Rakefile, README & minor config adjustment
-%% 5.3.1.orig.tar.xz (2014-02-05:05/3)
+** 5.3.1.orig.tar.xz (2014-02-05:05/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz
sisu_5.3.1.orig.tar.xz
- sisu_5.3.1-1.dsc
-* ao, document tags
+ * ao, document tags
-* options
- * --strict html option
- * ocn switch on/off instructions (& defaults for plaintext & odt)
+ * options
+ * --strict html option
+ * ocn switch on/off instructions (& defaults for plaintext & odt)
-* html cleaning
- * --strict html option
- (various changes, e.g. ocn [url]#37 only available as [url]#o37)
- * tags
- * endnote name and nameref (make compliant)
+ * html cleaning
+ * --strict html option
+ (various changes, e.g. ocn [url]#37 only available as [url]#o37)
+ * tags
+ * endnote name and nameref (make compliant)
-* epub
- * use same endnote name and nameref as introduced here for html
- * hash digests used only if availabile (availability check)
+ * epub
+ * use same endnote name and nameref as introduced here for html
+ * hash digests used only if availabile (availability check)
-* ocn turn on/off rules
- * txt
- * odt
+ * ocn turn on/off rules
+ * txt
+ * odt
-* cgi (pgsql, sqlite) fixes
+ * cgi (pgsql, sqlite) fixes
-* error/warn messages, including wrappers round require
+ * error/warn messages, including wrappers round require
-* documentation, manpage README etc.
- * sisu manual directory moved
- * sisu manual updated
- * README & sisu.1 (manpage) updated
- * removed html man pages (man2html)
+ * documentation, manpage README etc.
+ * sisu manual directory moved
+ * sisu manual updated
+ * README & sisu.1 (manpage) updated
+ * removed html man pages (man2html)
-%% 5.3.0.orig.tar.xz (2014-01-26:03/7)
+** 5.3.0.orig.tar.xz (2014-01-26:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.0.orig.tar.xz
sisu_5.3.0.orig.tar.xz
- sisu_5.3.0-1.dsc
-* v5 stable branch
- * v4 branch closed -(>4.2.20)-
- * v5 stable branch (>=5.3.0)
- * v6 development branch opened (copy v5) (>=6.0.0)
+ * v5 stable branch
+ * v4 branch closed -(>4.2.20)-
+ * v5 stable branch (>=5.3.0)
+ * v6 development branch opened (copy v5) (>=6.0.0)
-%% 5.2.4.orig.tar.xz (2014-01-26:03/7)
+** 5.2.4.orig.tar.xz (2014-01-26:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.4.orig.tar.xz
sisu_5.2.4.orig.tar.xz
- sisu_5.2.4-1.dsc
-* bin/sisu changes to simplify switching to new stable and development branches
+ * bin/sisu changes to simplify switching to new stable and development
+ branches
-%% 5.2.3.orig.tar.xz (2014-01-20:03/1)
+** 5.2.3.orig.tar.xz (2014-01-20:03/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.3.orig.tar.xz
sisu_5.2.3.orig.tar.xz
- sisu_5.2.3-1.dsc
[good time to consider rollover: closing v4 branch, replacing it with v5 &
introducing v6 for development, proposed for this release + 1]
-* bin/sisu & some related lib changes
+ * bin/sisu & some related lib changes
-* sysenv for texpdf, fix for when tex to pdf generator is absent
+ * sysenv for texpdf, fix for when tex to pdf generator is absent
-%% 5.2.2.orig.tar.xz (2014-01-17:02/5)
+** 5.2.2.orig.tar.xz (2014-01-17:02/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.2.orig.tar.xz
sisu_5.2.2.orig.tar.xz
- sisu_5.2.2-1.dsc
-* bin/sisu experimentation
- * start preparing for ruby changes
- * work on fix for bug related to gem path & system installed sisu
+ * bin/sisu experimentation
+ * start preparing for ruby changes
+ * work on fix for bug related to gem path & system installed sisu
-%% 5.2.1.orig.tar.xz (2014-01-12:01/7)
+** 5.2.1.orig.tar.xz (2014-01-12:01/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.1.orig.tar.xz
sisu_5.2.1.orig.tar.xz
- sisu_5.2.1-1.dsc
-* ao, add counter for various grouped / blocked texts & tables, of particular
- use for poems which are broken into verse
+ * ao, add counter for various grouped / blocked texts & tables, of particular
+ use for poems which are broken into verse
-* recalibrate headings, downstream code fixes
+ * recalibrate headings, downstream code fixes
-* texinfo, fixes
+ * texinfo, fixes
-* texpdf, report on pdf output, provide a working link to a generated file-size
- (multiple document file-sizes may be produced)
+ * texpdf, report on pdf output, provide a working link to a generated
+ file-size (multiple document file-sizes may be produced)
-* asciidoc, file extension (for now .ad), inline footnotes, minor
+ * asciidoc, file extension (for now .ad), inline footnotes, minor
-%% 5.2.0.orig.tar.xz (2014-01-06:01/1)
+** 5.2.0.orig.tar.xz (2014-01-06:01/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.0.orig.tar.xz
sisu_5.2.0.orig.tar.xz
- sisu_5.2.0-1.dsc
-
-* single document root A~ (recalibrate headings); level D~ possible
- * :A~ document title, single document root (ln==0)
- * introduce additional possible heading level, D~
- * markup rule change: single document root
- * breaks much downstream code, recalibrate (fix, test, fix & test again)
- * heading recalibration, code (downstream) changes
- * v4 & v5 bifurcate (diverge "un-merge-ably")
-
- Notes, rule imposed: heading level A~ becomes, document title & sole document
- root. Significant as an expressed rule/principle, it simplifies making certain
- document formats in particular some xml outputs, however, this has been pretty
- much the case in practice (most documents have this implicit structure) and
- will affect the markup of very few documents (for example all markup examples
- so far provided are this way). This being the case, it is a subtle change,
- because it will not be noticed (by the user) in a majority of cases. The most
- significant changes are to internal sisu code: it is not yet enforced by the
- software (software checks); it has implications for the way document output is
- created; it has implications for document structure regex matches, that now
- are attached to levels starting below level A~ (from B~ down) rather than
- level A. One document affected by single root/title level A~ markup rule and
- that provides a short test (for a document prepared using document structure
- regex matches), is the U.N. Convention on Contracts for the International Sale
- of Goods (CISG) that requires levels A-D & 1, and in previous versions of sisu
- exceptionally required multiple level A's (using levels A-C & 1)
-
-* vim syntax, updated to allow for possible level D~
-
-* bin/sisu
- * (ensure SiSU_version_dir) fix
- * sisu version info, yml info also when installed via ruby gem
- * downstream libs
-
-* fixes
- * ao_doc_str, nodes, possible parents, correction
- * epub, url closure decoration
- * sysenv, qrcode report absent program, minor
- * html scroll toc, clean links where none, exclude metadata
-
-* asciidoc, rename AsciiDoc module, & recalibrate headings
-
-* docbook, fictionbook, some tidying
-
-* cosmetic, code case statement
-
-* year updated, code headers
-
-%% 5.1.3.orig.tar.xz (2013-12-15:49/7)
+
+ * single document root A~ (recalibrate headings); level D~ possible
+ * :A~ document title, single document root (ln==0)
+ * introduce additional possible heading level, D~
+ * markup rule change: single document root
+ * breaks much downstream code, recalibrate (fix, test, fix & test again)
+ * heading recalibration, code (downstream) changes
+ * v4 & v5 bifurcate (diverge "un-merge-ably")
+
+ Notes, rule imposed: heading level A~ becomes, document title & sole
+ document root. Significant as an expressed rule/principle, it simplifies
+ making certain document formats in particular some xml outputs, however,
+ this has been pretty much the case in practice (most documents have this
+ implicit structure) and will affect the markup of very few documents (for
+ example all markup examples so far provided are this way). This being the
+ case, it is a subtle change, because it will not be noticed (by the user) in
+ a majority of cases. The most significant changes are to internal sisu code:
+ it is not yet enforced by the software (software checks); it has
+ implications for the way document output is created; it has implications for
+ document structure regex matches, that now are attached to levels starting
+ below level A~ (from B~ down) rather than level A. One document affected by
+ single root/title level A~ markup rule and that provides a short test (for a
+ document prepared using document structure regex matches), is the U.N.
+ Convention on Contracts for the International Sale of Goods (CISG) that
+ requires levels A-D & 1, and in previous versions of sisu exceptionally
+ required multiple level A's (using levels A-C & 1)
+
+ * vim syntax, updated to allow for possible level D~
+
+ * bin/sisu
+ * (ensure SiSU_version_dir) fix
+ * sisu version info, yml info also when installed via ruby gem
+ * downstream libs
+
+ * fixes
+ * ao_doc_str, nodes, possible parents, correction
+ * epub, url closure decoration
+ * sysenv, qrcode report absent program, minor
+ * html scroll toc, clean links where none, exclude metadata
+
+ * asciidoc, rename AsciiDoc module, & recalibrate headings
+
+ * docbook, fictionbook, some tidying
+
+ * cosmetic, code case statement
+
+ * year updated, code headers
+
+** 5.1.3.orig.tar.xz (2013-12-15:49/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.3.orig.tar.xz
sisu_5.1.3.orig.tar.xz
- sisu_5.1.3-1.dsc
-* Rakefile, (installer), reduce actions
+ * Rakefile, (installer), reduce actions
-%% 5.1.2.orig.tar.xz (2013-12-09:49/1)
+** 5.1.2.orig.tar.xz (2013-12-09:49/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.2.orig.tar.xz
sisu_5.1.2.orig.tar.xz
- sisu_5.1.2-1.dsc
-* Rakefile, (installer) improve, re-arrange
+ * Rakefile, (installer) improve, re-arrange
-* docbook, structure, a fix
- (construction zone: structure okish; docbook generated not usable)
+ * docbook, structure, a fix
+ (construction zone: structure okish; docbook generated not usable)
[NOTE disk crash (2013-12-05), fairly good but incomplete backup affecting work]
-%% 5.1.1.orig.tar.xz (2013-12-03:48/2)
+** 5.1.1.orig.tar.xz (2013-12-03:48/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.1.orig.tar.xz
sisu_5.1.1.orig.tar.xz
- sisu_5.1.1-1.dsc
-* rake create build & install sisu gemspec; (.gitignore), work on
- * gemspec adjusted to install only libraries related to a version (v4 or v5)
- * select sisu version to create, build & install
+ * rake create build & install sisu gemspec; (.gitignore), work on
+ * gemspec adjusted to install only libraries related to a version (v4 or v5)
+ * select sisu version to create, build & install
-* bin/sisu, simplify in relation to sisu gem
+ * bin/sisu, simplify in relation to sisu gem
-%% 5.1.0.orig.tar.xz (2013-12-02:48/1)
+** 5.1.0.orig.tar.xz (2013-12-02:48/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.0.orig.tar.xz
sisu_5.1.0.orig.tar.xz
- sisu_5.1.0-1.dsc
-
-* ao_doc_str, changes related to headings provided for document structure
- without ocn, testing required
-
-* ao endnotes, removed a space that should no longer be necessary,
- testing required
-
-* minor code related to line breaks, various locations
-
-* renaming of modules
- * use AO instead of DAL
-
-* renaming of files
- * ao*.rb instead of dal*.rb
- ao (abstract objects) shorter, also easily searched, higher sort location
- abstract as representation of & extraction of document objects
- (dal (document abstraction layer))
- * shared files e.g. shared_xml becomes xml_shared
- * plaintext becomes txt_plain
- * epub becomes xhtml_epub2
- * odf becomes xml_odf_odt
- * xml sax file renamed xml_sax.rb (from xml.rb)
-
-* new outputs under development, CONSTRUCTION_ZONE
- * plaintext, smarttext
- * textile
- * asciidoc
- * markdown
- * rst
- * xml
- * docbook, book
- * fictionbook
-
-* sisu.gemspec
-
-* xmlns xlink using xl
-
-* rake create build & install sisu gemspec; bin/sisugem (add .gitignore)
- * rake gemcbi #(create build install sisu gem)
- * rake gemspecscreate && \
- rake gembuild && \
- sudo rake geminstall
- * rake gemspecscreate && \
- gem build sisu5.gemspec && \
- sudo gem install --no-rdoc --no-ri \
- sisu-5.1.0.gem
- * bin/sisu updated (modified to take account of gems)
- * bin/sisugem added
- * .gitignore sisu-*.gem sisu*.gemspec
- consider inclusion (& tracking) of rake created sisu4.gemspec sisu5.gemspec
- (as this makes their availability more obvious)
- * once gem is installed: "sisu _5.1.0_ -vM" (to see version, commands
- otherwise as usual) if paths are such that sisu is not available
- "sisugem _5.1.0_ -vM" should work (as it is installed by gemspec, but not
- other sisu installers)
-
-* hub, sisu5 -M (maintenance mode) provide info as to path to hub.rb (i.e. where
- library is being drawn)
-
-* documentation related to commands for new outputs in development
-
-%% 5.0.25.orig.tar.xz (2013-11-08:44/5)
+
+ * ao_doc_str, changes related to headings provided for document structure
+ without ocn, testing required
+
+ * ao endnotes, removed a space that should no longer be necessary,
+ testing required
+
+ * minor code related to line breaks, various locations
+
+ * renaming of modules
+ * use AO instead of DAL
+
+ * renaming of files
+ * ao*.rb instead of dal*.rb
+ ao (abstract objects) shorter, also easily searched, higher sort location
+ abstract as representation of & extraction of document objects
+ (dal (document abstraction layer))
+ * shared files e.g. shared_xml becomes xml_shared
+ * plaintext becomes txt_plain
+ * epub becomes xhtml_epub2
+ * odf becomes xml_odf_odt
+ * xml sax file renamed xml_sax.rb (from xml.rb)
+
+ * new outputs under development, CONSTRUCTION_ZONE
+ * plaintext, smarttext
+ * textile
+ * asciidoc
+ * markdown
+ * rst
+ * xml
+ * docbook, book
+ * fictionbook
+
+ * sisu.gemspec
+
+ * xmlns xlink using xl
+
+ * rake create build & install sisu gemspec; bin/sisugem (add .gitignore)
+ * rake gemcbi #(create build install sisu gem)
+ * rake gemspecscreate && \
+ rake gembuild && \
+ sudo rake geminstall
+ * rake gemspecscreate && \
+ gem build sisu5.gemspec && \
+ sudo gem install --no-rdoc --no-ri \
+ sisu-5.1.0.gem
+ * bin/sisu updated (modified to take account of gems)
+ * bin/sisugem added
+ * .gitignore sisu-*.gem sisu*.gemspec
+ consider inclusion (& tracking) of rake created sisu4.gemspec
+ sisu5.gemspec (as this makes their availability more obvious)
+ * once gem is installed: "sisu _5.1.0_ -vM" (to see version, commands
+ otherwise as usual) if paths are such that sisu is not available
+ "sisugem _5.1.0_ -vM" should work (as it is installed by gemspec, but not
+ other sisu installers)
+
+ * hub, sisu5 -M (maintenance mode) provide info as to path to hub.rb
+ (i.e. where library is being drawn)
+
+ * documentation related to commands for new outputs in development
+
+** 5.0.25.orig.tar.xz (2013-11-08:44/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.25
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.25-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.25.orig.tar.xz
sisu_5.0.25.orig.tar.xz
- sisu_5.0.25-1.dsc
-* rake (& rant) sisu installer
- * do less by default
- * removed rant generated sisu-install
+ * rake (& rant) sisu installer
+ * do less by default
+ * removed rant generated sisu-install
-* vim, ftplugin sisu.vim, fix missing <leader>
+ * vim, ftplugin sisu.vim, fix missing <leader>
-* sisu_manual, minor info addition
+ * sisu_manual, minor info addition
-* bin/sisu-*
- * use option flag full names
- * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
+ * bin/sisu-*
+ * use option flag full names
+ * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
-%% 5.0.24.orig.tar.xz (2013-11-05:44/2)
+** 5.0.24.orig.tar.xz (2013-11-05:44/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.24
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.24-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.24.orig.tar.xz
sisu_5.0.24.orig.tar.xz
- sisu_5.0.24-1.dsc
-* xml, scaffold, re-activated, split into sisu structure & collapsed structure
+ * xml, scaffold, re-activated, split into sisu structure & collapsed structure
-%% 5.0.23.orig.tar.xz (2013-11-02:43/6)
+** 5.0.23.orig.tar.xz (2013-11-02:43/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.23
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.23-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.23.orig.tar.xz
sisu_5.0.23.orig.tar.xz
- sisu_5.0.23-1.dsc
-* constants, ocn output delimiter (where used) changed to 「...」
- (from square brackets [...])
+ * constants, ocn output delimiter (where used) changed to 「...」
+ (from square brackets [...])
-* plaintext
- * reorganize
+ * plaintext
+ * reorganize
-%% 5.0.22.orig.tar.xz (2013-10-27:42/7)
+** 5.0.22.orig.tar.xz (2013-10-27:42/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.22
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.22-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.22.orig.tar.xz
sisu_5.0.22.orig.tar.xz
- sisu_5.0.22-1.dsc
-* dal, document_structure_check_info
+ * dal, document_structure_check_info
-%% 5.0.21.orig.tar.xz (2013-10-23:42/3)
+** 5.0.21.orig.tar.xz (2013-10-23:42/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.21
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.21-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.21.orig.tar.xz
sisu_5.0.21.orig.tar.xz
- sisu_5.0.21-1.dsc
-* options & downstream, more use of opt.act.*.set==:on instead of opt.cmd =~/\S/
+ * options & downstream, more use of opt.act.*.set==:on instead of
+ opt.cmd =~/\S/
-* dal, parent & node info, fix
- (used e.g. for mind map type output (last for kdissert output, no longer
- supported))
+ * dal, parent & node info, fix
+ (used e.g. for mind map type output (last for kdissert output, no longer
+ supported))
-* dal, collapsed levels implemented
- convenience, collapse sisu's dual level document structure for output of
- markup with straight linear structure
+ * dal, collapsed levels implemented
+ convenience, collapse sisu's dual level document structure for output of
+ markup with straight linear structure
-%% 5.0.20.orig.tar.xz (2013-10-17:41/4)
+** 5.0.20.orig.tar.xz (2013-10-17:41/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.20
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.20-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.20.orig.tar.xz
sisu_5.0.20.orig.tar.xz
- sisu_5.0.20-1.dsc
-* constants, change a couple of internal processing delimiter characters, that
- might be used in ordinary marked up text (to characters even less likely to be
- of use in ordinary (marked up) text)
+ * constants, change a couple of internal processing delimiter characters, that
+ might be used in ordinary marked up text (to characters even less likely to
+ be of use in ordinary (marked up) text)
-%% 5.0.19.orig.tar.xz (2013-10-16:41/3)
+** 5.0.19.orig.tar.xz (2013-10-16:41/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.19
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.19-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.19.orig.tar.xz
sisu_5.0.19.orig.tar.xz
- sisu_5.0.19-1.dsc
-* constants, change a couple of internal processing delimiter characters, that
- might be used in ordinary marked up text
+ * constants, change a couple of internal processing delimiter characters, that
+ might be used in ordinary marked up text
-* vim, minor updates, not syntax related
+ * vim, minor updates, not syntax related
-* markup sample, update book index markup, appearance, minor
+ * markup sample, update book index markup, appearance, minor
-%% 5.0.18.orig.tar.xz (2013-09-22:37/7)
+** 5.0.18.orig.tar.xz (2013-09-22:37/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.18
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.18-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.18.orig.tar.xz
sisu_5.0.18.orig.tar.xz
- sisu_5.0.18-1.dsc
-* bin/sisu update language list ja ko zh, fix
+ * bin/sisu update language list ja ko zh, fix
-%% 5.0.17.orig.tar.xz (2013-09-21:37/6)
+** 5.0.17.orig.tar.xz (2013-09-21:37/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.17
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.17-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.17.orig.tar.xz
sisu_5.0.17.orig.tar.xz
- sisu_5.0.17-1.dsc
-
-* i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
- * texpdf, has large texlive xetex dependencies (Korean untested)
- * [concordance, untouched does nothing cjk, decide whether to disable]
-
-* sisu_manual, (in markup-samples) move to en/ sub-dir (permitting translations)
- * use of language sub-dir for source sisu markup suited to permitting
- translation management by po4a
- * sisurc.yml minor
- * Rakefile to help place sisu markup in a source language directory under po4a
- management
-* Rakefile to assist in placing sisu markup under po4a management (sisu_manual)
- * Provided as an example with sisu_manual
- * fairly generic, but potentially dangerous, can be used to place sisu markup
- source translations under po4a management, but user needs to know what this
- is, (and how to set it up, hence sisu_manual as an example (despite the lack
- of translations)) as can clobber/destroy files that are not managed by po4a.
-
-* minor cleaning
-
-%% 5.0.16.orig.tar.xz (2013-09-07:35/6)
+ * i18n CJK: zh ja ko, add languages Chinese, Japanese, Korean
+ * texpdf, has large texlive xetex dependencies (Korean untested)
+ * [concordance, untouched does nothing cjk, decide whether to disable]
+
+ * sisu_manual, (in markup-samples) move to en/ sub-dir (permitting
+ translations)
+ * use of language sub-dir for source sisu markup suited to permitting
+ translation management by po4a
+ * sisurc.yml minor
+ * Rakefile to help place sisu markup in a source language directory under
+ po4a management
+
+ * Rakefile to assist in placing sisu markup under po4a management
+ (sisu_manual)
+ * Provided as an example with sisu_manual
+ * fairly generic, but potentially dangerous, can be used to place sisu
+ markup source translations under po4a management, but user needs to know
+ what this is, (and how to set it up, hence sisu_manual as an example
+ (despite the lack of translations)) as can clobber/destroy files that are
+ not managed by po4a.
+
+ * minor cleaning
+
+** 5.0.16.orig.tar.xz (2013-09-07:35/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.16
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.16-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.16.orig.tar.xz
sisu_5.0.16.orig.tar.xz
- sisu_5.0.16-1.dsc
-* dal, book index, hash key, strip whitespace, a (required) fix
+ * dal, book index, hash key, strip whitespace, a (required) fix
-* db, book index, convert hash back to string
+ * db, book index, convert hash back to string
-%% 5.0.15.orig.tar.xz (2013-09-05:35/4)
+** 5.0.15.orig.tar.xz (2013-09-05:35/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.15
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.15-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.15.orig.tar.xz
sisu_5.0.15.orig.tar.xz
- sisu_5.0.15-1.dsc
-* dal, objects, store book index as hash (simplify downstream processing)
+ * dal, objects, store book index as hash (simplify downstream processing)
-* dal, book index markup, allow spaces on both sides of delimiters, or a space
- before and newline following a delimiter \s+[:|;](\s+|\n)
- [else parses as before no spaces]
+ * dal, book index markup, allow spaces on both sides of delimiters, or a space
+ before and newline following a delimiter \s+[:|;](\s+|\n)
+ [else parses as before no spaces]
-* vim syntax, book index markup, hilight delimeters
+ * vim syntax, book index markup, hilight delimeters
-%% 5.0.14.orig.tar.xz (2013-08-28:34/3)
+** 5.0.14.orig.tar.xz (2013-08-28:34/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.14
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.14-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
sisu_5.0.14.orig.tar.xz
- sisu_5.0.14-1.dsc
-* config files (by filetype & filename) touched
+ * config files (by filetype & filename) touched
-* manifest, output organised by, info, minor touch
+ * manifest, output organised by, info, minor touch
-* vim syntax, sisu.vim, fix typo
- * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+ * vim syntax, sisu.vim, fix typo
+ * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
-* dal
- * grouped text with fontface spanning newlines, partial solution, test
- * text blocks, tuning
+ * dal
+ * grouped text with fontface spanning newlines, partial solution, test
+ * text blocks, tuning
-* pdf (latex) tables, bugfix
+ * pdf (latex) tables, bugfix
-* odf:odt, footnotes, fix
+ * odf:odt, footnotes, fix
-%% 5.0.13.orig.tar.xz (2013-08-25:33/7)
+** 5.0.13.orig.tar.xz (2013-08-25:33/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.13
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.13-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz
sisu_5.0.13.orig.tar.xz
- sisu_5.0.13-1.dsc
-* dal, refine grouped text open and close using tics "```"
- [note use of "~~" considered but more problematic, (tics not used elsewhere)]
+ * dal, refine grouped text open and close using tics "```"
+ [note use of "~~" considered but more problematic, (tics not used
+ elsewhere)]
-* dal, improve font face matching within grouped text (other than code blocks)
+ * dal, improve font face matching within grouped text (other than code blocks)
-* vim syntax, improve grouped text match, open, close of blocks using tics "```"
+ * vim syntax, improve grouped text match, open, close of blocks using tics
+ "```"
-* css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
- review further)
+ * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
+ review further)
-%% 5.0.12.orig.tar.xz (2013-08-21:33/3)
+** 5.0.12.orig.tar.xz (2013-08-21:33/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.12
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.12-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.12.orig.tar.xz
sisu_5.0.12.orig.tar.xz
- sisu_5.0.12-1.dsc
-
-* syntax add
- * switch ocn off and on for a block of content, line containing only
- off: "--~#" (omit headings where possible) "---#" on: "--+#"
- * alternative open and close for blocks using line starting with "```", e.g.
- open code block: "``` code"
- close code block: "```"
- start poem: "``` poem"
- end poem: "```"
- * remove need for an empty line between opening & closing of a text block
-
-* vim syntax, add
- * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
- * grouped text, open, close of blocks using tics "```"
-
-* messages to terminal
- * code marker
- * rescued error messages
- * fuchsia (sp.)
-
-%% 5.0.11.orig.tar.xz (2013-08-08:31/4)
+
+ * syntax add
+ * switch ocn off and on for a block of content, line containing only
+ off: "--~#" (omit headings where possible) "---#" on: "--+#"
+ * alternative open and close for blocks using line starting with "```", e.g.
+ open code block: "``` code"
+ close code block: "```"
+ start poem: "``` poem"
+ end poem: "```"
+ * remove need for an empty line between opening & closing of a text block
+
+ * vim syntax, add
+ * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+ * grouped text, open, close of blocks using tics "```"
+
+ * messages to terminal
+ * code marker
+ * rescued error messages
+ * fuchsia (sp.)
+
+** 5.0.11.orig.tar.xz (2013-08-08:31/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.11
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.11.orig.tar.xz
sisu_5.0.11.orig.tar.xz
- sisu_5.0.11-1.dsc
-* dal_expand_insertions, refinement for monolingual output
+ * dal_expand_insertions, refinement for monolingual output
-%% 5.0.10.orig.tar.xz (2013-08-08:31/4)
+** 5.0.10.orig.tar.xz (2013-08-08:31/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.10
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.10.orig.tar.xz
sisu_5.0.10.orig.tar.xz
- sisu_5.0.10-1.dsc
-* output structure by, multilingual, monolingual filenames tweak
+ * output structure by, multilingual, monolingual filenames tweak
-%% 5.0.9.orig.tar.xz (2013-08-01:30/4)
+** 5.0.9.orig.tar.xz (2013-08-01:30/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.9
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.9.orig.tar.xz
sisu_5.0.9.orig.tar.xz
- sisu_5.0.9-1.dsc
-* output structure by :filename or :filetype, multilingual default, fix
+ * output structure by :filename or :filetype, multilingual default, fix
-* concordance, fix
+ * concordance, fix
-%% 5.0.8.orig.tar.xz (2013-07-30:30/2)
+** 5.0.8.orig.tar.xz (2013-07-30:30/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.8
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.8.orig.tar.xz
sisu_5.0.8.orig.tar.xz
- sisu_5.0.8-1.dsc
-
-* output structure by, add monolingual alternative for :filetype or :filename
- * filename without language code, if document is in default language
- * set a default language, 'en' or as specified
- * set in rc file or from command line instruction
- * command line e.g.
- sisu -hv --monolingual --by-filename sisu_markup.sst
- sisu -3v --monolingual --by-filetype sisu_manual.ssm
- * sisurc.yml lingual: 'mono' | 'multi'
- lingual: 'mono'
- * note: output by :filetype is roughly equivalent to what monolingual output
- by :language would be
- * allow command line setting of default language using language code
- --default-language='en' --default-lang-en if used together with
- --monolingual and --by-filetype or --by-filename the selected default
- language document will not have a language code in the output filename
- * documentation
-
-* cgi helper script, sample search form
- * single cgi form, (with different internal variables set for output types)
- * monolingual output search form option
-
-%% 5.0.7.orig.tar.xz (2013-06-25:25/2)
+
+ * output structure by, add monolingual alternative for :filetype or :filename
+ * filename without language code, if document is in default language
+ * set a default language, 'en' or as specified
+ * set in rc file or from command line instruction
+ * command line e.g.
+ sisu -hv --monolingual --by-filename sisu_markup.sst
+ sisu -3v --monolingual --by-filetype sisu_manual.ssm
+ * sisurc.yml lingual: 'mono' | 'multi'
+ lingual: 'mono'
+ * note: output by :filetype is roughly equivalent to what monolingual output
+ by :language would be
+ * allow command line setting of default language using language code
+ --default-language='en' --default-lang-en if used together with
+ --monolingual and --by-filetype or --by-filename the selected default
+ language document will not have a language code in the output filename
+ * documentation
+
+ * cgi helper script, sample search form
+ * single cgi form, (with different internal variables set for output types)
+ * monolingual output search form option
+
+** 5.0.7.orig.tar.xz (2013-06-25:25/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.7
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.7.orig.tar.xz
sisu_5.0.7.orig.tar.xz
- sisu_5.0.7-1.dsc
-* "general code cleaning" fix
+ * "general code cleaning" fix
-%% 5.0.6.orig.tar.xz (2013-06-25:25/2)
+** 5.0.6.orig.tar.xz (2013-06-25:25/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.6.orig.tar.xz
sisu_5.0.6.orig.tar.xz
- sisu_5.0.6-1.dsc
-* "general code cleaning" fix
+ * "general code cleaning" fix
-%% 5.0.5.orig.tar.xz (2013-06-22:24/6)
+** 5.0.5.orig.tar.xz (2013-06-22:24/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.5.orig.tar.xz
sisu_5.0.5.orig.tar.xz
- sisu_5.0.5-1.dsc
-* vim
- * colorscheme def, mark current line
- * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
+ * vim
+ * colorscheme def, mark current line
+ * ftplugin sisu.vim, c-\ hard wrap lines to line width (moved from c-j)
-* general code cleaning, propagate back to v4 after testing
+ * general code cleaning, propagate back to v4 after testing
-%% 5.0.4.orig.tar.xz (2013-06-06:22/4)
+** 5.0.4.orig.tar.xz (2013-06-06:22/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.4.orig.tar.xz
sisu_5.0.4.orig.tar.xz
- sisu_5.0.4-1.dsc
-* db, population of database (--update), import of master files (.ssm), fix
- (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns,
- affects construction of unique identifier)
+ * db, population of database (--update), import of master files (.ssm), fix
+ (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns
+ @md.opt.fns, affects construction of unique identifier)
-* cgi helper script, sample search form generator
- * file name matching, check
- * cosmetic, drop use of images in sample form
+ * cgi helper script, sample search form generator
+ * file name matching, check
+ * cosmetic, drop use of images in sample form
-* sysenv, requested load warning removed, less screen clutter, consider
+ * sysenv, requested load warning removed, less screen clutter, consider
-%% 5.0.3.orig.tar.xz (2013-05-30:21/4)
+** 5.0.3.orig.tar.xz (2013-05-30:21/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.3.orig.tar.xz
sisu_5.0.3.orig.tar.xz
- sisu_5.0.3-1.dsc
-* sysenv, pgsql db connect fix
+ * sysenv, pgsql db connect fix
-* cgi_pgsql, cgi helper script, sample search form generator, detail
+ * cgi_pgsql, cgi helper script, sample search form generator, detail
-%% 5.0.2.orig.tar.xz (2013-05-29:21/3)
+** 5.0.2.orig.tar.xz (2013-05-29:21/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.2.orig.tar.xz
sisu_5.0.2.orig.tar.xz
- sisu_5.0.2-1.dsc
-* help update, concentrate on man pages
- * documentation, manpage update
- * interactive help, out of date, removed
+ * help update, concentrate on man pages
+ * documentation, manpage update
+ * interactive help, out of date, removed
-* document version check, disable
- * automatic check disabled
- * check and correction of pre 0.38 markup removed
+ * document version check, disable
+ * automatic check disabled
+ * check and correction of pre 0.38 markup removed
-* sysenv, version info moved here from help
+ * sysenv, version info moved here from help
-* cgi helper script sample search form generator, adjust/improve, adds settings:
- db type --db-pq or db-sqlite
- webserver for cgi script & db --webserv-search=''
- webserver for sisu ouptut files --webserv-output=''
- cgi search form link name --cgi-search-form-name=''
- db user (pg) --db-user=''
+ * cgi helper script sample search form generator, adjust/improve, adds
+ settings:
+ db type --db-pq or db-sqlite
+ webserver for cgi script & db --webserv-search=''
+ webserver for sisu ouptut files --webserv-output=''
+ cgi search form link name --cgi-search-form-name=''
+ db user (pg) --db-user=''
-%% 5.0.1.orig.tar.xz (2013-05-18:19/7)
+** 5.0.1.orig.tar.xz (2013-05-18:19/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.1.orig.tar.xz
sisu_5.0.1.orig.tar.xz
- sisu_5.0.1-1.dsc
-* vim, ftplugin, sisu.vim, statusline
+ * vim, ftplugin, sisu.vim, statusline
-* cgi script for sample search form generator, sqlite, minor fixes (affects
- 'sisu -F')
+ * cgi script for sample search form generator, sqlite, minor fixes (affects
+ 'sisu -F')
-%% 5.0.0.orig.tar.xz (2013-05-08:18/3)
+** 5.0.0.orig.tar.xz (2013-05-08:18/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;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
+ * v3 closed
-v5 opened
+ v5 opened
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 3dfdc850..857d19ea 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -1,7 +1,8 @@
-%% SiSU version 6
+SiSU CHANGELOG -*- mode: org; -*-
+* SiSU version 6
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v6;hb=HEAD>
-* debian/changelog
+ * debian/changelog
<http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
v6 branch for development and testing prior to roll-into v5, to provide v5 with
@@ -11,647 +12,729 @@ v4 branch is removed; it is available in sisu < 4.2.20
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/
+ * 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:
+* Reverse Chronological:
-%% 6.3.1.orig.tar.xz (2014-10-19:41/7)
+--- HEAD ---
+
+** 6.4.0.orig.tar.xz (2015-04-20:16/1)
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.4.0
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
+ sisu_6.4.0.orig.tar.xz
+
+ * year set 2015 (prepare for the new year)
+
+ * qi, (quick install) header update (also rbuild)
+
+ * sisu-mode.el emacs, outline mode "folding" for sisu
+
+ * CHANGELOGS formatted for viewing as org-mode files
+ indentation, line-breaking, and formatting characters only changes made
+
+ * org files related to sisu
+ * break up and place in own subdir
+ * org files, minor editing
+
+ * code headers reformatted for viewing as org-mode files
+
+ * c&d: project dir structure, libs moved under new branch names
+ * libs & version files under new branch names: current & develop
+ * previously under branch version numbers (v5|v6)
+ * version .yml files moved
+ * associated adjustments made as required, notably to:
+ bin/sisu se* qi* (file headers)
+ * [on dir names, want release to precede next/development,
+ considered (cur|dev) (current|(dev|development|progress|next))
+ (stable|unstable), alpha sorting fail (release|(next|develop))]
+
+ * version & branch info, changes related to move of lib dirs
+ * track changes to sisu_version info
+ * in dp (param) project_details used instead of sisu_version
+
+ * misc minor
+ * html endnote segment, endnote in heading, link back to html scroll
+ * epub endnote segment fails, issue with match, fix
+ * dp, remark if no existing option selected
+
+ * ao, rearrange, introduce new file
+
+ * reorganize, introduce new file(s)
+ * txt outputs
+ * html segments
+ * epub
+ * xmls
+ * address related garbage collection issue
+
+ * orgmode, add orgmode structure output to txts
+
+ * cgi, search form, html ref, remove leading 'o' ocn, bugfix
+ in html (on use of html5), removed leading 'o' before ocn, not
+ reflected in generated cgi, sample search form, so, does not
+ jump to the (otherwise correctly) identified location
+
+ * html,
+ * output by filename, filenames, fix
+ * ocn link back to self reinstated
+ (removed ocn_html_identifier variable, unnecessary in html5,
+ requirement previously forced by html4)
+ (requested, used as quick means to get object url reference link)
+
+ * po4a, reinstate possibility to initialize po4a management of translated
+ marked up documents, i.e. to place translated versions of a sisu document
+ under po4a management (provide po4a.cfg file)
+ NOTE: shelf, abandon, change tack (for now at least)
+ explore a different way
+
+ * utils_composite, composite documents (.ssm) extract the list of insert files
+
+ * utils_response,
+ * rely on module (remove class) extend module
+ * ease selection options
+
+ * SiSU_is switched to a method (instead of a hash) (bin and lib)
+
+ * use RbConfig instead of Config
+
+ * bin/sisu-misc-utils, sisu_thor_lib, currently only for po4a
+ * uses po4a to create po files with empty translation strings
+ * in appropriately configured directory e.g.
+ "data/doc/sisu/markup-samples/manual" have file named:
+ "languages_source_and_targets" containing e.g.:
+ source: en
+ targets: de fr es ja ru zh
+ command examples:
+ ruby ~snx/bin/sisu-misc-utils po4a --next --clean
+ ruby ~snx/bin/sisu-misc-utils po4a --next --distclean
+ ruby ~snx/bin/sisu-misc-utils po4a --next --make
+
+ * under data/.../manual sisu po4a a ruby thor (Rakefile equivalent)
+
+ * sisu.org addition, modification, consider
+
+ * header regex matches for bold & italics auto match possessives ending in 's
+
+ * manpage, fix (require)
+
+ * manifest, html ids added to label/identify content
+
+ * ao and elsewhere, use of map and select
+
+ * ao bibliography / references, provide tools to assist in making (first pass)
+ * change end sequence: auto generated endnote section; bibliography;
+ book index if any
+ either:
+ * create a tagged bibliography list at end of document, also providing
+ an id for use in footnotes, and the short title that is to appear in
+ footnotes
+ or:
+ * tag footnote citations that should appear in the bibliography
+
+ * documentation, update to mention bibliography
+
+** SiSU "UnFrozen" - prior to end of Debian Freeze
+ (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
+ 5.7.1-2) was not accepted)
+
+** 6.3.2.orig.tar.xz (2014-11-02:43/7)
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.2
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.2.orig.tar.xz
+ sisu_6.3.2.orig.tar.xz
+
+ * ao, composite documents, --verbose report to terminal on loading of *.sst,
+ fix without fix sisu reports loading of .ssm & .ssi files but not .sst
+ (sub-documents are imported correctly and resulting document outputs are
+ correct and unaffected, but unless aware of this bug it would seem otherwise
+ until the correct operation of sisu was manually verified e.g. by examining
+ documents produced); (issue somewhat mitigated by not being the most common
+ sisu operation)
+ sisu is in development freeze, this fix is provided for Debian Jessie
+ (Closes: #767761)
+
+** SiSU Frozen - Debian Freeze - ^^ pre Jessie ^^
+
+** 6.3.1.orig.tar.xz (2014-10-19:41/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.3.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.1.orig.tar.xz
sisu_6.3.1.orig.tar.xz
- sisu_6.3.1-1.dsc
-* html
- * html_format, "id"s for objects & footnotes
- * remove trailing backslash for empty linebreak & paragraph, <br> <p>
+ * html
+ * html_format, "id"s for objects & footnotes
+ * remove trailing backslash for empty linebreak & paragraph, <br> <p>
-* db, text search & display field, footnotes moved to end of text object
- * cleaner, more useful search results
- * cleaner text search field
- * separate footnote fields redundant for search purposes
+ * db, text search & display field, footnotes moved to end of text object
+ * cleaner, more useful search results
+ * cleaner text search field
+ * separate footnote fields redundant for search purposes
-* cgi, sample search form, find & display endnotes from parent text object
- * remove dedicated endnote search section (as endnotes found & listed from
- reference text field)
- * cleaner search results
+ * cgi, sample search form, find & display endnotes from parent text object
+ * remove dedicated endnote search section (as endnotes found & listed from
+ reference text field)
+ * cleaner search results
-%% 6.3.0.orig.tar.xz (2014-10-12:40/7)
+** 6.3.0.orig.tar.xz (2014-10-12:40/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.3.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.3.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.3.0.orig.tar.xz
sisu_6.3.0.orig.tar.xz
- sisu_6.3.0-1.dsc
-* '*_parts', remove defaults.rb & some relics related to sisu skins (long gone)
- * old code removed & substituted as required by *_parts
- * attending code changes, fairly wide ranging, test
+ * '*_parts', remove defaults.rb & some relics related to sisu skins (long
+ gone)
+ * old code removed & substituted as required by *_parts
+ * attending code changes, fairly wide ranging, test
-* html, epub, set document body language
+ * html, epub, set document body language
-* html_format, label, re: object number object names
+ * html_format, label, re: object number object names
-* constants, remove ocn html leader (resulting hashtag #1 instead of #o1)
+ * constants, remove ocn html leader (resulting hashtag #1 instead of #o1)
-* moved files: harvest* to html_harvest*
+ * moved files: harvest* to html_harvest*
-* --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
+ * --maintenance revisited, bin/sisu, hub, urls --maintenance, fix required
-* db, --maintenance sql, separated out postgresql & sqlite
- could share "maintenance" db import sql file (as done previously), consider
+ * db, --maintenance sql, separated out postgresql & sqlite
+ could share "maintenance" db import sql file (as done previously), consider
-* fixes, minor
- * qrcode, sha call
- * epub tune, --maintenance related
+ * fixes, minor
+ * qrcode, sha call
+ * epub tune, --maintenance related
-%% 6.2.10.orig.tar.xz (2014-10-03:39/5)
+** 6.2.10.orig.tar.xz (2014-10-03:39/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.10
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.10.orig.tar.xz
sisu_6.2.10.orig.tar.xz
- sisu_6.2.10-1.dsc
-* --act provides info on current --act0 to --act9 settings (makes it easier to
- make use of acts 0 to 9)
+ * --act provides info on current --act0 to --act9 settings (makes it easier to
+ make use of acts 0 to 9)
-* html, tiny first nudge toward html5 (document headers and minor)
+ * html, tiny first nudge toward html5 (document headers and minor)
-%% 6.2.9.orig.tar.xz (2014-09-28:38/7)
+** 6.2.9.orig.tar.xz (2014-09-28:38/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.9
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.9.orig.tar.xz
sisu_6.2.9.orig.tar.xz
- sisu_6.2.9-1.dsc
-* sql, clean searchable text, update for (ao/dal) text representation,
- fix legacy action
+ * sql, clean searchable text, update for (ao/dal) text representation,
+ fix legacy action
-%% 6.2.8.orig.tar.xz (2014-09-19:37/5)
+** 6.2.8.orig.tar.xz (2014-09-19:37/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.8
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.8.orig.tar.xz
sisu_6.2.8.orig.tar.xz
- sisu_6.2.8-1.dsc
-* vim syntax, sisu.vim, update git url and email address
+ * vim syntax, sisu.vim, update git url and email address
-* update urls to git repo
+ * update urls to git repo
-%% 6.2.7.orig.tar.xz (2014-09-12:36/5)
+** 6.2.7.orig.tar.xz (2014-09-12:36/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.7
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.7.orig.tar.xz
sisu_6.2.7.orig.tar.xz
- sisu_6.2.7-1.dsc
-
-* ao, auto naming (segment & tag), exceptions, avoidance of name collisions
-
-* ao, feedback on markup document structure (heading level) errors
- adjustment to (existing) provided feedback, based on:
- * level A~ title, required;
- * levels B~ C~ D~ optional sequential document divider headings
- (Part, Section etc. equivalent);
- * level 1~ required, heading level preceding substantive text; followed by
- * levels 2~ 3~ 4~ optional, sequential headings
- (1.1, 1.1.1, 1.1.1.1 equivalents)
-
-* ao, expansion of links to internal filepaths (re: syntax based shortcut)
- (expansion of sisu output filepaths, sync with use of --act0 to --act9)
-
-* se, processing, adjustments to default settings for --act0 to --act9
-
-* se, env, lingual: mono / multi, rc settings
-
-* sisurc, update samples
- * adjustments to default settings for --act0 to --act9 (to match current "se")
- * removed sisurc examples to organize output by
- filetype, filename, monolingual, as one word diff
- output_dir_structure_by: language
- # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
- # language
- # (language and filetype directories);
- # filetype
- # (filetype directories, filename includes language code);
- # filetype_mono (or monolingual)
- # (filetype drectories, no language codes in filenames)
- # filename
- # (directory output similar to v1 v2, filename includes language code);
- # filename_mono
- # (directory output similar to v1 v2, filename without language code);
-
-* hub, /tmp processing directory checks
-
-%% 6.2.6.orig.tar.xz (2014-09-05:35/5)
+
+ * ao, auto naming (segment & tag), exceptions, avoidance of name collisions
+
+ * ao, feedback on markup document structure (heading level) errors
+ adjustment to (existing) provided feedback, based on:
+ * level A~ title, required;
+ * levels B~ C~ D~ optional sequential document divider headings
+ (Part, Section etc. equivalent);
+ * level 1~ required, heading level preceding substantive text; followed by
+ * levels 2~ 3~ 4~ optional, sequential headings
+ (1.1, 1.1.1, 1.1.1.1 equivalents)
+
+ * ao, expansion of links to internal filepaths (re: syntax based shortcut)
+ (expansion of sisu output filepaths, sync with use of --act0 to --act9)
+
+ * se, processing, adjustments to default settings for --act0 to --act9
+
+ * se, env, lingual: mono / multi, rc settings
+
+ * sisurc, update samples
+ * adjustments to default settings for --act0 to --act9 (to match current
+ "se")
+ * removed sisurc examples to organize output by
+ filetype, filename, monolingual, as one word diff
+ output_dir_structure_by: language
+ # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+ # language
+ # (language and filetype directories);
+ # filetype
+ # (filetype directories, filename includes language code);
+ # filetype_mono (or monolingual)
+ # (filetype drectories, no language codes in filenames)
+ # filename
+ # (directory output similar to v1 v2, filename includes language code);
+ # filename_mono
+ # (directory output similar to v1 v2, filename without language code);
+
+ * hub, /tmp processing directory checks
+
+** 6.2.6.orig.tar.xz (2014-09-05:35/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.6.orig.tar.xz
sisu_6.2.6.orig.tar.xz
- sisu_6.2.6-1.dsc
-* ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
- processing document
+ * ao_doc_str, if faulty document structure, stop; if --no-stop option, skip
+ processing document
-* ao_numbering, provide more information on duplicate numbering before stop
+ * ao_numbering, provide more information on duplicate numbering before stop
-* html navigation, enable turn off (nav buttons on remaining html segments)
+ * html navigation, enable turn off (nav buttons on remaining html segments)
-* (for html) set default to navigation bar off
+ * (for html) set default to navigation bar off
-* xml xhtml outputs, &amp; issues
+ * xml xhtml outputs, &amp; issues
-* shared_metadata, requires xml_shared
+ * shared_metadata, requires xml_shared
-* link/path fixes,
- * manifest, link where no "document harvest"
- * html, home button links url (remove slash)
- * harvest_authors, by_filetype, manifest path
+ * link/path fixes,
+ * manifest, link where no "document harvest"
+ * html, home button links url (remove slash)
+ * harvest_authors, by_filetype, manifest path
-%% 6.2.5.orig.tar.xz (2014-09-01:35/1)
+** 6.2.5.orig.tar.xz (2014-09-01:35/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.5.orig.tar.xz
sisu_6.2.5.orig.tar.xz
- sisu_6.2.5-1.dsc
-* cgi_sqlite, allow expansion of variable (default db name), double quotes, fix
+ * cgi_sqlite, allow expansion of variable (default db name), double quotes,
+ fix
-%% 6.2.4.orig.tar.xz (2014-08-29:34/5)
+** 6.2.4.orig.tar.xz (2014-08-29:34/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.4.orig.tar.xz
sisu_6.2.4.orig.tar.xz
- sisu_6.2.4-1.dsc
-* hub, sisu version info, when & what to report
+ * hub, sisu version info, when & what to report
-* dp, texpdf, copyright_and_license, minor fix, used by texpdf
+ * dp, texpdf, copyright_and_license, minor fix, used by texpdf
-%% 6.2.3.orig.tar.xz (2014-08-20:33/3)
+** 6.2.3.orig.tar.xz (2014-08-20:33/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.3.orig.tar.xz
sisu_6.2.3.orig.tar.xz
- sisu_6.2.3-1.dsc
-* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
-* start making use of --no-stop command
+ * hub_options, introduce "error override" --no-stop or --errors-as-warnings
+ flag
+ * start making use of --no-stop command
-* ao
- * book index related
- * ao_expand_insertions, blocked text match, adjust
+ * ao
+ * book index related
+ * ao_expand_insertions, blocked text match, adjust
-* texpdf, output, copyright & license
+ * texpdf, output, copyright & license
-* syntax hilighting, restrict heading matches, minor
- * vim
- * emacs
+ * syntax hilighting, restrict heading matches, minor
+ * vim
+ * emacs
-%% 6.2.2.orig.tar.xz (2014-08-12:32/2)
+** 6.2.2.orig.tar.xz (2014-08-12:32/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.2.orig.tar.xz
sisu_6.2.2.orig.tar.xz
- sisu_6.2.2-1.dsc
-* hub, organization & loose ends
- * tweak triggers
- * split file further
- * remove mod
+ * hub, organization & loose ends
+ * tweak triggers
+ * split file further
+ * remove mod
-* webrick, wb.cgi fixed and omitted (use discarded)
+ * webrick, wb.cgi fixed and omitted (use discarded)
-%% 6.2.1.orig.tar.xz (2014-08-08:31/5)
+** 6.2.1.orig.tar.xz (2014-08-08:31/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.1.orig.tar.xz
sisu_6.2.1.orig.tar.xz
- sisu_6.2.1-1.dsc
-* extend document structure, headings A - D, 1 - 4
- * sql db table structure changed (needs to be rebuilt)
+ * extend document structure, headings A - D, 1 - 4
+ * sql db table structure changed (needs to be rebuilt)
-%% 6.2.0.orig.tar.xz (2014-08-08:31/5)
+** 6.2.0.orig.tar.xz (2014-08-08:31/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.0.orig.tar.xz
sisu_6.2.0.orig.tar.xz
- sisu_6.2.0-1.dsc
-* some file renames, fairly extensive
+ * some file renames, fairly extensive
-* commandline, --act0 to --act9 & rc-config with act instead of roman numeral
- * configurable command line options increased to 0 - 9 (instead of 0 - 5)
- * use --act0 to --act9
- * default --act0
- * rc config with flag:act0 to flag:act9
- * legacy roman numeral configuration works (for now)
+ * commandline, --act0 to --act9 & rc-config with act instead of roman numeral
+ * configurable command line options increased to 0 - 9 (instead of 0 - 5)
+ * use --act0 to --act9
+ * default --act0
+ * rc config with flag:act0 to flag:act9
+ * legacy roman numeral configuration works (for now)
-* internally use opt.act (simplify, cleaner, instead of opt.cmd & opt.mod, now
- removed)
+ * internally use opt.act (simplify, cleaner, instead of opt.cmd & opt.mod, now
+ removed)
-%% 6.1.5.orig.tar.xz (2014-07-29:30/2)
+** 6.1.5.orig.tar.xz (2014-07-29:30/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.5.orig.tar.xz
-* ensure reset of parsed document directory path
- * needed in the case of html for some subsequent processing
+ * ensure reset of parsed document directory path
+ * needed in the case of html for some subsequent processing
-%% 6.1.4.orig.tar.xz (2014-07-24:29/4)
+** 6.1.4.orig.tar.xz (2014-07-24:29/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.4.orig.tar.xz
sisu_6.1.4.orig.tar.xz
- sisu_6.1.4-1.dsc
-* ao_numbering, auto name segment, tweak to make behave as intended
- (further testing required)
+ * ao_numbering, auto name segment, tweak to make behave as intended
+ (further testing required)
-%% 6.1.3.orig.tar.xz (2014-07-23:29/3)
+** 6.1.3.orig.tar.xz (2014-07-23:29/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.3.orig.tar.xz
sisu_6.1.3.orig.tar.xz
- sisu_6.1.3-1.dsc
-* db, rescue where no tables attempt to initialize db and retry
- (catch db message where no tables and attempt to initialize database)
- * internally run the equivalent of --createall
- * (if successful) permitting completion of --import or --update command
- * make use of action triggers
+ * db, rescue where no tables attempt to initialize db and retry
+ (catch db message where no tables and attempt to initialize database)
+ * internally run the equivalent of --createall
+ * (if successful) permitting completion of --import or --update command
+ * make use of action triggers
-%% 6.1.2.orig.tar.xz (2014-07-22:29/2)
+** 6.1.2.orig.tar.xz (2014-07-22:29/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.2.orig.tar.xz
sisu_6.1.2.orig.tar.xz
- sisu_6.1.2-1.dsc
-* bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
+ * bin/sisu, hub, hub close (ensure), remove /tmp/ processing dir
-* html_lite_shared, issue fix
+ * html_lite_shared, issue fix
-* options, sisupod parsing fix
+ * options, sisupod parsing fix
-* db, reorganize action triggers
+ * db, reorganize action triggers
-* db pg import, fix
- * remove dbi from rescue, no longer using ruby-dbi
- * ruby-pg query SELECT MAX
+ * db pg import, fix
+ * remove dbi from rescue, no longer using ruby-dbi
+ * ruby-pg query SELECT MAX
-* sysenv,
- * break up file, multiple se_* files
- * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced in
- 6.1.1) to bring back correct hub (post) processing behavior
- * processing shortcuts, options, adjust (refinement necessary)
+ * sysenv,
+ * break up file, multiple se_* files
+ * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced
+ in 6.1.1) to bring back correct hub (post) processing behavior
+ * processing shortcuts, options, adjust (refinement necessary)
-%% 6.1.1.orig.tar.xz (2014-07-15:28/2)
+** 6.1.1.orig.tar.xz (2014-07-15:28/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.1.orig.tar.xz
sisu_6.1.1.orig.tar.xz
- sisu_6.1.1-1.dsc
-* bin/sisu, hub, options, message pass sisu_called_from_directory
+ * bin/sisu, hub, options, message pass sisu_called_from_directory
-* sysenv, general, base_markup_dir_stub (replace pwd_stub)
+ * sysenv, general, base_markup_dir_stub (replace pwd_stub)
-* ao_numbering, auto name segment, extract "number" from heading, refine
+ * ao_numbering, auto name segment, extract "number" from heading, refine
-* src, sisupod, bring back in line
+ * src, sisupod, bring back in line
-* docbook,
- * code & other block markup
- * url links, urls
- * images, an adjustment
- * css (needs work)
- * document header, sisu processing info
- * docbook status, under construction notice removed (still much to do)
+ * docbook,
+ * code & other block markup
+ * url links, urls
+ * images, an adjustment
+ * css (needs work)
+ * document header, sisu processing info
+ * docbook status, under construction notice removed (still much to do)
-* general, document parts
- * css
- * base images
- * document images
+ * general, document parts
+ * css
+ * base images
+ * document images
-%% 6.1.0.orig.tar.xz (2014-07-11:27/5)
+** 6.1.0.orig.tar.xz (2014-07-11:27/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.0.orig.tar.xz
sisu_6.1.0.orig.tar.xz
- sisu_6.1.0-1.dsc
-
-* ao_numbering,
- * auto name segment, extract "number" from heading, fix
- * check that all auto given number based seg names are unique
-
-* ao_composite, nested includes, .ssi (insert) can include .ssi & .sst
-~ .ssm can contain/include .sst or .ssi
- .sst files can be processed independently, they do not contain other files
- .ssi files have been only insertions of text & are not processed independently
- but as part of an ssm
- change proposed:
- .ssm unchanged,
- .sst unchanged,
- .ssi as before, but can include .sst or .ssi, so:
- files are only insertions & are not processed independently but as part of an
- .ssm or another .ssi
- i.e. as before with the addition that it like a .ssm can contain/include
- .sst or .ssi
-~ requested feature, (Closes: #744408)
- User beware. In previous versions there has been a deliberate attempt to keep
- it easy to follow documents & not have to dig through different levels of
- includes, as this is more likely to lead to errors in markup.
- The idea of nested includes has not been attractive (messy for a document),
- however, this is now made possible, use with care
- ~ it is not as easy to see document structure at a glance, and structural
- errors may be introduced and will need to be taken care of (requiring
- document markup debugging)
- ~ allowing .ssi to also include other .ssi or .sst could lead to infinite
- recursion if an .ssi includes another which includes itself; stopping after
- an additional level of includes seems arbitrary, and possibly prone to error
- if you are dealing with many documents
-~ requires testing
-~ version bump, new behavior added to .ssi one of the 3 sisu filetypes
-
-* src, sisupod composite source, nested includes
- follow rules for ao_composite (described above)
-
-%% 6.0.11.orig.tar.xz (2014-07-07:27/1)
+
+ * ao_numbering,
+ * auto name segment, extract "number" from heading, fix
+ * check that all auto given number based seg names are unique
+
+ * ao_composite, nested includes, .ssi (insert) can include .ssi & .sst
+ ~ .ssm can contain/include .sst or .ssi
+ .sst files can be processed independently, they do not contain other files
+ .ssi files have been only insertions of text & are not processed
+ independently but as part of an ssm
+ change proposed:
+ .ssm unchanged,
+ .sst unchanged,
+ .ssi as before, but can include .sst or .ssi, so:
+ files are only insertions & are not processed independently but as part of
+ an .ssm or another .ssi
+ i.e. as before with the addition that it like a .ssm can contain/include
+ .sst or .ssi
+ ~ requested feature, (Closes: #744408)
+ User beware. In previous versions there has been a deliberate attempt to
+ keep it easy to follow documents & not have to dig through different levels
+ of includes, as this is more likely to lead to errors in markup.
+ The idea of nested includes has not been attractive (messy for a document),
+ however, this is now made possible, use with care
+ ~ it is not as easy to see document structure at a glance, and structural
+ errors may be introduced and will need to be taken care of (requiring
+ document markup debugging)
+ ~ allowing .ssi to also include other .ssi or .sst could lead to infinite
+ recursion if an .ssi includes another which includes itself; stopping
+ after an additional level of includes seems arbitrary, and possibly prone
+ to error if you are dealing with many documents
+ ~ requires testing
+ ~ version bump, new behavior added to .ssi one of the 3 sisu filetypes
+
+ * src, sisupod composite source, nested includes
+ follow rules for ao_composite (described above)
+
+** 6.0.11.orig.tar.xz (2014-07-07:27/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.11
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.11-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.11.orig.tar.xz
sisu_6.0.11.orig.tar.xz
- sisu_6.0.11-1.dsc
-
-* bin/sisu,
- * processing dir related
- e.g. using live-manual/manual as sample, the following should work as
- expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
- sisu --html -v en/live-manual.ssm ja/live-manual.ssm
- or for all available translations:
- sisu --html -v **/live-manual.ssm
- (these previously would have broken after processing the first directory)
- sisu command equivalent for all available translations being (unaffected):
- sisu --html -v --glob live-manual
- * some cosmetic long line breaking
-
-* ao, auto seg naming, adjustments,
- re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
-
-%% 6.0.10.orig.tar.xz (2014-07-04:26/5)
+
+ * bin/sisu,
+ * processing dir related
+ e.g. using live-manual/manual as sample, the following should work as
+ expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
+ sisu --html -v en/live-manual.ssm ja/live-manual.ssm
+ or for all available translations:
+ sisu --html -v **/live-manual.ssm
+ (these previously would have broken after processing the first directory)
+ sisu command equivalent for all available translations being (unaffected):
+ sisu --html -v --glob live-manual
+ * some cosmetic long line breaking
+
+ * ao, auto seg naming, adjustments,
+ re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
+
+** 6.0.10.orig.tar.xz (2014-07-04:26/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.10
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.10-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.10.orig.tar.xz
sisu_6.0.10.orig.tar.xz
- sisu_6.0.10-1.dsc
-* ao, fix, re seg numbering, fixed width, leading zeros
- (introduced: 5.4.3 / 6.0.9)
- provisional fix (check related issues against 5.4.2 / 6.0.8)
+ * ao, fix, re seg numbering, fixed width, leading zeros
+ (introduced: 5.4.3 / 6.0.9)
+ provisional fix (check related issues against 5.4.2 / 6.0.8)
-%% 6.0.9.orig.tar.xz (2014-07-01:26/2)
+** 6.0.9.orig.tar.xz (2014-07-01:26/2)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.9
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.9-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.9.orig.tar.xz
sisu_6.0.9.orig.tar.xz
- sisu_6.0.9-1.dsc
-* ao,
- * code cosmetic rearrangement
- * book index, strip white spaces around terms
- (fix uppercase first character where spaces used)
- * quote block, insert text indent markup, exclude book index
- * doc objects, layout group open & close identify is_for
- * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
+ * ao,
+ * code cosmetic rearrangement
+ * book index, strip white spaces around terms
+ (fix uppercase first character where spaces used)
+ * quote block, insert text indent markup, exclude book index
+ * doc objects, layout group open & close identify is_for
+ * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
-* code cosmetic rearrangement
- * ao*, param, hub, options, composite
+ * code cosmetic rearrangement
+ * ao*, param, hub, options, composite
-* sysenv, developer _CONSTRUCTION_ZONE warning modified
+ * sysenv, developer _CONSTRUCTION_ZONE warning modified
-* epub, a fix, double check
+ * epub, a fix, double check
-%% 6.0.8.orig.tar.xz (2014-06-19:24/4)
+** 6.0.8.orig.tar.xz (2014-06-19:24/4)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.8
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.8-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.8.orig.tar.xz
sisu_6.0.8.orig.tar.xz
- sisu_6.0.8-1.dsc
-
-* ao,
- * regex match for tics "```" followed by space tweaked
- * Symbol to match grouped text open & close (instead of String)
- * introduce way of removing unrecognized tic markers
- * syntax, able optionally to indicate the language syntax of a code block
- * syntax, introduce box text block/group
- * syntax, introduce tics quotes markup (blockquote equivalent)
- * turn id numbers (for tags) into a hash
- * code blocks, clean trailing newlines
- * misc, minorish
-
-* docbook,
- * ocn & footnote numbers (as xml comments)
- * metadata header (docinfo)
- * quotes (blockquote)
- * tables
- * images
- * code block
-
-* vim syntax, add
- * code block, language syntax, optional
- * box block
- * quote block
-
-%% 6.0.7.orig.tar.xz (2014-05-25:20/7)
+
+ * ao,
+ * regex match for tics "```" followed by space tweaked
+ * Symbol to match grouped text open & close (instead of String)
+ * introduce way of removing unrecognized tic markers
+ * syntax, able optionally to indicate the language syntax of a code block
+ * syntax, introduce box text block/group
+ * syntax, introduce tics quotes markup (blockquote equivalent)
+ * turn id numbers (for tags) into a hash
+ * code blocks, clean trailing newlines
+ * misc, minorish
+
+ * docbook,
+ * ocn & footnote numbers (as xml comments)
+ * metadata header (docinfo)
+ * quotes (blockquote)
+ * tables
+ * images
+ * code block
+
+ * vim syntax, add
+ * code block, language syntax, optional
+ * box block
+ * quote block
+
+** 6.0.7.orig.tar.xz (2014-05-25:20/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.7
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.7-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.7.orig.tar.xz
sisu_6.0.7.orig.tar.xz
- sisu_6.0.7-1.dsc
-%% 6.0.6.orig.tar.xz (2014-05-18:19/7)
+** 6.0.6.orig.tar.xz (2014-05-18:19/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.6
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.6-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.6.orig.tar.xz
sisu_6.0.6.orig.tar.xz
- sisu_6.0.6-1.dsc
-* db,
- * use symbols to identify sql engine
- * remove require 'dbi' (ruby-dbi)
- * for pg: require 'pg' (use ruby-pg directly)
- * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case]
+ * db,
+ * use symbols to identify sql engine
+ * remove require 'dbi' (ruby-dbi)
+ * for pg: require 'pg' (use ruby-pg directly)
+ * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the
+ case]
-* cgi, sample search form generator
- * remove require 'dbi' (ruby-dbi)
- * for pg: require 'pg' (use ruby-pg directly)
- * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
+ * cgi, sample search form generator
+ * remove require 'dbi' (ruby-dbi)
+ * for pg: require 'pg' (use ruby-pg directly)
+ * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
-%% 6.0.5.orig.tar.xz (2014-05-12:19/1)
+** 6.0.5.orig.tar.xz (2014-05-12:19/1)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.5
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.5-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
sisu_6.0.5.orig.tar.xz
- sisu_6.0.5-1.dsc
-* sisu, ensure return to start dir
+ * sisu, ensure return to start dir
-* ao, document structure check, stop processing on major error
- (with error message & text at location of failure)
+ * ao, document structure check, stop processing on major error
+ (with error message & text at location of failure)
-* ao_syntax, address possible manual use of url delimiters「」
+ * ao_syntax, address possible manual use of url delimiters「」
-* ao, heading with no ocn, distinguish ~# from -#
- * ~# is general & means no ocn (for any object to which it is applied)
- * -# is relevant only for 1~ dummy headings & instructs that they should be
- removed from output where possible, applied so far to pdf, odt & plaintext
+ * ao, heading with no ocn, distinguish ~# from -#
+ * ~# is general & means no ocn (for any object to which it is applied)
+ * -# is relevant only for 1~ dummy headings & instructs that they should be
+ removed from output where possible, applied so far to pdf, odt & plaintext
-* composite, fix includes, provide extra newline after inserted comment
- (Closes: #744360) "includes do not work properly"
+ * composite, fix includes, provide extra newline after inserted comment
+ (Closes: #744360) "includes do not work properly"
-* composite (inserts), missing includes doesn't give an error, fix
- (Closes: #744379) see sisu.org for comment
+ * composite (inserts), missing includes doesn't give an error, fix
+ (Closes: #744379) see sisu.org for comment
-* param, metadata add 'Copyright:' tag to output related to copyright
- (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
+ * param, metadata add 'Copyright:' tag to output related to copyright
+ (Closes: #744381) syntax: inconsistency \:copyright: and \:license:
-* param, remove trailing semicolon after :copyright:
- (Closes: #744358)
+ * param, remove trailing semicolon after :copyright:
+ (Closes: #744358)
-* metadata, pdf, remove link to manifest page where --no-manifest is used
- (Closes: #744378)
+ * metadata, pdf, remove link to manifest page where --no-manifest is used
+ (Closes: #744378)
-* digests, digests sha512 option implemented
- * options sha512 sha256 md5
- * command line --sha512
- * rcconf.yml ['defsault']['digest'] = sha512
- (Closes: #744402)
+ * digests, digests sha512 option implemented
+ * options sha512 sha256 md5
+ * command line --sha512
+ * rcconf.yml ['defsault']['digest'] = sha512
+ (Closes: #744402)
-* texpdf, (internal coding)
- * use symbols to identify page orientation
- * renaming related to fontface
+ * texpdf, (internal coding)
+ * use symbols to identify page orientation
+ * renaming related to fontface
-* texpdf, pdf colored hyperlinks configurable (cli & sisurc.yml)
- --pdf-hyperlinks-color │
- --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome │
- default:
- pdf_hyperlinks: 'color' │
- (other options switch hyperlink color off 'no-color' 'color-off' 'monochrome') │
- (Closes: #744391) no color on a4 portrait │
+ * texpdf, pdf colored hyperlinks configurable (cli & sisurc.yml)
+ --pdf-hyperlinks-color
+ --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome
+ default:
+ pdf_hyperlinks: 'color'
+ (other options switch hyperlink color off 'no-color' 'color-off'
+ 'monochrome')
+ (Closes: #744391) no color on a4 portrait
-* texpdf, headings and table of contents
+ * texpdf, headings and table of contents
-* texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions)
- --pdf-fontsize-12 --pdf-fontsize-8
- default:
- texpdf_fontsize: 12
- (Closes: #744405)
+ * texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions)
+ --pdf-fontsize-12 --pdf-fontsize-8
+ default:
+ texpdf_fontsize: 12
+ (Closes: #744405)
-* texpdf, for urls switch to sans serif (small fontsize),
- instead of typewriter, latex default
- (Closes: #744353)
+ * texpdf, for urls switch to sans serif (small fontsize),
+ instead of typewriter, latex default
+ (Closes: #744353)
-* texpdf, mailto markup links set for normal text objects
- (Closes: #744357) but testing required
+ * texpdf, mailto markup links set for normal text objects
+ (Closes: #744357) but testing required
-* texpdf, urls in creator cause breakage
- (Closes: #744541)
+ * texpdf, urls in creator cause breakage
+ (Closes: #744541)
-* texpdf, & in heading breaks toc, now & is removed from toc not heading,
- broken
+ * texpdf, & in heading breaks toc, now & is removed from toc not heading,
+ broken
-* added sisu.org emacs:evil:org mode notes related to sisu development
+ * added sisu.org emacs:evil:org mode notes related to sisu development
-%% 6.0.4.orig.tar.xz (2014-02-14:06/5)
+** 6.0.4.orig.tar.xz (2014-02-14:06/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.4
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.4-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.4.orig.tar.xz
sisu_6.0.4.orig.tar.xz
- sisu_6.0.4-1.dsc
-* ocn, object citation numbering
- * add perhaps less cryptic --numbering --no-numbering command-line options
- * plaintext & odt switch default to ocn==true for consistency
+ * ocn, object citation numbering
+ * add perhaps less cryptic --numbering --no-numbering command-line options
+ * plaintext & odt switch default to ocn==true for consistency
-%% 6.0.3.orig.tar.xz (2014-02-08:05/6)
+** 6.0.3.orig.tar.xz (2014-02-08:05/6)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.3
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.3-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.3.orig.tar.xz
sisu_6.0.3.orig.tar.xz
- sisu_6.0.3-1.dsc
-* cgi, search form (generator), using cgi ENV variables
+ * cgi, search form (generator), using cgi ENV variables
-* examples
- * nginx conf
- * cgi search forms pgsql & sqlite
+ * examples
+ * nginx conf
+ * cgi search forms pgsql & sqlite
-* documentation, minor update
+ * documentation, minor update
-%% 6.0.2.orig.tar.xz (2014-02-05:05/3)
+** 6.0.2.orig.tar.xz (2014-02-05:05/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.2
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.2-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.2.orig.tar.xz
sisu_6.0.2.orig.tar.xz
- sisu_6.0.2-1.dsc
-* ao, html book index linking, follow --strict option
+ * ao, html book index linking, follow --strict option
-* utils, code markers & messages, notes/warning/errors, fix
+ * utils, code markers & messages, notes/warning/errors, fix
-* sysenv, concordance redirected paths, watch
+ * sysenv, concordance redirected paths, watch
-* manual Rakefile, README & minor config adjustment
+ * manual Rakefile, README & minor config adjustment
-%% 6.0.1.orig.tar.xz (2014-02-05:05/3)
+** 6.0.1.orig.tar.xz (2014-02-05:05/3)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.1
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.1-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz
sisu_6.0.1.orig.tar.xz
- sisu_6.0.1-1.dsc
-* ao, document tags
+ * ao, document tags
-* options
- * --strict html option
- * ocn switch on/off instructions (& defaults for plaintext & odt)
+ * options
+ * --strict html option
+ * ocn switch on/off instructions (& defaults for plaintext & odt)
-* html cleaning
- * --strict html option
- (various changes, e.g. ocn [url]#37 only available as [url]#o37)
- * tags
- * endnote name and nameref (make compliant)
+ * html cleaning
+ * --strict html option
+ (various changes, e.g. ocn [url]#37 only available as [url]#o37)
+ * tags
+ * endnote name and nameref (make compliant)
-* epub
- * use same endnote name and nameref as introduced here for html
- * hash digests used only if availabile (availability check)
+ * epub
+ * use same endnote name and nameref as introduced here for html
+ * hash digests used only if availabile (availability check)
-* ocn turn on/off rules
- * txt
- * odt
+ * ocn turn on/off rules
+ * txt
+ * odt
-* cgi (pgsql, sqlite) fixes
+ * cgi (pgsql, sqlite) fixes
-* error/warn messages, including wrappers round require
+ * error/warn messages, including wrappers round require
-* documentation, manpage README etc.
- * sisu manual directory moved
- * sisu manual updated
- * README & sisu.1 (manpage) updated
- * removed html man pages (man2html)
+ * documentation, manpage README etc.
+ * sisu manual directory moved
+ * sisu manual updated
+ * README & sisu.1 (manpage) updated
+ * removed html man pages (man2html)
-%% 6.0.0.orig.tar.xz (2014-01-26:03/7)
+** 6.0.0.orig.tar.xz (2014-01-26:03/7)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.0
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.0-1
http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.0.orig.tar.xz
sisu_6.0.0.orig.tar.xz
- sisu_6.0.0-1.dsc
* v6 development branch opened
* v4 branch closed -(>4.2.20)-
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi b/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi
index 085229f1..c5f31d2a 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_download.ssi
@@ -44,13 +44,15 @@ For changelogs see http://www.jus.uio.no/sisu/SiSU/changelog.html
Git repository currently at:
-_* git clone git://git.sisudoc.org/git/code/sisu.git
-
-_* git clone _http://git.sisudoc.org/git/code/sisu.git
+_* git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
_* http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
-On using git, see
+To get the most recent source without repo history:
+
+_* git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+
+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
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
index 08c9ba02..97fdbd28 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_install_run.sst
@@ -19,26 +19,46 @@
:A~? SiSU Installation notes
-1~source_tarball Source tarball
+1~source_tree Source tree
2~ run off source package directory tree (without installing)
={ SiSU program:run off source package directory tree;SiSU:run off source package directory tree }
-1. Download the latest source
+Download & unpack the latest source tarball
-2. Unpack the source
+or
+
+Git clone the latest source, to clone the latest source without the repo history:
+
+``` code
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+```
Provided you have Ruby, SiSU can be run without installation straight from the source package directory tree. Run ruby against the full path to bin/sisu (in the unzipped source package directory tree)
Note however, that additional external package dependencies, such as texlive (for pdfs), sqlite3 or postgresql (for search) should you desire to use them are not taken care of for you.
-2~ Gem install (with rake)
+2~ Gem install
={ SiSU program:gem;SiSU:ruby gem }
Gem install, you need to:
(i) create the gemspec; (ii) build the gem (from the gemspec); (iii) install the gem
+3~ Gem install with qi (quick install) script
+
+(This requires that ruby-thor is installed).
+
+qi (quick install) can go through the steps required to install the gem:
+
+_1 qi gem --create --build --install --stable
+
+or
+
+_1 qi gem --create --build --install --unstable
+
+3~ Gem install with rake
+
Provided you have ruby & rake, this can be done with the single command:
_1 rake gem_create_build_install # (to build and install sisu v5 & sisu v6, alias gemcbi)
@@ -52,6 +72,16 @@ _1 rake gem_create_build_install_unstable # (to build and install sisu v6, alias
for individual steps (create, build, install) see rake options, rake -T
to specify sisu version for sisu installed via gem
+For a list of alternative actions you may type:
+
+_1 rake help
+
+_1 rake -T
+
+Rake: http://rake.rubyforge.org/ http://rubyforge.org/frs/?group_id=50
+
+3~ misc Gem
+
gem search sisu
_1 sisu _${sisu_stable}_ --version
@@ -62,15 +92,19 @@ to uninstall sisu installed via gem
_1 sudo gem uninstall --verbose sisu
-For a list of alternative actions you may type:
+2~ direct installation with qi (quick install) script
-_1 rake help
+(This requires that ruby-thor is installed).
-_1 rake -T
+Root will be requested as required:
-Rake: http://rake.rubyforge.org/ http://rubyforge.org/frs/?group_id=50
+_1 qi setup --bin --lib --conf --data --share --man
+
+or
+
+_1 qi setup --all
-Rant: http://make.rubyforge.org/ http://rubyforge.org/frs/?group_id=615
+You may wish to do a dryrun to see where files would be installed without copying them, to do so add the flag --dryrun
2~ installation with setup.rb
={ SiSU program:setup.rb;SiSU:setup.rb }
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
index 3a8ae570..43c161d1 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
@@ -1335,6 +1335,101 @@ code{
}code
+2~ Bibliography / References
+={ SiSU markup:references|bibliography|citations;references;book index }
+
+There are three ways to prepare a bibliography using sisu: (i) manually preparing and marking up as regular text in sisu a list of references; (ii) (tagging citations for inclusion) using a restricted form for citations and marking them up to identify them as such (which sisu then parses and attempts to build a bibliography from), or; (iii) preparing a bibliography, using metadata tags for author: title: year: and the like, including an id: and shortname: the id can be inserted in footnotes in place of the citation, and it will be substituted there by the short title for the work.
+
+For the heading/section sequence: endnotes, bibliography then book index to occur, the name biblio or bibliography must be given to the bibliography section, like so:
+
+code{
+
+1~biblio Bibliography
+
+}code
+
+3~ a markup tagged metadata bibliography section
+
+Here instead of writing your full citations directly in footnotes, each time you have new material to cite, you add it to your bibliography section (if it has not been added yet) providing the information you need against an available list of tags. At the time of writing, for articles: au|author; ti|title; lng|language; jo|journal; vo|volume; edr|editor; yr|year; pst|publisher_state; url; note; sn|shortname; id; and \\ for books: au|author; ti|title; st|subtitle; lng|language; pb|publisher; edn|edition; yr|year; pst|publisher_state; url; note; sn|shortname; id.
+
+The required tags are au: ti: and year: ~{for which you may alternatively use the full form author: title: and year: }~ an short quick example might be as follows:
+
+code{
+
+1~biblio Bibliography
+
+au: von Hippel, E.
+ti: Perspective: User Toolkits for Innovation
+lng: (language)
+jo: Journal of Product Innovation Management
+vo: 18
+edr: (editor)
+yr: 2001
+note:
+sn: Hippel, /{User Toolkits}/ (2001)
+id: vHippel_2001
+% form:
+
+au: Benkler, Yochai
+ti: The Wealth of Networks
+st: How Social Production Transforms Markets and Freedom
+lng: (language)
+pb: Harvard University Press
+edn: (edition)
+yr: 2006
+pst: U.S.
+url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+note:
+sn: Benkler, /{Wealth of Networks}/ (2006)
+id: Benkler2006
+
+au: Quixote, Don; Panza, Sancho
+ti: Taming Windmills, Keeping True
+jo: Imaginary Journal
+yr: 1605
+url: https://en.wikipedia.org/wiki/Don_Quixote
+note: made up to provide an example of author markup for an article with two authors
+sn: Quixote and Panza, /{Taming Windmills}/ (1605)
+id: quixote1605
+
+}code
+
+Note that the section name biblio (or bibliography) is required for the bibliography to be recognized as such, parsed correctly, and placed after the auto-generated endnote section.
+
+Using this method, work goes into preparing the bibliography, which will be automatically sorted by surname and presented, under the References or Bibliography section using the format for books:
+
+_1 number, author (firstname & initials, surname), fulltitle, publisher, year, url (if any)
+
+and for articles:
+
+_1 number, author (firstname & initials, surname), title, journal, volume, year, url (if any)
+
+The metadata tags may include shortname and id, if provided, every time the given id is found within the text it will be replaced by the given short title of the work (it is for this reason the short title has sisu markup to italicize the title), it should work with any page numbers to be added, the short title should be one that can easily be used to look up the full description in the bibliography.
+
+code{
+
+The following footnote~{ quixote1605, pp 1000 - 1001, also Benkler2006 p 1. }~
+
+}code
+
+would be presented as:
+
+Quixote and Panza, /{Taming Windmills}/ (1605), pp 1000 - 1001 also, Benkler, /{Wealth of Networks}/, (2006) p 1 or rather~{ Quixote and Panza, /{Taming Windmills}/ (1605), pp 1000 - 1001 also, Benkler, /{Wealth of Networks}/ (2006), p 1 }~
+
+3~ Tagging citations for inclusion in the Bibliography
+
+Here whenever you make a citation that you wish be included in the bibliography, you tag the citation as such using special delimiters (which are subsequently removed from the final text produced by sisu)
+
+Here you would write something like the following, either in regular text or a footnote
+
+code{
+
+See .: Quixote, Don; Panza, Sancho /{Taming Windmills, Keeping True}/ (1605) :.
+
+}code
+
+SiSU will parse for a number of patterns within the delimiters to try make out the authors, title, date etc. and from that create a Bibliography. This is more limited than the previously described method of preparing a tagged bibliography, and using an id within text to identify the work, which also lends itself to greater consistency.
+
2~ Book index
={ SiSU markup:book index;book index }
diff --git a/data/doc/sisu/markup-samples/manual/languages_source_and_targets b/data/doc/sisu/markup-samples/manual/languages_source_and_targets
new file mode 100644
index 00000000..a195adec
--- /dev/null
+++ b/data/doc/sisu/markup-samples/manual/languages_source_and_targets
@@ -0,0 +1,2 @@
+source: en
+target: de fr es ja ru zh
diff --git a/data/doc/sisu/markup-samples/manual/sisu_po4a b/data/doc/sisu/markup-samples/manual/sisu_po4a
new file mode 100755
index 00000000..fb79cde7
--- /dev/null
+++ b/data/doc/sisu/markup-samples/manual/sisu_po4a
@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+=begin
+
+** Description:
+
+** Homepage: <http://www.jus.uio.no/sisu/SiSU>
+ <http://search.sisudoc.org>
+** Download: <http://www.jus.uio.no/sisu/download>
+
+** Copyright: (C) 2007 - 2015 Ralph Amissah
+
+** License:
+
+** Ralph Amissah <ralph@amissah.com>
+ Ralph Amissah <ralph.amissah@gmail.com>
+
+=end
+#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
+begin
+ require 'thor'
+rescue LoadError
+ puts 'thor (package ruby-thor) not found'
+end
+#begin
+# require './setup/sisu_version' # ./setup/sisu_version.rb
+# include SiSUversion
+#rescue LoadError
+# puts 'this does not appear to be a SiSU development directory'
+# exit
+#end
+require_relative 'sisu_po4a_libs' # sisu_po4a_libs.rb
+require 'find'
+require 'fileutils'
+ include FileUtils
+require 'pathname'
+require 'rbconfig.rb'
+#require 'yaml'
+module SiSUconf
+ class LanguageCodes
+ def language_list
+ def codes
+ %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh]
+ end
+ def regex
+ codes.join('|')
+ end
+ self
+ end
+ end
+ class Configure < Thor
+ $SiSU_Language_Codes=LanguageCodes.new
+ @@source=@@targets=nil
+ include SiSU_Po4a_Actions
+ class_option :verbose, :type => :boolean
+# rake help clean default distclean make manpage readme rebuild
+ desc 'po4a',
+ 'place SiSU translations under po4a management' \
+ + 'assist with having sisu markup files managed by po4a' \
+ + 'create configuration files, and language directories and' \
+ + 'populate them with po4a pot & po files for translation and' \
+ + 'from those (as translated) create translated sisu markup' \
+ + '.ssm .sst & .ssi files in corresponding language sub-directories' \
+ + '*WARNING* creates, destroys, overrwrites directories not managed by po4a'
+ options \
+ :help => :boolean,
+ :clean => :boolean,
+ #:default => :boolean,
+ :distclean => :boolean,
+ :make => :boolean,
+ :lang_source => :string,
+ :lang_targets => :array,
+ :manpage => :boolean,
+ :readme => :boolean,
+ :rebuild => :boolean
+ def po4a
+ @@source=source=if options[:lang_source] \
+ and not options[:lang_source].empty?
+ options[:lang_source]
+ else nil
+ end
+ @@targets=targets=if options[:lang_targets]
+ options[:lang_targets]
+ else nil
+ end
+ language.translation_languages_selected(targets)
+ language.source_language_selected(source)
+ if options[:help]
+ notice.project_help
+ end
+ if options[:clean]
+ notice.default(:clean)
+ project.clean
+ end
+ #if options[:default]
+ # notice.project_help
+ #end
+ if options[:distclean]
+ notice.default(:distclean)
+ project.distclean
+ end
+ if options[:make]
+ notice.default(:make)
+ project.make
+ end
+ if options[:manpage]
+ generate.manpage
+ end
+ if options[:readme]
+ generate.readme
+ end
+ if options[:rebuild]
+ notice.default(:rebuild)
+ project.distclean
+ project.make
+ end
+ end
+ end
+end
+begin
+ $called_as,$argv=$0,$*
+ SiSUconf::Configure.start(ARGV)
+rescue
+end
+__END__
diff --git a/data/doc/sisu/markup-samples/manual/sisu_po4a_libs.rb b/data/doc/sisu/markup-samples/manual/sisu_po4a_libs.rb
new file mode 100644
index 00000000..47a0b065
--- /dev/null
+++ b/data/doc/sisu/markup-samples/manual/sisu_po4a_libs.rb
@@ -0,0 +1,439 @@
+module SiSU_Po4a_Actions
+ @@source=@@targets=nil
+ def project_details
+ def name
+ 'SiSU translations under po4a management'
+ end
+ def name_warning
+ <<-WOK
+#{name}
+
+WARNING all sisu markup files (.ssm, .sst, .ssi) in languages other than #{language.source_language_selected}
+are managed by po4a, through translations of the source language to other languages.
+
+#{language.info_on_selection}
+ WOK
+ end
+ def setup_project
+ "Setup file for placing #{name}"
+ end
+ self
+ end
+ def query
+ def selections_available_(selections=:strict)
+ short_options=(selections == :strict) ? '' : '; [ynqx]'
+ %{'yes', 'no', 'quit' or 'exit'#{short_options}}
+ end
+ def selection_options
+ def response_strict(resp)
+ case resp
+ when /^(?:yes)$/ then true
+ when /^(?:no)$/ then false
+ when /^(?:quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:strict)}]}
+ answer?('',:strict)
+ end
+ end
+ def response_short(resp)
+ case resp
+ when /^(?:y|yes)$/ then true
+ when /^(?:n|no)$/ then false
+ when /^(?:[qx]|quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:short)}]}
+ answer?('',:short)
+ end
+ end
+ self
+ end
+ def answer?(ask,selections=:strict)
+ resp='redo'
+ print ask + %{PROCEED? [#{selections_available_(selections)}]: }
+ resp=File.new('/dev/tty').gets.strip
+ (selections==:strict) \
+ ? selection_options.response_strict(resp)
+ : selection_options.response_short(resp)
+ end
+ self
+ end
+ def notice
+ def warn_and_proceed?
+ '*WARNING* this software module creates, destroys, overwrites directories' + "\n" \
+ + '*WARNING*: Use this Software at your own risk!'
+ end
+ def default(selection=nil)
+ selections=:strict #selections=:short
+ ans=if selection
+ case selection
+ when selection.is_a?(String)
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ when :make
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ selected (or configured) languages to be used
+ source language: #{language.source_language_available_str}
+ target languages: #{language.translation_languages_available.inspect}
+
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will create sub-directories for the
+ selected (or configured) target languages:
+ #{language.translation_languages_available.inspect}
+ & the po4a configuration file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ It will populate the sub-directories with translation files created from
+ the pot and po files found under the corresponding language
+ sub-directories, (under #{dir.pot}/ & #{dir.po}/).
+ (OVERWRITING any existing translated .ssm .sst .ssi files
+ in language subdirectories that are not under po4a management).
+
+ You should backup the current directory:
+ #{Dir.pwd}
+
+#{warn_and_proceed?}
+ WOK
+ when :clean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+#{warn_and_proceed?}
+ WOK
+ when :distclean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will remove the sub-directories (if they exist):
+ #{language.possible_translations.inspect}
+
+ #{language.translation_languages_available.inspect}
+ & file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ Note: these sub-directories & the config file #{filename.po4a_cfg}
+ should be auto-generated from pot and po files if this project translation
+ is under po4a management.
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ when :rebuild
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will destroy/clobber and then create again the
+ sub-directories:
+ #{language.translation_languages_available.inspect}
+ populating them with translation files created from the pot and po files
+ found under the corresponding language sub-directories in (#{dir.pot}/
+ & #{dir.po}/).
+ It will also generate the file: #{filename.po4a_cfg}
+ These actions will be taken in the current directory:
+ #{Dir.pwd}
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "install and to setup #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ exit unless query.answer?(ans)
+ end
+ def project_help
+ puts <<-WOK
+#{project_details.name}
+#{project_details.setup_project}
+
+This setup file is primarily to assist with having sisu markup files under po4a
+translation management. It assumes that the source language files are placed
+under the sub-directory identifying the source language set, which is currently
+#{language.source_language_selected}
+The files there are used to make the source translation file in the directory #{dir.pot}/
+Which is then used to create files for translation under the directory #{dir.po}/
+in sub-directories bearing the translation languages ISO code.
+
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+
+ WOK
+ end
+ self
+ end
+ def generate
+ def readme
+ system(%{ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm})
+ end
+ def manpage
+ system(%{ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm})
+ end
+ self
+ end
+ def filename
+ def languages_src_tgt
+ #'translation_languages'
+ 'languages_source_and_targets'
+ end
+ def po4a_cfg
+ 'po4a.cfg'
+ end
+ self
+ end
+ def dir
+ def pwd
+ Dir.pwd
+ end
+ def po4a_
+ 'po4a/' # ''
+ end
+ def pot
+ po4a_ + 'pot'
+ end
+ def po
+ po4a_ + 'po'
+ end
+ self
+ end
+ def dir_mk(dir)
+ FileUtils::mkdir_p(dir) unless FileTest.directory?(dir)
+ end
+ def po4a_flags
+ def debug
+ '-d -v'
+ end
+ def normal
+ ''
+ end
+ def quiet
+ '-q'
+ end
+ self
+ end
+ def languages_from_file
+ def language_source
+ if @@source.is_a?(String) \
+ and @@source =~ /w{2,4}/
+ else languages_extract_from_file
+ end
+ @@source
+ end
+ def language_targets
+ if @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ else languages_extract_from_file
+ end
+ @@targets
+ end
+ def languages_extract_from_file
+ if (@@source.is_a?(String) \
+ and @@source =~/\w{2,4}/) \
+ and (@@targets.is_a?(Array) \
+ and @@targets.length > 0)
+ else
+ if FileTest.file?(filename.languages_src_tgt)
+ puts 'file: "' + filename.languages_src_tgt + '" found and used (unless overridden)'
+ langs=IO.read(filename.languages_src_tgt, mode: 'r:utf-8').scan(/source:\s+\w+|target:\s+\w.+/)
+ langs.each do |sel|
+ case sel
+ when /source:/
+ source=sel.split(/source:\s*|\s+/).join
+ source=(source =~/\w{2,4}/) ? source : nil
+ @@source=unless @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ source
+ else @@source
+ end
+ when /target:/
+ @@targets=unless @@targets.is_a?(Array)
+ sel.split(/targets?:\s*|\s+/) - ['']
+ else @@targets
+ end
+ end
+ end
+ else puts 'no po target languages found' ; exit
+ end
+ end
+ end
+ self
+ end
+ def language
+ def source_language_selected(src=nil)
+ @@source=if not @@source.nil? \
+ and @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ @@source
+ elsif (src \
+ && src.is_a?(String) \
+ && src.length > 1)
+ src
+ else
+ src=languages_from_file.language_source
+ end
+ end
+ def translation_languages_selected(targets=nil) #translation_languages
+ @@targets=if not @@targets.nil? \
+ and @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ @@targets
+ elsif (targets \
+ && targets.is_a?(Array) \
+ && targets.length > 0)
+ targets
+ else
+ targets=languages_from_file.language_targets
+ end
+ end
+ def source_language_available
+ [source_language_selected] & sisu_languages_available
+ end
+ def translation_languages_available
+ translation_languages_selected & sisu_languages_available
+ end
+ def info_on_selection
+ if translation_languages_selected != translation_languages_available
+ <<-WOK
+WARNING: language selections mismatch
+
+The current language translation selection appears to be: #{translation_languages_selected_str}
+Of which the following are valid (available) selections: #{translation_languages_available_str}
+
+sisu available language list: #{sisu_languages_available_str}
+
+the following will be used: #{translation_languages_available_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+ WOK
+ else
+ <<-WOK
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+ WOK
+ end
+ end
+ def sisu_languages_available
+ $SiSU_Language_Codes.language_list.codes
+ end
+ def possible_translations
+ sisu_languages_available - [source_language_selected]
+ end
+ def translation_languages_selected_str
+ language.translation_languages_selected.join(' ')
+ end
+ def source_language_available_str
+ source_language_available.join
+ end
+ def translation_languages_available_str
+ language.translation_languages_available.join(' ')
+ end
+ def sisu_languages_available_str
+ language.sisu_languages_available.join(' ')
+ end
+ def posible_translations_str
+ language.posible_translations.join(' ')
+ end
+ self
+ end
+ def files_src
+ def ssm
+ Dir.glob("#{language.source_language_selected}/*.ssm").sort
+ end
+ def sst
+ Dir.glob("#{language.source_language_selected}/*.sst").sort
+ end
+ def ssi
+ Dir.glob("#{language.source_language_selected}/*.ssi").sort
+ end
+ def all
+ Dir.glob("#{language.source_language_selected}/*{.ssm,.sst,.ssi}").sort
+ end
+ self
+ end
+ def po4a_cfg_file
+ File.open("#{Dir.pwd}/#{filename.po4a_cfg}",'w')
+ end
+ def po4a_create
+ def configure #po4a_cfg
+ po4a_cfg_arr=[]
+ po4a_cfg_arr << "[po4a_langs] #{language.translation_languages_available_str}"
+ po4a_cfg_arr << "[po4a_paths] #{dir.pot}/$master.pot $lang:#{dir.po}/$lang/$master.po"
+ files_src.ssm.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.sst.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.ssi.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ file=po4a_cfg_file
+ po4a_cfg_arr.each do |txt|
+ puts txt
+ file << txt << "\n"
+ end
+ file.close
+ cmd='po4a --keep 0 ' \
+ + po4a_flags.normal + ' ' \
+ + filename.po4a_cfg
+ #cmd='po4a --keep 0 --no-backups --package-name ' \
+ #+ 'sisu-manual' + ' ' \
+ #+ po4a_flags.normal + ' ' \
+ #+ filename.po4a_cfg
+ system(cmd); puts cmd
+ end
+ self
+ end
+ def project
+ def make
+ dir_mk(dir.pot)
+ language.translation_languages_available.each do |lang_dir|
+ dir_lang="#{Dir.pwd}/#{dir.po}/#{lang_dir}"
+ dir_mk(dir_lang)
+ end
+ po4a_create.configure
+ end
+ def clean
+ #rm -f po/*/*.po~
+ #rm -rf ../build
+ FileUtils.rm_f Dir.glob("./#{dir.po}/*/*.po~")
+ end
+ def distclean
+ #rm -f po4a.cfg
+ #rm -rf $(LANGUAGES)
+ FileUtils::rm_f(filename.po4a_cfg)
+ FileUtils::rm_r(language.possible_translations,:force => true)
+ #FileUtils::rm_r(language.translation_languages_available,:force => true)
+ end
+ self
+ end
+end
+__END__
diff --git a/data/doc/sisu/markup-samples/manual/translation_languages b/data/doc/sisu/markup-samples/manual/translation_languages
deleted file mode 100644
index d84a94e8..00000000
--- a/data/doc/sisu/markup-samples/manual/translation_languages
+++ /dev/null
@@ -1 +0,0 @@
-de fr es ja ru zh
diff --git a/data/doc/sisu/org/bugs/sisu_bugs.org b/data/doc/sisu/org/bugs/sisu_bugs.org
new file mode 100644
index 00000000..0571e6d2
--- /dev/null
+++ b/data/doc/sisu/org/bugs/sisu_bugs.org
@@ -0,0 +1,403 @@
+#+PRIORITIES: A F E
+#+OPTIONS: ^:nil _:nil
+** bugs :bug:
+
+*** misc, unclassified
+
+**** TODO UNDERWAY (6.0.5) [#B] exclude heading where possible marker '-#' not distinguished from unnumbered heading '~#'
+
+ * ~# is general & means no ocn (for any object to which it is applied)
+ * -# is relevant only for 1~ dummy headings & instructs that they should be
+ removed from output where possible
+ * where -# is used on any other objects, it is treated the same way as ~#
+
+**** TODO [#B] collapsed level work out logic where dummy lev1 heading
+
+ * exclude heading where lev1 '-#'
+ * means subsequent headings & text belong to parent heading (of lev1 -#) 1 level up
+ * ponder
+
+*** DBT Outstanding bugs -- sisu caught by removal of ruby-dbi
+
+**** TODO ONGOING #746740 [n|u] manpages incomplete
+
+Date: Sat, 03 May 2014 08:45:49 +0200
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Subject: manpages incomplete
+Package: sisu
+Version: 5.3.4-1
+Tag: upstream
+Severity: normal
+
+sisu supports options like --verbose or --no-manifest, but they are not
+listed in the sisu manpage.
+
+***** NOTES/COMMENTS
+
+documentation for sisu does lag a bit and has omissions, but I think you will
+find that --verbose is documented, and --no-* options are listed under --exc-*
+to which there is a pointer --no-manifest works but is actually
+--no-links-to-manifest and is listed under aliases --exc-links-to-manifest and
+--exc-manifest-links
+
+Will leave bug open as a reminder that updating is necessary and as there are
+no doubt numerous issues for which this could be (re)opened
+
+**** TODO #746742 [n|u] please implement --no-metadata similar to --no-manifest
+
+Date: Sun, 13 Apr 2014 16:12:13 +0200
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Subject: --no-manifest not working anymore
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+
+when running sisu-pdf with --no-manifest, the output (pdf) still
+contains the sisu manifest at the end of the document.
+
+Regards,
+Daniel
+
+*** DBT Outstanding bugs -- Wishlist items; Unclassified (24 bugs) :debian:dbt:wishlist:
+
+**** TODO [#D] #744352 [w|u] sisu output: aligning margin numbers when using 'code'
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744352>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: 744352@bugs.debian.org
+Subject: Re: sisu output: too many margin numbers
+Date: Sun, 13 Apr 2014 17:27:10 +0200
+retitle 744352 sisu output: aligning margin numbers when using 'code'
+severity 744352 wishlist
+thanks
+
+sorry, i've looked wrongly at the output, the problem is simply an
+aligning issue. it looks like that:
+
+ foo bar. [1]
+ [2]
+ baz
+
+ foo bar baz. [3]
+
+rather than:
+
+ foo bar. [1]
+
+ baz [2]
+
+ foo bar baz. [3]
+
+Regards,
+Daniel
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: too many margin numbers
+Date: Sun, 13 Apr 2014 12:28:14 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+
+when using the following code:
+
+foo bar.
+
+code{
+
+ baz
+
+}code
+
+foo bar baz.
+
+the result in the output (pdf) is:
+
+foo bar. [1]
+ [2]
+baz [3]
+ [4]
+foo bar baz. [5]
+
+the '[n]' designates the margin number at the right site of the page.
+
+the problem is that sisu gives margin numbers to *empty* lines, which is
+wrong. margin numbers should only be assigned to actual content.
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+issue with pdf, look again, consider, this is cosmetic, a fix should be found,
+but is not striaghtforward alignment issue for code blocks not so easy to fix
+in some outputs, have so far ignored this is an issue with other types of text
+block as well
+
+reason why this has not been addressed especially with code blocks:
+the easiest fix would be to place the numbering at the end of the first line of
+a code block however, as it is now, if you copy & paste a block of code you
+should get the code if numbering is moved down to the first line, a copy of the
+code block will inlcude the extraneous (to the code) object number which is to
+my mind a bigger problem
+
+That said re pdf, LaTeX XeTeX are flexible, it may be possible to drop the ocn
+at the start of a code block lower on its line so that it is closer to the code
+that follows
+
+**** TODO [#C] #744354 [w|u] sisu output: please do not add '<' and '>' around urls
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: please do not add '<' and '>' around links
+Date: Sun, 13 Apr 2014 12:28:37 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+
+when using urls in sisu like this:
+
+ http://example.org
+
+sisu then creates in the output (pdf) links like this:
+
+ <http://example.org>
+
+Please do not automagically add a '<' and '>' around urls. If the user
+wants them, he would add one.
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+is sisu default behavior,
+would need to make configurable
+url_visual_delimiters: '<>'
+look into later
+
+
+**** TODO [#B] #744390 [w|u] sisu: empty sections are ignored
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744390>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu: empty sections are ignored
+Date: Sun, 13 Apr 2014 17:09:32 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+
+if you have the following sisu syntax:
+
+ :B~ foo
+
+ 1~ foo1
+
+ foo1.
+
+ 1~ foo2
+
+ foo2.
+
+ :B~ bar
+
+ 1~ bar1
+
+ 1~ bar2
+
+ :B~ baz
+
+ 1~ baz1
+
+ 1~ baz2
+
+then anything (including and) after ':B~ bar' is ignored entirely.
+
+***** NOTES/COMMENTS
+
+further info, have not yet been able to duplicate,
+seemed to work (checked pdf & html (scroll & seg))
+was not able to reproduce
+will look again
+
+**** TODO [#D] #744395 [w|u] sisu output: half-page title page in landscape output
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744395>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu output: half-page title page in landscape output
+Date: Sun, 13 Apr 2014 17:38:03 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+in a4 landscape output, there's always two pages on one page, which is
+nice; except for the title page which spans over the whole page.
+
+it would be nice if the first page would be consistent to the same
+scheme like the rest of the document - spanning only over the half of
+the page.
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+think about, should be fairly easily done, but am reluctant
+
+note the page numbering in landscape, the two landscape columns are given a single page number
+it is really a landscape two column per-page text, provided primarily for screen viewing or
+other convenience if found
+
+(many viewers provide two page per screen presentations, which would result in an effect similar to the one requested
+the issue I guess might arise in that they are not printable on a single page? ...
+but then the current settings are arguably justified)
+
+**** TODO [#C] #744396 [w|u] sisu output: "european" toc indenting
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744396>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu output: "european" toc indenting
+Date: Sun, 13 Apr 2014 17:40:53 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+by default, latex uses the following indenting in the TOC:
+
+ 1. foo
+ 1.1 bar1
+ 1.1.1 baz
+ 1.2 bar2
+
+there's a latex option that i don't remember off-hand to have the
+indenting like it's common in europe:
+
+ 1. foo
+ 1.1 bar1
+ 1.1.1 baz
+ 1.2 bar2
+
+it would be nice if sisu could let the used decide which indenting style
+to use for TOCs.
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+will look at: should be possible; requires a configuration option
+
+**** TODO [#C] #744407 [w|u] sisu: possibility to influence content/formating of the title page
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744407>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu: possibility to influence content/formating of the title page
+Date: Sun, 13 Apr 2014 18:32:14 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+by default, the title page (in the pdf output) shows @title and @creator.
+
+it would be nice if there would be a possibility to influence the
+formatting (e.g. to have the title written in bold), and to have
+additional possibilities to influence the content on the title page
+(like the date or version, an url, or other text strings).
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+consider, work on possibly, later
+
+**** TODO [#C] #744409 [w|u] sisu output: urls in code blocks are not linkified
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744409>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu output: urls in code blocks are not linkified
+Date: Sun, 13 Apr 2014 18:41:09 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+it would be nice if urls written withiin code{...}code blocks would also
+be automatically transformed into a link within the output (html).
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+consider, so far code blocks are pretty much untouched ... not tampered with,
+this could be done though
+
+**** TODO [#C] #744685 [w|u] sisu output: copy&past-able wrapped code blocks
+ <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744685>
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu output: copy&past-able wrapped code blocks
+Date: Sun, 13 Apr 2014 19:04:01 +0200
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+if a line within a 'code{...}code' block is longer and needs to be
+wrapped, sisu indicates the wrapping with an 'arrow' (←) symbol, which
+is nice.
+
+it would be even nicer if the arrow would not 'selectable', so that when
+you mark the line spanning over two lines with your mouse, the arrow is
+not selected and thus not copy&pasted.
+
+i don't know how to do this, but it's possible within pdfs, as can be
+seen in lots of pdfs in the internet.
+
+Regards,
+Daniel
+
+***** NOTES/COMMENTS
+
+find out how and implement, further feedback on appropriate xetex tools welcome
+
+[Note: if can be applied to random characters, use may be of interest for
+object numbers as well!]
+
+**** TODO [#C] #744734 [w|u] sisu output: replace all occurences of (C) rather than the first only
+
+From: Daniel Baumann <daniel.baumann@progress-technologies.net>
+To: Debian Bug Tracking System <submit@bugs.debian.org>
+Subject: sisu output: replace all occurences of (C) rather than the first only
+Date: Mon, 14 Apr 2014 06:11:13 +0200
+
+Package: sisu
+Version: 5.3.4-1
+Severity: wishlist
+Tags: upstream
+
+if you have a '(C)' in :copyright:, it is automatically replaced with a
+copyright symbol, which is nice, however, it sisu does that with the
+first occurence only.
+
+so if you use:
+
+ :copyright: (C) john doe<br />(C) jane doe
+
+then the second occurence is not replaced and that combination looks
+very ugly. i suggest you replace all occurences of '(C)' to the
+copyright symbol automatically.
+
+Regards,
+Daniel
+
diff --git a/data/doc/sisu/sisu-done.org b/data/doc/sisu/org/done/sisu-done.org
index f39fcee1..f39fcee1 100644
--- a/data/doc/sisu/sisu-done.org
+++ b/data/doc/sisu/org/done/sisu-done.org
diff --git a/data/doc/sisu/org/in_progress/sisu_asciidoc.org b/data/doc/sisu/org/in_progress/sisu_asciidoc.org
new file mode 100644
index 00000000..bd2ec738
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_asciidoc.org
@@ -0,0 +1,140 @@
+***** urls
+#% asciidoc
+<http://asciidoc.org/>
+<http://asciidoctor.org/>
+<http://www.methods.co.nz/asciidoc/>
+<http://en.wikipedia.org/wiki/AsciiDoc>
+
+cheatsheets
+<http://powerman.name/doc/asciidoc>
+<http://powerman.name/doc/asciidoc-index>
+
+<http://www.methods.co.nz/asciidoc/asciidoc.txt>
+<http://www.methods.co.nz/asciidoc/userguide.html>
+
+<http://www.methods.co.nz/asciidoc/asciidoc.css-embedded.html>
+<http://www.methods.co.nz/asciidoc/asciidoc.html>
+<http://www.methods.co.nz/asciidoc/chunked/index.html>
+
+***** rb file
+lib/sisu/v6/txt_asaciidoc.rb
+
+***** transformations :transformations:markup_asciidoc: #%
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-4) (decoration)
+ [] inline
+ '== '
+ '=== '
+ '==== '
+ '===== '
+ ''
+ ''
+ [] underscore
+ '-'
+ '~'
+ '^'
+ '+'
+ '' ['.' proposed]
+ '' ['.' proposed]
+ [] node (child, parent ...)
+
+#% font face
+ [open & close marks]
+ [] bold
+ '*'
+ [] italics
+ '_'
+ [] underscore
+ ''
+ [] superscript
+ '^'
+ [] subscript
+ '~'
+ [] strike
+ '-'
+ [] add
+ [] monospace
+ '+'
+ '`' pass markup through unchanged, monospace code
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+ [levels 1-6]
+ '*'
+ '**'
+ '***'
+ '****'
+ '*****'
+ '*******'
+ [] numbered list
+ [levels 1-3]
+ '. ' number
+ '.. ' lower alpha
+ '... ' lower roman
+ '.... ' upper alpha
+ '..... ' upper roman
+
+#% blocks
+ [] code
+ [source,perl]
+ ----
+ code here
+ ----
+ [] [type of markup if any]
+ [] poem
+ [] group
+ ----
+ grouped text here, actually a listing block
+ ----
+ [] alt
+ [] tables
+
+#% notes
+ [] footnotes
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ http://google.com[Google Search]
+ [] links - internal
+
+#% images [multimedia?]
+ [] images
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ [] index (book index)
+
+#% breaks
+ [] line break
+ "+\n"
+ forced +
+ line break
+ [] horizontal rule
+ [] column break
+ [] page break
+
+#% comment
+ [] comment
+ //
+
+#% misc
+
+ [] term & definition
+Term 1:: Definition 1
+Term 2:: Definition 2
+[horizontal]
+ Term 2.1;;
+ Definition 2.1
+ Term 2.2;;
+ Definition 2.2
+
diff --git a/data/doc/sisu/org/in_progress/sisu_docbook.org b/data/doc/sisu/org/in_progress/sisu_docbook.org
new file mode 100644
index 00000000..7b1ac29b
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_docbook.org
@@ -0,0 +1,77 @@
+***** urls
+#% docbook book xml.txt
+<http://www.docbook.org>
+<http://www.sagehill.net/docbookxsl/index.html>
+<http://wiki.docbook.org/>
+<http://www.docbook.org/tdg5/en/html/>
+<http://www.docbook.org/tdg5/en/html/docbook.html>
+<http://www.docbook.org/tdg5/en/html/ch01.html>
+<http://www.docbook.org/tdg5/en/html/ch02.html>
+<http://www.sagehill.net/docbookxsl/index.html>
+
+<http://www.docbook.org/schemas/5x>
+<http://www.docbook.org/xml/5.0/>
+
+<http://infohost.nmt.edu/tcc/help/pubs/docbook5/web/index.html>
+
+<http://docbook.org/xml/5.0/rng/docbook.rng>
+<http://docbook.org/xml/5.0/rng/docbook.rnc>
+
+<http://www.cuddletech.com/blog/pivot/entry.php?id=509>
+
+***** rb file
+lib/sisu/v6/xml_docbook5.rb
+
+***** transformations :transform:markup_docbook:
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-6) (decoration)
+ [] node (child, parent ...)
+
+#% font face
+ [] bold
+ [] italics
+ [] underscore
+ [] superscript
+ [] subscript
+ [] strike
+ [] add
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+
+#% blocks
+ <http://www.docbook.org/tdg5/en/html/literallayout.html>
+ [] code
+ [] [type of markup if any]
+ [] poem
+ [] group
+ [] alt
+ [] tables
+
+#% notes
+ [] footnotes
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ [] links - internal
+
+#% images [multimedia?]
+ [] images
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ <http://www.docbook.org/tdg5/en/html/toc.html>
+ [] index (book index)
+
+#% misc
+
diff --git a/data/doc/sisu/org/in_progress/sisu_fictionbook.org b/data/doc/sisu/org/in_progress/sisu_fictionbook.org
new file mode 100644
index 00000000..f689c30a
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_fictionbook.org
@@ -0,0 +1,86 @@
+
+<http://en.wikipedia.org/wiki/FictionBook>
+<http://fictionbook.org/index.php/Eng:FictionBook>
+<http://fictionbook.org/index.php/Eng:Articles>
+<http://fictionbook.org/index.php/Eng:Documentations>
+<http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1>
+<http://www.fictionbook.org/index.php/Eng:FictionBook>
+<http://fictionbook-lib.org/>
+<http://fictionbook-lib.org/browse.php>
+<http://wiki.mobileread.com/wiki/FB2>
+
+***** rb file
+lib/sisu/v6/xml_fictionbook2.rb
+
+***** transformations :transformations:markup_fictionbok: #%
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-6) (decoration)
+ [] node (child, parent ...)
+
+#% font face
+ [] bold
+ [] italics
+ [] underscore
+ [] superscript
+ [] subscript
+ [] strike
+ [] add
+ [] monospace
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+
+#% blocks
+ [] code
+ [] [type of markup if any]
+ [] poem
+ [] group
+ [] alt
+ [] tables
+
+#% notes
+ [] footnotes
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ [] links - internal
+
+#% images [multimedia?]
+ [] images
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ [] index (book index)
+
+#% breaks
+ [] line break
+ [] horizontal rule
+ [] column break
+ [] page break
+
+#% comment
+ [] comment
+
+#% misc
+
+<http://en.wikipedia.org/wiki/FictionBook>
+<http://fictionbook.org/index.php/Eng:FictionBook>
+<http://fictionbook.org/index.php/Eng:Articles>
+<http://fictionbook.org/index.php/Eng:Documentations>
+<http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1>
+<http://www.fictionbook.org/index.php/Eng:FictionBook>
+
+<http://www.fictionbook.org/index.php/%D0%9F%D1%80%D0%B8%D0%BC%D0%B5%D1%80_%D0%B4%D0%BE%D0%BA%D1%83%D0%BC%D0%B5%D0%BD%D1%82%D0%B0_%D0%B2_FB2>
+
+<https://addons.mozilla.org/en-US/firefox/addon/fb2-reader/>
+
diff --git a/data/doc/sisu/org/in_progress/sisu_markdown.org b/data/doc/sisu/org/in_progress/sisu_markdown.org
new file mode 100644
index 00000000..0171f236
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_markdown.org
@@ -0,0 +1,139 @@
+
+***** urls
+
+#% markdown
+<http://daringfireball.net/projects/markdown/>
+<http://daringfireball.net/projects/markdown/syntax>
+<http://daringfireball.net/projects/markdown/basics>
+<http://en.wikipedia.org/wiki/Markdown>
+<https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet>
+<http://whatismarkdown.com/>
+
+Markdown supports two styles of headers, Setext and atx
+Setext
+<http://docutils.sourceforge.net/mirror/setext.html>
+<http://en.wikipedia.org/wiki/Setext>
+atx
+<http://www.aaronsw.com/2002/atx/intro>
+
+<http://support.iawriter.com/help/kb/general-questions/markdown-syntax-reference-guide>
+<http://bywordapp.com/markdown/syntax.html>
+<http://stackoverflow.com/editing-help>
+
+<http://support.mashery.com/docs/customizing_your_portal/Markdown_Cheat_Sheet>
+<http://warpedvisions.org/projects/markdown-cheat-sheet.md>
+<http://nestacms.com/docs/creating-content/markdown-cheat-sheet>
+<https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet>
+
+<https://help.github.com/articles/github-flavored-markdown>
+<http://lifehacker.com/5943320/what-is-markdown-and-why-is-it-better-for-my-to+do-lists-and-notes>
+
+#% pandoc markdown
+<http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html>
+<http://johnmacfarlane.net/pandoc/README.html>
+<http://johnmacfarlane.net/pandoc/demo/example19/Pandoc_0027s-markdown.html>
+<http://johnmacfarlane.net/pandoc/>
+<http://johnmacfarlane.net/pandoc/epub.html>
+<http://johnmacfarlane.net/pandoc/faqs.html>
+
+#% multimarkdown
+<http://fletcher.github.io/peg-multimarkdown/>
+
+#% markdown pandoc v multimarkdown
+<https://github.com/jgm/pandoc/wiki/Pandoc-vs-Multimarkdown>
+
+#% rST v markdown
+<http://stackoverflow.com/questions/34276/markdown-versus-restructuredtext>
+
+***** rb file
+lib/sisu/v6/txt_markdown.rb
+
+***** transformations :transformations:markup_markdown: #%
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-6) (decoration)
+ [inline 1-5]
+ '#'
+ '##'
+ '###'
+ '####'
+ '#####'
+ '######'
+ [underscore 1-5]
+ '='
+ '-'
+ #'~'
+ #'^'
+ #'+'
+ [] node (child, parent ...)
+
+#% font face
+ [open & close marks]
+ [] bold
+ '**'
+ [] italics
+ '*'
+ [] underscore
+ ''
+ [] superscript
+ ''
+ [] subscript
+ ''
+ [] strike
+ ''
+ [] add
+ [] monospace
+ '`'
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+ '*'
+ [] numbered list
+ '0.'
+
+#% blocks
+ [] code
+ ' ' #indent at least 4 spaces
+ [] [type of markup if any]
+ [] poem
+ [] group
+ [] alt
+ [] tables
+
+#% notes
+ [] footnotes
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ [] links - internal
+
+#% images [multimedia?]
+ [] images
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ [] index (book index)
+
+#% breaks
+ [] line break
+ [] horizontal rule
+ (three or more asterisks hypens or underscores)
+ * * *
+ ***
+ *****
+ - - -
+ ___
+ [] column break
+ [] page break
+
+#% misc
+
diff --git a/data/doc/sisu/org/in_progress/sisu_rst.org b/data/doc/sisu/org/in_progress/sisu_rst.org
new file mode 100644
index 00000000..27a8ec25
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_rst.org
@@ -0,0 +1,236 @@
+
+***** urls
+#% rST
+<http://docutils.sourceforge.net/rst.html>
+<http://docutils.sourceforge.net/docs/user/rst/quickref.html>
+<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>
+<http://en.wikipedia.org/wiki/ReStructuredText>
+<http://sphinx-doc.org/rest.html>
+
+<http://stackoverflow.com/questions/2746692/restructuredtext-tool-support>
+
+#% rST v markdown
+<http://stackoverflow.com/questions/34276/markdown-versus-restructuredtext>
+
+***** rb file
+lib/sisu/v6/txt_rst.rb
+
+***** transformations :transformations:markup_rst: #%
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-6) (decoration)
+ [inline]
+ N/A
+ [underscore]
+ Titles are underlined (or over- and underlined) with a printing
+ nonalphanumeric 7-bit ASCII character. Recommended choices are
+ "= - ` : ' " ~ ^ _ * + # < >". The underline/overline must be at
+ least as long as the title text.
+ '='
+ '-'
+ '`'
+ ':'
+ "'"
+ '"'
+
+ [] node (child, parent ...)
+
+#% font face
+ [] bold
+ '**'
+ [] italics
+ '*'
+ [] underscore
+ '+'
+ [] superscript
+ '^'
+ [] subscript
+ [] strike
+ '-'
+ [] add
+ [] monospace
+ '``'
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+ "-", "*" or "+"
+ '-'
+ [] numbered list
+ '#.'
+
+#% blocks
+ [] code
+ [] [type of markup if any]
+ [] poem
+ [] group
+ [] alt
+ [] tables
+
+#% notes
+ [] footnotes
+ [binary]
+ Footnote references, like [5]_.
+ Note that footnotes may get
+ rearranged, e.g., to the bottom of
+ the "page".
+ .. [5] A numerical footnote.
+ --
+ Autonumbered footnotes are
+ possible, like using [#]_ and [#]_.
+ .. [#] This is the first one.
+ .. [#] This is the second one.
+
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ Typical result
+ External hyperlinks, like Python_.
+ .. _Python: <http://www.python.org/>
+ or
+ External hyperlinks, like `Python
+ <http://www.python.org/>`_.
+ [] links - internal
+ Internal crossreferences, like example_.
+ .. _example:
+
+ This is an example crossreference target.
+ --
+ Titles are targets, too
+ =======================
+ Implict references, like `Titles are
+ targets, too`_.
+
+#% images [multimedia?]
+ [] images
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ [] index (book index)
+
+#% breaks
+ [] line break
+ [] horizontal rule
+ [] column break
+ [] page break
+
+#% misc
+
+**** TODO [#F] textile :feature:
+
+***** urls
+#% textile
+<http://en.wikipedia.org/wiki/Textile_(markup_language)>
+v2.4
+<http://www.txstyle.org/>
+v2
+<http://redcloth.org/hobix.com/textile/>
+
+***** rb file
+lib/sisu/v6/txt_textile.rb
+
+***** transformations :transformations:markup_textile: #%
+#% structure - headings, levels
+ [] sisu (A-C, 1-3)
+ [] collapsed (1-6) (decoration)
+ [inline]
+ h1(#id). An HTML first-level heading
+ h2. An HTML second-level heading
+ h3. An HTML third-level heading
+ h4. An HTML fourth-level heading
+ h5. An HTML fifth-level heading
+ h6. An HTML sixth-level heading
+ [underscore]
+ N/A
+
+ [] node (child, parent ...)
+
+#% font face
+ [] bold
+ *bold text*
+ [] italics
+ _italic text_
+ [] underscore
+ +underlined text+
+ [] superscript
+ ^TM^
+ [] subscript
+ ~subscript~
+ [] strike
+ -strikethrough text-
+ [] add
+
+#% para
+ [] default
+ [] indent
+ [] default, all
+ [] first line hang or indent further
+ [] bullet
+ * bulleted list
+ ** 2-level
+
+#% blocks
+ [] code
+ [] [type of markup if any]
+ [] poem
+ [] group
+ [] alt
+ [] tables
+ |Table | with two columns |
+ |and two | rows |
+
+#% notes
+ [] footnotes
+ Text with a link to some reference[1]
+ fn1. Footnote explanation
+ [] [bibliography?]
+
+#% links, linking
+ [] links - external, web, url
+ "(classname)link text(title tooltip)":link_address
+ "Link to Wikipedia":http://www.wikipedia.org
+ [] links - internal
+
+#% images [multimedia?]
+ [] images
+ !http://commons.wikimedia.org/wiki/Special:Filepath/Wikipedia-logo-en.png!
+ !imageurl(alt text)!
+ [] [base 64]
+
+#% object numbers
+ [] ocn (object numbers)
+
+#% contents
+ [] toc (table of contents)
+ [] index (book index)
+
+#% breaks
+ [] line break
+ [] horizontal rule
+ [] column break
+ [] page break
+
+#% misc
+ [] *_bold italic text_*
+ [] *-bold strikethrough text-*
+ [] *_-bold italic strikethrough text-_*
+ [] *+bold underlined text+*
+ [] *_+italic underlined text+_
+ [] *_+bold italic underlined text+_
+ [] *_-+bold italic strikethrough underlined text+-_*
+ %{font-size:18pt}font size%
+ %{color:red}text in red%
+ # Chapter 1
+
+#% notes
+heading inline only
+footnotes uses marker and endnote, check
+
diff --git a/data/doc/sisu/org/in_progress/sisu_todo.org b/data/doc/sisu/org/in_progress/sisu_todo.org
new file mode 100644
index 00000000..2bec4987
--- /dev/null
+++ b/data/doc/sisu/org/in_progress/sisu_todo.org
@@ -0,0 +1,192 @@
+* things i want
+- vim style folds (setup like my .org mode like folds) working in both
+ - vim
+ - emacs
+- elastic search
+- outputs
+ - docbook
+ - asciidoc
+- odt to sisu form?
+- description of the focus of sisu as a smarttext, compared to
+ - asciidoc --> docbook;
+ - markdown --> natural writing, visually meaningful
+ - sisu --> identify document structure & objects
+* proposals/additions
+
+** TODO [#B] markup indicate objects language where other than document default
+at end of text object mark language from language code list (SiSU_is[:language_list_regex]) ~:ja
+
+to mark subsequent objects as being of a particular language ^:~(SiSU_is[:language_list_regex])$
+:~ja
+to return to language default ^:~-$
+:~-
+** TODO [#B] markup syntax code block, indicate syntax of code block :feature:
+``` code:ruby
+
+** TODO [#C] colored boxes round text :feature:ponder:
+ ``` box:red (select color of box)
+ ``` box:warn ``` box:tip (some default boxes? decide)
+ ``` box:red:"Warn" (select color and lead text of box, else instead
+ select color box & use regular single line bold markup ^!_ Warn$)
+
+** TODO [#D] blockquotes implement? :feature:ponder:
+ ``` quote
+ not sure how best to represent
+
+** TODO [#D] bibliography :feature:ponder:
+
+** TODO speaker, as e.g. play (irc?) :feature:ponder:
+ ``` Ophelia:
+ ::Ophelia
+
+** TODO [#F] time stamp (e.g. for irc, video text?):feature:ponder:
+ ``` 04:03
+ ``` 04:03 ... 07:12
+ ``` 04:03 + 03:09
+ ``` 12:04:03
+ ``` 12:04:03 ... 12:07:12
+ ``` 12:04:03 + 03:09
+ probably not worth the effort, as time stamp is an alternative
+ identifying number (to ocn, and ∴ sisu objects not ideal)
+
+** TODO book index, alternative based on search within text
+
+
+* Document Abstraction :sisu:doc_abstr:
+
+** TODO [#D] XML middle layer?
+
+*** XMLda sisu
+ consder alternative sisu layer in XML
+
+*** TODO [#D] RelaxNG sisu
+
+* Output :sisu:output:
+
+** New outputs to consider
+*** elasticsearch
+*** JSON for elasticsearch
+*** XML :xml:
+%% xml, docbook.txt fictionbook.txt xldl.txt lml.txt tei.txt emacs.txt
+<http://xml.silmaril.ie/>
+<http://www.xml.com/>
+<http://programming.oreilly.com/2012/08/shrinking-and-stretching-the-boundaries-of-markup.htmlhttp://programming.oreilly.com/2012/08/shrinking-and-stretching-the-boundaries-of-markup.html>
+
+<http://broadcast.oreilly.com/2012/03/xmls-dialect-problem.html>
+
+xml editor vim emacs
+<http://chimera.labs.oreilly.com/books/1234000000058/ch01.html#which_xml_editor_should_i_use>
+nXML plugin
+<http://blog.tommorris.org/post/2456183251/emacs-and-nxml-survival-guide>
+<http://johnbokma.com/mexit/2008/10/01/nxml-emacs-how-to.html>
+<http://www.emacswiki.org/cgi-bin/wiki/NxmlModeForXHTML>
+<http://www.xmlhack.com/read.php_item=2061>
+<http://infohost.nmt.edu/tcc/help/pubs/nxml/index.html>
+emacs.txt evil.txt
+
+<http://www.oreillynet.com/xml/blog/2005/10/smart_quotes_and_more_in_vim_a.html>
+<http://stackoverflow.com/questions/1430164/differences-between-emacs-and-vim>
+
+To validate a book.xml file using xmllint, run the following command:
+$ xmllint --postvalid --xinclude --noout book.xml
+
+The default location where xmllint will look for the catalog file is
+/etc/xml/catalog. Alternatively, you can set the environment variable
+XML_CATALOG_FILES to define another default location for catalog
+files. Once you’ve got the DTD and catalog set up locally, you can
+validate as before:
+$ xmllint --postvalid --xinclude --noout book.xml
+
+%% Docbook
+sisu_docbook.org
+
+%% Fictionbook
+sisu_fictionbook.org
+
+%% XLDL
+xldl.txt
+
+%% Literature Markup Language
+lml.txt
+
+%% Text Encoding Initiative
+tei.txt
+
+**** TODO [#B] docbook :feature:
+sisu_docbook.org
+
+**** TODO [#D] fictionbook :feature:
+
+***** urls
+
+**** TODO [#B] fictionbook :feature:
+sisu_fictionbook.org
+
+**** TODO [#D] XLDL :feature:
+
+***** urls
+%% xml.txt xldl - novels, stories, poems
+Name: XLDL - an XML doctype for novels, stories, poems, playsName: XLDL - an XML doctype for novels, stories, poems, plays
+<http://www.ister.org/code/xldl/>
+<http://www.ister.org/code/xldl/doc/xldl.dtd.html>
+<line> <stanza>
+
+**** TODO [#E] Literature Markup Language - <LML /> :feature:
+
+***** urls
+%% Literature Markup Language - <LML />
+<http://hoffmann.bplaced.net/lml/>
+"It is assumed, that there are three quite different techniques to provide text,
+respectively three types of text, this is prose and poetry and code (for
+example source code of computer programs or from markup languages)."
+Suggestions and Ideas for Literature Markup Language - <LML /> 1.1
+<http://hoffmann.bplaced.net/lml/lml1.1.php>
+
+**** TODO [#E] TEI Lite (Text Encoding Initiative) :feature:
+
+***** urls
+%% TEI Lite (Text Encoding Initiative)
+<http://www.tei-c.org/Guidelines/Customization/Lite/>
+<http://www.tei-c.org/release/doc/tei-p5-exemplars/html/tei_lite.doc.html>
+
+*** Text :txt:
+
+sisu_markup.txt asciidoc.txt markdown.txt textile.txt rst.txt
+
+**** TODO [#D] asciidoc :feature:
+sisu_asciidoc.org
+
+**** TODO [#E] markdown :feature:
+sisu_markdown.org
+
+**** TODO [#F] rst :feature:
+sisu_rst.org
+
+** Improvements
+
+*** HTML
+
+*** XML
+
+*** --strict mode (html w3c compliant ocn etc.)
+
+* Code (ruby) :sisu:code:
+
+** code enhancements :enhance:
+
+*** TODO [#D] directory & path, use ruby directory tools
+
+*** TODO [#D] document url shortcut, allow addition of alternative dir stub
+(e.g. viral Spiral)
+
+** code refactoring :refactor:
+
+*** ruby 2.1
+
+*** TODO [#C] refactor ruby :ongoing:
+
+* Reference versions
+** v5
+5.6.2
+5.6.1
+5.5.6 (5.5.5)
diff --git a/data/doc/sisu/org/sisu.org b/data/doc/sisu/org/sisu.org
new file mode 100644
index 00000000..fdcb3eaa
--- /dev/null
+++ b/data/doc/sisu/org/sisu.org
@@ -0,0 +1,853 @@
+#+PRIORITIES: A F E
+#+OPTIONS: ^:nil _:nil
+(emacs:evil mode gifts a "vim" of enticing "alternative" powers! ;)
+(vim, my _editor_ of choice also in the emacs environment :)
+
+* What is SiSU?
+
+Multiple output formats with a nod to the strengths of each output format and
+the ability to cite text easily across output formats.
+
+** debian/control desc
+
+documents - structuring, publishing in multiple formats and search
+ SiSU is a lightweight markup based, command line oriented, document
+ structuring, publishing and search, static content tool for document
+ collections.
+ .
+ With minimal preparation of a plain-text (UTF-8) file, using sisu 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. Think of being able to finely match text in documents, using
+ common object numbers, across different output formats and across languages if
+ you have translations of the same document. For search, your criteria is met
+ by these documents at these locations within each document (equally relevant
+ across different output formats and languages). To be clear (if obvious) page
+ numbers provide none of this functionality. 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 can also share provided semantic meta-data.
+ .
+ SiSU also provides concordance files, document content certificates and
+ manifests of generated output and the means to make book indexes that make use
+ of its object numbering.
+ .
+ Syntax highlighting and folding (outlining) files are provided for the Vim and
+ Emacs editors.
+ .
+ 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.
+ .
+ SiSU uses utf-8 & parses left to right. Currently supported languages:
+ am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it
+ ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta
+ te th tk tr uk ur us vi zh (see XeTeX polyglossia & cjk)
+ .
+ SiSU works well under po4a translation management, for which an administrative
+ sample Rakefile is provided with sisu_manual under markup-samples.
+
+** take two
+
+SiSU may be regarded as an open access document publishing platform, applicable
+to a modest but substantial domain of documents (typically law and literature,
+but also some forms of technical writing), that is tasked to address certain
+challenges I identified as being of interest to me over the years in open
+publishing.
+
+The idea and implementation may be of interest to consider as some of the
+issues encountered and that it seeks to address are known and common to such
+endeavors. Amongst them:
+
+ * how do you ensure what you do now can be read in decades?
+ * how do you keep up with new changing and technologies?
+ * do you select a canonical format to represent your documents, if so
+ what?
+ * how do you reliably cite (locate) material in different document
+ representations?
+ * how do you deal with multilingual texts?
+ * what of search?
+ * how are documents contributed to the collection?
+
+(these questions are selected in to help describe the direction of efforts with
+regard to sisu).
+
+My Dabblings in the Domain of Open Publishing
+---------------------------------------------
+
+The system is called SiSU, it is an offshoot of my early efforts at finding out
+what to make of the web, that started at the University of Tromsø in 1993 (an
+early law website Ananse/ International Trade Law Project / Lex Mercatoria). I
+have worked on SiSU continually since 1997 and it has been open source in 2005
+(under a license called GPL3+), though I remain its developer.
+
+In working in this field I have had to address some of the common issues.
+
+So how do you ensure what you do now can be read in decades to come? There are
+alternative solutions. (i) stick with a widely used and not overly complicated
+well document open standard, and for that the likes of odf is an excellent
+choice (ii) alternatively go for the most basic representation of a document
+that meets your needs, in my case based on UTF-8 text and some markup tags,
+fairly easily parsable by the human eye and as long as utf8 is in use it will
+always be possible to extract the information
+
+How do you keep up with new changing and technologies? Here my solution has
+been to generate new versions of the substantive content so as to always have
+the latest document representations available e.g. HTML has changed a lot over
+the years, different specifications come out for various formats including ODF,
+electronic readers have become an important viewing alternative, introducing
+the open reader format EPUB. Output representations are generated from source
+documents. Different open document file formats can be produced and databases
+and search engines populated. (The source documents and interpreter are all
+that are required to re-create site content. Source documents can be made
+public or retained privately). The strict separation of a simple source
+document from the output produced, means that with updates to SiSU (the
+interpreter/processor/generator), outputs can be updated technically as
+necessary, and new output formats added when needed. Amongst the output formats
+currently supported are HTML, LaTeX generated Pdfs (A4, letter, other;
+landscape, portrait), Epub, Open Document Format text. Returning to HTML as an
+example, it has changed a lot over the years I have worked with it, this way of
+working has meant it is possible to keep producing current versions of HTML,
+retaining the original substantive document... and new formats have been added
+as thought desired. There is no attempt to make output in different document
+formats/ representations look alike let alone identical. Rather the attempt is
+to optimize output for the particular document filetype, (there is no reason
+why an epub document would look or behave like an open document text or that a
+Pdf would look like HTML output; rather PDF is optimized for paper viewing,
+HTML for screen etc.) Wherever possible features associated with the
+particular output type are taken advantage of. This freedom is made possible to
+a large extent by the answer to the question that follows.
+
+How do you reliably cite (locate) material in different document
+representations? The traditional answer has been to have a canonical
+publication, and resulting fixed page numbers. This was not a viable solution
+for HTML (which changes from one viewer to another and with selectable font
+faces & size etc.); nor is it otherwise ideal in an electronic age with the
+possibility of presenting/interacting with material/documents in so many
+different ways. Why be so restricted? Here my solution has been "object
+citation numbering". What the various generated document formats have in
+common is a shared object numbering system that identifies the location of text
+and that is available for citation purposes. Object numbers are: sequential
+numbers assigned to each identified object in a document. Objects are logical
+units of text (or equivalent parts of a document), usually paragraphs, but also
+document headings, tables, images, in a poem a verse etc. [In an electronic
+publishing age are page numbers the best we can come up with? Change font
+type, font size, page orientation, paper size (sometimes even the viewer) and
+where are you with them? And paper though a favorite medium of mine is no
+longer the sole (or sometimes primary) means of interacting with documents/text
+or of sharing knowledge]
+
+What object numbers mean (unlike page numbers) is e.g.
+
+ * if you cite text in any format, the resulting output can be reliably located
+ in any other document format type. Cite HTML and the reader can choose to
+ view in Epub or Pdf (the PDFs being an independent output, generated by
+ book publishing software XeTeX/LaTeX).
+
+ * if you do a search, you can be given a result "index" indicating that your
+ search criteria is met by these documents, and at these specific locations
+ within each document, and the "index" is relevant not only for content
+ within the database, but for all document formats.
+
+ * if you have a translated text prepared for sisu, then your citations are
+ relevant across languages e.g. you can specify exactly where in a Chinese
+ document text is to be found.
+
+ * generated document index references & concordance list references etc. are
+ relevant across all output formats.
+
+What of search? For search, see the implications of object numbers for search
+mentioned above. The system currently loads an SQL server (Postgresql) with
+object sized text chunks. It could just as well populate an analytical engine
+with larger sections or chapters of text for analytical purposes (such as the
+currently popular Elasticsearch), whilst availing itself also of the concept of
+objects and object numbers in search results.
+
+How do you deal with multilingual texts? If you have translated text prepared
+for sisu, then your citations are relevant across languages. Object numbers
+also provide an easy way to compare, discuss text (translations) across
+languages. Text found/cited in one language has the same object number in its
+translations, a given paragraph will be the same in another language, just
+change the language code. (documents are prepared in UTF-8, current language
+restrictions are: through use of LaTeX tools, Polyglosia & CJK (Chinese,
+Japanese & Korean), and from the fact that sisu parses left to right)
+
+How are materials prepared for contribution to the collection? (a) The easiest
+solution if the system allows is for submission in the format in which work is
+authored, usually a word processor, for which odf may be a decent selection.
+(b) I have stuck with enhanced plaintext, UTF-8 with minimal markup. Source
+documents are prepared in UTF-8 text, with a minimalist native markup to
+indicate the document structure (headings and their relative levels),
+footnotes, and other document "features". This markup is easily parsable to the
+human eye, and plays well with version control systems. Documents are prepared
+in a text editor. Front ends such as markup assistants in a word processor that
+can save to sisu text format or other tool whist possible do not exist. [(c)
+yet another form of submission for collaborative work are wikis which have
+shown their strength in efforts such as Wikipedia.]
+
+The system has proven to be a good testing ground for ideas and is flexible and
+extensible. (things that could usefully be done: apart from a front end for
+simpler user interaction; feed text to an analytical search engine, like
+Elasticsearch/Lucene; it still needs a bibliography parser (auto-generation of
+a bibliography from footnotes); and it might be useful to allow rough auto
+translation documents on the fly by passing text through a translator (such as
+Google translate)).
+
+In any event, my resulting technical opinions (in my modest domain of
+action) may be regarded as encapsulated within SiSU
+[http://www.sisudoc.org/]
+
+http://www.sisudoc.org/
+http://www.jus.uio.no/sisu/
+
+git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+(there may be additional commits in the upstream branch)
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+
+git clone git://git.sisudoc.org/git/doc/sisu-markup-samples.git --branch upstream
+git clone --depth 1 git://git.sisudoc.org/git/doc/sisu-markup-samples.git --branch upstream
+Development work is on Linux and the easiest way to install it is through the
+Debian Linux package as this takes care of optional external dependencies such
+as XeTeX for PDF output and Postgresql or Sqlite for search.
+
+** multiple document formats
+
+Text can be represented in multiple output formats with different
+characteristics that are (or may be) regarded as strengths/advantages and
+therefore preferred in different contexts.
+
+Given the different strengths and characteristics of various output formats, it
+makes little sense to try too hard to make different representations of a
+document look the same. More interesting is have document representations that
+take advantage of each given outputs strengths. As valuable if not more so is
+the ability to cite, find, discuss text with ease, across the different output
+formats.
+
+For citation across output formats, SiSU uses object citation numbers.
+
+** document structure and document objects
+
+SiSU breaks marked up text into document structure and objects
+
+Document structure being the document heading hierarchy (having separated out
+the document header).
+
+*** What are document objects?
+An object is an identified meaningful unit of a document, most commonly a
+paragraph of text, but also for example a table, code block, verse or image.
+
+SiSU tracks these substantive document units as document objects (and their
+relationship to the document structure).
+
+** object citation numbers
+
+*** What are object citation numbers?
+
+An object citation number is a sequential number assigned to a document object.
+
+In sisu output documents share this common object numbering system (dubbed
+"object citation numbering" (ocn)) that is meaningful (machine & human readable)
+across various digital outputs whether paper, screen, or database oriented,
+(PDF, html, XML, EPUB, sqlite, postgresql), and across multilingual content if
+prepared appropriately. This numbering system can be used to reference content
+across output types.
+
+*** Why might I want object citation numbering?
+
+The ability to cite and quickly locate text can be invaluable if not essential.
+ (whether for instruction or discussion).
+
+In this digital & Internet age we have multiple ways to represent documents and
+multiple document output formats as options with different characteristics,
+strengths/advantages etc. We need a way to cite text that works and is relevant
+independent of the document format used.
+
+I want to discuss (cite) html text how do I do this?
+how do I refer to / cite / discuss text in html?
+Issue: html may be viewed online or printed, it is not tied to paper (as
+e.g. pdf) and prints differently depending on selected font face and font size.
+
+I want to discuss (cite) text that is available in multiple formats (e.g. pdf,
+epub, html) without having to worry about the output format that is referred
+to.
+How do I refer to / discuss text that is available in more than one format,
+uncertain of what format is preferred, used or available to my colleagues?
+e.g. html and epub or pdf have rather different text representations, how do I
+discuss ...
+
+I would like to have a book index that is relevant (can be used) across multiple
+output formats (e.g. pdf, epub, html)
+
+How do I make a book index (or a concordance file) that works across multiple
+output formats?
+
+I would like to have search results indicating where in a document matches are
+found and I would like it to be relevant across available output formats (e.g.
+pdf, epub, html)
+How do I get search results for locations of text within each relevant document
+
+I would like to be able to discuss a text that has been translated ...
+how do I find text across languages?
+Where I have a nicely translated document, how do I point to or discuss with my
+foreign language counterpart some detail of the text, or, how do I point my
+foreign language counterpart to the text I would like to bring to his
+attention.
+
+** "Granular" Search
+
+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 serialize
+html, LaTeX, XML, SQL, (whatever) is also inherent in / incidental to the
+design.
+
+** Summary
+SiSU information Structuring Universe
+Structured information, Serialized Units <www.sisudoc.org> or
+<www.jus.uio.no/sisu/> software for electronic texts, document collections,
+books, digital libraries, and search, with "atomic search" and text positioning
+system (shared text citation numbering: "ocn")
+outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX,
+PDF, SQL (PostgreSQL and SQLite)
+
+** SiSU Short Description
+
+SiSU is a comprehensive future-resilient 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-resilient 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.
+
+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.
+
+SiSU is an Open Source project initiated and led by Ralph Amissah
+<ralph.amissah@gmail.com> and can be contacted via mailing list
+<http://lists.sisudoc.org/listinfo/sisu> at <sisu@lists.sisudoc.org>. SiSU is
+licensed under the GNU General Public License.
+
+*** notes
+
+For less markup than the most elementary HTML you can have more. SiSU -
+Structured information, Serialized Units for electronic documents, is an
+information structuring, transforming, publishing and search framework with the
+following features:
+
+(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,
+
+ * 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 output formats, including amongst others: plaintext (UTF-8);
+html; (structured) XML; ODF (Open Document text); EPUB; LaTeX; PDF (via LaTeX);
+SQL type databases (currently PostgreSQL and SQLite). SiSU 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, XML,
+EPUB, 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: (a) the
+document and each object within it stamped with an sha256 hash making it
+possible to easily check or guarantee that the substantive content of a document
+is unchanged, (b) version control, documents integrated with time based source
+control system, default RCS or CVS with use of $Id$ tag, which SiSU checks
+
+(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-resilience, output representations are
+"upgradeable", and new document formats may be added.
+
+(xv) there is a considerable degree of future-resilience, 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, 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 (ext3, Reiserfs, XFS,
+whatever) 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, 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.
+
+as a developers tool it is flexible and extensible
+
+** description
+
+SiSU ("SiSU information Structuring Universe" or "Structured information,
+Serialized Units"),1 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, LaTeX or PDF files, and populate an SQL database with objects2
+(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. 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,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).
+
+1. also chosen for the meaning of the Finnish term "sisu".
+
+2 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.
+
+More information on SiSU provided at: <www.sisudoc.org/sisu/SiSU>
+
+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.
+
+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.
+
+<ralph@amissah.com>
+<ralph.amissah@gmail.com>
+<sisu@lists.sisudoc.org>
+<http://lists.sisudoc.org/listinfo/sisu>
+2010
+w3 since October 3 1993
+* Finding SiSU
+** source
+http://git.sisudoc.org/gitweb/
+
+*** sisu
+sisu git repo:
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+
+**** most recent source without repo history
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+**** full clone
+git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
+
+*** sisu-markup-samples git repo:
+http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary
+
+** mailing list
+sisu at lists.sisudoc.org
+http://lists.sisudoc.org/listinfo/sisu
+
+** irc oftc #sisu
+
+** home pages
+ <http://www.sisudoc.org/>
+ <http://search.sisudoc.org/>
+ <http://www.jus.uio.no/sisu>
+
+* Installation
+
+** where you take responsibility for having the correct dependencies
+
+Provided you have *Ruby*, *SiSU* can be run.
+
+SiSU should be run from the directory containing your sisu marked up document
+set.
+
+This works fine so long as you already have sisu external dependencies in
+place. For many operations such as html, epub, odt this is likely to be fine.
+Note however, that additional external package dependencies, such as texlive
+(for pdfs), sqlite3 or postgresql (for search) should you desire to use them
+are not taken care of for you.
+
+*** run off the source tarball without installation
+
+RUN OFF SOURCE PACKAGE DIRECTORY TREE (WITHOUT INSTALLING)
+..........................................................
+
+**** 1. Obtain the latest sisu source
+
+using git:
+
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log
+
+ git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
+ git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+
+or, identify latest available source:
+
+https://packages.debian.org/sid/sisu
+http://packages.qa.debian.org/s/sisu.html
+http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+
+http://sisudoc.org/sisu/archive/pool/main/s/sisu/
+
+and download the:
+
+ sisu_5.4.5.orig.tar.xz
+
+using debian tool dget:
+
+The dget tool is included within the devscripts package
+https://packages.debian.org/search?keywords=devscripts
+to install dget install devscripts:
+
+ apt-get install devscripts
+
+and then you can get it from Debian:
+ dget -xu http://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc
+
+or off sisu repos
+ dget -x http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+or
+ dget -x http://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+
+**** 2. Unpack the source
+
+Provided you have *Ruby*, *SiSU* can be run without installation straight from
+the source package directory tree.
+
+Run ruby against the full path to bin/sisu (in the unzipped source package
+directory tree). SiSU should be run from the directory containing your sisu
+marked up document set.
+
+ ruby ~/sisu-5.4.5/bin/sisu --html -v document_name.sst
+
+This works fine so long as you already have sisu external dependencies in
+place. For many operations such as html, epub, odt this is likely to be fine.
+Note however, that additional external package dependencies, such as texlive
+(for pdfs), sqlite3 or postgresql (for search) should you desire to use them
+are not taken care of for you.
+
+*** gem install (with rake)
+
+(i) create the gemspec; (ii) build the gem (from the gemspec); (iii) install
+the gem
+
+Provided you have ruby & rake, this can be done with the single command:
+
+ rake gem_create_build_install
+
+to build and install sisu v5 & sisu v6, alias gemcbi
+
+separate gems are made/installed for sisu v5 & sisu v6 contained in source.
+
+to build and install sisu v5, alias gem5cbi:
+
+ rake gem_create_build_install_stable
+
+to build and install sisu v6, alias gem6cbi:
+
+ rake gem_create_build_install_unstable
+
+for individual steps (create, build, install) see rake options, rake -T to
+specify sisu version for sisu installed via gem
+
+ gem search sisu
+
+ sisu _5.4.5_ --version
+
+ sisu _6.0.11_ --version
+
+to uninstall sisu installed via gem
+
+ sudo gem uninstall --verbose sisu
+
+For a list of alternative actions you may type:
+
+ rake help
+
+ rake -T
+
+Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
+
+*** installation with setup.rb
+
+this is a three step process, in the root directory of the unpacked *SiSU* as
+root type:
+
+ruby setup.rb config
+ruby setup.rb setup
+#[as root:]
+ruby setup.rb install
+
+further information:
+<http://i.loveruby.net/en/projects/setup/>
+<http://i.loveruby.net/en/projects/setup/doc/usage.html>
+
+ ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install
+
+** Debian install
+
+*SiSU* is available off the *Debian* archives. It should necessary only to run
+as root, Using apt-get:
+
+ apt-get update
+
+ apt get install sisu-complete
+
+(all sisu dependencies should be taken care of)
+
+If there are newer versions of *SiSU* upstream, they will be available by
+adding the following to your sources list /etc/apt/sources.list
+
+#/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
+
+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.
+
+*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:
+
+ *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
+
+ *sisu-complete*, a dummy package that installs the whole of greater sisu as
+ described below, apart from sisu -examples
+
+ *sisu-pdf*, dependencies used by sisu to produce pdf from /LaTeX/ generated
+
+ *sisu-postgresql*, dependencies used by sisu to populate postgresql database
+ (further configuration is necessary)
+
+ *sisu-sqlite*, dependencies used by sisu to populate sqlite database
+
+ *sisu-markup-samples*, sisu markup samples and other miscellany (under
+ *Debian* Free Software Guidelines non-free)
+
+ *SiSU* is available off Debian Unstable and Testing [link:
+ <http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
+ [^1] install it using apt-get, aptitude or alternative *Debian* install tools.
+
+** Arch Linux
+
+* sisu markup :sisu:markup:
+
+** sisu markup
+
+#% structure - headings, levels
+ * headings (A-D, 1-3)
+ * inline
+ 'A~ ' NOTE title level
+ 'B~ ' NOTE optional
+ 'C~ ' NOTE optional
+ 'D~ ' NOTE optional
+ '1~ ' NOTE chapter level
+ '2~ ' NOTE optional
+ '3~ ' NOTE optional
+ '4~ ' NOTE optional :consider:
+ * node
+ * parent
+ * children
+
+#% font face NOTE open & close marks, inline within paragraph
+ * emphasize '*{ ... }*' NOTE configure whether bold italics or underscore, default bold
+ * bold '!{ ... }!'
+ * italics '/{ ... }/'
+ * underscore '_{ ... }_'
+ * superscript '^{ ... }^'
+ * subscript ',{ ... },'
+ * strike '-{ ... }-'
+ * add '+{ ... }+'
+ * monospace '#{ ... }#'
+#% para NOTE paragraph controls are at the start of a paragraph
+ * a para is a block of text separated from others by an empty line
+ * indent
+ * default, all '_1 ' up to '_9 '
+ * first line hang '_1_0 '
+ * first line indent further '_0_1 '
+ * bullet
+ [levels 1-6]
+ '_* '
+ '_1* '
+ '_2* '
+ * numbered list
+ [levels 1-3]
+ '# '
+
+#% blocks NOTE text blocks that are not to be treated in the way that ordinary paragraphs would be
+ * code
+ * [type of markup if any]
+ * poem
+ * group
+ * alt
+ * tables
+#% boxes
+ NOTE grouped text with code block type color & possibly default image, warning, tip, red, blue etc. decide [NB N/A not implemented]
+
+#% notes NOTE inline within paragraph at the location where the note reference is to occur
+ * footnotes '~{ ... }~'
+ * [bibliography] [NB N/A not implemented]
+
+#% links, linking
+ * links - external, web, url
+ * links - internal
+
+#% images [multimedia?]
+ * images
+ * [base64 inline] [N/A not implemented]
+
+#% object numbers
+ * ocn (object numbers)
+ automatically attributed to substantive objects, paragraphs, tables, blocks, verse (unless exclude marker provided)
+
+#% contents
+ * toc (table of contents)
+ autogenerated from structure/headings information
+ * index (book index)
+ built from hints in newline text following a paragraph and starting with ={} has identifying rules for main and subsidiary text
+
+#% breaks
+ * line break ' \\ ' inline
+ * page break, column break ' -\\- ' start of line, breaks a column, starts a new column, if using columns, else breaks the page, starts a new page.
+ * page break, page new ' =\\= ' start of line, breaks the page, starts a new page.
+ * horizontal '-..-' start of line, rule page (break) line across page (dividing paragraphs)
+
+#% book type index
+
+#% comment
+ * comment
+
+#% misc
+ * term & definition
+
+** syntax hilighting
+
+*** vim
+data/sisu/conf/editor-syntax-etc/vim/
+data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+
+*** emacs
+data/sisu/conf/editor-syntax-etc/emacs/
+data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
+
+* todo
+sisu_todo.org
diff --git a/data/doc/sisu/org/sisu_packaging.org b/data/doc/sisu/org/sisu_packaging.org
new file mode 100644
index 00000000..3ef53fe7
--- /dev/null
+++ b/data/doc/sisu/org/sisu_packaging.org
@@ -0,0 +1,269 @@
+#+OPTIONS: ^:nil _:nil
+Developer Notes, Dependencies
+
+* description
+** short summary: 80 chars
+smart text parser for document structuring, multiple format publishing & search
+** longer
+ 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 sisu markup
+ syntax in a text editor of your 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. Think being able to finely match
+ text in documents, using object numbers, across different output formats (and
+ across languages if you have translations of the same document). Search results
+ can be an index of documents and object numbers within them, your criteria is
+ met by these documents at these locations within each document (equally
+ relevant across different output formats and languages). To be clear (if
+ obvious) page numbers provide none of this functionality. 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 can also share provided
+ semantic meta-data.
+ .
+ SiSU also provides concordance files, document content certificates and
+ manifests of generated output. SiSU provides the means to make book indexes
+ that make use of its object numbering.
+ .
+ A vim syntax highlighting file and an ftplugin with folds for sisu markup is
+ provided. Vim 7 includes syntax highlighting for SiSU. Some syntax hilighting
+ is also available for Emacs and a few other editors.
+ .
+ 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.
+ .
+ SiSU uses utf-8 & parses left to right. Currently supported languages:
+ am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it
+ ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta
+ te th tk tr uk ur us vi zh (see XeTeX polyglossia & cjk)
+ .
+ SiSU works well under po4a translation management, for which an administrative
+ sample Rakefile is provided with sisu_manual under markup-samples.
+* Generic Dependencies
+** source
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream
+*** full source
+git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream
+
+** an install method
+
+$ qi setup --bin --lib --share --dryrun
+$ sudo ./qi setup --bin --lib --share
+
+$ qi setup --bin --lib --share --conf --data --dryrun
+$ sudo ./qi setup --bin --lib --share --conf --data
+
+$ qi setup --all --dryrun
+$ sudo ./qi setup --all dryrun
+
+** minimal
+ needed for
+----------------------
+ruby all, provides outputs text, html
+xz sisupod
+zip unzip epub & odt
+
+*** images
+imagemagick | graphicsmagick
+ruby-rmagick ?
+
+** special requirements
+
+*** pdf
+
+texlive
+texlive-cjk
+texlive-fonts ?
+texlive-latex ?
+
+.sty (texpdf_format.rb)
+
+alltt.sty
+amssymb.sty
+babel.sty
+boites.sty
+color.sty
+endnotes.sty
+fancyhdr.sty
+fontspec.sty
+footmisc.sty
+graphicx.sty
+inputenc.sty
+listings.sty
+longtable.sty
+manyfoot.sty
+multicol.sty
+parskip.sty
+polyglossia.sty
+soul.sty
+textcomp.sty
+thumbpdf.sty
+titlepic.sty
+ucs.sty
+ulem.sty
+url.sty
+xetex.sty
+xltxtra.sty
+xunicode.sty
+
+*** sql db
+**** sqlite3
+
+sqlite3
+ruby-sqlite3
+
+ruby-fcgi (fast-cgi)
+httpd
+
+**** postgresql
+
+postgresql
+ruby-pg
+
+ruby-fcgi (fast-cgi)
+httpd
+
+*** qr codes
+
+qrencode
+
+*** maintenance/installation
+ruby-thor | rake
+
+ruby-thor
+rake
+
+* Debian Dependencies
+
+** source
+git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch debian/sid
+
+** debian/control (extract)
+
+Package: sisu
+Depends: ${misc:Depends}, ruby | ruby-interpreter, rsync, unzip, zip, xz-utils
+Recommends:
+ sisu-pdf, sisu-sqlite, sisu-postgresql, imagemagick | graphicsmagick, keychain,
+ openssh-client | lsh-client, openssl, po4a, qrencode, rake, ruby-rmagick,
+ ruby-thor, tidy, tree, vim-addon-manager
+Suggests: sisu-markup-samples, lv, calibre, pinfo, poedit, texinfo, trang
+
+Package: sisu-complete
+Depends:
+ ${misc:Depends}, sisu (= ${source:Version}), sisu-pdf (= ${source:Version}),
+ sisu-postgresql (= ${source:Version}), sisu-sqlite (= ${source:Version}),
+ imagemagick | graphicsmagick, openssl, qrencode, ruby-thor, tree
+Suggests: sisu-markup-samples
+
+Package: sisu-pdf
+Depends:
+ ${misc:Depends}, sisu (= ${source:Version}),
+ texlive-latex-base, texlive-fonts-recommended, texlive-generic-recommended,
+ texlive-latex-recommended, texlive-latex-extra, texlive-math-extra,
+ texlive-xetex, fonts-liberation, lmodern, latex-cjk-all, texlive-lang-cjk
+Suggests: evince | pdf-viewer
+
+Package: sisu-postgresql
+Depends:
+ ${misc:Depends}, sisu (= ${source:Version}),
+ postgresql, ruby-pg, ruby-fcgi | libfcgi-ruby
+Suggests: fcgiwrap, httpd, postgresql-contrib
+
+Package: sisu-sqlite
+Depends:
+ ${misc:Depends}, sisu (= ${source:Version}),
+ sqlite3, ruby-sqlite3, ruby-fcgi | libfcgi-ruby
+Suggests: fcgiwrap, httpd
+
+* Arch Linux Dependencies
+
+** source
+
+sisu-git
+
+full clone is more than is needed, so is limiting the branch
+
+git clone --branch upstream git://git.sisudoc.org/git/code/sisu.git
+
+try get a shallow clone that contains the last tag for git describe source version info
+
+git clone --depth 1 --branch upstream git://git.sisudoc.org/git/code/sisu.git
+git clone --depth 1 --branch archlinux git://git.sisudoc.org/git/code/sisu.git
+
+git clone --depth 1 --no-single-branch --branch upstream \
+ git://git.sisudoc.org/git/code/sisu.git
+
+*** git describe, source version
+git describe --long --tags | sed 's/^sisu_//;s/\([^-]*-g\)/r\1/;s/-/./g'
+git describe --long --tags | sed 's/^[a-z_-]\+//;s/\([^-]*-g\)/r\1/;s/-/./g'
+git describe --long --tags | \
+ sed 's/^[a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'
+
+needs more than a shallow clone of depth 1
+
+** pacman install
+
+sudo pacman -S ruby \
+ zip unzip xy
+
+sudo pacman -S ruby \
+ texlive-core texlive-latexextra texlive-fontsextra texlive-langcjk
+
+sudo pacman -S ruby \
+ sqlite postgresql
+
+# issue with ruby-pg ruby-sqlite ruby-fcgi
+
+** interpreter
+ ruby
+
+** compression tools (epub, odf:odt, sisupod)
+ zip unzip
+ xy
+
+** texlive (pdf)
+sudo pacman -S texlive-core texlive-latexextra
+sudo pacman -S texlive-core texlive-latexextra texlive-fontsextra texlive-langcjk
+
+texlive-core extra/texlive-core
+texlive-fontsextra extra/texlive-fontsextra
+texlive-langcjk extra/texlive-langcjk
+
+*** .sty (called from texpdf_format.rb)
+alltt.sty extra/texlive-core
+amssymb.sty extra/texlive-core
+babel.sty extra/texlive-core
+boites.sty extra/texlive-latexextra
+color.sty extra/texlive-core
+endnotes.sty extra/texlive-latexextra
+fancyhdr.sty extra/texlive-core
+fontspec.sty extra/texlive-core
+footmisc.sty extra/texlive-latexextra
+graphicx.sty extra/texlive-core
+inputenc.sty extra/texlive-core
+listings.sty extra/texlive-core
+longtable.sty extra/texlive-core
+manyfoot.sty extra/texlive-latexextra
+multicol.sty extra/texlive-core
+parskip.sty extra/texlive-core
+polyglossia.sty extra/texlive-core
+soul.sty extra/texlive-latexextra
+textcomp.sty extra/texlive-core
+thumbpdf.sty extra/texlive-core
+titlepic.sty extra/texlive-latexextra
+ucs.sty extra/texlive-latexextra
+ulem.sty extra/texlive-core
+url.sty extra/texlive-core
+xetex.sty ??
+xltxtra.sty extra/texlive-core
+xunicode.sty extra/texlive-core
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
deleted file mode 100644
index a5f8dbdc..00000000
--- a/data/doc/sisu/sisu.org
+++ /dev/null
@@ -1,1546 +0,0 @@
-#+PRIORITIES: A F E
-(emacs:evil mode gifts a "vim" of "alternative" powers! ;)
-
-* General
-** Finding
-*** source
-
-http://git.sisudoc.org/gitweb/
-
-sisu git repo:
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
-
-sisu-markup-samples git repo:
-http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary
-
-*** mailing list
-sisu at lists.sisudoc.org
-
-http://lists.sisudoc.org/listinfo/sisu
-
-** irc oftc sisu
-
-** home pages
- * <http://www.sisudoc.org/>
- * <http://search.sisudoc.org/>
- * <http://www.jus.uio.no/sisu>
-
-** Installing sisu
-
-*** where you take responsibility for having the correct dependencies
-
-Provided you have *Ruby*, *SiSU* can be run.
-
-SiSU should be run from the directory containing your sisu marked up document
-set.
-
-This works fine so long as you already have sisu external dependencies in
-place. For many operations such as html, epub, odt this is likely to be fine.
-Note however, that additional external package dependencies, such as texlive
-(for pdfs), sqlite3 or postgresql (for search) should you desire to use them
-are not taken care of for you.
-
-**** run off the source tarball without installation
-
-RUN OFF SOURCE PACKAGE DIRECTORY TREE (WITHOUT INSTALLING)
-..........................................................
-
-***** 1. Obtain the latest sisu source
-
-using git:
-
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log
-
- git clone git://git.sisudoc.org/git/code/sisu.git
-
-or, identify latest available source:
-
-https://packages.debian.org/sid/sisu
-http://packages.qa.debian.org/s/sisu.html
-http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
-
-http://sisudoc.org/sisu/archive/pool/main/s/sisu/
-
-and download the:
-
- sisu_5.4.5.orig.tar.xz
-
-using debian tool dget:
-
-The dget tool is included within the devscripts package
-https://packages.debian.org/search?keywords=devscripts
-to install dget install devscripts:
-
- apt-get install devscripts
-
-and then you can get it from Debian:
- dget -xu http://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc
-
-or off sisu repos
- dget -x http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
-or
- dget -x http://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
-
-***** 2. Unpack the source
-
-Provided you have *Ruby*, *SiSU* can be run without installation straight from
-the source package directory tree.
-
-Run ruby against the full path to bin/sisu (in the unzipped source package
-directory tree). SiSU should be run from the directory containing your sisu
-marked up document set.
-
- ruby ~/sisu-5.4.5/bin/sisu --html -v document_name.sst
-
-This works fine so long as you already have sisu external dependencies in
-place. For many operations such as html, epub, odt this is likely to be fine.
-Note however, that additional external package dependencies, such as texlive
-(for pdfs), sqlite3 or postgresql (for search) should you desire to use them
-are not taken care of for you.
-
-**** gem install (with rake)
-
-(i) create the gemspec; (ii) build the gem (from the gemspec); (iii) install
-the gem
-
-Provided you have ruby & rake, this can be done with the single command:
-
- rake gem_create_build_install
-
-to build and install sisu v5 & sisu v6, alias gemcbi
-
-separate gems are made/installed for sisu v5 & sisu v6 contained in source.
-
-to build and install sisu v5, alias gem5cbi:
-
- rake gem_create_build_install_stable
-
-to build and install sisu v6, alias gem6cbi:
-
- rake gem_create_build_install_unstable
-
-for individual steps (create, build, install) see rake options, rake -T to
-specify sisu version for sisu installed via gem
-
- gem search sisu
-
- sisu _5.4.5_ --version
-
- sisu _6.0.11_ --version
-
-to uninstall sisu installed via gem
-
- sudo gem uninstall --verbose sisu
-
-For a list of alternative actions you may type:
-
- rake help
-
- rake -T
-
-Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50>
-
-**** installation with setup.rb
-
-this is a three step process, in the root directory of the unpacked *SiSU* as
-root type:
-
-ruby setup.rb config
-ruby setup.rb setup
-#[as root:]
-ruby setup.rb install
-
-further information:
-<http://i.loveruby.net/en/projects/setup/>
-<http://i.loveruby.net/en/projects/setup/doc/usage.html>
-
- ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install
-
-*** Debian install
-
-*SiSU* is available off the *Debian* archives. It should necessary only to run
-as root, Using apt-get:
-
- apt-get update
-
- apt get install sisu-complete
-
-(all sisu dependencies should be taken care of)
-
-If there are newer versions of *SiSU* upstream, they will be available by
-adding the following to your sources list /etc/apt/sources.list
-
-#/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
-
-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.
-
-*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:
-
- *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
-
- *sisu-complete*, a dummy package that installs the whole of greater sisu as
- described below, apart from sisu -examples
-
- *sisu-pdf*, dependencies used by sisu to produce pdf from /LaTeX/ generated
-
- *sisu-postgresql*, dependencies used by sisu to populate postgresql database
- (further configuration is necessary)
-
- *sisu-sqlite*, dependencies used by sisu to populate sqlite database
-
- *sisu-markup-samples*, sisu markup samples and other miscellany (under
- *Debian* Free Software Guidelines non-free)
-
- *SiSU* is available off Debian Unstable and Testing [link:
- <http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>]
- [^1] install it using apt-get, aptitude or alternative *Debian* install tools.
-
-* Markup :sisu:markup:
-
-** sisu
-
-#% structure - headings, levels
- * headings (A-D, 1-3)
- * inline
- 'A~ ' NOTE title level
- 'B~ ' NOTE optional
- 'C~ ' NOTE optional
- 'D~ ' NOTE optional
- '1~ ' NOTE chapter level
- '2~ ' NOTE optional
- '3~ ' NOTE optional
- '4~ ' NOTE optional :consider:
- * node
- * parent
- * children
-
-#% font face NOTE open & close marks, inline within paragraph
- * emphasize '*{ ... }*' NOTE configure whether bold italics or underscore, default bold
- * bold '!{ ... }!'
- * italics '/{ ... }/'
- * underscore '_{ ... }_'
- * superscript '^{ ... }^'
- * subscript ',{ ... },'
- * strike '-{ ... }-'
- * add '+{ ... }+'
- * monospace '#{ ... }#'
-#% para NOTE paragraph controls are at the start of a paragraph
- * a para is a block of text separated from others by an empty line
- * indent
- * default, all '_1 ' up to '_9 '
- * first line hang '_1_0 '
- * first line indent further '_0_1 '
- * bullet
- [levels 1-6]
- '_* '
- '_1* '
- '_2* '
- * numbered list
- [levels 1-3]
- '# '
-
-#% blocks NOTE text blocks that are not to be treated in the way that ordinary paragraphs would be
- * code
- * [type of markup if any]
- * poem
- * group
- * alt
- * tables
-#% boxes
- NOTE grouped text with code block type color & possibly default image, warning, tip, red, blue etc. decide [NB N/A not implemented]
-
-#% notes NOTE inline within paragraph at the location where the note reference is to occur
- * footnotes '~{ ... }~'
- * [bibliography] [NB N/A not implemented]
-
-#% links, linking
- * links - external, web, url
- * links - internal
-
-#% images [multimedia?]
- * images
- * [base64 inline] [N/A not implemented]
-
-#% object numbers
- * ocn (object numbers)
- automatically attributed to substantive objects, paragraphs, tables, blocks, verse (unless exclude marker provided)
-
-#% contents
- * toc (table of contents)
- autogenerated from structure/headings information
- * index (book index)
- built from hints in newline text following a paragraph and starting with ={} has identifying rules for main and subsidiary text
-
-#% breaks
- * line break ' \\ ' inline
- * page break, column break ' -\\- ' start of line, breaks a column, starts a new column, if using columns, else breaks the page, starts a new page.
- * page break, page new ' =\\= ' start of line, breaks the page, starts a new page.
- * horizontal '-..-' start of line, rule page (break) line across page (dividing paragraphs)
-
-#% book type index
-
-#% comment
- * comment
-
-#% misc
- * term & definition
-
-** proposals/additions
-
-*** TODO [#B] markup syntax code block, indicate syntax of code :feature:
- ``` code:ruby
-
-*** TODO [#C] colored boxes round text :feature:ponder:
- ``` box:red (select color of box)
- ``` box:warn ``` box:tip (some default boxes? decide)
- ``` box:red:"Warn" (select color and lead text of box, else instead
- select color box & use regular single line bold markup ^!_ Warn$)
-
-*** TODO [#D] blockquotes implement? :feature:ponder:
- ``` quote
- not sure how best to represent
-
-*** TODO [#D] bibliography :feature:ponder:
-
-*** TODO speaker, as e.g. play (irc?) :feature:ponder:
- ``` Ophelia:
- ::Ophelia
-
-*** TODO [#F] time stamp (e.g. for irc, video text?):feature:ponder:
- ``` 04:03
- ``` 04:03 ... 07:12
- ``` 04:03 + 03:09
- ``` 12:04:03
- ``` 12:04:03 ... 12:07:12
- ``` 12:04:03 + 03:09
- probably not worth the effort, as time stamp is an alternative
- identifying number (to ocn, and ∴ sisu objects not ideal)
-
-*** TODO book index, alternative based on search within text
-
-** syntax hilighting
-
-*** vim
-data/sisu/conf/editor-syntax-etc/vim/
-data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
-
-*** emacs
-data/sisu/conf/editor-syntax-etc/emacs/
-data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
-
-* Document Abstraction :sisu:doc_abstr:
-
-** TODO [#D] XML middle layer?
-
-*** XMLda sisu
- consder alternative sisu layer in XML
-
-*** TODO [#D] RelaxNG sisu
-
-* Output :sisu:output:
-
-** New outputs to consider
-
-*** XML :xml:
-%% xml, docbook.txt fictionbook.txt xldl.txt lml.txt tei.txt emacs.txt
-<http://xml.silmaril.ie/>
-<http://www.xml.com/>
-<http://programming.oreilly.com/2012/08/shrinking-and-stretching-the-boundaries-of-markup.htmlhttp://programming.oreilly.com/2012/08/shrinking-and-stretching-the-boundaries-of-markup.html>
-
-<http://broadcast.oreilly.com/2012/03/xmls-dialect-problem.html>
-
-xml editor vim emacs
-<http://chimera.labs.oreilly.com/books/1234000000058/ch01.html#which_xml_editor_should_i_use>
-nXML plugin
-<http://blog.tommorris.org/post/2456183251/emacs-and-nxml-survival-guide>
-<http://johnbokma.com/mexit/2008/10/01/nxml-emacs-how-to.html>
-<http://www.emacswiki.org/cgi-bin/wiki/NxmlModeForXHTML>
-<http://www.xmlhack.com/read.php_item=2061>
-<http://infohost.nmt.edu/tcc/help/pubs/nxml/index.html>
-emacs.txt evil.txt
-
-<http://www.oreillynet.com/xml/blog/2005/10/smart_quotes_and_more_in_vim_a.html>
-<http://stackoverflow.com/questions/1430164/differences-between-emacs-and-vim>
-
-To validate a book.xml file using xmllint, run the following command:
-$ xmllint --postvalid --xinclude --noout book.xml
-
-The default location where xmllint will look for the catalog file is
-/etc/xml/catalog. Alternatively, you can set the environment variable
-XML_CATALOG_FILES to define another default location for catalog
-files. Once you’ve got the DTD and catalog set up locally, you can
-validate as before:
-$ xmllint --postvalid --xinclude --noout book.xml
-
-%% Docbook
-docbook.txt
-
-%% Fictionbook
-fictionbook.txt
-
-%% XLDL
-xldl.txt
-
-%% Literature Markup Language
-lml.txt
-
-%% Text Encoding Initiative
-tei.txt
-
-**** TODO [#B] docbook :feature:
-
-***** urls
-#% docbook book xml.txt
-<http://www.docbook.org>
-<http://www.sagehill.net/docbookxsl/index.html>
-<http://wiki.docbook.org/>
-<http://www.docbook.org/tdg5/en/html/>
-<http://www.docbook.org/tdg5/en/html/docbook.html>
-<http://www.docbook.org/tdg5/en/html/ch01.html>
-<http://www.docbook.org/tdg5/en/html/ch02.html>
-<http://www.sagehill.net/docbookxsl/index.html>
-
-<http://www.docbook.org/schemas/5x>
-<http://www.docbook.org/xml/5.0/>
-
-<http://infohost.nmt.edu/tcc/help/pubs/docbook5/web/index.html>
-
-<http://docbook.org/xml/5.0/rng/docbook.rng>
-<http://docbook.org/xml/5.0/rng/docbook.rnc>
-
-<http://www.cuddletech.com/blog/pivot/entry.php?id=509>
-
-***** rb file
-lib/sisu/v6/xml_docbook5.rb
-
-***** transformations :transform:markup_docbook:
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-6) (decoration)
- [] node (child, parent ...)
-
-#% font face
- [] bold
- [] italics
- [] underscore
- [] superscript
- [] subscript
- [] strike
- [] add
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
-
-#% blocks
- <http://www.docbook.org/tdg5/en/html/literallayout.html>
- [] code
- [] [type of markup if any]
- [] poem
- [] group
- [] alt
- [] tables
-
-#% notes
- [] footnotes
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- [] links - internal
-
-#% images [multimedia?]
- [] images
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- <http://www.docbook.org/tdg5/en/html/toc.html>
- [] index (book index)
-
-#% misc
-
-**** TODO [#D] fictionbook :feature:
-
-***** urls
-#% fictionbook xml.txt
-<http://en.wikipedia.org/wiki/FictionBook>
-<http://fictionbook.org/index.php/Eng:FictionBook>
-<http://fictionbook.org/index.php/Eng:Articles>
-<http://fictionbook.org/index.php/Eng:Documentations>
-<http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1>
-<http://www.fictionbook.org/index.php/Eng:FictionBook>
-<http://fictionbook-lib.org/>
-<http://fictionbook-lib.org/browse.php>
-<http://wiki.mobileread.com/wiki/FB2>
-
-***** rb file
-lib/sisu/v6/xml_fictionbook2.rb
-
-***** transformations :transformations:markup_fictionbok: #%
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-6) (decoration)
- [] node (child, parent ...)
-
-#% font face
- [] bold
- [] italics
- [] underscore
- [] superscript
- [] subscript
- [] strike
- [] add
- [] monospace
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
-
-#% blocks
- [] code
- [] [type of markup if any]
- [] poem
- [] group
- [] alt
- [] tables
-
-#% notes
- [] footnotes
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- [] links - internal
-
-#% images [multimedia?]
- [] images
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- [] index (book index)
-
-#% breaks
- [] line break
- [] horizontal rule
- [] column break
- [] page break
-
-#% comment
- [] comment
-
-#% misc
-
-<http://en.wikipedia.org/wiki/FictionBook>
-<http://fictionbook.org/index.php/Eng:FictionBook>
-<http://fictionbook.org/index.php/Eng:Articles>
-<http://fictionbook.org/index.php/Eng:Documentations>
-<http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1>
-<http://www.fictionbook.org/index.php/Eng:FictionBook>
-
-<http://www.fictionbook.org/index.php/%D0%9F%D1%80%D0%B8%D0%BC%D0%B5%D1%80_%D0%B4%D0%BE%D0%BA%D1%83%D0%BC%D0%B5%D0%BD%D1%82%D0%B0_%D0%B2_FB2>
-
-<https://addons.mozilla.org/en-US/firefox/addon/fb2-reader/>
-
-**** TODO [#D] XLDL :feature:
-
-***** urls
-%% xml.txt xldl - novels, stories, poems
-Name: XLDL - an XML doctype for novels, stories, poems, playsName: XLDL - an XML doctype for novels, stories, poems, plays
-<http://www.ister.org/code/xldl/>
-<http://www.ister.org/code/xldl/doc/xldl.dtd.html>
-<line> <stanza>
-
-**** TODO [#E] Literature Markup Language - <LML /> :feature:
-
-***** urls
-%% Literature Markup Language - <LML />
-<http://hoffmann.bplaced.net/lml/>
-"It is assumed, that there are three quite different techniques to provide text,
-respectively three types of text, this is prose and poetry and code (for
-example source code of computer programs or from markup languages)."
-Suggestions and Ideas for Literature Markup Language - <LML /> 1.1
-<http://hoffmann.bplaced.net/lml/lml1.1.php>
-
-**** TODO [#E] TEI Lite (Text Encoding Initiative) :feature:
-
-***** urls
-%% TEI Lite (Text Encoding Initiative)
-<http://www.tei-c.org/Guidelines/Customization/Lite/>
-<http://www.tei-c.org/release/doc/tei-p5-exemplars/html/tei_lite.doc.html>
-
-*** Text :txt:
-
-sisu_markup.txt asciidoc.txt markdown.txt textile.txt rst.txt
-
-**** TODO [#D] asciidoc :feature:
-
-***** urls
-#% asciidoc
-<http://asciidoc.org/>
-<http://asciidoctor.org/>
-<http://www.methods.co.nz/asciidoc/>
-<http://en.wikipedia.org/wiki/AsciiDoc>
-
-cheatsheets
-<http://powerman.name/doc/asciidoc>
-<http://powerman.name/doc/asciidoc-index>
-
-<http://www.methods.co.nz/asciidoc/asciidoc.txt>
-<http://www.methods.co.nz/asciidoc/userguide.html>
-
-<http://www.methods.co.nz/asciidoc/asciidoc.css-embedded.html>
-<http://www.methods.co.nz/asciidoc/asciidoc.html>
-<http://www.methods.co.nz/asciidoc/chunked/index.html>
-
-***** rb file
-lib/sisu/v6/txt_asaciidoc.rb
-
-***** transformations :transformations:markup_asciidoc: #%
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-4) (decoration)
- [] inline
- '== '
- '=== '
- '==== '
- '===== '
- ''
- ''
- [] underscore
- '-'
- '~'
- '^'
- '+'
- '' ['.' proposed]
- '' ['.' proposed]
- [] node (child, parent ...)
-
-#% font face
- [open & close marks]
- [] bold
- '*'
- [] italics
- '_'
- [] underscore
- ''
- [] superscript
- '^'
- [] subscript
- '~'
- [] strike
- '-'
- [] add
- [] monospace
- '+'
- '`' pass markup through unchanged, monospace code
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
- [levels 1-6]
- '*'
- '**'
- '***'
- '****'
- '*****'
- '*******'
- [] numbered list
- [levels 1-3]
- '. ' number
- '.. ' lower alpha
- '... ' lower roman
- '.... ' upper alpha
- '..... ' upper roman
-
-#% blocks
- [] code
- [source,perl]
- ----
- code here
- ----
- [] [type of markup if any]
- [] poem
- [] group
- ----
- grouped text here, actually a listing block
- ----
- [] alt
- [] tables
-
-#% notes
- [] footnotes
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- http://google.com[Google Search]
- [] links - internal
-
-#% images [multimedia?]
- [] images
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- [] index (book index)
-
-#% breaks
- [] line break
- "+\n"
- forced +
- line break
- [] horizontal rule
- [] column break
- [] page break
-
-#% comment
- [] comment
- //
-
-#% misc
-
- [] term & definition
-Term 1:: Definition 1
-Term 2:: Definition 2
-[horizontal]
- Term 2.1;;
- Definition 2.1
- Term 2.2;;
- Definition 2.2
-
-**** TODO [#E] markdown :feature:
-
-***** urls
-#% markdown
-<http://daringfireball.net/projects/markdown/>
-<http://daringfireball.net/projects/markdown/syntax>
-<http://daringfireball.net/projects/markdown/basics>
-<http://en.wikipedia.org/wiki/Markdown>
-<https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet>
-<http://whatismarkdown.com/>
-
-Markdown supports two styles of headers, Setext and atx
-Setext
-<http://docutils.sourceforge.net/mirror/setext.html>
-<http://en.wikipedia.org/wiki/Setext>
-atx
-<http://www.aaronsw.com/2002/atx/intro>
-
-<http://support.iawriter.com/help/kb/general-questions/markdown-syntax-reference-guide>
-<http://bywordapp.com/markdown/syntax.html>
-<http://stackoverflow.com/editing-help>
-
-<http://support.mashery.com/docs/customizing_your_portal/Markdown_Cheat_Sheet>
-<http://warpedvisions.org/projects/markdown-cheat-sheet.md>
-<http://nestacms.com/docs/creating-content/markdown-cheat-sheet>
-<https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet>
-
-<https://help.github.com/articles/github-flavored-markdown>
-<http://lifehacker.com/5943320/what-is-markdown-and-why-is-it-better-for-my-to+do-lists-and-notes>
-
-#% pandoc markdown
-<http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html>
-<http://johnmacfarlane.net/pandoc/README.html>
-<http://johnmacfarlane.net/pandoc/demo/example19/Pandoc_0027s-markdown.html>
-<http://johnmacfarlane.net/pandoc/>
-<http://johnmacfarlane.net/pandoc/epub.html>
-<http://johnmacfarlane.net/pandoc/faqs.html>
-
-#% multimarkdown
-<http://fletcher.github.io/peg-multimarkdown/>
-
-#% markdown pandoc v multimarkdown
-<https://github.com/jgm/pandoc/wiki/Pandoc-vs-Multimarkdown>
-
-#% rST v markdown
-<http://stackoverflow.com/questions/34276/markdown-versus-restructuredtext>
-
-***** rb file
-lib/sisu/v6/txt_markdown.rb
-
-***** transformations :transformations:markup_markdown: #%
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-6) (decoration)
- [inline 1-5]
- '#'
- '##'
- '###'
- '####'
- '#####'
- '######'
- [underscore 1-5]
- '='
- '-'
- #'~'
- #'^'
- #'+'
- [] node (child, parent ...)
-
-#% font face
- [open & close marks]
- [] bold
- '**'
- [] italics
- '*'
- [] underscore
- ''
- [] superscript
- ''
- [] subscript
- ''
- [] strike
- ''
- [] add
- [] monospace
- '`'
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
- '*'
- [] numbered list
- '0.'
-
-#% blocks
- [] code
- ' ' #indent at least 4 spaces
- [] [type of markup if any]
- [] poem
- [] group
- [] alt
- [] tables
-
-#% notes
- [] footnotes
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- [] links - internal
-
-#% images [multimedia?]
- [] images
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- [] index (book index)
-
-#% breaks
- [] line break
- [] horizontal rule
- (three or more asterisks hypens or underscores)
- * * *
- ***
- *****
- - - -
- ___
- [] column break
- [] page break
-
-#% misc
-
-**** TODO [#F] rst :feature:
-
-***** urls
-#% rST
-<http://docutils.sourceforge.net/rst.html>
-<http://docutils.sourceforge.net/docs/user/rst/quickref.html>
-<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>
-<http://en.wikipedia.org/wiki/ReStructuredText>
-<http://sphinx-doc.org/rest.html>
-
-<http://stackoverflow.com/questions/2746692/restructuredtext-tool-support>
-
-#% rST v markdown
-<http://stackoverflow.com/questions/34276/markdown-versus-restructuredtext>
-
-***** rb file
-lib/sisu/v6/txt_rst.rb
-
-***** transformations :transformations:markup_rst: #%
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-6) (decoration)
- [inline]
- N/A
- [underscore]
- Titles are underlined (or over- and underlined) with a printing
- nonalphanumeric 7-bit ASCII character. Recommended choices are
- "= - ` : ' " ~ ^ _ * + # < >". The underline/overline must be at
- least as long as the title text.
- '='
- '-'
- '`'
- ':'
- "'"
- '"'
-
- [] node (child, parent ...)
-
-#% font face
- [] bold
- '**'
- [] italics
- '*'
- [] underscore
- '+'
- [] superscript
- '^'
- [] subscript
- [] strike
- '-'
- [] add
- [] monospace
- '``'
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
- "-", "*" or "+"
- '-'
- [] numbered list
- '#.'
-
-#% blocks
- [] code
- [] [type of markup if any]
- [] poem
- [] group
- [] alt
- [] tables
-
-#% notes
- [] footnotes
- [binary]
- Footnote references, like [5]_.
- Note that footnotes may get
- rearranged, e.g., to the bottom of
- the "page".
- .. [5] A numerical footnote.
- --
- Autonumbered footnotes are
- possible, like using [#]_ and [#]_.
- .. [#] This is the first one.
- .. [#] This is the second one.
-
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- Typical result
- External hyperlinks, like Python_.
- .. _Python: <http://www.python.org/>
- or
- External hyperlinks, like `Python
- <http://www.python.org/>`_.
- [] links - internal
- Internal crossreferences, like example_.
- .. _example:
-
- This is an example crossreference target.
- --
- Titles are targets, too
- =======================
- Implict references, like `Titles are
- targets, too`_.
-
-#% images [multimedia?]
- [] images
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- [] index (book index)
-
-#% breaks
- [] line break
- [] horizontal rule
- [] column break
- [] page break
-
-#% misc
-
-**** TODO [#F] textile :feature:
-
-***** urls
-#% textile
-<http://en.wikipedia.org/wiki/Textile_(markup_language)>
-v2.4
-<http://www.txstyle.org/>
-v2
-<http://redcloth.org/hobix.com/textile/>
-
-***** rb file
-lib/sisu/v6/txt_textile.rb
-
-***** transformations :transformations:markup_textile: #%
-#% structure - headings, levels
- [] sisu (A-C, 1-3)
- [] collapsed (1-6) (decoration)
- [inline]
- h1(#id). An HTML first-level heading
- h2. An HTML second-level heading
- h3. An HTML third-level heading
- h4. An HTML fourth-level heading
- h5. An HTML fifth-level heading
- h6. An HTML sixth-level heading
- [underscore]
- N/A
-
- [] node (child, parent ...)
-
-#% font face
- [] bold
- *bold text*
- [] italics
- _italic text_
- [] underscore
- +underlined text+
- [] superscript
- ^TM^
- [] subscript
- ~subscript~
- [] strike
- -strikethrough text-
- [] add
-
-#% para
- [] default
- [] indent
- [] default, all
- [] first line hang or indent further
- [] bullet
- * bulleted list
- ** 2-level
-
-#% blocks
- [] code
- [] [type of markup if any]
- [] poem
- [] group
- [] alt
- [] tables
- |Table | with two columns |
- |and two | rows |
-
-#% notes
- [] footnotes
- Text with a link to some reference[1]
- fn1. Footnote explanation
- [] [bibliography?]
-
-#% links, linking
- [] links - external, web, url
- "(classname)link text(title tooltip)":link_address
- "Link to Wikipedia":http://www.wikipedia.org
- [] links - internal
-
-#% images [multimedia?]
- [] images
- !http://commons.wikimedia.org/wiki/Special:Filepath/Wikipedia-logo-en.png!
- !imageurl(alt text)!
- [] [base 64]
-
-#% object numbers
- [] ocn (object numbers)
-
-#% contents
- [] toc (table of contents)
- [] index (book index)
-
-#% breaks
- [] line break
- [] horizontal rule
- [] column break
- [] page break
-
-#% misc
- [] *_bold italic text_*
- [] *-bold strikethrough text-*
- [] *_-bold italic strikethrough text-_*
- [] *+bold underlined text+*
- [] *_+italic underlined text+_
- [] *_+bold italic underlined text+_
- [] *_-+bold italic strikethrough underlined text+-_*
- %{font-size:18pt}font size%
- %{color:red}text in red%
- # Chapter 1
-
-#% notes
-heading inline only
-footnotes uses marker and endnote, check
-
-** Improvements
-
-*** HTML
-
-*** XML
-
-*** --strict mode (html w3c compliant ocn etc.)
-
-* Code (ruby) :sisu:code:
-
-** code enhancements :enhance:
-
-*** TODO [#D] directory & path, use ruby directory tools
-
-*** TODO [#D] document url shortcut, allow addition of alternative dir stub
-(e.g. viral Spiral)
-
-** code refactoring :refactor:
-
-*** ruby 2.1
-
-*** TODO [#C] refactor ruby :ongoing:
-
-** bugs :bug:
-
-*** misc, unclassified
-
-**** TODO UNDERWAY (6.0.5) [#B] exclude heading where possible marker '-#' not distinguished from unnumbered heading '~#'
-
- * ~# is general & means no ocn (for any object to which it is applied)
- * -# is relevant only for 1~ dummy headings & instructs that they should be
- removed from output where possible
- * where -# is used on any other objects, it is treated the same way as ~#
-
-**** TODO [#B] collapsed level work out logic where dummy lev1 heading
-
- * exclude heading where lev1 '-#'
- * means subsequent headings & text belong to parent heading (of lev1 -#) 1 level up
- * ponder
-
-*** DBT Outstanding bugs -- sisu caught by removal of ruby-dbi
-
-**** TODO ONGOING #746740 [n|u] manpages incomplete
-
-Date: Sat, 03 May 2014 08:45:49 +0200
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-Subject: manpages incomplete
-Package: sisu
-Version: 5.3.4-1
-Tag: upstream
-Severity: normal
-
-sisu supports options like --verbose or --no-manifest, but they are not
-listed in the sisu manpage.
-
-***** NOTES/COMMENTS
-
-documentation for sisu does lag a bit and has omissions, but I think you will
-find that --verbose is documented, and --no-* options are listed under --exc-*
-to which there is a pointer --no-manifest works but is actually
---no-links-to-manifest and is listed under aliases --exc-links-to-manifest and
---exc-manifest-links
-
-Will leave bug open as a reminder that updating is necessary and as there are
-no doubt numerous issues for which this could be (re)opened
-
-**** TODO #746742 [n|u] please implement --no-metadata similar to --no-manifest
-
-Date: Sun, 13 Apr 2014 16:12:13 +0200
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-Subject: --no-manifest not working anymore
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-
-when running sisu-pdf with --no-manifest, the output (pdf) still
-contains the sisu manifest at the end of the document.
-
-Regards,
-Daniel
-
-*** DBT Outstanding bugs -- Wishlist items; Unclassified (24 bugs) :debian:dbt:wishlist:
-
-**** TODO [#D] #744352 [w|u] sisu output: aligning margin numbers when using 'code'
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744352>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: 744352@bugs.debian.org
-Subject: Re: sisu output: too many margin numbers
-Date: Sun, 13 Apr 2014 17:27:10 +0200
-retitle 744352 sisu output: aligning margin numbers when using 'code'
-severity 744352 wishlist
-thanks
-
-sorry, i've looked wrongly at the output, the problem is simply an
-aligning issue. it looks like that:
-
- foo bar. [1]
- [2]
- baz
-
- foo bar baz. [3]
-
-rather than:
-
- foo bar. [1]
-
- baz [2]
-
- foo bar baz. [3]
-
-Regards,
-Daniel
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: too many margin numbers
-Date: Sun, 13 Apr 2014 12:28:14 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-
-when using the following code:
-
-foo bar.
-
-code{
-
- baz
-
-}code
-
-foo bar baz.
-
-the result in the output (pdf) is:
-
-foo bar. [1]
- [2]
-baz [3]
- [4]
-foo bar baz. [5]
-
-the '[n]' designates the margin number at the right site of the page.
-
-the problem is that sisu gives margin numbers to *empty* lines, which is
-wrong. margin numbers should only be assigned to actual content.
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-issue with pdf, look again, consider, this is cosmetic, a fix should be found,
-but is not striaghtforward alignment issue for code blocks not so easy to fix
-in some outputs, have so far ignored this is an issue with other types of text
-block as well
-
-reason why this has not been addressed especially with code blocks:
-the easiest fix would be to place the numbering at the end of the first line of
-a code block however, as it is now, if you copy & paste a block of code you
-should get the code if numbering is moved down to the first line, a copy of the
-code block will inlcude the extraneous (to the code) object number which is to
-my mind a bigger problem
-
-That said re pdf, LaTeX XeTeX are flexible, it may be possible to drop the ocn
-at the start of a code block lower on its line so that it is closer to the code
-that follows
-
-**** TODO [#C] #744354 [w|u] sisu output: please do not add '<' and '>' around urls
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: please do not add '<' and '>' around links
-Date: Sun, 13 Apr 2014 12:28:37 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-
-when using urls in sisu like this:
-
- http://example.org
-
-sisu then creates in the output (pdf) links like this:
-
- <http://example.org>
-
-Please do not automagically add a '<' and '>' around urls. If the user
-wants them, he would add one.
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-is sisu default behavior,
-would need to make configurable
-url_visual_delimiters: '<>'
-look into later
-
-
-**** TODO [#B] #744390 [w|u] sisu: empty sections are ignored
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744390>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu: empty sections are ignored
-Date: Sun, 13 Apr 2014 17:09:32 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-
-if you have the following sisu syntax:
-
- :B~ foo
-
- 1~ foo1
-
- foo1.
-
- 1~ foo2
-
- foo2.
-
- :B~ bar
-
- 1~ bar1
-
- 1~ bar2
-
- :B~ baz
-
- 1~ baz1
-
- 1~ baz2
-
-then anything (including and) after ':B~ bar' is ignored entirely.
-
-***** NOTES/COMMENTS
-
-further info, have not yet been able to duplicate,
-seemed to work (checked pdf & html (scroll & seg))
-was not able to reproduce
-will look again
-
-**** TODO [#D] #744395 [w|u] sisu output: half-page title page in landscape output
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744395>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu output: half-page title page in landscape output
-Date: Sun, 13 Apr 2014 17:38:03 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-in a4 landscape output, there's always two pages on one page, which is
-nice; except for the title page which spans over the whole page.
-
-it would be nice if the first page would be consistent to the same
-scheme like the rest of the document - spanning only over the half of
-the page.
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-think about, should be fairly easily done, but am reluctant
-
-note the page numbering in landscape, the two landscape columns are given a single page number
-it is really a landscape two column per-page text, provided primarily for screen viewing or
-other convenience if found
-
-(many viewers provide two page per screen presentations, which would result in an effect similar to the one requested
-the issue I guess might arise in that they are not printable on a single page? ...
-but then the current settings are arguably justified)
-
-**** TODO [#C] #744396 [w|u] sisu output: "european" toc indenting
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744396>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu output: "european" toc indenting
-Date: Sun, 13 Apr 2014 17:40:53 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-by default, latex uses the following indenting in the TOC:
-
- 1. foo
- 1.1 bar1
- 1.1.1 baz
- 1.2 bar2
-
-there's a latex option that i don't remember off-hand to have the
-indenting like it's common in europe:
-
- 1. foo
- 1.1 bar1
- 1.1.1 baz
- 1.2 bar2
-
-it would be nice if sisu could let the used decide which indenting style
-to use for TOCs.
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-will look at: should be possible; requires a configuration option
-
-**** TODO [#C] #744407 [w|u] sisu: possibility to influence content/formating of the title page
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744407>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu: possibility to influence content/formating of the title page
-Date: Sun, 13 Apr 2014 18:32:14 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-by default, the title page (in the pdf output) shows @title and @creator.
-
-it would be nice if there would be a possibility to influence the
-formatting (e.g. to have the title written in bold), and to have
-additional possibilities to influence the content on the title page
-(like the date or version, an url, or other text strings).
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-consider, work on possibly, later
-
-**** TODO [#C] #744409 [w|u] sisu output: urls in code blocks are not linkified
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744409>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu output: urls in code blocks are not linkified
-Date: Sun, 13 Apr 2014 18:41:09 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-it would be nice if urls written withiin code{...}code blocks would also
-be automatically transformed into a link within the output (html).
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-consider, so far code blocks are pretty much untouched ... not tampered with,
-this could be done though
-
-**** TODO [#C] #744685 [w|u] sisu output: copy&past-able wrapped code blocks
- <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744685>
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu output: copy&past-able wrapped code blocks
-Date: Sun, 13 Apr 2014 19:04:01 +0200
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-if a line within a 'code{...}code' block is longer and needs to be
-wrapped, sisu indicates the wrapping with an 'arrow' (←) symbol, which
-is nice.
-
-it would be even nicer if the arrow would not 'selectable', so that when
-you mark the line spanning over two lines with your mouse, the arrow is
-not selected and thus not copy&pasted.
-
-i don't know how to do this, but it's possible within pdfs, as can be
-seen in lots of pdfs in the internet.
-
-Regards,
-Daniel
-
-***** NOTES/COMMENTS
-
-find out how and implement, further feedback on appropriate xetex tools welcome
-
-[Note: if can be applied to random characters, use may be of interest for
-object numbers as well!]
-
-**** TODO [#C] #744734 [w|u] sisu output: replace all occurences of (C) rather than the first only
-
-From: Daniel Baumann <daniel.baumann@progress-technologies.net>
-To: Debian Bug Tracking System <submit@bugs.debian.org>
-Subject: sisu output: replace all occurences of (C) rather than the first only
-Date: Mon, 14 Apr 2014 06:11:13 +0200
-
-Package: sisu
-Version: 5.3.4-1
-Severity: wishlist
-Tags: upstream
-
-if you have a '(C)' in :copyright:, it is automatically replaced with a
-copyright symbol, which is nice, however, it sisu does that with the
-first occurence only.
-
-so if you use:
-
- :copyright: (C) john doe<br />(C) jane doe
-
-then the second occurence is not replaced and that combination looks
-very ugly. i suggest you replace all occurences of '(C)' to the
-copyright symbol automatically.
-
-Regards,
-Daniel
-* Reference versions
-** v5
-5.6.2
-5.6.1
-5.5.6 (5.5.5)
diff --git a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
index 9f30d7c9..772a87d8 100644
--- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -3,7 +3,7 @@
;; @Keywords: text, syntax, processes, tools
;; @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]
+;; [5.7.2 2014-10-28 Ralph Amissah]
;; @URL: <http://git.sisudoc.org/gitweb/?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
@@ -331,6 +331,21 @@
)
"Default expressions to highlight in AsciiSisu mode."
)
+;; enables outlining for sisu
+(add-hook 'sisu-mode-hook
+ '(lambda ()
+ (outline-minor-mode)
+ (setq outline-regexp "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)")))
+;; outline mode "folding" if available
+;(define-key evil-normal-state-map (kbd ",0") (lambda() (interactive) (show-all)))
+;(define-key evil-normal-state-map (kbd ",-") (lambda() (interactive) (hide-body)))
+;(define-key evil-normal-state-map (kbd ",+") (lambda() (interactive) (show-subtree)))
+;(define-key evil-normal-state-map (kbd ",=") (lambda() (interactive) (show-subtree)))
+;; C-c @ C-a show all
+;; C-c @ C-t show only the headings
+;; C-c @ C-s show subtree at cursor location
+;; C-c @ C-d hide subtree at cursor location
+
;; Sisu & Autoload:
;; ##autoload
(define-derived-mode sisu-mode text-mode "SiSU"
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
deleted file mode 100644
index 225033c4..00000000
--- a/data/sisu/v5/v/version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:project: SiSU
-:version: 5.7.1
-:date_stamp: 2014w41/7
-:date: "2014-10-19"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
deleted file mode 100644
index 33916d04..00000000
--- a/data/sisu/v6/v/version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-:project: SiSU
-:version: 6.3.1
-:date_stamp: 2014w41/7
-:date: "2014-10-19"
diff --git a/data/sisu/version/current.yml b/data/sisu/version/current.yml
new file mode 100644
index 00000000..18463362
--- /dev/null
+++ b/data/sisu/version/current.yml
@@ -0,0 +1,5 @@
+---
+:project: SiSU
+:version: 5.8.0
+:date_stamp: 2015w16/1
+:date: "2015-04-20"
diff --git a/data/sisu/version/develop.yml b/data/sisu/version/develop.yml
new file mode 100644
index 00000000..5ae6ac06
--- /dev/null
+++ b/data/sisu/version/develop.yml
@@ -0,0 +1,5 @@
+---
+:project: SiSU
+:version: 6.4.0
+:date_stamp: 2015w16/1
+:date: "2015-04-20"
diff --git a/lib/sisu/current/air.rb b/lib/sisu/current/air.rb
new file mode 100644
index 00000000..1876a0ec
--- /dev/null
+++ b/lib/sisu/current/air.rb
@@ -0,0 +1,80 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/air.rb;hb=HEAD>
+
+=end
+module SiSU_Air
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
+ class Source
+ @@ao_array=[]
+ @@fns=nil
+ def initialize(opt)
+ @opt=opt
+ @@fns||@opt.fns
+ @particulars=SiSU_Particulars::Combined.new(opt)
+ #@env=@particulars.env
+ #@md=@particulars.md
+ #@ao_array=@particulars.ao_array
+ end
+ def read
+ end
+ protected
+ def print
+ puts @particulars.md.inspect
+ puts @particulars.env.inspect
+ puts @particulars.ao_array
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/ao.rb b/lib/sisu/current/ao.rb
index ebb17a8f..3467c4c6 100644
--- a/lib/sisu/v5/ao.rb
+++ b/lib/sisu/current/ao.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** preprocessing, (document abstraction), data abstraction used in subsequent
+ processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: preprocessing, (document abstraction), data abstraction used
- in subsequent processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao.rb;hb=HEAD>
=end
module SiSU_AO
@@ -63,7 +60,7 @@ module SiSU_AO
include SiSU_Env
require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'ao_doc_objects' # ao.rb
+ require_relative 'ao_doc_objects' # ao_doc_objects.rb
require_relative 'ao_syntax' # ao_syntax.rb
include SiSU_AO_Syntax
require_relative 'ao_doc_str' # ao_doc_str.rb
@@ -89,8 +86,8 @@ module SiSU_AO
@@idx_arr={ sst: [], tex: [], html: [], xhtml: [] }
@@map_arr={ nametags: [], ocn_htmlseg: [] }
@@fns=nil
- def initialize(opt,fnx=nil)
- @opt,@fnx=opt,fnx
+ def initialize(opt,fnx=nil,process=:complete)
+ @opt,@fnx,@process=opt,fnx,process
@@fns ||=opt.fns
fn_use=if fnx \
and fnx =~/\.ss[tmi]$/
@@ -119,7 +116,7 @@ module SiSU_AO
: @opt.fns
create_ao
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@@fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@@fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -140,7 +137,7 @@ module SiSU_AO
? read_fnc
: @@ao_array.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -161,7 +158,7 @@ module SiSU_AO
? read_idx_sst
: @@idx_arr[:sst].dup #check
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -182,7 +179,7 @@ module SiSU_AO
? read_idx_raw
: @@idx_arr[:tex].dup #check
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -203,7 +200,7 @@ module SiSU_AO
? read_idx_html
: @@idx_arr[:html].dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -224,7 +221,7 @@ module SiSU_AO
? read_idx_xhtml
: @@idx_arr[:xhtml].dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -245,7 +242,7 @@ module SiSU_AO
? read_map_nametags
: @@map_arr[:nametags].dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -266,7 +263,7 @@ module SiSU_AO
? read_map_ocn_htmlseg
: @@map_arr[:ocn_htmlseg].dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -276,6 +273,7 @@ module SiSU_AO
protected
def create_ao
ao_array=[]
+ fnp = @fnx ? "#{@opt.fno} #{@fnx}" : @opt.fno
unless @opt.act[:quiet][:set]==:on
tell=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
@@ -286,7 +284,8 @@ module SiSU_AO
)
: SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
- 'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
+ 'Document Abstraction',
+ "[#{@opt.f_pth[:lng_is]}] #{fnp}"
)
tell.blue_title_hi
end
@@ -299,7 +298,7 @@ module SiSU_AO
meta=file_array=@env.source_file_processing_array(fn)
@md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
meta=nil
- ao=SiSU_AO::Make.new(fn,@md,file_array).song
+ ao=SiSU_AO::Make.new(fn,@md,file_array,@fnx,@process).song
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -350,7 +349,7 @@ module SiSU_AO
ao=[]
ao=(FileTest.file?(@fnc)) \
? (File.open(@fnc,'r:utf-8'){ |f| ao=Marshal.load(f)})
- : SiSU_AO::Source.new(@opt).create_ao
+ : SiSU_AO::Source.new(@opt,@fnx,@process).create_ao
end
def read_idx_sst
m=[]
@@ -522,8 +521,8 @@ module SiSU_AO
end
end
class Make
- def initialize(fn,md,data)
- @fn,@md,@data=fn,md,data
+ def initialize(fn,md,data,fnx,process)
+ @fn,@md,@data,@fnx,@process=fn,md,data,fnx,process
@env=SiSU_Env::InfoEnv.new(@md.fns)
end
def reset
@@ -554,12 +553,13 @@ module SiSU_AO
data_obj,
tags_map,
ocn_html_seg_map=
- SiSU_AO_Numbering::Numbering.new(@md,data_obj). # ao_numbering.rb
+ SiSU_AO_Numbering::Numbering.new(@md,data_obj,@fnx,@process). # ao_numbering.rb
numbering_song
data_obj,
book_index_rel,
book_index_rel_html_seg,
- html_idx,xhtml_idx=
+ html_idx,
+ xhtml_idx=
SiSU_AO_BookIndex::BookIndex.new(@md,data_obj,@env). # ao_idx.rb
indexing_song if @md.book_idx
data_obj=
diff --git a/lib/sisu/v6/ao_character_check.rb b/lib/sisu/current/ao_character_check.rb
index 6f47432e..faee5924 100644
--- a/lib/sisu/v6/ao_character_check.rb
+++ b/lib/sisu/current/ao_character_check.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_character_check.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_character_check.rb;hb=HEAD>
=end
module SiSU_AO_CharacterCheck
diff --git a/lib/sisu/v5/ao_composite.rb b/lib/sisu/current/ao_composite.rb
index c570d05f..611dd70c 100644
--- a/lib/sisu/v5/ao_composite.rb
+++ b/lib/sisu/current/ao_composite.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** composite documents, assemble/build documents from other documents
+ or parts of marked up text
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_composite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: composite documents, assemble/build documents from other
- documents or parts of marked up text
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_composite.rb;hb=HEAD>
=end
module SiSU_Assemble
diff --git a/lib/sisu/v6/ao_doc_objects.rb b/lib/sisu/current/ao_doc_objects.rb
index e361e0b2..ac528b90 100644
--- a/lib/sisu/v6/ao_doc_objects.rb
+++ b/lib/sisu/current/ao_doc_objects.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document abstraction
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_objects.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document abstraction
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_objects.rb;hb=HEAD>
=end
module SiSU_AO_DocumentStructure
diff --git a/lib/sisu/v6/ao_doc_str.rb b/lib/sisu/current/ao_doc_str.rb
index e8b15cd6..50916d10 100644
--- a/lib/sisu/v6/ao_doc_str.rb
+++ b/lib/sisu/current/ao_doc_str.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document abstraction
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_str.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document abstraction
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_str.rb;hb=HEAD>
=end
module SiSU_AO_DocumentStructureExtract
@@ -1260,8 +1257,8 @@ module SiSU_AO_DocumentStructureExtract
end
end
class OCN
- def initialize(md,data)
- @md,@data=md,data
+ def initialize(md,data,fnx,process)
+ @md,@data,@fnx,@process=md,data,fnx,process
end
def structure_info
def lv
@@ -1321,31 +1318,33 @@ has incorrect level and/or parent level
--}
end
def required_headers_present?
- unless (defined? @md.title \
- and @md.title.full)
- STDERR.puts %{required header missing:
+ if @process == :complete
+ unless (defined? @md.title \
+ and @md.title.full)
+ STDERR.puts %{required header missing:
@title:
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"
}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
- end
- unless (defined? @md.creator.author \
- and @md.creator.author)
- STDERR.puts %{required header missing:
+ unless (defined? @md.creator.author \
+ and @md.creator.author)
+ STDERR.puts %{required header missing:
@creator:
:author: anonymous?
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"
}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
end
end
@@ -1384,337 +1383,341 @@ SKIPPED processing file:
if not dob.obj =~/~#|-#/
ocn+=1
end
- if dob.is==:heading \
- and (ln.to_s =~/^[0-9]/ \
- or ln.to_s =~@md.lv0 \
- or ln.to_s =~@md.lv1 \
- or ln.to_s =~@md.lv2 \
- or ln.to_s =~@md.lv3 \
- or ln.to_s =~@md.lv4 \
- or ln.to_s =~@md.lv5 \
- or ln.to_s =~@md.lv6 \
- or ln.to_s =~@md.lv7)
- if not dob.obj =~/~#|-#/
- ocnh+=1
- end
- if ln==0 \
- or ln=~@md.lv0
- @lev_occurences[:a] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh0+=1 #heading
- node0="0:#{ocnh0};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node0="0:0;0"
- end
- document_structure_check_info(node0,node0)
- @collapsed_lv0=0
- collapsed_level=@collapsed_lv0
- node,ocn_sp,parent=node0,"h#{ocnh}",'ROOT'
- elsif ln==1 \
- or ln=~@md.lv1
- @lev_occurences[:b] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh1+=1 #heading
- node1="1:#{ocnh1};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node1="1:0;0"
- end
- parent=if node0
- document_structure_check_info(node1,node0)
- @collapsed_lv1=@collapsed_lv0+1
- node0
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node0,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv1
- node,ocn_sp,parent=node1,"h#{ocnh}",node0 #FIX
- elsif ln==2 \
- or ln=~@md.lv2
- @lev_occurences[:c] += 1
+ if @process == :complete \
+ or (@fnx == @md.opt.fns \
+ && @md.opt.fns =~/.sst$/)
+ if dob.is==:heading \
+ and (ln.to_s =~/^[0-9]/ \
+ or ln.to_s =~@md.lv0 \
+ or ln.to_s =~@md.lv1 \
+ or ln.to_s =~@md.lv2 \
+ or ln.to_s =~@md.lv3 \
+ or ln.to_s =~@md.lv4 \
+ or ln.to_s =~@md.lv5 \
+ or ln.to_s =~@md.lv6 \
+ or ln.to_s =~@md.lv7)
if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh2+=1
- node2="2:#{ocnh2};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node2="2:0;0"
+ ocnh+=1
end
- parent=if node1
- document_structure_check_info(node2,node1)
- @collapsed_lv2=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node2,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv2
- node,ocn_sp=node2,"h#{ocnh}"
- elsif ln==3 \
- or ln=~@md.lv3
- @lev_occurences[:d] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh3+=1
- node3="3:#{ocnh3};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node3="3:0;0"
- end
- parent=if node2
- document_structure_check_info(node3,node2)
- @collapsed_lv3=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- puts %{parent is :A~ & this level #{dob.lv}
+ if ln==0 \
+ or ln=~@md.lv0
+ @lev_occurences[:a] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh0+=1 #heading
+ node0="0:#{ocnh0};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node0="0:0;0"
+ end
+ document_structure_check_info(node0,node0)
+ @collapsed_lv0=0
+ collapsed_level=@collapsed_lv0
+ node,ocn_sp,parent=node0,"h#{ocnh}",'ROOT'
+ elsif ln==1 \
+ or ln=~@md.lv1
+ @lev_occurences[:b] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh1+=1 #heading
+ node1="1:#{ocnh1};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node1="1:0;0"
+ end
+ parent=if node0
+ document_structure_check_info(node1,node0)
+ @collapsed_lv1=@collapsed_lv0+1
+ node0
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node0,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv1
+ node,ocn_sp,parent=node1,"h#{ocnh}",node0 #FIX
+ elsif ln==2 \
+ or ln=~@md.lv2
+ @lev_occurences[:c] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh2+=1
+ node2="2:#{ocnh2};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node2="2:0;0"
+ end
+ parent=if node1
+ document_structure_check_info(node2,node1)
+ @collapsed_lv2=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node2,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv2
+ node,ocn_sp=node2,"h#{ocnh}"
+ elsif ln==3 \
+ or ln=~@md.lv3
+ @lev_occurences[:d] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh3+=1
+ node3="3:#{ocnh3};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node3="3:0;0"
+ end
+ parent=if node2
+ document_structure_check_info(node3,node2)
+ @collapsed_lv3=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts %{parent is :A~ & this level #{dob.lv}
either parent should be level :B~
or this level should be level :B~ rather than #{dob.lv}}
- document_structure_check_info(node3,node1,:error)
- @collapsed_lv3=@collapsed_lv1+1
- node1
- else
- document_structure_check_info(node3,node0,:error)
- warning_incorrect_parent_level_or_level(dob.obj)
- node0
- end
- collapsed_level=@collapsed_lv3
- node,ocn_sp=node3,"h#{ocnh}"
- elsif ln==4 \
- or ln=~@md.lv4
- @lev_occurences[:l1] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh4+=1
- node4="4:#{ocnh4};#{ocn}"
- else
- ocn_flag=false
- node4="4:0;0"
- end
- parent=if node3
- document_structure_check_info(node4,node3)
- @collapsed_lv4=@collapsed_lv3+1
- node3
- elsif node2
- document_structure_check_info(node4,node2)
- @collapsed_lv4=@collapsed_lv2+1
- node2
- elsif node1
- document_structure_check_info(node4,node1)
- @collapsed_lv4=@collapsed_lv1+1
- node1
- elsif node0
- document_structure_check_info(node4,node0)
- @collapsed_lv4=@collapsed_lv0+1
- node0
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node4,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv4
- node,ocn_sp=node4,"h#{ocnh}"
- elsif ln==5 \
- or ln=~@md.lv5
- @lev_occurences[:l2] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh5+=1
- node5="5:#{ocnh5};#{ocn}"
- else
- ocn_flag=false
- node5="5:0;0"
- end
- parent=if node4
- document_structure_check_info(node5,node4)
- @collapsed_lv5=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node3,:error)
- @collapsed_lv5=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node2,:error)
- @collapsed_lv5=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node1,:error)
- @collapsed_lv5=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv5
- node,ocn_sp=node5,"h#{ocnh}"
- elsif ln==6 \
- or ln=~@md.lv6
- @lev_occurences[:l3] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh6+=1
- node6="6:#{ocnh6};#{ocn}"
- else
- ocn_flag=false
- node6="6:0;0"
- end
- parent=if node5
- document_structure_check_info(node6,node5)
- @collapsed_lv6=@collapsed_lv5+1
- node5
- elsif node4
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node3,node1,:error)
+ @collapsed_lv3=@collapsed_lv1+1
+ node1
+ else
+ document_structure_check_info(node3,node0,:error)
+ warning_incorrect_parent_level_or_level(dob.obj)
+ node0
+ end
+ collapsed_level=@collapsed_lv3
+ node,ocn_sp=node3,"h#{ocnh}"
+ elsif ln==4 \
+ or ln=~@md.lv4
+ @lev_occurences[:l1] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh4+=1
+ node4="4:#{ocnh4};#{ocn}"
+ else
+ ocn_flag=false
+ node4="4:0;0"
+ end
+ parent=if node3
+ document_structure_check_info(node4,node3)
+ @collapsed_lv4=@collapsed_lv3+1
+ node3
+ elsif node2
+ document_structure_check_info(node4,node2)
+ @collapsed_lv4=@collapsed_lv2+1
+ node2
+ elsif node1
+ document_structure_check_info(node4,node1)
+ @collapsed_lv4=@collapsed_lv1+1
+ node1
+ elsif node0
+ document_structure_check_info(node4,node0)
+ @collapsed_lv4=@collapsed_lv0+1
+ node0
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node4,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv4
+ node,ocn_sp=node4,"h#{ocnh}"
+ elsif ln==5 \
+ or ln=~@md.lv5
+ @lev_occurences[:l2] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh5+=1
+ node5="5:#{ocnh5};#{ocn}"
+ else
+ ocn_flag=false
+ node5="5:0;0"
+ end
+ parent=if node4
+ document_structure_check_info(node5,node4)
+ @collapsed_lv5=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node3,:error)
+ @collapsed_lv5=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node2,:error)
+ @collapsed_lv5=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node1,:error)
+ @collapsed_lv5=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv5
+ node,ocn_sp=node5,"h#{ocnh}"
+ elsif ln==6 \
+ or ln=~@md.lv6
+ @lev_occurences[:l3] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh6+=1
+ node6="6:#{ocnh6};#{ocn}"
+ else
+ ocn_flag=false
+ node6="6:0;0"
+ end
+ parent=if node5
+ document_structure_check_info(node6,node5)
+ @collapsed_lv6=@collapsed_lv5+1
+ node5
+ elsif node4
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level #5 (2~)
or this level should be #5 (2~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node6,node4,:error)
- @collapsed_lv6=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node3,:error)
- @collapsed_lv6=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node2,:error)
- @collapsed_lv6=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node1,:error)
- @collapsed_lv6=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv6
- node,ocn_sp=node6,"h#{ocnh}"
- elsif ln==7 \
- or ln=~@md.lv7
- @lev_occurences[:l4] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh7+=1
- node7="7:#{ocnh7};#{ocn}"
- else
- ocn_flag=false
- node7="7:0;0"
- end
- parent=if node6
- document_structure_check_info(node7,node6)
- @collapsed_lv7=@collapsed_lv6+1
- node5
- elsif node5
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #5 (2~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node6,node4,:error)
+ @collapsed_lv6=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node3,:error)
+ @collapsed_lv6=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node2,:error)
+ @collapsed_lv6=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node1,:error)
+ @collapsed_lv6=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv6
+ node,ocn_sp=node6,"h#{ocnh}"
+ elsif ln==7 \
+ or ln=~@md.lv7
+ @lev_occurences[:l4] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh7+=1
+ node7="7:#{ocnh7};#{ocn}"
+ else
+ ocn_flag=false
+ node7="7:0;0"
+ end
+ parent=if node6
+ document_structure_check_info(node7,node6)
+ @collapsed_lv7=@collapsed_lv6+1
+ node5
+ elsif node5
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #5 (2~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level #6 (3~)
or this level should be #6 (3~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node7,node5,:error)
- @collapsed_lv6=@collapsed_lv5+1
- node5
- elsif node4
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node7,node5,:error)
+ @collapsed_lv6=@collapsed_lv5+1
+ node5
+ elsif node4
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level 6~
or this level should be #6 (3~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node7,node4,:error)
- @collapsed_lv6=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node3,:error)
- @collapsed_lv6=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node2,:error)
- @collapsed_lv6=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node1,:error)
- @collapsed_lv6=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node0,:error)
- node0
+ document_structure_check_info(node7,node4,:error)
+ @collapsed_lv6=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node3,:error)
+ @collapsed_lv6=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node2,:error)
+ @collapsed_lv6=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node1,:error)
+ @collapsed_lv6=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv7
+ node,ocn_sp=node7,"h#{ocnh}"
end
- collapsed_level=@collapsed_lv7
- node,ocn_sp=node7,"h#{ocnh}"
- end
- else
- unless @lev_occurences[:l1] > 0
- STDERR.puts %{Substantive text objects must follow a level 1~ heading and there are none at this point in processing: #{@lev_occurences[:l1]}
+ else
+ unless @lev_occurences[:l1] > 0
+ STDERR.puts %{Substantive text objects must follow a level 1~ heading and there are none at this point in processing: #{@lev_occurences[:l1]}
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- puts dob.obj #.gsub(/^(.{1,80})/,'"\1"')
- exit
- end
- unless @ln >= 4
- lev=case @ln
- when 0 then 'A'
- when 1 then 'B'
- when 2 then 'C'
- when 3 then 'D'
- when 4 then '1'
- when 5 then '2'
- when 6 then '3'
- when 7 then '4'
- when 8 then '5'
- when 9 then '6'
+ puts dob.obj #.gsub(/^(.{1,80})/,'"\1"')
+ exit
end
- STDERR.puts %{Substantive text objects must follow a level 1~ 2~ or 3~ heading: #{lev}~
+ unless @ln >= 4
+ lev=case @ln
+ when 0 then 'A'
+ when 1 then 'B'
+ when 2 then 'C'
+ when 3 then 'D'
+ when 4 then '1'
+ when 5 then '2'
+ when 6 then '3'
+ when 7 then '4'
+ when 8 then '5'
+ when 9 then '6'
+ end
+ STDERR.puts %{Substantive text objects must follow a level 1~ 2~ or 3~ heading: #{lev}~
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- puts dob.obj.gsub(/^(.{1,80})/,'"\1"')
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- break
- else exit
+ puts dob.obj.gsub(/^(.{1,80})/,'"\1"')
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ break
+ else exit
+ end
+ end
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ else
+ ocn_flag=false
+ end
+ ocno+=1
+ if dob.is==:table
+ ocnt+=1
+ ocn_sp,parent="t#{ocnt}",node
+ elsif dob.is==:code
+ ocnc+=1
+ ocn_sp,parent="c#{ocnc}",node
+ elsif dob.is==:group \
+ || dob.is==:box \
+ || dob.is==:block \
+ || dob.is==:alt \
+ || dob.is==:verse
+ ocng+=1 #group, poem
+ ocn_sp,parent="g#{ocng}",node
+ elsif dob.is==:image #check
+ ocni+=1
+ ocn_sp,parent="i#{ocni}",node
+ else ocnp+=1 #paragraph
+ ocn_sp,parent="p#{ocnp}",node
end
- end
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- else
- ocn_flag=false
- end
- ocno+=1
- if dob.is==:table
- ocnt+=1
- ocn_sp,parent="t#{ocnt}",node
- elsif dob.is==:code
- ocnc+=1
- ocn_sp,parent="c#{ocnc}",node
- elsif dob.is==:group \
- || dob.is==:box \
- || dob.is==:block \
- || dob.is==:alt \
- || dob.is==:verse
- ocng+=1 #group, poem
- ocn_sp,parent="g#{ocng}",node
- elsif dob.is==:image #check
- ocni+=1
- ocn_sp,parent="i#{ocni}",node
- else ocnp+=1 #paragraph
- ocn_sp,parent="p#{ocnp}",node
end
end
if dob.is==:heading
@@ -1763,24 +1766,28 @@ SKIPPED processing file:
end
@o_array << dob
end
- unless @lev_occurences[:a] == 1
- STDERR.puts %{The number of level A~ in this document: #{@lev_occurences[:a]}
+ if @process == :complete \
+ or (@fnx == @md.opt.fns \
+ && @md.opt.fns =~/.sst$/)
+ unless @lev_occurences[:a] == 1
+ STDERR.puts %{The number of level A~ in this document: #{@lev_occurences[:a]}
There must be one level A~ (no more and no less)
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
- end
- unless @lev_occurences[:l1] > 0
- STDERR.puts %{The number of level 1~ in this document: #{@lev_occurences[:l1]}
+ unless @lev_occurences[:l1] > 0
+ STDERR.puts %{The number of level 1~ in this document: #{@lev_occurences[:l1]}
There must be at least one level 1~ (and as many as required)
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
end
@o_array
diff --git a/lib/sisu/v5/ao_endnotes.rb b/lib/sisu/current/ao_endnotes.rb
index 65726d84..7c9ae067 100644
--- a/lib/sisu/v5/ao_endnotes.rb
+++ b/lib/sisu/current/ao_endnotes.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_endnotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_doc_endnotes.rb;hb=HEAD>
=end
module SiSU_AO_Endnotes
diff --git a/lib/sisu/v6/ao_expand_insertions.rb b/lib/sisu/current/ao_expand_insertions.rb
index a1566da2..3a749df3 100644
--- a/lib/sisu/v6/ao_expand_insertions.rb
+++ b/lib/sisu/current/ao_expand_insertions.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_expand_insertions.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_expand_insertions.rb;hb=HEAD>
=end
module SiSU_AO_Insertions
diff --git a/lib/sisu/v6/ao_hash_digest.rb b/lib/sisu/current/ao_hash_digest.rb
index aeb881bf..bc86a485 100644
--- a/lib/sisu/v6/ao_hash_digest.rb
+++ b/lib/sisu/current/ao_hash_digest.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_hash_digest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_hash_digest.rb;hb=HEAD>
=end
module SiSU_AO_Hash
diff --git a/lib/sisu/v6/ao_idx.rb b/lib/sisu/current/ao_idx.rb
index 6d53367b..0c9c8a43 100644
--- a/lib/sisu/v6/ao_idx.rb
+++ b/lib/sisu/current/ao_idx.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_idx.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_idx.rb;hb=HEAD>
=end
module SiSU_AO_BookIndex
diff --git a/lib/sisu/v6/ao_images.rb b/lib/sisu/current/ao_images.rb
index 93356e9f..c0c45712 100644
--- a/lib/sisu/v6/ao_images.rb
+++ b/lib/sisu/current/ao_images.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_images.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_images.rb;hb=HEAD>
=end
module SiSU_AO_Images
@@ -122,7 +119,7 @@ module SiSU_AO_Images
).warn
end
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
if imgk or gmgk
if imgk
imgsys=`identify #{image_path}/#{image}`.strip #system call
@@ -132,7 +129,7 @@ module SiSU_AO_Images
img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2]
img_col,img_row=img_col.to_i,img_row.to_i
else
- errmsg='imagemagick or graphicksmagick are required to process images'
+ errmsg='imagemagick or graphicsmagick are required to process images'
if @md.opt.act[:no_stop][:set]==:on
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error("#{errmsg}, proceeding (as requested) without image processing")
diff --git a/lib/sisu/current/ao_metadata.rb b/lib/sisu/current/ao_metadata.rb
new file mode 100644
index 00000000..46e80a7d
--- /dev/null
+++ b/lib/sisu/current/ao_metadata.rb
@@ -0,0 +1,86 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_metadata.rb;hb=HEAD>
+
+=end
+module SiSU_AO_Metadata
+ class Metadata
+ def initialize(md,metad)
+ @md,@metadata=md,metad
+ l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
+ language=l[:n]
+ @tr=SiSU_Translate::Source.new(md,language)
+ end
+ def make_para(obj,ocn)
+ h={
+ obj: obj,
+ ocn: 0
+ }
+ SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ end
+ def make_heading(obj,ocn,name,lv,ln)
+ h={
+ lv: lv,
+ ln: ln,
+ name: name,
+ obj: obj,
+ ocn: 0
+ }
+ SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
+ end
+ def metadata
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/ao_misc_arrange.rb b/lib/sisu/current/ao_misc_arrange.rb
index 6c340004..e010eaca 100644
--- a/lib/sisu/v5/ao_misc_arrange.rb
+++ b/lib/sisu/current/ao_misc_arrange.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_misc_arrange.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_misc_arrange.rb;hb=HEAD>
=end
module SiSU_AO_MiscArrangeText
diff --git a/lib/sisu/v6/ao_numbering.rb b/lib/sisu/current/ao_numbering.rb
index a8000c92..31986a86 100644
--- a/lib/sisu/v6/ao_numbering.rb
+++ b/lib/sisu/current/ao_numbering.rb
@@ -1,68 +1,65 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_numbering.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_numbering.rb;hb=HEAD>
=end
module SiSU_AO_Numbering
class Numbering
attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
@@segments_count=0
- def initialize(md,data)
- @md,@data=md,data
+ def initialize(md,data,fnx,process)
+ @md,@data,@fnx,@process=md,data,fnx,process
@obj=@type=@ocn=@lv=@name=@index=@comment=nil
@chosen_seg_names=[]
end
@@ -107,7 +104,9 @@ module SiSU_AO_Numbering
data=ocn(data.compact) #watch
data=xml(data.compact)
data=minor_numbering(data.compact)
- data,tags_map,ocn_html_seg_map=name_para_seg_filename(data)
+ if @process==:complete
+ data,tags_map,ocn_html_seg_map=name_para_seg_filename(data)
+ end
data=set_heading_top(data) unless @md.set_heading_top
[data,tags_map,ocn_html_seg_map]
ensure
@@ -280,7 +279,7 @@ module SiSU_AO_Numbering
@tuned_file=@tuned_file.flatten
end
def ocn(data) #and auto segment numbering increment
- @tuned_file=SiSU_AO_DocumentStructureExtract::OCN.new(@md,data).ocn
+ @tuned_file=SiSU_AO_DocumentStructureExtract::OCN.new(@md,data,@fnx,@process).ocn
@tuned_file
end
def xml(data)
diff --git a/lib/sisu/v6/ao_syntax.rb b/lib/sisu/current/ao_syntax.rb
index da1daddf..554daae5 100644
--- a/lib/sisu/v6/ao_syntax.rb
+++ b/lib/sisu/current/ao_syntax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Syntax for markup, input markup syntaxes, determined here
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_syntax.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Syntax for markup, input markup syntaxes, determined here
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/ao_syntax.rb;hb=HEAD>
=end
module SiSU_AO_Syntax
@@ -91,8 +88,8 @@ module SiSU_AO_Syntax
@manmkp_ital=emph_italics \
? '[i/*]\\{.+?\\}[i/*]'
: '[i/]\\{.+?\\}[i/]'
- tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)}
- tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
+ tail_m_ital=%q{(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$)}
+ tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$))?}
bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)}
#ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)} #not implemented
@line_scan_ital=if defined? @md.italics_match_list[:str]
@@ -360,7 +357,7 @@ module SiSU_AO_Syntax
# {url address}:url
# {image.png}imageurl
# {image.png}png
- # ~{endnote}~ <!e endnote !>
+ # ~{endnote}~
# !_ #bold/emphasise paragraph
# _" #blockquote paragraph
# _1 <:i1> #indent paragraph 1 step
@@ -392,7 +389,7 @@ module SiSU_AO_Syntax
dob.obj=dob.obj.strip
end
dob.obj=dob.obj.
- gsub(/^([*#-.]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators
+ gsub(/^([*#.-]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators
gsub(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c]).
gsub(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]). #default if markup does not specify
gsub(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
@@ -555,7 +552,7 @@ module SiSU_AO_Syntax
# {url address}:url
# {image.png}imageurl
# {image.png}png
- # ~{endnote}~ <!e endnote !>
+ # ~{endnote}~
# +1 <!i1!>
# +2 <!i2!>
puts 'tech'
diff --git a/lib/sisu/current/cgi.rb b/lib/sisu/current/cgi.rb
new file mode 100644
index 00000000..99f2e987
--- /dev/null
+++ b/lib/sisu/current/cgi.rb
@@ -0,0 +1,84 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql sqlite)
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi.rb;hb=HEAD>
+
+=end
+module SiSU_CGI #% database building documents
+ require_relative 'se' # se.rb
+ require_relative 'cgi_pgsql' # cgi_pgsql.rb
+ require_relative 'cgi_sqlite' # cgi_sqlite.rb
+ class SearchSQL
+ def initialize(opt)
+ @opt=opt
+ @webserv=@opt.files[0].to_s.strip
+ end
+ def read
+ if @opt.act[:sample_search_form][:db]==:pg # cgi_pgsql.rb
+ SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
+ elsif @opt.act[:sample_search_form][:db]==:sqlite # cgi_sqlite.rb
+ SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
+ else
+ puts <<-WOK
+ please select database type for which sample search form should be built (pgsql or sqlite)
+ sisu --sample-search-form --db=sqlite
+ sisu --sample-search-form --db=pg
+ other options include
+ --webserv-cgi='[cgi-server-name]'
+ --webserv-output='[sisu-output-server-with-base-path]'
+ WOK
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/cgi_pgsql.rb b/lib/sisu/current/cgi_pgsql.rb
index 49ab0e50..9a4c555b 100644
--- a/lib/sisu/v6/cgi_pgsql.rb
+++ b/lib/sisu/current/cgi_pgsql.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_pgsql.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database (pgsql)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_pgsql.rb;hb=HEAD>
=end
module SiSU_CGI_PgSQL #% database building documents
diff --git a/lib/sisu/v5/cgi_sql_common.rb b/lib/sisu/current/cgi_sql_common.rb
index 4d2304ba..94f6126e 100644
--- a/lib/sisu/v5/cgi_sql_common.rb
+++ b/lib/sisu/current/cgi_sql_common.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql sqlite)
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- 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.
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ 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.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ 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>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_common.rb;hb=HEAD>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- ** Description: generates naive cgi search form for search of sisu database (pgsql sqlite)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_sql_common.rb;hb=HEAD>
=end
module SiSU_CGI_SQL
@@ -927,7 +924,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'],c['language_document_char'])}#o#{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
@@ -935,9 +932,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'],c['language_document_char'])}#o#{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,c['language_document_char'])}#o#{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
diff --git a/lib/sisu/v6/cgi_sqlite.rb b/lib/sisu/current/cgi_sqlite.rb
index d11d4c30..91444237 100644
--- a/lib/sisu/v6/cgi_sqlite.rb
+++ b/lib/sisu/current/cgi_sqlite.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (sqlite)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_sql_sqlite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database (sqlite)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/cgi_sql_sqlite.rb;hb=HEAD>
=end
module SiSU_CGI_SQLite #% database building documents
diff --git a/lib/sisu/v6/conf.rb b/lib/sisu/current/conf.rb
index ea0ea387..2bc71ce7 100644
--- a/lib/sisu/v6/conf.rb
+++ b/lib/sisu/current/conf.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** configuration
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/conf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: configuration
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/conf.rb;hb=HEAD>
=end
module SiSU_Initialize
diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/current/constants.rb
index 1e5a4dfe..7a23027d 100644
--- a/lib/sisu/v5/constants.rb
+++ b/lib/sisu/current/constants.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- constants
+** Description: documents, structuring, processing, publishing, search
+*** constants, system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/constants.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/constants.rb;hb=HEAD>
=end
#Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
@@ -234,8 +230,8 @@ Px={
po_subscript_o: ',{', po_subscript_c: '},',
po_hilite_o: '*{', po_hilite_c: '}*',
po_monospace_o: '#{', po_monospace_c: '}#',
- lng_lst: SiSU_is[:language_list],
- lng_lst_rgx: SiSU_is[:language_list_regex],
+ lng_lst: SiSU_is.language_list?,
+ lng_lst_rgx: SiSU_is.language_list_regex?,
lv1: '*',
lv2: '=',
lv3: '=',
@@ -264,8 +260,8 @@ else
}
end
Db={
- name_prefix: "SiSU#{SiSU_is[:version_dir]}c_",
- name_prefix_db: "sisu_#{SiSU_is[:version_dir]}c_",
+ name_prefix: "SiSU#{SiSU_is.branch_version?}c_",
+ name_prefix_db: "sisu_#{SiSU_is.branch_version?}c_",
col_title: 800,
col_title_part: 400,
col_title_edition: 10,
diff --git a/lib/sisu/v5/css.rb b/lib/sisu/current/css.rb
index b70d3edd..1832b66c 100644
--- a/lib/sisu/v5/css.rb
+++ b/lib/sisu/current/css.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** css stylesheets
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/css.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: css stylesheets
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/css.rb;hb=HEAD>
=end
module SiSU_Style
@@ -358,16 +355,6 @@ WOK
color: #000000;
background-color: #f9f9aa;
}
- a.lnkocn:link {
- color: #777777;
- text-decoration: none;
- }
-/*
- a:hover {
- border-bottom: 2px solid #777777;
- background-color: #fff3b6;
- }
-*/
a:hover img {
background-color: #ffffff;
}
@@ -375,6 +362,14 @@ WOK
color: #003399;
text-decoration: underline;
}
+ a.lnkocn:link {
+ color: #777777;
+ text-decoration: none;
+ }
+ a.lnkocn:visited {
+ color: #555555;
+ text-decoration: none;
+ }
div {
margin-left: 0;
margin-right: 0;
diff --git a/lib/sisu/v5/db_columns.rb b/lib/sisu/current/db_columns.rb
index 158a1ba2..35491e94 100644
--- a/lib/sisu/v5/db_columns.rb
+++ b/lib/sisu/current/db_columns.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_columns.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_columns.rb;hb=HEAD>
=end
module SiSU_DbColumns
@@ -373,7 +369,6 @@ module SiSU_DbColumns
if defined? @md.creator.editor_detail \
and @md.creator.editor_detail.is_a?(Array) \
and @md.creator.editor_detail.length > 0
- txt=@md.creator.editor_detail #dc
txt=''
@md.creator.editor_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -401,7 +396,6 @@ module SiSU_DbColumns
if defined? @md.creator.contributor_detail \
and @md.creator.contributor_detail.is_a?(Array) \
and @md.creator.contributor_detail.length > 0
- txt=@md.creator.contributor_detail #dc
txt=''
@md.creator.contributor_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -429,7 +423,6 @@ module SiSU_DbColumns
if defined? @md.creator.illustrator_detail \
and @md.creator.illustrator_detail.is_a?(Array) \
and @md.creator.illustrator_detail.length > 0
- txt=@md.creator.illustrator_detail
txt=''
@md.creator.illustrator_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -457,7 +450,6 @@ module SiSU_DbColumns
if defined? @md.creator.photographer_detail \
and @md.creator.photographer_detail.is_a?(Array) \
and @md.creator.photographer_detail.length > 0
- txt=@md.creator.photographer_detail
txt=''
@md.creator.photographer_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -512,7 +504,6 @@ module SiSU_DbColumns
if defined? @md.creator.prepared_by_detail \
and @md.creator.prepared_by_detail.is_a?(Array) \
and @md.creator.prepared_by_detail.length > 0
- txt=@md.creator.prepared_by_detail
txt=''
@md.creator.prepared_by_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -540,7 +531,6 @@ module SiSU_DbColumns
if defined? @md.creator.digitized_by_detail \
and @md.creator.digitized_by_detail.is_a?(Array) \
and @md.creator.digitized_by_detail.length > 0
- txt=@md.creator.digitized_by_detail
txt=''
@md.creator.digitized_by_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -568,7 +558,6 @@ module SiSU_DbColumns
if defined? @md.creator.audio_detail \
and @md.creator.audio_detail.is_a?(Array) \
and @md.creator.audio_detail.length > 0
- txt=@md.creator.audio_detail
txt=''
@md.creator.audio_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
diff --git a/lib/sisu/v5/db_create.rb b/lib/sisu/current/db_create.rb
index 58a441de..df8983d2 100644
--- a/lib/sisu/v5/db_create.rb
+++ b/lib/sisu/current/db_create.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_create.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_create.rb;hb=HEAD>
=end
module SiSU_DbCreate
diff --git a/lib/sisu/v5/db_dbi.rb b/lib/sisu/current/db_dbi.rb
index 88ebb5ac..9824a6c5 100644
--- a/lib/sisu/v5/db_dbi.rb
+++ b/lib/sisu/current/db_dbi.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_dbi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_dbi.rb;hb=HEAD>
=end
module SiSU_DbDBI
diff --git a/lib/sisu/v5/db_drop.rb b/lib/sisu/current/db_drop.rb
index 4d08313d..acdae9da 100644
--- a/lib/sisu/v5/db_drop.rb
+++ b/lib/sisu/current/db_drop.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_drop.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_drop.rb;hb=HEAD>
=end
module SiSU_DbDrop
diff --git a/lib/sisu/v6/db_import.rb b/lib/sisu/current/db_import.rb
index 5e159451..43da9c44 100644
--- a/lib/sisu/v6/db_import.rb
+++ b/lib/sisu/current/db_import.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_import.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_import.rb;hb=HEAD>
=end
module SiSU_DbImport
diff --git a/lib/sisu/v5/db_indexes.rb b/lib/sisu/current/db_indexes.rb
index b5d99b5d..25373bf5 100644
--- a/lib/sisu/v5/db_indexes.rb
+++ b/lib/sisu/current/db_indexes.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_indexes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_indexes.rb;hb=HEAD>
=end
module SiSU_DbIndex
diff --git a/lib/sisu/v5/db_load_tuple.rb b/lib/sisu/current/db_load_tuple.rb
index ef21f62b..ebf7a45e 100644
--- a/lib/sisu/v5/db_load_tuple.rb
+++ b/lib/sisu/current/db_load_tuple.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_load_tuple.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_load_tuple.rb;hb=HEAD>
=end
module SiSU_DbTuple
diff --git a/lib/sisu/v6/db_remove.rb b/lib/sisu/current/db_remove.rb
index 9378378e..c8287aa9 100644
--- a/lib/sisu/v6/db_remove.rb
+++ b/lib/sisu/current/db_remove.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_remove.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_remove.rb;hb=HEAD>
=end
module SiSU_DbRemove
diff --git a/lib/sisu/v6/db_select.rb b/lib/sisu/current/db_select.rb
index c9c4ffc1..284bd135 100644
--- a/lib/sisu/v6/db_select.rb
+++ b/lib/sisu/current/db_select.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_select.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_select.rb;hb=HEAD>
=end
module SiSU_DbAction
diff --git a/lib/sisu/v5/db_sqltxt.rb b/lib/sisu/current/db_sqltxt.rb
index 3f6cf951..a307dc1d 100644
--- a/lib/sisu/v5/db_sqltxt.rb
+++ b/lib/sisu/current/db_sqltxt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_sqltxt.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_sqltxt.rb;hb=HEAD>
=end
module SiSU_DbText
@@ -172,4 +169,3 @@ module SiSU_DbText
end
end
__END__
-
diff --git a/lib/sisu/v5/db_tests.rb b/lib/sisu/current/db_tests.rb
index 59fa74e2..137850ab 100644
--- a/lib/sisu/v5/db_tests.rb
+++ b/lib/sisu/current/db_tests.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_tests.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/db_tests.rb;hb=HEAD>
=end
module SiSU_DbTests
diff --git a/lib/sisu/v6/dbi.rb b/lib/sisu/current/dbi.rb
index e939607c..93e4769a 100644
--- a/lib/sisu/v6/dbi.rb
+++ b/lib/sisu/current/dbi.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** postgresql module, dbi import frame
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dbi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: postgresql module, dbi import frame
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dbi.rb;hb=HEAD>
=end
module SiSU_DBI #% database building
diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/current/dbi_discrete.rb
index 4c3efc46..f62204c6 100644
--- a/lib/sisu/v6/dbi_discrete.rb
+++ b/lib/sisu/current/dbi_discrete.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** postgresql module, dbi import frame
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dbi_discrete.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: postgresql module, dbi import frame
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dbi_discrete.rb;hb=HEAD>
=end
module SiSU_DBI_Discrete #% database building
diff --git a/lib/sisu/v6/digests.rb b/lib/sisu/current/digests.rb
index fe72ea84..8a3a2d08 100644
--- a/lib/sisu/v6/digests.rb
+++ b/lib/sisu/current/digests.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document digests (md5|sha256) and structure processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/digests.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document digests (md5|sha256) and structure processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/digests.rb;hb=HEAD>
=end
module SiSU_DigestView
diff --git a/lib/sisu/v5/dp.rb b/lib/sisu/current/dp.rb
index 6186f323..4cf058e7 100644
--- a/lib/sisu/v5/dp.rb
+++ b/lib/sisu/current/dp.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document parameters extracted from input files for program use
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document parameters extracted from input files for program use
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp.rb;hb=HEAD>
=end
module SiSU_Param
@@ -70,19 +67,6 @@ module SiSU_Param
require_relative 'dp_make' # dp_make.rb
require_relative 'dp_identify_markup' # dp_identify_markup.rb
@@date=SiSU_Env::InfoDate.new
- @@proc=
- @@filename_txt=
- @@filename_texinfo=
- @@filename_lout_portrait=
- @@filename_lout_landscape=
- @@filename_html_scroll=
- @@filename_html_index=
- @@filename_html_segtoc=
- @@filename_semantic=
- @@filename_rss=
- @@newfile=
- @@drr=
- nil
@doc={
initialise: nil,
markup: '',
@@ -90,7 +74,6 @@ module SiSU_Param
stmp: '',
req: {},
}
- @@yaml=@@yamladdr=nil
@@trigger=nil
@@lv,@@flag={},{}
@@tex_backslash="\\\\"
@@ -543,7 +526,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Copyright missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
''
end
l,n=Db[:col_info_note],'rights.copyright.text'
@@ -615,7 +600,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Rights information missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
else
l,n=Db[:col_info_note],'rights.all'
validate_length(s,l,n)
@@ -673,7 +660,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Rights information missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
else
l,n=Db[:col_info_note],'rights.all'
validate_length(s,l,n)
@@ -1424,11 +1413,13 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'*WARN* endnote number mismatch',
- "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})"
+ "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} " \
+ + "(difference = #{@en[:mismatch]})"
).warn unless @opt.act[:quiet][:set]==:on
footnote_conversion_errors=File.new("#{Dir.pwd}/footnote_conversion_errors.txt",'a')
footnote_conversion_errors <<
- "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
+ "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} " \
+ + "(difference = #{@en[:mismatch]})\n"
end
if not @title \
or not defined? @title.main \
@@ -1441,7 +1432,9 @@ module SiSU_Param
@opt.act[:color_state][:set],
'WARNING: Document Title missing',
'please provide @title:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
end
end
if @author !~/[\S]/
@@ -1453,7 +1446,9 @@ module SiSU_Param
@opt.act[:color_state][:set],
'WARNING: Document Author missing',
'please provide @creator: :author:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
end
end
@struct={}
@@ -1565,19 +1560,6 @@ module SiSU_Param
class Instantiate
def param_instantiate
@@date=SiSU_Env::InfoDate.new
- @@proc=
- @@filename_txt=
- @@filename_texinfo=
- @@filename_lout_portrait=
- @@filename_lout_landscape=
- @@filename_html_scroll=
- @@filename_html_index=
- @@filename_html_segtoc=
- @@filename_semantic=
- @@filename_rss=
- @@newfile=
- @@drr=
- nil
@doc={
initialise: nil,
markup: '',
@@ -1587,7 +1569,6 @@ module SiSU_Param
prefix_b: '',
req: {}
}
- @@yaml=@@yamladdr=nil
@@flag={}
@@publisher='SiSU scribe'
end
diff --git a/lib/sisu/v6/dp_identify_markup.rb b/lib/sisu/current/dp_identify_markup.rb
index 2ec5ac8a..acb6070a 100644
--- a/lib/sisu/v6/dp_identify_markup.rb
+++ b/lib/sisu/current/dp_identify_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_identify_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp_identify_markup.rb;hb=HEAD>
=end
module SiSU_MarkupType
diff --git a/lib/sisu/v6/dp_make.rb b/lib/sisu/current/dp_make.rb
index 9a2c2989..f65717bb 100644
--- a/lib/sisu/v6/dp_make.rb
+++ b/lib/sisu/current/dp_make.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document parameters make extracted for program use
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp_make.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document parameters make extracted for program use
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/dp_make.rb;hb=HEAD>
=end
@@ -429,7 +426,7 @@ module SiSU_Param_Make
end
def get_image_dimensions(img)
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
img_pth={
sst: @env.path.image_source_include,
pod: File.expand_path("../../../sisupod/image" )
diff --git a/lib/sisu/v6/embedded.rb b/lib/sisu/current/embedded.rb
index 1e5d7925..14f2bd4a 100644
--- a/lib/sisu/v6/embedded.rb
+++ b/lib/sisu/current/embedded.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** sitemap created from parameters extracted from input file(s)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/embedded.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: sitemap created from parameters extracted from input file(s)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/embedded.rb;hb=HEAD>
=end
module SiSU_Embedded
diff --git a/lib/sisu/current/errors.rb b/lib/sisu/current/errors.rb
new file mode 100644
index 00000000..73b2feaa
--- /dev/null
+++ b/lib/sisu/current/errors.rb
@@ -0,0 +1,84 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, error screen reporting
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/errors.rb;hb=HEAD>
+
+=end
+module SiSU_Errors
+ require_relative 'se' # se.rb
+ include SiSU_Env; include SiSU_Screen
+ class Rescued <CreateFile
+ def initialize(error,errorlist,cmd,fns='')
+ @fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
+ @cmd=(cmd \
+ && (cmd =~/c/)) \
+ ? 'Vc'
+ : 'V'
+ end
+ def location
+ file=@fns \
+ ? (SiSU_Env::CreateFile.new(@fns).file_error)
+ : (File.new('/tmp/errorlog.sisu','w+'))
+ file << @fns << "\n" << @error << "\n" << @errorlist
+ file.close
+ if @cmd=~/[vVM]/
+ SiSU_Screen::Ansi.new('',$!,$@).rescue do
+ (block_given?) ? yield : __LINE__.to_s + ':' + __FILE__
+ end
+ else
+ SiSU_Screen::Ansi.new('',"rescued, exception raised, silenced").puts_grey
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/current/generic_parts.rb b/lib/sisu/current/generic_parts.rb
new file mode 100644
index 00000000..ba10b38e
--- /dev/null
+++ b/lib/sisu/current/generic_parts.rb
@@ -0,0 +1,131 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
+
+=end
+module SiSU_Parts_Generic
+ def the_url
+ def urify(uri)
+ URI.parse(uri)
+ end
+ def sisu
+ 'http://www.sisudoc.org/'
+ end
+ def sisudoc
+ 'http://www.sisudoc.org'
+ end
+ def footer_signature
+ 'http://www.sisudoc.org/'
+ end
+ def rl_root
+ '/sisu' #watch
+ end
+ def root_http
+ 'http://www.sisudoc.org/' #watch
+ end
+ def home
+ 'http://www.sisudoc.org/' # used in pdf header
+ end
+ def site #used as stub... where there are subdirectories and is different from home
+ home
+ end
+ def home_txt
+ 'www.sisudoc.org'
+ end
+ def sisu_txt
+ 'www.sisudoc.org'
+ end
+ self
+ end
+ def the_text
+ def home
+ 'SiSU'
+ 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
+ def url_open
+ '<'
+ end
+ def url_close
+ '>'
+ end
+ self
+ end
+ def the_icon
+ def i_ico
+ 'rb7.ico'
+ end
+ def i_home_button
+ 'sisu.png'
+ end
+ def i_choice
+ 'b_choice.png'
+ end
+ def i_new
+ 'b_new.png'
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v6/git.rb b/lib/sisu/current/git.rb
index 3c20b2e3..0ec3520b 100644
--- a/lib/sisu/v6/git.rb
+++ b/lib/sisu/current/git.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/git.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/git.rb;hb=HEAD>
=end
module SiSU_Git
@@ -62,8 +59,8 @@ module SiSU_Git
require_relative 'se' # se.rb
require_relative 'ao' # ao.rb
class Source
- def initialize(opt)
- @opt=opt
+ def initialize(opt,process=:complete)
+ @opt,@process=opt,process
@env=SiSU_Env::InfoEnv.new
@md=SiSU_Param::Parameters.new(@opt).get
@file=SiSU_Env::FileOp.new(@md)
@@ -91,7 +88,7 @@ module SiSU_Git
video: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:video],
conf: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:conf]
}
- SiSU_AO::Source.new(@opt).read # -m
+ SiSU_AO::Source.new(@opt,nil,@process).read # -m
end
def create_file_structure_git
make_dir_fnb
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/current/html.rb
index 1a8d6608..582773e5 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/current/html.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html.rb;hb=HEAD>
=end
module SiSU_HTML
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/current/html_concordance.rb
index 231eb4c1..3b3275e3 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/current/html_concordance.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** concordance file (html, wordmap, linked index of words in document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_concordance.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: concordance file (html concordance, wordmap, linked index of
- words in document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_concordance.rb;hb=HEAD>
=end
module SiSU_Concordance
diff --git a/lib/sisu/v6/html_format.rb b/lib/sisu/current/html_format.rb
index a84d079d..8f83219f 100644
--- a/lib/sisu/v6/html_format.rb
+++ b/lib/sisu/current/html_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html formating, css template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html formating, css template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_format.rb;hb=HEAD>
=end
module SiSU_HTML_Format
@@ -72,7 +69,7 @@ module SiSU_HTML_Format
or @ocn.empty?
''
else
- %{<label class="ocn">#{@ocn}</label>}
+ %{<label class="ocn"><a href="##{@ocn_html_identifier}#{@ocn}" class="lnkocn">#{@ocn}</a></label>}
end
else
''
@@ -1150,8 +1147,8 @@ WOK
def initialize(md,txt)
super(md,txt)
end
- def endnote_seg_body(fn='') #FIX #url construction keep within single line... BUG WATCH 200408
- fn='doc' if fn.to_s.empty? #you may wish to reconsider, sends to 'doc' where no segment info
+ def endnote_seg_body(fn='')
+ fn="../#{@md.fnb}" if fn.to_s.empty?
%{
<p class="endnote">
#{@endnote_part_a}#{fn}#{@md.lang_code_insert}#{Sfx[:html]}#{@endnote_part_b}
diff --git a/lib/sisu/current/html_harvest.rb b/lib/sisu/current/html_harvest.rb
new file mode 100644
index 00000000..0ac5c95f
--- /dev/null
+++ b/lib/sisu/current/html_harvest.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, harvest metadata from document corpus
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest.rb;hb=HEAD>
+
+=end
+module SiSU_Harvest
+ @@the_idx_topics,@@the_idx_authors={},{}
+ class Source
+ require_relative 'hub_options' # hub_options.rb
+ require_relative 'html_harvest_topics' # html_harvest_topics.rb
+ require_relative 'html_harvest_authors' # html_harvest_authors.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ def initialize(opt)
+ @opt=opt
+ @env=SiSU_Env::InfoEnv.new
+ end
+ def read
+ begin
+ harvest_pth=@env.path.webserv + '/' + @opt.base_stub
+ FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
+ cases(@opt,@env)
+ rescue
+ ensure
+ SiSU_Env::CreateSite.new(@opt).cp_css
+ end
+ end
+ def help
+ puts <<WOK
+ harvest --harvest extracts document index metadata
+
+WOK
+ end
+ def css(opt)
+ require_relative 'css' # css.rb
+ css=SiSU_Style::CSS.new
+ fn_css=SiSU_Env::CSS_Default.new
+ style=File.new("#{@env.path.pwd}/#{fn_css.harvest}",'w')
+ style << css.harvest
+ style.close
+ end
+ def cases(opt,env)
+ case opt.selections.str.inspect
+ when/--harvest/i
+ css(opt) if @opt.act[:maintenance][:set]==:on
+ SiSU_HarvestAuthors::Songsheet.new(opt,env).songsheet
+ SiSU_HarvestTopics::Songsheet.new(opt,env).songsheet
+ if @opt.act[:rsync][:set]==:on
+ require_relative 'remote' # remote.rb
+ SiSU_Remote::Put.new(opt).rsync_harvest
+ end
+ else
+ help
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/current/html_harvest_author_format.rb b/lib/sisu/current/html_harvest_author_format.rb
new file mode 100644
index 00000000..db71b013
--- /dev/null
+++ b/lib/sisu/current/html_harvest_author_format.rb
@@ -0,0 +1,111 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_author_format.rb;hb=HEAD>
+
+=end
+module SiSU_FormatAuthor
+ class Author
+ def initialize(author_param)
+ @author_param=author_param
+ end
+ def author_details
+ @authors,@author_array=[],[]
+ authors=@author_param.scan(/[^;]+/)
+ authors.each do |a|
+ a=a.strip
+ if a =~/"(.+?)"/
+ @authors << { the: $1 }
+ @author_array << $1.upcase
+ else #if a =~/,/
+ x=a.scan(/[^,]+/)
+ x[0]=x[0].strip
+ x[1]=x[1].strip if x[1]
+ if x.length==1
+ @authors << { the: x[0] }
+ @author_array << x[0].upcase
+ elsif x.length==2
+ @authors << { the: x[0], others: x[1] }
+ @author_array << "#{x[0].upcase}, #{x[1]}"
+ else #p x.length
+ end
+ end
+ end
+ l = @authors.length
+ authors_string=''
+ @authors.each_with_index do |a,i|
+ authors_string += if a[:others]
+ if (l - i) > 1
+ "#{a[:others]} #{a[:the]}, "
+ else
+ "#{a[:others]} #{a[:the]}"
+ end
+ else
+ if (l - i) > 2
+ "#{a[:the]}, "
+ else
+ "#{a[:the]}"
+ end
+ end
+ end
+ {
+ last_first_a: authors,
+ last_first_format_a: @author_array,
+ authors_h: @authors,
+ authors_s: authors_string,
+ authors_param: @author_param
+ }
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/html_harvest_authors.rb b/lib/sisu/current/html_harvest_authors.rb
index 14b18ca0..cbbd153c 100644
--- a/lib/sisu/v6/html_harvest_authors.rb
+++ b/lib/sisu/current/html_harvest_authors.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- metadata harvest, extract authors and their writings from document set
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, extract authors and their writings from document set
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_authors.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_authors.rb;hb=HEAD>
=end
module SiSU_HarvestAuthors
diff --git a/lib/sisu/v5/html_harvest_topics.rb b/lib/sisu/current/html_harvest_topics.rb
index ab74968c..58f92bcb 100644
--- a/lib/sisu/v5/html_harvest_topics.rb
+++ b/lib/sisu/current/html_harvest_topics.rb
@@ -1,62 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- metadata harvest, extract topics and associated writings from document set
- (topics use topic_register header)
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, extract topics and associated writings from document set
+ (topics use topic_register header)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_topics.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/harvest_topics.rb;hb=HEAD>
=end
module SiSU_HarvestTopics
diff --git a/lib/sisu/v5/html_lite_shared.rb b/lib/sisu/current/html_lite_shared.rb
index fa1cc481..aac53727 100644
--- a/lib/sisu/v5/html_lite_shared.rb
+++ b/lib/sisu/current/html_lite_shared.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by db and flatfile output generators, mostly xml/xhtml/html
+ formatting
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_lite_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by db and flatfile output generators, mostly
- xml/xhtml/html formatting
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_lite_shared.rb;hb=HEAD>
=end
module SiSU_FormatShared
diff --git a/lib/sisu/v6/html_manifest.rb b/lib/sisu/current/html_manifest.rb
index 8fcf198c..44094383 100644
--- a/lib/sisu/v6/html_manifest.rb
+++ b/lib/sisu/current/html_manifest.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_manifest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_manifest.rb;hb=HEAD>
=end
module SiSU_Manifest
diff --git a/lib/sisu/v5/html_minitoc.rb b/lib/sisu/current/html_minitoc.rb
index f185b0ee..902a68d4 100644
--- a/lib/sisu/v5/html_minitoc.rb
+++ b/lib/sisu/current/html_minitoc.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- minitoc
+** Description: documents, structuring, processing, publishing, search
+*** html minitoc
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_minitoc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_minitoc.rb;hb=HEAD>
=end
module SiSU_HTML_MiniToc
diff --git a/lib/sisu/v6/html_parts.rb b/lib/sisu/current/html_parts.rb
index 2c09db7e..db7cdb76 100644
--- a/lib/sisu/v6/html_parts.rb
+++ b/lib/sisu/current/html_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
=end
module SiSU_Parts_HTML
diff --git a/lib/sisu/v6/html_promo.rb b/lib/sisu/current/html_promo.rb
index 1880e246..28b4e356 100644
--- a/lib/sisu/v6/html_promo.rb
+++ b/lib/sisu/current/html_promo.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html advertising component, build here, mockup
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_promo.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html advertising component, build here, mockup
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_promo.rb;hb=HEAD>
=end
module SiSU_HTML_Promo
diff --git a/lib/sisu/v6/html_scroll.rb b/lib/sisu/current/html_scroll.rb
index 9e158af3..4751a01b 100644
--- a/lib/sisu/v6/html_scroll.rb
+++ b/lib/sisu/current/html_scroll.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html scroll generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_scroll.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html scroll generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_scroll.rb;hb=HEAD>
=end
module SiSU_HTML_Scroll
diff --git a/lib/sisu/v6/html_segments.rb b/lib/sisu/current/html_segments.rb
index 060258d9..3288b8f4 100644
--- a/lib/sisu/v6/html_segments.rb
+++ b/lib/sisu/current/html_segments.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html segment generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_segments.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html segment generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_segments.rb;hb=HEAD>
=end
module SiSU_HTML_Seg
diff --git a/lib/sisu/current/html_shared.rb b/lib/sisu/current/html_shared.rb
new file mode 100644
index 00000000..883467b1
--- /dev/null
+++ b/lib/sisu/current/html_shared.rb
@@ -0,0 +1,62 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_shared.rb;hb=HEAD>
+
+=end
+module SiSU_HTML_Shared
+ require_relative 'html_table' # html_table.rb
+ class TableHTML < SiSU_HTML_Table::TableHTML
+ end
+end
+__END__
diff --git a/lib/sisu/current/html_table.rb b/lib/sisu/current/html_table.rb
new file mode 100644
index 00000000..ddcb513d
--- /dev/null
+++ b/lib/sisu/current/html_table.rb
@@ -0,0 +1,64 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts, table
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_table.rb;hb=HEAD>
+
+=end
+module SiSU_HTML_Table
+ require_relative 'xhtml_table' # xhtml_table.rb
+ require_relative 'html_parts' # html_parts.rb
+ class TableHTML < SiSU_XHTML_Table::TableXHTML
+ include SiSU_Parts_HTML
+ end
+end
+__END__
diff --git a/lib/sisu/v6/html_tune.rb b/lib/sisu/current/html_tune.rb
index 09c771b6..5a4575cf 100644
--- a/lib/sisu/v6/html_tune.rb
+++ b/lib/sisu/current/html_tune.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html generation, html pre-processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_tune.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html generation, html pre-processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_tune.rb;hb=HEAD>
=end
require_relative 'dp' # dp.rb
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/current/hub.rb
index 13f95654..eb6ab19d 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/current/hub.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub.rb;hb=HEAD>
=end
module SiSU
@@ -76,9 +72,9 @@ module SiSU
error('uri NOT FOUND (LoadError)')
end
class HubMaster
- def initialize(argv,call_path)
+ def initialize(argv,sisu_runtime)
begin
- opt=SiSU_Commandline::Options.new(argv,call_path)
+ opt=SiSU_Commandline::Options.new(argv,sisu_runtime)
SiSU::Processing.new(opt).actions_without_files
SiSU::Processing.new(opt).actions_on_files
SiSU::Processing.new(opt).actions_without_files_post
diff --git a/lib/sisu/v6/hub_actions.rb b/lib/sisu/current/hub_actions.rb
index 076461db..8878855d 100644
--- a/lib/sisu/v6/hub_actions.rb
+++ b/lib/sisu/current/hub_actions.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub, perform selected actions
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_actions.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_actions.rb;hb=HEAD>
=end
module SiSU_Hub_Actions
diff --git a/lib/sisu/v6/hub_loop_markup_files.rb b/lib/sisu/current/hub_loop_markup_files.rb
index cf56f23b..626dc8e1 100644
--- a/lib/sisu/v6/hub_loop_markup_files.rb
+++ b/lib/sisu/current/hub_loop_markup_files.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_loop_markup_files.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_loop_markup_files.rb;hb=HEAD>
=end
module SiSU_Hub_Loops
diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/current/hub_options.rb
index fb58f396..8a9af156 100644
--- a/lib/sisu/v6/hub_options.rb
+++ b/lib/sisu/current/hub_options.rb
@@ -1,61 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub, command line options parsing
- * Author: Ralph Amissah
+*** hub
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- Copyright (C) Ralph Amissah
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- 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.
+ 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.
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ 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>
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/hub_options.rb;hb=HEAD>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, command line options
- parsing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/hub_options.rb;hb=HEAD>
=end
module SiSU_Commandline
@@ -154,9 +152,9 @@ module SiSU_Commandline
end
end
class Options
- attr_accessor :selections,:opt_ch,:act,:dir_structure_by,:lingual,:f_pths,:files,:files_mod,:call_path,:base_path,:base_stub,:sub_location,:image_src_path,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what,:make_instructions,:make_instructions_pod
+ attr_accessor :selections,:opt_ch,:act,:dir_structure_by,:lingual,:f_pths,:files,:files_mod,:call_path,:base_path,:base_stub,:sub_location,:image_src_path,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what,:make_instructions,:make_instructions_pod,:sisu_run_path,:sisu_install_type
@@act=nil
- def initialize(a,call_path)
+ def initialize(a,sisu_runtime)
@opt_ch=@f_pth=@pth=@fno=@fns=@fnb=@fnc=@fng=@fncb=@what=@lng=@lng_base=@call_path=@base_path=@base_stub=@image_src_path=@sub_location=''
@f_pths,@files,@files_mod,@paths,@select_arr,@act=Array.new(5){[]}
@select_str=nil
@@ -164,7 +162,9 @@ module SiSU_Commandline
@lng_base=@env.language_default_set
@dir_structure_by=SiSU_Env::EnvCall.new.output_dir_structure.by?
@lingual=SiSU_Env::EnvCall.new.mono_multi_lingual?
- @call_path=call_path
+ @sisu_run_from=sisu_runtime[:runtime_path]
+ @sisu_install_type=sisu_runtime[:runtime_type]
+ @call_path=sisu_runtime[:call_path]
pth=SiSU_Utils::Path.new(call_path)
@base_path=pth.base_markup
@base_stub=pth.base_markup_stub
@@ -175,6 +175,30 @@ module SiSU_Commandline
@make_instructions_pod=nil
init
end
+ def sisu_run_from?
+ @sisu_run_from
+ end
+ def sisu_bin_filepath?
+ @sisu_run_from
+ end
+ def sisu_install_type?
+ @sisu_install_type
+ end
+ def sisu_data_dir?
+ env=RbConfig::CONFIG
+ if sisu_install_type? ==:full_path_to_sisu_bin_in_sisu_dir_tree
+ sisu_bin_filepath?.gsub(/\/bin\/sisu\S*/,'/data/sisu')
+ #sisu_lib_dir?.gsub(/\/lib\/sisu\/(?:current|develop)\S*/,'/data/sisu')
+ elsif sisu_install_type? ==:gem_install
+ #sisu_run_from?.gsub(/\/bin\/.+/,'/data/sisu')
+ env['datadir']
+ elsif sisu_install_type? ==:system_install
+ #SiSU_Info_Env::InfoEnv.new.path.share
+ env['datadir']
+ else
+ env['datadir']
+ end
+ end
def find_all(find_flag,opt)
if find_flag
x=Dir.glob('*.ss[tm]')
diff --git a/lib/sisu/v5/i18n.rb b/lib/sisu/current/i18n.rb
index 20b30483..0413bb87 100644
--- a/lib/sisu/v5/i18n.rb
+++ b/lib/sisu/current/i18n.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** internationalisation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/i18n.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: internationalisation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/i18n.rb;hb=HEAD>
=end
module SiSU_i18n
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/current/manpage.rb
index 1dff0bde..fb5a1f3c 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/current/manpage.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** manpage text generation, stripped manpage output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: manpage text generation, stripped manpage output (unix,
- linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/manpage.rb;hb=HEAD>
=end
module SiSU_Manpage
diff --git a/lib/sisu/current/manpage_format.rb b/lib/sisu/current/manpage_format.rb
new file mode 100644
index 00000000..88291535
--- /dev/null
+++ b/lib/sisu/current/manpage_format.rb
@@ -0,0 +1,85 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** manpage formatting template
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/manpage_format.rb;hb=HEAD>
+
+=end
+module SiSU_ManpageFormat
+ require_relative 'dp' # dp.rb
+ include SiSU_Param
+ class ParagraphNumber
+ def initialize(paranum)
+ @paranum=/(\d+)/m.match(paranum)[1]
+ end
+ def display
+ @paranum.gsub(/(\d+)/,'<font size="1" color="#777777">&nbsp;&nbsp;\1</font>')
+ end
+ def name
+ @paranum.gsub(/(\d+)/,'<a name="\1"></a>')
+ end
+ def goto
+ @paranum.gsub(/(\d+)/,'<a href="#\1">')
+ end
+ end
+ class FormatTextObject
+ def initialize(md,dob)
+ @md,@dob=md,dob
+ rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
+ @dob.obj.gsub!(rgx,'\1') if @dob.obj =~rgx
+ end
+ def scr_endnote_body
+ "<endnote>#{@dob.obj}</endnote> "
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/current/po4a.rb
index 03cf14f7..3de3ff7d 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/current/po4a.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** pot file generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: pot file generation
- linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/po4a.rb;hb=HEAD>
=end
module SiSU_Po4a
@@ -67,12 +63,15 @@ module SiSU_Po4a
require_relative 'po4a_set' # po4a_set.rb
include SiSU_Param
class Source
- @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn=nil,nil,nil,nil,nil,nil
+ @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn=
+ nil, nil, nil, nil, nil, nil
def initialize(opt,fn=nil)
@opt,@fn=opt,fn
#unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/
# puts "#{@opt.fns} not a processed file type"
#end
+ file_arr=SiSU_Info_Env::InfoEnv.new.source_file_processing_array(@opt.fns)
+ SiSU_Param::Parameters::Instructions.new(file_arr,@opt).extract
r=Px[:lng_lst_rgx].gsub(/\|en\|/,'|')
@lang_regx=%r{(?:#{r})}
if opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
@@ -98,36 +97,44 @@ module SiSU_Po4a
end
md=SiSU_Param::Parameters.new(@opt).get
src[:files].each do |fn|
- SiSU_AO::Source.new(@opt,fn).read # -m
env=SiSU_Env::InfoEnv.new(@opt.fns)
+ file=SiSU_Env::FileOp.new(md)
m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm|ssi)$/ #watch added match for sss
@fnn,@fnb,@fnt=fn[m,1],fn[m,2],fn[m,3]
unless @opt.act[:quiet][:set]==:on
- path=env.path.output_tell
tool=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{path}/#{md.fnb}/#{md.fn[:plain]}"
+ ? "#{env.program.text_editor} #{file.output_path.pot.dir}/"
: @opt.fns
(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Pot po4a',tool).green_hi_blue
- : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Pot po4a',tool).green_title_hi
+ ? SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Pot po4a',
+ tool
+ ).green_hi_blue
+ : SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Pot po4a',
+ tool
+ ).green_title_hi
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
@opt.fns,
- "#{path}/#{md.fnb}/#{md.fn[:plain]}"
+ file.output_path.pot.dir
).flow
end
end
if @opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
or @opt.f_pth[:lng] !=@opt.lng_base
opt_lang_trn_fn=fn
- @ao_array_lang_translation=SiSU_AO::Source.new(@opt,opt_lang_trn_fn).get # ao file drawn here
+ @ao_array_lang_translation=
+ SiSU_AO::Source.new(@opt,opt_lang_trn_fn,:po4a).get # ao file drawn here
opt_lang_src_fn=if fn =~/\S+?~\S{2}(?:_\S{2})?\.ss[mti]/
fn.gsub(/(\S+?)~\S{2}(?:_\S{2})?(\.ss[mti])/,'\1\2') #check i
else fn
@@ -142,14 +149,16 @@ module SiSU_Po4a
else nil
end
if FileTest.file?("#{srcdir}/#{opt_lang_src_fn}")
- @ao_array_lang_src=SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn).get # ao file drawn here
+ @ao_array_lang_src=
+ SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn,:po4a).get # ao file drawn here
else
puts "no identified source document"
exit
end
Dir.chdir(transdir) if transdir
else
- @ao_array_lang_src=SiSU_AO::Source.new(@opt,fn).get # ao file drawn here
+ @ao_array_lang_src=
+ SiSU_AO::Source.new(@opt,fn,:po4a).get # ao file drawn here
@ao_array_lang_translation=nil
end
wrap_width=if defined? md.make.plaintext_wrap \
@@ -160,7 +169,13 @@ module SiSU_Po4a
env.plaintext_wrap
else 78
end
- SiSU_Po4a::Source::Scroll.new(fn,@ao_array_lang_src,@ao_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
+ SiSU_Po4a::Source::Scroll.new(
+ fn,
+ @ao_array_lang_src,
+ @ao_array_lang_translation,
+ @@md_src,@@md_trn,
+ wrap_width
+ ).songsheet
end
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
@@ -174,14 +189,24 @@ module SiSU_Po4a
include SiSU_Po4aUtils
@@endnotes={ para: [], end: [] }
def initialize(fn,data_src,data_trn,md_src,md_trn,wrap_width)
- @fn,@data_src,@data_trn,@md_src,@md_trn,@wrap_width=fn,data_src,data_trn,md_src,md_trn,wrap_width
+ @fn,@data_src,@data_trn,@md_src,@md_trn,@wrap_width=
+ fn, data_src, data_trn, md_src, md_trn, wrap_width
@md=(md_trn.nil?) \
? md_src
: md_trn
@tab="\t"
@@endnotes_=(@md.opt.selections.str =~/--endnote/) ? true : false # --footnote
- @br=(@md.opt.selections.str =~/--dos/) ? "\r\n" : "\n" # --unix
- @pot={ body: [], open: [], close: [], head: [], metadata: [], tail: [] }
+ @pot={
+ body: [],
+ open: [],
+ close: [],
+ head: [],
+ metadata: [],
+ tail: []
+ }
+ end
+ def br
+ (@md.opt.selections.str =~/--dos/) ? "\r\n" : "\n" # --unix
end
def songsheet
############## BUG @fn changes value
@@ -189,7 +214,7 @@ module SiSU_Po4a
pot=pot_markup(@data_src,@data_trn)
publish(fn,pot)
end
- def extract_endnotes(dob='') #% Used for extraction of endnotes from paragraphs
+ def extract_endnotes(dob='') #% used for extraction of endnotes from paragraphs
notes_a=dob.obj.scan(/#{Mx[:en_a_o]}([\d]+\s+.+?)#{Mx[:en_a_c]}/)
##notes_a=dob.obj.scan(/#{Mx[:en_a_o]}([\d*+]+\s+.+?)#{Mx[:en_a_c]}/)
#notes_b=dob.obj.scan(/#{Mx[:en_b_o]}([\d*+]+\s+.+?)#{Mx[:en_b_c]}/)
@@ -197,8 +222,8 @@ module SiSU_Po4a
notes_a.flatten.each do |n| #high cost to deal with <br> appropriately within plaintext, consider
n=n.dup.to_s
n=n.gsub(/^([\d]+)\s+/,'^~\1 ').
- #gsub(/^([\d*+]+)\s+/,'^~\1 ').
- gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'<br>')
+ gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,
+ ' \\\\\\ ')
@n << n
end
notes_a=@n.flatten
@@ -216,14 +241,21 @@ module SiSU_Po4a
mark="^~ "
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# footnotes, the preferred sisu markup for a footnote is~{this is a footnote}~ however, for translation a footnote reference marker in the text~^ with a set of notes following the paragraph starting on a newline with "^~ this is a footnote", is easier to deal with, if possible these should be converted back to~{inline notes}~}
+ instruct=%{\n# footnotes, the preferred sisu markup for a footnote is~{this is a footnote}~ } \
+ + %{however, for translation a footnote reference marker in the text~^ } \
+ + %{with a set of notes following the paragraph starting on a newline with "^~ this is a footnote", } \
+ + %{is easier to deal with, if possible these should be converted back to~{inline notes}~}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
- orig=(orig_notes[i].to_s =~/^\^~[\d*+]+/) ? (orig_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~')) : orig_notes[i].to_s
+ orig=(orig_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (orig_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : orig_notes[i].to_s
trans=if trn_notes.is_a?(Array) \
and trn_notes.length==orig_notes.length
- (trn_notes[i].to_s =~/^\^~[\d*+]+/) ? (trn_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~')) : trn_notes[i].to_s
+ (trn_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (trn_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : trn_notes[i].to_s
else ''
end
util=pot_structure(desc,orig,trans)
@@ -242,7 +274,7 @@ GSUB
@@endnotes[:para] << wrap
@@endnotes[:end] << '' << wrap
end
- @@endnotes[:para].each {|e| @pot[:body] << e << @br}
+ @@endnotes[:para].each {|e| @pot[:body] << e << br}
@@endnotes[:para]=[]
@@endnotes
end
@@ -301,10 +333,10 @@ GSUB
meta_src.metadata_tags.classify.topic_register,
meta_src.metadata_tags.classify.loc,
meta_src.metadata_tags.classify.dewey,
- meta_src.metadata_tags.notes.relation,
- meta_src.metadata_tags.notes.type,
- meta_src.metadata_tags.identifier.oclc,
- meta_src.metadata_tags.identifier.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 << [
@@ -344,7 +376,7 @@ GSUB
z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
end
end
- @pot[:metadata] << z << @br
+ @pot[:metadata] << z << br
#puts z unless z.empty?
end
end
@@ -429,20 +461,20 @@ GSUB
meta_src.metadata_tags.classify.topic_register,
meta_src.metadata_tags.classify.loc,
meta_src.metadata_tags.classify.dewey,
- meta_src.metadata_tags.notes.relation,
- meta_src.metadata_tags.notes.type,
- meta_src.metadata_tags.identifier.oclc,
- meta_src.metadata_tags.identifier.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.subject,
meta_trn.metadata_tags.classify.topic_register,
meta_trn.metadata_tags.classify.loc,
meta_trn.metadata_tags.classify.dewey,
- meta_trn.metadata_tags.notes.relation,
- meta_trn.metadata_tags.notes.type,
- meta_trn.metadata_tags.identifier.oclc,
- meta_trn.metadata_tags.identifier.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",
@@ -497,14 +529,22 @@ GSUB
z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
end
end
- @pot[:metadata] << z << @br
+ @pot[:metadata] << z << br
#puts z unless z.empty?
end
end
def pot_structure(desc,orig,trans,indent=0,hang=0)
- SiSU_Po4aUtils::Wrap.new(@md,orig,trans,desc,@wrap_width,indent,hang)
+ SiSU_Po4aUtils::Wrap.new(
+ @md,
+ orig,
+ trans,
+ desc,
+ @wrap_width,
+ indent,
+ hang
+ )
end
- def pot_structure_heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
lv=n=n3=nil
lv=dob_src.ln
n=lv - 1
@@ -515,7 +555,9 @@ GSUB
d="#{dob_src.is.to_s} (level #{dob_src.lv})"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for headings is marker at the start of the line/object, indicating the heading level, and if provided an associated name tag, this heading is "#{mark}"}
+ instruct=%{\n# markup for headings is marker at the start of the line/object, } \
+ + %{indicating the heading level, and if provided an associated name tag, } \
+ + %{this heading is "#{mark}"}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -523,18 +565,18 @@ GSUB
trans=(dob_trn=='') ? '' : "#{s_mark}#{dob_trn.obj}"
util=pot_structure(desc,orig,trans)
wrapped=util.line_wrap
- @pot[:body] << wrapped << @br # main text, contents, body KEEP
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
if @@endnotes[:para] \
and notes_s.length > 0 \
and not @@endnotes_
- @pot[:body] << @br
+ @pot[:body] << br
wrap_endnotes(notes_s,notes_t)
elsif @@endnotes[:para] \
and @@endnotes_
- @pot[:body] << @br*2
+ @pot[:body] << br*2
end
end
- def pot_structure_para(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_para(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
util=nil
wrapped=if dob_src.indent =~/[1-9]/ \
and dob_src.indent == dob_src.hang
@@ -544,7 +586,8 @@ GSUB
d="#{dob_src.is.to_s}: indent #{dob_src.indent}, bullet"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented bullet text is at the start of the line/object, an underscore followed by the indent level and an asterisk "#{mark}"}
+ instruct=%{\n# markup for indented bullet text is at the start of the line/object, } \
+ + %{an underscore followed by the indent level and an asterisk "#{mark}"}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -553,7 +596,8 @@ GSUB
d="#{dob_src.is.to_s}: indent #{dob_src.indent}"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text is at the start of the line/object, an underscore followed by the indent level "#{mark}"}
+ instruct=%{\n# markup for indented text is at the start of the line/object, } \
+ + %{an underscore followed by the indent level "#{mark}"}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -568,7 +612,11 @@ GSUB
d="#{dob_src.is.to_s}: hang #{dob_src.hang} indent #{dob_src.indent}"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text with a first line indented to a different level from the rest of the paragraph, is at the start of the line/object, an underscore and the first indent level a second underscore and the indent level for the rest of the paragraph, "#{mark1}"}
+ instruct=%{\n# markup for indented text with a first line indented } \
+ + %{to a different level from the rest of the paragraph, } \
+ + %{is at the start of the line/object, } \
+ + %{an underscore and the first indent level } \
+ + %{a second underscore and the indent level for the rest of the paragraph, "#{mark1}"}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -582,7 +630,8 @@ GSUB
d="#{dob_src.is.to_s}: bullet"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text is at the start of the line/object, an underscore followed by an asterisk "#{mark}"}
+ instruct=%{\n# markup for indented text is at the start of the line/object, } \
+ + %{an underscore followed by an asterisk "#{mark}"}
s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -603,23 +652,24 @@ GSUB
util=pot_structure(desc,orig,trans)
end
wrapped=util.line_wrap
- @pot[:body] << wrapped << @br # main text, contents, body KEEP
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
if @@endnotes[:para] \
and notes_s.length > 0 \
and not @@endnotes_
- @pot[:body] << @br
+ @pot[:body] << br
wrap_endnotes(notes_s,notes_t)
elsif @@endnotes[:para] \
and @@endnotes_
- @pot[:body] << @br*2
+ @pot[:body] << br*2
end
end
- def pot_structure_block(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_block(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
mark="block{\\n\\n...\\n\\n}block"
d=dob_src.is.to_s
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# block text is a text block with an opening and closing marker, the content of which may be wrapped"
+ instruct=%{\n# block text is a text block with an opening and closing marker, } \
+ + %{the content of which may be wrapped}
s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -627,14 +677,15 @@ GSUB
trans=(dob_trn=='') ? '' : dob_trn.obj
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
end
- def pot_structure_group(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_group(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
mark="group{\\n\\n...\\n\\n}group"
d=dob_src.is.to_s
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# group text is a text block with an opening and closing marker, the content of which may be wrapped"
+ instruct=%{\n# group text is a text block with an opening and closing marker, } \
+ + %{the content of which may be wrapped}
s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -642,14 +693,17 @@ GSUB
trans=(dob_trn=='') ? '' : dob_trn.obj
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
end
- def pot_structure_verse(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_verse(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
mark="poem{\n\nverse\n\nverse\n\n...\n\n}poem"
d=dob_src.is.to_s
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# verse are part of the text block described as a poem, the first verse is preceeded by an opening marker, and the last verse by a closing marker, the content of which should remain unwrapped"
+ instruct=%{\n# verse are part of the text block described as a poem, } \
+ + %{the first verse is preceeded by an opening marker, } \
+ + %{and the last verse by a closing marker, } \
+ + %{the content of which should remain unwrapped}
s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -657,14 +711,15 @@ GSUB
trans=(dob_trn=='') ? '' : dob_trn.obj
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
end
- def pot_structure_code(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_code(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
mark="code{\\n\\n...\\n\\n}code"
d=dob_src.is.to_s
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# codeblocks are a text block with an opening and closing marker, the content of which should remain unwrapped"
+ instruct=%{\n# codeblocks are a text block with an opening and closing marker, } \
+ + %{the content of which should remain unwrapped}
s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -672,14 +727,15 @@ GSUB
trans=(dob_trn=='') ? '' : dob_trn.obj
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
end
- def pot_structure_table(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
+ def pot_structure_table(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
mark="table{\\n\\n...\\n\\n}table"
d=dob_src.is.to_s
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# tables are a text block with an opening and closing marker, the content of which should remain unwrapped"
+ instruct=%{\n# tables are a text block with an opening and closing marker, } \
+ + %{the content of which should remain unwrapped}
s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
end
desc="#{d}#{s_mark}#{instruct}"
@@ -689,27 +745,67 @@ GSUB
trans=trans.gsub(/#{Mx[:tc_c]}/,"\n")
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
+ end
+ def pot_structure_idx_markup(idx)
+ struct=['={']
+ idx.sort.each do |x|
+ x.each_with_index do |y,i0|
+ case y
+ when String
+ struct << ';' unless struct[-1] =~/=\{/
+ struct << y
+ if x[i0+1].class == Hash \
+ and x[i0+1][:sub].length > 0
+ struct << ':'
+ end
+ when Hash
+ if y[:plus].to_i > 0
+ struct << '+' + y[:plus].to_s
+ end
+ if y[:sub].length > 0
+ y[:sub].each_with_index do |z,i1|
+ z.each_with_index do |a,i2|
+ #p a
+ if z.length > 0
+ struct << a[0]
+ if a[1][:plus].to_i > 0
+ struct << '+' + a[1][:plus].to_s
+ end
+ if (i1 + 1) < y[:sub].length
+ struct << '|'
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ struct << '}'
+ #puts struct.join
+ struct.join
end
- def pot_structure_idx(dob_src='',dob_trn='') #% Used to extract the structure of a document
+ def pot_structure_idx(dob_src='',dob_trn='') #% used for book index but broken as original markup lost, already abstracted, fix
mark="={ ... }"
instruct=s_mark=''
if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# the book index should be attached unwrapped to the preceding text block (there should be a new line, but no empty line)"
+ instruct=%{\n# the book index should be attached unwrapped to the preceding text block } \
+ + %{(there should be a new line, but no empty line)}
s_mark="\n# " + %{"\\n#{mark}\\n\\n"}
end
d='book-idx'
desc="#{d}#{s_mark}#{instruct}"
- orig='={' + dob_src.idx + '}'
+ orig=pot_structure_idx_markup(dob_src.idx) #'={' + dob_src.idx + '}'
trans=if defined? dob_trn.idx \
and not dob_trn.idx.nil? \
and not dob_trn.idx.empty?
- '={' + dob_trn.idx + '}'
+ pot_structure_idx_markup(dob_trn.idx) #'={' + dob_trn.idx + '}'
else ''
end
util=pot_structure(desc,orig,trans)
unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
+ @pot[:body] << unwrapped << br
end
def pot_markup(data_src,data_trn)
#@endnotes,@copen,@pot_contents_close=Array.new(3){[]}
@@ -738,24 +834,35 @@ GSUB
s+=1;t+=1
next
end
- if (data_src[s].is == :comment or data_trn[t].is == :comment) \
+ if ((data_src[s].is == :comment) \
+ || (data_trn[t].is == :comment)) \
and (data_src[s].is != data_trn[t].is)
if data_src[s].is == :comment
- puts "src (comment):\n\t" + data_src[s].obj if @md.opt.act[:maintenance][:set]==:on
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "src (comment):\n\t" \
+ + data_src[s].obj
+ end
s+=1
#next if data_src[s].is == :comment
elsif data_trn[t].is == :comment
- puts "trans (comment):\n\t" + data_trn[t].obj if @md.opt.act[:maintenance][:set]==:on
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "trans (comment):\n\t" \
+ + data_trn[t].obj
+ end
t+=1
#next if data_trn[t].is == :comment
end
end
- if (defined? data_src[s].ocn and data_src[s].ocn.is_a?(Fixnum)) \
- and (defined? data_trn[t].ocn and data_trn[t].ocn.is_a?(Fixnum)) \
+ if ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
and (data_src[s].ocn == data_trn[t].ocn)
@m_s,@m_t=s,t
- elsif (defined? data_src[s].ocn and data_src[s].ocn.is_a?(Fixnum)) \
- and (defined? data_trn[t].ocn and data_trn[t].ocn.is_a?(Fixnum)) \
+ elsif ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
and (data_src[s].ocn != data_trn[t].ocn)
p '--- OCN ---'
p 'mis-match'
@@ -770,7 +877,8 @@ GSUB
p data_trn[@m_t].ocn
p data_trn[@m_t].obj
exit
- elsif (defined? data_src[s].ocn and defined? data_trn[t].ocn \
+ elsif (((defined? data_src[s].ocn) \
+ && (defined? data_trn[t].ocn)) \
and data_src[s].ocn.class != data_trn[t].ocn.class)
p '--- OCN class ---'
p 'mis-match'
@@ -817,13 +925,20 @@ GSUB
@p_num=SiSU_Po4aUtils::ParagraphNumber.new(paranum)
end
case dob_src.is
- when :heading then pot_structure_heading(dob_src,notes_s,dob_trn,notes_t)
- when :para then pot_structure_para(dob_src,notes_s,dob_trn,notes_t)
- when :group then pot_structure_group(dob_src,notes_s,dob_trn,notes_t)
- when :block then pot_structure_block(dob_src,notes_s,dob_trn,notes_t)
- when :verse then pot_structure_verse(dob_src,notes_s,dob_trn,notes_t)
- when :code then pot_structure_code(dob_src,notes_s,dob_trn,notes_t)
- when :table then pot_structure_table(dob_src,notes_s,dob_trn,notes_t)
+ when :heading
+ pot_structure_heading(dob_src,notes_s,dob_trn,notes_t)
+ when :para
+ pot_structure_para(dob_src,notes_s,dob_trn,notes_t)
+ when :group
+ pot_structure_group(dob_src,notes_s,dob_trn,notes_t)
+ when :block
+ pot_structure_block(dob_src,notes_s,dob_trn,notes_t)
+ when :verse
+ pot_structure_verse(dob_src,notes_s,dob_trn,notes_t)
+ when :code
+ pot_structure_code(dob_src,notes_s,dob_trn,notes_t)
+ when :table
+ pot_structure_table(dob_src,notes_s,dob_trn,notes_t)
end
if defined? dob_src.idx \
and not dob_src.idx.nil? \
@@ -839,9 +954,10 @@ GSUB
end
#[dob_src,dob_trn]
end
- def markup(dob) # Used for major markup instructions
+ def markup(dob) # used for major markup instructions
SiSU_Env::InfoEnv.new(@md.fns)
- dob.obj=dob.obj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
"#{Px[:po_bold_o]}\\1#{Px[:po_bold_c]}").
gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,
"#{Px[:po_italics_o]}\\1#{Px[:po_italics_c]}").
@@ -861,19 +977,26 @@ GSUB
"#{Px[:po_monospace_o]}\\1#{Px[:po_monospace_c]}")
notes=''
unless dob.is==:code
- dob.obj=dob.obj.gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/,'\1').
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/,'\1').
gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
- gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1 [link: <\2>]').
- gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}image/,'\1 [link: local image]').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,
+ '\1 [link: <\2>]').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}image/,
+ '\1 [link: local image]').
gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1')
notes=extract_endnotes(dob)
#% ### footnotes current state - extracted
- dob.obj=dob.obj.gsub(/#{Mx[:en_a_o]}([\d]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'~^'). # endnote marker marked up
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:en_a_o]}([\d]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'~^'). # endnote marker marked up
#% ### footnotes current state - keep inline
#dob.obj.gsub!(/#{Mx[:en_a_o]}[\d]+\s+(.+?)#{Mx[:en_a_c]}/,'~{ \1 }~') # inline endnote with marker marked up
- gsub(/#{Mx[:en_b_o]}[\d]+\s+(.+?)#{Mx[:en_b_c]}/,'~[ \1 ]~'). # inline endnote with marker marked up
- gsub(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/,'~{\1 \2 }~'). # inline endnote with marker marked up
- gsub(/#{Mx[:en_b_o]}([*+]+)\s+(.+?)#{Mx[:en_b_c]}/,'~[\1 \2 ]~'). # inline endnote with marker marked up
+ gsub(/#{Mx[:en_b_o]}[\d]+\s+(.+?)#{Mx[:en_b_c]}/,
+ '~[ \1 ]~'). # inline endnote with marker marked up
+ gsub(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/,
+ '~{\1 \2 }~'). # inline endnote with marker marked up
+ gsub(/#{Mx[:en_b_o]}([*+]+)\s+(.+?)#{Mx[:en_b_c]}/,
+ '~[\1 \2 ]~'). # inline endnote with marker marked up
gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
@@ -902,9 +1025,12 @@ GSUB
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[:lnk_o]}(\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+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
- gsub(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,'[image: "\1"]')
+ gsub(/(?:^|[^_\\])#{Mx[:lnk_o]}(\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+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,
+ ' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
+ gsub(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,
+ '[image: "\1"]')
[dob,notes]
end
def publish(fn,pot)
@@ -914,18 +1040,18 @@ GSUB
content << pot[:metadata]
content << pot[:body]
content << @@endnotes[:end] if @@endnotes_
- Output.new(fn,content,@md).po4a
+ Output.new(fn,content,@md,@process).po4a
@@endnotes={ para: [], end: [] }
end
end
class Output <Source
include SiSU_Param
include SiSU_Env
- def initialize(fn,content,md)
- @fn,@content,@md=fn,content,md
+ def initialize(fn,content,md,process=:complete)
+ @fn,@content,@md,@process=fn,content,md,process
@file=SiSU_Env::FileOp.new(md,fn)
end
- def po4a #%pot output
+ def po4a #%pot output
file_pot=(@md.opt.f_pth[:lng] ==@md.opt.lng_base) \
? @file.write_file.pot
: @file.write_file.po
@@ -955,12 +1081,20 @@ GSUB
def po4a_git
unless @md.opt.act[:maintenance][:set]==:on
require_relative 'git' # git.rb
- git=SiSU_Git::Source.new(@md.opt)
- git.create_file_structure_git unless FileTest.directory?(@file.output_path.pot_git.dir)
+ git=SiSU_Git::Source.new(@md.opt,@process)
+ unless FileTest.directory?(@file.output_path.pot_git.dir)
+ git.create_file_structure_git
+ end
if @md.opt.f_pth[:lng] ==@md.opt.lng_base
- FileUtils::cp(@file.place_file.pot.dir, @file.output_path.pot_git.dir)
+ FileUtils::cp(
+ @file.place_file.pot.dir,
+ @file.output_path.pot_git.dir
+ )
else # naive, work on -->
- FileUtils::cp(@file.place_file.po.dir, @file.output_path.po_git.dir) #unless FileTest.file?(@file.place_file.po_git.dir)
+ FileUtils::cp(
+ @file.place_file.po.dir,
+ @file.output_path.po_git.dir
+ ) #unless FileTest.file?(@file.place_file.po_git.dir)
end
git.read
end
diff --git a/lib/sisu/v5/po4a_set.rb b/lib/sisu/current/po4a_set.rb
index b0d2baaa..a08eea35 100644
--- a/lib/sisu/v5/po4a_set.rb
+++ b/lib/sisu/current/po4a_set.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** po4a
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/po4a_set.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by flatfile output generators
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/po4a_set.rb;hb=HEAD>
=end
module SiSU_Po4aUtils
diff --git a/lib/sisu/v5/prog_text_translation.rb b/lib/sisu/current/prog_text_translation.rb
index d097ab27..1b96e651 100644
--- a/lib/sisu/v5/prog_text_translation.rb
+++ b/lib/sisu/current/prog_text_translation.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** internationalisation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/prog_text_translation.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: internationalisation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/prog_text_translation.rb;hb=HEAD>
=end
module SiSU_Translate
diff --git a/lib/sisu/v6/qrcode.rb b/lib/sisu/current/qrcode.rb
index 902411b6..8d933b71 100644
--- a/lib/sisu/v6/qrcode.rb
+++ b/lib/sisu/current/qrcode.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/qrcode.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/qrcode.rb;hb=HEAD>
=end
module SiSU_QRcode
diff --git a/lib/sisu/v6/relaxng.rb b/lib/sisu/current/relaxng.rb
index 95d227bb..c0083834 100644
--- a/lib/sisu/v6/relaxng.rb
+++ b/lib/sisu/current/relaxng.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** relaxng flow/logic
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/relaxng.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- ** Description: relaxng flow/logic
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/relaxng.rb;hb=HEAD>
=end
module SiSU_Relaxng
diff --git a/lib/sisu/v5/remote.rb b/lib/sisu/current/remote.rb
index 20e648dc..7741a6a3 100644
--- a/lib/sisu/v5/remote.rb
+++ b/lib/sisu/current/remote.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** remote operations, get source from or copy output to remote server
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/remote.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: remote operations, get source from or copy output to remote server
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/remote.rb;hb=HEAD>
=end
module SiSU_Remote
diff --git a/lib/sisu/v5/rexml.rb b/lib/sisu/current/rexml.rb
index 18041cf7..9a11305c 100644
--- a/lib/sisu/v5/rexml.rb
+++ b/lib/sisu/current/rexml.rb
@@ -1,67 +1,64 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** rexml testing of xml
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/rexml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: rexml testing of xml
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/rexml.rb;hb=HEAD>
=end
module SiSU_Rexml
# load XML file for REXML parsing
begin
require 'rexml/document' \
- if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir']
+ if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir']
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('rexml/document NOT FOUND (LoadError)')
@@ -73,7 +70,7 @@ module SiSU_Rexml
class Rexml
begin
require 'rexml/document' \
- if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir']
+ if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir']
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('rexml/document NOT FOUND (LoadError)')
diff --git a/lib/sisu/v5/se.rb b/lib/sisu/current/se.rb
index a4120429..94ada012 100644
--- a/lib/sisu/v5/se.rb
+++ b/lib/sisu/current/se.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se.rb;hb=HEAD>
=end
@@cX=nil
diff --git a/lib/sisu/v6/se_cleanoutput.rb b/lib/sisu/current/se_cleanoutput.rb
index e8395a1d..8fee88cf 100644
--- a/lib/sisu/v6/se_cleanoutput.rb
+++ b/lib/sisu/current/se_cleanoutput.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_cleanoutput.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_cleanoutput.rb;hb=HEAD>
=end
module SiSU_Clean_Output
diff --git a/lib/sisu/current/se_clear.rb b/lib/sisu/current/se_clear.rb
new file mode 100644
index 00000000..1d769268
--- /dev/null
+++ b/lib/sisu/current/se_clear.rb
@@ -0,0 +1,106 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_clear.rb;hb=HEAD>
+
+=end
+module SiSU_Clear
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ require_relative 'se_info_env' # se_info_env.rb
+ begin
+ require 'singleton'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('singleton NOT FOUND (LoadError)')
+ end
+ class Clear < SiSU_Info_Env::InfoEnv # se_info_env.rb
+ #todo unify with FileOp
+ def initialize(cmd,fns,operation='')
+ @cmd=cmd
+ begin
+ super(fns)
+ @env=SiSU_Env::InfoEnv.new(fns)
+ SiSU_Env::InfoVersion.instance
+ if operation.class.inspect =~/SiSU_Param/
+ @md=operation
+ end
+ case operation #watch
+ when /pdf/ then @env_out=''
+ when /sql/
+ when /xml|plaintext|ascii/ then @env_out=@env.path.output + @fnb #check change of name to plaintext from ascii
+ else
+ if defined? @md.sfx_src \
+ and @md.sfx_src =~/ss[ftsumc]/
+ @env_out_root=@env.path.output
+ @env_out="#{@env.path.output}/#{@fnb}"
+ @@publisher='SiSU http://www.jus.uio.no/sisu'
+ @env_pdf="#{@env_out_root}/pdf"
+ end
+ end
+ rescue
+ SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ def param_instantiate
+ @cX||=SiSU_Screen::Ansi.new(@cmd)
+ @@date=SiSU_Env::InfoDate.new
+ @@proc=@@filename_txt=@@filename_texinfo=@@filename_html_scroll=@@filename_html_index=@@filename_html_segtoc=@@filename_semantic=@@filename_rss=@@newfile=@@drr=@@yaml=@@yamladdr=nil
+ @@publisher='SiSU scribe'
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/se_createsite.rb b/lib/sisu/current/se_createsite.rb
index 943cf8c5..2d20007a 100644
--- a/lib/sisu/v5/se_createsite.rb
+++ b/lib/sisu/current/se_createsite.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_createsite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_createsite.rb;hb=HEAD>
=end
module SiSU_Create_Site
@@ -166,7 +163,7 @@ module SiSU_Create_Site
cp_images(src,dest) if FileTest.directory?(src)
end
def cp_base_images #fix images
- src=SiSU_is[:path_base_system_data] + '/image'
+ src=SiSU_is.path_base_system_data? + '/image'
dest_arr=[
"#{@env.path.webserv}/_sisu/image_sys",
"#{@env.path.webserv}/#{@env.path.base_markup_dir_stub}/_sisu/image_sys"
diff --git a/lib/sisu/v5/se_css.rb b/lib/sisu/current/se_css.rb
index 4d4713e1..13a099d5 100644
--- a/lib/sisu/v5/se_css.rb
+++ b/lib/sisu/current/se_css.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_css.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_css.rb;hb=HEAD>
=end
module SiSU_CSS
diff --git a/lib/sisu/current/se_date.rb b/lib/sisu/current/se_date.rb
new file mode 100644
index 00000000..0cdf8841
--- /dev/null
+++ b/lib/sisu/current/se_date.rb
@@ -0,0 +1,92 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_date.rb;hb=HEAD>
+
+=end
+module SiSU_Info_Date
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ class InfoDate
+ begin
+ require 'date'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('date NOT FOUND (LoadError)')
+ end
+ attr_accessor :dt,:t
+ def initialize
+ @dt,@t=Date.today.to_s,Time.now
+ end
+ def week
+ w=@t.strftime('%W')
+ "#{@t.year}w#{w}"
+ end
+ def month
+ "#{@t.year}#{@t.month}"
+ end
+ def year
+ @t.year
+ end
+ def weekonly
+ @t.strftime('%W')
+ end
+ def monthonly
+ @t.month
+ end
+ def year_static
+ YEAR
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/se_db.rb b/lib/sisu/current/se_db.rb
index 392af850..2207fb3d 100644
--- a/lib/sisu/v6/se_db.rb
+++ b/lib/sisu/current/se_db.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_db.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_db.rb;hb=HEAD>
=end
module SiSU_Info_Db
diff --git a/lib/sisu/v5/se_envcall.rb b/lib/sisu/current/se_envcall.rb
index 64758811..cda71630 100644
--- a/lib/sisu/v5/se_envcall.rb
+++ b/lib/sisu/current/se_envcall.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_envcall.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_envcall.rb;hb=HEAD>
=end
module SiSU_Env_Call
diff --git a/lib/sisu/v6/se_file_op.rb b/lib/sisu/current/se_file_op.rb
index ff9aa65a..3f9cb834 100644
--- a/lib/sisu/v6/se_file_op.rb
+++ b/lib/sisu/current/se_file_op.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_file_op.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_file_op.rb;hb=HEAD>
=end
module SiSU_Info_File
@@ -354,7 +351,7 @@ module SiSU_File_Op
pth=output_path.html.dir
make_path(pth)
p_fn=place_file.html_scroll.dir
- @@filename_html_scroll=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def html_seg_index
pth=((output_dir_structure.by_filename?) \
@@ -363,7 +360,7 @@ module SiSU_File_Op
: "#{output_path.html.dir}/#{@md.fnb}"
make_path(pth)
p_fn=place_file.html_seg_index.dir
- @@filename_html_index=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def html_segtoc
pth=((output_dir_structure.by_filename?) \
@@ -373,7 +370,7 @@ module SiSU_File_Op
: "#{output_path.html.dir}/#{@md.fnb}"
make_path(pth)
p_fn=place_file.html_segtoc.dir
- @@filename_html_index=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def xhtml
path=output_path.xhtml.dir
@@ -1011,19 +1008,11 @@ module SiSU_File_Op
def html_seg(fh)
fh=default_hash_build(fh,Sfx[:html])
fh[:lng]=lang_code?(fh[:lng])
- fnh=if output_dir_structure.by_filename?
- {
- fn: 'scroll',
- ft: fh[:ft],
- lng: fh[:lng],
- }
- else
- {
- fn: fh[:fn],
- ft: fh[:ft],
- lng: fh[:lng],
- }
- end
+ fnh={
+ fn: fh[:fn],
+ ft: fh[:ft],
+ lng: fh[:lng],
+ }
i18n(fnh)
end
def html_book_index(fh=nil)
@@ -2579,11 +2568,11 @@ module SiSU_Create_File
end
def file_semantic
fn='./semantic.yaml'
- @@filename_semantic=File.new(fn,'w+')
+ File.new(fn,'w+')
end
def file_rss
fn='./semantic.xml'
- @@filename_rss=File.new(fn,'w+')
+ File.new(fn,'w+')
end
def epub
@pth=@env.processing_path.epub
diff --git a/lib/sisu/v5/se_filemap.rb b/lib/sisu/current/se_filemap.rb
index 867111bb..82580025 100644
--- a/lib/sisu/v5/se_filemap.rb
+++ b/lib/sisu/current/se_filemap.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_filemap.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_filemap.rb;hb=HEAD>
=end
module SiSU_File_Map
diff --git a/lib/sisu/v5/se_get_init.rb b/lib/sisu/current/se_get_init.rb
index a74e22f9..a299cd10 100644
--- a/lib/sisu/v5/se_get_init.rb
+++ b/lib/sisu/current/se_get_init.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_get_init.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_get_init.rb;hb=HEAD>
=end
module SiSU_Get_Init
@@ -83,13 +80,13 @@ module SiSU_Get_Init
end
def rc_path_options
[
- "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_version?}",
"#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
- "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_version?}",
"#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
- "#{@@home}/.sisu/#{SiSU_is[:version_dir]}",
+ "#{@@home}/.sisu/#{SiSU_is.branch_version?}",
"#{@@home}/.sisu",
- "#{@@sisu_etc}/#{SiSU_is[:version_dir]}",
+ "#{@@sisu_etc}/#{SiSU_is.branch_version?}",
"#{@@sisu_etc}",
]
end
@@ -170,13 +167,13 @@ module SiSU_Get_Init
tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:'
if @markup_dir_changed_
@ad_path=[
- "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml",
- "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml",
- "#{@@home}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{@@home}/.sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{@@home}/.sisu/skin/yml",
- "#{@@sisu_etc}/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{@@sisu_etc}/#{SiSU_is.branch_version?}/skin/yml",
"#{@@sisu_etc}/skin/yml",
]
@ad_path.each do |v|
diff --git a/lib/sisu/v6/se_hub_particulars.rb b/lib/sisu/current/se_hub_particulars.rb
index ca9a8a06..f1c7f816 100644
--- a/lib/sisu/v6/se_hub_particulars.rb
+++ b/lib/sisu/current/se_hub_particulars.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- particulars, composite information about document being processed
+** Description: documents, structuring, processing, publishing, search
+*** particulars, composite information about document being processed
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_hub_particulars.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_hub_particulars.rb;hb=HEAD>
=end
module SiSU_Particulars
diff --git a/lib/sisu/v6/se_info_env.rb b/lib/sisu/current/se_info_env.rb
index e8342783..297a0a10 100644
--- a/lib/sisu/v6/se_info_env.rb
+++ b/lib/sisu/current/se_info_env.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_env.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_env.rb;hb=HEAD>
=end
@@current_document=Dir.pwd #nil #''
@@ -1063,7 +1060,7 @@ WOK
@sys.home
end
def sisurc_path
- GetInit.new.sisu_yaml.rc_path
+ SiSU_Get_Init::GetInit.new.sisu_yaml.rc_path
end
def pwd
@sys.pwd
@@ -1084,7 +1081,7 @@ WOK
@stub_pod
end
def etc
- defaults[:sisu_etc] #live/dynamic
+ defaults[:sisu_etc] #live/dynamic
end
def arch
@sys.dir_arch
@@ -1128,7 +1125,7 @@ WOK
def webserv_path #testing, check need, remove
webserv
end
- def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed)
+ def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed)
man_path=if @@man_path.nil?
man_path=if defined? @rc['webserv']['path'] \
and @rc['webserv']['path'] =~/\S\S+/
@@ -1166,17 +1163,17 @@ WOK
def webserv_map_pwd #dir
"#{path.webserv}/#{base_markup_dir_stub}"
end
- def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+ def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
defaults[:webserv_dir]
end
- def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+ def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
images=if defined? @rc['webserv']['images']
@rc['webserv']['images']
else defaults[:images]
end
"#{path.webserv}/#{images}"
end
- def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
+ def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
r=Px[:lng_lst_rgx]
u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
base_stub=@sys.pwd.gsub(u,'\1')
@@ -1194,7 +1191,7 @@ WOK
def feed_home
"#{public_output}/#{@rc['webserv']['feed_home']}"
end
- def scripts #used previously only to include tla version info
+ def scripts #used previously only to include tla version info
if defined? @rc['project']['path']
"#{home}/#{@rc['project']['path']}"
end
@@ -1213,19 +1210,28 @@ WOK
def output_tell
url.webserv_map_pwd
end
- def image_source #image repository source directory
+ def image_source_sisu_includes(md=nil)
+ if md \
+ and (md.opt.sisu_install_type? == \
+ :full_path_to_sisu_bin_in_sisu_dir_tree) \
+ and FileTest.directory?(
+ "#{md.opt.sisu_data_dir?}/image"
+ )==true
+ "#{md.opt.sisu_data_dir?}/image"
+ else
+ "#{share}/image"
+ end
+ end
+ def image_source(md=nil) #image repository source directory
if defined? @rc['image']['path'] \
and defined? @rc['image']['public']
pth="#{@rc['image']['path']}"
"#{pth}/#{@rc['image']['public']}"
else
- "#{share}/image"
+ image_source_sisu_includes(md)
end
end
- def image_source_sisu_includes
- "#{share}/image"
- end
- def image_source_include #image repository source directory
+ def image_source_include(md=nil) #image repository source directory
if defined? @rc['image']['path'] \
and defined? @rc['image']['public'] \
and FileTest.directory?(
@@ -1239,7 +1245,7 @@ WOK
)==true
"#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}"
else
- "#{share}/image"
+ image_source_sisu_includes(md)
end
end
def image_external
@@ -1251,7 +1257,8 @@ WOK
end
end
def image_source_include_remote
- if FileTest.directory?(image_external); image_external
+ if FileTest.directory?(image_external)
+ image_external
end
end
self
@@ -1286,7 +1293,7 @@ WOK
end
v=SiSU_Env::InfoVersion.instance.get_version
v_dev=(DEVELOPER[:maintenance]==:true) \
- ? "_#{v[:version]}"
+ ? "_#{v.version}"
: ''
path=if proposed_path_base \
and FileTest.directory?(proposed_path_base) \
@@ -1476,7 +1483,9 @@ WOK
def epub_cp_images(md)
pth="#{processing_path.epub}/#{Ep[:d_oebps]}/image"
FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
- src="#{path.share}/image"
+ src=(md.opt.sisu_install_type? == :full_path_to_sisu_bin_in_sisu_dir_tree) \
+ ? "#{md.opt.sisu_data_dir?}/image"
+ : "#{md.opt.sisu_data_dir?}/sisu/image"
images=%W[bullet_09.png arrow_next_red.png arrow_prev_red.png arrow_up_red.png]
images.each do |i| #move to avoid repeated tests
if FileTest.file?("#{src}/#{i}")
@@ -2107,7 +2116,8 @@ WOK
FileUtils::rm_rf(processing_path.processing_path.odf_pth)
FileUtils::mkdir_p(processing_path.processing_path.odf_pth)
system(
- "unzip -q #{path.share}/#{SiSU_is[:version_dir]}/odf/odt.zip -d #{processing_path.odf_pth}"
+ "unzip -q #{path.share}/#{SiSU_is.branch_name?}/odf/odt.zip -d #{processing_path.odf_pth}"
+ #"unzip -q #{path.share}/#{SiSU_is.branch_version?}/odf/odt.zip -d #{processing_path.odf_pth}"
)
end
def sisupod_gen(fns_pod)
diff --git a/lib/sisu/current/se_info_port.rb b/lib/sisu/current/se_info_port.rb
new file mode 100644
index 00000000..17275b0c
--- /dev/null
+++ b/lib/sisu/current/se_info_port.rb
@@ -0,0 +1,70 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_port.rb;hb=HEAD>
+
+=end
+module SiSU_Info_Port
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ require_relative 'se_info_env' # se_info_env.rb
+ class InfoPort < SiSU_Info_Env::InfoEnv # se_info_env.rb
+ def initialize
+ @env=SiSU_Env::InfoEnv.new
+ end
+ def webrick
+ @env.port.webrick_port
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/se_info_system.rb b/lib/sisu/current/se_info_system.rb
index 58de52a0..969b508a 100644
--- a/lib/sisu/v6/se_info_system.rb
+++ b/lib/sisu/current/se_info_system.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_system.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_info_system.rb;hb=HEAD>
=end
module SiSU_Info_Sys_Gen
@@ -68,15 +65,15 @@ module SiSU_Info_Sys_Gen
error('rbconfig NOT FOUND (LoadError)')
end
@@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'
- share=Config::CONFIG['datadir'] + '/sisu'
- data=Config::CONFIG['datadir'] + '/doc/sisu'
+ ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],RbConfig::CONFIG['sysconfdir'] + '/sisu',RbConfig::CONFIG['host'],RbConfig::CONFIG['arch'],%x{ruby -v}.strip,RbConfig::CONFIG['archdir'],RbConfig::CONFIG['sitearchdir'],RbConfig::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # RbConfig::CONFIG['rb_ver']
+ out=RbConfig::CONFIG['localstatedir']
+ etc=RbConfig::CONFIG['sysconfdir'] + '/sisu'
+ share=RbConfig::CONFIG['datadir'] + '/sisu'
+ data=RbConfig::CONFIG['datadir'] + '/doc/sisu'
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@stub_pwd ||=@@pwd[m,1]
@base_markup_dir_stub=SiSU_Utils::Path.new.base_markup_stub
- prcss_dir='_sisu_processing_' + '.' + SiSU_is[:version_dir]
+ prcss_dir='_sisu_processing_' + '.' + SiSU_is.branch_version?
prcss_dir_tmp_root="/tmp/#{prcss_dir}"
prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}"
if @@user
diff --git a/lib/sisu/current/se_load.rb b/lib/sisu/current/se_load.rb
new file mode 100644
index 00000000..a0086049
--- /dev/null
+++ b/lib/sisu/current/se_load.rb
@@ -0,0 +1,108 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_load.rb;hb=HEAD>
+
+=end
+module SiSU_Load
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ class Load
+ def initialize(prog,mandatory=false)
+ @prog,@mandatory=prog,mandatory
+ end
+ def prog
+ load_prog=false
+ $:.each do |reqpath|
+ if FileTest.exist?("#{reqpath}/#{@prog}.rb")
+ load_prog=true
+ #SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).ok("#{reqpath}/#{@prog}.rb loaded")
+ break
+ #else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{reqpath}/#{@prog}.rb not found")
+ end
+ end
+ if load_prog \
+ and @prog=~/dbi/
+ begin
+ require 'dbi'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('dbi NOT FOUND (LoadError)')
+ end
+ end
+ if load_prog
+ begin
+ require @prog
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error("#{@prog} NOT FOUND (LoadError)")
+ end
+ else
+ @mandatory \
+ ? (SiSU_Screen::Ansi.new(@prog,"*WARN* module required: #{@prog}").warn)
+ : '' #(SiSU_Screen::Ansi.new(@prog,"*WARN* #{@prog} load requested").warn)
+ end
+ load_prog
+ end
+ def prog?
+ load_prog=false
+ $:.each do |reqpath|
+ if FileTest.exist?("#{reqpath}/#{@prog}.rb"); load_prog=true
+ break
+ end
+ end
+ load_prog
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/se_processing.rb b/lib/sisu/current/se_processing.rb
index 2f41bb17..9a5f9ab2 100644
--- a/lib/sisu/v6/se_processing.rb
+++ b/lib/sisu/current/se_processing.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_processing.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_processing.rb;hb=HEAD>
=end
module SiSU_Processing_Settings
diff --git a/lib/sisu/v6/se_programs.rb b/lib/sisu/current/se_programs.rb
index 5c8bb70f..83c57977 100644
--- a/lib/sisu/v6/se_programs.rb
+++ b/lib/sisu/current/se_programs.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_programs.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_programs.rb;hb=HEAD>
=end
module SiSU_Sys_Call
@@ -75,7 +72,7 @@ module SiSU_Sys_Call
@sys=SiSU_Info_Sys::InfoSystem.instance
end
def program_found?(program)
- found=`which #{program}` #`whereis #{program}`
+ found=`which #{program} 2>&1` #`whereis #{program}`
(found =~/bin\/#{program}\b/) ? true : false
end
def locale #locales utf8 or other
@@ -250,7 +247,7 @@ module SiSU_Sys_Call
#STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
- def graphicksmagick #graphicsmagick is a image manipulation program
+ def graphicsmagick #graphicsmagick is a image manipulation program
program='gm'
#program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
diff --git a/lib/sisu/v5/se_remotes.rb b/lib/sisu/current/se_remotes.rb
index 633d85e9..77876637 100644
--- a/lib/sisu/v5/se_remotes.rb
+++ b/lib/sisu/current/se_remotes.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_remotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_remotes.rb;hb=HEAD>
=end
module SiSU_Info_Remote_Host
diff --git a/lib/sisu/v5/se_standardise_lang.rb b/lib/sisu/current/se_standardise_lang.rb
index f7be20df..3293b8c4 100644
--- a/lib/sisu/v5/se_standardise_lang.rb
+++ b/lib/sisu/current/se_standardise_lang.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_standardise_lang.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_standardise_lang.rb;hb=HEAD>
=end
@@lang_info=nil
diff --git a/lib/sisu/v6/se_version.rb b/lib/sisu/current/se_version.rb
index b5998b26..464af3d9 100644
--- a/lib/sisu/v6/se_version.rb
+++ b/lib/sisu/current/se_version.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_version.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/se_version.rb;hb=HEAD>
=end
module SiSU_Info_Version
@@ -85,16 +82,19 @@ module SiSU_Info_Version
? @@lib_path
: `echo $RUBYLIB`.split(':')
@@lib_path ||=lib_path
- if File.exist?(SiSU_is[:version_info_path])
- @version=YAML::load(File::open(SiSU_is[:version_info_path]))
+ if File.exist?(SiSU_is.version_info_path?)
+ @version=YAML::load(File::open(SiSU_is.version_info_path?))
end
- @version[:install_method]=if SiSU_is[:run_from]==:gem_install
+ @version[:install_method]=if SiSU_is.runtime_type? ==:gem_install
spec = Gem::Specification.find_by_name("sisu")
gem_root = spec.gem_dir
- (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is[:version_dir]}/,'')) == gem_root) \
+ (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is.branch_name?}/,'')) == gem_root) \
? ' (ruby gem install)' : ''
else ''
end
+ @version[:branch_name]=SiSU_is.branch_name?
+ @version[:branch_version]=SiSU_is.branch_version?
+ @version[:branch_number]=/^v([0-9]+)$/.match(@version[:branch_version])[1]
@version
end
def rbversion
diff --git a/lib/sisu/v5/shared_images.rb b/lib/sisu/current/shared_images.rb
index 1bd08260..6d244945 100644
--- a/lib/sisu/v5/shared_images.rb
+++ b/lib/sisu/current/shared_images.rb
@@ -1,60 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_images.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_images.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: common file for xml generation
=end
module SiSU_Images
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -127,7 +125,7 @@ module SiSU_Images
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="#{SiSU_is[:path_base_system_data]}/image"
+ src_path="#{SiSU_is.path_base_system_data?}/image"
dest=dest_path(:image_sys)
copy(src_path,dest,images)
end
diff --git a/lib/sisu/v6/shared_markup_alt.rb b/lib/sisu/current/shared_markup_alt.rb
index 83f843be..50984a22 100644
--- a/lib/sisu/v6/shared_markup_alt.rb
+++ b/lib/sisu/current/shared_markup_alt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_markup_alt.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_markup_alt.rb;hb=HEAD>
=end
module SiSU_TextRepresentation
diff --git a/lib/sisu/v6/shared_metadata.rb b/lib/sisu/current/shared_metadata.rb
index 646d7f72..92d32dda 100644
--- a/lib/sisu/v6/shared_metadata.rb
+++ b/lib/sisu/current/shared_metadata.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_metadata.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_metadata.rb;hb=HEAD>
=end
module SiSU_Metadata
diff --git a/lib/sisu/v6/shared_sem.rb b/lib/sisu/current/shared_sem.rb
index 74cfeaa7..35547f3a 100644
--- a/lib/sisu/v6/shared_sem.rb
+++ b/lib/sisu/current/shared_sem.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- Sematic tags
+** Description: documents, structuring, processing, publishing, search
+*** Sematic tags
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_sem.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/shared_sem.rb;hb=HEAD>
=end
module SiSU_Sem
diff --git a/lib/sisu/current/sisu_thor_lib.rb b/lib/sisu/current/sisu_thor_lib.rb
new file mode 100644
index 00000000..3212e923
--- /dev/null
+++ b/lib/sisu/current/sisu_thor_lib.rb
@@ -0,0 +1,407 @@
+module SiSU_Po4a_Actions
+ require_relative 'utils_response' # utils_response.rb
+ include SiSU_Response
+ @@source=@@targets=nil
+ def project_details
+ def name
+ 'SiSU translations under po4a management'
+ end
+ def name_warning
+ <<-WOK
+#{name}
+
+WARNING all sisu markup files (.ssm, .sst, .ssi) in languages other than #{language.source_language_selected}
+are managed by po4a, through translations of the source language to other languages.
+
+#{language.info_on_selection}
+ WOK
+ end
+ def setup_project
+ "Setup file for placing #{name}"
+ end
+ self
+ end
+ def notice
+ def warn_and_proceed?
+ '*WARNING* this software module creates, destroys, overwrites directories' + "\n" \
+ + '*WARNING*: Use this Software at your own risk!'
+ end
+ def default(selection=nil)
+ selections=:strict #selections=:short
+ ans=if selection
+ case selection
+ when selection.is_a?(String)
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ when :make
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ selected (or configured) languages to be used
+ source language: #{language.source_language_available_str}
+ target languages: #{language.translation_languages_selected_that_are_available.inspect}
+
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will create sub-directories for the
+ selected (or configured) target languages:
+ #{language.translation_languages_selected_that_are_available.inspect}
+ & the po4a configuration file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ It will populate the sub-directories with translation files created from
+ the pot and po files found under the corresponding language
+ sub-directories, (under #{dir.pot}/ & #{dir.po}/).
+ (OVERWRITING any existing translated .ssm .sst .ssi files
+ in language subdirectories that are not under po4a management).
+
+ You should backup the current directory:
+ #{Dir.pwd}
+
+#{warn_and_proceed?}
+ WOK
+ when :clean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+#{warn_and_proceed?}
+ WOK
+ when :distclean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will remove the sub-directories (if they exist):
+ #{language.possible_translations.inspect}
+
+ #{language.translation_languages_selected_that_are_available.inspect}
+ & file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ Note: these sub-directories & the config file #{filename.po4a_cfg}
+ should be auto-generated from pot and po files if this project translation
+ is under po4a management.
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ when :rebuild
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will destroy/clobber and then create again the
+ sub-directories:
+ #{language.translation_languages_selected_that_are_available.inspect}
+ populating them with translation files created from the pot and po files
+ found under the corresponding language sub-directories in (#{dir.pot}/
+ & #{dir.po}/).
+ It will also generate the file: #{filename.po4a_cfg}
+ These actions will be taken in the current directory:
+ #{Dir.pwd}
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "install and to setup #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ exit unless query.answer?(ans)
+ end
+ def project_help
+ puts <<-WOK
+#{project_details.name}
+#{project_details.setup_project}
+
+This setup file is primarily to assist with having sisu markup files under po4a
+translation management. It assumes that the source language files are placed
+under the sub-directory identifying the source language set, which is currently
+#{language.source_language_selected}
+The files there are used to make the source translation file in the directory #{dir.pot}/
+Which is then used to create files for translation under the directory #{dir.po}/
+in sub-directories bearing the translation languages ISO code.
+
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+
+ WOK
+ end
+ self
+ end
+ def generate
+ def readme
+ system(%{ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm})
+ end
+ def manpage
+ system(%{ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm})
+ end
+ self
+ end
+ def filename
+ def languages_src_tgt
+ #'translation_languages'
+ 'languages_source_and_targets'
+ end
+ def po4a_cfg
+ 'po4a.cfg'
+ end
+ self
+ end
+ def dir
+ def pwd
+ Dir.pwd
+ end
+ def po4a_
+ 'po4a/' # ''
+ end
+ def pot
+ po4a_ + 'pot'
+ end
+ def po
+ po4a_ + 'po'
+ end
+ self
+ end
+ def dir_mk(dir)
+ FileUtils::mkdir_p(dir) unless FileTest.directory?(dir)
+ end
+ def po4a_flags
+ def debug
+ '-d -v'
+ end
+ def normal
+ ''
+ end
+ def quiet
+ '-q'
+ end
+ self
+ end
+ def languages_from_file
+ def language_source
+ if @@source.is_a?(String) \
+ and @@source =~ /w{2,4}/
+ else languages_extract_from_file
+ end
+ @@source
+ end
+ def language_targets
+ if @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ else languages_extract_from_file
+ end
+ @@targets
+ end
+ def languages_extract_from_file
+ if (@@source.is_a?(String) \
+ and @@source =~/\w{2,4}/) \
+ and (@@targets.is_a?(Array) \
+ and @@targets.length > 0)
+ else
+ if FileTest.file?(filename.languages_src_tgt)
+ puts 'file: "' + filename.languages_src_tgt + '" found and used (unless overridden)'
+ langs=IO.read(filename.languages_src_tgt, mode: 'r:utf-8').scan(/source:\s+\w+|target:\s+\w.+/)
+ langs.each do |sel|
+ case sel
+ when /source:/
+ source=sel.split(/source:\s*|\s+/).join
+ source=(source =~/\w{2,4}/) ? source : nil
+ @@source=unless @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ source
+ else @@source
+ end
+ when /target:/
+ @@targets=unless @@targets.is_a?(Array)
+ sel.split(/targets?:\s*|\s+/) - ['']
+ else @@targets
+ end
+ end
+ end
+ else
+ puts %{(create) missing instruction file: "#{filename.languages_src_tgt}"\n contents e.g.:\n source: en\n target: de fr es ja ru zh\n no po target languages found}
+ exit
+ end
+ end
+ end
+ self
+ end
+ def language
+ def source_language_selected(src=nil)
+ @@source=if not @@source.nil? \
+ and @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ @@source
+ elsif (src \
+ && src.is_a?(String) \
+ && src.length > 1)
+ src
+ else
+ src=languages_from_file.language_source
+ end
+ end
+ def translation_languages_selected(targets=nil) #translation_languages
+ @@targets=if not @@targets.nil? \
+ and @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ @@targets
+ elsif (targets \
+ && targets.is_a?(Array) \
+ && targets.length > 0)
+ targets
+ else
+ targets=languages_from_file.language_targets
+ end
+ end
+ def source_language_available
+ [source_language_selected] & sisu_languages_available
+ end
+ def translation_languages_selected_that_are_available
+ translation_languages_selected & sisu_languages_available
+ end
+ def info_on_selection
+ if translation_languages_selected != translation_languages_selected_that_are_available
+ <<-WOK
+WARNING: language selections mismatch
+
+The current language translation selection appears to be: #{translation_languages_selected_str}
+Of which the following are valid (available) selections: #{translation_languages_selected_that_are_available_str}
+
+sisu available language list: #{sisu_languages_available_str}
+
+the following will be used: #{translation_languages_selected_that_are_available_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+ WOK
+ else
+ <<-WOK
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+ WOK
+ end
+ end
+ def sisu_languages_available
+ $SiSU_Language_Codes.language_list.codes
+ end
+ def possible_translations
+ sisu_languages_available - [source_language_selected]
+ end
+ def translation_languages_selected_str
+ language.translation_languages_selected.join(' ')
+ end
+ def source_language_available_str
+ source_language_available.join
+ end
+ def translation_languages_selected_that_are_available_str
+ language.translation_languages_selected_that_are_available.join(' ')
+ end
+ def sisu_languages_available_str
+ language.sisu_languages_available.join(' ')
+ end
+ def posible_translations_str
+ language.posible_translations.join(' ')
+ end
+ self
+ end
+ def files_src
+ def ssm
+ Dir.glob("#{language.source_language_selected}/*.ssm").sort
+ end
+ def sst
+ Dir.glob("#{language.source_language_selected}/*.sst").sort
+ end
+ def ssi
+ Dir.glob("#{language.source_language_selected}/*.ssi").sort
+ end
+ def all
+ Dir.glob("#{language.source_language_selected}/*{.ssm,.sst,.ssi}").sort
+ end
+ self
+ end
+ def po4a_cfg_file
+ File.open("#{Dir.pwd}/#{filename.po4a_cfg}",'w')
+ end
+ def po4a_create
+ def configure #po4a_cfg
+ po4a_cfg_arr=[]
+ po4a_cfg_arr \
+ << "[po4a_langs] #{language.translation_languages_selected_that_are_available_str}"
+ po4a_cfg_arr \
+ << "[po4a_paths] #{dir.pot}/$master.pot $lang:#{dir.po}/$lang/$master.po"
+ files_src.ssm.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.sst.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.ssi.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ file=po4a_cfg_file
+ po4a_cfg_arr.each do |txt|
+ puts txt
+ file << txt << "\n"
+ end
+ file.close
+ cmd='po4a --keep 0 ' \
+ + po4a_flags.normal + ' ' \
+ + filename.po4a_cfg
+ #cmd='po4a --keep 0 --no-backups --package-name ' \
+ #+ 'sisu-manual' + ' ' \
+ #+ po4a_flags.normal + ' ' \
+ #+ filename.po4a_cfg
+ system(cmd); puts cmd
+ end
+ self
+ end
+ def project
+ def make
+ dir_mk(dir.pot)
+ language.translation_languages_selected_that_are_available.each do |lang_dir|
+ dir_lang="#{Dir.pwd}/#{dir.po}/#{lang_dir}"
+ dir_mk(dir_lang)
+ end
+ po4a_create.configure
+ end
+ def clean
+ #rm -f po/*/*.po~
+ #rm -rf ../build
+ FileUtils.rm_f Dir.glob("./#{dir.po}/*/*.po~")
+ end
+ def distclean
+ #rm -f po4a.cfg
+ #rm -rf $(LANGUAGES)
+ FileUtils::rm_f(filename.po4a_cfg)
+ FileUtils::rm_r(language.possible_translations,:force => true)
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v6/sitemaps.rb b/lib/sisu/current/sitemaps.rb
index 39432146..61c62172 100644
--- a/lib/sisu/v6/sitemaps.rb
+++ b/lib/sisu/current/sitemaps.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** sitemap created from document parameters
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sitemaps.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: sitemap created from document parameters
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sitemaps.rb;hb=HEAD>
=end
module SiSU_Sitemaps
diff --git a/lib/sisu/current/src_kdissert_share.rb b/lib/sisu/current/src_kdissert_share.rb
new file mode 100644
index 00000000..2220aea0
--- /dev/null
+++ b/lib/sisu/current/src_kdissert_share.rb
@@ -0,0 +1,102 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** share sisu source markup file, copy it to output directory!
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_share_kdissert.rb;hb=HEAD>
+
+=end
+module SiSU_KdiSource
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source
+ begin
+ require 'fileutils'
+ include FileUtils
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('fileutils NOT FOUND (LoadError)')
+ end
+ def initialize(opt)
+ @opt=opt
+ @env=SiSU_Env::InfoEnv.new(@opt.fns)
+ @output_path="#{@env.path.output}/#{@opt.fnb}"
+ end
+ def read
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share Kdissert Source Document!',
+ @opt.fnb
+ ).green_hi_blue unless @opt.act[:quiet][:set]==:on
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Copy kdissert file to output directory",
+ "#{@opt.fnb} -> #{@output_path}"
+ ).warn unless @opt.act[:quiet][:set]==:on
+ FileUtils::mkdir_p(@env.path.output) unless FileTest.directory?(@env.path.output)
+ FileUtils::mkdir_p(@output_path) unless FileTest.directory?(@output_path)
+ if FileTest.directory?(@output_path)
+ if @opt.fns =~/\.kdi\._sst$/ \
+ and FileTest.file?(@opt.fnb)
+ FileUtils::cp(@opt.fnb,@output_path)
+ end
+ else
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Output directory does not exist",
+ "#{@opt.fnb} -> #{@output_path}"
+ ).warn unless @opt.act[:quiet][:set]==:on
+ exit
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/current/src_share.rb b/lib/sisu/current/src_share.rb
new file mode 100644
index 00000000..7d3564f2
--- /dev/null
+++ b/lib/sisu/current/src_share.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** share sisu source markup file, copy it to output directory!
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_share.rb;hb=HEAD>
+
+=end
+module SiSU_Markup
+ require_relative 'src_shared' # src_shared.rb
+ include SiSU_Source
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source < SiSU_Source::SiSUpodSource
+ def initialize(opt,build=nil,place=nil)
+ super(opt,build,place)
+ @opt=opt
+ end
+ def read
+ unless @opt.act[:quiet][:set]==:on
+ (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
+ ? SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share document markup text source',
+ @opt.fns
+ ).cyan_hi_blue
+ : SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ '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.act[:maintenance][:set]==:on) \
+ ? '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
+ if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ '',
+ "#{@opt.fno} not available"
+ ).blue_tab
+ end
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/src_shared.rb b/lib/sisu/current/src_shared.rb
index 957fcb30..a6c41c22 100644
--- a/lib/sisu/v6/src_shared.rb
+++ b/lib/sisu/current/src_shared.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** create sisupod filetype and copy it to output directory!
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: create sisupod filetype and copy it to output directory!
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_shared.rb;hb=HEAD>
=end
module SiSU_Source
diff --git a/lib/sisu/v5/src_sisupod_make.rb b/lib/sisu/current/src_sisupod_make.rb
index 0077948e..5eefdcff 100644
--- a/lib/sisu/v5/src_sisupod_make.rb
+++ b/lib/sisu/current/src_sisupod_make.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** create sisupod filetype and copy it to output directory!
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_sisupod_make.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: create sisupod filetype and copy it to output directory!
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/src_sisupod_make.rb;hb=HEAD>
=end
module SiSU_Doc
diff --git a/lib/sisu/v6/sst_convert_markup.rb b/lib/sisu/current/sst_convert_markup.rb
index d92461f6..447514f4 100644
--- a/lib/sisu/v6/sst_convert_markup.rb
+++ b/lib/sisu/current/sst_convert_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_convert_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_convert_markup.rb;hb=HEAD>
=end
module SiSU_Modify
diff --git a/lib/sisu/v6/sst_do_inline_footnotes.rb b/lib/sisu/current/sst_do_inline_footnotes.rb
index 42fd559e..3a623d55 100644
--- a/lib/sisu/v6/sst_do_inline_footnotes.rb
+++ b/lib/sisu/current/sst_do_inline_footnotes.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** preprocessing, convert bi-footnotemarker-footnote to inline
+ footnotes, invoked using: sisu --to-footnotes filename.sst
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/set_do_inline_footnotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: preprocessing, convert bi-footnotemarker-footnote to inline
- footnotes, invoked using: sisu --to-footnotes filename.sst
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/set_do_inline_footnotes.rb;hb=HEAD>
=end
module SiSU_ConvertFootnotes
diff --git a/lib/sisu/v5/sst_from_xml.rb b/lib/sisu/current/sst_from_xml.rb
index e18e1798..3b253775 100644
--- a/lib/sisu/v5/sst_from_xml.rb
+++ b/lib/sisu/current/sst_from_xml.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Conversion script from kdissert .kdi to sisu markup .ssm (master document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_from_xml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Conversion script from kdissert .kdi to sisu markup .ssm
- (master document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_from_xml.rb;hb=HEAD>
=end
module SiSU_sstFromXML
diff --git a/lib/sisu/v6/sst_identify_markup.rb b/lib/sisu/current/sst_identify_markup.rb
index bd2e4569..5a41fb54 100644
--- a/lib/sisu/v6/sst_identify_markup.rb
+++ b/lib/sisu/current/sst_identify_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_identify_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_identify_markup.rb;hb=HEAD>
=end
module SiSU_Markup
diff --git a/lib/sisu/v6/sst_to_s_xml_sax.rb b/lib/sisu/current/sst_to_s_xml_sax.rb
index 5a77903a..f82f44b6 100644
--- a/lib/sisu/v6/sst_to_s_xml_sax.rb
+++ b/lib/sisu/current/sst_to_s_xml_sax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** simple xml representation (sax style)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_to_s_xml_sax.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/sst_to_s_xml_sax.rb;hb=HEAD>
=end
module SiSU_SimpleXML_ModelSax
diff --git a/lib/sisu/v5/termsheet.rb b/lib/sisu/current/termsheet.rb
index 9349816a..7089f1c5 100644
--- a/lib/sisu/v5/termsheet.rb
+++ b/lib/sisu/current/termsheet.rb
@@ -1,62 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** specialised pre-processing wrapper
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/termsheet.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, specialised pre-processing wrapper
- ** NOTE wrapper makes little sense without additional components, additional
- sample files must be provided - (saved till later as may confuse)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/termsheet.rb;hb=HEAD>
=end
require_relative 'se' # se.rb
@@ -151,6 +146,9 @@ report_html.join("\n")
summary_file << "#{report_thlnk}"
summary_html << "#{report_html}"
__END__
+** NOTE wrapper makes little sense without additional components, additional
+ sample files must be provided - (saved till later as may confuse)
+*** bits
sisu -t x_bank.and.*
e.g. sisu -t x_bank.and.*.termsheet.rb
e.g. sisu_termsheet.rb -t x_bank.and.c*.termsheet.rb
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/current/texinfo.rb
index 92b7241c..898312cc 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/current/texinfo.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** texinfo processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: texinfo processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texinfo.rb;hb=HEAD>
=end
module SiSU_TexInfo
diff --git a/lib/sisu/v6/texinfo_format.rb b/lib/sisu/current/texinfo_format.rb
index 03ec2609..c03e2ec7 100644
--- a/lib/sisu/v6/texinfo_format.rb
+++ b/lib/sisu/current/texinfo_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** texinfo formatting template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texinfo_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: texinfo formatting template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texinfo_format.rb;hb=HEAD>
=end
module SiSU_TexInfoFormat
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/current/texpdf.rb
index 79a36c0d..cd4504aa 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/current/texpdf.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** LaTeX generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texpdf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: LaTeX generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texpdf.rb;hb=HEAD>
=end
module SiSU_TeX
diff --git a/lib/sisu/v6/texpdf_format.rb b/lib/sisu/current/texpdf_format.rb
index 134a2b2f..a1a147e1 100644
--- a/lib/sisu/v6/texpdf_format.rb
+++ b/lib/sisu/current/texpdf_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** LaTeX formatting template, unicode utf-8 version, used for pdf
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texpdf_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: LaTeX formatting template, unicode utf-8 version, used for pdf
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/texpdf_format.rb;hb=HEAD>
=end
module SiSU_TeX_Pdf
diff --git a/lib/sisu/v5/texpdf_parts.rb b/lib/sisu/current/texpdf_parts.rb
index d5daf004..229785df 100644
--- a/lib/sisu/v5/texpdf_parts.rb
+++ b/lib/sisu/current/texpdf_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_parts.rb;hb=HEAD>
=end
module SiSU_Parts_TeXpdf
diff --git a/lib/sisu/v5/txt_asciidoc.rb b/lib/sisu/current/txt_asciidoc.rb
index 3545fcb0..65488bd5 100644
--- a/lib/sisu/v5/txt_asciidoc.rb
+++ b/lib/sisu/current/txt_asciidoc.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, asciidoc
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_asciidoc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, asciidoc
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_asciidoc.rb;hb=HEAD>
=end
module SiSU_Txt_AsciiDoc
diff --git a/lib/sisu/v6/txt_markdown.rb b/lib/sisu/current/txt_markdown.rb
index eb220a46..1ec2bdf2 100644
--- a/lib/sisu/v6/txt_markdown.rb
+++ b/lib/sisu/current/txt_markdown.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, markdown
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/plaintext_markdown.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, markdown
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_markdown.rb;hb=HEAD>
=end
module SiSU_Txt_Markdown
diff --git a/lib/sisu/v6/txt_plain.rb b/lib/sisu/current/txt_plain.rb
index c988c50f..0edd6551 100644
--- a/lib/sisu/v6/txt_plain.rb
+++ b/lib/sisu/current/txt_plain.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext text generation, stripped plaintext output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/plaintext.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext text generation, stripped plaintext output (unix,
- linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext.rb;hb=HEAD>
=end
module SiSU_Txt_Plain
diff --git a/lib/sisu/v6/txt_rst.rb b/lib/sisu/current/txt_rst.rb
index 8e08ba81..238c0bb7 100644
--- a/lib/sisu/v6/txt_rst.rb
+++ b/lib/sisu/current/txt_rst.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, rST
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/plaintext_rst.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, rST
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_rst.rb;hb=HEAD>
=end
module SiSU_Txt_rST
diff --git a/lib/sisu/v6/txt_shared.rb b/lib/sisu/current/txt_shared.rb
index f2b4a0bf..a47279bb 100644
--- a/lib/sisu/v6/txt_shared.rb
+++ b/lib/sisu/current/txt_shared.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by flatfile output generators
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/txt_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by flatfile output generators
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/txt_shared.rb;hb=HEAD>
=end
module SiSU_TextUtils
diff --git a/lib/sisu/v6/txt_textile.rb b/lib/sisu/current/txt_textile.rb
index 39e95bcb..86187a3d 100644
--- a/lib/sisu/v6/txt_textile.rb
+++ b/lib/sisu/current/txt_textile.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, textile
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/plaintext_textile.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, textile
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/plaintext_textile.rb;hb=HEAD>
=end
module SiSU_Txt_Textile
diff --git a/lib/sisu/v6/update.rb b/lib/sisu/current/update.rb
index e72c26ee..32fdd1a2 100644
--- a/lib/sisu/v6/update.rb
+++ b/lib/sisu/current/update.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** update previous output (with similar output file type formats)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/update.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: update previous output (with similar output file type formats)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/update.rb;hb=HEAD>
=end
module SiSU_UpdateControlFlag
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/current/urls.rb
index 33781603..db31282b 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/current/urls.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** urls for output files
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/urls.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: urls for output files
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/urls.rb;hb=HEAD>
=end
module SiSU_Urls
diff --git a/lib/sisu/v5/utils.rb b/lib/sisu/current/utils.rb
index ba467bb4..53e28fd9 100644
--- a/lib/sisu/v5/utils.rb
+++ b/lib/sisu/current/utils.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, debug related
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, debug related
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils.rb;hb=HEAD>
=end
module SiSU_Utils
@@ -135,6 +132,12 @@ module SiSU_Utils
def mark(v=nil,x=nil)
puts set(v,x)
end
+ def tell(v=nil,x=nil)
+ puts set(v,x)
+ end
+ def report(v=nil,x=nil)
+ puts set(v,x)
+ end
def ok(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
diff --git a/lib/sisu/current/utils_response.rb b/lib/sisu/current/utils_response.rb
new file mode 100644
index 00000000..c47fab2e
--- /dev/null
+++ b/lib/sisu/current/utils_response.rb
@@ -0,0 +1,113 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** Request response
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_response.rb;hb=HEAD>
+
+=end
+module SiSU_Response
+ class Response
+ def response?(ask) #move to more appropriate directory later
+ response='redo'
+ print ask + " ['yes', 'no' or 'quit']: "
+ response=File.new('/dev/tty').gets.strip
+ ans=if response=='yes' then true
+ elsif response=='no' then false
+ elsif response =~/^quit|exit$/ then exit
+ else puts "[please type: 'yes', 'no' or 'quit']"
+ response?(ask)
+ end
+ ans
+ end
+ end
+ def query
+ def selections_available_(selections=:strict)
+ short_options=(selections == :strict) ? '' : '; [ynqx]'
+ %{'yes', 'no', 'quit' or 'exit'#{short_options}}
+ end
+ def selection_options
+ def response_strict(resp)
+ case resp
+ when /^(?:yes)$/ then true
+ when /^(?:no)$/ then false
+ when /^(?:quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:strict)}]}
+ answer?('',:strict)
+ end
+ end
+ def response_short(resp)
+ case resp
+ when /^(?:y|yes)$/ then true
+ when /^(?:n|no)$/ then false
+ when /^(?:[qx]|quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:short)}]}
+ answer?('',:short)
+ end
+ end
+ self
+ end
+ def answer?(ask,selections=:strict)
+ resp='redo'
+ print ask + %{PROCEED? [#{selections_available_(selections)}]: }
+ resp=File.new('/dev/tty').gets.strip
+ (selections==:strict) \
+ ? selection_options.response_strict(resp)
+ : selection_options.response_short(resp)
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/utils_screen_text_color.rb b/lib/sisu/current/utils_screen_text_color.rb
index 5689389e..4fd9f6a1 100644
--- a/lib/sisu/v5/utils_screen_text_color.rb
+++ b/lib/sisu/current/utils_screen_text_color.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, screen colors text
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_screen_text_color.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, screen colors text
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_screen_text_color.rb;hb=HEAD>
=end
module SiSU_Screen
diff --git a/lib/sisu/current/utils_spell.rb b/lib/sisu/current/utils_spell.rb
new file mode 100644
index 00000000..ffd781d1
--- /dev/null
+++ b/lib/sisu/current/utils_spell.rb
@@ -0,0 +1,99 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** spellchecking
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/utils_spell.rb;hb=HEAD>
+
+=end
+module SiSU_SpellUtility
+ class Spell
+ def initialize(input,filesrc,flg)
+ @flg=flg
+ @filename, @filetype = /(.+?)(\.\w\w\w0$)/.match(filesrc)[1,2] #.gsub(/\.\w\w\w0$/, "")
+ @input=input
+ @allwords=[]
+ puts @filename
+ @speller='aspell' # 'ispell'
+ @dictionary='british'
+ @lang='en_GB'
+ end
+ def check
+ @input.each do |data|
+ data=data.gsub(/(https?|www|ftp|gopher|png|jpg|gif|html|htm)\S+/i,' ').
+ gsub(/(&nbsp;|#{Mx[:nbsp]})/i,' ').
+ gsub(/<\/?(table|tr|td|b|p|href).*?>/i,' ').
+ gsub(/(<==.+|<:\S+>|<!.+?!>|^@\S+?:.+|\{\{\{|~)/,' ').
+ gsub(/(["|<>)(\n'`.;&_-]|\=)/,' ').
+ gsub(/\b(altExternal|
+ target|externalimg|
+ srcimagebext|
+ img|src|toc|pdf|
+ cd|org|
+ helvetica|roman
+ )\b/i,' ').
+ gsub(/EOF/,'')
+ @words=data.scan(/\S+/)
+ @words.each { |y| @allwords << y }
+ end
+ @allwords=@allwords.uniq
+ if @flg =~ /S/
+ File.open('/home/ralph/spell_error','a+') do |file| #fix
+ file.puts %{\n\n<<#{@filename}>>}
+ end
+ @allwords.each { |y| puts y.inspect; system(%{cat #{y} | /usr/bin/#{@speller} -l -d #{@dictionary} >> ~/spell_error })}
+ else
+ @allwords.each { |y| sp=%x{echo #{y}|#{@speller} -l }; puts sp unless sp.empty?}
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/webrick.rb b/lib/sisu/current/webrick.rb
index f05e16de..cabdf6cc 100644
--- a/lib/sisu/v6/webrick.rb
+++ b/lib/sisu/current/webrick.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** webrick share - note sisu by default does not link with file suffixes,
+ see man pages for options
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/webrick.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: webrick share - note sisu by default does not link with file
- suffixes, see man pages for options
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/webrick.rb;hb=HEAD>
=end
module SiSU_Webserv
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/current/wikispeak.rb
index c8bf1d53..a40f6424 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/current/wikispeak.rb
@@ -1,60 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** wiki text generation, stripped wiki output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- Copyright (C) Ralph Amissah
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- 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.
+ 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.
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ 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>
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/wikispeak.rb;hb=HEAD>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: wiki text generation, stripped wiki output (unix, linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/wikispeak.rb;hb=HEAD>
=end
module SiSU_Wikispeak
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/current/xhtml.rb
index 2327ba30..8a7cc176 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/current/xhtml.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Description: xhtml output logic, flow
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xhtml output logic, flow
- ** Notes: tidy -xml scroll.xhtml >> index.tidy
=end
module SiSU_XHTML
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -461,6 +458,8 @@ WOK
end
end
__END__
+** Notes:
+tidy -xml scroll.xhtml >> index.tidy
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/current/xhtml_epub2.rb
index 4850ad73..9072bf93 100644
--- a/lib/sisu/v6/xhtml_epub2.rb
+++ b/lib/sisu/current/xhtml_epub2.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/epub.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2
diff --git a/lib/sisu/v5/xhtml_epub2_concordance.rb b/lib/sisu/current/xhtml_epub2_concordance.rb
index 02f47d5a..d3dfec0e 100644
--- a/lib/sisu/v5/xhtml_epub2_concordance.rb
+++ b/lib/sisu/current/xhtml_epub2_concordance.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub concordance file (wordmap, linked index of words in document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_concordance.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub concordance file (html concordance, wordmap, linked index
- of words in document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_concordance.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Concordance
diff --git a/lib/sisu/v6/xhtml_epub2_format.rb b/lib/sisu/current/xhtml_epub2_format.rb
index f6aa6be5..9cfc5736 100644
--- a/lib/sisu/v6/xhtml_epub2_format.rb
+++ b/lib/sisu/current/xhtml_epub2_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub formating, css template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/epub_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub formating, css template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_format.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Format
diff --git a/lib/sisu/v5/xhtml_epub2_segments.rb b/lib/sisu/current/xhtml_epub2_segments.rb
index ea3e27fa..b8af25dc 100644
--- a/lib/sisu/v5/xhtml_epub2_segments.rb
+++ b/lib/sisu/current/xhtml_epub2_segments.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub segment generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_segments.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub segment generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_segments.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Seg
@@ -389,18 +386,18 @@ WOK
else sto.para
end
end
- elsif dob.is ==:block \
- || dob.is ==:group \
- || dob.is ==:alt
- sto.para #fix this should be block type specific #FIX
- elsif dob.is==:verse
- sto.verse
- elsif dob.is==:code
- sto.code
- elsif dob.is==:table
- sto.table
- elsif dob.is==:break
- sto.break
+ elsif dob.is ==:block \
+ || dob.is ==:group \
+ || dob.is ==:alt
+ sto.para #fix this should be block type specific #FIX
+ elsif dob.is==:verse
+ sto.verse
+ elsif dob.is==:code
+ sto.code
+ elsif dob.is==:table
+ sto.table
+ elsif dob.is==:break
+ sto.break
end
if @md.flag_separate_endnotes # may need to revisit, check
dob.obj=dob.obj.gsub(/"\s+href="##{Mx[:note_ref]}(\d+)">/,%{" href=\"endnotes#{Sfx[:epub_xhtml]}##{Mx[:note_ref]}\\1">}) #endnote- twice #removed file type
@@ -529,7 +526,7 @@ WOK
end
try.join('<br \/>')
#% creation of separate end segment/page of all endnotes referenced back to reference segment
- m=/(?:#{Mx[:en_a_o]}(?:\d|#{ast}|#{pls})+|#{Mx[:en_b_o]}(?:#{ast}|#{pls})\d+)\s+(.+?href=")(#note_ref(?:\d|_a|_b)+".+)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/mi
+ m=/(?:#{Mx[:en_a_o]}(?:\d|#{ast}|#{pls})+|#{Mx[:en_b_o]}(?:#{ast}|#{pls})\d+)\s+(.+?href=")(##{Mx[:note_ref]}(?:\d|_a|_b)+".+)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/mi
endnote_part_a=note_match_seg[m,1]
endnote_part_b=note_match_seg[m,2]
txt_obj={ endnote_part_a: endnote_part_a, endnote_part_b: endnote_part_b }
diff --git a/lib/sisu/v6/xhtml_epub2_tune.rb b/lib/sisu/current/xhtml_epub2_tune.rb
index 836ccce3..f8cc3774 100644
--- a/lib/sisu/v6/xhtml_epub2_tune.rb
+++ b/lib/sisu/current/xhtml_epub2_tune.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub generation, epub pre-processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/epub_tune.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub generation, epub pre-processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_epub2_tune.rb;hb=HEAD>
=end
require_relative 'dp' # dp.rb
diff --git a/lib/sisu/v5/xhtml_parts.rb b/lib/sisu/current/xhtml_parts.rb
index 7ae6cfc1..3a7cff04 100644
--- a/lib/sisu/v5/xhtml_parts.rb
+++ b/lib/sisu/current/xhtml_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_parts.rb;hb=HEAD>
=end
module SiSU_Parts_XHTML
diff --git a/lib/sisu/current/xhtml_shared.rb b/lib/sisu/current/xhtml_shared.rb
new file mode 100644
index 00000000..c2026799
--- /dev/null
+++ b/lib/sisu/current/xhtml_shared.rb
@@ -0,0 +1,62 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_shared.rb;hb=HEAD>
+
+=end
+module SiSU_XHTML_Shared
+ require_relative 'xhtml_table' # xhtml_table.rb
+ class TableXHTML < SiSU_XHTML_Table::TableXHTML
+ end
+end
+__END__
diff --git a/lib/sisu/current/xhtml_table.rb b/lib/sisu/current/xhtml_table.rb
new file mode 100644
index 00000000..42698f0b
--- /dev/null
+++ b/lib/sisu/current/xhtml_table.rb
@@ -0,0 +1,98 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xhtml_table.rb;hb=HEAD>
+
+=end
+module SiSU_XHTML_Table
+ require_relative 'xhtml_parts' # xhtml_parts.rb
+ class TableXHTML
+ include SiSU_Parts_XHTML
+ @@tablehead=0
+ @@tablefoot=[] #watch
+ def initialize(table)
+ @table_obj=table
+ end
+ def table
+ table_obj=@table_obj
+ if table_obj.obj !~/^<table\s/m
+ table_obj=table_rows_and_columns_array(table_obj)
+ else p __LINE__; p caller
+ end
+ table_obj
+ end
+ def table_rows_and_columns_array(table_obj) # provides basic (x)html table
+ table_rows,nr=[],0
+ table_obj.obj.split(Mx[:tc_c]).each do |table_row|
+ table_row_with_columns=table_row.split(Mx[:tc_p])
+ trc,nc=[],0
+ table_row_with_columns.each do |c|
+ c=c.gsub(/^~$/,''). # tilde / empty cell
+ gsub(/<:br>/,the_line_break)
+ trc <<= if table_obj.head_ and nr==0; %{<th width="#{table_obj.widths[nc]}%">#{c}</th>}
+ else %{<td width="#{table_obj.widths[nc]}%">#{c}</td>}
+ end
+ nc+=1
+ end
+ trc=(trc.is_a?(Array)) ? trc.flatten.join : trc
+ trc=" <tr>#{trc}</tr>\n"
+ nr+=1
+ table_rows << trc
+ end
+ table_rows=table_rows.flatten.join
+ table_obj.obj=%{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">\n#{table_rows} </table>}
+ table_obj
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/current/xml_docbook5.rb
index 73cfc75b..384efbe0 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/current/xml_docbook5.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Docbook book XML rendition
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_docbook_book.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Docbook book XML rendition
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_docbook_book.rb;hb=HEAD>
=end
module SiSU_XML_Docbook_Book
diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/current/xml_dom.rb
index fd96b564..9707deec 100644
--- a/lib/sisu/v6/xml_dom.rb
+++ b/lib/sisu/current/xml_dom.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** xml (dom style) output processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_dom.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_dom.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml (dom style) output processing
- ** Notes: tidy -xml dom.xml >> index.tidy
=end
module SiSU_XML_DOM
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -618,3 +615,4 @@ WOK
end
end
__END__
+** Notes: tidy -xml dom.xml >> index.tidy
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/current/xml_fictionbook2.rb
index c192179b..f8c0ed6b 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/current/xml_fictionbook2.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Fictionbook XML rendition
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_fictionbook.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Fictionbook XML rendition
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_fictionbook.rb;hb=HEAD>
=end
module SiSU_XML_Fictionbook
diff --git a/lib/sisu/v6/xml_format.rb b/lib/sisu/current/xml_format.rb
index 088b5d2b..08eed960 100644
--- a/lib/sisu/v6/xml_format.rb
+++ b/lib/sisu/current/xml_format.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+** xml template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml template
- ** Notes: tidy -xml index.xml >> index.tidy
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_format.rb;hb=HEAD>
=end
module SiSU_XML_Format
@@ -866,3 +862,4 @@ WOK
end
end
__END__
+** Notes: tidy -xml index.xml >> index.tidy
diff --git a/lib/sisu/v5/xml_md_oai_pmh_dc.rb b/lib/sisu/current/xml_md_oai_pmh_dc.rb
index a452c9b5..b5fe2ccf 100644
--- a/lib/sisu/v5/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/current/xml_md_oai_pmh_dc.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_md_oai_pmh_dc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_md_oai_pmh_dc.rb;hb=HEAD>
=end
module SiSU_XML_Metadata
diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/current/xml_odf_odt.rb
index 0351babc..8b7c493c 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/current/xml_odf_odt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** opendocument text generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/odf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: opendocument text generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/odf.rb;hb=HEAD>
=end
module SiSU_XML_ODF_ODT
diff --git a/lib/sisu/v6/xml_odf_odt_format.rb b/lib/sisu/current/xml_odf_odt_format.rb
index 7f8d2106..436c3996 100644
--- a/lib/sisu/v6/xml_odf_odt_format.rb
+++ b/lib/sisu/current/xml_odf_odt_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** opendocument formatting, default opendocument template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/odf_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: opendocument formatting, default opendocument template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/odf_format.rb;hb=HEAD>
=end
module SiSU_XML_ODF_ODT_Format
diff --git a/lib/sisu/v5/xml_parts.rb b/lib/sisu/current/xml_parts.rb
index c08fc05c..d8acea66 100644
--- a/lib/sisu/v5/xml_parts.rb
+++ b/lib/sisu/current/xml_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared xml parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/html_parts.rb;hb=HEAD>
=end
module SiSU_Parts_XML
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/current/xml_sax.rb
index 87205488..21455628 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/current/xml_sax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** xml output (sax style) processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml output (sax style) processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml.rb;hb=HEAD>
=end
module SiSU_XML_SAX
diff --git a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb b/lib/sisu/current/xml_scaffold_structure_collapsed.rb
index cb895f24..2da1f135 100644
--- a/lib/sisu/v6/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/current/xml_scaffold_structure_collapsed.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** extract and print an XML rendition of document structure to screen
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_scaffold.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: extract and print an XML rendition of document structure to screen
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_scaffold.rb;hb=HEAD>
=end
module SiSU_XML_Scaffold_Structure_Collapse
diff --git a/lib/sisu/v6/xml_scaffold_structure_sisu.rb b/lib/sisu/current/xml_scaffold_structure_sisu.rb
index 3bd413cf..dbb6be7d 100644
--- a/lib/sisu/v6/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/current/xml_scaffold_structure_sisu.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** extract and print an XML rendition of document structure to screen
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_scaffold.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: extract and print an XML rendition of document structure to screen
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_scaffold.rb;hb=HEAD>
=end
module SiSU_XML_Scaffold_Structure_Sisu
diff --git a/lib/sisu/v5/xml_shared.rb b/lib/sisu/current/xml_shared.rb
index a5f5e114..f392d9fc 100644
--- a/lib/sisu/v5/xml_shared.rb
+++ b/lib/sisu/current/xml_shared.rb
@@ -1,60 +1,60 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_shared.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_shared.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- ** Description: common file for xml generation
=end
module SiSU_XML_Munge
require_relative 'xml_parts' # xml_parts.rb
diff --git a/lib/sisu/v6/xml_tables.rb b/lib/sisu/current/xml_tables.rb
index 468963ff..55b0be41 100644
--- a/lib/sisu/v6/xml_tables.rb
+++ b/lib/sisu/current/xml_tables.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml table generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_tables.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: common file for xml table generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/xml_tables.rb;hb=HEAD>
=end
module SiSU_Tables
diff --git a/lib/sisu/current/zap.rb b/lib/sisu/current/zap.rb
new file mode 100644
index 00000000..6e1e0fb0
--- /dev/null
+++ b/lib/sisu/current/zap.rb
@@ -0,0 +1,90 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** zap wipe clean previous output of the type specified
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/current/zap.rb;hb=HEAD>
+
+=end
+module SiSU_Zap
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source
+ def initialize(opt)
+ @opt=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')
+ unless @opt.act[:quiet][:set]==:on
+ tell=SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Clean files related to processing #{@opt.selections.str} ->",
+ "#{@opt.fns} -> #{zap_path}"
+ )
+ tell.warn
+ end
+ z.zap.remove_output
+ else
+ unless @opt.act[:quiet][:set]==:on
+ tell=SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'use of -Z (zap) has not enabled in sisurc.yml'
+ )
+ tell.warn
+ end
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/air.rb b/lib/sisu/develop/air.rb
new file mode 100644
index 00000000..2822fe52
--- /dev/null
+++ b/lib/sisu/develop/air.rb
@@ -0,0 +1,80 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/air.rb;hb=HEAD>
+
+=end
+module SiSU_Air
+ require_relative 'se_hub_particulars' # se_hub_particulars.rb
+ class Source
+ @@ao_array=[]
+ @@fns=nil
+ def initialize(opt)
+ @opt=opt
+ @@fns||@opt.fns
+ @particulars=SiSU_Particulars::Combined.new(opt)
+ #@env=@particulars.env
+ #@md=@particulars.md
+ #@ao_array=@particulars.ao_array
+ end
+ def read
+ end
+ protected
+ def print
+ puts @particulars.md.inspect
+ puts @particulars.env.inspect
+ puts @particulars.ao_array
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/ao.rb b/lib/sisu/develop/ao.rb
index 34e952cb..0ac6f502 100644
--- a/lib/sisu/v6/ao.rb
+++ b/lib/sisu/develop/ao.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** preprocessing, (document abstraction), data abstraction used in subsequent
+ processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: preprocessing, (document abstraction), data abstraction used
- in subsequent processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao.rb;hb=HEAD>
=end
module SiSU_AO
@@ -63,10 +60,11 @@ module SiSU_AO
include SiSU_Env
require_relative 'dp' # dp.rb
include SiSU_Param
- require_relative 'ao_doc_objects' # ao.rb
+ require_relative 'ao_doc_objects' # ao_doc_objects.rb
require_relative 'ao_syntax' # ao_syntax.rb
include SiSU_AO_Syntax
require_relative 'ao_doc_str' # ao_doc_str.rb
+ require_relative 'ao_references' # ao_references.rb
require_relative 'ao_idx' # ao_idx.rb
require_relative 'ao_numbering' # ao_numbering.rb
require_relative 'ao_hash_digest' # ao_hash_digest.rb
@@ -76,6 +74,7 @@ module SiSU_AO
require_relative 'ao_character_check' # ao_character_check.rb
require_relative 'ao_misc_arrange' # ao_misc_arrange.rb
require_relative 'ao_expand_insertions' # ao_expand_insertions.rb
+ require_relative 'ao_persist' # ao_persist.rb
require_relative 'prog_text_translation' # prog_text_translation.rb
require_relative 'shared_sem' # shared_sem.rb
class Instantiate < SiSU_Param::Parameters::Instructions
@@ -85,13 +84,10 @@ module SiSU_AO
end
end
class Source <Instantiate
- @@ao_array=[]
- @@idx_arr={ sst: [], tex: [], html: [], xhtml: [] }
- @@map_arr={ nametags: [], ocn_htmlseg: [] }
- @@fns=nil
- def initialize(opt,fnx=nil)
- @opt,@fnx=opt,fnx
- @@fns ||=opt.fns
+ def initialize(opt,fnx=nil,process=:complete)
+ @opt,@fnx,@process=opt,fnx,process
+ @per ||=SiSU_AO_Persist::Persist.new.persist_init
+ @per.fns ||=opt.fns
fn_use=if fnx \
and fnx =~/\.ss[tmi]$/
fnx
@@ -113,34 +109,36 @@ module SiSU_AO
end
def read #creates ao
begin
- @@ao_array=[]
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ @per=SiSU_AO_Persist::Persist.new
+ @per.ao_arr=[]
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
create_ao
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@@fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@per.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
+ SiSU_AO_Persist::Persist.new.persist_init
SiSU_AO::Instantiate.new
end
end
def get #reads ao, unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@ao_array=[]
+ @per.ao_arr=[]
end
- ao=(@@ao_array.empty?) \
+ ao=(@per.ao_arr.empty?) \
? read_fnc
- : @@ao_array.dup
+ : @per.ao_arr.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -150,18 +148,18 @@ module SiSU_AO
def get_idx_sst #reads ao idx.sst, #unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@idx_arr[:sst]=[]
+ @per.idx_arr_sst=[]
end
- ao=(@@idx_arr[:sst].empty?) \
+ ao=(@per.idx_arr_sst.empty?) \
? read_idx_sst
- : @@idx_arr[:sst].dup #check
+ : @per.idx_arr_sst.dup #check
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -171,18 +169,18 @@ module SiSU_AO
def get_idx_raw
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@idx_arr[:tex]=[]
+ @per.idx_arr_tex=[]
end
- ao=(@@idx_arr[:tex].empty?) \
+ ao=(@per.idx_arr_tex.empty?) \
? read_idx_raw
- : @@idx_arr[:tex].dup #check
+ : @per.idx_arr_tex.dup #check
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -192,18 +190,18 @@ module SiSU_AO
def get_idx_html #reads ao idx.html, #unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@idx_arr[:html]=[]
+ @per.idx_arr_html=[]
end
- ao=(@@idx_arr[:html].empty?) \
+ ao=(@per.idx_arr_html.empty?) \
? read_idx_html
- : @@idx_arr[:html].dup
+ : @per.idx_arr_html.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -213,18 +211,18 @@ module SiSU_AO
def get_idx_xhtml #reads ao idx.xhtml, #unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@idx_arr[:xthml]=[]
+ @per.idx_arr_xhtml=[] #...
end
- ao=(@@idx_arr[:xhtml].empty?) \
+ ao=(@per.idx_arr_xhtml.empty?) \
? read_idx_xhtml
- : @@idx_arr[:xhtml].dup
+ : @per.idx_arr_xhtml.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -234,18 +232,18 @@ module SiSU_AO
def get_map_nametags #reads ao map.nametags, #unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@map_arr[:nametags]=[]
+ @per.map_arr_nametags=[]
end
- ao=(@@map_arr[:nametags].empty?) \
+ ao=(@per.map_arr_nametags.empty?) \
? read_map_nametags
- : @@map_arr[:nametags].dup
+ : @per.map_arr_nametags.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -255,18 +253,18 @@ module SiSU_AO
def get_map_ocn_htmlseg #reads ao map.ocn_htmlseg, #unless does not exist then creates first
begin
ao=[]
- unless @@fns==@opt.fns \
- or @@fns==@fnx
- @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+ unless @per.fns==@opt.fns \
+ or @per.fns==@fnx
+ @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@map_arr[:ocn_htmlseg]=[]
+ @per.map_arr_ocn_htmlseg=[]
end
- ao=(@@map_arr[:ocn_htmlseg].empty?) \
+ ao=(@per.map_arr_ocn_htmlseg.empty?) \
? read_map_ocn_htmlseg
- : @@map_arr[:ocn_htmlseg].dup
+ : @per.map_arr_ocn_htmlseg.dup
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -276,6 +274,7 @@ module SiSU_AO
protected
def create_ao
ao_array=[]
+ fnp = @fnx ? "#{@opt.fno} #{@fnx}" : @opt.fno
unless @opt.act[:quiet][:set]==:on
tell=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
@@ -286,7 +285,8 @@ module SiSU_AO
)
: SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
- 'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
+ 'Document Abstraction',
+ "[#{@opt.f_pth[:lng_is]}] #{fnp}"
)
tell.blue_title_hi
end
@@ -299,7 +299,7 @@ module SiSU_AO
meta=file_array=@env.source_file_processing_array(fn)
@md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
meta=nil
- ao=SiSU_AO::Make.new(fn,@md,file_array).song
+ ao=SiSU_AO::Make.new(fn,@md,file_array,@fnx,@process).song
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -350,7 +350,7 @@ module SiSU_AO
ao=[]
ao=(FileTest.file?(@fnc)) \
? (File.open(@fnc,'r:utf-8'){ |f| ao=Marshal.load(f)})
- : SiSU_AO::Source.new(@opt).create_ao
+ : SiSU_AO::Source.new(@opt,@fnx,@process).create_ao
end
def read_idx_sst
m=[]
@@ -522,8 +522,8 @@ module SiSU_AO
end
end
class Make
- def initialize(fn,md,data)
- @fn,@md,@data=fn,md,data
+ def initialize(fn,md,data,fnx,process)
+ @fn,@md,@data,@fnx,@process=fn,md,data,fnx,process
@env=SiSU_Env::InfoEnv.new(@md.fns)
end
def reset
@@ -540,11 +540,12 @@ module SiSU_AO
SiSU_AO_MiscArrangeText::SI.new(@md,data_txt). # ao_misc_arrange.rb
prepare_text
data_obj,
- metadata=
+ metadata,
+ bibliography=
SiSU_AO_DocumentStructureExtract::Build.new(@md,data_txt). # ao_doc_str.rb
identify_parts
data_obj=
- SiSU_AO_Syntax::Markup.new(@md,data_obj).songsheet # ao_syntax.rb
+ SiSU_AO_Syntax::Markup.new(@md,data_obj,bibliography).songsheet # ao_syntax.rb
data_obj,
endnote_array=
SiSU_AO_CharacterCheck::Check.new(data_obj). # ao_character_check.rb
@@ -554,12 +555,13 @@ module SiSU_AO
data_obj,
tags_map,
ocn_html_seg_map=
- SiSU_AO_Numbering::Numbering.new(@md,data_obj). # ao_numbering.rb
+ SiSU_AO_Numbering::Numbering.new(@md,data_obj,@fnx,@process). # ao_numbering.rb
numbering_song
data_obj,
book_index_rel,
book_index_rel_html_seg,
- html_idx,xhtml_idx=
+ html_idx,
+ xhtml_idx=
SiSU_AO_BookIndex::BookIndex.new(@md,data_obj,@env). # ao_idx.rb
indexing_song if @md.book_idx
data_obj=
diff --git a/lib/sisu/develop/ao_character_check.rb b/lib/sisu/develop/ao_character_check.rb
new file mode 100644
index 00000000..2596c739
--- /dev/null
+++ b/lib/sisu/develop/ao_character_check.rb
@@ -0,0 +1,102 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_character_check.rb;hb=HEAD>
+
+=end
+module SiSU_AO_CharacterCheck
+ class Check
+ def initialize(data)
+ @data=data
+ @comment='%'
+ @endnote_array=[]
+ end
+ def character_check_and_oldstyle_endnote_array
+ data=@data
+ @endnote_array=[]
+ endnote_no=1
+ @tuned_file=data.select do |dob|
+ unless dob.is ==:table
+ dob.obj=dob.obj.strip.
+ gsub(/^[{~}]\s*$/,'').
+ gsub(/~#\s*/,"#{Mx[:pa_non_object_no_heading]}").
+ gsub(/-#\s*/,"#{Mx[:pa_non_object_dummy_heading]}").
+ gsub(/(#{Mx[:en_a_o]})\s*\s+/,'\1 ').
+ gsub(/(~\{\s*)\s+/,'\1 ').
+ gsub(/ \/\//,"#{Mx[:br_line]}").
+ gsub(/<br>/,"#{Mx[:br_line]}"). #needed by xml, xhtml etc.
+ gsub(/\t/,' ').
+ gsub(/\342\200\231/u,"'"). #if dob =~/’/ #Avoid #&lsquo; &rsquo; #&ldquo; &rdquo;
+ gsub(/\\copy(?:right)?\b/,'&#169;').
+ gsub(/\\trademark\b|\\tm\b/,'&#174;')
+ dob.obj=dob.obj + "\n"
+ unless dob.is ==:code
+ case dob.obj
+ when /\^~/ #% Note must do this first (earlier loop) and then enter gathered data into ~^\d+
+ sub_dob=dob.obj.dup
+ @endnote_array << sub_dob.gsub(/\n/,'').
+ gsub(/\^~\s+(.+)\s*/,
+ %{#{Mx[:en_a_o]}#{endnote_no} \\1 #{Mx[:en_a_c]}}).
+ strip
+ endnote_no+=1
+ dob=nil if dob.obj =~/\^~ .+/ #watch, removes 'binary' endnote now in endnote array for later insertion
+ end
+ end
+ end
+ dob if dob.is_a?(Object)
+ end.flatten.compact
+ [@tuned_file,@endnote_array]
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/ao_composite.rb b/lib/sisu/develop/ao_composite.rb
index 1cf7b45d..8a59f064 100644
--- a/lib/sisu/v6/ao_composite.rb
+++ b/lib/sisu/develop/ao_composite.rb
@@ -1,65 +1,63 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** composite documents, assemble/build documents from other documents
+ or parts of marked up text
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_composite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: composite documents, assemble/build documents from other
- documents or parts of marked up text
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_composite.rb;hb=HEAD>
=end
module SiSU_Assemble
require_relative 'se' # se.rb
+ require_relative 'utils_composite' # utils_composite.rb
class RemoteImage
def initialize
@env=SiSU_Env::InfoEnv.new
@@ -89,7 +87,7 @@ module SiSU_Assemble
end
end
class Composite
- @@imager={}
+ include SiSU_Composite_Doc_Utils # composite doc, .ssm, extract all related insert files, array of filenames test
def initialize(opt)
@opt=opt
@env=SiSU_Env::InfoEnv.new
@@ -104,14 +102,14 @@ module SiSU_Assemble
'Composite Document',
"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}",
).grey_title_hi unless @opt.act[:quiet][:set]==:on
+ composite_and_imported_filenames_array(@opt.fno) # composite doc, .ssm, extract all related insert files, array of filenames test
assembled=loadfile(@opt.fno)
- #assembled=insertions?(fns_array)
- write(assembled)
write(assembled)
end
Dir.chdir(pwd)
rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).
+ location do
__LINE__.to_s + ':' + __FILE__
end
ensure
@@ -129,7 +127,6 @@ module SiSU_Assemble
end
end
def loadfile(loadfilename)
- tuned_file=[]
begin
if FileTest.file?(loadfilename)
insert_array=IO.readlines(loadfilename,'')
@@ -143,18 +140,17 @@ module SiSU_Assemble
loadfilename,
).txt_grey
end
- if loadfilename =~/\S+?\.ss[im]$/
- insert_array.each do |para|
- tuned_file << insert?(para)
+ tuned_file=if loadfilename =~/\S+?\.ss[im]$/
+ insert_array.each.map do |para|
+ insert?(para)
end
elsif loadfilename =~/\S+?\.sst$/
- insert_array.each do |para|
- tuned_file << para
+ insert_array.each.map do |para|
+ para
end
- end
+ end.flatten.compact
end
end
- tuned_file=tuned_file.flatten.compact
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -165,9 +161,6 @@ module SiSU_Assemble
def url(loadfilename)
if loadfilename =~ /((?:https?|file):\/\/\S+?\.ss[it])$/ # and NetTest
loadfilename=$1
- imagedir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.ss[it]$/.
- match(loadfilename).captures.join +
- '/_sisu/image' #watch
begin
require 'uri'
require 'open-uri'
@@ -176,13 +169,10 @@ module SiSU_Assemble
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('uri, open-uri or pp NOT FOUND (LoadError)')
end
- image_uri=URI.parse(imagedir)
insert=open(loadfilename)
insert_array=insert.dup
insert.close
file=insertion(loadfilename,insert_array)
- @@imager[image_uri] ||=[]
- @@imager[image_uri] << file[:images]
file[:prepared]
end
end
@@ -241,7 +231,6 @@ module SiSU_Assemble
end
end
class CompositeFileList
- @@imager={}
def initialize(opt)
@opt=opt
@env=SiSU_Env::InfoEnv.new
diff --git a/lib/sisu/v5/ao_doc_objects.rb b/lib/sisu/develop/ao_doc_objects.rb
index a07357e5..5a59af7d 100644
--- a/lib/sisu/v5/ao_doc_objects.rb
+++ b/lib/sisu/develop/ao_doc_objects.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document abstraction
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_objects.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document abstraction
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_objects.rb;hb=HEAD>
=end
module SiSU_AO_DocumentStructure
@@ -498,6 +495,18 @@ module SiSU_AO_DocumentStructure
of,is, obj, flag, act, selections,tmp
self
end
+ def flag_lng(h,o=nil)
+ of= @of #Symbol, classification - group
+ is= :flag_lng
+ obj= nil #String, text content
+ flag= h[:flag] || ((defined? o.flag) ? o.flag : nil) #Symbol, :lng_on or :lng_off
+ act= h[:act] || ((defined? o.act) ? o.act : nil) #Symbol, language set to :en etc.
+ selections= h[:selections] || ((defined? o.selections) ? o.selections : nil) #String, text content
+ tmp= h[:act] || ((defined? o.tmp) ? o.tmp : nil) #available for processing, empty after use
+ @of, @is,@obj,@flag,@act,@selections,@tmp=
+ of,is, obj, flag, act, selections,tmp
+ self
+ end
end
class ObjectLayout
attr_accessor :obj,:sym,:attr,:is,:is_for,:of,:from,:tmp,:num
diff --git a/lib/sisu/v5/ao_doc_str.rb b/lib/sisu/develop/ao_doc_str.rb
index 2ca21f9d..353469ec 100644
--- a/lib/sisu/v5/ao_doc_str.rb
+++ b/lib/sisu/develop/ao_doc_str.rb
@@ -1,102 +1,75 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document abstraction
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_str.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document abstraction
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_str.rb;hb=HEAD>
=end
module SiSU_AO_DocumentStructureExtract
+ require_relative 'ao_persist' # ao_persist.rb
class Instantiate < SiSU_Param::Parameters::Instructions
- @@flag={
- ocn: :on,
- code: :off,
- lngsyn: :txt,
- poem: :off,
- block: :off,
- box: :off,
- group: :off,
- alt: :off,
- quote: :off,
- table: :off,
- table_to: :off,
- }
def initialize
@@counter=@@column=@@columns=0
@@line_mode=''
end
end
class Build
- @@flag={
- ocn: :on,
- code: :off,
- lngsyn: :txt,
- poem: :off,
- block: :off,
- box: :off,
- group: :off,
- alt: :off,
- quote: :off,
- table: :off,
- table_to: :off,
- }
def initialize(md,data)
@md,@data=md,data
SiSU_AO_DocumentStructureExtract::Instantiate.new
@pb=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
@pbn=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
@pbl=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line])
+ @per=SiSU_AO_Persist::PersistDocStructExt.new
end
def ln_get(lv)
case lv
@@ -123,7 +96,7 @@ module SiSU_AO_DocumentStructureExtract
: false
end
def quotes?
- @@flag[:quote]==:open \
+ @per.quote==:open \
? true
: false
end
@@ -258,42 +231,29 @@ module SiSU_AO_DocumentStructureExtract
array: idx_array,
}
end
- def identify_parts
- tuned_file=[]
- @tuned_block,@tuned_code=[],[]
- @@counter,@verse_count=0,0
- @num_id={
- code_block: 0,
- poem: 0,
- box: 0,
- group: 0,
- alt: 0,
- quote: 0,
- table: 0,
- }
- @metadata={}
- @data.each do |t_o|
+ def extract_structure_loop(data,tuned_file)
+ data.each do |t_o|
if t_o =~/^--([+~-])[#]$/
h=case $1
when /[+]/
- @@flag[:ocn]=:on
+ @per.ocn=:on
{
flag: :ocn_on,
}
when /[~]/
- @@flag[:ocn]=:ocn_off_headings_keep
+ @per.ocn=:ocn_off_headings_keep
{
flag: :ocn_off,
mod: :headings_keep,
}
when /[-]/ #of particular relevance with level 1~ which is required to precede substantive text & used e.g. in html segmented text
- @@flag[:ocn]=:ocn_off_headings_dummy_lev1
+ @per.ocn=:ocn_off_headings_dummy_lev1
{
flag: :ocn_off,
mod: :headings_exclude,
}
else
- @@flag[:ocn]=:on
+ @per.ocn=:on
{
flag: :ocn_on,
}
@@ -301,7 +261,30 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectFlag.new.flag_ocn(h)
next
end
- t_o=t_o.gsub(/(?:\n\s*\n)+/m,"\n") if @@flag[:code]==:off
+ if t_o =~/^:[~](#{SiSU_is.language_list_regex?}|-)$/ # work with for identifying language of objects
+ lng=$1
+ h=case lng
+ when /(?:#{SiSU_is.language_list_regex?})/
+ @per.lng=:on
+ @per.lng_is=lng.to_sym
+ {
+ flag: :lng_on,
+ act: lng.to_sym,
+ }
+ else # ^:~-
+ if @per.lng==:on
+ @per.lng=:off
+ @per.lng_is=:doc_default
+ {
+ flag: :lng_off,
+ act: :doc_default,
+ }
+ end
+ end
+ t_o=SiSU_AO_DocumentStructure::ObjectFlag.new.flag_lng(h)
+ next
+ end
+ t_o=t_o.gsub(/(?:\n\s*\n)+/m,"\n") if @per.code==:off
unless t_o =~/^(?:@\S+?:|%+)\s/ # extract book index for paragraph if any
idx=if t_o=~/^=\{\s*(.+)\s*\}\s*$\Z/m
m=$1
@@ -316,13 +299,13 @@ module SiSU_AO_DocumentStructureExtract
end
if t_o !~/^(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|poem|alt|group|block)\{|^\}(?:code|poem|alt|group|block)|^(?:table\{|\{table)[ ~]/ \
and t_o !~/^```[ ]+(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|poem|alt|group|block|table)|^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$|^`:quote_(?:open|close)`/ \
- and @@flag[:code]==:off \
- and @@flag[:poem]==:off \
- and @@flag[:group]==:off \
- and @@flag[:block]==:off \
- and @@flag[:alt]==:off \
- and @@flag[:box]==:off \
- and @@flag[:table]==:off
+ and @per.code==:off \
+ and @per.poem==:off \
+ and @per.group==:off \
+ and @per.block==:off \
+ and @per.alt==:off \
+ and @per.box==:off \
+ and @per.table==:off
t_o=case t_o
when /^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/ #metadata, header
if t_o=~/^#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}\s*(.+)/m
@@ -343,14 +326,14 @@ module SiSU_AO_DocumentStructureExtract
obj=$1
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
and t_o =~/^1\~\S*\s+/m
obj << ' -#'
- elsif @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ elsif @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
obj << ' ~#'
end
end
@@ -367,14 +350,14 @@ module SiSU_AO_DocumentStructureExtract
name,obj=$1,$2
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
and t_o =~/^1\~\S*\s+/m
obj << ' -#'
- elsif @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ elsif @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
obj << ' ~#'
end
end
@@ -392,14 +375,14 @@ module SiSU_AO_DocumentStructureExtract
name,obj=$1,$2
note=endnote_test?(obj)
obj,tags=extract_tags(obj,name)
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
and t_o =~/^1\~\S*\s+/m
obj << ' -#'
- elsif @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ elsif @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
obj << ' ~#'
end
end
@@ -427,8 +410,8 @@ module SiSU_AO_DocumentStructureExtract
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
unless obj=~/\A\s*\Z/m
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
obj << ' ~#'
end
@@ -460,8 +443,8 @@ module SiSU_AO_DocumentStructureExtract
note=endnote_test?(obj)
obj,tags=extract_tags(obj)
unless obj=~/\A\s*\Z/m
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
obj << ' ~#'
end
@@ -492,8 +475,8 @@ module SiSU_AO_DocumentStructureExtract
image=image_test(t_o)
note=endnote_test?(t_o)
obj,tags=extract_tags(t_o)
- if @@flag[:ocn]==:ocn_off_headings_dummy_lev1 \
- or @@flag[:ocn]==:ocn_off_headings_keep
+ if @per.ocn==:ocn_off_headings_dummy_lev1 \
+ or @per.ocn==:ocn_off_headings_keep
unless obj =~ /[~-][#]\s*$/
obj << ' ~#'
end
@@ -514,14 +497,14 @@ module SiSU_AO_DocumentStructureExtract
end
t_o=SiSU_AO_DocumentStructureExtract::Structure.new(@md).structure_markup(t_o) #must happen earlier, node info etc. require
end
- elsif @@flag[:code]==:off
+ elsif @per.code==:off
if t_o =~/^(?:code(?:\.[a-z][0-9a-z_]+)?\{|```[ ]+code(?:\.[a-z][0-9a-z_]+)?)/
- @@flag[:code]=case t_o
+ @per.code=case t_o
when /^code(?:\.[a-z][0-9a-z_]+)?\{/ then :curls
when /^```[ ]+code/ then :tics
- else @@flag[:code] #error
+ else @per.code #error
end
- @@flag[:lngsyn]=if t_o =~/^(?:code\.[a-z][0-9a-z_]+\{|```[ ]+code\.[a-z_]+)/
+ @per.lngsyn=if t_o =~/^(?:code\.[a-z][0-9a-z_]+\{|```[ ]+code\.[a-z_]+)/
case t_o
when /^code\.([a-z][0-9a-z_]+)\{/
:"#{$1}"
@@ -542,14 +525,14 @@ module SiSU_AO_DocumentStructureExtract
obj: '',
sym: :code_block_open,
num: @num_id[:code_block],
- syntax: @@flag[:lngsyn],
+ syntax: @per.lngsyn,
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
elsif t_o =~/^(?:poem\{|```[ ]+poem)/
- @@flag[:poem]=case t_o
+ @per.poem=case t_o
when /^poem\{/ then :curls
when /^```[ ]+poem/ then :tics
- else @@flag[:poem] #error
+ else @per.poem #error
end
@num_id[:poem] +=1
h={
@@ -561,10 +544,10 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << t_o
elsif t_o =~/^(?:box(?:\.[a-z_]+)?\{|```[ ]+box(?:\.[a-z_]+)?)/
- @@flag[:box]=case t_o
+ @per.box=case t_o
when /^box\{/ then :curls
when /^```[ ]+box/ then :tics
- else @@flag[:box] #error
+ else @per.box #error
end
@num_id[:box] +=1
h={
@@ -576,10 +559,10 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << t_o
elsif t_o =~/^(?:group\{|```[ ]+group)/
- @@flag[:group]=case t_o
+ @per.group=case t_o
when /^group\{/ then :curls
when /^```[ ]+group/ then :tics
- else @@flag[:group] #error
+ else @per.group #error
end
@num_id[:group] +=1
h={
@@ -591,10 +574,10 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << t_o
elsif t_o =~/^(?:block\{|```[ ]+block)/
- @@flag[:block]=case t_o
+ @per.block=case t_o
when /^block\{/ then :curls
when /^```[ ]+block/ then :tics
- else @@flag[:block] #error
+ else @per.block #error
end
@num_id[:block] +=1
h={
@@ -606,10 +589,10 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << t_o
elsif t_o =~/^(?:alt\{|```[ ]+alt)/
- @@flag[:alt]=case t_o
+ @per.alt=case t_o
when /^alt\{/ then :curls
when /^```[ ]+alt/ then :tics
- else @@flag[:alt] #error
+ else @per.alt #error
end
@num_id[:alt] +=1
h={
@@ -621,7 +604,7 @@ module SiSU_AO_DocumentStructureExtract
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << t_o
elsif t_o =~/^`:quote_open`/
- @@flag[:quote]=:open
+ @per.quote=:open
@num_id[:quote] +=1
h={
is_for: :quote,
@@ -642,7 +625,7 @@ module SiSU_AO_DocumentStructureExtract
ins_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
tuned_file << ins_o
if t_o=~/^table\{(?:~h)?\s+/
- @@flag[:table]=:curls
+ @per.table=:curls
@rows=''
case t_o
when /table\{~h\s+c(\d+);\s+(.+)/
@@ -661,7 +644,7 @@ module SiSU_AO_DocumentStructureExtract
idx: idx,
}
elsif t_o=~/^```[ ]+table(?:~h)?\s+c\d+/
- @@flag[:table]=:tics
+ @per.table=:tics
@rows=''
case t_o
when /^```[ ]+table~h\s+c(\d+);\s+(.+)/
@@ -800,12 +783,12 @@ module SiSU_AO_DocumentStructureExtract
end
t_o
end
- if @@flag[:table]==:curls or @@flag[:table]==:tics
- if (@@flag[:table]==:curls \
+ if @per.table==:curls or @per.table==:tics
+ if (@per.table==:curls \
and t_o =~/^\}table/) \
- or (@@flag[:table]==:tics \
+ or (@per.table==:tics \
and t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:table]=:off
+ @per.table=:off
headings,columns,widths,idx=@h[:head_],@h[:cols],@h[:widths],@h[:idx]
@h={
head_: headings,
@@ -835,13 +818,13 @@ module SiSU_AO_DocumentStructureExtract
t_o=nil
end
end
- if @@flag[:code]==:curls \
- or @@flag[:code]==:tics
- if (@@flag[:code]==:curls \
+ if @per.code==:curls \
+ or @per.code==:tics
+ if (@per.code==:curls \
&& t_o =~/^\}code/) \
- or (@@flag[:code]==:tics \
+ or (@per.code==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/m)
- @@flag[:code]=:off
+ @per.code=:off
if @tuned_code[-1]
@tuned_code[-1].
gsub!(/\s*(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*\Z/m,'')
@@ -851,12 +834,12 @@ module SiSU_AO_DocumentStructureExtract
h={
obj: obj,
idx: idx,
- syntax: @@flag[:lngsyn],
+ syntax: @per.lngsyn,
tags: tags,
num: @num_id[:code_block],
number_: @codeblock_numbered,
}
- @@flag[:lngsyn]=:txt
+ @per.lngsyn=:txt
t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.code(h)
@tuned_code=[]
tuned_file << t_o
@@ -868,8 +851,8 @@ module SiSU_AO_DocumentStructureExtract
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
end
- if (@@flag[:code]==:curls \
- || @@flag[:code]==:tics) \
+ if (@per.code==:curls \
+ || @per.code==:tics) \
and t_o.is_a?(String)
sub_array=t_o.dup + "#{Mx[:br_nl]}"
@line_mode=[]
@@ -878,23 +861,23 @@ module SiSU_AO_DocumentStructureExtract
@tuned_code << t_o
t_o=nil
end
- elsif (@@flag[:poem]==:curls \
- || @@flag[:poem]==:tics) \
- or (@@flag[:box]==:curls \
- || @@flag[:box]==:tics) \
- or (@@flag[:group]==:curls \
- || @@flag[:group]==:tics) \
- or (@@flag[:block]==:curls \
- || @@flag[:block]==:tics) \
- or (@@flag[:alt]==:curls \
- || @@flag[:alt]==:tics) \
- or (@@flag[:quote]==:open \
+ elsif (@per.poem==:curls \
+ || @per.poem==:tics) \
+ or (@per.box==:curls \
+ || @per.box==:tics) \
+ or (@per.group==:curls \
+ || @per.group==:tics) \
+ or (@per.block==:curls \
+ || @per.block==:tics) \
+ or (@per.alt==:curls \
+ || @per.alt==:tics) \
+ or (@per.quote==:open \
&& t_o =~/`:quote_close`/m) #not
- if (@@flag[:poem]==:curls \
+ if (@per.poem==:curls \
&& t_o =~/^\}poem$/m) \
- or (@@flag[:poem]==:tics \
+ or (@per.poem==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:poem]=:off
+ @per.poem=:off
h={
is_for: :poem,
obj: '',
@@ -903,11 +886,11 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:poem],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif (@@flag[:box]==:curls \
+ elsif (@per.box==:curls \
&& t_o =~/^\}box/) \
- or (@@flag[:box]==:tics \
+ or (@per.box==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:box]=:off
+ @per.box=:off
obj,tags=extract_tags(@tuned_block.join("\n"))
h={
obj: obj,
@@ -926,11 +909,11 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:box],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif (@@flag[:group]==:curls \
+ elsif (@per.group==:curls \
&& t_o =~/^\}group/) \
- or (@@flag[:group]==:tics \
+ or (@per.group==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:group]=:off
+ @per.group=:off
obj,tags=extract_tags(@tuned_block.join("\n"))
h={
obj: obj,
@@ -948,11 +931,11 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:group],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif (@@flag[:block]==:curls \
+ elsif (@per.block==:curls \
&& t_o =~/^\}block/) \
- or (@@flag[:block]==:tics \
+ or (@per.block==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:block]=:off
+ @per.block=:off
obj,tags=extract_tags(@tuned_block.join("\n"))
h={
obj: obj,
@@ -970,11 +953,11 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:block],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif (@@flag[:alt]==:curls \
+ elsif (@per.alt==:curls \
&& t_o =~/^\}alt/) \
- or (@@flag[:alt]==:tics \
+ or (@per.alt==:tics \
&& t_o =~/^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
- @@flag[:alt]=:off
+ @per.alt=:off
obj,tags=extract_tags(@tuned_block.join("\n"))
h={
obj: obj,
@@ -992,9 +975,9 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:alt],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif @@flag[:quote]==:open \
+ elsif @per.quote==:open \
and t_o =~/`:quote_close`/m
- @@flag[:quote]=:off
+ @per.quote=:off
h={
is_for: :quote,
idx: idx,
@@ -1003,7 +986,7 @@ module SiSU_AO_DocumentStructureExtract
num: @num_id[:quote],
}
t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
- elsif @@flag[:quote]==:open
+ elsif @per.quote==:open
t_o,tags=extract_tags(t_o)
h={
indent: 1,
@@ -1016,18 +999,18 @@ module SiSU_AO_DocumentStructureExtract
}
SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
end
- if (@@flag[:poem]==:curls \
- || @@flag[:poem]==:tics) \
- or (@@flag[:group]==:curls \
- || @@flag[:group]==:tics) \
- or (@@flag[:alt]==:curls \
- || @@flag[:alt]==:tics) \
+ if (@per.poem==:curls \
+ || @per.poem==:tics) \
+ or (@per.group==:curls \
+ || @per.group==:tics) \
+ or (@per.alt==:curls \
+ || @per.alt==:tics) \
and t_o =~/\S/ \
and t_o !~/^(?:\}(?:verse|code|box|alt|group|block)|(?:verse|code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|alt|group|block)\{)/ \
and t_o !~/^```[ ]+(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|poem|alt|group|block)|^```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/ # fix logic
sub_array=t_o.dup
@line_mode=sub_array.scan(/.+/)
- type=if @@flag[:poem]==:curls or @@flag[:poem]==:tics
+ type=if @per.poem==:curls or @per.poem==:tics
t_o=SiSU_AO_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join
poem=t_o.split(/\n\n/)
poem.each do |v|
@@ -1045,14 +1028,14 @@ module SiSU_AO_DocumentStructureExtract
else :group
end
end
- @verse_count+=1 if @@flag[:poem]==:curls or @@flag[:poem]==:tics
+ @verse_count+=1 if @per.poem==:curls or @per.poem==:tics
end
- if @@flag[:code]==:off
- if @@flag[:poem]==:curls or @@flag[:poem]==:tics \
- or @@flag[:box]==:curls or @@flag[:box]==:tics \
- or @@flag[:group]==:curls or @@flag[:group]==:tics \
- or @@flag[:alt]==:curls or @@flag[:alt]==:tics \
- or (@@flag[:quote]==:open and t_o =~/`:quote_close`/m)
+ if @per.code==:off
+ if @per.poem==:curls or @per.poem==:tics \
+ or @per.box==:curls or @per.box==:tics \
+ or @per.group==:curls or @per.group==:tics \
+ or @per.alt==:curls or @per.alt==:tics \
+ or (@per.quote==:open and t_o =~/`:quote_close`/m)
if t_o.is_a?(String)
t_o=t_o.gsub(/\n/m,"#{Mx[:br_nl]}").
gsub(/[ ][ ]/m,"#{Mx[:nbsp]*2}").
@@ -1073,6 +1056,24 @@ module SiSU_AO_DocumentStructureExtract
else tuned_file << t_o
end
end
+ tuned_file
+ end
+ def identify_parts
+ tuned_file=[]
+ @tuned_block,@tuned_code=[],[]
+ @@counter,@verse_count=0,0
+ @num_id={
+ code_block: 0,
+ poem: 0,
+ box: 0,
+ group: 0,
+ alt: 0,
+ quote: 0,
+ table: 0,
+ }
+ @metadata={}
+ @data,bibliography=SiSU_AO_References::Bibliography.new(@md,@data).biblio_extraction
+ tuned_file=extract_structure_loop(@data,tuned_file)
if @md.flag_endnotes
tuned_file << @pb
h={
@@ -1092,7 +1093,98 @@ module SiSU_AO_DocumentStructureExtract
tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
h={
obj: 'Endnotes'
- }
+ }
+ end
+ if @md.flag_auto_biblio
+ tuned_file << @pb
+ h={
+ ln: 1,
+ lc: 1,
+ obj: 'References',
+ autonum_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+ h={
+ ln: 4,
+ lc: 2,
+ obj: 'Bibliography',
+ name: 'biblio',
+ autonum_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+ h={
+ obj: 'Bibliography'
+ }
+ citenumber=0
+ bibliography.each do |c|
+ citenumber +=1 if c.is_a?(Hash)
+ if c[:is]==:book
+ h={
+ obj: %{[#{citenumber}] *{#{c[:author]}}* /{"#{c[:fulltitle]}"}/ #{c[:publisher]} (#{c[:year]}) #{c[:url]}},
+ tags: [c[:id]],
+ hang: 0,
+ indent: 2,
+ ocn_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ elsif c[:is]==:article
+ h={
+ obj: %{[#{citenumber}] *{#{c[:author]}}* /{"#{c[:title]}"}/ #{c[:journal]} #{c[:volume]} (#{c[:year]}) #{c[:url]}},
+ tags: [c[:id]],
+ hang: 0,
+ indent: 2,
+ ocn_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ end
+ end
+ elsif @md.flag_biblio
+ tuned_file << @pb
+ h={
+ ln: 1,
+ lc: 1,
+ obj: 'References',
+ autonum_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+ h={
+ ln: 4,
+ lc: 2,
+ obj: 'Bibliography',
+ name: 'biblio',
+ autonum_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
+ h={
+ obj: 'Bibliography'
+ }
+ if bibliography.length > 0
+ tuned_file=extract_structure_loop(bibliography,tuned_file)
+ else
+ tuned_file, citations =
+ SiSU_AO_References::Citations.new(@md,tuned_file).songsheet # ao_references.rb
+ citenumber=0
+ citations.compact.each do |c|
+ citenumber +=1 if c.is_a?(Hash)
+ if c[:is]==:book
+ h={
+ obj: %{[#{citenumber}] *{#{c[:author]}}* /{#{c[:publication]}}/ (#{c[:year]})},
+ hang: 0,
+ indent: 2,
+ ocn_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ elsif c[:is]==:article
+ h={
+ obj: %{[#{citenumber}] *{#{c[:author]}}* /{"#{c[:title]}"}/ #{c[:publication]} editor #{c[:editor]} (#{c[:year]})},
+ hang: 0,
+ indent: 2,
+ ocn_: false,
+ }
+ tuned_file << SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ end
+ end
+ end
end
if @md.book_idx
tuned_file << @pb
@@ -1137,7 +1229,7 @@ module SiSU_AO_DocumentStructureExtract
obj: 'eof',
}
meta=SiSU_AO_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
- [tuned_file,meta]
+ [tuned_file,meta,bibliography]
end
def table_rows_and_columns_array(table_str)
table=[]
@@ -1165,13 +1257,13 @@ module SiSU_AO_DocumentStructureExtract
SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
end
def build_lines(type=:none)
- lines,lines_new=@data,[]
- lines.each do |line|
+ lines=@data
+ lines.each.map do |line|
line=if line =~/\S/ \
and line !~/^(?:code(?:\.[a-z][0-9a-z_]+)?\{|\}code)/ \
and line !~/^(?:```[ ]+code(?:\.[a-z][0-9a-z_]+)?|```(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$)/ \
and not line.is_a?(Hash) #watch
- @@counter+=1 if @@flag[:code]==:curls or @@flag[:code]==:tics
+ @@counter+=1 if @per.code==:curls or @per.code==:tics
line=line.gsub(/\s\s/,"#{Mx[:nbsp]*2}").
gsub(/#{Mx[:nbsp]}\s/,"#{Mx[:nbsp]*2}")
line=line.gsub(/^/,"#{Mx[:gr_o]}codeline#{Mx[:gr_c]}") if type==:code # REMOVE try sort for texpdf special case
@@ -1183,9 +1275,8 @@ module SiSU_AO_DocumentStructureExtract
line.gsub(/\s*$/,"#{Mx[:br_nl]}")
else line
end
- lines_new << line
+ line
end
- lines_new
end
end
class Structure # this must happen early
@@ -1260,8 +1351,8 @@ module SiSU_AO_DocumentStructureExtract
end
end
class OCN
- def initialize(md,data)
- @md,@data=md,data
+ def initialize(md,data,fnx,process)
+ @md,@data,@fnx,@process=md,data,fnx,process
end
def structure_info
def lv
@@ -1321,31 +1412,33 @@ has incorrect level and/or parent level
--}
end
def required_headers_present?
- unless (defined? @md.title \
- and @md.title.full)
- STDERR.puts %{required header missing:
+ if @process == :complete
+ unless (defined? @md.title \
+ and @md.title.full)
+ STDERR.puts %{required header missing:
@title:
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"
}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
- end
- unless (defined? @md.creator.author \
- and @md.creator.author)
- STDERR.puts %{required header missing:
+ unless (defined? @md.creator.author \
+ and @md.creator.author)
+ STDERR.puts %{required header missing:
@creator:
:author: anonymous?
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"
}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
end
end
@@ -1384,337 +1477,341 @@ SKIPPED processing file:
if not dob.obj =~/~#|-#/
ocn+=1
end
- if dob.is==:heading \
- and (ln.to_s =~/^[0-9]/ \
- or ln.to_s =~@md.lv0 \
- or ln.to_s =~@md.lv1 \
- or ln.to_s =~@md.lv2 \
- or ln.to_s =~@md.lv3 \
- or ln.to_s =~@md.lv4 \
- or ln.to_s =~@md.lv5 \
- or ln.to_s =~@md.lv6 \
- or ln.to_s =~@md.lv7)
- if not dob.obj =~/~#|-#/
- ocnh+=1
- end
- if ln==0 \
- or ln=~@md.lv0
- @lev_occurences[:a] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh0+=1 #heading
- node0="0:#{ocnh0};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node0="0:0;0"
- end
- document_structure_check_info(node0,node0)
- @collapsed_lv0=0
- collapsed_level=@collapsed_lv0
- node,ocn_sp,parent=node0,"h#{ocnh}",'ROOT'
- elsif ln==1 \
- or ln=~@md.lv1
- @lev_occurences[:b] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh1+=1 #heading
- node1="1:#{ocnh1};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node1="1:0;0"
- end
- parent=if node0
- document_structure_check_info(node1,node0)
- @collapsed_lv1=@collapsed_lv0+1
- node0
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node0,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv1
- node,ocn_sp,parent=node1,"h#{ocnh}",node0 #FIX
- elsif ln==2 \
- or ln=~@md.lv2
- @lev_occurences[:c] += 1
+ if @process == :complete \
+ or (@fnx == @md.opt.fns \
+ && @md.opt.fns =~/.sst$/)
+ if dob.is==:heading \
+ and (ln.to_s =~/^[0-9]/ \
+ or ln.to_s =~@md.lv0 \
+ or ln.to_s =~@md.lv1 \
+ or ln.to_s =~@md.lv2 \
+ or ln.to_s =~@md.lv3 \
+ or ln.to_s =~@md.lv4 \
+ or ln.to_s =~@md.lv5 \
+ or ln.to_s =~@md.lv6 \
+ or ln.to_s =~@md.lv7)
if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh2+=1
- node2="2:#{ocnh2};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node2="2:0;0"
- end
- parent=if node1
- document_structure_check_info(node2,node1)
- @collapsed_lv2=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node2,node0,:error)
- node0
+ ocnh+=1
end
- collapsed_level=@collapsed_lv2
- node,ocn_sp=node2,"h#{ocnh}"
- elsif ln==3 \
- or ln=~@md.lv3
- @lev_occurences[:d] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh3+=1
- node3="3:#{ocnh3};#{ocn}"
- else
- #document_structure_check_info(node0,node0,:error) #fix
- ocn_flag=false
- node3="3:0;0"
- end
- parent=if node2
- document_structure_check_info(node3,node2)
- @collapsed_lv3=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- puts %{parent is :A~ & this level #{dob.lv}
+ if ln==0 \
+ or ln=~@md.lv0
+ @lev_occurences[:a] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh0+=1 #heading
+ node0="0:#{ocnh0};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node0="0:0;0"
+ end
+ document_structure_check_info(node0,node0)
+ @collapsed_lv0=0
+ collapsed_level=@collapsed_lv0
+ node,ocn_sp,parent=node0,"h#{ocnh}",'ROOT'
+ elsif ln==1 \
+ or ln=~@md.lv1
+ @lev_occurences[:b] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh1+=1 #heading
+ node1="1:#{ocnh1};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node1="1:0;0"
+ end
+ parent=if node0
+ document_structure_check_info(node1,node0)
+ @collapsed_lv1=@collapsed_lv0+1
+ node0
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node0,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv1
+ node,ocn_sp,parent=node1,"h#{ocnh}",node0 #FIX
+ elsif ln==2 \
+ or ln=~@md.lv2
+ @lev_occurences[:c] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh2+=1
+ node2="2:#{ocnh2};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node2="2:0;0"
+ end
+ parent=if node1
+ document_structure_check_info(node2,node1)
+ @collapsed_lv2=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node2,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv2
+ node,ocn_sp=node2,"h#{ocnh}"
+ elsif ln==3 \
+ or ln=~@md.lv3
+ @lev_occurences[:d] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh3+=1
+ node3="3:#{ocnh3};#{ocn}"
+ else
+ #document_structure_check_info(node0,node0,:error) #fix
+ ocn_flag=false
+ node3="3:0;0"
+ end
+ parent=if node2
+ document_structure_check_info(node3,node2)
+ @collapsed_lv3=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts %{parent is :A~ & this level #{dob.lv}
either parent should be level :B~
or this level should be level :B~ rather than #{dob.lv}}
- document_structure_check_info(node3,node1,:error)
- @collapsed_lv3=@collapsed_lv1+1
- node1
- else
- document_structure_check_info(node3,node0,:error)
- warning_incorrect_parent_level_or_level(dob.obj)
- node0
- end
- collapsed_level=@collapsed_lv3
- node,ocn_sp=node3,"h#{ocnh}"
- elsif ln==4 \
- or ln=~@md.lv4
- @lev_occurences[:l1] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh4+=1
- node4="4:#{ocnh4};#{ocn}"
- else
- ocn_flag=false
- node4="4:0;0"
- end
- parent=if node3
- document_structure_check_info(node4,node3)
- @collapsed_lv4=@collapsed_lv3+1
- node3
- elsif node2
- document_structure_check_info(node4,node2)
- @collapsed_lv4=@collapsed_lv2+1
- node2
- elsif node1
- document_structure_check_info(node4,node1)
- @collapsed_lv4=@collapsed_lv1+1
- node1
- elsif node0
- document_structure_check_info(node4,node0)
- @collapsed_lv4=@collapsed_lv0+1
- node0
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node4,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv4
- node,ocn_sp=node4,"h#{ocnh}"
- elsif ln==5 \
- or ln=~@md.lv5
- @lev_occurences[:l2] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh5+=1
- node5="5:#{ocnh5};#{ocn}"
- else
- ocn_flag=false
- node5="5:0;0"
- end
- parent=if node4
- document_structure_check_info(node5,node4)
- @collapsed_lv5=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node3,:error)
- @collapsed_lv5=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node2,:error)
- @collapsed_lv5=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node1,:error)
- @collapsed_lv5=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node5,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv5
- node,ocn_sp=node5,"h#{ocnh}"
- elsif ln==6 \
- or ln=~@md.lv6
- @lev_occurences[:l3] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh6+=1
- node6="6:#{ocnh6};#{ocn}"
- else
- ocn_flag=false
- node6="6:0;0"
- end
- parent=if node5
- document_structure_check_info(node6,node5)
- @collapsed_lv6=@collapsed_lv5+1
- node5
- elsif node4
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node3,node1,:error)
+ @collapsed_lv3=@collapsed_lv1+1
+ node1
+ else
+ document_structure_check_info(node3,node0,:error)
+ warning_incorrect_parent_level_or_level(dob.obj)
+ node0
+ end
+ collapsed_level=@collapsed_lv3
+ node,ocn_sp=node3,"h#{ocnh}"
+ elsif ln==4 \
+ or ln=~@md.lv4
+ @lev_occurences[:l1] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh4+=1
+ node4="4:#{ocnh4};#{ocn}"
+ else
+ ocn_flag=false
+ node4="4:0;0"
+ end
+ parent=if node3
+ document_structure_check_info(node4,node3)
+ @collapsed_lv4=@collapsed_lv3+1
+ node3
+ elsif node2
+ document_structure_check_info(node4,node2)
+ @collapsed_lv4=@collapsed_lv2+1
+ node2
+ elsif node1
+ document_structure_check_info(node4,node1)
+ @collapsed_lv4=@collapsed_lv1+1
+ node1
+ elsif node0
+ document_structure_check_info(node4,node0)
+ @collapsed_lv4=@collapsed_lv0+1
+ node0
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node4,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv4
+ node,ocn_sp=node4,"h#{ocnh}"
+ elsif ln==5 \
+ or ln=~@md.lv5
+ @lev_occurences[:l2] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh5+=1
+ node5="5:#{ocnh5};#{ocn}"
+ else
+ ocn_flag=false
+ node5="5:0;0"
+ end
+ parent=if node4
+ document_structure_check_info(node5,node4)
+ @collapsed_lv5=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node3,:error)
+ @collapsed_lv5=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node2,:error)
+ @collapsed_lv5=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node1,:error)
+ @collapsed_lv5=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node5,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv5
+ node,ocn_sp=node5,"h#{ocnh}"
+ elsif ln==6 \
+ or ln=~@md.lv6
+ @lev_occurences[:l3] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh6+=1
+ node6="6:#{ocnh6};#{ocn}"
+ else
+ ocn_flag=false
+ node6="6:0;0"
+ end
+ parent=if node5
+ document_structure_check_info(node6,node5)
+ @collapsed_lv6=@collapsed_lv5+1
+ node5
+ elsif node4
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level #5 (2~)
or this level should be #5 (2~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node6,node4,:error)
- @collapsed_lv6=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node3,:error)
- @collapsed_lv6=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node2,:error)
- @collapsed_lv6=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node1,:error)
- @collapsed_lv6=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node6,node0,:error)
- node0
- end
- collapsed_level=@collapsed_lv6
- node,ocn_sp=node6,"h#{ocnh}"
- elsif ln==7 \
- or ln=~@md.lv7
- @lev_occurences[:l4] += 1
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- ocnh7+=1
- node7="7:#{ocnh7};#{ocn}"
- else
- ocn_flag=false
- node7="7:0;0"
- end
- parent=if node6
- document_structure_check_info(node7,node6)
- @collapsed_lv7=@collapsed_lv6+1
- node5
- elsif node5
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #5 (2~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node6,node4,:error)
+ @collapsed_lv6=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node3,:error)
+ @collapsed_lv6=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node2,:error)
+ @collapsed_lv6=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node1,:error)
+ @collapsed_lv6=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node6,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv6
+ node,ocn_sp=node6,"h#{ocnh}"
+ elsif ln==7 \
+ or ln=~@md.lv7
+ @lev_occurences[:l4] += 1
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ ocnh7+=1
+ node7="7:#{ocnh7};#{ocn}"
+ else
+ ocn_flag=false
+ node7="7:0;0"
+ end
+ parent=if node6
+ document_structure_check_info(node7,node6)
+ @collapsed_lv7=@collapsed_lv6+1
+ node5
+ elsif node5
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #5 (2~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level #6 (3~)
or this level should be #6 (3~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node7,node5,:error)
- @collapsed_lv6=@collapsed_lv5+1
- node5
- elsif node4
- warning_incorrect_parent_level_or_level(dob.obj)
- puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
+ document_structure_check_info(node7,node5,:error)
+ @collapsed_lv6=@collapsed_lv5+1
+ node5
+ elsif node4
+ warning_incorrect_parent_level_or_level(dob.obj)
+ puts "parent is level #4 (1~) & this level ##{dob.ln} (#{dob.lv}~)
either parent should be level 6~
or this level should be #6 (3~) rather ##{dob.ln} (#{dob.lv}~)"
- document_structure_check_info(node7,node4,:error)
- @collapsed_lv6=@collapsed_lv4+1
- node4
- elsif node3
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node3,:error)
- @collapsed_lv6=@collapsed_lv3+1
- node3
- elsif node2
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node2,:error)
- @collapsed_lv6=@collapsed_lv2+1
- node2
- elsif node1
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node1,:error)
- @collapsed_lv6=@collapsed_lv1+1
- node1
- else
- warning_incorrect_parent_level_or_level(dob.obj)
- document_structure_check_info(node7,node0,:error)
- node0
+ document_structure_check_info(node7,node4,:error)
+ @collapsed_lv6=@collapsed_lv4+1
+ node4
+ elsif node3
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node3,:error)
+ @collapsed_lv6=@collapsed_lv3+1
+ node3
+ elsif node2
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node2,:error)
+ @collapsed_lv6=@collapsed_lv2+1
+ node2
+ elsif node1
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node1,:error)
+ @collapsed_lv6=@collapsed_lv1+1
+ node1
+ else
+ warning_incorrect_parent_level_or_level(dob.obj)
+ document_structure_check_info(node7,node0,:error)
+ node0
+ end
+ collapsed_level=@collapsed_lv7
+ node,ocn_sp=node7,"h#{ocnh}"
end
- collapsed_level=@collapsed_lv7
- node,ocn_sp=node7,"h#{ocnh}"
- end
- else
- unless @lev_occurences[:l1] > 0
- STDERR.puts %{Substantive text objects must follow a level 1~ heading and there are none at this point in processing: #{@lev_occurences[:l1]}
+ else
+ unless @lev_occurences[:l1] > 0
+ STDERR.puts %{Substantive text objects must follow a level 1~ heading and there are none at this point in processing: #{@lev_occurences[:l1]}
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- puts dob.obj #.gsub(/^(.{1,80})/,'"\1"')
- exit
- end
- unless @ln >= 4
- lev=case @ln
- when 0 then 'A'
- when 1 then 'B'
- when 2 then 'C'
- when 3 then 'D'
- when 4 then '1'
- when 5 then '2'
- when 6 then '3'
- when 7 then '4'
- when 8 then '5'
- when 9 then '6'
+ puts dob.obj #.gsub(/^(.{1,80})/,'"\1"')
+ exit
end
- STDERR.puts %{Substantive text objects must follow a level 1~ 2~ or 3~ heading: #{lev}~
+ unless @ln >= 4
+ lev=case @ln
+ when 0 then 'A'
+ when 1 then 'B'
+ when 2 then 'C'
+ when 3 then 'D'
+ when 4 then '1'
+ when 5 then '2'
+ when 6 then '3'
+ when 7 then '4'
+ when 8 then '5'
+ when 9 then '6'
+ end
+ STDERR.puts %{Substantive text objects must follow a level 1~ 2~ or 3~ heading: #{lev}~
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- puts dob.obj.gsub(/^(.{1,80})/,'"\1"')
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- break
- else exit
+ puts dob.obj.gsub(/^(.{1,80})/,'"\1"')
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ break
+ else exit
+ end
+ end
+ if not dob.obj =~/~#|-#/
+ ocn_flag=true
+ else
+ ocn_flag=false
+ end
+ ocno+=1
+ if dob.is==:table
+ ocnt+=1
+ ocn_sp,parent="t#{ocnt}",node
+ elsif dob.is==:code
+ ocnc+=1
+ ocn_sp,parent="c#{ocnc}",node
+ elsif dob.is==:group \
+ || dob.is==:box \
+ || dob.is==:block \
+ || dob.is==:alt \
+ || dob.is==:verse
+ ocng+=1 #group, poem
+ ocn_sp,parent="g#{ocng}",node
+ elsif dob.is==:image #check
+ ocni+=1
+ ocn_sp,parent="i#{ocni}",node
+ else ocnp+=1 #paragraph
+ ocn_sp,parent="p#{ocnp}",node
end
- end
- if not dob.obj =~/~#|-#/
- ocn_flag=true
- else
- ocn_flag=false
- end
- ocno+=1
- if dob.is==:table
- ocnt+=1
- ocn_sp,parent="t#{ocnt}",node
- elsif dob.is==:code
- ocnc+=1
- ocn_sp,parent="c#{ocnc}",node
- elsif dob.is==:group \
- || dob.is==:box \
- || dob.is==:block \
- || dob.is==:alt \
- || dob.is==:verse
- ocng+=1 #group, poem
- ocn_sp,parent="g#{ocng}",node
- elsif dob.is==:image #check
- ocni+=1
- ocn_sp,parent="i#{ocni}",node
- else ocnp+=1 #paragraph
- ocn_sp,parent="p#{ocnp}",node
end
end
if dob.is==:heading
@@ -1763,24 +1860,28 @@ SKIPPED processing file:
end
@o_array << dob
end
- unless @lev_occurences[:a] == 1
- STDERR.puts %{The number of level A~ in this document: #{@lev_occurences[:a]}
+ if @process == :complete \
+ or (@fnx == @md.opt.fns \
+ && @md.opt.fns =~/.sst$/)
+ unless @lev_occurences[:a] == 1
+ STDERR.puts %{The number of level A~ in this document: #{@lev_occurences[:a]}
There must be one level A~ (no more and no less)
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
- end
- unless @lev_occurences[:l1] > 0
- STDERR.puts %{The number of level 1~ in this document: #{@lev_occurences[:l1]}
+ unless @lev_occurences[:l1] > 0
+ STDERR.puts %{The number of level 1~ in this document: #{@lev_occurences[:l1]}
There must be at least one level 1~ (and as many as required)
SKIPPED processing file:
[#{@md.opt.lng}] "#{@md.fns}"}
- if @md.opt.act[:no_stop][:set]==:on
- $process_document = :skip
- else exit
+ if @md.opt.act[:no_stop][:set]==:on
+ $process_document = :skip
+ else exit
+ end
end
end
@o_array
diff --git a/lib/sisu/v6/ao_endnotes.rb b/lib/sisu/develop/ao_endnotes.rb
index 3b731e30..c5233452 100644
--- a/lib/sisu/v6/ao_endnotes.rb
+++ b/lib/sisu/develop/ao_endnotes.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_doc_endnotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_doc_endnotes.rb;hb=HEAD>
=end
module SiSU_AO_Endnotes
@@ -69,9 +66,8 @@ module SiSU_AO_Endnotes
end
def endnotes
data=@data
- @tuned_file=[]
endnote_ref=1
- data.each do |dob|
+ @tuned_file=data.each.map do |dob|
# manually numbered endnotes <!e(\d)!> <!e_(\d)!> -->
if @md.opt.selections.str =~/--no-asterisk|--no-annotate/
dob.obj=dob.obj.
@@ -92,20 +88,20 @@ module SiSU_AO_Endnotes
word_mode=endnote_call_number(word_mode)
dob.obj=word_mode.join(' ')
endnote_ref+=1
- when /~\^(?:\s|$)|<:e>/ #%note inserts endnotes previously gathered from /^(<!e[:_]!>|[-~]\{{3})/ (in earlier loop)
+ when /~\^(?:\s|$)/ #%note inserts endnotes previously gathered from /^(<!e[:_]!>|[-~]\{{3})/ (in earlier loop)
word_mode=dob.obj.scan(/\S+/m)
word_mode=endnote_call_number(word_mode)
dob.obj=word_mode.join(' ')
endnote_ref+=1
end
end
- @tuned_file << dob
- end
+ dob
+ end.flatten
@endnote_counter,
@endnote_counter_asterisk,
@endnote_counter_dag=
1,1,1
- @tuned_file=@tuned_file.flatten
+ @tuned_file
end
def endnote_call_number(words)
words.each do |word|
@@ -126,9 +122,9 @@ module SiSU_AO_Endnotes
"#{Mx[:en_b_o]}\*#{@endnote_counter_asterisk} ")
@endnote_counter_asterisk+=1
end
- when /~\^|<:e>/
+ when /~\^/
if @endnote_array
- word.gsub!(/~\^|<:e>/,
+ word.gsub!(/~\^/,
"#{@endnote_array[@endnote_counter-1]}")
@endnote_counter+=1
end
diff --git a/lib/sisu/v5/ao_expand_insertions.rb b/lib/sisu/develop/ao_expand_insertions.rb
index fe02d4c6..897cb7e2 100644
--- a/lib/sisu/v5/ao_expand_insertions.rb
+++ b/lib/sisu/develop/ao_expand_insertions.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_expand_insertions.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_expand_insertions.rb;hb=HEAD>
=end
module SiSU_AO_Insertions
@@ -487,21 +484,19 @@ module SiSU_AO_Insertions
linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
tuned_file_tmp << linked_title
output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
- output_filetypes[:gen].each do |o_f|
- describe = o_f
- if describe
- tuned_file_tmp << if @u.remote #to double space <:br> at beginning of entry
- "#{Mx[:nbsp]*4} #{describe} "
+ output_filetypes[:gen].each do |desc|
+ if desc
+ tuned_file_tmp << if @u.remote
+ "#{Mx[:nbsp]*4} #{desc} "
else # remove ...
"[provide document placement host location]"
end
end
end
- output_filetypes[:src].each do |o_f|
- describe = o_f
- if describe
+ output_filetypes[:src].each do |desc|
+ if desc
tuned_file_tmp << if @u.remote
- "#{Mx[:nbsp]*4} #{describe} "
+ "#{Mx[:nbsp]*4} #{desc} "
else
"[provide document placement host location]"
end
diff --git a/lib/sisu/v5/ao_hash_digest.rb b/lib/sisu/develop/ao_hash_digest.rb
index f732cc63..39f34f85 100644
--- a/lib/sisu/v5/ao_hash_digest.rb
+++ b/lib/sisu/develop/ao_hash_digest.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_hash_digest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_hash_digest.rb;hb=HEAD>
=end
module SiSU_AO_Hash
@@ -106,9 +103,8 @@ module SiSU_AO_Hash
#use md5 or to create hash of each ao object including ocn, & add into to each ao object
end
def endnote_digest(data)
- t_o_bit=[]
- data.each do |en_plus|
- t_o_bit <<= case en_plus
+ data.each.map do |en_plus|
+ case en_plus
when /#{Mx[:en_a_o]}|#{Mx[:en_b_o]}/
if en_plus =~/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/
t_o_txt,en_open,en_txt,en_close=
@@ -136,8 +132,7 @@ module SiSU_AO_Hash
end
else en_plus
end
- end
- t_o_bit.join
+ end.join
end
def stamped(t_o,hash_class) #decide what hash information is most useful, is compromise necessary?
t_o.obj=SiSU_TextRepresentation::Alter.new(t_o).strip_clean_of_extra_spaces
diff --git a/lib/sisu/v5/ao_idx.rb b/lib/sisu/develop/ao_idx.rb
index 71cfc9df..cbe3f00c 100644
--- a/lib/sisu/v5/ao_idx.rb
+++ b/lib/sisu/develop/ao_idx.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_idx.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_idx.rb;hb=HEAD>
=end
module SiSU_AO_BookIndex
@@ -64,8 +61,6 @@ module SiSU_AO_BookIndex
@rgx_idx=/#{Mx[:idx_o]}(?:.+?)#{Mx[:idx_c]}\s*/
@rgx_idx_ocn_seg=/(.+?)~(\d+)~(\S+)/
@rgx_idx_ocn=/(.+?)~(\d+)/
- @ocn_html_identifier=
- SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
@env ||=SiSU_Env::InfoEnv.new(@md.fns)
end
def indexing_song
@@ -264,13 +259,13 @@ module SiSU_AO_BookIndex
if a[:range]
idx[:sst_rel_html_seg][@o]=
idx[:sst_rel_html_seg][@o] +
- %{#{Mx[:lnk_o]}#{a[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}/#{a[:seg]}.html##{@ocn_html_identifier}#{a[:ocn]}#{Mx[:rel_c]}, }
+ %{#{Mx[:lnk_o]}#{a[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}/#{a[:seg]}.html##{a[:ocn]}#{Mx[:rel_c]}, }
idx[:sst_rel][@t]=
idx[:sst_rel][@t] +
%{#{Mx[:lnk_o]}#{a[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{a[:ocn]}#{Mx[:rel_c]}, }
idx[:html][@q]=
idx[:html][@q] +
- %{<a href="#{a[:seg]}.html##{@ocn_html_identifier}#{a[:ocn]}">#{a[:range]}</a>, }
+ %{<a href="#{a[:seg]}.html##{a[:ocn]}">#{a[:range]}</a>, }
idx[:xhtml][@q]=
idx[:xhtml][@q] +
%{<a href="#{a[:seg]}.xhtml#o#{a[:ocn]}">#{a[:range]}</a>, }
@@ -278,13 +273,13 @@ module SiSU_AO_BookIndex
elsif a[:ocn]
idx[:sst_rel_html_seg][@o]=
idx[:sst_rel_html_seg][@o] +
- %{#{Mx[:lnk_o]}#{a[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{a[:seg]}.html##{@ocn_html_identifier}#{a[:ocn]}#{Mx[:rel_c]}, }
+ %{#{Mx[:lnk_o]}#{a[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{a[:seg]}.html##{a[:ocn]}#{Mx[:rel_c]}, }
idx[:sst_rel][@t]=
idx[:sst_rel][@t] +
%{#{Mx[:lnk_o]}#{a[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{a[:ocn]}#{Mx[:rel_c]}, }
idx[:html][@q]=
idx[:html][@q] +
- %{<a href="#{a[:seg]}.html##{@ocn_html_identifier}#{a[:ocn]}">#{a[:ocn]}</a>, }
+ %{<a href="#{a[:seg]}.html##{a[:ocn]}">#{a[:ocn]}</a>, }
idx[:xhtml][@q]=
idx[:xhtml][@q] +
%{<a href="#{a[:seg]}.xhtml#o#{a[:ocn]}">#{a[:ocn]}</a>, }
@@ -316,13 +311,13 @@ module SiSU_AO_BookIndex
if z[:range]
idx[:sst_rel_html_seg][@o]=
idx[:sst_rel_html_seg][@o] +
- %{#{Mx[:lnk_o]}#{z[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:seg]}.html##{@ocn_html_identifier}#{z[:ocn]}#{Mx[:rel_c]}, }
+ %{#{Mx[:lnk_o]}#{z[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:seg]}.html##{z[:ocn]}#{Mx[:rel_c]}, }
idx[:sst_rel][@t]=
idx[:sst_rel][@t] +
%{#{Mx[:lnk_o]}#{z[:range]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:ocn]}#{Mx[:rel_c]}, }
idx[:html][@q]=
idx[:html][@q] +
- %{<a href="#{z[:seg]}.html##{@ocn_html_identifier}#{z[:ocn]}">#{z[:range]}</a>, }
+ %{<a href="#{z[:seg]}.html##{z[:ocn]}">#{z[:range]}</a>, }
idx[:xhtml][@q]=
idx[:xhtml][@q] +
%{<a href="#{z[:seg]}.xhtml#o#{z[:ocn]}">#{z[:range]}</a>, }
@@ -330,13 +325,13 @@ module SiSU_AO_BookIndex
elsif z[:ocn]
idx[:sst_rel_html_seg][@o]=
idx[:sst_rel_html_seg][@o] +
- %{#{Mx[:lnk_o]}#{z[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:seg]}.html##{@ocn_html_identifier}#{z[:ocn]}#{Mx[:rel_c]}, }
+ %{#{Mx[:lnk_o]}#{z[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:seg]}.html##{z[:ocn]}#{Mx[:rel_c]}, }
idx[:sst_rel][@t]=
idx[:sst_rel][@t] +
%{#{Mx[:lnk_o]}#{z[:ocn]}#{Mx[:lnk_c]}#{Mx[:rel_o]}#{z[:ocn]}#{Mx[:rel_c]}, }
idx[:html][@q]=
idx[:html][@q] +
- %{<a href="#{z[:seg]}.html##{@ocn_html_identifier}#{z[:ocn]}">#{z[:ocn]}</a>, }
+ %{<a href="#{z[:seg]}.html##{z[:ocn]}">#{z[:ocn]}</a>, }
idx[:xhtml][@q]=
idx[:xhtml][@q] +
%{<a href="#{z[:seg]}.xhtml#o#{z[:ocn]}">#{z[:ocn]}</a>, }
@@ -418,12 +413,9 @@ module SiSU_AO_BookIndex
tuned_file
end
def clean_index(data) #check on use of dob
- tuned_file=[]
- data.each do |para|
- para=para.gsub(/\n*#{@rgx_idx}/m,'')
- tuned_file << para
+ data.each.map do |para|
+ para.gsub(/\n*#{@rgx_idx}/m,'')
end
- tuned_file
end
end
end
diff --git a/lib/sisu/v5/ao_images.rb b/lib/sisu/develop/ao_images.rb
index 26694501..f6ef8e12 100644
--- a/lib/sisu/v5/ao_images.rb
+++ b/lib/sisu/develop/ao_images.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_images.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_images.rb;hb=HEAD>
=end
module SiSU_AO_Images
@@ -70,7 +67,6 @@ module SiSU_AO_Images
end
def images
data=@data
- tuned_file=[]
@rmgk=false
imagemagick_=true #imagemagick_=SiSU_Env::InfoSettings.new.program?('rmagick')
if imagemagick_
@@ -88,7 +84,7 @@ module SiSU_AO_Images
).warn
end
end
- data.each do |dob|
+ data.select do |dob|
unless dob.is ==:table
dob.obj=dob.obj.strip
if dob.obj =~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/
@@ -122,7 +118,7 @@ module SiSU_AO_Images
).warn
end
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
if imgk or gmgk
if imgk
imgsys=`identify #{image_path}/#{image}`.strip #system call
@@ -132,7 +128,7 @@ module SiSU_AO_Images
img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2]
img_col,img_row=img_col.to_i,img_row.to_i
else
- errmsg='imagemagick or graphicksmagick are required to process images'
+ errmsg='imagemagick or graphicsmagick are required to process images'
if @md.opt.act[:no_stop][:set]==:on
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error("#{errmsg}, proceeding (as requested) without image processing")
@@ -182,9 +178,8 @@ module SiSU_AO_Images
dob.obj=dob.obj.gsub(/(#{Mx[:lnk_o]})\s*(\S+\.(?:png|jpg|gif))\s+/i,'\1\2 ')
end
end
- tuned_file << dob unless dob.nil?
+ dob unless dob.nil?
end
- tuned_file
end
end
end
diff --git a/lib/sisu/develop/ao_metadata.rb b/lib/sisu/develop/ao_metadata.rb
new file mode 100644
index 00000000..95743213
--- /dev/null
+++ b/lib/sisu/develop/ao_metadata.rb
@@ -0,0 +1,86 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_metadata.rb;hb=HEAD>
+
+=end
+module SiSU_AO_Metadata
+ class Metadata
+ def initialize(md,metad)
+ @md,@metadata=md,metad
+ l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
+ language=l[:n]
+ @tr=SiSU_Translate::Source.new(md,language)
+ end
+ def make_para(obj,ocn)
+ h={
+ obj: obj,
+ ocn: 0
+ }
+ SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
+ end
+ def make_heading(obj,ocn,name,lv,ln)
+ h={
+ lv: lv,
+ ln: ln,
+ name: name,
+ obj: obj,
+ ocn: 0
+ }
+ SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
+ end
+ def metadata
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/ao_misc_arrange.rb b/lib/sisu/develop/ao_misc_arrange.rb
index ffd8684f..8f8fe368 100644
--- a/lib/sisu/v6/ao_misc_arrange.rb
+++ b/lib/sisu/develop/ao_misc_arrange.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_misc_arrange.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_misc_arrange.rb;hb=HEAD>
=end
module SiSU_AO_MiscArrangeText
@@ -192,7 +189,6 @@ module SiSU_AO_MiscArrangeText
end
def prepare_text
data=@data
- data_new=[],[]
if data[0] =~ /^#!\s*(?:\/usr\/bin\/env sisu|\/usr\/bin\/sisu)/ # remove bang from top #! (however file is stripped, so will be removed provided no content precedes it)
data[0]=data[0].gsub(/^#!\s*\/usr\/bin\/sisu/,'').
gsub(/^#!\s*\/usr\/bin\/env sisu/,'')
@@ -201,11 +197,10 @@ module SiSU_AO_MiscArrangeText
data[0]=data[0].gsub(/^(SiSU\s*[\d.]*)$/,'% \1').
gsub(/^(sisu-[\d.]+)$/,'% \1')
end
- data.each do |para|
+ data.each.map do |para|
para=conditional_headings(para)
- data_new << markup_blocks(para)
- end
- data_new=data_new.flatten
+ markup_blocks(para)
+ end.flatten
end
end
end
diff --git a/lib/sisu/v5/ao_numbering.rb b/lib/sisu/develop/ao_numbering.rb
index 06588159..38054fa1 100644
--- a/lib/sisu/v5/ao_numbering.rb
+++ b/lib/sisu/develop/ao_numbering.rb
@@ -1,68 +1,65 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_numbering.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_numbering.rb;hb=HEAD>
=end
module SiSU_AO_Numbering
class Numbering
attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
@@segments_count=0
- def initialize(md,data)
- @md,@data=md,data
+ def initialize(md,data,fnx,process)
+ @md,@data,@fnx,@process=md,data,fnx,process
@obj=@type=@ocn=@lv=@name=@index=@comment=nil
@chosen_seg_names=[]
end
@@ -107,7 +104,9 @@ module SiSU_AO_Numbering
data=ocn(data.compact) #watch
data=xml(data.compact)
data=minor_numbering(data.compact)
- data,tags_map,ocn_html_seg_map=name_para_seg_filename(data)
+ if @process==:complete
+ data,tags_map,ocn_html_seg_map=name_para_seg_filename(data)
+ end
data=set_heading_top(data) unless @md.set_heading_top
[data,tags_map,ocn_html_seg_map]
ensure
@@ -173,7 +172,6 @@ module SiSU_AO_Numbering
gsub(/#{Mx[:gl_bullet]}/,'')
end
def auto_number_heading_ie_title(data) #also does some segment naming
- @tuned_file=[]
if defined? @md.make.num_top \
and @md.make.num_top \
and @md.make.num_top !~/^$/
@@ -186,7 +184,7 @@ module SiSU_AO_Numbering
end
chapter_number_counter=0
data=data.compact
- data.each do |dob| #@md.seg_names << [additions to segment names]
+ @tuned_file=data.each.map do |dob| #@md.seg_names << [additions to segment names]
title_no=nil
if dob.is ==:heading \
&& dob.autonum_ \
@@ -275,12 +273,11 @@ module SiSU_AO_Numbering
dob.tags=set_tags(dob.tags,dob.name)
end
dob.tags=dob.tags.uniq if defined? dob.tags
- @tuned_file << dob
- end
- @tuned_file=@tuned_file.flatten
+ dob
+ end.flatten
end
def ocn(data) #and auto segment numbering increment
- @tuned_file=SiSU_AO_DocumentStructureExtract::OCN.new(@md,data).ocn
+ @tuned_file=SiSU_AO_DocumentStructureExtract::OCN.new(@md,data,@fnx,@process).ocn
@tuned_file
end
def xml(data)
@@ -288,10 +285,9 @@ module SiSU_AO_Numbering
@tuned_file
end
def minor_numbering(data) #and auto segment numbering increment
- @tuned_file=[]
number_small,letter_small=0,0
letter=%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 )
- data.each do |dob|
+ @tuned_file=data.each.map do |dob|
if dob.of ==:heading \
|| dob.of ==:heading_insert \
|| dob.of ==:para \
@@ -314,9 +310,8 @@ module SiSU_AO_Numbering
end
end
end
- @tuned_file << dob
- end
- @tuned_file=@tuned_file.flatten
+ dob
+ end.flatten
end
def leading_zeros_fixed_width_number(possible_seg_name)
if possible_seg_name.to_s =~/^([0-9]+?\.|[0-9]+)$/m #!~/[.,:-]+/
diff --git a/lib/sisu/develop/ao_persist.rb b/lib/sisu/develop/ao_persist.rb
new file mode 100644
index 00000000..51ff6e0b
--- /dev/null
+++ b/lib/sisu/develop/ao_persist.rb
@@ -0,0 +1,194 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** document abstraction
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_persist.rb;hb=HEAD>
+
+=end
+module SiSU_AO_Persist
+ class Persist
+ @@persistance=nil
+ attr_accessor :fns, :ao_arr, :idx_arr_sst, :idx_arr_tex, :idx_arr_html, :idx_arr_xhtml, :map_arr_nametags, :map_arr_ocn_htmlseg
+ def initialize(args=nil)
+ @@persistance=args=(args ? args : (@@persistance || persist_init_hash_values))
+ @fns=args[:fns]
+ @ao_arr=args[:ao_arr]
+ @idx_arr_sst=args[:idx_arr_sst]
+ @idx_arr_tex=args[:idx_arr_tex]
+ @idx_arr_html=args[:idx_arr_html]
+ @idx_arr_xhtml=args[:idx_arr_xhtml]
+ @map_arr_nametags=args[:map_arr_nametags]
+ @map_arr_ocn_htmlseg=args[:map_arr_ocn_htmlseg]
+ end
+ def fns
+ @fns
+ end
+ def ao_arr
+ @ao_arr
+ end
+ def idx_arr_sst
+ @idx_arr_sst
+ end
+ def idx_arr_tex
+ @idx_arr_tex
+ end
+ def idx_arr_html
+ @idx_arr_html
+ end
+ def idx_arr_xhtml
+ @idx_arr_xhtml
+ end
+ def map_arr_nametags
+ @map_arr_nametags
+ end
+ def map_arr_ocn_htmlseg
+ @map_arr_ocn_htmlseg
+ end
+ def persist_init_hash_values
+ {
+ fns: nil,
+ ao_arr: [],
+ idx_arr_sst: [],
+ idx_arr_tex: [],
+ idx_arr_html: [],
+ idx_arr_xhtml: [],
+ map_arr_nametags: [],
+ map_arr_ocn_htmlseg: [],
+ }
+ end
+ def persist_init
+ @@persistance=nil
+ Persist.new(persist_init_hash_values)
+ end
+ end
+ class PersistDocStructExt
+ @@persist=nil
+ attr_accessor :ocn, :lng, :lng_is, :code, :lngsyn, :poem, :block, :box, :group, :alt, :quote, :table, :table_to
+ def initialize(args=nil)
+ @@persist=args=(args ? args : (@@persist || persist_init_hash_values))
+ @ocn=args[:ocn]
+ @lng=args[:lng]
+ @lng_is=args[:lng_is]
+ @code=args[:code]
+ @lngsyn=args[:lngsyn]
+ @poem=args[:poem]
+ @block=args[:block]
+ @box=args[:box]
+ @group=args[:group]
+ @alt=args[:alt]
+ @quote=args[:quote]
+ @table=args[:table]
+ @table_to=args[:table_to]
+ end
+ def ocn
+ @ocn
+ end
+ def lng
+ @lng
+ end
+ def lng_is
+ @lng_is
+ end
+ def code
+ @code
+ end
+ def lngsyn
+ @lngsyn
+ end
+ def poem
+ @poem
+ end
+ def block
+ @block
+ end
+ def box
+ @box
+ end
+ def group
+ @group
+ end
+ def alt
+ @alt
+ end
+ def quote
+ @quote
+ end
+ def table
+ @table
+ end
+ def table_to
+ @table_to
+ end
+ def persist_init_hash_values
+ {
+ ocn: :on,
+ lng: :off,
+ lng_is: :doc_default,
+ code: :off,
+ lngsyn: :txt,
+ poem: :off,
+ block: :off,
+ box: :off,
+ group: :off,
+ alt: :off,
+ quote: :off,
+ table: :off,
+ table_to: :off,
+ }
+ end
+ def persist_init
+ @@persist=nil
+ PersistDocStructExt.new(persist_init_hash_values)
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/ao_references.rb b/lib/sisu/develop/ao_references.rb
new file mode 100644
index 00000000..5ef94c61
--- /dev/null
+++ b/lib/sisu/develop/ao_references.rb
@@ -0,0 +1,502 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_references.rb;hb=HEAD>
+
+=end
+module SiSU_AO_References
+ class Bibliography
+ def initialize(md,data)
+ @md,@data=md,data
+ end
+ def sort_bibliography_array_by_author_year_title(bib)
+ if bib
+ bib.compact.sort_by do |c|
+ [c[:author_arr][0],c[:year],c[:title]]
+ end
+ end
+ end
+ def citation_in_prepared_bibliography(cite)
+ @cite=cite
+ def article
+ {
+ is: :article,
+ author_raw: nil,
+ author: nil,
+ author_arr: nil,
+ title: nil,
+ language: nil,
+ journal: nil,
+ volume: nil,
+ editor: nil,
+ year: nil,
+ where: nil,
+ url: nil,
+ note: nil,
+ short_name: nil,
+ id: nil,
+ }
+ end
+ def book
+ {
+ is: :book,
+ author_raw: nil,
+ author: nil,
+ author_arr: nil,
+ #editor: nil,
+ title: nil,
+ subtitle: nil,
+ fulltitle: nil,
+ language: nil,
+ publisher: nil,
+ edition: nil,
+ year: nil,
+ where: nil,
+ url: nil,
+ note: nil,
+ short_name: nil,
+ id: nil,
+ }
+ end
+ def citation_metadata
+ type=if @cite =~/^jo: \S+/m
+ :article
+ elsif @cite =~/^au: \S+/m
+ :book
+ end
+ if type
+ citeblock=@cite.split("\n")
+ if type == :article
+ citation=article
+ citeblock.select do |meta|
+ case meta
+ when /^((?:au|author):\s+)\S+/ #req
+ citation[:author_raw]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:ti|title):\s+)\S+/ #req
+ citation[:title]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:lng|language):\s+)\S+/
+ citation[:language]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:jo|journal):\s+)\S+/ #req?
+ citation[:journal]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:vo|volume):\s+)\S+/
+ citation[:volume]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:edr|editor):\s+)\S+/
+ citation[:editor]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:yr|year):\s+)\S+/ #req?
+ citation[:year]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:pst|publisher_state):\s+)\S+/
+ citation[:where]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(url:\s+)\S+/
+ citation[:url]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(note:\s+)\S+/
+ citation[:note]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:sn|shortname):\s+)\S+/
+ citation[:short_name]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(id:\s+)\S+/
+ citation[:id]=/^#{$1}(.+)/.match(meta)[1]
+ end
+ end
+ end
+ if type == :book
+ citation=book
+ citeblock.select do |meta|
+ case meta
+ when /^((?:au|author):\s+)\S+/ #req
+ citation[:author_raw]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:ti|title):\s+)\S+/ #req
+ citation[:title]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:st|subtitle):\s+)\S+/
+ citation[:subtitle]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:lng|language):\s+)\S+/
+ citation[:language]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:pb|publisher):\s+)\S+/
+ citation[:publisher]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:edn|edition):\s+)\S+/
+ citation[:edition]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:yr|year):\s+)\S+/ #req?
+ citation[:year]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:pst|publisher_state):\s+)\S+/
+ citation[:where]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(url:\s+)\S+/
+ citation[:url]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(note:\s+)\S+/
+ citation[:note]=/^#{$1}(.+)/.match(meta)[1]
+ when /^((?:sn|shortname):\s+)\S+/
+ citation[:short_name]=/^#{$1}(.+)/.match(meta)[1]
+ when /^(id:\s+)\S+/
+ citation[:id]=/^#{$1}(.+)/.match(meta)[1]
+ end
+ end
+ end
+ if citation[:is]==:book
+ if citation[:subtitle]
+ citation[:fulltitle] = citation[:title] \
+ + ' - ' \
+ + citation[:subtitle]
+ else
+ citation[:fulltitle] = citation[:title]
+ end
+ end
+ citation[:author_arr]=citation[:author_raw].split(/;\s*/)
+ citation[:author]=citation[:author_arr].map do |author|
+ author.gsub(/(.+?),\s+(.+)/,'\2 \1').strip
+ end.join(', ').strip
+ unless citation[:short_name]
+ citation[:short_name]=%{#{c[:author]}, "#{c[:short_name]}" (#{c[:date]})}
+ end
+ end
+ citation
+ end
+ self
+ end
+ def biblio_extraction
+ bibliography=[]
+ biblioflag=false
+ code_flag=false
+ flag_code_curly=:not_code_curly
+ flag_code_tics=:not_code_tics
+ @data=@data.select do |t_o|
+ if t_o =~/^code\{/
+ flag_code_curly=:code_curly
+ elsif t_o =~/^\}code/
+ flag_code_curly=:not_code_curly
+ elsif t_o =~/^``` code/
+ flag_code_tics=:code_tics
+ elsif flag_code_tics ==:code_tics \
+ and t_o =~/^```/
+ flag_code_tics=:not_code_tics
+ end
+ code_flag=if flag_code_curly==:code_curly \
+ or flag_code_tics==:code_tics
+ true
+ else false
+ end
+ unless code_flag
+ if @md.flag_auto_biblio
+ if t_o =~/^1~biblio(?:graphy)?/
+ biblioflag = true
+ t_o
+ elsif t_o =~/^:?[B-D1]~/
+ biblioflag = false
+ t_o
+ elsif biblioflag
+ if t_o !~/\A%+ /
+ bibliography << citation_in_prepared_bibliography(t_o).citation_metadata
+ next
+ else
+ t_o
+ end
+ else t_o
+ end
+ elsif @md.flag_biblio
+ if t_o =~/^1~biblio(?:graphy)?/
+ biblioflag = true
+ next
+ elsif t_o =~/^:?[B-D]~/
+ next
+ elsif t_o =~/^:?[B-D1]~/
+ biblioflag = false
+ t_o
+ elsif biblioflag
+ if t_o !~/\A%+ /
+ bibliography << t_o
+ next
+ else
+ t_o
+ end
+ else t_o
+ end
+ else t_o
+ end
+ else t_o
+ end
+ end.compact
+ if @md.flag_auto_biblio \
+ and bibliography.length > 0
+ data_new=[]
+ bibliography=sort_bibliography_array_by_author_year_title(bibliography)
+ @data.select do |t_o|
+ if t_o =~/^1~biblio(?:graphy)?/
+ bibliography.each do |c|
+ if c[:is]==:book
+ <<-WOK
+
+!_ #{c[:author]}
+/{"#{c[:fulltitle]}"}/ #{c[:publisher]} (#{c[:year]})
+ WOK
+ elsif c[:is]==:article
+ <<-WOK
+
+!_ #{c[:author]}
+/{"#{c[:title]}"}/ #{c[:journal]} (#{c[:year]})
+ WOK
+ end
+ end
+ else data_new << t_o
+ end
+ end
+ @data=data_new
+ end
+ [@data,bibliography]
+ end
+ end
+ class Citations
+ def initialize(md='',data='')
+ @md,@data=md,data
+ #@biblio=[]
+ end
+ def songsheet
+ tuned_file,citations=citations_scan(@data)
+ [tuned_file,citations]
+ end
+ def sort_bibliography_array_by_author_year(bib)
+ bib.sort_by do |c|
+ [c[:author_raw],c[:year]]
+ #[c[:author_arr][0],c[:year],c[:title]]
+ end
+ end
+ def citations_regex
+ def pages_pattern
+ %r{(?:[,.:]?\s+(?:p{1,2}\.?\s+)?(?:\d+--?\d+)[,.]?\s+)?}
+ end
+ def editor_pattern
+ %r{(?<editor>(?:editor|edited by)\s+.+?)}
+ end
+ def year_pattern
+ %r{[(\[]?(?<year>\d{4})[\])]?[.,]?}
+ end
+ def authors_year_title_publication_editor_pages
+ /(?<authors>.+?)\s+#{year_pattern}\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})\s+#{editor_pattern}#{pages_pattern}/m # note ed. is usually edition rather than editor
+ end
+ def authors_title_publication_year_editor_pages
+ /(?<authors>.+?)\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})\s+#{year_pattern}\s+#{editor_pattern}#{pages_pattern}/m # note ed. is usually edition rather than editor
+ end
+ def authors_title_publication_editor_year_pages ###
+ /(?<authors>.+?)\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})\s+ed.\s+#{editor_pattern}#{year_pattern}#{pages_pattern}/m
+ # note ed. is usually edition rather than editor
+ end
+ def authors_title_publication_editor_pages_year ###
+ /(?<authors>.+?)\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})\s+#{editor_pattern}#{pages_pattern}#{year_pattern}/m # note ed. is usually edition rather than editor
+ end
+ def authors_year_title_publication_pages
+ /(?<authors>.+?)\s+#{year_pattern}\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})[,.;]?#{pages_pattern}/m
+ end
+ def authors_title_publication_year_pages
+ /(?<authors>.+?)\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})\s+#{year_pattern}\s+#{pages_pattern}/m
+ end
+ def authors_title_publication_pages_year ###
+ /(?<authors>.+?)\s+"(?<title>.+?)"\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})#{pages_pattern}#{year_pattern}/m
+ end
+ def authors_year_publication_pages
+ /(?<authors>.+?)\s+#{year_pattern}\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})#{pages_pattern}/m
+ end
+ def authors_publication_year_pages
+ /(?<authors>.+?)\s+(?:#{Mx[:fa_italics_o]}|#{Mx[:srcrgx_italics_o]})(?<publication>.+?)(?:#{Mx[:fa_italics_c]}|#{Mx[:srcrgx_italics_c]})[,.;]?\s+(?<publisher>.+?)?#{year_pattern}#{pages_pattern}[.;]?/m
+ end
+ self
+ end
+ def authors?(citations)
+ citations.each.map do |b|
+ if b =~ /^.+\s+::.+?:$/
+ c=/^(?<citation>.+?)\s+::(?<shortref>.+?):$/.match(b)
+ {
+ citation: c[:citation],
+ shortref: c[:shortref],
+ c[:shortref].to_s => c[:citation]
+ }
+ else { citation: b }
+ end
+ end
+ end
+ def long_and_short_ref?(citations) #could be useful, keep ... ectract shortref
+ citations.each.map do |b|
+ if b =~ /^.+\s+::.+?:$/
+ c=/^(?<citation>.+?)\s+::(?<shortref>.+?):$/.match(b)
+ {
+ citation: c[:citation],
+ shortref: c[:shortref],
+ c[:shortref].to_s => c[:citation]
+ }
+ else { citation: b }
+ end
+ end
+ end
+ def citation_detail(citations) #could be useful, keep ... extract shortref
+ bibahash=[]
+ number=0
+ missed=0
+ citations.select do |b|
+ z=if b =~citations_regex.authors_year_title_publication_editor_pages
+ c=citations_regex.authors_year_title_publication_editor_pages.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ editor: c[:editor],
+ }
+ elsif b =~citations_regex.authors_title_publication_year_editor_pages
+ c=citations_regex.authors_title_publication_year_editor_pages.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ editor: c[:editor],
+ }
+ elsif b =~citations_regex.authors_title_publication_editor_year_pages
+ c=citations_regex.authors_title_publication_editor_year_pages.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ editor: c[:editor],
+ }
+ elsif b =~citations_regex.authors_title_publication_editor_pages_year
+ c=citations_regex.authors_title_publication_editor_pages_year.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ editor: c[:editor],
+ }
+ elsif b =~citations_regex.authors_year_title_publication_pages
+ c=citations_regex.authors_year_title_publication_pages.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ }
+ elsif b =~citations_regex.authors_title_publication_year_pages
+ c=citations_regex.authors_title_publication_year_pages.match(b)
+ {
+ is: :article,
+ author_raw: c[:authors],
+ year: c[:year],
+ title: c[:title],
+ publication: c[:publication],
+ }
+ elsif b =~citations_regex.authors_year_publication_pages
+ c=citations_regex.authors_year_publication_pages.match(b)
+ {
+ is: :book,
+ author_raw: c[:authors],
+ year: c[:year],
+ publication: c[:publication],
+ }
+ elsif b =~citations_regex.authors_publication_year_pages
+ c=citations_regex.authors_publication_year_pages.match(b)
+ {
+ is: :book,
+ author_raw: c[:authors],
+ year: c[:year],
+ publication: c[:publication],
+ }
+ else b
+ end
+ if not z.is_a?(NilClass) \
+ and z.is_a?(Hash) \
+ and z[:author_raw].length > 0
+ z[:author_arr]=z[:author_raw].split(/;\s*/)
+ z[:author]=z[:author_arr].map do |author|
+ author.gsub(/(.+?),\s+(.+)/,'\2 \1').strip
+ end.join(', ').strip
+ if @md.opt.act[:verbose_plus][:set]==:on \
+ || @md.opt.act[:maintenance][:set]==:on
+ number +=1 if z.is_a?(Hash)
+ missed +=1 if z.is_a?(String)
+ (z.is_a?(Hash)) \
+ ? (p '[' + number.to_s + '] ' + z.to_s)
+ : (p '<' + missed.to_s + '> ' + z.to_s)
+ end
+ end
+ bibahash << z if z.is_a?(Hash)
+ end
+ bibahash=sort_bibliography_array_by_author_year(bibahash.compact)
+ bibahash
+ end
+ def citations_scan(data)
+ citations=[]
+ #short_ref=[]
+ tuned_file = data.compact.select do |dob|
+ if dob.is !=:meta \
+ && dob.is !=:comment \
+ && dob.is !=:code \
+ && dob.is !=:table
+ if dob.obj =~/\.:.+?:\./
+ citations << dob.obj.scan(/\.:\s*(.+?)\s*:\./m)
+ #short_ref << dob.obj.scan(/\.:\s+(.+?)\s+::([^:]+)::\./m) #look at later
+ ##short_ref << dob.obj.scan(/\.:\s+(.+?)\s+::(.+?)::\./m) #look at later
+ #short_ref << dob.obj.scan(/\.:\s*(.+?)\s*(::(.+?):)?:\./m) #look at later
+ citations=citations.flatten.compact
+ dob.obj=dob.obj. #remove citations delimiter & helpers from text
+ gsub(/\.:|:\./,'')
+ end
+ end
+ dob if dob.is_a?(Object)
+ end
+ #bib=long_and_short_ref?(citations) #could be useful, keep ... extract shortref
+ citations=citation_detail(citations)
+ [tuned_file,citations]
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/ao_syntax.rb b/lib/sisu/develop/ao_syntax.rb
index f5608d97..4632fb2d 100644
--- a/lib/sisu/v5/ao_syntax.rb
+++ b/lib/sisu/develop/ao_syntax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Syntax for markup, input markup syntaxes, determined here
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_syntax.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Syntax for markup, input markup syntaxes, determined here
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/ao_syntax.rb;hb=HEAD>
=end
module SiSU_AO_Syntax
@@ -64,8 +61,8 @@ module SiSU_AO_Syntax
end
end
class Markup
- def initialize(md='',data='')
- @md,@data=md,data
+ def initialize(md='',data='',biblio=[])
+ @md,@data,@bibliography=md,data,biblio
@data_new=[]
url_and_stub=SiSU_Env::InfoEnv.new.url
@output_url="#{url_and_stub.remote}"
@@ -91,8 +88,8 @@ module SiSU_AO_Syntax
@manmkp_ital=emph_italics \
? '[i/*]\\{.+?\\}[i/*]'
: '[i/]\\{.+?\\}[i/]'
- tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)}
- tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
+ tail_m_ital=%q{(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$)}
+ tail_m_bold=%{(?:(?:#{Mx[:fa_italics_c]})?(?:\s|'s\b|[.,;:?!'")]|~\^|~\\\{\s|$))?}
bold_line=%{^!_\s.+?(?:#{Mx[:br_line]}|\n|$)}
#ital_line=%{^/_\s.+?(?:#{Mx[:br_line]}|\n|$)} #not implemented
@line_scan_ital=if defined? @md.italics_match_list[:str]
@@ -224,6 +221,24 @@ module SiSU_AO_Syntax
end
def substitutions(dob)
dob=dob.dup
+ dob=if @md.flag_auto_biblio \
+ and @bibliography.length > 0
+ dob=if dob.is !=:meta \
+ && dob.is !=:heading_insert \
+ && dob.is !=:code \
+ && dob.is !=:comment \
+ && dob.is !=:table
+ @bibliography.each do |c|
+ if c[:id] and not c[:id].nil? and not c[:id].empty?
+ dob.obj=dob.obj.gsub(/#{c[:id]}/mi,c[:short_name])
+ end
+ end
+ dob
+ else dob
+ end
+ dob
+ else dob
+ end
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 \
@@ -360,7 +375,7 @@ module SiSU_AO_Syntax
# {url address}:url
# {image.png}imageurl
# {image.png}png
- # ~{endnote}~ <!e endnote !>
+ # ~{endnote}~
# !_ #bold/emphasise paragraph
# _" #blockquote paragraph
# _1 <:i1> #indent paragraph 1 step
@@ -392,7 +407,7 @@ module SiSU_AO_Syntax
dob.obj=dob.obj.strip
end
dob.obj=dob.obj.
- gsub(/^([*#-.]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators
+ gsub(/^([*#.-]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators
gsub(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c]).
gsub(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]). #default if markup does not specify
gsub(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
@@ -555,7 +570,7 @@ module SiSU_AO_Syntax
# {url address}:url
# {image.png}imageurl
# {image.png}png
- # ~{endnote}~ <!e endnote !>
+ # ~{endnote}~
# +1 <!i1!>
# +2 <!i2!>
puts 'tech'
diff --git a/lib/sisu/develop/cgi.rb b/lib/sisu/develop/cgi.rb
new file mode 100644
index 00000000..23df361f
--- /dev/null
+++ b/lib/sisu/develop/cgi.rb
@@ -0,0 +1,84 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql sqlite)
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi.rb;hb=HEAD>
+
+=end
+module SiSU_CGI #% database building documents
+ require_relative 'se' # se.rb
+ require_relative 'cgi_pgsql' # cgi_pgsql.rb
+ require_relative 'cgi_sqlite' # cgi_sqlite.rb
+ class SearchSQL
+ def initialize(opt)
+ @opt=opt
+ @webserv=@opt.files[0].to_s.strip
+ end
+ def read
+ if @opt.act[:sample_search_form][:db]==:pg # cgi_pgsql.rb
+ SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
+ elsif @opt.act[:sample_search_form][:db]==:sqlite # cgi_sqlite.rb
+ SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
+ else
+ puts <<-WOK
+ please select database type for which sample search form should be built (pgsql or sqlite)
+ sisu --sample-search-form --db=sqlite
+ sisu --sample-search-form --db=pg
+ other options include
+ --webserv-cgi='[cgi-server-name]'
+ --webserv-output='[sisu-output-server-with-base-path]'
+ WOK
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/cgi_pgsql.rb b/lib/sisu/develop/cgi_pgsql.rb
index 3ae98ffe..bb561b08 100644
--- a/lib/sisu/v5/cgi_pgsql.rb
+++ b/lib/sisu/develop/cgi_pgsql.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_pgsql.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database (pgsql)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_pgsql.rb;hb=HEAD>
=end
module SiSU_CGI_PgSQL #% database building documents
diff --git a/lib/sisu/v6/cgi_sql_common.rb b/lib/sisu/develop/cgi_sql_common.rb
index 6976e042..33e9c150 100644
--- a/lib/sisu/v6/cgi_sql_common.rb
+++ b/lib/sisu/develop/cgi_sql_common.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (pgsql sqlite)
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- 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.
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ 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.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ 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>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi_sql_common.rb;hb=HEAD>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- ** Description: generates naive cgi search form for search of sisu database (pgsql sqlite)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_sql_common.rb;hb=HEAD>
=end
module SiSU_CGI_SQL
@@ -540,14 +537,14 @@ module SiSU_CGI_SQL
<!-- SiSU Rights -->
<p class="tiny_left"><font color="#666666" size="2">
Generated by
- #{v[:project]} #{v[:version]} #{v[:date]} (#{v[:date_stamp]})
+ #{v.project} #{v.version} #{v.date} (#{v.date_stamp})
<br>
<a href="http://www.sisudoc.org" >
- <b>#{v[:project]}</b></a> <sup>&copy;</sup> Ralph Amissah
+ <b>#{v.project}</b></a> <sup>&copy;</sup> Ralph Amissah
1993, current 2014.
All Rights Reserved.
<br>
- #{v[:project]} is software for document structuring, publishing and search,
+ #{v.project} is software for document structuring, publishing and search,
<br>
<a href="http://www.jus.uio.no/sisu" >
www.jus.uio.no/sisu
@@ -577,7 +574,7 @@ module SiSU_CGI_SQL
</font></p>
</td><td valign="top" width="45%">
<p class="tiny_left"><font color="#666666" size="2">
- #{v[:project]} using:
+ #{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 identifying/locating system)
@@ -604,7 +601,7 @@ module SiSU_CGI_SQL
</font></p>
</td><td valign="top" width="45%">
<p class="tiny_left"><font color="#666666" size="2">
- #{v[:project]}, developed using
+ #{v.project}, developed using
<a href="http://www.ruby-lang.org/en/">
Ruby
</a>
@@ -911,13 +908,11 @@ module SiSU_CGI_SQL
else nil
end
@search_regx=if unescaped_search #check
- search_regex=[]
- build=unescaped_search.scan(/\S+/).each do |g|
+ search_regex=unescaped_search.scan(/\S+/).each.map do |g|
(g.to_s =~/(AND|OR)/) \
- ? (search_regex << '|')
- : (search_regex << %{#{g.to_s}})
- end
- search_regex=search_regex.join(' ')
+ ? ('|')
+ : (%{#{g.to_s}})
+ end.join(' ')
search_regex=search_regex.gsub(/\s*\|\s*/,'|')
Regexp.new(search_regex, Regexp::IGNORECASE)
else nil
@@ -927,7 +922,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'],c['language_document_char'])}#o#{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
@@ -935,9 +930,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'],c['language_document_char'])}#o#{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,c['language_document_char'])}#o#{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
diff --git a/lib/sisu/v5/cgi_sqlite.rb b/lib/sisu/develop/cgi_sqlite.rb
index 8f3f58eb..7b3a5b02 100644
--- a/lib/sisu/v5/cgi_sqlite.rb
+++ b/lib/sisu/develop/cgi_sqlite.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** generates naive cgi search form for search of sisu database (sqlite)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi_sql_sqlite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database (sqlite)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/cgi_sql_sqlite.rb;hb=HEAD>
=end
module SiSU_CGI_SQLite #% database building documents
diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/develop/conf.rb
index 32354503..90364899 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/develop/conf.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** configuration
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/conf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: configuration
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/conf.rb;hb=HEAD>
=end
module SiSU_Initialize
diff --git a/lib/sisu/v6/constants.rb b/lib/sisu/develop/constants.rb
index bf16d7da..0c4c258d 100644
--- a/lib/sisu/v6/constants.rb
+++ b/lib/sisu/develop/constants.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- constants
+** Description: documents, structuring, processing, publishing, search
+*** constants, system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/constants.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/constants.rb;hb=HEAD>
=end
#Ax,Xx,Mx,Rx,Hx,Dx,Px,Ep,Db,Gt,Tex=Array.new(11){{}}
@@ -66,6 +62,7 @@ Sfx={
txt_asciidoc: '.ad',
txt_markdown: '.md',
txt_rst: '.rst',
+ txt_orgmode: '.org',
html: '.html',
xhtml: '.xhtml',
xml: '.xml',
@@ -150,6 +147,26 @@ Mx={
sm_set_o: '◢', sm_set_c: '◣',
sm_subset_o: '◢', sm_subset_c: '◣',
vline: '┆', # ¦ |
+ src_bold_o: '!{', src_bold_c: '}!',
+ src_italics_o: '/{', src_italics_c: '}/',
+ src_underscore_o: '_{', src_underscore_c: '}_',
+ src_cite_o: '"{', src_cite_c: '}"',
+ src_insert_o: '+{', src_insert_c: '}+',
+ src_strike_o: '-{', src_strike_c: '}-',
+ src_superscript_o: '^{', src_superscript_c: '}^',
+ src_subscript_o: ',{', src_subscript_c: '}',
+ src_hilite_o: '*{', src_hilite_c: '}*',
+ src_monospace_o: '#{', src_monospace_c: '}#',
+ srcrgx_bold_o: '\!\{', srcrgx_bold_c: '\}\!',
+ srcrgx_italics_o: '\/\{', srcrgx_italics_c: '\}\/',
+ srcrgx_underscore_o: '_\{', srcrgx_underscore_c: '\}_',
+ srcrgx_cite_o: '"\{', srcrgx_cite_c: '\}"',
+ srcrgx_insert_o: '\+\{', srcrgx_insert_c: '\}\+',
+ srcrgx_strike_o: '\-\{', srcrgx_strike_c: '\}\-',
+ srcrgx_superscript_o: '\^\{', srcrgx_superscript_c: '\}\^',
+ srcrgx_subscript_o: ',\{', srcrgx_subscript_c: '\},',
+ srcrgx_hilite_o: '\*\{', srcrgx_hilite_c: '\}\*',
+ srcrgx_monospace_o: '\#\{', srcrgx_monospace_c: '\}\#',
}
Mx[:fa_bold_o]= "#{Mx[:fa_o]}b#{Mx[:fa_o_c]}"
Mx[:fa_bold_c]= "#{Mx[:fa_c_o]}b#{Mx[:fa_c]}"
@@ -224,18 +241,8 @@ Px={
subscript_o: '[', subscript_c: ']',
hilite_o: '*', hilite_c: '*',
monospace_o: '', monospace_c: '',
- po_bold_o: '!{', po_bold_c: '}!',
- po_italics_o: '/{', po_italics_c: '}/',
- po_underscore_o: '_{', po_underscore_c: '}_',
- po_cite_o: '"{', po_cite_c: '}"',
- po_insert_o: '+{', po_insert_c: '}+',
- po_strike_o: '-{', po_strike_c: '}-',
- po_superscript_o: '^{', po_superscript_c: '}^',
- po_subscript_o: ',{', po_subscript_c: '},',
- po_hilite_o: '*{', po_hilite_c: '}*',
- po_monospace_o: '#{', po_monospace_c: '}#',
- lng_lst: SiSU_is[:language_list],
- lng_lst_rgx: SiSU_is[:language_list_regex],
+ lng_lst: SiSU_is.language_list?,
+ lng_lst_rgx: SiSU_is.language_list_regex?,
lv1: '*',
lv2: '=',
lv3: '=',
@@ -264,8 +271,8 @@ else
}
end
Db={
- name_prefix: "SiSU#{SiSU_is[:version_dir]}c_",
- name_prefix_db: "sisu_#{SiSU_is[:version_dir]}c_",
+ name_prefix: "SiSU#{SiSU_is.branch_version?}c_",
+ name_prefix_db: "sisu_#{SiSU_is.branch_version?}c_",
col_title: 800,
col_title_part: 400,
col_title_edition: 10,
@@ -356,7 +363,7 @@ check:
#˝ " λ Ω β α π Ѫ Ж Я Ѳ ѳ Ф ✠ ㈣
Ѳ ѳ Ф
♩ ♭  ✠  ▭ ▬ ▪
-【】〖〗◢ ◣ ◀ ▶ ◘ ◙
+【】〖〗◢ ◣ ◀ ▶ ◘ ◙ « ▲ »
《》「」
‹ › ∗  ∴ ∷
'〔lv1〕','〔lv2〕','〔lv3〕','〔lv4〕','〔lv5〕','〔lv6〕','〔lv7〕','〔lv8〕','〔lv9〕'
diff --git a/lib/sisu/v6/css.rb b/lib/sisu/develop/css.rb
index 05f0631a..19c87c07 100644
--- a/lib/sisu/v6/css.rb
+++ b/lib/sisu/develop/css.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** css stylesheets
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/css.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: css stylesheets
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/css.rb;hb=HEAD>
=end
module SiSU_Style
@@ -358,16 +355,6 @@ WOK
color: #000000;
background-color: #f9f9aa;
}
- a.lnkocn:link {
- color: #777777;
- text-decoration: none;
- }
-/*
- a:hover {
- border-bottom: 2px solid #777777;
- background-color: #fff3b6;
- }
-*/
a:hover img {
background-color: #ffffff;
}
@@ -375,6 +362,14 @@ WOK
color: #003399;
text-decoration: underline;
}
+ a.lnkocn:link {
+ color: #777777;
+ text-decoration: none;
+ }
+ a.lnkocn:visited {
+ color: #555555;
+ text-decoration: none;
+ }
div {
margin-left: 0;
margin-right: 0;
diff --git a/lib/sisu/v6/db_columns.rb b/lib/sisu/develop/db_columns.rb
index 95beab3b..478a1127 100644
--- a/lib/sisu/v6/db_columns.rb
+++ b/lib/sisu/develop/db_columns.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_columns.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_columns.rb;hb=HEAD>
=end
module SiSU_DbColumns
@@ -373,7 +369,6 @@ module SiSU_DbColumns
if defined? @md.creator.editor_detail \
and @md.creator.editor_detail.is_a?(Array) \
and @md.creator.editor_detail.length > 0
- txt=@md.creator.editor_detail #dc
txt=''
@md.creator.editor_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -401,7 +396,6 @@ module SiSU_DbColumns
if defined? @md.creator.contributor_detail \
and @md.creator.contributor_detail.is_a?(Array) \
and @md.creator.contributor_detail.length > 0
- txt=@md.creator.contributor_detail #dc
txt=''
@md.creator.contributor_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -429,7 +423,6 @@ module SiSU_DbColumns
if defined? @md.creator.illustrator_detail \
and @md.creator.illustrator_detail.is_a?(Array) \
and @md.creator.illustrator_detail.length > 0
- txt=@md.creator.illustrator_detail
txt=''
@md.creator.illustrator_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -457,7 +450,6 @@ module SiSU_DbColumns
if defined? @md.creator.photographer_detail \
and @md.creator.photographer_detail.is_a?(Array) \
and @md.creator.photographer_detail.length > 0
- txt=@md.creator.photographer_detail
txt=''
@md.creator.photographer_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -512,7 +504,6 @@ module SiSU_DbColumns
if defined? @md.creator.prepared_by_detail \
and @md.creator.prepared_by_detail.is_a?(Array) \
and @md.creator.prepared_by_detail.length > 0
- txt=@md.creator.prepared_by_detail
txt=''
@md.creator.prepared_by_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -540,7 +531,6 @@ module SiSU_DbColumns
if defined? @md.creator.digitized_by_detail \
and @md.creator.digitized_by_detail.is_a?(Array) \
and @md.creator.digitized_by_detail.length > 0
- txt=@md.creator.digitized_by_detail
txt=''
@md.creator.digitized_by_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -568,7 +558,6 @@ module SiSU_DbColumns
if defined? @md.creator.audio_detail \
and @md.creator.audio_detail.is_a?(Array) \
and @md.creator.audio_detail.length > 0
- txt=@md.creator.audio_detail
txt=''
@md.creator.audio_detail.each do |h|
txt=txt + %{#{h[:the]}, #{h[:others]}; }
diff --git a/lib/sisu/v6/db_create.rb b/lib/sisu/develop/db_create.rb
index 861e3b56..782b0e60 100644
--- a/lib/sisu/v6/db_create.rb
+++ b/lib/sisu/develop/db_create.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_create.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_create.rb;hb=HEAD>
=end
module SiSU_DbCreate
diff --git a/lib/sisu/v6/db_dbi.rb b/lib/sisu/develop/db_dbi.rb
index db09a855..e72c0e7f 100644
--- a/lib/sisu/v6/db_dbi.rb
+++ b/lib/sisu/develop/db_dbi.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_dbi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_dbi.rb;hb=HEAD>
=end
module SiSU_DbDBI
diff --git a/lib/sisu/v6/db_drop.rb b/lib/sisu/develop/db_drop.rb
index c8e00bde..f2dd642e 100644
--- a/lib/sisu/v6/db_drop.rb
+++ b/lib/sisu/develop/db_drop.rb
@@ -1,69 +1,65 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_drop.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_drop.rb;hb=HEAD>
=end
module SiSU_DbDrop
+ require_relative 'utils_response' # utils_response.rb
class Drop
- require_relative 'utils_response' # utils_response.rb
+ include SiSU_Response
def initialize(opt,conn,db_info,sql_type)
@opt,@conn,@db_info,@sql_type=opt,conn,db_info,sql_type
- @ans=SiSU_Response::Response.new
case @sql_type
when :sqlite
cascade=''
@@ -86,7 +82,7 @@ module SiSU_DbDrop
case @sql_type
when :sqlite
puts msg_sqlite
- ans=@ans.response?('remove sql database?')
+ ans=response?('remove sql database?')
if ans \
and File.exist?(@db_info.sqlite.db)
@conn.close
@@ -137,7 +133,7 @@ module SiSU_DbDrop
rescue
case @sql_type
when :sqlite
- ans=@ans.response?('remove sql database?')
+ ans=response?('remove sql database?')
if ans and File.exist?(@db_info.sqlite.db); File.unlink(@db_info.sqlite.db)
end
else
diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/develop/db_import.rb
index 72fb3753..c221885c 100644
--- a/lib/sisu/v5/db_import.rb
+++ b/lib/sisu/develop/db_import.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_import.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_import.rb;hb=HEAD>
=end
module SiSU_DbImport
diff --git a/lib/sisu/v6/db_indexes.rb b/lib/sisu/develop/db_indexes.rb
index c3717a83..bb925090 100644
--- a/lib/sisu/v6/db_indexes.rb
+++ b/lib/sisu/develop/db_indexes.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_indexes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_indexes.rb;hb=HEAD>
=end
module SiSU_DbIndex
diff --git a/lib/sisu/v6/db_load_tuple.rb b/lib/sisu/develop/db_load_tuple.rb
index d5cb6e14..3833c686 100644
--- a/lib/sisu/v6/db_load_tuple.rb
+++ b/lib/sisu/develop/db_load_tuple.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_load_tuple.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_load_tuple.rb;hb=HEAD>
=end
module SiSU_DbTuple
diff --git a/lib/sisu/v5/db_remove.rb b/lib/sisu/develop/db_remove.rb
index 10c84560..bb98a814 100644
--- a/lib/sisu/v5/db_remove.rb
+++ b/lib/sisu/develop/db_remove.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_remove.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_remove.rb;hb=HEAD>
=end
module SiSU_DbRemove
diff --git a/lib/sisu/v5/db_select.rb b/lib/sisu/develop/db_select.rb
index 997b6a1a..ad56e65c 100644
--- a/lib/sisu/v5/db_select.rb
+++ b/lib/sisu/develop/db_select.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/db_select.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_select.rb;hb=HEAD>
=end
module SiSU_DbAction
diff --git a/lib/sisu/v6/db_sqltxt.rb b/lib/sisu/develop/db_sqltxt.rb
index 2375d5ca..1e3efbc7 100644
--- a/lib/sisu/v6/db_sqltxt.rb
+++ b/lib/sisu/develop/db_sqltxt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_sqltxt.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_sqltxt.rb;hb=HEAD>
=end
module SiSU_DbText
@@ -69,9 +66,9 @@ module SiSU_DbText
gsub(/#{Mx[:lnk_o]}\s*(.+?)\s*#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/m,'\1')
end
def clean_searchable_text_from_document_objects(arr)
- txt_arr,en=[],[]
+ en=[]
arr=(arr.is_a?(String)) ? [ arr ] : arr
- arr.each do |s|
+ txt_arr=arr.each.map do |s|
s=s.gsub(/#{Mx[:fa_o]}[a-z]{1,4}#{Mx[:fa_o_c]}/m,'').
gsub(/#{Mx[:fa_c_o]}[a-z]{1,4}#{Mx[:fa_c]}/m,'').
gsub(/<br>/m,' ')
@@ -80,25 +77,26 @@ module SiSU_DbText
gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/m,'').
gsub(/ \s+/m,' ')
#p s if s =~/[^ \nA-Za-z0-9'"`?!#@$%^&*=+,.;:\[\]()<>{}‹›|\\\/~_-]/
- txt_arr << s
+ s
end
txt_arr=txt_arr << en
txt=txt_arr.flatten.join("\n")
special_character_escape(txt)
end
def clean_document_objects_body(arr)
- txt_arr,en,en_arr=[],[],[]
+ en=[]
arr=(arr.is_a?(String)) ? [ arr ] : arr
- arr.each do |s|
+ txt_arr=arr.each.map do |s|
en << s.scan(/#{Mx[:en_a_o]}\s*(.+?)\s*#{Mx[:en_a_c]}/m)
- s=s.gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m,'<sup>\1</sup>').
+ s=s.
+ gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m,
+ '<sup>\1</sup>').
gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/m,'').
gsub(/ \s+/m,' ')
- txt_arr << s
+ s
end
- en.flatten.each do |e|
- e=e.sub(/^(\d+)\s*/,'<sup>\1</sup> ')
- en_arr << e
+ en_arr=en.flatten.each.map do |e|
+ e.sub(/^(\d+)\s*/,'<sup>\1</sup> ')
end
txt_arr=txt_arr << en_arr
txt=txt_arr.flatten.join("\n<br>")
@@ -109,7 +107,8 @@ module SiSU_DbText
arr=(arr.is_a?(String)) ? arr.split(/\n+/m) : arr
arr.each do |s|
s=s.gsub(/([*\/_-])\{(.+?)\}\1/m,'\2').
- gsub(/^(?:block|group|poem|code)\{/m,'').gsub(/^\}(?:block|group|poem|code)/m,'').
+ gsub(/^(?:block|group|poem|code)\{/m,'').
+ gsub(/^\}(?:block|group|poem|code)/m,'').
gsub(/\A(?:@\S+:\s+.+)\Z/m,'')
if s =~/^:A~/
if defined? @md.creator \
@@ -172,4 +171,3 @@ module SiSU_DbText
end
end
__END__
-
diff --git a/lib/sisu/v6/db_tests.rb b/lib/sisu/develop/db_tests.rb
index dbe227aa..a3022414 100644
--- a/lib/sisu/v6/db_tests.rb
+++ b/lib/sisu/develop/db_tests.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by the different db types, dbi, postgresql, sqlite
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/db_tests.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by the different db types, dbi, postgresql,
- sqlite
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/db_tests.rb;hb=HEAD>
=end
module SiSU_DbTests
diff --git a/lib/sisu/v5/dbi.rb b/lib/sisu/develop/dbi.rb
index 019b56a3..90e4312c 100644
--- a/lib/sisu/v5/dbi.rb
+++ b/lib/sisu/develop/dbi.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** postgresql module, dbi import frame
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: postgresql module, dbi import frame
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dbi.rb;hb=HEAD>
=end
module SiSU_DBI #% database building
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/develop/dbi_discrete.rb
index e50f5646..19b1dc82 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/develop/dbi_discrete.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** postgresql module, dbi import frame
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dbi_discrete.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: postgresql module, dbi import frame
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dbi_discrete.rb;hb=HEAD>
=end
module SiSU_DBI_Discrete #% database building
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/develop/digests.rb
index 985e76b2..358bd929 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/develop/digests.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document digests (md5|sha256) and structure processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/digests.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document digests (md5|sha256) and structure processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/digests.rb;hb=HEAD>
=end
module SiSU_DigestView
diff --git a/lib/sisu/v6/dp.rb b/lib/sisu/develop/dp.rb
index 89c6ba58..f9cd27fa 100644
--- a/lib/sisu/v6/dp.rb
+++ b/lib/sisu/develop/dp.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document parameters extracted from input files for program use
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/dp.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document parameters extracted from input files for program use
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp.rb;hb=HEAD>
=end
module SiSU_Param
@@ -70,19 +67,6 @@ module SiSU_Param
require_relative 'dp_make' # dp_make.rb
require_relative 'dp_identify_markup' # dp_identify_markup.rb
@@date=SiSU_Env::InfoDate.new
- @@proc=
- @@filename_txt=
- @@filename_texinfo=
- @@filename_lout_portrait=
- @@filename_lout_landscape=
- @@filename_html_scroll=
- @@filename_html_index=
- @@filename_html_segtoc=
- @@filename_semantic=
- @@filename_rss=
- @@newfile=
- @@drr=
- nil
@doc={
initialise: nil,
markup: '',
@@ -90,7 +74,6 @@ module SiSU_Param
stmp: '',
req: {},
}
- @@yaml=@@yamladdr=nil
@@trigger=nil
@@lv,@@flag={},{}
@@tex_backslash="\\\\"
@@ -149,8 +132,14 @@ module SiSU_Param
@@md=@md
else @@md
end
- @@md.opt=@opt
- @@md
+ begin
+ @@md.opt=@opt
+ @@md
+ rescue
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ mark('has an existing option been selected?')
+ exit
+ end
end
class MdDefault
def rights(author,date)
@@ -543,7 +532,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Copyright missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
''
end
l,n=Db[:col_info_note],'rights.copyright.text'
@@ -615,7 +606,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Rights information missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
else
l,n=Db[:col_info_note],'rights.all'
validate_length(s,l,n)
@@ -673,7 +666,9 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'WARNING Document Rights information missing; provide @rights: :copyright:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
else
l,n=Db[:col_info_note],'rights.all'
validate_length(s,l,n)
@@ -902,9 +897,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,: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,:lv0,: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,: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
+ 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,:project_details,: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,:lv0,: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_biblio,:flag_auto_biblio,:flag_endnotes,:flag_auto_endnotes,:flag_separate_endnotes,:flag_separate_endnotes_make,:markup,:markup_instruction,: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=@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=@lv0=@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
+ @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_biblio=@flag_auto_biblio=@flag_endnotes=@flag_auto_endnotes=@flag_separate_endnotes=@flag_separate_endnotes_make=@sisu=@project_details=@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=@lv0=@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=
@@ -1019,22 +1014,35 @@ module SiSU_Param
@fnstex=@fns.gsub(/_/,'\_\-').gsub(/\./,'.\-')
@flag_endnotes,@flag_auto_endnotes,@flag_separate_endnotes=false,false,false
@flag_separate_endnotes_make=true
+ @flag_biblio,@flag_auto_biblio=false,false
ver=SiSU_Env::InfoVersion.instance
- @sisu_version=ver.get_version
+ @project_details=ver.get_version
@ruby_version=ver.rbversion
@generated=Time.now
fns_array=@data.dup
skip unless fns_array # consider
@code_flag=false
+ flag_code_curly=:not_code_curly
+ flag_code_tics=:not_code_tics
fns_array.each do |para| #% scan document
if para !~/^%+\s/ \
and para =~/<![abcdeghijklmnopqrstuvwxyz]/i # <!f not included
- raise "Old markup style in file #{@fns}, current version #{@sisu_version[:project]} #{@sisu_version[:version]} #{@sisu_version[:date_stamp]} #{@sisu_version[:date]}:\n\t\t#{para}\n\n"
+ raise "Old markup style in file #{@fns}, current version #{@project_details.project} #{@project_details.version} #{@project_details.date_stamp} #{@project_details.date}:\n\t\t#{para}\n\n"
end
- @code_flag=case para
- when /^code\{\s*$/ then true
- when /^\}code\s*$/ then false
- else @code_flag
+ if para =~/^code\{/
+ flag_code_curly=:code_curly
+ elsif para =~/^\}code/
+ flag_code_curly=:not_code_curly
+ elsif para =~/^``` code/
+ flag_code_tics=:code_tics
+ elsif flag_code_tics ==:code_tics \
+ and para =~/^```/
+ flag_code_tics=:not_code_tics
+ end
+ @code_flag=if flag_code_curly==:code_curly \
+ or flag_code_tics==:code_tics
+ true
+ else false
end
regx_header=/^@\S+?:[+-]?\s/
if para =~regx_header \
@@ -1207,6 +1215,16 @@ module SiSU_Param
%{#{title}#{creator}}
).txt_grey if @opt.act[:verbose][:set]==:on
end
+ unless @code_flag
+ if para =~/^1~biblio(?:graphy)?/
+ @flag_auto_biblio,@flag_biblio=false,true
+ #@flag_biblio=true
+ elsif @flag_biblio ==true \
+ and @flag_auto_biblio ==false \
+ and para =~/^(?:au|author):/m
+ @flag_auto_biblio =true
+ end
+ end
if not @book_idx \
and para =~/^=\{(.+?)\}[\s`]*\Z/m
@book_idx=true
@@ -1424,11 +1442,13 @@ module SiSU_Param
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
'*WARN* endnote number mismatch',
- "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})"
+ "endnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} " \
+ + "(difference = #{@en[:mismatch]})"
).warn unless @opt.act[:quiet][:set]==:on
footnote_conversion_errors=File.new("#{Dir.pwd}/footnote_conversion_errors.txt",'a')
footnote_conversion_errors <<
- "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} (difference = #{@en[:mismatch]})\n"
+ "#{@fns}:\n\tendnotes: #{@en[:note]} != endnote reference marks: #{@en[:mark]} " \
+ + "(difference = #{@en[:mismatch]})\n"
end
if not @title \
or not defined? @title.main \
@@ -1441,7 +1461,9 @@ module SiSU_Param
@opt.act[:color_state][:set],
'WARNING: Document Title missing',
'please provide @title:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
end
end
if @author !~/[\S]/
@@ -1453,7 +1475,9 @@ module SiSU_Param
@opt.act[:color_state][:set],
'WARNING: Document Author missing',
'please provide @creator: :author:'
- ).warn unless @opt.act[:quiet][:set]==:on
+ ).warn if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
end
end
@struct={}
@@ -1565,19 +1589,6 @@ module SiSU_Param
class Instantiate
def param_instantiate
@@date=SiSU_Env::InfoDate.new
- @@proc=
- @@filename_txt=
- @@filename_texinfo=
- @@filename_lout_portrait=
- @@filename_lout_landscape=
- @@filename_html_scroll=
- @@filename_html_index=
- @@filename_html_segtoc=
- @@filename_semantic=
- @@filename_rss=
- @@newfile=
- @@drr=
- nil
@doc={
initialise: nil,
markup: '',
@@ -1587,7 +1598,6 @@ module SiSU_Param
prefix_b: '',
req: {}
}
- @@yaml=@@yamladdr=nil
@@flag={}
@@publisher='SiSU scribe'
end
diff --git a/lib/sisu/v5/dp_identify_markup.rb b/lib/sisu/develop/dp_identify_markup.rb
index ee0c4ebc..411ea5da 100644
--- a/lib/sisu/v5/dp_identify_markup.rb
+++ b/lib/sisu/develop/dp_identify_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp_identify_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp_identify_markup.rb;hb=HEAD>
=end
module SiSU_MarkupType
diff --git a/lib/sisu/v5/dp_make.rb b/lib/sisu/develop/dp_make.rb
index 39a5ba1a..62b5ed21 100644
--- a/lib/sisu/v5/dp_make.rb
+++ b/lib/sisu/develop/dp_make.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** document parameters make extracted for program use
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dp_make.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: document parameters make extracted for program use
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/dp_make.rb;hb=HEAD>
=end
@@ -429,7 +426,7 @@ module SiSU_Param_Make
end
def get_image_dimensions(img)
imgk=SiSU_Env::SystemCall.new.imagemagick
- gmgk=SiSU_Env::SystemCall.new.graphicksmagick
+ gmgk=SiSU_Env::SystemCall.new.graphicsmagick
img_pth={
sst: @env.path.image_source_include,
pod: File.expand_path("../../../sisupod/image" )
diff --git a/lib/sisu/v5/embedded.rb b/lib/sisu/develop/embedded.rb
index 4eec8a2f..fbe73d6d 100644
--- a/lib/sisu/v5/embedded.rb
+++ b/lib/sisu/develop/embedded.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** sitemap created from parameters extracted from input file(s)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/embedded.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: sitemap created from parameters extracted from input file(s)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/embedded.rb;hb=HEAD>
=end
module SiSU_Embedded
diff --git a/lib/sisu/develop/errors.rb b/lib/sisu/develop/errors.rb
new file mode 100644
index 00000000..e24b9571
--- /dev/null
+++ b/lib/sisu/develop/errors.rb
@@ -0,0 +1,84 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, error screen reporting
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/errors.rb;hb=HEAD>
+
+=end
+module SiSU_Errors
+ require_relative 'se' # se.rb
+ include SiSU_Env; include SiSU_Screen
+ class Rescued <CreateFile
+ def initialize(error,errorlist,cmd,fns='')
+ @fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
+ @cmd=(cmd \
+ && (cmd =~/c/)) \
+ ? 'Vc'
+ : 'V'
+ end
+ def location
+ file=@fns \
+ ? (SiSU_Env::CreateFile.new(@fns).file_error)
+ : (File.new('/tmp/errorlog.sisu','w+'))
+ file << @fns << "\n" << @error << "\n" << @errorlist
+ file.close
+ if @cmd=~/[vVM]/
+ SiSU_Screen::Ansi.new('',$!,$@).rescue do
+ (block_given?) ? yield : __LINE__.to_s + ':' + __FILE__
+ end
+ else
+ SiSU_Screen::Ansi.new('',"rescued, exception raised, silenced").puts_grey
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/generic_parts.rb b/lib/sisu/develop/generic_parts.rb
new file mode 100644
index 00000000..1545a72a
--- /dev/null
+++ b/lib/sisu/develop/generic_parts.rb
@@ -0,0 +1,131 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
+
+=end
+module SiSU_Parts_Generic
+ def the_url
+ def urify(uri)
+ URI.parse(uri)
+ end
+ def sisu
+ 'http://www.sisudoc.org/'
+ end
+ def sisudoc
+ 'http://www.sisudoc.org'
+ end
+ def footer_signature
+ 'http://www.sisudoc.org/'
+ end
+ def rl_root
+ '/sisu' #watch
+ end
+ def root_http
+ 'http://www.sisudoc.org/' #watch
+ end
+ def home
+ 'http://www.sisudoc.org/' # used in pdf header
+ end
+ def site #used as stub... where there are subdirectories and is different from home
+ home
+ end
+ def home_txt
+ 'www.sisudoc.org'
+ end
+ def sisu_txt
+ 'www.sisudoc.org'
+ end
+ self
+ end
+ def the_text
+ def home
+ 'SiSU'
+ 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
+ def url_open
+ '<'
+ end
+ def url_close
+ '>'
+ end
+ self
+ end
+ def the_icon
+ def i_ico
+ 'rb7.ico'
+ end
+ def i_home_button
+ 'sisu.png'
+ end
+ def i_choice
+ 'b_choice.png'
+ end
+ def i_new
+ 'b_new.png'
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/develop/git.rb
index 7cf26272..4d20742a 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/develop/git.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/git.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/git.rb;hb=HEAD>
=end
module SiSU_Git
@@ -62,8 +59,8 @@ module SiSU_Git
require_relative 'se' # se.rb
require_relative 'ao' # ao.rb
class Source
- def initialize(opt)
- @opt=opt
+ def initialize(opt,process=:complete)
+ @opt,@process=opt,process
@env=SiSU_Env::InfoEnv.new
@md=SiSU_Param::Parameters.new(@opt).get
@file=SiSU_Env::FileOp.new(@md)
@@ -91,7 +88,7 @@ module SiSU_Git
video: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:video],
conf: git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:conf]
}
- SiSU_AO::Source.new(@opt).read # -m
+ SiSU_AO::Source.new(@opt,nil,@process).read # -m
end
def create_file_structure_git
make_dir_fnb
@@ -135,14 +132,22 @@ module SiSU_Git
(found =~/bin\/git\b/) ? true : false
end
def make_dir_fnb
- FileUtils::mkdir_p(@git_path[:fnb]) unless FileTest.directory?(@git_path[:fnb])
- FileUtils::mkdir_p(@git_path[:doc]) unless FileTest.directory?(@git_path[:doc])
- 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[: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])
+ FileUtils::mkdir_p(@git_path[:fnb]) \
+ unless FileTest.directory?(@git_path[:fnb])
+ FileUtils::mkdir_p(@git_path[:doc]) \
+ unless FileTest.directory?(@git_path[:doc])
+ 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[: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])
end
def git_init
unless FileTest.directory?("#{@git_path[:fnb]}/.git")
@@ -171,13 +176,23 @@ module SiSU_Git
p __LINE__
end
def copy_src_head
- if @opt.f_pth[:lng]
- FileUtils::cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{@opt.fns}",@git_path[:doc])
+ if @opt.f_pth[:lng] \
+ and File.exist?("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{@opt.fns}")
+ FileUtils::cp_r(
+ "#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{@opt.fns}",
+ @git_path[:doc]
+ )
elsif @opt.fns =~/\.ssm\.sst/
ssm=@opt.fns.gsub(/\.ssm\.sst/,'.ssm')
- FileUtils::cp_r("#{@env.path.pwd}/#{ssm}",@git_path[:doc])
- else
- FileUtils::cp_r("#{@env.path.pwd}/#{@opt.fns}",@git_path[:doc])
+ FileUtils::cp_r(
+ "#{@env.path.pwd}/#{ssm}",
+ @git_path[:doc]
+ )
+ elsif File.exist?("#{@env.path.pwd}/#{@opt.fns}")
+ FileUtils::cp_r(
+ "#{@env.path.pwd}/#{@opt.fns}",
+ @git_path[:doc]
+ )
end
end
def copy_related_sst_ssi
@@ -186,14 +201,21 @@ module SiSU_Git
file_array=IO.readlines(@opt.fns,'')
file_array.each do |f|
if f =~@rgx_doc_import
- doc_import = doc_import + f.scan(@rgx_doc_import).uniq.flatten
+ doc_import = doc_import \
+ + f.scan(@rgx_doc_import).uniq.flatten
end
end
doc_import.each do |f|
if @opt.f_pth[:lng]
- FileUtils::cp_r("#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{f}",@git_path[:doc])
+ FileUtils::cp_r(
+ "#{@env.path.pwd}/#{@opt.f_pth[:lng]}/#{f}",
+ @git_path[:doc]
+ )
else
- FileUtils::cp_r("#{@env.path.pwd}/#{f}",@git_path[:doc])
+ FileUtils::cp_r(
+ "#{@env.path.pwd}/#{f}",
+ @git_path[:doc]
+ )
end
end
end
@@ -203,10 +225,19 @@ module SiSU_Git
and not @opt.act[:ao][:set]==:on
##SiSU_Assemble::Composite.new(@opt).read
#SiSU_AO::Source.new(@opt).read # -m
- "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst"
+ @env.processing_path.composite_file \
+ + '/' \
+ + @opt.fnb \
+ + '.ssm.sst'
elsif composite_src
- "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst"
- else "#{@env.path.pwd}/#{@opt.fns}"
+ @env.processing_path.composite_file \
+ + '/' \
+ + @opt.fnb \
+ + '.ssm.sst'
+ else
+ @env.path.pwd
+ + '/' \
+ + @opt.fns
end
end
def read_composite
diff --git a/lib/sisu/v6/html.rb b/lib/sisu/develop/html.rb
index 3da2baf4..2386394f 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/develop/html.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html.rb;hb=HEAD>
=end
module SiSU_HTML
@@ -168,11 +165,10 @@ module SiSU_HTML
end
end
SiSU_Env::Clear.new(@opt.selections.str,@opt.fns,@md).param_instantiate
- @@flag,@@scr,@@seg,@@seg_endnotes,@@seg_subtoc,@@seg_ad={},{},{},{},{},{}
- @@seg_total,@@tracker,@@loop_count,@@tablehead,@@number_of_cols=0,0,0,0,0
- @@seg_name,@@seg_name_html,@@seg_subtoc_array,@@seg_endnotes_array,@@segtocband,@@tablefoot=Array.new(7){[]}
- @@filename_seg,@@seg_url,@@fn,@@to_lev4,@@get_hash_to,@@get_hash_fn='','','','','','',''
- @@is4=@@is3=@@is2=@@is1=@@heading1=@@heading2=@@heading3=@@heading4=0
+ @@flag,@@scr,@@seg,@@seg_endnotes,@@seg_subtoc={},{},{},{},{}
+ @@tracker=0
+ @@seg_name,@@seg_name_x,@@seg_subtoc_array,@@seg_endnotes_array,@@tablefoot=Array.new(5){[]}
+ @@filename_seg,@@seg_url,@@to_lev4,@@get_hash_to,@@get_hash_fn='','','','',''
end
end
private
@@ -265,8 +261,6 @@ module SiSU_HTML
@@firstseg=nil
def initialize(md=nil,data='')
@data,@md=data,md
- @ocn_html_identifier=
- SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
@tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]) if @md
end
def songsheet #extracts toc for scroll & seg
@@ -381,7 +375,7 @@ WOK
title=if dob.ocn ==0 then linkname
else
@@toc[:scr] << '<br>'
- %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
+ %{<b><a href="##{dob.ocn}">#{linkname}</a></b>}
end
txt_obj={ txt: title }
format_toc=SiSU_HTML_Format::FormatToc.new(@md,txt_obj)
@@ -423,7 +417,7 @@ WOK
end
else
@@toc[:scr] << '<br>'
- %{<b><a href="##{@ocn_html_identifier}#{dob.ocn}">#{linkname}</a></b>}
+ %{<b><a href="##{dob.ocn}">#{linkname}</a></b>}
end
txt_obj={ txt: title }
format_toc=SiSU_HTML_Format::FormatToc.new(@md,txt_obj)
@@ -540,7 +534,7 @@ WOK
}
f=@md.file.base_filename.html_seg(fnh)
p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
- lnk_n_txt=%{ <a href="#{f}##{@ocn_html_identifier}#{ocn}">
+ lnk_n_txt=%{ <a href="#{f}##{ocn}">
#{linkname}
</a>}
txt_obj={ txt: lnk_n_txt }
@@ -565,7 +559,7 @@ WOK
}
f=@md.file.base_filename.html_seg(fnh)
p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
- lnk_n_txt=%{ <a href="#{f}##{@ocn_html_identifier}#{ocn}">
+ lnk_n_txt=%{ <a href="#{f}##{ocn}">
#{linkname}
</a>}
txt_obj={ txt: lnk_n_txt }
diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/develop/html_concordance.rb
index 4d3b74e4..d988dd33 100644
--- a/lib/sisu/v6/html_concordance.rb
+++ b/lib/sisu/develop/html_concordance.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** concordance file (html, wordmap, linked index of words in document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_concordance.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: concordance file (html concordance, wordmap, linked index of
- words in document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_concordance.rb;hb=HEAD>
=end
module SiSU_Concordance
diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/develop/html_format.rb
index 78080878..1692e452 100644
--- a/lib/sisu/v5/html_format.rb
+++ b/lib/sisu/develop/html_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html formating, css template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html formating, css template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_format.rb;hb=HEAD>
=end
module SiSU_HTML_Format
@@ -63,7 +60,6 @@ module SiSU_HTML_Format
def initialize(md,ocn)
@md,@ocn=md,ocn.to_s
@ocn ||=''
- @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
@make=SiSU_Env::ProcessingSettings.new(@md)
end
def ocn_display
@@ -72,7 +68,7 @@ module SiSU_HTML_Format
or @ocn.empty?
''
else
- %{<label class="ocn">#{@ocn}</label>}
+ %{<label class="ocn"><a href="##{@ocn}" class="lnkocn">#{@ocn}</a></label>}
end
else
''
@@ -87,10 +83,12 @@ module SiSU_HTML_Format
end
end
def id #w3c? "tidy" complains about numbers as identifiers ! annoying
- (@ocn==nil || @ocn.empty?) ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"}
+ (@ocn==nil || @ocn.empty?) \
+ ? '' : %{id="#{Mx[:ocn_id_char]}#{@ocn}"}
end
def goto
- (@ocn==nil || @ocn.empty?) ? '' : %{<a href="##{@ocn_html_identifier}#{@ocn}">}
+ (@ocn==nil || @ocn.empty?) \
+ ? '' : %{<a href="##{@ocn}">}
end
end
class HeadInformation
@@ -102,8 +100,9 @@ module SiSU_HTML_Format
@md=md
# DublinCore 1 - title
@bits=SiSU_Proj_HTML::Bits.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 || [])
+ @per=SiSU_HTML_Persist::Persist.new
+ @per.seg_name_x=SiSU_HTML::Seg.new.seg_name_x
+ @per.seg_name_x_tracker=SiSU_HTML::Seg.new.seg_name_x_tracker
@tocband_scroll,@tocband_segtoc=nil,nil
@stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
@@ -406,7 +405,7 @@ WOK
<head>
<meta charset="utf-8">
<title>
- #{@md.html_title}
+ #{@md.title.full}
</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
#{rdf.metatag_html}
@@ -618,9 +617,9 @@ WOK
super(md)
end
def dot_control_pre_next
- pre="#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.lang_code_insert}#{Sfx[:html]}"
+ pre="#{@per.seg_name_x[@per.seg_name_x_tracker-1]}#{@md.lang_code_insert}#{Sfx[:html]}"
up=@toc
- nxt="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}"
+ nxt="#{@per.seg_name_x[@per.seg_name_x_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}"
if nxt=~/sisu_manifest\.html/
@file=SiSU_Env::FileOp.new(@md) if @md
if @file.output_dir_structure.by_language_code? \
@@ -646,7 +645,7 @@ WOK
#{the_table_close}}
end
def dot_control_pre
- pre="#{@seg_name_html[@seg_name_html_tracker-2]}#{@md.lang_code_insert}#{Sfx[:html]}"
+ pre="#{@per.seg_name_x[@per.seg_name_x_tracker-2]}#{@md.lang_code_insert}#{Sfx[:html]}"
up=@toc
nxt="#{@md.file.base_filename.html_segtoc}"
%{<table summary="segment hidden control pre" width="100%" border="0" cellpadding="0" bgcolor=#{the_color.grey_pale} align="center">
@@ -674,12 +673,12 @@ WOK
</a>
</td>}
pre=%{<td align="center" bgcolor=#{the_color.band1}>
- <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top">
+ <a href="#{@per.seg_name_x[@per.seg_name_x_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top">
#{png_nav.pre}
</a>
</td>} if f_pre==true
nxt=%{<td align="center" bgcolor=#{the_color.band1}>
- <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top">
+ <a href="#{@per.seg_name_x[@per.seg_name_x_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top">
#{png_nav.nxt}
</a>
</td>} if f_nxt==true
@@ -724,23 +723,6 @@ WOK
else ''
end
end
- def navigation_table
- %{<table summary="navigation segment table" width=#{the_width.table1} border="0" bgcolor="white" cellpadding="0">
-<tr><th width="#{@@indent['leve_1']}" align="right">
-</td>
-<td valign="top">
- <font size=2>}
- end
- def navigation_table1
- %{<table summary="navigation segment table1" width=#{the_width.table1} border="0" cellpadding=#{the_table_cellpad_box} bgcolor=#{the_color.table1} align="left">
-<tr><td valign="top">
- <font size="2">}
- end
- def navigation_table2
- %{<table summary="navigation segment table2" width=#{the_width.table2} border="0" cellpadding=#{the_table_cellpad_box} bgcolor=#{the_color.table2} align="left">
-<tr><td valign="top">
- <font size="2">}
- end
def credit
%{
<div class="main_column">
@@ -802,8 +784,8 @@ WOK
<head>
<meta charset="utf-8">
<title>
- #{@seg_name_html[@seg_name_html_tracker]} -
- #{@md.html_title}
+ #{@per.seg_name_x[@per.seg_name_x_tracker]} -
+ #{@md.title.main}
</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
#{rdf.metatag_html}
@@ -1150,8 +1132,8 @@ WOK
def initialize(md,txt)
super(md,txt)
end
- def endnote_seg_body(fn='') #FIX #url construction keep within single line... BUG WATCH 200408
- fn='doc' if fn.to_s.empty? #you may wish to reconsider, sends to 'doc' where no segment info
+ def endnote_seg_body(fn='')
+ fn="../#{@md.fnb}" if fn.to_s.empty?
%{
<p class="endnote">
#{@endnote_part_a}#{fn}#{@md.lang_code_insert}#{Sfx[:html]}#{@endnote_part_b}
@@ -1164,7 +1146,6 @@ WOK
end
def subtoc_lev(tag,attrib)
@txt=clean(@txt)
- @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
txt=if @txt \
and @txt =~/<\/?i>|<a\s+name="\S+?">/mi
@txt.gsub(/<\/?i>|<a\s+name="\S+?">/mi,'') #removes name markers from subtoc, go directly to substantive text
@@ -1178,7 +1159,7 @@ WOK
gsub(/<a[\s]+name="-\d+"[\s]+href="#_\d+">&nbsp;<sup>\d+<\/sup>&nbsp;/m,'')
end
%{<#{tag} class="#{attrib}">
- <a href="##{@ocn_html_identifier}#{@ocn}"><i>#{txt}</i></a> #{note}
+ <a href="##{@ocn}"><i>#{txt}</i></a> #{note}
</#{tag}>}
end
def subtoc_lev5
diff --git a/lib/sisu/develop/html_harvest.rb b/lib/sisu/develop/html_harvest.rb
new file mode 100644
index 00000000..cc867352
--- /dev/null
+++ b/lib/sisu/develop/html_harvest.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, harvest metadata from document corpus
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest.rb;hb=HEAD>
+
+=end
+module SiSU_Harvest
+ @@the_idx_topics,@@the_idx_authors={},{}
+ class Source
+ require_relative 'hub_options' # hub_options.rb
+ require_relative 'html_harvest_topics' # html_harvest_topics.rb
+ require_relative 'html_harvest_authors' # html_harvest_authors.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ def initialize(opt)
+ @opt=opt
+ @env=SiSU_Env::InfoEnv.new
+ end
+ def read
+ begin
+ harvest_pth=@env.path.webserv + '/' + @opt.base_stub
+ FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
+ cases(@opt,@env)
+ rescue
+ ensure
+ SiSU_Env::CreateSite.new(@opt).cp_css
+ end
+ end
+ def help
+ puts <<WOK
+ harvest --harvest extracts document index metadata
+
+WOK
+ end
+ def css(opt)
+ require_relative 'css' # css.rb
+ css=SiSU_Style::CSS.new
+ fn_css=SiSU_Env::CSS_Default.new
+ style=File.new("#{@env.path.pwd}/#{fn_css.harvest}",'w')
+ style << css.harvest
+ style.close
+ end
+ def cases(opt,env)
+ case opt.selections.str.inspect
+ when/--harvest/i
+ css(opt) if @opt.act[:maintenance][:set]==:on
+ SiSU_HarvestAuthors::Songsheet.new(opt,env).songsheet
+ SiSU_HarvestTopics::Songsheet.new(opt,env).songsheet
+ if @opt.act[:rsync][:set]==:on
+ require_relative 'remote' # remote.rb
+ SiSU_Remote::Put.new(opt).rsync_harvest
+ end
+ else
+ help
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/html_harvest_author_format.rb b/lib/sisu/develop/html_harvest_author_format.rb
new file mode 100644
index 00000000..24f8af8d
--- /dev/null
+++ b/lib/sisu/develop/html_harvest_author_format.rb
@@ -0,0 +1,111 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_author_format.rb;hb=HEAD>
+
+=end
+module SiSU_FormatAuthor
+ class Author
+ def initialize(author_param)
+ @author_param=author_param
+ end
+ def author_details
+ @authors,@author_array=[],[]
+ authors=@author_param.scan(/[^;]+/)
+ authors.each do |a|
+ a=a.strip
+ if a =~/"(.+?)"/
+ @authors << { the: $1 }
+ @author_array << $1.upcase
+ else #if a =~/,/
+ x=a.scan(/[^,]+/)
+ x[0]=x[0].strip
+ x[1]=x[1].strip if x[1]
+ if x.length==1
+ @authors << { the: x[0] }
+ @author_array << x[0].upcase
+ elsif x.length==2
+ @authors << { the: x[0], others: x[1] }
+ @author_array << "#{x[0].upcase}, #{x[1]}"
+ else #p x.length
+ end
+ end
+ end
+ l = @authors.length
+ authors_string=''
+ @authors.each_with_index do |a,i|
+ authors_string += if a[:others]
+ if (l - i) > 1
+ "#{a[:others]} #{a[:the]}, "
+ else
+ "#{a[:others]} #{a[:the]}"
+ end
+ else
+ if (l - i) > 2
+ "#{a[:the]}, "
+ else
+ "#{a[:the]}"
+ end
+ end
+ end
+ {
+ last_first_a: authors,
+ last_first_format_a: @author_array,
+ authors_h: @authors,
+ authors_s: authors_string,
+ authors_param: @author_param
+ }
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/html_harvest_authors.rb b/lib/sisu/develop/html_harvest_authors.rb
index 0fa079d6..8298b1af 100644
--- a/lib/sisu/v5/html_harvest_authors.rb
+++ b/lib/sisu/develop/html_harvest_authors.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- metadata harvest, extract authors and their writings from document set
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, extract authors and their writings from document set
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_authors.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_authors.rb;hb=HEAD>
=end
module SiSU_HarvestAuthors
@@ -326,7 +322,7 @@ module SiSU_HarvestAuthors
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" />
<meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
-<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
+<meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
<link href="#{css_path}" rel="stylesheet" >
<link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
diff --git a/lib/sisu/v6/html_harvest_topics.rb b/lib/sisu/develop/html_harvest_topics.rb
index 3daafe3d..22c880d6 100644
--- a/lib/sisu/v6/html_harvest_topics.rb
+++ b/lib/sisu/develop/html_harvest_topics.rb
@@ -1,62 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- metadata harvest, extract topics and associated writings from document set
- (topics use topic_register header)
+** Description: documents, structuring, processing, publishing, search
+*** metadata harvest, extract topics and associated writings from document set
+ (topics use topic_register header)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_topics.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/harvest_topics.rb;hb=HEAD>
=end
module SiSU_HarvestTopics
@@ -162,10 +158,9 @@ module SiSU_HarvestTopics
end
idx_array[lang] <<=if @idx_list =~/;/
g=@idx_list.scan(/[^;]+/)
- idxl=[]
- g.each do |i|
+ g.each.map do |i|
i=i.strip
- idxl << {
+ {
filename: filename,
file: file,
rough_idx: i,
@@ -175,7 +170,6 @@ module SiSU_HarvestTopics
lang: lang
}
end
- idxl
else {
filename: filename,
file: file,
@@ -695,7 +689,7 @@ module SiSU_HarvestTopics
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" />
<meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" />
-<meta name="generator" content="#{sv[:project]} #{sv[:version]} of #{sv[:date_stamp]} (n*x and Ruby!)" />
+<meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" />
<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" />
<link href="#{css_path}" rel="stylesheet">
<link rel="shortcut icon" href="../_sisu/image/rb7.ico" />
diff --git a/lib/sisu/v6/html_lite_shared.rb b/lib/sisu/develop/html_lite_shared.rb
index e54ee952..5c74fa85 100644
--- a/lib/sisu/v6/html_lite_shared.rb
+++ b/lib/sisu/develop/html_lite_shared.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by db and flatfile output generators, mostly xml/xhtml/html
+ formatting
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_lite_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by db and flatfile output generators, mostly
- xml/xhtml/html formatting
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_lite_shared.rb;hb=HEAD>
=end
module SiSU_FormatShared
@@ -78,7 +75,6 @@ module SiSU_FormatShared
else @@hname
end
@tab="\t"
- @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
@@tablehead,@@tablefoot=[],[]
@env=SiSU_Env::InfoEnv.new(@md.fns)
@base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html"
@@ -207,7 +203,7 @@ GSUB
%{<p class="#{h[:class]}" type="#{h[:type]}">#{h[:txt]}</a></p>\n} << "\n"
end
def lev_toc_hname
- %{<p class="toc#{@lv}" header="#{@hname}"><a href="##{@ocn_html_identifier}#{@ocn}">#{@txt}</a></p>\n} #<< "\n"
+ %{<p class="toc#{@lv}" header="#{@hname}"><a href="##{@ocn}">#{@txt}</a></p>\n} #<< "\n"
end
def lev_toc
h={ txt: txt, class: "toc#{@lv}", type: 'toc' }
diff --git a/lib/sisu/v5/html_manifest.rb b/lib/sisu/develop/html_manifest.rb
index 02368111..514727e6 100644
--- a/lib/sisu/v5/html_manifest.rb
+++ b/lib/sisu/develop/html_manifest.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_manifest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_manifest.rb;hb=HEAD>
=end
module SiSU_Manifest
@@ -163,19 +160,19 @@ module SiSU_Manifest
%{<p class="tiny">#{the_url_decoration.xml_open}<a href="#{url}/#{file}">#{url}/#{file}</a>#{the_url_decoration.xml_close}</p>}
end
end
- def summarize(id,file,pth='',rel='',url='',img='● ')
+ def summarize(desc,id,file,pth='',rel='',url='',img='● ')
size=(File.size("#{pth}/#{file}")/1024.00).to_s
kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
- @manifest[:txt] << "#{file} #{id} #{kb}\n"
- @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{rel}/#{file}">#{file}</a></p>#{url_make(url,file)}</td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+ @manifest[:txt] << "#{file} #{desc} #{kb}\n"
+ @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{img}#{desc}</a></p></th><td><p class="small"><a href="#{rel}/#{file}">#{file}</a></p>#{url_make(url,file)}</td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
end
- def summarize_html_seg(id,file,pth='',rel='',url='',img='● ')
+ def summarize_html_seg(desc,id,file,pth='',rel='',url='',img='● ')
size=(File.size("#{pth}/#{file}")/1024.00).to_s
kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
- @manifest[:txt] << "#{file} #{id} #{kb}\n"
- @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{img}#{id}</a></p></th><td><p class="small"><a href="#{rel}/#{file}">#{file}</a></p>#{url_make(url,file)}</td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
+ @manifest[:txt] << "#{file} #{desc} #{kb}\n"
+ @manifest[:html] << %{<tr><th class="left"><p class="norm"><a href="#{rel}/#{file}">#{img}#{desc}</a></p></th><td><p class="small"><a href="#{rel}/#{file}">#{file}</a></p>#{url_make(url,file)}</td><td class="right"><p class="right">#{kb}</p></td></tr>\n}
end
- def summarize_sources(id,file,pth,rel,url)
+ def summarize_sources(desc,id,file,pth,rel,url)
sys=SiSU_Env::SystemCall.new
dgst=case @dg
when :sha512
@@ -197,9 +194,9 @@ module SiSU_Manifest
end
size=(File.size("#{pth}/#{file}")/1024.00).to_s
kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
- @manifest[:txt] << "#{file} #{id} #{kb}\n"
+ @manifest[:txt] << "#{file} #{desc} #{kb}\n"
@manifest[:html] << %{<tr>} \
- + %{<th class="left"><p class="norm"><a href="#{rel}/#{file}">#{id}</a></p></th>} \
+ + %{<th class="left"><p class="norm" id="#{id}"><a href="#{rel}/#{file}">#{desc}</a></p></th>} \
+ %{<td class="right"><p class="tiny"><a href="#{rel}/#{file}">#{file}</a> &nbsp;&nbsp;#{dgst[1]}#{url_make(url,file,:src)}</p></td>} \
+ %{<td class="right"><p class="right">#{kb}</p></td>} \
+ %{</tr>\n} \
@@ -249,7 +246,7 @@ module SiSU_Manifest
end
@m=@m.uniq
end
- def languages(id,file)
+ def languages(desc,file)
@manifest[:html] << %{<tr><th class="left"><div id="horizontal_links"><ul id="horizontal">\n}
published_manifests?.each do |l|
SiSU_Translate::Source.new(@md,@language,l[:n]).language_list
@@ -258,15 +255,15 @@ module SiSU_Manifest
end
@manifest[:html] << %{</ul></div></th></tr>\n}
end
- def published_languages(id)
+ def published_languages(desc)
published_manifests?.each do |l|
@manifest[:txt] << "#{l[:mu]} #{l[:l]}\n"
@manifest[:html] << %{<tr><th class="left"><p class="bold"><a href="#{l[:mu]}">#{l[:l]}</a></p></th><td><p class="norm">#{l[:l]}</p><p class="tiny">#{the_url_decoration.xml_open}<a href="#{l[:mu]}">#{l[:mu]}</a>#{the_url_decoration.xml_close}</p></td><td class="right"><p class="right">&nbsp;</p></td></tr>\n}
end
end
- def metadata(id,info)
+ def metadata(desc,id,info)
info=info.to_s.gsub(/(?:#{Mx[:br_line]}|\\)+/,'<br>')
- @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{id}:</p></th><td><p class="left">#{info}</p></td></tr>\n}
+ @manifest[:html] << %{<tr><th class="left"><p class="bold_left" id="#{id}">#{desc}:</p></th><td><p class="left">#{info}</p></td></tr>\n}
end
def links(url,lnk,target)
static=if url =~/^\.\// then url.gsub(/^\.(\.)?/,@base_url)
@@ -281,271 +278,278 @@ module SiSU_Manifest
pth=@f.output_path.html_seg.dir
rel=@f.output_path.html_seg.rel_sm
url=@f.output_path.html_seg.url
- id,file='HTML, table of contents (for segmented text)',@f.base_filename.html_segtoc
- summarize_html_seg(id,file,pth,rel,url,img)
+ desc,id,file='HTML, table of contents (for segmented text)','html',@f.base_filename.html_segtoc
+ summarize_html_seg(desc,id,file,pth,rel,url,img)
end
if FileTest.file?(@f.place_file.html_scroll.dir)==true
img=%{<img border="0" height="15" width="15" src="#{@image_path}/b_doc.png" alt="Full Text" /> }
pth=@f.output_path.html_scroll.dir
rel=@f.output_path.html_scroll.rel_sm
url=@f.output_path.html_scroll.url
- id,file='HTML, full length document',@f.base_filename.html_scroll
- summarize(id,file,pth,rel,url,img)
+ desc,id,file='HTML, full length document','html_scroll',@f.base_filename.html_scroll
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?(@f.place_file.html_book_index.dir)==true
pth=@f.output_path.html_seg.dir
rel=@f.output_path.html_seg.rel_sm
url=@f.output_path.html_seg.url
- id,file='HTML, (book type) index',@f.base_filename.html_book_index
- summarize(id,file,pth,rel,url)
+ desc,id,file='HTML, (book type) index','html_book',@f.base_filename.html_book_index
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.html_concordance.dir)==true
pth=@f.output_path.html_seg.dir
rel=@f.output_path.html_seg.rel_sm
url=@f.output_path.html_seg.url
- id,file='HTML, concordance file',@f.base_filename.html_concordance
- summarize(id,file,pth,rel,url)
+ desc,id,file='HTML, concordance file','concordance',@f.base_filename.html_concordance
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.epub.dir)==true
img=%{<img border="0" height="18" width="18" src="#{@image_path}/b_epub.png" alt="EPUB" /> }
- id,file='EPUB (Electronic Publication, e-book standard)',@f.base_filename.epub
+ desc,id,file='EPUB (Electronic Publication, e-book standard)','epub',@f.base_filename.epub
pth=@f.output_path.epub.dir
rel=@f.output_path.epub.rel_sm
url=@f.output_path.epub.url
- summarize(id,file,pth,rel,url,img)
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_p_letter}")==true
img=%{<img border="0" height="18" width="15" src="#{@image_path}/b_pdf.png" alt="PDF portrait" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)","#{@f.base_filename.pdf_p_letter}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)",'pdf_letter',"#{@f.base_filename.pdf_p_letter}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_l_letter}")==true
img=%{<img border="0" height="15" width="18" src="#{@image_path}/b_pdf.png" alt="PDF landscape" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, U.S. letter size, landscape/horizontal document (recommended for screen viewing)","#{@f.base_filename.pdf_l_letter}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, U.S. letter size, landscape/horizontal document (recommended for screen viewing)",'pdf_letter_landscape',"#{@f.base_filename.pdf_l_letter}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_p_a4}")==true
img=%{<img border="0" height="18" width="15" src="#{@image_path}/b_pdf.png" alt="PDF portrait" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, A4 size, portrait/vertical document (recommended for printing)","#{@f.base_filename.pdf_p_a4}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, A4 size, portrait/vertical document (recommended for printing)",'pdf_a4',"#{@f.base_filename.pdf_p_a4}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_l_a4}")==true
img=%{<img border="0" height="15" width="18" src="#{@image_path}/b_pdf.png" alt="PDF landscape" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, A4 size, landscape/horizontal document (recommended for screen viewing)","#{@f.base_filename.pdf_l_a4}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, A4 size, landscape/horizontal document (recommended for screen viewing)",'pdf_a4_landscape',"#{@f.base_filename.pdf_l_a4}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_p_a5}")==true
img=%{<img border="0" height="18" width="15" src="#{@image_path}/b_pdf.png" alt="PDF portrait" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, A5 (book) size, portrait/vertical document (recommended for printing)","#{@f.base_filename.pdf_p_a5}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, A5 (book) size, portrait/vertical document (recommended for printing)",'pdf_a5',"#{@f.base_filename.pdf_p_a5}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_l_a5}")==true
img=%{<img border="0" height="15" width="18" src="#{@image_path}/b_pdf.png" alt="PDF landscape" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, A5 (book) size, landscape/horizontal document (recommended for screen viewing)","#{@f.base_filename.pdf_l_a5}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, A5 (book) size, landscape/horizontal document (recommended for screen viewing)",'pdf_a5_landscape',"#{@f.base_filename.pdf_l_a5}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_p_b5}")==true
img=%{<img border="0" height="18" width="15" src="#{@image_path}/b_pdf.png" alt="PDF portrait" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, B5 (book) size, portrait/vertical document (recommended for printing)","#{@f.base_filename.pdf_p_b5}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, B5 (book) size, portrait/vertical document (recommended for printing)",'pdf_b5',"#{@f.base_filename.pdf_p_b5}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_l_b5}")==true
img=%{<img border="0" height="15" width="18" src="#{@image_path}/b_pdf.png" alt="PDF landscape" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, B5 (book) size, landscape/horizontal document (recommended for screen viewing)","#{@f.base_filename.pdf_l_b5}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, B5 (book) size, landscape/horizontal document (recommended for screen viewing)",'pdf_a5_landscape',"#{@f.base_filename.pdf_l_b5}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_p_legal}")==true
img=%{<img border="0" height="18" width="15" src="#{@image_path}/b_pdf.png" alt="PDF portrait" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, U.S. legal size, portrait/vertical document (recommended for printing)","#{@f.base_filename.pdf_p_legal}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, U.S. legal size, portrait/vertical document (recommended for printing)",'pdf_legal',"#{@f.base_filename.pdf_p_legal}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?("#{@f.output_path.pdf.dir}/#{@f.base_filename.pdf_l_legal}")==true
img=%{<img border="0" height="15" width="18" src="#{@image_path}/b_pdf.png" alt="PDF landscape" /> }
pth=@f.output_path.pdf.dir
rel=@f.output_path.pdf.rel_sm
url=@f.output_path.pdf.url
- id,file="PDF, U.S. legal size, landscape/horizontal document (recommended for screen viewing)","#{@f.base_filename.pdf_l_legal}"
- summarize(id,file,pth,rel,url,img)
+ desc,id,file="PDF, U.S. legal size, landscape/horizontal document (recommended for screen viewing)",'pdf_legal_landscape',"#{@f.base_filename.pdf_l_legal}"
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?(@f.place_file.odt.dir)==true
img=%{<img border="0" height="18" width="18" src="#{@image_path}/b_odf.png" alt="ODF/ODT" /> }
pth=@f.output_path.odt.dir
rel=@f.output_path.odt.rel_sm
url=@f.output_path.odt.url
- id,file='ODF:ODT (Open Document Format)',@f.base_filename.odt
- summarize(id,file,pth,rel,url,img)
+ desc,id,file='ODF:ODT (Open Document Format)','odt',@f.base_filename.odt
+ summarize(desc,id,file,pth,rel,url,img)
end
if FileTest.file?(@f.place_file.xhtml.dir)==true
pth=@f.output_path.xhtml.dir
rel=@f.output_path.xhtml.rel_sm
url=@f.output_path.xhtml.url
- id,file='ODF:ODT (Open Document Format)',@f.base_filename.odt
- id,file='XHTML',@f.base_filename.xhtml
- summarize(id,file,pth,rel,url)
+ desc,id,file='XHTML','xhtml',@f.base_filename.xhtml
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_sax.dir)==true
pth=@f.output_path.xml_sax.dir
rel=@f.output_path.xml_sax.rel_sm
url=@f.output_path.xml_sax.url
- id,file='XML SAX',@f.base_filename.xml_sax
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML SAX','xml_sax',@f.base_filename.xml_sax
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_dom.dir)==true
pth=@f.output_path.xml_dom.dir
rel=@f.output_path.xml_dom.rel_sm
url=@f.output_path.xml_dom.url
- id,file='XML DOM',@f.base_filename.xml_dom
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML DOM','xml_dom',@f.base_filename.xml_dom
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_docbook_article.dir)==true
pth=@f.output_path.xml_docbook_article.dir
rel=@f.output_path.xml_docbook_article.rel_sm
url=@f.output_path.xml_docbook_article.url
- id,file='XML Docbook Book',@f.base_filename.xml_docbook_article
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML Docbook Article','docbook_article',@f.base_filename.xml_docbook_article
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_docbook_book.dir)==true
pth=@f.output_path.xml_docbook_book.dir
rel=@f.output_path.xml_docbook_book.rel_sm
url=@f.output_path.xml_docbook_book.url
- id,file='XML Docbook Book',@f.base_filename.xml_docbook_book
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML Docbook Book','docbook',@f.base_filename.xml_docbook_book
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_fictionbook.dir)==true
pth=@f.output_path.xml_fictionbook.dir
rel=@f.output_path.xml_fictionbook.rel_sm
url=@f.output_path.xml_fictionbook.url
- id,file='XML Fictionbook',@f.base_filename.xml_fictionbook
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML Fictionbook','fictionbook',@f.base_filename.xml_fictionbook
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_scaffold_structure_sisu.dir)==true
pth=@f.output_path.xml_scaffold_structure_sisu.dir
rel=@f.output_path.xml_scaffold_structure_sisu.rel_sm
url=@f.output_path.xml_scaffold_structure_sisu.url
- id,file='XML Scaffold sisu structure',@f.base_filename.xml_scaffold_structure_sisu
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML Scaffold sisu structure','xml_scaffold',@f.base_filename.xml_scaffold_structure_sisu
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.xml_scaffold_structure_collapse.dir)==true
pth=@f.output_path.xml_scaffold_structure_collapse.dir
rel=@f.output_path.xml_scaffold_structure_collapse.rel_sm
url=@f.output_path.xml_scaffold_structure_collapse.url
- id,file='XML Scaffold collapsed structure',@f.base_filename.xml_scaffold_structure_collapse
- summarize(id,file,pth,rel,url)
+ desc,id,file='XML Scaffold collapsed structure','xml_collapsed',@f.base_filename.xml_scaffold_structure_collapse
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.info.dir)==true
pth=@f.output_path.texinfo.dir
rel=@f.output_path.texinfo.rel_sm
url=@f.output_path.texinfo.url
- id,file='Info file',@f.base_filename.info
- summarize(id,file,pth,rel,url)
+ desc,id,file='Info file','info',@f.base_filename.info
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.manpage.dir)==true
pth=@f.output_path.manpage.dir
rel=@f.output_path.manpage.rel_sm
url=@f.output_path.manpage.url
- id,file='Manpage',@f.base_filename.manpage
- summarize(id,file,pth,rel,url)
+ desc,id,file='Manpage','manpage',@f.base_filename.manpage
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.sqlite_discrete.dir)==true
- id,file='SQLite3 file',@f.base_filename.sqlite_discrete
+ desc,id,file='SQLite3 file','sqlite',@f.base_filename.sqlite_discrete
pth=@f.output_path.sqlite_discrete.dir
rel=@f.output_path.sqlite_discrete.rel_sm
url=@f.output_path.sqlite_discrete.url
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.txt.dir)==true
- id='Plaintext (UTF-8)'
+ desc,id='Plaintext (UTF-8)','text'
pth=@f.output_path.txt.dir
rel=@f.output_path.txt.rel_sm
url=@f.output_path.txt.url
file=@f.base_filename.txt
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.textile.dir)==true
- id='Textile text (UTF-8)'
+ desc,id='Textile text (UTF-8)','textile'
pth=@f.output_path.textile.dir
rel=@f.output_path.textile.rel_sm
url=@f.output_path.textile.url
file=@f.base_filename.textile
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.asciidoc.dir)==true
- id='AsciiDoc text (UTF-8)'
+ desc,id='AsciiDoc text (UTF-8)','asciidoc'
pth=@f.output_path.asciidoc.dir
rel=@f.output_path.asciidoc.rel_sm
url=@f.output_path.asciidoc.url
file=@f.base_filename.asciidoc
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.markdown.dir)==true
- id='Markdown text (UTF-8)'
+ desc,id='Markdown text (UTF-8)','markdown'
pth=@f.output_path.markdown.dir
rel=@f.output_path.markdown.rel_sm
url=@f.output_path.markdown.url
file=@f.base_filename.markdown
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.rst.dir)==true
- id='rST text (UTF-8)'
+ desc,id='rST text (UTF-8)','rst'
pth=@f.output_path.rst.dir
rel=@f.output_path.rst.rel_sm
url=@f.output_path.rst.url
file=@f.base_filename.rst
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
+ end
+ if FileTest.file?(@f.place_file.orgmode.dir)==true
+ desc,id='OrgMode structure text (UTF-8)','org'
+ pth=@f.output_path.orgmode.dir
+ rel=@f.output_path.orgmode.rel_sm
+ url=@f.output_path.orgmode.url
+ file=@f.base_filename.orgmode
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?("#{@base_path}/#{@md.fns}.tex")==true
- id,file='LaTeX (portrait)',"#{@md.fns}.tex"
+ desc,id,file='LaTeX (portrait)','latex',"#{@md.fns}.tex"
pth,rel,url='','',''
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?("#{@base_path}/#{@md.fns}.tex")==true
- id,file='LaTeX (landscape)',"#{@md.fns}.landscape.tex"
+ desc,id,file='LaTeX (landscape)','latex_landscape',"#{@md.fns}.landscape.tex"
pth,rel,url='','',''
- summarize(id,file,pth,rel,url)
+ summarize(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.hash_digest.dir)==true
pth=@f.output_path.hash_digest.dir
rel=@f.output_path.hash_digest.rel_sm
url=@f.output_path.hash_digest.url
- id,file="Digest/DCC - Document Content Certificate (#{@dg})",@f.base_filename.hash_digest
- summarize(id,file,pth,rel,url)
+ desc,id,file="Digest/DCC - Document Content Certificate (#{@dg})",'digests',@f.base_filename.hash_digest
+ summarize(desc,id,file,pth,rel,url)
end
end
def published_versions
- id,file='Markup (SiSU source)',@md.fns
- languages(id,file)
+ desc,file='Markup (SiSU source)','source',@md.fns
+ languages(desc,file)
end
def language_versions
if FileTest.file?(@f.place_file.manifest.dir)==true
- id='Markup (SiSU source)'
- published_languages(id)
+ desc='Markup (SiSU source)'
+ published_languages(desc)
end
end
def qrc_image
@@ -585,165 +589,165 @@ WOK
pth=@f.output_path.src.dir
rel=@f.output_path.src.rel_sm
url=@f.output_path.src.url
- id,file='Markup Composite File (SiSU source)',@f.base_filename.src
- summarize_sources(id,file,pth,rel,url)
+ desc,id,file='Markup Composite File (SiSU source)','source',@f.base_filename.src
+ summarize_sources(desc,id,file,pth,rel,url)
end
else
if FileTest.file?(@f.place_file.src.dir)==true
pth=@f.output_path.src.dir
rel=@f.output_path.src.rel_sm
url=@f.output_path.src.url
- id,file='Markup (SiSU source)',@f.base_filename.src
- summarize_sources(id,file,pth,rel,url)
+ desc,id,file='Markup (SiSU source)','composite',@f.base_filename.src
+ summarize_sources(desc,id,file,pth,rel,url)
end
end
if FileTest.file?(@f.place_file.sisupod.dir)==true
pth=@f.output_path.sisupod.dir
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)
+ desc,id,file='SiSUdoc pod (tar.xz)','sisupod',@f.base_filename.sisupod
+ summarize_sources(desc,id,file,pth,rel,url)
end
if FileTest.file?(@f.place_file.pot.dir)==true
pth=@f.output_path.pot.dir
rel=@f.output_path.pot.rel_sm
url=@f.output_path.pot.url
- id,file='SiSU pot',@f.base_filename.pot
- summarize_sources(id,file,pth,rel,url)
+ desc,id,file='SiSU pot','pot',@f.base_filename.pot
+ summarize_sources(desc,id,file,pth,rel,url)
end
end
def metadata_tests
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)
+ desc,id,info=@translate.full_title,'title',@md.title.full
+ metadata(desc,id,info)
end
end
if defined? @md.creator #%
if defined? @md.creator.author \
and @md.creator.author=~/\S+/
- id,info=@translate.author,@md.creator.author
- metadata(id,info)
+ desc,id,info=@translate.author,'author',@md.creator.author
+ metadata(desc,id,info)
end
if defined? @md.creator.editor \
and @md.creator.editor=~/\S+/
- id,info=@translate.editor,@md.creator.editor
- metadata(id,info)
+ desc,id,info=@translate.editor,'editor',@md.creator.editor
+ metadata(desc,id,info)
end
if defined? @md.creator.contributor \
and @md.creator.contributor=~/\S+/
- id,info=@translate.contributor,@md.creator.contributor
- metadata(id,info)
+ desc,id,info=@translate.contributor,'contributor',@md.creator.contributor
+ metadata(desc,id,info)
end
if defined? @md.creator.translator \
and @md.creator.translator=~/\S+/
- id,info=@translate.translator,@md.creator.translator
- metadata(id,info)
+ desc,id,info=@translate.translator,'creator',@md.creator.translator
+ metadata(desc,id,info)
end
if defined? @md.creator.illustrator \
and @md.creator.illustrator=~/\S+/
- id,info=@translate.illustrator,@md.creator.illustrator
- metadata(id,info)
+ desc,id,info=@translate.illustrator,'illustrator',@md.creator.illustrator
+ metadata(desc,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)
+ desc,id,info=@translate.prepared_by,'prepared_by',@md.creator.prepared_by
+ metadata(desc,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)
+ desc,id,info=@translate.digitized_by,'designed_by',@md.creator.digitized_by
+ metadata(desc,id,info)
end
end
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)
+ desc,id,info=@translate.rights,'rights',@md.rights.all
+ metadata(desc,id,info)
end
end
if defined? @md.date #%
if defined? @md.date.published \
and @md.date.published=~/\S+/ #dc
- id,info=@translate.date,@md.date.published
- metadata(id,info)
+ desc,id,info=@translate.date,'date',@md.date.published
+ metadata(desc,id,info)
end
if defined? @md.date.created \
and @md.date.created=~/\S+/ #dc
- id,info=@translate.date_created,@md.date.created
- metadata(id,info)
+ desc,id,info=@translate.date_created,'date_created',@md.date.created
+ metadata(desc,id,info)
end
if defined? @md.date.issued \
and @md.date.issued=~/\S+/ #dc
- id,info=@translate.date_issued,@md.date.issued
- metadata(id,info)
+ desc,id,info=@translate.date_issued,'date_issued',@md.date.issued
+ metadata(desc,id,info)
end
if defined? @md.date.available \
and @md.date.available=~/\S+/ #dc
- id,info=@translate.date_available,@md.date.available
- metadata(id,info)
+ desc,id,info=@translate.date_available,'date_available',@md.date.available
+ metadata(desc,id,info)
end
if defined? @md.date.modified \
and @md.date.modified=~/\S+/ #dc
- id,info=@translate.date_modified,@md.date.modified
- metadata(id,info)
+ desc,id,info=@translate.date_modified,'date_modified',@md.date.modified
+ metadata(desc,id,info)
end
if defined? @md.date.valid \
and @md.date.valid=~/\S+/ #dc
- id,info=@translate.date_valid,@md.date.valid
- metadata(id,info)
+ desc,id,info=@translate.date_valid,'date_valid',@md.date.valid
+ metadata(desc,id,info)
end
end
if defined? @md.publisher \
and @md.publisher=~/\S+/ #dc
- id,info=@translate.publisher,@md.publisher
- metadata(id,info)
+ desc,id,info=@translate.publisher,'publisher',@md.publisher
+ metadata(desc,id,info)
end
if defined? @md.notes #%
if defined? @md.notes.description \
and @md.notes.description=~/\S+/
- id,info=@translate.description,@md.notes.description
- metadata(id,info)
+ desc,id,info=@translate.description,'description',@md.notes.description
+ metadata(desc,id,info)
end
if defined? @md.notes.abstract \
and @md.notes.abstract=~/\S+/
- id,info=@translate.abstract,@md.notes.abstract
- metadata(id,info)
+ desc,id,info=@translate.abstract,'abstract',@md.notes.abstract
+ metadata(desc,id,info)
end
if defined? @md.notes.comment \
and @md.notes.comment=~/\S+/
- id,info=@translate.comments,@md.notes.comment
- metadata(id,info)
+ desc,id,info=@translate.comments,'comment',@md.notes.comment
+ metadata(desc,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)
+ desc,id,info=@translate.prefix_a,'prefix',@md.notes.prefix_a
+ metadata(desc,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)
+ desc,id,info=@translate.prefix_b,'prefix_b',@md.notes.prefix_b
+ metadata(desc,id,info)
end
end
if defined? @md.title #%
if defined? @md.title.language \
and @md.title.language=~/\S+/
- id,info=@translate.language,@md.title.language
- metadata(id,info)
+ desc,id,info=@translate.language,'language',@md.title.language
+ metadata(desc,id,info)
end
if defined? @md.original.language \
and @md.original.language=~/\S+/
- id,info=@translate.language_original,@md.original.language
- metadata(id,info)
+ desc,id,info=@translate.language_original,'language_original',@md.original.language
+ metadata(desc,id,info)
end
end
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}
+ @manifest[:html] << %{<tr><th class="left"><p class="bold_left" id="topics">#{@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)
@@ -764,104 +768,104 @@ WOK
end
if defined? @md.classify.subject \
and @md.classify.subject=~/\S+/
- id,info=@translate.subject,@md.classify.subject
- metadata(id,info)
+ desc,id,info=@translate.subject,'subject',@md.classify.subject
+ metadata(desc,id,info)
end
if defined? @md.classify.keywords \
and @md.classify.keywords=~/\S+/
- id,info=@translate.keywords,@md.classify.keywords
- metadata(id,info)
+ desc,id,info=@translate.keywords,'keywords',@md.classify.keywords
+ metadata(desc,id,info)
end
if defined? @md.classify.loc \
and @md.classify.loc=~/\S+/
- id,info=@translate.cls_loc,@md.classify.loc
- metadata(id,info)
+ desc,id,info=@translate.cls_loc,'loc',@md.classify.loc
+ metadata(desc,id,info)
end
if defined? @md.classify.dewey \
and @md.classify.dewey=~/\S+/
- id,info=@translate.cls_dewey,@md.classify.dewey
- metadata(id,info)
+ desc,id,info=@translate.cls_dewey,'dewey',@md.classify.dewey
+ metadata(desc,id,info)
end
if defined? @md.notes.coverage \
and @md.notes.coverage=~/\S+/
- id,info=@translate.coverage,@md.notes.coverage
- metadata(id,info)
+ desc,id,info=@translate.coverage,'coverage',@md.notes.coverage
+ metadata(desc,id,info)
end
if defined? @md.notes.relation \
and @md.notes.relation=~/\S+/
- id,info=@translate.relation,@md.notes.relation
- metadata(id,info)
+ desc,id,info=@translate.relation,'relation',@md.notes.relation
+ metadata(desc,id,info)
end
if defined? @md.notes.type \
and @md.notes.type=~/\S+/ #dc
- id,info=@translate.type,@md.notes.type
- metadata(id,info)
+ desc,id,info=@translate.type,'type',@md.notes.type
+ metadata(desc,id,info)
end
if defined? @md.notes.format \
and @md.notes.format=~/\S+/
- id,info=@transate.format,@md.notes.format
- metadata(id,info)
+ desc,id,info=@transate.format,'format',@md.notes.format
+ metadata(desc,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}
+ desc,id,info=@translate.cls_oclc,'',@md.identifier.oclc
+ @manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{desc}:</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)
+ desc,id,info=@translate.cls_gutenberg,'ocalc',@md.identifier.pg
+ metadata(desc,id,info)
end
if defined? @md.identifier.isbn \
and @md.identifier.isbn=~/\S+/
- id,info=@translate.cls_isbn,@md.identifier.isbn
- metadata(id,info)
+ desc,id,info=@translate.cls_isbn,'isbn',@md.identifier.isbn
+ metadata(desc,id,info)
end
end
if defined? @md.original.source \
and @md.original.source=~/\S+/
- id,info=@translate.source,@md.original.source
- metadata(id,info)
+ desc,id,info=@translate.source,'source_original',@md.original.source
+ metadata(desc,id,info)
end
if @md.fns
- id,info=@translate.sourcefile,@md.fns
- metadata(id,info)
+ desc,id,info=@translate.sourcefile,'source_filename',@md.fns
+ metadata(desc,id,info)
end
if @md.en[:mismatch] > 0
- id,info='WARNING document error in endnote markup, number mismatch',"endnotes: #{@md.en[:note]} != endnote reference marks: #{@md.en[:mark]} (difference = #{@md.en[:mismatch]})"
- metadata(id,info)
+ desc,id,info='WARNING document error in endnote markup, number mismatch','',"endnotes: #{@md.en[:note]} != endnote reference marks: #{@md.en[:mark]} (difference = #{@md.en[:mismatch]})"
+ metadata(desc,id,info)
end
if @md.wc_words
- id,info=@translate.word_count,@md.wc_words
- metadata(id,info)
+ desc,id,info=@translate.word_count,'wordcount',@md.wc_words
+ metadata(desc,id,info)
end
if @md.dgst
- id,info="#{@translate.sourcefile_digest} (#{@dg})",@md.dgst[1]
- metadata(id,info)
+ desc,id,info="#{@translate.sourcefile_digest} (#{@dg})",'digests',@md.dgst[1]
+ metadata(desc,id,info)
end
if @md.sc_number
- id,info=@translate.sc_number,@md.sc_number
- metadata(id,info)
+ desc,id,info=@translate.sc_number,'sc_number',@md.sc_number
+ metadata(desc,id,info)
end
if @md.sc_date
- id,info=@translate.sc_date,"#{@md.sc_date} at #{@md.sc_time}"
- metadata(id,info)
+ desc,id,info=@translate.sc_date,'sc_date',"#{@md.sc_date} at #{@md.sc_time}"
+ metadata(desc,id,info)
end
if @md.generated
- id,info=@translate.last_generated,@md.generated
- metadata(id,info)
+ desc,id,info=@translate.last_generated,'generated',@md.generated
+ metadata(desc,id,info)
end
- if @md.sisu_version
- id,info=@translate.sisu_version,"#{@md.sisu_version[:project]} #{@md.sisu_version[:version]} #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})#{@md.sisu_version[:install_method]}"
- metadata(id,info)
+ if @md.project_details
+ desc,id,info=@translate.sisu_version,'project',"#{@md.project_details.project} #{@md.project_details.version} #{@md.project_details.date_stamp} (#{@md.project_details.date})#{@md.project_details.install_method}"
+ metadata(desc,id,info)
end
if @md.ruby_version
- id,info=@translate.ruby_version,@md.ruby_version
- metadata(id,info)
+ desc,id,info=@translate.ruby_version,'ruby',@md.ruby_version
+ metadata(desc,id,info)
end
end
def links_tests
@@ -982,7 +986,7 @@ WOK
@manifest[:html] <<<<WOK
<h2 class="small"><a name="metadata">#{@translate.manifest_description_metadata}</a></h2>
<table summary="document metadata" width="100%" border="0" cellpadding="2" align="center">
-<tr> <th class="left"><p class="bold">#{@translate.metadata}</p></th><th class="left"><p class="bold">#{@translate.description}</p></th></tr>
+<tr> <th class="left"><p class="bold" id="metadata">#{@translate.metadata}</p></th><th class="left"><p class="bold">#{@translate.description}</p></th></tr>
WOK
metadata_tests
@manifest[:html] <<<<WOK
diff --git a/lib/sisu/v6/html_minitoc.rb b/lib/sisu/develop/html_minitoc.rb
index 9c8ed2a1..96da06d7 100644
--- a/lib/sisu/v6/html_minitoc.rb
+++ b/lib/sisu/develop/html_minitoc.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- minitoc
+** Description: documents, structuring, processing, publishing, search
+*** html minitoc
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_minitoc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_minitoc.rb;hb=HEAD>
=end
module SiSU_HTML_MiniToc
@@ -68,7 +64,6 @@
def initialize(md,data)
@md,@data=md,data
@pat_strip_heading_name=/<a name="h?\d.*?">(.+?)<\/a>/
- @ocn_html_identifier=SiSU_Env::ProcessingSettings.new(@md).ocn_html_identifier
@tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]) if @md
end
def songsheet
@@ -203,7 +198,7 @@
fn: @@seg_url,
}
f=@md.file.base_filename.html_seg(fnh)
- lnk_n_txt=%{ <a href="#{f}##{@ocn_html_identifier}#{txt.ocn}">
+ lnk_n_txt=%{ <a href="#{f}##{txt.ocn}">
#{txt.obj}
</a>}
txt_obj={ txt: lnk_n_txt }
@@ -222,7 +217,7 @@
fn: @@seg_url,
}
f=@md.file.base_filename.html_seg(fnh)
- lnk_n_txt=%{ <a href="#{f}##{@ocn_html_identifier}#{txt.ocn}">
+ lnk_n_txt=%{ <a href="#{f}##{txt.ocn}">
#{txt.obj}
</a>}
txt_obj={ txt: lnk_n_txt }
diff --git a/lib/sisu/v5/html_parts.rb b/lib/sisu/develop/html_parts.rb
index 6f3468d0..4133203c 100644
--- a/lib/sisu/v5/html_parts.rb
+++ b/lib/sisu/develop/html_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
=end
module SiSU_Parts_HTML
@@ -296,7 +293,7 @@ module SiSU_Proj_HTML
#@date=SiSU_Env::InfoDate.new #{@date.year}
end
def txt_generator
- %{ <meta name="generator" content="#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!)" />
+ %{ <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 widget_sisu_text
@@ -304,9 +301,9 @@ module SiSU_Proj_HTML
<p class="tiny"><font color="#666666" size="2">
Output generated by
<a href="#{the_url.sisu}">
- #{@v[:project]}
+ #{@v.project}
</a>
- #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]})
+ #{@v.version} #{@v.date} (#{@v.date_stamp})
</font></p>
WOK
end
@@ -365,7 +362,7 @@ WOK
<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!)" />
+<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" />
@@ -423,7 +420,7 @@ Outputs include: plaintext, HTML, EPUB, ODT (OpenDocumentText), (XHTML, XML,) La
</a>
</p>
<p class="tiny">
-#{@v[:project]} #{@v[:version]} of #{@v[:date_stamp]} (#{@v[:date]}) (n*x and Ruby!), #{@date.year_static}.
+#{@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.
diff --git a/lib/sisu/develop/html_persist.rb b/lib/sisu/develop/html_persist.rb
new file mode 100644
index 00000000..482a0c00
--- /dev/null
+++ b/lib/sisu/develop/html_persist.rb
@@ -0,0 +1,237 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** html segment generation, processing
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_persist.rb;hb=HEAD>
+
+=end
+module SiSU_HTML_Persist
+ class Persist
+ @@persist=nil
+ attr_accessor :is0,:is1,:is2,:is3,:is4,:heading0,:heading1,:heading2,:heading3,:heading4, :title, :dot_nav, :tocband_banner, :tocband_bannerless, :headings, :heading_endnotes, :main, :endnote_all, :tail, :credits, :heading_idx, :idx, :seg_endnotes, :seg_endnotes_array, :segtocband, :get_hash_fn, :get_hash_to, :seg_subtoc, :seg_subtoc_array, :fn, :seg_name ,:seg_name_x,:seg_name_x_tracker
+ def initialize(args=nil)
+ @@persist=args=(args ? args : (@@persist || persist_init_hash_values))
+ @is0=args[:is0]
+ @is1=args[:is1]
+ @is2=args[:is2]
+ @is3=args[:is3]
+ @is4=args[:is4]
+ @heading0=args[:heading0]
+ @heading1=args[:heading1]
+ @heading2=args[:heading2]
+ @heading3=args[:heading3]
+ @heading4=args[:heading4]
+ @title=args[:title]
+ @dot_nav=args[:dot_nav]
+ @tocband_banner=args[:tocband_banner]
+ @tocband_bannerless=args[:tocband_bannerless]
+ @headings=args[:headings]
+ @heading_endnotes=args[:heading_endnotes]
+ @main=args[:main]
+ @endnote_all=args[:endnote_all]
+ @tail=args[:tail]
+ @credits=args[:credits]
+ @heading_idx=args[:heading_idx]
+ @idx=args[:idx]
+ @seg_endnotes=args[:seg_endnotes]
+ @seg_endnotes_array=args[:seg_endnotes_array]
+ @get_hash_to=args[:get_hash_to]
+ @get_hash_fn=args[:get_hash_fn]
+ @seg_subtoc=args[:seg_subtoc]
+ @seg_subtoc_array=args[:seg_subtoc_array]
+ @segtocband=args[:fn]
+ @fn=args[:fn]
+ @seg_name=args[:seg_name]
+ @seg_name_x=args[:seg_name_x]
+ @seg_name_x_tracker=args[:seg_name_x_tracker]
+ end
+ def is0
+ @is0
+ end
+ def is1
+ @is1
+ end
+ def is2
+ @is2
+ end
+ def is3
+ @is3
+ end
+ def is4
+ @is4
+ end
+ def heading0
+ @heading0
+ end
+ def heading1
+ @heading1
+ end
+ def heading2
+ @heading2
+ end
+ def heading3
+ @heading3
+ end
+ def heading4
+ @heading4
+ end
+ def title
+ @title
+ end
+ def dot_nav
+ @dot_nav
+ end
+ def tocband_banner
+ @tocband_banner
+ end
+ def tocband_bannerless
+ @tocband_bannerless
+ end
+ def headings
+ @headings
+ end
+ def heading_endnotes
+ @heading_endnotes
+ end
+ def main
+ @main
+ end
+ def endnote_all
+ @endnote_all
+ end
+ def tail
+ @tail
+ end
+ def credits
+ @credits
+ end
+ def heading_idx
+ @heading_idx
+ end
+ def idx
+ @idx
+ end
+ def seg_endnotes
+ @seg_endnotes
+ end
+ def seg_endnotes_array
+ @seg_endnotes_array
+ end
+ def get_hash_to
+ @get_hash_to
+ end
+ def get_hash_fn
+ @get_hash_fn
+ end
+ def seg_subtoc
+ @seg_subtoc
+ end
+ def seg_subtoc_array
+ @seg_subtoc_array
+ end
+ def segtocband
+ @segtocband
+ end
+ def fn
+ @fn
+ end
+ def seg_name
+ @seg_name
+ end
+ def seg_name_x
+ @seg_name_x
+ end
+ def seg_name_x_tracker
+ @seg_name_x_tracker
+ end
+ def persist_init_hash_values
+ {
+ is0: 0,
+ is1: 0,
+ is2: 0,
+ is3: 0,
+ is4: 0,
+ heading0: '',
+ heading1: '',
+ heading2: '',
+ heading3: '',
+ heading4: '',
+ tocband_banner: [],
+ tocband_bannerless: [],
+ title: [],
+ headings: [],
+ main: [],
+ idx: [],
+ tail: [],
+ credits: [],
+ endnote_all: [],
+ heading_endnotes: '',
+ seg_endnotes: {},
+ seg_endnotes_array: [],
+ get_hash_fn: '',
+ get_hash_to: '',
+ seg_subtoc: {},
+ seg_subtoc_array: [],
+ segtocband: '',
+ fn: '',
+ seg_name: [],
+ seg_name_x: [],
+ seg_name_x_tracker: 0,
+ }
+ end
+ def persist_init
+ @@persist=nil
+ Persist.new(persist_init_hash_values)
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/html_promo.rb b/lib/sisu/develop/html_promo.rb
index a2d3ecf3..b58fcac2 100644
--- a/lib/sisu/v5/html_promo.rb
+++ b/lib/sisu/develop/html_promo.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html advertising component, build here, mockup
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_promo.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html advertising component, build here, mockup
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_promo.rb;hb=HEAD>
=end
module SiSU_HTML_Promo
diff --git a/lib/sisu/v5/html_scroll.rb b/lib/sisu/develop/html_scroll.rb
index 94dac502..9229e5fb 100644
--- a/lib/sisu/v5/html_scroll.rb
+++ b/lib/sisu/develop/html_scroll.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html scroll generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_scroll.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html scroll generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_scroll.rb;hb=HEAD>
=end
module SiSU_HTML_Scroll
diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/develop/html_segments.rb
index 06aac4e1..65bd2d64 100644
--- a/lib/sisu/v5/html_segments.rb
+++ b/lib/sisu/develop/html_segments.rb
@@ -1,71 +1,69 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html segment generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_segments.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html segment generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_segments.rb;hb=HEAD>
=end
module SiSU_HTML_Seg
require_relative 'html_shared' # html_shared.rb
require_relative 'html' # html.rb
+ require_relative 'html_persist' # html_persist.rb
require_relative 'html_promo' # html_promo.rb
require_relative 'shared_metadata' # shared_metadata.rb
class Output
- def initialize(md,outputfile,seg,minitoc,type='')
- @md, @output_seg_file,@seg,@minitoc,@type=
- md,outputfile, seg,minitoc, type
+ def initialize(md,outputfile,per,minitoc,type='')
+ @md, @output_seg_file,@per,@minitoc,@type=
+ md,outputfile, per,minitoc, type
@title_banner_=SiSU_Env::CreateSite.new(@md.opt).html_seg_title_banner?
@file=SiSU_Env::FileOp.new(@md)
@make=SiSU_Env::ProcessingSettings.new(@md)
@@ -74,67 +72,68 @@ module SiSU_HTML_Seg
: 'content0'
end
def output
- if @seg[:title] =~/\S/
+ if @per.title =~/\S/
filename_seg=[]
if @make.build.html_top_band?
filename_seg \
- << @seg[:title] \
- << @seg[:tocband_banner]
+ << @per.title \
+ << @per.tocband_banner
else
filename_seg \
- << @seg[:title]
+ << @per.title
end
if @type=='endnotes'
- @seg[:headings]=[]
+ @per.headings=[]
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
if @title_banner_
- @seg[:headings] \
+ @per.headings \
<< format_head_seg.
title_banner(@md.title.main,@md.title.sub,@author)
end
txt_obj={ txt: 'Endnotes', ocn_display: '' }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] \
+ @per.headings \
<< format_seg.title_heading1
filename_seg \
- << @seg[:heading_endnotes] \
- << @minitoc << @seg[:headings] \
+ << @per.heading_endnotes \
+ << @minitoc << @per.headings \
<< %{\n<div class="#{@cl}">\n} \
- << @seg[:endnote_all] \
+ << @per.endnote_all \
<< '</div>' # << '</div>'
elsif @type=='idx'
- @seg[:headings]=[]
+ @per.headings=[]
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
if @title_banner_
- @seg[:headings] \
+ @per.headings \
<< format_head_seg.
title_banner(@md.title.main,@md.title.sub,@author)
end
txt_obj={ txt: 'Index', ocn_display: '' }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
+ @per.headings << format_seg.title_heading1
filename_seg \
- << @seg[:heading_idx] \
- << @minitoc << @seg[:headings] \
+ << @per.heading_idx \
+ << @minitoc << @per.headings \
<< %{\n<div class="#{@cl}">\n} \
- << @seg[:idx] \
+ << @per.idx \
<< '</div>' # << '</div>'
elsif @type=='metadata'
metadata=SiSU_Metadata::Summary.new(@md).html_display.metadata
- @seg[:headings]=[]
+ @per.headings=[]
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
if @title_banner_
- @seg[:headings] \
+ @per.headings \
<< format_head_seg.
title_banner(@md.title.main,@md.title.sub,@author)
end
txt_obj={ txt: 'Metadata', ocn_display: '' }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
+ @per.headings \
+ << format_seg.title_heading1
filename_seg \
- << @seg[:heading_idx] \
+ << @per.heading_idx \
<< @minitoc \
- << @seg[:headings] \
+ << @per.headings \
<< %{\n<div class="#{@cl}">\n} \
<< metadata \
<< '</div>' # << '</div>'
@@ -142,23 +141,23 @@ module SiSU_HTML_Seg
if @make.build.html_top_band?
filename_seg \
<< @minitoc \
- << @seg[:headings] \
- << @seg[:main] \
+ << @per.headings \
+ << @per.main \
<< "\n</div>\n"
else
filename_seg \
<< @minitoc \
- << @seg[:main] \
+ << @per.main \
<< "\n</div>\n"
end
end
filename_seg <<=if @make.build.html_top_band?
- @seg[:tail] \
- << @seg[:tocband_bannerless] \
- << @seg[:credits]
+ @per.tail \
+ << @per.tocband_bannerless \
+ << @per.credits
else
- @seg[:tail] \
- << @seg[:credits]
+ @per.tail \
+ << @per.credits
end
filename_seg=filename_seg.flatten.compact #watch
filename_seg.each do |str|
@@ -176,32 +175,15 @@ module SiSU_HTML_Seg
end
end
class Seg
- @@seg,@@seg_subtoc,@@seg_endnotes,@@seg_ad={},{},{},{}
- @@seg_name,@@seg_name_html=[],[]
- @@seg_url=@@fn=@@get_hash_to=@@get_hash_fn=''
- @@loop_count=@@seg_total=@@tracker=0
- @@is4=@@is3=@@is2=@@is1=@@is0=0
- @@heading0=@@heading1=@@heading2=@@heading3=@@heading4=0
- @@seg[:tocband_banner],
- @@seg[:tocband_bannerless],
- @@seg[:title],@@seg[:headings],
- @@seg[:main],
- @@seg[:idx],
- @@seg[:tail],
- @@seg[:credits],
- @@seg_subtoc_array,
- @@seg_endnotes_array,
- @@seg[:endnote_all]=
- Array.new(11){[]}
- @@seg[:heading_endnotes]=''
- @@tablehead,@@number_of_cols=0,0
- @@dp,@@segtocband=nil,nil
- @@fns_previous=''
- attr_reader :seg_name_html,:seg_name_html_tracker
+ @@seg_url=''
+ @@tracker=0
+ @@seg_name=[]
+ attr_reader :seg_name_x,:seg_name_x_tracker
def initialize(md=nil,data='')
@md,@data=md,data
- @seg_name_html=@@seg_name_html || nil
- @seg_name_html_tracker=@@tracker || nil
+ @per=SiSU_HTML_Persist::Persist.new
+ @seg_name_x=@per.seg_name_x=(@@seg_name || [])
+ @seg_name_x_tracker=@per.seg_name_x_tracker=(@@tracker || 0)
@env=SiSU_Env::InfoEnv.new(@md.fns) if @md
if @md
@make=SiSU_Env::ProcessingSettings.new(@md)
@@ -217,22 +199,24 @@ module SiSU_HTML_Seg
def songsheet
begin
@minitoc=SiSU_HTML::Source::Toc.new(@md,@data).minitoc
- data=get_subtoc_endnotes(@data)
- data=articles(data)
- SiSU_HTML_Seg::Seg.new.cleanup # (((( added ))))
+ @per=SiSU_HTML_Persist::Persist.new
+ data=get_subtoc_endnotes(@data,@per)
+ data=articles(data,@per)
+ cleanup(@md,@per) # (((( added ))))
#### (((( END )))) ####
rescue
SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
- @@seg_name=[]
+ SiSU_HTML_Persist::Persist.new.persist_init
+ @@seg_name=@per.seg_name=[]
end
end
protected
- def articles(data)
+ def articles(data,per)
+ @per=per
tracking,newfile=0,0
- @@is4=@@is3=@@is2=@@is1=@@is0=0
printed_endnote_seg='n'
idx_html=nil
if @md.book_idx
@@ -240,27 +224,28 @@ module SiSU_HTML_Seg
idx_html=SiSU_Particulars::CombinedSingleton.
instance.get_idx_html(@md.opt).html_idx
idx_html.each do |x|
- @@seg[:idx] << x
+ @per.idx << x
end
- @@seg[:heading_idx]=''
+ @per.heading_idx=''
end
data.each do |dob|
if (dob.is == :heading \
|| dob.is == :heading_insert) \
&& dob.ln == 4
@@seg_name << dob.name
+ @per.seg_name = @@seg_name
dob.name
end
end
- @@seg_name_html=@@seg_name
- @@seg_total=@@seg_name.length
- testforartnum=@@seg_name_html
+ @per.seg_name_x=@per.seg_name
+ @per.seg_name.length
+ testforartnum=@per.seg_name_x
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@md.opt.act[:color_state][:set],
- @@seg_name.length
+ @per.seg_name.length
).segmented
end
map_nametags=SiSU_Particulars::CombinedSingleton.
@@ -288,41 +273,41 @@ module SiSU_HTML_Seg
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==4
- @@heading4=dob.obj
- @@is4=newfile=1
+ @per.heading4=dob.obj
+ @per.is4=newfile=1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==3
- @@heading3=dob.obj
- @@is4,@@is3=0,1
+ @per.heading3=dob.obj
+ @per.is4,@per.is3=0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==2
- @@heading2=dob.obj
- @@is4,@@is3,@@is2=0,0,1
+ @per.heading2=dob.obj
+ @per.is4,@per.is3,@per.is2=0,0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==1
- @@heading1=dob.obj
- @@is4,@@is3,@@is2,@@is1=0,0,0,1
+ @per.heading1=dob.obj
+ @per.is4,@per.is3,@per.is2,@per.is1=0,0,0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==0
- @@heading0=dob.obj
- @@is4,@@is3,@@is2,@@is1,@@is0=0,0,0,0,1
+ @per.heading0=dob.obj
+ @per.is4,@per.is3,@per.is2,@per.is1,@per.is0=0,0,0,0,1
end
- if (@@is1 && !@@is2 && !@@is3 && !@@is4)
+ if (@per.is1 && !@per.is2 && !@per.is3 && !@per.is4)
if not (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==0
$_ #; check
end
end
- if @@is4==1
+ if @per.is4==1
if newfile==1 \
or dob.obj =~/^#{Mx[:br_endnotes]}|^#{Mx[:br_eof]}/
newfile=0
@@ -335,43 +320,46 @@ module SiSU_HTML_Seg
FileUtils::mkdir_p(@file.output_path.html_seg.dir) \
if File.writable?("#{@file.output_path.base.dir}/.")
end
- SiSU_HTML_Seg::Seg.new(@md).tail
+ tail(@md,@per)
+ #SiSU_HTML_Seg::Seg.new(@md,@per).tail
fnh={
- fn: @@seg_name_html[tracking-1],
+ fn: @per.seg_name_x[tracking-1],
}
fn=@md.file.base_filename.html_seg(fnh)
segfilename="#{@file.output_path.html_seg.dir}/#{fn}"
- output_seg_file=File.new(segfilename,'w') if @@seg_name_html[tracking-1]
+ output_seg_file=File.new(segfilename,'w') if @per.seg_name_x[tracking-1]
minitoc=(@make.build.html_minitoc?) ? @minitoc : ''
if dob.is==:heading \
- || (@@seg_name_html[tracking-1] !~/endnotes|book_index|metadata/)
- SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc).output
+ || (@per.seg_name_x[tracking-1] !~/endnotes|book_index|metadata/)
+ SiSU_HTML_Seg::Output.new(@md,output_seg_file,@per,minitoc).output
elsif dob.is==:heading_insert
- if @@seg_name_html[tracking-1]=='endnotes'
- SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'endnotes').output
- elsif @@seg_name_html[tracking-1]=='book_index'
- SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'idx').output
- @@seg[:idx]=[]
- elsif @@seg_name_html[tracking-1]=='metadata'
- SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
+ if @per.seg_name_x[tracking-1]=='endnotes'
+ SiSU_HTML_Seg::Output.new(@md,output_seg_file,@per,minitoc,'endnotes').output
+ elsif @per.seg_name_x[tracking-1]=='book_index'
+ SiSU_HTML_Seg::Output.new(@md,output_seg_file,@per,minitoc,'idx').output
+ @per.idx=[]
+ elsif @per.seg_name_x[tracking-1]=='metadata'
+ SiSU_HTML_Seg::Output.new(@md,output_seg_file,@per,minitoc,'metadata').output
else puts "#{__FILE__}::#{__LINE__}"
end
else puts "#{__FILE__}::#{__LINE__}"
end
- SiSU_HTML_Seg::Seg.new.reinitialise
+ SiSU_HTML_Seg::Seg.new.reinitialise(per)
+ #per=persist_init
heading_art(dob)
head(dob)
#keep use for last segment, eg if metadata is last segment
- if @@seg_name_html[tracking] =='metadata' # this is for metadata
- fnh={
- fn: @@seg_name_html[tracking],
- }
- fn=@md.file.base_filename.html_seg(fnh)
- segfilename="#{@file.output_path.html_seg.dir}/#{fn}"
- output_seg_file=File.new(segfilename,'w')
- SiSU_HTML_Seg::Output.new(@md,output_seg_file,@@seg,minitoc,'metadata').output
- Seg.new.reinitialise
- end
+ if @per.seg_name_x[tracking] =='metadata' # this is for metadata
+ fnh={
+ fn: @per.seg_name_x[tracking],
+ }
+ fn=@md.file.base_filename.html_seg(fnh)
+ segfilename="#{@file.output_path.html_seg.dir}/#{fn}"
+ output_seg_file=File.new(segfilename,'w')
+ SiSU_HTML_Seg::Output.new(@md,output_seg_file,@per,minitoc,'metadata').output
+ #per=persist_init
+ Seg.new.reinitialise(per)
+ end
end
if tracking==0
heading_art(dob)
@@ -384,8 +372,8 @@ module SiSU_HTML_Seg
|| dob.is==:heading_insert) \
&& dob.ln==4 \
&& dob.name
- @@get_hash_to=dob.name
- @@get_hash_fn=dob.name
+ @per.get_hash_to=dob.name
+ @per.get_hash_fn=dob.name
end
if dob.obj.is_a?(String)
markup(dob)
@@ -405,108 +393,108 @@ module SiSU_HTML_Seg
end
def heading_art(dob)
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
- @@seg[:dot_nav]=if (@make.build.html_navigation?) \
+ @per.dot_nav=if (@make.build.html_navigation?) \
&& (@make.build.html_navigation_bar?)
x=if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& (dob.ln.to_s =~/^[0-7]/)
- x=if @@tracker < @@seg_total-1
+ x=if @@tracker < @per.seg_name.length-1
format_head_seg.dot_control_pre_next
else
format_head_seg.dot_control_pre
end
- else @@seg[:dot_nav]
+ else @per.dot_nav
end
- else @@seg[:dot_nav]=''
+ else @per.dot_nav=''
end
ads=SiSU_HTML_Promo::Ad.new(@md)
- @@seg[:title]=format_head_seg.head_seg << ads.div.major
+ @per.title=format_head_seg.head_seg << ads.div.major
end
def head(dob)
clean=/<!.*?!>|<:.*?>/
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
if @make.build.html_navigation?
- if @@tracker < @@seg_total-1
- @@segtocband=if @@tracker==0
+ if @@tracker < @per.seg_name.length-1
+ @per.segtocband=if @@tracker==0
format_head_seg.toc_next2
else
format_head_seg.toc_pre_next2
end
- else @@segtocband=format_head_seg.toc_pre2
+ else @per.segtocband=format_head_seg.toc_pre2
end
- else @@segtocband=''
+ else @per.segtocband=''
end
@p_num ||= ''
- if @@is0==1
+ if @per.is0==1
@author=%{<b>#{@md.author}</b>\n} if @md.author.to_s =~/\S/
- @@seg[:tocband_banner] \
- << format_head_seg.navigation_band(@@segtocband,@@seg[:dot_nav])
- @@seg[:tocband_bannerless] \
+ @per.tocband_banner \
+ << format_head_seg.navigation_band(@per.segtocband,@per.dot_nav)
+ @per.tocband_bannerless \
<< '<br>' \
- << format_head_seg.navigation_band_bottom(@@segtocband,@@seg[:dot_nav])
+ << format_head_seg.navigation_band_bottom(@per.segtocband,@per.dot_nav)
if @title_banner_
- @@seg[:headings] \
+ @per.headings \
<< format_head_seg.title_banner(@md.title.main,@md.title.sub,@author).gsub(clean,'')
end
- ocn=(@@heading0[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
+ ocn=(@per.heading0[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
? $1
: ''
@p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
- txt_obj={ txt: @@heading0, ocn_display: @p_num.ocn_display }
+ txt_obj={ txt: @per.heading0, ocn_display: @p_num.ocn_display }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] \
+ @per.headings \
<< format_seg.title_heading0.gsub(clean,'')
- @@heading0=@@heading0.
+ @per.heading0=@per.heading0.
gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
end
- if @@is1==1
- heading1=@@heading1
+ if @per.is1==1
+ heading1=@per.heading1
ocn=(heading1[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
? $1
: ''
@p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
txt_obj={ txt: heading1, ocn_display: @p_num.ocn_display }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] \
+ @per.headings \
<< format_seg.title_heading1.gsub(clean,'')
- @@heading1=@@heading1.
+ @per.heading1=@per.heading1.
gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
end
- if @@is2==1
- heading2=@@heading2
+ if @per.is2==1
+ heading2=@per.heading2
ocn=(heading2[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
? $1
: ''
@p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
txt_obj={ txt: heading2, ocn_display: @p_num.ocn_display }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] \
+ @per.headings \
<< format_seg.title_heading2.gsub(clean,'')
- @@heading2=@@heading2.
+ @per.heading2=@per.heading2.
gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
end
- if @@is3==1
- heading3=@@heading3
+ if @per.is3==1
+ heading3=@per.heading3
ocn=(heading3[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
? $1
: ''
@p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
txt_obj={ txt: heading3, ocn_display: @p_num.ocn_display }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] \
+ @per.headings \
<< format_seg.title_heading3.gsub(clean,'')
- @@heading3=@@heading3.
+ @per.heading3=@per.heading3.
gsub(/&nbsp;<a name="-[\d*+]+" href="#_[\d*+]+">&nbsp;<sup>[\d*+]+<\/sup>&nbsp;<\/a>/,'')
end
- if @@is4==1
- heading4=@@heading4
+ if @per.is4==1
+ heading4=@per.heading4
ocn=(heading4[/.+?#{Mx[:id_o]}~(\d+);(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#{@dp}:#{@dp}#{Mx[:id_c]}$/]) \
? $1
: ''
@p_num=SiSU_HTML_Format::ParagraphNumber.new(@md,ocn)
txt_obj={ txt: heading4, ocn_display: @p_num.ocn_display }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] \
+ @per.headings \
<< format_seg.title_heading4.gsub(clean,'')
end
@@tracker=@@tracker+1
@@ -589,66 +577,73 @@ module SiSU_HTML_Seg
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==4
- @@seg[:main] << %{\n<div class="#{@cl}">\n}
- @@seg[:main] << dob_html
+ @per.main << %{\n<div class="#{@cl}">\n}
+ @per.main << dob_html
if @make.build.segsubtoc?
- @@seg[:main] << @@seg_subtoc[@@get_hash_fn] #% insertion of sub-toc
+ @per.main << @per.seg_subtoc[@per.get_hash_fn] #% insertion of sub-toc
end
else
- @@seg[:main] << dob_html #unless @@flag_alt==true
+ @per.main << dob_html #unless @@flag_alt==true
end
end
end
- def tail
+ def tail(md,per)
+ @md,@per=md,per
format_head_seg=SiSU_HTML_Format::HeadSeg.new(@md)
- if @md.flag_auto_endnotes and @@seg_endnotes[@@get_hash_fn]
- @@seg[:tail] << %{\n<div class="#{@cl}">\n<div class="endnote">\n}
- if @@seg_endnotes[@@get_hash_fn].flatten.length > 0
- @@seg[:tail] << format_head_seg.endnote_mark
- @@seg[:tail] << @@seg_endnotes[@@get_hash_fn].flatten #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
+ if @md.flag_auto_endnotes \
+ and @per.seg_endnotes[@per.get_hash_fn]
+ @per.tail << %{\n<div class="#{@cl}">\n<div class="endnote">\n}
+ if @per.seg_endnotes[@per.get_hash_fn].flatten.length > 0
+ @per.tail << format_head_seg.endnote_mark
+ @per.tail << @per.seg_endnotes[@per.get_hash_fn].flatten #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
end
- @@seg[:tail] << '</div>'
- @@seg[:tail] << '</div>' #this div closes div class content
+ @per.tail << '</div>'
+ @per.tail << '</div>' #this div closes div class content
end
ads=SiSU_HTML_Promo::Ad.new(@md)
- @@seg[:credits] << format_head_seg.credit << ads.div.close << ads.display << format_head_seg.html_close
+ @per.credits \
+ << format_head_seg.credit \
+ << ads.div.close \
+ << ads.display \
+ << format_head_seg.html_close
end
- def reinitialise
- @@seg[:title],@@seg[:dot_nav],@@seg[:tocband_banner],@@seg[:tocband_bannerless],@@seg[:headings],@@seg[:main],@@seg[:tail],@@seg[:credits]=Array.new(8){[]}
- @@segtocband=nil
+ def reinitialise(per)
+ per.title,per.dot_nav,per.tocband_banner,per.tocband_bannerless,per.headings,per.main,per.tail,per.credits=Array.new(8){[]}
+ @per.segtocband=nil
end
- def cleanup
- reinitialise
- @@seg_total,@@tracker=0,0
- @@seg_endnotes,@@seg_subtoc={},{}
- @@seg_endnotes_array,@@seg_subtoc_array=[],[]
- @@seg[:endnote_all]=[]
+ def cleanup(md,per)
+ #per=persist_init
+ reinitialise(per)
+ @@tracker=0
+ @per.seg_endnotes,@per.seg_subtoc={},{}
+ @per.seg_endnotes_array,@per.seg_subtoc_array=[],[]
+ per.endnote_all=[]
end
- def get_subtoc_endnotes(data) #get endnotes & sub-table of contents subtoc
+ def get_subtoc_endnotes(data,per) #get endnotes & sub-table of contents subtoc
+ @per=per
data.each do |dob|
dob.obj=dob.obj.gsub(/<a name=\"h\d.*?\">(.+?)<\/a>/mi,'\1')
if @md.flag_auto_endnotes
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& (dob.ln.to_s =~/^[0-4]/) \
- and not @@fn.to_s.empty?
- @@seg_endnotes[@@fn]=[]
- @@seg_endnotes[@@fn] << @@seg_endnotes_array
- @@seg_endnotes_array=[] if dob.ln==4
- @@fns_previous=@md.fns if dob.ln==4 and dob.name =~/^meta/
+ and not @per.fn.to_s.empty?
+ @per.seg_endnotes[@per.fn]=[]
+ @per.seg_endnotes[@per.fn] << @per.seg_endnotes_array
+ @per.seg_endnotes_array=[] if dob.ln==4
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==4 #% EXTRACTION OF SUB-TOCs & SEGMENT NAME, after EXTRACTION OF ENDNOTES & SUB-TOCs
- @@seg_subtoc[@@fn]=@@seg_subtoc_array
- @@seg_subtoc_array=[]
+ @per.seg_subtoc[@per.fn]=@per.seg_subtoc_array
+ @per.seg_subtoc_array=[]
if dob.name \
and dob.obj
- @@fn=dob.name
+ @per.fn=dob.name
else
if dob.name =~/\S+/
- @@fn=dob.name
- else @@fn=''
+ @per.fn=dob.name
+ else @per.fn=''
end
end
end
@@ -669,7 +664,7 @@ module SiSU_HTML_Seg
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
subtoc=format_seg.subtoc_lev7 #keep and make available, this is the subtoc
end
- @@seg_subtoc_array << subtoc
+ @per.seg_subtoc_array << subtoc
end
if @md.flag_auto_endnotes
if (dob.obj =~/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})[\d*+]+\s*<a href="##{Mx[:note_ref]}[\d*+]+"/) \
@@ -679,10 +674,12 @@ module SiSU_HTML_Seg
endnote_array << dob.obj.scan(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/m)
end
if dob.obj=~/#{Mx[:en_b_o]}[*]\d+\s.+?#{Mx[:en_b_c]}/m
- endnote_array << dob.obj.scan(/#{Mx[:en_b_o]}[*]\d+\s.+?#{Mx[:en_b_c]}/m)
+ endnote_array \
+ << dob.obj.scan(/#{Mx[:en_b_o]}[*]\d+\s.+?#{Mx[:en_b_c]}/m)
end
if dob.obj=~/#{Mx[:en_b_o]}[+]\d+\s.+?#{Mx[:en_b_c]}/m
- endnote_array << dob.obj.scan(/#{Mx[:en_b_o]}[+]\d+\s.+?#{Mx[:en_b_c]}/m)
+ endnote_array \
+ << dob.obj.scan(/#{Mx[:en_b_o]}[+]\d+\s.+?#{Mx[:en_b_c]}/m)
end
endnote_array=endnote_array.flatten.compact #watch, check compacting
endnote_array.each do |note|
@@ -697,7 +694,7 @@ module SiSU_HTML_Seg
format_seg.endnote_body_indent
else format_seg.endnote_body
end
- @@seg_endnotes_array << note_match
+ @per.seg_endnotes_array << note_match
end
try.join('<br>')
#% creation of separate end segment/page of all endnotes referenced back to reference segment
@@ -706,8 +703,8 @@ module SiSU_HTML_Seg
endnote_part_b=note_match_seg[m,2]
txt_obj={ endnote_part_a: endnote_part_a, endnote_part_b: endnote_part_b }
format_seg=SiSU_HTML_Format::FormatSeg.new(@md,txt_obj)
- note_match_all_seg=format_seg.endnote_seg_body(@@fn) #BUG WATCH 200408
- @@seg[:endnote_all] << note_match_all_seg
+ note_match_all_seg=format_seg.endnote_seg_body(@per.fn) #BUG WATCH 200408
+ @per.endnote_all << note_match_all_seg
end
dob.obj=dob.obj.gsub(/(?:#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]})\s*/m,' ')
end
diff --git a/lib/sisu/develop/html_shared.rb b/lib/sisu/develop/html_shared.rb
new file mode 100644
index 00000000..5d716368
--- /dev/null
+++ b/lib/sisu/develop/html_shared.rb
@@ -0,0 +1,62 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_shared.rb;hb=HEAD>
+
+=end
+module SiSU_HTML_Shared
+ require_relative 'html_table' # html_table.rb
+ class TableHTML < SiSU_HTML_Table::TableHTML
+ end
+end
+__END__
diff --git a/lib/sisu/develop/html_table.rb b/lib/sisu/develop/html_table.rb
new file mode 100644
index 00000000..7cc005c8
--- /dev/null
+++ b/lib/sisu/develop/html_table.rb
@@ -0,0 +1,64 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts, table
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_table.rb;hb=HEAD>
+
+=end
+module SiSU_HTML_Table
+ require_relative 'xhtml_table' # xhtml_table.rb
+ require_relative 'html_parts' # html_parts.rb
+ class TableHTML < SiSU_XHTML_Table::TableXHTML
+ include SiSU_Parts_HTML
+ end
+end
+__END__
diff --git a/lib/sisu/v5/html_tune.rb b/lib/sisu/develop/html_tune.rb
index e241dcd3..70c7e0ee 100644
--- a/lib/sisu/v5/html_tune.rb
+++ b/lib/sisu/develop/html_tune.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** html generation, html pre-processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_tune.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: html generation, html pre-processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_tune.rb;hb=HEAD>
=end
require_relative 'dp' # dp.rb
@@ -154,7 +151,6 @@ module SiSU_HTML_Tune
end
def songsheet_array(data)
data_tuned=[]
- #@tuned_file=[]
data.each do |dob|
dob=amp_angle_brackets(dob)
dob=endnotes_html(dob)
@@ -165,9 +161,8 @@ module SiSU_HTML_Tune
data_tuned
end
def urls(data)
- @words=[]
- data.each do |word|
- @words << if word=~/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)/
+ @words=data.each.map do |word|
+ if word=~/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)/
http_=true
if word =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}#{Mx[:url_o]}\S+?#{Mx[:url_c]}/
m,u=/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/.match(word).captures
@@ -211,9 +206,7 @@ module SiSU_HTML_Tune
word
else word
end
- word
- end
- @words=@words.join(' ')
+ end.join(' ')
end
def url_markup(dob)
unless dob.is==:code
@@ -296,10 +289,9 @@ module SiSU_HTML_Tune
end
def output
data=@data
- @tuned_file=[]
- data.each do |dob|
+ @tuned_file=data.each.map do |dob|
dob.obj=dob.obj.strip.chomp
- @tuned_file << dob
+ dob
end
@tuned_file << "\n<EOF>" if (@md.fns =~/\.sst0/) #remove
@tuned_file
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/develop/hub.rb
index a4751e40..1ed7a8e7 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/develop/hub.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub.rb;hb=HEAD>
=end
module SiSU
@@ -76,9 +72,9 @@ module SiSU
error('uri NOT FOUND (LoadError)')
end
class HubMaster
- def initialize(argv,call_path)
+ def initialize(argv,sisu_runtime)
begin
- opt=SiSU_Commandline::Options.new(argv,call_path)
+ opt=SiSU_Commandline::Options.new(argv,sisu_runtime)
SiSU::Processing.new(opt).actions_without_files
SiSU::Processing.new(opt).actions_on_files
SiSU::Processing.new(opt).actions_without_files_post
@@ -137,6 +133,7 @@ module SiSU
actions.outputs.each_file.xml?
actions.outputs.each_file.pdf?
actions.outputs.each_file.man_or_info?
+ actions.outputs.each_file.po4a_make?
actions.outputs.each_file.sqlite_discrete?
actions.outputs.each_file.manifest?
end
@@ -185,6 +182,9 @@ module SiSU
if defined? actions.outputs.loop_files.run_termsheet?
actions.outputs.loop_files.run_termsheet?
end
+ if defined? actions.outputs.loop_files.po4a_setup?
+ actions.outputs.loop_files.po4a_setup?
+ end
if defined? actions.outputs.loop_files.sql?
actions.outputs.loop_files.sql?
end
@@ -202,7 +202,7 @@ module SiSU
def actions_without_files
actions=SiSU_Hub_Actions::HubActions.new(@opt)
actions.report.version_info?
- actions.report.version_dir?
+ actions.report.version_info_extra?
actions.prepare.site?
actions.prepare.sql?
end
diff --git a/lib/sisu/v5/hub_actions.rb b/lib/sisu/develop/hub_actions.rb
index 7781ef63..bc1ef948 100644
--- a/lib/sisu/v5/hub_actions.rb
+++ b/lib/sisu/develop/hub_actions.rb
@@ -1,65 +1,63 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub, perform selected actions
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_actions.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_actions.rb;hb=HEAD>
=end
module SiSU_Hub_Actions
class HubActions
+ require_relative 'utils_composite' # utils_composite.rb
+ include SiSU_Composite_Doc_Utils # composite doc, .ssm, extract all related insert files, array of filenames test
def initialize(opt)
@opt=opt
end
@@ -69,6 +67,17 @@ module SiSU_Hub_Actions
SiSU_Env::InfoAbout.new(@opt).sisu_version
end
end
+ def version_number_git?
+ if @opt.act[:version_info][:set]==:on \
+ || @opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ ' ' + SiSU_is.git_version_info?
+ ).grey
+ end
+ end
def version_dir?
if @opt.act[:version_info][:set]==:on \
|| @opt.act[:verbose][:set]==:on \
@@ -80,6 +89,25 @@ module SiSU_Hub_Actions
).grey
end
end
+ def version_info_extra?
+ if @opt.act[:version_info][:set]==:on \
+ || @opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on
+ if SiSU_is.git_version_info?
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ ' ' + File.dirname(__FILE__) + \
+ ' vcr: ' + SiSU_is.git_version_info?
+ ).grey
+ else
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ ' ' + File.dirname(__FILE__)
+ ).grey
+ end
+ end
+ end
self
end
def prepare
@@ -160,7 +188,7 @@ module SiSU_Hub_Actions
def abstract_objects?
if @opt.act[:ao][:set]==:on #% --ao --dal, -m
if @opt.f_pths.length > 0
- unless @opt.act[:po4a][:set]==:on # --po4a, -P
+ unless @opt.act[:po4a_shelf][:set]==:on # --po4a-shelf
if @opt.fno =~ /\.ssm$/
require_relative 'ao_composite' # ao_composite.rb #pre-processing
SiSU_Assemble::Composite.new(@opt).read
@@ -282,6 +310,20 @@ module SiSU_Hub_Actions
end
end
end
+ if @opt.act[:txt_orgmode][:set]==:on #% --orgmode
+ if @opt.f_pths.length > 0
+ require_relative 'txt_orgmode' # txt_orgmode.rb
+ SiSU_Txt_OrgMode::Source.new(@opt).read
+ else
+ msg='orgmode request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:yellow).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
end
def html?
if @opt.act[:html][:set]==:on #% --html, -h
@@ -536,15 +578,51 @@ module SiSU_Hub_Actions
end
end
end
+ def po4a_make?
+ if @opt.act[:po4a_sst_ao_sst][:set]==:on #% --po4a-ao
+ if @opt.f_pths.length > 0
+ require_relative 'src_po4a_sst_ao_sst'
+ SiSU_SStm_AO_SStm::Source.new(@opt).read_process_src_files # src_po4a_sst_ao_sst.rb
+ else
+ msg='sst request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
+ end
+ def elasticsearch?
+ if @opt.act[:elasticsearch][:set]==:on #% --elastic, -x
+ if @opt.f_pths.length > 0
+ require_relative 'json_elastic' # json_elastic.rb
+ SiSU_Elastic::Source.new(@opt).read
+ else
+ msg='easticsearch request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:yellow).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
+ end
def manifest?
if @opt.act[:manifest][:set]==:on #% --manifest, -y
if @opt.f_pths.length > 0
- require_relative 'html_manifest' # html_manifest.rb
- ((@opt.act[:sisupod][:set]==:on \
- || @opt.act[:share_source][:set]==:on) \
- && @opt.f_pths.length < 2 ) \
- ? nil
- : SiSU_Manifest::Source.new(@opt).read
+ begin
+ require_relative 'html_manifest' # html_manifest.rb
+ ((@opt.act[:sisupod][:set]==:on \
+ || @opt.act[:share_source][:set]==:on \
+ || @opt.act[:po4a_sstm][:set]==:on) \
+ && @opt.f_pths.length < 2 ) \
+ ? nil
+ : SiSU_Manifest::Source.new(@opt).read
+ rescue
+ end
else
msg='manifest request requires sisu markup files'
if (@opt.act[:verbose_plus][:set]==:on \
@@ -576,8 +654,9 @@ module SiSU_Hub_Actions
end
def loop_files
def share_source?
- if @opt.act[:share_source][:set]==:on \
- or @opt.act[:sisupod][:set]==:on \
+ if @opt.act[:sisupod][:set]==:on \
+ or @opt.act[:share_source][:set]==:on \
+ or @opt.act[:po4a_sstm][:set]==:on \
or @opt.act[:git][:set]==:on
begin
if @opt.f_pths.length > 0
@@ -595,26 +674,6 @@ module SiSU_Hub_Actions
else puts msg
end
end
- if @opt.act[:share_source][:set]==:on
- if @opt.f_pths.length > 0
- require_relative 'src_share' # src_share.rb
- begin
- ensure
- SiSU_Hub_Loops::OptionLoopFiles.new(@opt).
- loop_files_on_given_option_bundle do
- SiSU_Markup::Source.new(@opt).read
- end
- end
- else
- msg='share markup source request requires sisu markup files'
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
- mark(msg)
- else puts msg
- end
- end
- end
if @opt.act[:sisupod][:set]==:on #% --sisupod, -S
if @opt.f_pths.length > 0
require_relative 'src_sisupod_make' # src_sisupod_make.rb
@@ -660,7 +719,8 @@ module SiSU_Hub_Actions
end
end
if (@opt.act[:sisupod][:set]==:on \
- || @opt.act[:share_source][:set]==:on) \
+ || @opt.act[:share_source][:set]==:on \
+ || @opt.act[:po4a_sstm][:set]==:on) \
and @opt.act[:manifest][:set]==:on #% --manifest, -y
if @opt.f_pths.length > 0
require_relative 'html_manifest' # html_manifest.rb
@@ -695,18 +755,78 @@ module SiSU_Hub_Actions
end
end
end
- if @opt.act[:po4a][:set]==:on #% --po4a, -P
+ if @opt.act[:share_source][:set]==:on
+ if @opt.f_pths.length > 0
+ require_relative 'src_sisupod_sstm' # src_sisupod_sstm.rb
+ begin
+ ensure
+ SiSU_Hub_Loops::OptionLoopFiles.new(@opt).
+ loop_files_on_given_option_bundle do
+ SiSU_Markup::Source_Sisupod.new(@opt).read
+ end
+ end
+ else
+ msg='share markup source request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
+ if @opt.act[:po4a_sstm][:set]==:on #% --po4a-sst
+ if @opt.f_pths.length > 0
+ require_relative 'src_po4a_sstm'
+ begin
+ SiSU_Hub_Loops::OptionLoopFiles.new(@opt).
+ loop_files_on_given_option do
+ SiSU_Markup::Source_Po4a.new(@opt).read # src_po4a_sstm.rb
+ end
+ ensure
+ end
+ else
+ msg='sst request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
+ if @opt.act[:po4a_sst_ao_sst][:set]==:on #% --po4a-ao
+ if @opt.f_pths.length > 0
+ require_relative 'src_po4a_sst_ao_sst'
+ begin
+ SiSU_Hub_Loops::OptionLoopFiles.new(@opt).
+ loop_files_on_given_option do
+ SiSU_SStm_AO_SStm::Source.new(@opt).read_setup # src_po4a_sst_ao_sst.rb
+ end
+ ensure
+ end
+ else
+ msg='sst request requires sisu markup files'
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
+ mark(msg)
+ else puts msg
+ end
+ end
+ end
+ if @opt.act[:po4a_shelf][:set]==:on #% --po4a-shelf
if @opt.f_pths.length > 0
- require_relative 'po4a'
+ require_relative 'src_po4a_shelf'
begin
SiSU_Hub_Loops::OptionLoopFiles.new(@opt).
loop_files_on_given_option do
- SiSU_Po4a::Source.new(@opt).read # po4a.rb
+ SiSU_Po4a::Source.new(@opt).read # src_po4a_shelf.rb
end
ensure
end
else
- msg='po4a request requires sisu markup files'
+ msg='src_po4a_shelf request requires sisu markup files'
if (@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:cyan).
diff --git a/lib/sisu/v5/hub_loop_markup_files.rb b/lib/sisu/develop/hub_loop_markup_files.rb
index 165fdc93..6b27b8d3 100644
--- a/lib/sisu/v5/hub_loop_markup_files.rb
+++ b/lib/sisu/develop/hub_loop_markup_files.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_loop_markup_files.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, text structuring,
- processing, publishing, search
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_loop_markup_files.rb;hb=HEAD>
=end
module SiSU_Hub_Loops
@@ -140,6 +136,9 @@ module SiSU_Hub_Loops
files_translated_idx << x[1]
end
end
+ #files_translated_idx=number_of_files.select do |x|
+ # x[1] if x[1].length > 1
+ #end
if files_translated_idx.flatten.length > 1
SiSU_Screen::Ansi.new(
@opt.act[:color_state][:set],
diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/develop/hub_options.rb
index d267cb74..1c3f4e3d 100644
--- a/lib/sisu/v5/hub_options.rb
+++ b/lib/sisu/develop/hub_options.rb
@@ -1,61 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** hub, command line options parsing
- * Author: Ralph Amissah
+*** hub
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- Copyright (C) Ralph Amissah
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- 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.
+ 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.
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ 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>
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/hub_options.rb;hb=HEAD>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, command line options
- parsing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/hub_options.rb;hb=HEAD>
=end
module SiSU_Commandline
@@ -154,9 +152,9 @@ module SiSU_Commandline
end
end
class Options
- attr_accessor :selections,:opt_ch,:act,:dir_structure_by,:lingual,:f_pths,:files,:files_mod,:call_path,:base_path,:base_stub,:sub_location,:image_src_path,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what,:make_instructions,:make_instructions_pod
+ attr_accessor :selections,:opt_ch,:act,:dir_structure_by,:lingual,:f_pths,:files,:files_mod,:call_path,:base_path,:base_stub,:sub_location,:image_src_path,:paths,:lngs,:f_pth,:pth,:fno,:fns,:fnb,:fnc,:fng,:fncb,:lng,:lng_base,:what,:make_instructions,:make_instructions_pod,:sisu_run_path,:sisu_install_type
@@act=nil
- def initialize(a,call_path)
+ def initialize(a,sisu_runtime)
@opt_ch=@f_pth=@pth=@fno=@fns=@fnb=@fnc=@fng=@fncb=@what=@lng=@lng_base=@call_path=@base_path=@base_stub=@image_src_path=@sub_location=''
@f_pths,@files,@files_mod,@paths,@select_arr,@act=Array.new(5){[]}
@select_str=nil
@@ -164,7 +162,9 @@ module SiSU_Commandline
@lng_base=@env.language_default_set
@dir_structure_by=SiSU_Env::EnvCall.new.output_dir_structure.by?
@lingual=SiSU_Env::EnvCall.new.mono_multi_lingual?
- @call_path=call_path
+ @sisu_run_from=sisu_runtime[:runtime_path]
+ @sisu_install_type=sisu_runtime[:runtime_type]
+ @call_path=sisu_runtime[:call_path]
pth=SiSU_Utils::Path.new(call_path)
@base_path=pth.base_markup
@base_stub=pth.base_markup_stub
@@ -175,6 +175,33 @@ module SiSU_Commandline
@make_instructions_pod=nil
init
end
+ def sisu_called_from?
+ @call_path
+ end
+ def sisu_bin_filepath?
+ @sisu_run_from
+ end
+ def sisu_install_type?
+ @sisu_install_type
+ end
+ def sisu_lib_dir?
+ File.dirname(__FILE__)
+ end
+ def sisu_data_dir?
+ env=RbConfig::CONFIG
+ if sisu_install_type? ==:full_path_to_sisu_bin_in_sisu_dir_tree
+ sisu_bin_filepath?.gsub(/\/bin\/sisu\S*/,'/data/sisu')
+ #sisu_lib_dir?.gsub(/\/lib\/sisu\/(?:current|develop)\S*/,'/data/sisu')
+ elsif sisu_install_type? ==:gem_install
+ #sisu_run_from?.gsub(/\/bin\/.+/,'/data/sisu')
+ env['datadir']
+ elsif sisu_install_type? ==:system_install
+ #SiSU_Info_Env::InfoEnv.new.path.share
+ env['datadir']
+ else
+ env['datadir']
+ end
+ end
def find_all(find_flag,opt)
if find_flag
x=Dir.glob('*.ss[tm]')
@@ -251,17 +278,15 @@ module SiSU_Commandline
end
end
def init_selected_lang_dirs(a)
- @z=[]
- a.each do |y|
+ @z=a.each.map do |y|
if y =~/^#{lng_base}\/(\S+?\.ss[tm])$/
@fn=$1
- @z << y
+ y
elsif y =~/^#{@lang_regx}\/?$/
- @z << "#{y}/#{@fn}"
- else @z << y
+ "#{y}/#{@fn}"
+ else y
end
end
- @z
end
def init
a=@a
@@ -616,7 +641,7 @@ module SiSU_Commandline
if ch =~/N/ then select_arr << '--digests'
ch=ch.gsub(/[N]/,'')
end
- if ch =~/P/ then select_arr << '--po4a'
+ if ch =~/P/ then select_arr << '--po4a-sst'
ch=ch.gsub(/[P]/,'')
end
if ch =~/d/ then select_arr << '--sqlite'
@@ -1152,6 +1177,10 @@ module SiSU_Commandline
=~/"--rst"|"--rest"|"--restructuredtext"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
+ act[:txt_orgmode]=(select_arr.inspect \
+ =~/"--org"|"--orgmode"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
act[:manpage]=(select_arr.inspect \
=~/"--manpage"|"--man"/) \
? { bool: true, set: :on }
@@ -1299,10 +1328,56 @@ module SiSU_Commandline
=~/"--harvest"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:po4a]=(select_arr.inspect \
- =~/"--po4a"|"--pot?"/) \
+ act[:po4a_sstm]=(select_arr.inspect \
+ =~/"--po4a-ss[tm]"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
+ act[:po4a_sst_ao_sst]=(select_arr.inspect \
+ =~/"--po4a-ao(?:-ss[tm])?"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
+ act[:po4a_shelf]=(select_arr.inspect \
+ =~/"--po4a-shelf"|"--pot?-shelf"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
+ if act[:po4a_shelf][:set]==:on \
+ or act[:po4a_sst_ao_sst][:set]==:on \
+ or act[:po4a_sstm][:set]==:on
+ act[:po4a_lang]=if select_arr.inspect \
+ =~/"--(?:trans|init)-([a-z]{2}):((?:(?:[a-z]{2}\b),?)+)/
+ lng_src,lng_trn=$1,$2.split(',')
+ { bool: true, set: :on, src: lng_src, trn: lng_trn }
+ elsif select_arr.inspect \
+ =~/"--trans"/
+ { bool: true, set: :on }
+ { bool: true, set: :on, src: 'en', trn: [] }
+ else
+ { bool: false, set: :na }
+ end
+ act[:po4a_lang_trans]=if select_arr.inspect \
+ =~/"--trans-([a-z]{2}):((?:(?:[a-z]{2}\b),?)+)/
+ lng_src,lng_trn=$1,$2.split(',')
+ { bool: true, set: :on, src: lng_src, trn: lng_trn }
+ elsif select_arr.inspect \
+ =~/"--trans"/
+ { bool: true, set: :on }
+ { bool: true, set: :on, src: 'en', trn: [] }
+ else
+ { bool: false, set: :na }
+ end
+ act[:po4a_lang_init]=if select_arr.inspect \
+ =~/"--init-([a-z]{2}):((?:(?:[a-z]{2}\b),?)+)/
+ lng_src,lng_trn=$1,$2.split(',')
+ { bool: true, set: :on, src: lng_src, trn: lng_trn }
+ else
+ { bool: false, set: :na }
+ end
+ else
+ act[:po4a_lang_trans]= \
+ { bool: false, set: :na }
+ act[:po4a_lang_init]= \
+ { bool: false, set: :na }
+ end
act[:git]=(select_arr.inspect \
=~/"--git"/) \
? { bool: true, set: :on }
@@ -1409,6 +1484,7 @@ module SiSU_Commandline
|| act[:txt_asciidoc][:set]==:on \
|| act[:txt_markdown][:set]==:on \
|| act[:txt_rst][:set]==:on \
+ || act[:txt_orgmode][:set]==:on \
|| act[:xhtml][:set]==:on \
|| act[:epub][:set]==:on \
|| act[:html][:set]==:on \
@@ -1422,8 +1498,9 @@ module SiSU_Commandline
|| act[:pdf_p][:set]==:on \
|| act[:pdf_l][:set]==:on \
|| act[:qrcode][:set]==:on \
- || act[:share_source][:set]==:on \
|| act[:sisupod][:set]==:on \
+ || act[:share_source][:set]==:on \
+ || act[:po4a_sstm][:set]==:on \
|| act[:concordance][:set]==:on \
|| act[:sqlite_discrete][:set]==:on \
|| act[:sqlite_import][:set]==:on \
@@ -1457,6 +1534,7 @@ module SiSU_Commandline
|| act[:txt_asciidoc][:set]==:on \
|| act[:txt_markdown][:set]==:on \
|| act[:txt_rst][:set]==:on \
+ || act[:txt_orgmode][:set]==:on \
|| act[:xhtml][:set]==:on \
|| act[:epub][:set]==:on \
|| act[:html][:set]==:on \
@@ -1470,8 +1548,9 @@ module SiSU_Commandline
|| act[:pdf_p][:set]==:on \
|| act[:pdf_l][:set]==:on \
|| act[:qrcode][:set]==:on \
- || act[:share_source][:set]==:on \
|| act[:sisupod][:set]==:on \
+ || act[:share_source][:set]==:on \
+ || act[:po4a_sstm][:set]==:on \
|| act[:concordance][:set]==:on \
|| act[:xml_dom][:set]==:on \
|| act[:xml_sax][:set]==:on \
diff --git a/lib/sisu/v6/i18n.rb b/lib/sisu/develop/i18n.rb
index c80d0e9a..5e30b760 100644
--- a/lib/sisu/v6/i18n.rb
+++ b/lib/sisu/develop/i18n.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** internationalisation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/i18n.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: internationalisation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/i18n.rb;hb=HEAD>
=end
module SiSU_i18n
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/develop/manpage.rb
index 9ff83fd5..a39e3a8a 100644
--- a/lib/sisu/v6/manpage.rb
+++ b/lib/sisu/develop/manpage.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** manpage text generation, stripped manpage output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/manpage.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: manpage text generation, stripped manpage output (unix,
- linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/manpage.rb;hb=HEAD>
=end
module SiSU_Manpage
@@ -67,10 +63,13 @@ module SiSU_Manpage
include SiSU_ManpageFormat
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
+ require_relative 'txt_output' # txt_output.rb
require_relative 'txt_shared' # txt_shared.rb
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
+ include SiSU_Txt_Read
def initialize(opt)
@opt=opt
if @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -81,37 +80,14 @@ module SiSU_Manpage
end
def read
begin
- @md=SiSU_Param::Parameters.new(@opt).get
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{@env.program.text_editor} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- && @opt.act[:quiet][:set]==:on \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Manpage',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Manpage',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}"
- ).flow
- end
- @ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- SiSU_Manpage::Source::Scroll.new(@md,@ao_array).songsheet
+ md=SiSU_Param::Parameters.new(@opt).get
+ specific={
+ description: 'Manpage',
+ output_path: md.file.output_path.manpage.dir,
+ output_file: md.file.base_filename.manpage,
+ }
+ read_generic(@opt,specific)
+ SiSU_Manpage::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -125,8 +101,8 @@ module SiSU_Manpage
include SiSU_Parts_Generic
include SiSU_TextUtils
@@endnotes={ para: [], end: [] }
- def initialize(md,data)
- @md,@data=md,data
+ def initialize(md,data,wrap_width)
+ @md,@data,@wrap_width=md,data,wrap_width
@tab="\t"
@@notes=:end
@manpage={ body: [], open: [], close: [], head: [], metadata: [], tail: [], endnotes: [] }
@@ -157,8 +133,8 @@ module SiSU_Manpage
notes=@n.flatten
notes.each do |e|
util=(e.to_s =~/^\[[\d*+]+\]:/) \
- ? (SiSU_TextUtils::Wrap.new(e.to_s,78,4,1))
- : (SiSU_TextUtils::Wrap.new(e.to_s,78,0,1))
+ ? (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,4,1))
+ : (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,0,1))
wrap=util.line_wrap
wrap=if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m
wrap.gsub(/(^|&nbsp;|#{Mx[:nbsp]}|\s|\*)\\\*/,'\1\\\\\*'). #man page requires
@@ -223,19 +199,19 @@ WOK
if dob.indent =~/[1-9]/ \
and dob.indent == dob.hang
util=if dob.bullet_
- SiSU_TextUtils::Wrap.new("* #{paragraph}",78,dob.indent.to_i*2)
- else SiSU_TextUtils::Wrap.new(paragraph,78,dob.indent.to_i*2)
+ SiSU_TextUtils::Wrap.new("* #{paragraph}",@wrap_width,dob.indent.to_i*2)
+ else SiSU_TextUtils::Wrap.new(paragraph,@wrap_width,dob.indent.to_i*2)
end
elsif dob.hang =~/[0-9]/ \
and dob.indent != dob.hang # NOT yet implemented
- util=SiSU_TextUtils::Wrap.new(paragraph,78,dob.indent.to_i*2)
+ util=SiSU_TextUtils::Wrap.new(paragraph,@wrap_width,dob.indent.to_i*2)
else
util=if dob.bullet_
- SiSU_TextUtils::Wrap.new("* #{paragraph}",78,0)
- else SiSU_TextUtils::Wrap.new(paragraph,78,0)
+ SiSU_TextUtils::Wrap.new("* #{paragraph}",@wrap_width,0)
+ else SiSU_TextUtils::Wrap.new(paragraph,@wrap_width,0)
end
end
- else util=SiSU_TextUtils::Wrap.new(paragraph,78,0)
+ else util=SiSU_TextUtils::Wrap.new(paragraph,@wrap_width,0)
end
w=util.line_wrap
w=w.gsub(/^(\\\.)/,' \1')
@@ -243,7 +219,7 @@ WOK
end
if lv
times=wrapped.length
- times=78 if times > 78
+ times=@wrap_width if times > @wrap_width
@manpage[:body] << case lv
when 0 then '.SH ' << wrapped.upcase << break_line << break_line
when 1..3 then '.SH ' << wrapped.upcase << break_line << break_line
@@ -384,49 +360,18 @@ WOK
else SiSU_Env::InfoDate.new.year #date missing decide on action
end
proj=SiSU_Env::InfoVersion.instance.get_version
- manpage[:open] = %{.TH "#{@md.fnb}" "#{@md.make.manpage['section']}" "#{date}" "#{proj[:version]}" "#{@md.title.main}"#{@md.make.manpage['name']}#{@md.make.manpage['synopsis']}}
+ manpage[:open] = %{.TH "#{@md.fnb}" "#{@md.make.manpage['section']}" "#{date}" "#{proj.version}" "#{@md.title.main}"#{@md.make.manpage['name']}#{@md.make.manpage['synopsis']}}
content << manpage[:open]
content << manpage[:head]
content << manpage[:body]
content << @@endnotes[:end] if @@notes==:end
content << manpage[:metadata]
content << manpage[:tail]
- Output.new(@md,content).manpage
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.manpage
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(md,content)
- @md,@content=md,content
- end
- def manpage #%manpage output
- SiSU_Env::FileOp.new(@md).mkdir
- filename_manpage=SiSU_Env::FileOp.new(@md).write_file.manpage
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- filename_manpage.puts line #unix manpage
- end
- end
- end
- else filename_manpage.puts para #unix manpage # /^([*=-]|\.){5}/
- end
- end
- filename_manpage.close
- end
- end
end
end
__END__
diff --git a/lib/sisu/develop/manpage_format.rb b/lib/sisu/develop/manpage_format.rb
new file mode 100644
index 00000000..4885fb75
--- /dev/null
+++ b/lib/sisu/develop/manpage_format.rb
@@ -0,0 +1,85 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** manpage formatting template
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/manpage_format.rb;hb=HEAD>
+
+=end
+module SiSU_ManpageFormat
+ require_relative 'dp' # dp.rb
+ include SiSU_Param
+ class ParagraphNumber
+ def initialize(paranum)
+ @paranum=/(\d+)/m.match(paranum)[1]
+ end
+ def display
+ @paranum.gsub(/(\d+)/,'<font size="1" color="#777777">&nbsp;&nbsp;\1</font>')
+ end
+ def name
+ @paranum.gsub(/(\d+)/,'<a name="\1"></a>')
+ end
+ def goto
+ @paranum.gsub(/(\d+)/,'<a href="#\1">')
+ end
+ end
+ class FormatTextObject
+ def initialize(md,dob)
+ @md,@dob=md,dob
+ rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
+ @dob.obj.gsub!(rgx,'\1') if @dob.obj =~rgx
+ end
+ def scr_endnote_body
+ "<endnote>#{@dob.obj}</endnote> "
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/object_munge.rb b/lib/sisu/develop/object_munge.rb
new file mode 100644
index 00000000..0c2b5137
--- /dev/null
+++ b/lib/sisu/develop/object_munge.rb
@@ -0,0 +1,307 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** object munge
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
+
+=end
+module SiSU_Object_Munge
+ def i_src_o_strip_markup(txtobj)
+ txtobj=txtobj.
+ gsub(/#{Mx[:srcrgx_bold_o]}(.+?)#{Mx[:srcrgx_bold_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_italics_o]}(.+?)#{Mx[:srcrgx_italics_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_underscore_o]}(.+?)#{Mx[:srcrgx_underscore_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_cite_o]}(.+?)#{Mx[:srcrgx_cite_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_insert_o]}(.+?)#{Mx[:srcrgx_insert_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_strike_o]}(.+?)#{Mx[:srcrgx_strike_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_superscript_o]}(\d+)#{Mx[:srcrgx_superscript_c]}/m,'[\1]').
+ gsub(/#{Mx[:srcrgx_superscript_o]}(.+?)#{Mx[:srcrgx_superscript_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_subscript_o]}(.+?)#{Mx[:srcrgx_subscript_c]}/m,'\1').
+ gsub(/#{Mx[:srcrgx_hilite_o]}(.+?)#{Mx[:srcrgx_hilite_c]}/m,'\1').
+ gsub(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/i,'~').
+ gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/m,''). # endnote removed
+ gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/m,''). # endnote removed
+ gsub(/(?:#{Mx[:nbsp]})+/,' ').
+ gsub(/(?:#{Mx[:br_nl]})+/,"\n").
+ gsub(/(?:#{Mx[:br_paragraph]})+/,"\n").
+ gsub(/(?:#{Mx[:br_line]})+/,"\n").
+ gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
+ gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
+ gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
+ gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
+ gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
+ gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
+ gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
+ gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
+ gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
+ gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
+ gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
+ gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
+ gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©').
+ gsub(/[ ][ ]s+/,' ').
+ strip
+if txtobj =~/Reading this/
+ puts txtobj
+ if txtobj =~ /#{Mx[:srcrgx_italics_o]}(.+?)#{Mx[:srcrgx_italics_c]}/
+ puts __LINE__
+ puts Mx[:srcrgx_italics_o]
+ puts txtobj
+ end
+end
+; txtobj
+ end
+ def i_ao_o_strip_markup(txtobj)
+ txtobj=txtobj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1').
+ gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1').
+ gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1').
+ gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'\1').
+ gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'\1').
+ gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'\1').
+ gsub(/#{Mx[:fa_superscript_o]}(\d+)#{Mx[:fa_superscript_c]}/,'[\1]').
+ gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'\1').
+ gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'\1').
+ gsub(/#{Mx[:fa_hilite_o]}(.+?)#{Mx[:fa_hilite_c]}/,'\1').
+ gsub(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/i,'~').
+ gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,''). # endnote removed
+ gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,''). # endnote removed
+ gsub(/(?:#{Mx[:nbsp]})+/,' ').
+ gsub(/(?:#{Mx[:br_nl]})+/,"\n").
+ gsub(/(?:#{Mx[:br_paragraph]})+/,"\n").
+ gsub(/(?:#{Mx[:br_line]})+/,"\n").
+ gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
+ gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
+ gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
+ gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
+ gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
+ gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
+ gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
+ gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
+ gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
+ gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
+ gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
+ gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
+ gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©').
+ gsub(/[ ][ ]s+/,' ').
+ strip
+ end
+ def i_ao_o_src_markup_restore(txtobj)
+ @txtobj=txtobj
+ def textface_marks
+ @txtobj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'*{\1}*').
+ gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'/{\1}/').
+ gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'_{\1}_').
+ gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'"{\1}"').
+ gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'+{\1}+').
+ gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'-{\1}-').
+ gsub(/#{Mx[:fa_superscript_o]}(\d+)#{Mx[:fa_superscript_c]}/,'^{[\1]}^').
+ gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'^{\1}^').
+ gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,',{\1},').
+ gsub(/#{Mx[:fa_hilite_o]}(.+?)#{Mx[:fa_hilite_c]}/,'\1').
+ gsub(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/i,'~').
+ gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'~{\1 \2}~').
+ gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,''). # endnote removed
+ gsub(/(?:#{Mx[:nbsp]})+/,' ').
+ gsub(/(?:#{Mx[:br_nl]})+/,"\n").
+ gsub(/(?:#{Mx[:br_paragraph]})+/,"\n").
+ gsub(/(?:#{Mx[:br_line]})+/,"\n").
+ gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
+ gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
+ gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
+ gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
+ gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
+ gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
+ gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
+ gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
+ gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
+ gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
+ gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
+ gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
+ gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©').
+ gsub(/[ ][ ]s+/,' ').
+ strip
+ end
+ def object_marks
+ @txtobj
+ end
+ self
+ end
+ def clean_text(txtobj,markup=:ao)
+ if txtobj.class==String
+ txtobj=if markup ==:ao
+ i_ao_o_strip_markup(txtobj)
+ elsif markup ==:src
+ i_src_o_strip_markup(txtobj)
+ else p __FILE__; p __LINE__
+ end
+ elsif txtobj.class.inspect=~/^SiSU_AO_DocumentStructure::/
+ txtobj.obj=i_ao_o_strip_markup(txtobj.obj)
+ else p 'error'
+ end
+ txtobj
+ end
+ def footnotes_inline(txtobj)
+ end
+ def footnotes_ref_and_note(txtobj)
+ end
+ def src_markup(txtobj)
+ txtobj
+ end
+ def extract_endnotes(doc_obj_txt,endnotes_) #% used for extraction of endnotes from paragraphs
+ if endnotes_ ==:separate
+ notes_a=doc_obj_txt.scan(/#{Mx[:en_a_o]}([\d]+\s+.+?)#{Mx[:en_a_c]}/)
+ ##notes_a=doc_obj_txt.scan(/#{Mx[:en_a_o]}([\d*+]+\s+.+?)#{Mx[:en_a_c]}/)
+ #notes_b=doc_obj_txt.scan(/#{Mx[:en_b_o]}([\d*+]+\s+.+?)#{Mx[:en_b_c]}/)
+ n=[]
+ notes_a.flatten.each do |note| #high cost to deal with <br> appropriately within plaintext, consider
+ note=note.dup.to_s
+ note=note.gsub(/^([\d]+)\s+/,'^~\1 ').
+ gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,
+ ' \\\\\\ ')
+ n << note
+ end
+ notes_a=n.flatten
+ doc_obj_txt=doc_obj_txt.
+ gsub(/#{Mx[:en_a_o]}([\d]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'~^') # endnote marker marked up
+ else
+ doc_obj_txt=doc_obj_txt.
+ gsub(/#{Mx[:en_b_o]}[\d]+\s+(.+?)#{Mx[:en_b_c]}/,
+ '~[ \1 ]~'). # inline endnote with marker marked up
+ gsub(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/,
+ '~{\1 \2 }~'). # inline endnote with marker marked up
+ gsub(/#{Mx[:en_b_o]}([*+]+)\s+(.+?)#{Mx[:en_b_c]}/,
+ '~[\1 \2 ]~') # inline endnote with marker marked up
+ end
+ [doc_obj_txt,notes_a]
+ end
+ def objects #def i_ao_o_src_markup_restore(txtobj)
+ def code_(dob)
+ if dob.is==:code
+ dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
+ gsub(/(^|[^}])_([<>])/m,'\1\2') # _<_<
+ end
+ dob
+ end
+ def block_(dob)
+ dob.obj=if dob.of==:block # watch
+ dob.obj.gsub(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/,"* ").
+ gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n")
+ else dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n\n")
+ end
+ dob
+ end
+ def textface_marks_po4a(dob,endnotes_=:inline)
+ notes=''
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
+ Mx[:src_bold_o] + '\1' + Mx[:src_bold_c]).
+ gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,
+ Mx[:src_italics_o] + '\1' + Mx[:src_italics_c]).
+ gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,
+ Mx[:src_underscore_o] + '\1' + Mx[:src_underscore_c]).
+ gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,
+ Mx[:src_subscript_o] + '\1' + Mx[:src_subscript_c]).
+ gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,
+ Mx[:src_superscript_o] + '\1' + Mx[:src_superscript_c]).
+ gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,
+ Mx[:src_insert_o] + '\1' + Mx[:src_insert_c]).
+ gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,
+ Mx[:src_cite_o] + '\1' + Mx[:src_cite_c]).
+ gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,
+ Mx[:src_strike_o] + '\1' + Mx[:src_strike_c]).
+ gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,
+ Mx[:src_monospace_o] + '\1' + Mx[:src_monospace_c])
+ unless dob.is==:code
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/,'\1').
+ gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,
+ '\1 [link: <\2>]').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}image/,
+ '\1 [link: local image]').
+ gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1')
+ dob.obj,notes=extract_endnotes(dob.obj,endnotes_)
+ dob.obj=dob.obj.
+ gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
+ gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
+ gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
+ gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
+ gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
+ gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
+ gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
+ gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
+ gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
+ gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
+ gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
+ gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
+ gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©')
+ end
+ dob=block_(dob)
+ dob=code_(dob)
+ dob.obj=dob.obj.gsub(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,''). # remove page breaks
+ gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
+ gsub(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,''). # remove name links
+ gsub(/&nbsp;|#{Mx[:nbsp]}/,' '). # decide on
+ gsub(/(?:^|[^_\\])#{Mx[:lnk_o]}(\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+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,
+ ' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
+ gsub(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,
+ '[image: "\1"]')
+ [dob,notes]
+ end
+ def object_marks
+ @txtobj
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v6/prog_text_translation.rb b/lib/sisu/develop/prog_text_translation.rb
index 222d8940..a13f75d3 100644
--- a/lib/sisu/v6/prog_text_translation.rb
+++ b/lib/sisu/develop/prog_text_translation.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** internationalisation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/prog_text_translation.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: internationalisation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/prog_text_translation.rb;hb=HEAD>
=end
module SiSU_Translate
diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/develop/qrcode.rb
index 483f4deb..4cdc5b2d 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/develop/qrcode.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/qrcode.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/qrcode.rb;hb=HEAD>
=end
module SiSU_QRcode
diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/develop/relaxng.rb
index 89066c13..194e2e3d 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/develop/relaxng.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** relaxng flow/logic
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/relaxng.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- ** Description: relaxng flow/logic
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/relaxng.rb;hb=HEAD>
=end
module SiSU_Relaxng
diff --git a/lib/sisu/v6/remote.rb b/lib/sisu/develop/remote.rb
index 9862c62a..56275227 100644
--- a/lib/sisu/v6/remote.rb
+++ b/lib/sisu/develop/remote.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** remote operations, get source from or copy output to remote server
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/remote.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: remote operations, get source from or copy output to remote server
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/remote.rb;hb=HEAD>
=end
module SiSU_Remote
diff --git a/lib/sisu/v6/rexml.rb b/lib/sisu/develop/rexml.rb
index db5019f4..977bf33c 100644
--- a/lib/sisu/v6/rexml.rb
+++ b/lib/sisu/develop/rexml.rb
@@ -1,67 +1,64 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** rexml testing of xml
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/rexml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: rexml testing of xml
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/rexml.rb;hb=HEAD>
=end
module SiSU_Rexml
# load XML file for REXML parsing
begin
require 'rexml/document' \
- if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir']
+ if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir']
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('rexml/document NOT FOUND (LoadError)')
@@ -73,7 +70,7 @@ module SiSU_Rexml
class Rexml
begin
require 'rexml/document' \
- if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir']
+ if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir']
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
error('rexml/document NOT FOUND (LoadError)')
diff --git a/lib/sisu/v6/se.rb b/lib/sisu/develop/se.rb
index 5afb5ee3..5525f46f 100644
--- a/lib/sisu/v6/se.rb
+++ b/lib/sisu/develop/se.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se.rb;hb=HEAD>
=end
@@cX=nil
diff --git a/lib/sisu/v5/se_cleanoutput.rb b/lib/sisu/develop/se_cleanoutput.rb
index 1ed9ee8e..99833ccb 100644
--- a/lib/sisu/v5/se_cleanoutput.rb
+++ b/lib/sisu/develop/se_cleanoutput.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_cleanoutput.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_cleanoutput.rb;hb=HEAD>
=end
module SiSU_Clean_Output
diff --git a/lib/sisu/develop/se_clear.rb b/lib/sisu/develop/se_clear.rb
new file mode 100644
index 00000000..f86a2477
--- /dev/null
+++ b/lib/sisu/develop/se_clear.rb
@@ -0,0 +1,105 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_clear.rb;hb=HEAD>
+
+=end
+module SiSU_Clear
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ require_relative 'se_info_env' # se_info_env.rb
+ begin
+ require 'singleton'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('singleton NOT FOUND (LoadError)')
+ end
+ class Clear < SiSU_Info_Env::InfoEnv # se_info_env.rb
+ #todo unify with FileOp
+ def initialize(cmd,fns,operation='')
+ @cmd=cmd
+ begin
+ super(fns)
+ @env=SiSU_Env::InfoEnv.new(fns)
+ SiSU_Env::InfoVersion.instance
+ if operation.class.inspect =~/SiSU_Param/
+ @md=operation
+ end
+ case operation #watch
+ when /pdf/ then @env_out=''
+ when /sql/
+ when /xml|plaintext|ascii/ then @env_out=@env.path.output + @fnb #check change of name to plaintext from ascii
+ else
+ if defined? @md.sfx_src \
+ and @md.sfx_src =~/ss[ftsumc]/
+ @env_out_root=@env.path.output
+ @env_out="#{@env.path.output}/#{@fnb}"
+ @@publisher='SiSU http://www.jus.uio.no/sisu'
+ @env_pdf="#{@env_out_root}/pdf"
+ end
+ end
+ rescue
+ SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ def param_instantiate
+ @cX||=SiSU_Screen::Ansi.new(@cmd)
+ @@date=SiSU_Env::InfoDate.new
+ @@publisher='SiSU scribe'
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/se_createsite.rb b/lib/sisu/develop/se_createsite.rb
index ce31b460..4981eda0 100644
--- a/lib/sisu/v6/se_createsite.rb
+++ b/lib/sisu/develop/se_createsite.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_createsite.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_createsite.rb;hb=HEAD>
=end
module SiSU_Create_Site
@@ -166,7 +163,7 @@ module SiSU_Create_Site
cp_images(src,dest) if FileTest.directory?(src)
end
def cp_base_images #fix images
- src=SiSU_is[:path_base_system_data] + '/image'
+ src=SiSU_is.path_base_system_data? + '/image'
dest_arr=[
"#{@env.path.webserv}/_sisu/image_sys",
"#{@env.path.webserv}/#{@env.path.base_markup_dir_stub}/_sisu/image_sys"
diff --git a/lib/sisu/v6/se_css.rb b/lib/sisu/develop/se_css.rb
index a83d13ca..5654d09d 100644
--- a/lib/sisu/v6/se_css.rb
+++ b/lib/sisu/develop/se_css.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_css.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_css.rb;hb=HEAD>
=end
module SiSU_CSS
diff --git a/lib/sisu/develop/se_date.rb b/lib/sisu/develop/se_date.rb
new file mode 100644
index 00000000..8c2ca8ea
--- /dev/null
+++ b/lib/sisu/develop/se_date.rb
@@ -0,0 +1,92 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_date.rb;hb=HEAD>
+
+=end
+module SiSU_Info_Date
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ class InfoDate
+ begin
+ require 'date'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('date NOT FOUND (LoadError)')
+ end
+ attr_accessor :dt,:t
+ def initialize
+ @dt,@t=Date.today.to_s,Time.now
+ end
+ def week
+ w=@t.strftime('%W')
+ "#{@t.year}w#{w}"
+ end
+ def month
+ "#{@t.year}#{@t.month}"
+ end
+ def year
+ @t.year
+ end
+ def weekonly
+ @t.strftime('%W')
+ end
+ def monthonly
+ @t.month
+ end
+ def year_static
+ YEAR
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/se_db.rb b/lib/sisu/develop/se_db.rb
index 373fcfab..39701ef6 100644
--- a/lib/sisu/v5/se_db.rb
+++ b/lib/sisu/develop/se_db.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_db.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_db.rb;hb=HEAD>
=end
module SiSU_Info_Db
diff --git a/lib/sisu/v6/se_envcall.rb b/lib/sisu/develop/se_envcall.rb
index 840092eb..b5a9500d 100644
--- a/lib/sisu/v6/se_envcall.rb
+++ b/lib/sisu/develop/se_envcall.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_envcall.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_envcall.rb;hb=HEAD>
=end
module SiSU_Env_Call
diff --git a/lib/sisu/v5/se_file_op.rb b/lib/sisu/develop/se_file_op.rb
index 826c01ab..342f75f1 100644
--- a/lib/sisu/v5/se_file_op.rb
+++ b/lib/sisu/develop/se_file_op.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_file_op.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_file_op.rb;hb=HEAD>
=end
module SiSU_Info_File
@@ -350,11 +347,17 @@ module SiSU_File_Op
fn=base_filename.rst
make_file(path,fn)
end
+ def orgmode
+ path=output_path.orgmode.dir
+ make_path(path)
+ fn=base_filename.orgmode
+ make_file(path,fn)
+ end
def html_scroll
pth=output_path.html.dir
make_path(pth)
p_fn=place_file.html_scroll.dir
- @@filename_html_scroll=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def html_seg_index
pth=((output_dir_structure.by_filename?) \
@@ -363,7 +366,7 @@ module SiSU_File_Op
: "#{output_path.html.dir}/#{@md.fnb}"
make_path(pth)
p_fn=place_file.html_seg_index.dir
- @@filename_html_index=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def html_segtoc
pth=((output_dir_structure.by_filename?) \
@@ -373,7 +376,7 @@ module SiSU_File_Op
: "#{output_path.html.dir}/#{@md.fnb}"
make_path(pth)
p_fn=place_file.html_segtoc.dir
- @@filename_html_index=File.new(p_fn,'w+')
+ File.new(p_fn,'w+')
end
def xhtml
path=output_path.xhtml.dir
@@ -459,18 +462,30 @@ module SiSU_File_Op
fn=base_filename.manifest_txt
make_file(path,fn)
end
+ def po4a_cfg
+ path=output_path.po4a.dir
+ make_path(path)
+ fn=base_filename.po4a_cfg
+ make_file(path,fn)
+ end
def pot
path=output_path.pot.dir
make_path(path)
fn=base_filename.pot
make_file(path,fn)
end
- def po
- path=output_path.po.dir
+ def po(lng=@md.opt.lng)
+ path=output_path.po(lng).dir
make_path(path)
fn=base_filename.po
make_file(path,fn)
end
+ def po4a_sst(lng=@md.opt.lng)
+ path=output_path.po4a_sst(lng).dir
+ make_path(path)
+ fn=base_filename.po4a_sst
+ make_file(path,fn)
+ end
self
end
def place_file
@@ -529,6 +544,17 @@ module SiSU_File_Op
end
self
end
+ def orgmode
+ def dir
+ output_path.orgmode.dir + '/' \
+ + base_filename.orgmode
+ end
+ def rel
+ output_path.orgmode.rel + '/' \
+ + base_filename.orgmode
+ end
+ self
+ end
def html_scroll
def dir
output_path.html_scroll.dir + '/' \
@@ -964,6 +990,24 @@ module SiSU_File_Op
end
i18n(fnh)
end
+ def orgmode(fh=nil)
+ fh=default_hash_build(fh,Sfx[:txt_orgmode])
+ fh[:lng]=lang_code?(fh[:lng])
+ fnh=if output_dir_structure.by_filename?
+ {
+ fn: 'plain',
+ ft: fh[:ft],
+ lng: fh[:lng],
+ }
+ else
+ {
+ fn: fh[:fn],
+ ft: fh[:ft],
+ lng: fh[:lng],
+ }
+ end
+ i18n(fnh)
+ end
def html_scroll(fh=nil)
fh=default_hash_build(fh,Sfx[:html])
fh[:lng]=lang_code?(fh[:lng])
@@ -1011,19 +1055,11 @@ module SiSU_File_Op
def html_seg(fh)
fh=default_hash_build(fh,Sfx[:html])
fh[:lng]=lang_code?(fh[:lng])
- fnh=if output_dir_structure.by_filename?
- {
- fn: 'scroll',
- ft: fh[:ft],
- lng: fh[:lng],
- }
- else
- {
- fn: fh[:fn],
- ft: fh[:ft],
- lng: fh[:lng],
- }
- end
+ fnh={
+ fn: fh[:fn],
+ ft: fh[:ft],
+ lng: fh[:lng],
+ }
i18n(fnh)
end
def html_book_index(fh=nil)
@@ -1422,6 +1458,9 @@ module SiSU_File_Op
def src
@md.fno
end
+ def po4a_cfg
+ 'po4a.cfg'
+ end
def po #check
(@fno.empty?) \
? (@md.fn[:po])
@@ -1432,6 +1471,9 @@ module SiSU_File_Op
? (@md.fn[:pot])
: (@fno + '.pot')
end
+ def po4a_sst #check
+ @fno
+ end
def sisupod
(@md.fns =~/\.ssm\.sst$/) \
? @md.fns.gsub(/(?:\~\S{2,3})?\.ssm\.sst$/,'.ssm.txz')
@@ -1723,17 +1765,33 @@ module SiSU_File_Op
end
self
end
- def po
+ def po4a
+ def dir
+ output_path.base.dir + '/' \
+ + Gt[:src] + '/' \
+ + @md.opt.fng + '/po4a'
+ end
+ def url
+ output_path.base.url + '/po4a/' \
+ + @md.fnb
+ end
+ def rcp
+ #p "#{output_path.base.dir}/po4a/#{@md.fnb}"
+ end
+ self
+ end
+ def po(lng=@md.opt.lng)
+ @lng=lng
def dir
output_path.base.dir + '/' \
+ Gt[:src] + '/' \
+ @md.opt.fng + '/po4a/po/' \
- + @md.opt.lng
+ + @lng
end
def url
output_path.base.url + '/po4a/' \
+ @md.fnb + '/po/' \
- + @md.opt.lng
+ + @lng
end
self
end
@@ -1777,6 +1835,21 @@ module SiSU_File_Op
end
self
end
+ def po4a_sst(lng=@md.opt.lng)
+ @lng=lng
+ def dir
+ output_path.base.dir + '/' \
+ + Gt[:src] + '/' \
+ + @md.opt.fng + '/po4a/' \
+ + @lng
+ end
+ def url
+ output_path.base.url + '/po4a/' \
+ + @md.fnb \
+ + @lng
+ end
+ self
+ end
def md_harvest
manifest
self
@@ -1890,6 +1963,28 @@ module SiSU_File_Op
end
self
end
+ def orgmode
+ def ft
+ 'orgmode' \
+ + DEVELOPER[:under_construction]
+ end
+ def dir
+ set_path(ft).dir.abc
+ end
+ def url
+ set_path(ft).url.abc
+ end
+ def rel
+ set_path(ft).rel.abc
+ end
+ def rcp
+ set_path(ft).rcp.abc
+ end
+ def rel_sm
+ set_path(ft).rel_sm.ab
+ end
+ self
+ end
def html_scroll
def ft
'html'
@@ -2579,11 +2674,11 @@ module SiSU_Create_File
end
def file_semantic
fn='./semantic.yaml'
- @@filename_semantic=File.new(fn,'w+')
+ File.new(fn,'w+')
end
def file_rss
fn='./semantic.xml'
- @@filename_rss=File.new(fn,'w+')
+ File.new(fn,'w+')
end
def epub
@pth=@env.processing_path.epub
diff --git a/lib/sisu/v6/se_filemap.rb b/lib/sisu/develop/se_filemap.rb
index 1af08ffd..10931b74 100644
--- a/lib/sisu/v6/se_filemap.rb
+++ b/lib/sisu/develop/se_filemap.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_filemap.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_filemap.rb;hb=HEAD>
=end
module SiSU_File_Map
@@ -99,6 +96,9 @@ module SiSU_File_Map
if @md.opt.act[:txt_rst][:set]==:on #% --rst, --rest
ft << @md.fn[:txt_rst]
end
+ if @md.opt.act[:txt_orgmode][:set]==:on #% --orgmode
+ ft << @md.fn[:txt_orgmode]
+ end
if @md.opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
ft << @md.fn[:xhtml]
end
@@ -167,6 +167,9 @@ module SiSU_File_Map
if @opt.act[:txt_rst][:set]==:on #% --rst, --rest
ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
end
+ if @opt.act[:txt_orgmode][:set]==:on #% --orgmode
+ ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
+ end
if @opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
end
diff --git a/lib/sisu/v6/se_get_init.rb b/lib/sisu/develop/se_get_init.rb
index 7452bb66..dd767d05 100644
--- a/lib/sisu/v6/se_get_init.rb
+++ b/lib/sisu/develop/se_get_init.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_get_init.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_get_init.rb;hb=HEAD>
=end
module SiSU_Get_Init
@@ -82,15 +79,39 @@ module SiSU_Get_Init
@@tx ||=SiSU_Parts_TeXpdf::TeX.new
end
def rc_path_options
+ v=SiSU_Env::InfoVersion.instance.get_version
[
- "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}",
- "#{$sisu_document_markup_directory_base_fixed_path}/.sisu",
- "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}",
- "#{$sisu_document_markup_directory_base_fixed_path}/_sisu",
- "#{@@home}/.sisu/#{SiSU_is[:version_dir]}",
- "#{@@home}/.sisu",
- "#{@@sisu_etc}/#{SiSU_is[:version_dir]}",
- "#{@@sisu_etc}",
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/.sisu/' \
+ + v.branch_name,
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/.sisu/' \
+ + v.branch_version,
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/.sisu',
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/_sisu/' \
+ + v.branch_name,
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/_sisu/' \
+ + v.branch_version,
+ $sisu_document_markup_directory_base_fixed_path \
+ + '/_sisu',
+ @@home \
+ + '/.sisu/' \
+ + v.branch_name,
+ @@home \
+ + '/.sisu/' \
+ + v.branch_version,
+ @@home \
+ + '/.sisu', \
+ @@sisu_etc \
+ + '/' \
+ + v.branch_name,
+ @@sisu_etc \
+ + '/' \
+ + v.branch_version,
+ @@sisu_etc,
]
end
def sisu_document_make
@@ -170,13 +191,17 @@ module SiSU_Get_Init
tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:'
if @markup_dir_changed_
@ad_path=[
- "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_name?}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml",
- "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_name?}/skin/yml",
+ "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml",
- "#{@@home}/.sisu/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{@@home}/.sisu/#{SiSU_is.branch_name?}/skin/yml",
+ "#{@@home}/.sisu/#{SiSU_is.branch_version?}/skin/yml",
"#{@@home}/.sisu/skin/yml",
- "#{@@sisu_etc}/#{SiSU_is[:version_dir]}/skin/yml",
+ "#{@@sisu_etc}/#{SiSU_is.branch_name?}/skin/yml",
+ "#{@@sisu_etc}/#{SiSU_is.branch_version?}/skin/yml",
"#{@@sisu_etc}/skin/yml",
]
@ad_path.each do |v|
diff --git a/lib/sisu/v5/se_hub_particulars.rb b/lib/sisu/develop/se_hub_particulars.rb
index 9b443305..e7e9decf 100644
--- a/lib/sisu/v5/se_hub_particulars.rb
+++ b/lib/sisu/develop/se_hub_particulars.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- particulars, composite information about document being processed
+** Description: documents, structuring, processing, publishing, search
+*** particulars, composite information about document being processed
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_hub_particulars.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_hub_particulars.rb;hb=HEAD>
=end
module SiSU_Particulars
diff --git a/lib/sisu/v5/se_info_env.rb b/lib/sisu/develop/se_info_env.rb
index 495b7a04..7cd4041b 100644
--- a/lib/sisu/v5/se_info_env.rb
+++ b/lib/sisu/develop/se_info_env.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_env.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_env.rb;hb=HEAD>
=end
@@current_document=Dir.pwd #nil #''
@@ -571,6 +568,12 @@ module SiSU_Info_Env
? @rc['rst']['ocn']
: false
end
+ def orgmode_ocn?
+ ((defined? @rc['orgmode']['ocn']) \
+ && @rc['orgmode']['ocn']==true) \
+ ? @rc['orgmode']['ocn']
+ : false
+ end
def widget #needs (md) #move
@rc=SiSU_Env::GetInit.new.sisu_yaml.rc
@ad=SiSU_Env::GetInit.new.ads
@@ -1063,7 +1066,7 @@ WOK
@sys.home
end
def sisurc_path
- GetInit.new.sisu_yaml.rc_path
+ SiSU_Get_Init::GetInit.new.sisu_yaml.rc_path
end
def pwd
@sys.pwd
@@ -1084,7 +1087,7 @@ WOK
@stub_pod
end
def etc
- defaults[:sisu_etc] #live/dynamic
+ defaults[:sisu_etc] #live/dynamic
end
def arch
@sys.dir_arch
@@ -1128,7 +1131,7 @@ WOK
def webserv_path #testing, check need, remove
webserv
end
- def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed)
+ def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed)
man_path=if @@man_path.nil?
man_path=if defined? @rc['webserv']['path'] \
and @rc['webserv']['path'] =~/\S\S+/
@@ -1166,17 +1169,17 @@ WOK
def webserv_map_pwd #dir
"#{path.webserv}/#{base_markup_dir_stub}"
end
- def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+ def webserv_dir #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
defaults[:webserv_dir]
end
- def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+ def webserv_image #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
images=if defined? @rc['webserv']['images']
@rc['webserv']['images']
else defaults[:images]
end
"#{path.webserv}/#{images}"
end
- def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
+ def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
r=Px[:lng_lst_rgx]
u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
base_stub=@sys.pwd.gsub(u,'\1')
@@ -1194,7 +1197,7 @@ WOK
def feed_home
"#{public_output}/#{@rc['webserv']['feed_home']}"
end
- def scripts #used previously only to include tla version info
+ def scripts #used previously only to include tla version info
if defined? @rc['project']['path']
"#{home}/#{@rc['project']['path']}"
end
@@ -1213,19 +1216,28 @@ WOK
def output_tell
url.webserv_map_pwd
end
- def image_source #image repository source directory
+ def image_source_sisu_includes(md=nil)
+ if md \
+ and (md.opt.sisu_install_type? == \
+ :full_path_to_sisu_bin_in_sisu_dir_tree) \
+ and FileTest.directory?(
+ "#{md.opt.sisu_data_dir?}/image"
+ )==true
+ "#{md.opt.sisu_data_dir?}/image"
+ else
+ "#{share}/image"
+ end
+ end
+ def image_source(md=nil) #image repository source directory
if defined? @rc['image']['path'] \
and defined? @rc['image']['public']
pth="#{@rc['image']['path']}"
"#{pth}/#{@rc['image']['public']}"
else
- "#{share}/image"
+ image_source_sisu_includes(md)
end
end
- def image_source_sisu_includes
- "#{share}/image"
- end
- def image_source_include #image repository source directory
+ def image_source_include(md=nil) #image repository source directory
if defined? @rc['image']['path'] \
and defined? @rc['image']['public'] \
and FileTest.directory?(
@@ -1239,7 +1251,7 @@ WOK
)==true
"#{SiSU_Utils::Path.new.base_markup}/#{defaults[:image_stub]}"
else
- "#{share}/image"
+ image_source_sisu_includes(md)
end
end
def image_external
@@ -1251,7 +1263,8 @@ WOK
end
end
def image_source_include_remote
- if FileTest.directory?(image_external); image_external
+ if FileTest.directory?(image_external)
+ image_external
end
end
self
@@ -1286,7 +1299,7 @@ WOK
end
v=SiSU_Env::InfoVersion.instance.get_version
v_dev=(DEVELOPER[:maintenance]==:true) \
- ? "_#{v[:version]}"
+ ? "_#{v.version}"
: ''
path=if proposed_path_base \
and FileTest.directory?(proposed_path_base) \
@@ -1476,7 +1489,9 @@ WOK
def epub_cp_images(md)
pth="#{processing_path.epub}/#{Ep[:d_oebps]}/image"
FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
- src="#{path.share}/image"
+ src=(md.opt.sisu_install_type? == :full_path_to_sisu_bin_in_sisu_dir_tree) \
+ ? "#{md.opt.sisu_data_dir?}/image"
+ : "#{md.opt.sisu_data_dir?}/sisu/image"
images=%W[bullet_09.png arrow_next_red.png arrow_prev_red.png arrow_up_red.png]
images.each do |i| #move to avoid repeated tests
if FileTest.file?("#{src}/#{i}")
@@ -2103,13 +2118,6 @@ WOK
? @rc['default']['papersize'].downcase
: (defaults[:papersize].downcase)
end
- def odf_structure
- FileUtils::rm_rf(processing_path.processing_path.odf_pth)
- FileUtils::mkdir_p(processing_path.processing_path.odf_pth)
- system(
- "unzip -q #{path.share}/#{SiSU_is[:version_dir]}/odf/odt.zip -d #{processing_path.odf_pth}"
- )
- end
def sisupod_gen(fns_pod)
sisupod_gen_v3(fns_pod)
end
diff --git a/lib/sisu/develop/se_info_port.rb b/lib/sisu/develop/se_info_port.rb
new file mode 100644
index 00000000..f878142b
--- /dev/null
+++ b/lib/sisu/develop/se_info_port.rb
@@ -0,0 +1,70 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_port.rb;hb=HEAD>
+
+=end
+module SiSU_Info_Port
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ require_relative 'se_info_env' # se_info_env.rb
+ class InfoPort < SiSU_Info_Env::InfoEnv # se_info_env.rb
+ def initialize
+ @env=SiSU_Env::InfoEnv.new
+ end
+ def webrick
+ @env.port.webrick_port
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/se_info_system.rb b/lib/sisu/develop/se_info_system.rb
index 0216d0a1..e688395c 100644
--- a/lib/sisu/v5/se_info_system.rb
+++ b/lib/sisu/develop/se_info_system.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_system.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_info_system.rb;hb=HEAD>
=end
module SiSU_Info_Sys_Gen
@@ -68,15 +65,15 @@ module SiSU_Info_Sys_Gen
error('rbconfig NOT FOUND (LoadError)')
end
@@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'
- share=Config::CONFIG['datadir'] + '/sisu'
- data=Config::CONFIG['datadir'] + '/doc/sisu'
+ ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],RbConfig::CONFIG['sysconfdir'] + '/sisu',RbConfig::CONFIG['host'],RbConfig::CONFIG['arch'],%x{ruby -v}.strip,RbConfig::CONFIG['archdir'],RbConfig::CONFIG['sitearchdir'],RbConfig::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # RbConfig::CONFIG['rb_ver']
+ out=RbConfig::CONFIG['localstatedir']
+ etc=RbConfig::CONFIG['sysconfdir'] + '/sisu'
+ share=RbConfig::CONFIG['datadir'] + '/sisu'
+ data=RbConfig::CONFIG['datadir'] + '/doc/sisu'
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@stub_pwd ||=@@pwd[m,1]
@base_markup_dir_stub=SiSU_Utils::Path.new.base_markup_stub
- prcss_dir='_sisu_processing_' + '.' + SiSU_is[:version_dir]
+ prcss_dir='_sisu_processing_' + '.' + SiSU_is.branch_version?
prcss_dir_tmp_root="/tmp/#{prcss_dir}"
prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}"
if @@user
diff --git a/lib/sisu/develop/se_load.rb b/lib/sisu/develop/se_load.rb
new file mode 100644
index 00000000..6f61ddd6
--- /dev/null
+++ b/lib/sisu/develop/se_load.rb
@@ -0,0 +1,108 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_load.rb;hb=HEAD>
+
+=end
+module SiSU_Load
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ class Load
+ def initialize(prog,mandatory=false)
+ @prog,@mandatory=prog,mandatory
+ end
+ def prog
+ load_prog=false
+ $:.each do |reqpath|
+ if FileTest.exist?("#{reqpath}/#{@prog}.rb")
+ load_prog=true
+ #SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).ok("#{reqpath}/#{@prog}.rb loaded")
+ break
+ #else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{reqpath}/#{@prog}.rb not found")
+ end
+ end
+ if load_prog \
+ and @prog=~/dbi/
+ begin
+ require 'dbi'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('dbi NOT FOUND (LoadError)')
+ end
+ end
+ if load_prog
+ begin
+ require @prog
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error("#{@prog} NOT FOUND (LoadError)")
+ end
+ else
+ @mandatory \
+ ? (SiSU_Screen::Ansi.new(@prog,"*WARN* module required: #{@prog}").warn)
+ : '' #(SiSU_Screen::Ansi.new(@prog,"*WARN* #{@prog} load requested").warn)
+ end
+ load_prog
+ end
+ def prog?
+ load_prog=false
+ $:.each do |reqpath|
+ if FileTest.exist?("#{reqpath}/#{@prog}.rb"); load_prog=true
+ break
+ end
+ end
+ load_prog
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/se_processing.rb b/lib/sisu/develop/se_processing.rb
index 8646b5e0..b40dfc59 100644
--- a/lib/sisu/v5/se_processing.rb
+++ b/lib/sisu/develop/se_processing.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_processing.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_processing.rb;hb=HEAD>
=end
module SiSU_Processing_Settings
diff --git a/lib/sisu/v5/se_programs.rb b/lib/sisu/develop/se_programs.rb
index 985f8233..e3949882 100644
--- a/lib/sisu/v5/se_programs.rb
+++ b/lib/sisu/develop/se_programs.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_programs.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_programs.rb;hb=HEAD>
=end
module SiSU_Sys_Call
@@ -75,7 +72,7 @@ module SiSU_Sys_Call
@sys=SiSU_Info_Sys::InfoSystem.instance
end
def program_found?(program)
- found=`which #{program}` #`whereis #{program}`
+ found=`which #{program} 2>&1` #`whereis #{program}`
(found =~/bin\/#{program}\b/) ? true : false
end
def locale #locales utf8 or other
@@ -137,6 +134,16 @@ module SiSU_Sys_Call
false
end
end
+ def po4a #po4a
+ program='po4a'
+ program_ref="\n\t\tpo4a"
+ if program_found?(program); true
+ else
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ warn("#{program} is not installed #{program_ref}")
+ false
+ end
+ end
def zip #zip
program='zip'
program_ref="\n\t\tused to in the making of number of file formats, odf, epub"
@@ -250,7 +257,7 @@ module SiSU_Sys_Call
#STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
- def graphicksmagick #graphicsmagick is a image manipulation program
+ def graphicsmagick #graphicsmagick is a image manipulation program
program='gm'
#program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
diff --git a/lib/sisu/v6/se_remotes.rb b/lib/sisu/develop/se_remotes.rb
index 3b4ded45..23f1386d 100644
--- a/lib/sisu/v6/se_remotes.rb
+++ b/lib/sisu/develop/se_remotes.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_remotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_remotes.rb;hb=HEAD>
=end
module SiSU_Info_Remote_Host
diff --git a/lib/sisu/v6/se_standardise_lang.rb b/lib/sisu/develop/se_standardise_lang.rb
index a2340374..94c6baa3 100644
--- a/lib/sisu/v6/se_standardise_lang.rb
+++ b/lib/sisu/develop/se_standardise_lang.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_standardise_lang.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_standardise_lang.rb;hb=HEAD>
=end
@@lang_info=nil
diff --git a/lib/sisu/develop/se_version.rb b/lib/sisu/develop/se_version.rb
new file mode 100644
index 00000000..157ecc9c
--- /dev/null
+++ b/lib/sisu/develop/se_version.rb
@@ -0,0 +1,183 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/se_version.rb;hb=HEAD>
+
+=end
+module SiSU_Info_Version
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ require_relative 'se_info_env' # se_info_env.rb
+ begin
+ require 'singleton'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('singleton NOT FOUND (LoadError)')
+ end
+ class InfoVersion < SiSU_Info_Env::InfoEnv # se_info_env.rb
+ include Singleton
+ begin
+ require 'rbconfig'
+ require 'yaml'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('rbconfig or yaml NOT FOUND (LoadError)')
+ end
+ @@lib_path=nil
+ def get_version
+ version={}
+ @pwd=ENV['PWD']
+ lib_path=
+ @@lib_path \
+ ? @@lib_path
+ : `echo $RUBYLIB`.split(':')
+ @@lib_path ||=lib_path
+ if File.exist?(SiSU_is.version_info_path?)
+ version=YAML::load(File::open(SiSU_is.version_info_path?))
+ end
+ version[:branch_version]=SiSU_is.branch_version?
+ version[:branch_number]=/^v([0-9]+)/.match(version[:branch_version])[1]
+ version[:branch_name]=SiSU_is.branch_name?
+ version[:install_method]=if SiSU_is.runtime_type? ==:gem_install
+ spec = Gem::Specification.find_by_name("sisu")
+ gem_root = spec.gem_dir
+ (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is.branch_name?}/,'')) == gem_root) \
+ ? ' (ruby gem install)' : ''
+ else ''
+ end
+ @version=version
+ def version_details_hash
+ @version
+ end
+ def project
+ version_details_hash[:project]
+ end
+ def date
+ version_details_hash[:date]
+ end
+ def date_stamp
+ version_details_hash[:date_stamp]
+ end
+ def version
+ version_details_hash[:version]
+ end
+ def branch_version
+ version_details_hash[:branch_version]
+ end
+ def branch_number
+ version_details_hash[:branch_number]
+ end
+ def branch_name
+ version_details_hash[:branch_name]
+ end
+ def install_method
+ version_details_hash[:install_method]
+ end
+ self
+ end
+ def rbversion
+ %x{ruby -v}.strip
+ end
+ end
+end
+module SiSU_Info_About
+ require_relative 'constants' # constants.rb
+ require_relative 'utils' # utils.rb
+ begin
+ require 'singleton'
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('singleton NOT FOUND (LoadError)')
+ end
+ class InfoAbout
+ def initialize(color='')
+ @color=color
+ end
+ def sisu_version
+ version=SiSU_Env::InfoVersion.instance.get_version
+ rb_ver=SiSU_Env::InfoVersion.instance.rbversion
+ if version.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,
+ version.install_method,
+ rb_ver
+ ).version
+ else puts 'SiSU (version information not available)'
+ end
+ end
+ def sisu_about
+ puts <<-WOK
+ sisu: documents; markup, structuring, publishing in multiple standard formats, & search
+ most (not all) useful commands (are made in a directory containing a sisu markup file &) take the form:
+ sisu [action(s)] [filename(s)]
+ where filename refers to a valid sisu marked up file, e.g.:
+ cd /usr/share/doc/sisu/markup-samples/sisu_manual
+ sisu --html --verbose sisu_commands.sst
+ sisu --txt --html --epub --odt --pdf --sqlite --manpage --texinfo --concordance --qrcode --verbose sisu.ssm
+ cd -
+ See output produced, or see man pages: man sisu
+ <http://www.sisudoc.org/> <http://www.jus.uio.no/sisu/>
+ WOK
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/shared_images.rb b/lib/sisu/develop/shared_images.rb
index 85520a51..e617676e 100644
--- a/lib/sisu/v6/shared_images.rb
+++ b/lib/sisu/develop/shared_images.rb
@@ -1,60 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/shared_images.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_images.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: common file for xml generation
=end
module SiSU_Images
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -127,7 +125,7 @@ module SiSU_Images
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="#{SiSU_is[:path_base_system_data]}/image"
+ src_path="#{SiSU_is.path_base_system_data?}/image"
dest=dest_path(:image_sys)
copy(src_path,dest,images)
end
diff --git a/lib/sisu/v5/shared_markup_alt.rb b/lib/sisu/develop/shared_markup_alt.rb
index 3869dea4..f862c46c 100644
--- a/lib/sisu/v5/shared_markup_alt.rb
+++ b/lib/sisu/develop/shared_markup_alt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_markup_alt.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_markup_alt.rb;hb=HEAD>
=end
module SiSU_TextRepresentation
@@ -82,9 +79,8 @@ module SiSU_TextRepresentation
gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1').
gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'\1').
gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'\1').
- gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strke_c]}/,'\1').
+ gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'\1').
gsub(/#{Mx[:fa_superscript_o]}(\d+)#{Mx[:fa_superscript_c]}/,'[\1]').
- gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'\1').
gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'\1').
gsub(/#{Mx[:fa_hilite_o]}(.+?)#{Mx[:fa_hilite_c]}/,'\1').
gsub(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/i,'~').
diff --git a/lib/sisu/v5/shared_metadata.rb b/lib/sisu/develop/shared_metadata.rb
index 17e0a4c4..3cfd72f1 100644
--- a/lib/sisu/v5/shared_metadata.rb
+++ b/lib/sisu/develop/shared_metadata.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, resource control and configuration details
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_metadata.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_metadata.rb;hb=HEAD>
=end
module SiSU_Metadata
@@ -283,13 +280,13 @@ module SiSU_Metadata
@tag,@inf=%{<b><u>Generated</u></b>},''
meta << self.meta_para
end
- if defined? @md.sisu_version \
- and @md.sisu_version[:version]=~/\S+/
+ if defined? @md.project_details \
+ and @md.project_details.version=~/\S+/
v="#{tr.sisu_version}: " +
- "#{@md.sisu_version[:project]} " +
- "#{@md.sisu_version[:version]} " +
- "of #{@md.sisu_version[:date_stamp]} " +
- "(#{@md.sisu_version[:date]})"
+ "#{@md.project_details.project} " +
+ "#{@md.project_details.version} " +
+ "of #{@md.project_details.date_stamp} " +
+ "(#{@md.project_details.date})"
@tag,@inf,@class='Generated by',v,'ver'
meta << self.meta_para
end
@@ -464,7 +461,7 @@ module SiSU_Metadata
def language
if defined? @md.title.language \
and @md.title.language
- ' :language: ' + @md.title.language.join(', ')
+ ' :language: ' + @md.title.language
else nil
end
end
@@ -677,13 +674,13 @@ module SiSU_Metadata
# end
nil
end
- def identifier
- if defined? @md.classify.identifier \
- and @md.classify.identifier
- ' :identifier: ' + @md.classify.identifier
- else nil
- end
- end
+ #def identifier
+ # if defined? @md.classify.identifier \
+ # and @md.classify.identifier
+ # ' :identifier: ' + @md.classify.identifier
+ # else nil
+ # end
+ #end
def loc
if defined? @md.classify.loc \
and @md.classify.loc
@@ -1219,13 +1216,13 @@ WOK
tag,inf=tr.last_generated,@md.generated
meta << meta_para(tag,inf)
end
- if defined? @md.sisu_version \
- and @md.sisu_version[:version]=~/\S+/
+ if defined? @md.project_details \
+ and @md.project_details.version=~/\S+/
tag=tr.sisu_version
- inf="#{@md.sisu_version[:project]} " +
- "#{@md.sisu_version[:version]} " +
- "of #{@md.sisu_version[:date_stamp]} " +
- "(#{@md.sisu_version[:date]})"
+ inf="#{@md.project_details.project} " +
+ "#{@md.project_details.version} " +
+ "of #{@md.project_details.date_stamp} " +
+ "(#{@md.project_details.date})"
meta << meta_para(tag,inf)
end
if defined? @md.ruby_version \
diff --git a/lib/sisu/v5/shared_sem.rb b/lib/sisu/develop/shared_sem.rb
index 397aaa62..1866cc3b 100644
--- a/lib/sisu/v5/shared_sem.rb
+++ b/lib/sisu/develop/shared_sem.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
- Sematic tags
+** Description: documents, structuring, processing, publishing, search
+*** Sematic tags
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/shared_sem.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/shared_sem.rb;hb=HEAD>
=end
module SiSU_Sem
diff --git a/lib/sisu/develop/sisu_thor_lib.rb b/lib/sisu/develop/sisu_thor_lib.rb
new file mode 100644
index 00000000..3212e923
--- /dev/null
+++ b/lib/sisu/develop/sisu_thor_lib.rb
@@ -0,0 +1,407 @@
+module SiSU_Po4a_Actions
+ require_relative 'utils_response' # utils_response.rb
+ include SiSU_Response
+ @@source=@@targets=nil
+ def project_details
+ def name
+ 'SiSU translations under po4a management'
+ end
+ def name_warning
+ <<-WOK
+#{name}
+
+WARNING all sisu markup files (.ssm, .sst, .ssi) in languages other than #{language.source_language_selected}
+are managed by po4a, through translations of the source language to other languages.
+
+#{language.info_on_selection}
+ WOK
+ end
+ def setup_project
+ "Setup file for placing #{name}"
+ end
+ self
+ end
+ def notice
+ def warn_and_proceed?
+ '*WARNING* this software module creates, destroys, overwrites directories' + "\n" \
+ + '*WARNING*: Use this Software at your own risk!'
+ end
+ def default(selection=nil)
+ selections=:strict #selections=:short
+ ans=if selection
+ case selection
+ when selection.is_a?(String)
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ when :make
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ selected (or configured) languages to be used
+ source language: #{language.source_language_available_str}
+ target languages: #{language.translation_languages_selected_that_are_available.inspect}
+
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will create sub-directories for the
+ selected (or configured) target languages:
+ #{language.translation_languages_selected_that_are_available.inspect}
+ & the po4a configuration file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ It will populate the sub-directories with translation files created from
+ the pot and po files found under the corresponding language
+ sub-directories, (under #{dir.pot}/ & #{dir.po}/).
+ (OVERWRITING any existing translated .ssm .sst .ssi files
+ in language subdirectories that are not under po4a management).
+
+ You should backup the current directory:
+ #{Dir.pwd}
+
+#{warn_and_proceed?}
+ WOK
+ when :clean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+#{warn_and_proceed?}
+ WOK
+ when :distclean
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will remove the sub-directories (if they exist):
+ #{language.possible_translations.inspect}
+
+ #{language.translation_languages_selected_that_are_available.inspect}
+ & file: #{filename.po4a_cfg}
+ in the current directory:
+ #{Dir.pwd}
+ Note: these sub-directories & the config file #{filename.po4a_cfg}
+ should be auto-generated from pot and po files if this project translation
+ is under po4a management.
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ when :rebuild
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ "--#{selection}" selected - #{selection} #{project_details.name}
+ WARNING: this action assumes (and places) this project is under po4a
+ (translation) management. It will destroy/clobber and then create again the
+ sub-directories:
+ #{language.translation_languages_selected_that_are_available.inspect}
+ populating them with translation files created from the pot and po files
+ found under the corresponding language sub-directories in (#{dir.pot}/
+ & #{dir.po}/).
+ It will also generate the file: #{filename.po4a_cfg}
+ These actions will be taken in the current directory:
+ #{Dir.pwd}
+ This query is to give you the chance to make sure you know what you are doing.
+#{warn_and_proceed?}
+ WOK
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "#{selection} #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ else
+ selections=:strict
+ <<-WOK
+ #{project_details.setup_project}
+ Default action selected - "install and to setup #{project_details.name}"
+#{warn_and_proceed?}
+ WOK
+ end
+ exit unless query.answer?(ans)
+ end
+ def project_help
+ puts <<-WOK
+#{project_details.name}
+#{project_details.setup_project}
+
+This setup file is primarily to assist with having sisu markup files under po4a
+translation management. It assumes that the source language files are placed
+under the sub-directory identifying the source language set, which is currently
+#{language.source_language_selected}
+The files there are used to make the source translation file in the directory #{dir.pot}/
+Which is then used to create files for translation under the directory #{dir.po}/
+in sub-directories bearing the translation languages ISO code.
+
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+
+ WOK
+ end
+ self
+ end
+ def generate
+ def readme
+ system(%{ruby ../../../../../bin/sisu6 --txt -v --no-manifest --dump='../../../../../..' en/README.ssm})
+ end
+ def manpage
+ system(%{ruby ../../../../../bin/sisu6 --manpage -v --no-manifest --dump='../../../../../../man/man1' en/sisu.ssm})
+ end
+ self
+ end
+ def filename
+ def languages_src_tgt
+ #'translation_languages'
+ 'languages_source_and_targets'
+ end
+ def po4a_cfg
+ 'po4a.cfg'
+ end
+ self
+ end
+ def dir
+ def pwd
+ Dir.pwd
+ end
+ def po4a_
+ 'po4a/' # ''
+ end
+ def pot
+ po4a_ + 'pot'
+ end
+ def po
+ po4a_ + 'po'
+ end
+ self
+ end
+ def dir_mk(dir)
+ FileUtils::mkdir_p(dir) unless FileTest.directory?(dir)
+ end
+ def po4a_flags
+ def debug
+ '-d -v'
+ end
+ def normal
+ ''
+ end
+ def quiet
+ '-q'
+ end
+ self
+ end
+ def languages_from_file
+ def language_source
+ if @@source.is_a?(String) \
+ and @@source =~ /w{2,4}/
+ else languages_extract_from_file
+ end
+ @@source
+ end
+ def language_targets
+ if @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ else languages_extract_from_file
+ end
+ @@targets
+ end
+ def languages_extract_from_file
+ if (@@source.is_a?(String) \
+ and @@source =~/\w{2,4}/) \
+ and (@@targets.is_a?(Array) \
+ and @@targets.length > 0)
+ else
+ if FileTest.file?(filename.languages_src_tgt)
+ puts 'file: "' + filename.languages_src_tgt + '" found and used (unless overridden)'
+ langs=IO.read(filename.languages_src_tgt, mode: 'r:utf-8').scan(/source:\s+\w+|target:\s+\w.+/)
+ langs.each do |sel|
+ case sel
+ when /source:/
+ source=sel.split(/source:\s*|\s+/).join
+ source=(source =~/\w{2,4}/) ? source : nil
+ @@source=unless @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ source
+ else @@source
+ end
+ when /target:/
+ @@targets=unless @@targets.is_a?(Array)
+ sel.split(/targets?:\s*|\s+/) - ['']
+ else @@targets
+ end
+ end
+ end
+ else
+ puts %{(create) missing instruction file: "#{filename.languages_src_tgt}"\n contents e.g.:\n source: en\n target: de fr es ja ru zh\n no po target languages found}
+ exit
+ end
+ end
+ end
+ self
+ end
+ def language
+ def source_language_selected(src=nil)
+ @@source=if not @@source.nil? \
+ and @@source.is_a?(String) \
+ and @@source =~/\w{2,4}/
+ @@source
+ elsif (src \
+ && src.is_a?(String) \
+ && src.length > 1)
+ src
+ else
+ src=languages_from_file.language_source
+ end
+ end
+ def translation_languages_selected(targets=nil) #translation_languages
+ @@targets=if not @@targets.nil? \
+ and @@targets.is_a?(Array) \
+ and @@targets.length > 0
+ @@targets
+ elsif (targets \
+ && targets.is_a?(Array) \
+ && targets.length > 0)
+ targets
+ else
+ targets=languages_from_file.language_targets
+ end
+ end
+ def source_language_available
+ [source_language_selected] & sisu_languages_available
+ end
+ def translation_languages_selected_that_are_available
+ translation_languages_selected & sisu_languages_available
+ end
+ def info_on_selection
+ if translation_languages_selected != translation_languages_selected_that_are_available
+ <<-WOK
+WARNING: language selections mismatch
+
+The current language translation selection appears to be: #{translation_languages_selected_str}
+Of which the following are valid (available) selections: #{translation_languages_selected_that_are_available_str}
+
+sisu available language list: #{sisu_languages_available_str}
+
+the following will be used: #{translation_languages_selected_that_are_available_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+ WOK
+ else
+ <<-WOK
+The current language translation selection is: #{translation_languages_selected_str}
+The languages selected are located in the file: #{filename.languages_src_tgt}
+
+sisu available language list: #{sisu_languages_available_str}
+ WOK
+ end
+ end
+ def sisu_languages_available
+ $SiSU_Language_Codes.language_list.codes
+ end
+ def possible_translations
+ sisu_languages_available - [source_language_selected]
+ end
+ def translation_languages_selected_str
+ language.translation_languages_selected.join(' ')
+ end
+ def source_language_available_str
+ source_language_available.join
+ end
+ def translation_languages_selected_that_are_available_str
+ language.translation_languages_selected_that_are_available.join(' ')
+ end
+ def sisu_languages_available_str
+ language.sisu_languages_available.join(' ')
+ end
+ def posible_translations_str
+ language.posible_translations.join(' ')
+ end
+ self
+ end
+ def files_src
+ def ssm
+ Dir.glob("#{language.source_language_selected}/*.ssm").sort
+ end
+ def sst
+ Dir.glob("#{language.source_language_selected}/*.sst").sort
+ end
+ def ssi
+ Dir.glob("#{language.source_language_selected}/*.ssi").sort
+ end
+ def all
+ Dir.glob("#{language.source_language_selected}/*{.ssm,.sst,.ssi}").sort
+ end
+ self
+ end
+ def po4a_cfg_file
+ File.open("#{Dir.pwd}/#{filename.po4a_cfg}",'w')
+ end
+ def po4a_create
+ def configure #po4a_cfg
+ po4a_cfg_arr=[]
+ po4a_cfg_arr \
+ << "[po4a_langs] #{language.translation_languages_selected_that_are_available_str}"
+ po4a_cfg_arr \
+ << "[po4a_paths] #{dir.pot}/$master.pot $lang:#{dir.po}/$lang/$master.po"
+ files_src.ssm.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.sst.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ files_src.ssi.each do |file_src|
+ file_src_fn=file_src.gsub(/#{language.source_language_selected}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ file=po4a_cfg_file
+ po4a_cfg_arr.each do |txt|
+ puts txt
+ file << txt << "\n"
+ end
+ file.close
+ cmd='po4a --keep 0 ' \
+ + po4a_flags.normal + ' ' \
+ + filename.po4a_cfg
+ #cmd='po4a --keep 0 --no-backups --package-name ' \
+ #+ 'sisu-manual' + ' ' \
+ #+ po4a_flags.normal + ' ' \
+ #+ filename.po4a_cfg
+ system(cmd); puts cmd
+ end
+ self
+ end
+ def project
+ def make
+ dir_mk(dir.pot)
+ language.translation_languages_selected_that_are_available.each do |lang_dir|
+ dir_lang="#{Dir.pwd}/#{dir.po}/#{lang_dir}"
+ dir_mk(dir_lang)
+ end
+ po4a_create.configure
+ end
+ def clean
+ #rm -f po/*/*.po~
+ #rm -rf ../build
+ FileUtils.rm_f Dir.glob("./#{dir.po}/*/*.po~")
+ end
+ def distclean
+ #rm -f po4a.cfg
+ #rm -rf $(LANGUAGES)
+ FileUtils::rm_f(filename.po4a_cfg)
+ FileUtils::rm_r(language.possible_translations,:force => true)
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/sitemaps.rb b/lib/sisu/develop/sitemaps.rb
index 39c02255..b34ff57c 100644
--- a/lib/sisu/v5/sitemaps.rb
+++ b/lib/sisu/develop/sitemaps.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** sitemap created from document parameters
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sitemaps.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: sitemap created from document parameters
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sitemaps.rb;hb=HEAD>
=end
module SiSU_Sitemaps
diff --git a/lib/sisu/develop/src_kdissert_share.rb b/lib/sisu/develop/src_kdissert_share.rb
new file mode 100644
index 00000000..351e5004
--- /dev/null
+++ b/lib/sisu/develop/src_kdissert_share.rb
@@ -0,0 +1,102 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** share sisu source markup file, copy it to output directory!
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_share_kdissert.rb;hb=HEAD>
+
+=end
+module SiSU_KdiSource
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source
+ begin
+ require 'fileutils'
+ include FileUtils
+ rescue LoadError
+ SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
+ error('fileutils NOT FOUND (LoadError)')
+ end
+ def initialize(opt)
+ @opt=opt
+ @env=SiSU_Env::InfoEnv.new(@opt.fns)
+ @output_path="#{@env.path.output}/#{@opt.fnb}"
+ end
+ def read
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share Kdissert Source Document!',
+ @opt.fnb
+ ).green_hi_blue unless @opt.act[:quiet][:set]==:on
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Copy kdissert file to output directory",
+ "#{@opt.fnb} -> #{@output_path}"
+ ).warn unless @opt.act[:quiet][:set]==:on
+ FileUtils::mkdir_p(@env.path.output) unless FileTest.directory?(@env.path.output)
+ FileUtils::mkdir_p(@output_path) unless FileTest.directory?(@output_path)
+ if FileTest.directory?(@output_path)
+ if @opt.fns =~/\.kdi\._sst$/ \
+ and FileTest.file?(@opt.fnb)
+ FileUtils::cp(@opt.fnb,@output_path)
+ end
+ else
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Output directory does not exist",
+ "#{@opt.fnb} -> #{@output_path}"
+ ).warn unless @opt.act[:quiet][:set]==:on
+ exit
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/src_po4a_share.rb b/lib/sisu/develop/src_po4a_share.rb
new file mode 100644
index 00000000..3c34115a
--- /dev/null
+++ b/lib/sisu/develop/src_po4a_share.rb
@@ -0,0 +1,309 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** pot file generation
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_share.rb;hb=HEAD>
+
+=end
+#module SiSU_SStm_AO_SStm
+module SiSU_Languages_Selected
+ require_relative 'utils_response' # utils_response.rb
+ def language
+ def sisu_languages_available
+ Px[:lng_lst]
+ end
+ def source_language_selected_str
+ @opt.act[:po4a_lang][:src] \
+ ? @opt.act[:po4a_lang][:src]
+ : 'en'
+ end
+ def translation_languages_selected
+ @opt.act[:po4a_lang][:trn] \
+ ? @opt.act[:po4a_lang][:trn]
+ : []
+ end
+ def translation_languages_available
+ sisu_languages_available - [source_language_selected_str]
+ end
+ def translation_languages_selected_that_are_available
+ translation_languages_selected & sisu_languages_available
+ end
+ def translation_languages_selected_that_are_available_str
+ translation_languages_selected_that_are_available.join(' ')
+ end
+ def translation_languages_selected_str
+ @opt.act[:po4a_lang][:trn].join(' ')
+ end
+ self
+ end
+end
+module SiSU_Po4a_Project
+ class Po4aCfg
+ include SiSU_Composite_Doc_Utils # composite doc, .ssm, extract all related insert files, array of filenames test
+ include SiSU_Response
+ include SiSU_Languages_Selected
+ def initialize(opt,file)
+ @opt,@file=opt,file
+ end
+ def song
+ if @opt.lng==language.source_language_selected_str
+ ans=response?('po4a config file')
+ if ans
+ po4a_cfg
+ end
+ end
+ end
+ def po4a_cfg_filename
+ 'po4a.cfg'
+ end
+ def dir
+ def pwd
+ Dir.pwd
+ end
+ def po4a_
+ 'po4a/' # ''
+ end
+ def pot
+ #po4a_ + 'pot'
+ 'pot'
+ end
+ def po
+ #po4a_ + 'po'
+ 'po'
+ end
+ self
+ end
+ def po4a_cfg_file
+ File.open("#{Dir.pwd}/#{po4a_cfg_filename}",'w')
+ end
+ def po4a_cfg
+ lng=language.source_language_selected_str
+ doc_import_list=composite_and_imported_filenames_array(@opt.fno)
+ po4a_cfg_arr=[]
+ po4a_cfg_arr \
+ << "[po4a_langs] #{language.translation_languages_selected_that_are_available_str}"
+ po4a_cfg_arr \
+ << "[po4a_paths] #{dir.pot}/$master.pot $lang:#{dir.po}/$lang/$master.po"
+ doc_import_list.each do |file_src|
+ file_src_fn=
+ file_src.gsub(/#{language.source_language_selected_str}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{lng}/#{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ file=@file.write_file.po4a_cfg
+ po4a_cfg_arr.each do |txt|
+ puts txt
+ file << txt << "\n"
+ end
+ file.close
+ end
+ end
+ class Po4aProject
+ include SiSU_Languages_Selected
+ include SiSU_Response
+ def initialize(opt,file)
+ @opt,@file=opt,file
+ end
+ def song
+ make_paths
+ if FileTest.directory?(@file.output_path.po4a.dir)
+ Dir.chdir(@file.output_path.po4a.dir)
+ dirs=Dir['*/']
+ dirs_language=[]
+ dirs.each do |x|
+ dirs_language << x.gsub(/\/$/,'')
+ end
+ dirs_translation = \
+ (language.translation_languages_available & dirs_language)
+ end
+ if (language.translation_languages_available & [@opt.lng]).length == 1
+ puts %{gettext for: #{dirs_translation}
+in #{Dir.pwd}}
+ ans=response?('gettext?')
+ if ans
+ gettext_if_any_build_src_trans_po
+ end
+ end
+ ans=response?('build project?')
+ if ans
+ build_src_master_to_pot_and_po_and_srcs
+ end
+ end
+ def flags
+ def debug
+ '-d -v'
+ end
+ def normal
+ ''
+ end
+ def quiet
+ '-q'
+ end
+ self
+ end
+ def build_src_master_to_pot_and_po_and_srcs
+ if SiSU_Sys_Call::SystemCall.new.po4a
+ pwd=Dir.pwd
+ #cmd='po4a --keep 0 -M UTF-8 --no-backups ' \
+ #+ '--package-name ' \
+ #+ 'sisu-manual' + ' ' \
+ #+ flags.normal + ' ' \
+ #+ filename.po4a_cfg
+ cmd='po4a --keep 0 -M UTF-8' \
+ + flags.normal + ' ' \
+ + @file.base_filename.po4a_cfg
+ Dir.chdir(@file.output_path.po4a.dir)
+ system("
+ cd #{@file.output_path.po4a.dir}
+ #{cmd}
+ cd -
+ "); puts cmd
+ Dir.chdir(pwd)
+ end
+ end
+ def gettext_if_any_build_src_trans_po
+ Dir.chdir(@file.output_path.po4a.dir)
+ dirs=Dir['*/']
+ dirs_language=[]
+ dirs.each do |x|
+ dirs_language << x.gsub(/\/$/,'')
+ end
+ dirs_translation = \
+ (language.translation_languages_available & dirs_language)
+ files_src=Dir.glob("./#{source_language_selected_str}/*.ss[tmi]")
+ dirs_translation.each do |lng|
+ files_src.each do |file|
+ fn=file.gsub(/\.\/#{source_language_selected_str}\//,'')
+ system("
+ po4a-gettextize -f text -M utf-8 \
+ -m ./#{source_language_selected_str}/#{fn} \
+ -l ./#{lng}/#{fn} \
+ -p ./po/#{lng}/#{fn}.po
+ ")
+ puts fn
+ end
+ end
+ end
+ def dir_mk(dir)
+ unless FileTest.directory?(dir)
+ FileUtils::mkdir_p(dir)
+ end
+ end
+ def make_paths
+ dir_mk(@file.output_path.pot.dir)
+ dir_mk(@file.output_path.po.dir)
+ end
+ def clean
+ #rm -f po/*/*.po~
+ #rm -rf ../build
+ FileUtils.rm_f Dir.glob("./#{dir.po}/*/*.po~")
+ end
+ def distclean
+ #rm -f po4a.cfg
+ #rm -rf $(LANGUAGES)
+ FileUtils::rm_f(filename.po4a_cfg)
+ FileUtils::rm_r(language.possible_translations,:force => true)
+ #FileUtils::rm_r(language.translation_languages_selected_that_are_available,:force => true)
+ end
+ end
+ class Po4aDistClean
+ include SiSU_Languages_Selected
+ include SiSU_Response
+ def initialize(opt,file)
+ @opt,@file=opt,file
+ end
+ def song
+ pwd=Dir.pwd
+ if FileTest.directory?(@file.output_path.po4a.dir)
+ Dir.chdir(@file.output_path.po4a.dir)
+ dirs=Dir['*/']
+ dirs_language=[]
+ dirs.each do |x|
+ dirs_language << x.gsub(/\/$/,'')
+ end
+ dirs_translation = \
+ (language.translation_languages_available & dirs_language)
+ if dirs_translation.length > 0
+ puts %{remove language translation directorie(s): #{dirs_translation}
+in #{Dir .pwd}}
+ ans=response?('disclean?')
+ if ans
+ FileUtils::rm_f(@file.base_filename.po4a_cfg)
+ FileUtils::rm_r(dirs_translation,:force => true)
+ #FileUtils::rm_r(language.translation_languages_available,:force => true)
+ end
+ end
+ Dir.chdir(pwd)
+ end
+ end
+ end
+end
+#end
+__END__
+REMOVE
+&#033;\|&#035;\|&&#042;\|&#045;\|&#047;\|&#095;\|&#123;\|&#125;\|&#126;\|&#
+
+tables are problematic, difficult to reconstitute instruction, check
+
+metadata, move to top? and work on
+
+footnotes, different types, asterisk, also do you want to have separate
+paragraphs, or breaks within one block?
+
+where no ocn appropriately use ~# or -# or indeed 1~name-
+
+comments in document, what to do about them, not sure they are currently
+retained in dal, could be quite valuable to keep
+
+Translate Shell
+http://www.soimort.org/translate-shell/
+translate.google.com
diff --git a/lib/sisu/develop/src_po4a_shelf.rb b/lib/sisu/develop/src_po4a_shelf.rb
new file mode 100644
index 00000000..dee6818f
--- /dev/null
+++ b/lib/sisu/develop/src_po4a_shelf.rb
@@ -0,0 +1,1217 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** pot file generation
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_shelf.rb;hb=HEAD>
+
+=end
+module SiSU_Po4a
+ require_relative 'ao' # ao.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ require_relative 'ao_composite' # ao_composite.rb
+ require_relative 'shared_metadata' # shared_metadata.rb
+ require_relative 'src_po4a_shelf_set' # src_po4a_shelf_set.rb
+ include SiSU_Param
+ require_relative 'object_munge' # object_munge.rb
+ require_relative 'utils_composite' # utils_composite.rb
+ class Source
+ include SiSU_Object_Munge
+ @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn=
+ nil, nil, nil, nil, nil, nil
+ @@auto_translation_ = :go
+ def initialize(opt,fn=nil)
+ @opt,@fn=opt,fn
+ #unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/
+ # puts "#{@opt.fns} not a processed file type"
+ #end
+ file_arr=SiSU_Info_Env::InfoEnv.new.source_file_processing_array(@opt.fns)
+ SiSU_Param::Parameters::Instructions.new(file_arr,@opt).extract
+ r=Px[:lng_lst_rgx].gsub(/\|en\|/,'|')
+ @lang_regx=%r{(?:#{r})}
+ if opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
+ and opt.f_pth[:lng]!=@opt.lng_base
+ @@opt_src_=false
+ @@opt_trn=opt
+ @@md_trn=SiSU_Param::Parameters.new(opt).get
+ else
+ @@opt_src_=true
+ @@opt_src=opt
+ @@md_src=SiSU_Param::Parameters.new(opt).get
+ end
+ end
+ def wrap_width_set(md,env)
+ if defined? md.make.plaintext_wrap \
+ and md.make.plaintext_wrap
+ md.make.plaintext_wrap
+ elsif defined? env.plaintext_wrap \
+ and env.plaintext_wrap
+ env.plaintext_wrap
+ else 78
+ end
+ end
+ def process_file(md,env,file,wrap_width,fn)
+ unless @opt.act[:quiet][:set]==:on
+ tool=(@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
+ ? "#{env.program.text_editor} #{file.output_path.pot.dir}/"
+ : @opt.fns
+ (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
+ ? SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Pot po4a',
+ tool
+ ).green_hi_blue
+ : SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Pot po4a',
+ tool
+ ).green_title_hi
+ if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ @opt.fns,
+ file.output_path.pot.dir
+ ).flow
+ end
+ end
+ if @opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
+ or @opt.f_pth[:lng] !=@opt.lng_base
+ opt_lang_trn_fn=fn
+ @ao_arr_lang_trans=
+ SiSU_AO::Source.new(@opt,opt_lang_trn_fn,:po4a).get # ao file drawn here
+ opt_lang_src_fn=(fn =~/\S+?~\S{2}(?:_\S{2})?\.ss[mti]/) \
+ ? (fn.gsub(/(\S+?)~\S{2}(?:_\S{2})?(\.ss[mti])/,'\1\2')) #check i
+ : fn
+ transdir,srcdir=Dir.pwd,Dir.pwd
+ if Dir.pwd.to_s =~/\/#{@lang_regx}$/
+ transdir=Dir.pwd
+ srcdir=transdir.
+ gsub(/\/#{@lang_regx}$/,
+ "/#{@opt.lng_base}")
+ if FileTest.directory?(srcdir)
+ Dir.chdir(srcdir)
+ end
+ else nil
+ end
+ if FileTest.file?("#{srcdir}/#{opt_lang_src_fn}")
+ @ao_arr_lang_src=
+ SiSU_AO::Source.new(
+ @@opt_src,
+ opt_lang_src_fn,
+ :po4a
+ ).get # ao file drawn here
+ else
+ puts "no identified source document"
+ exit
+ end
+ Dir.chdir(transdir) if transdir
+ else
+ @ao_arr_lang_src=
+ SiSU_AO::Source.new(
+ @opt,
+ fn,
+ :po4a
+ ).get # ao file drawn here
+ @ao_arr_lang_trans=nil
+ end
+ SiSU_Po4a::Source::Scroll.new(
+ fn,
+ @ao_arr_lang_src,
+ @ao_arr_lang_trans,
+ @@md_src,
+ @@md_trn,
+ wrap_width
+ ).songsheet
+ end
+ def read
+ begin
+ src={}
+ src[:pth]=@opt.f_pth[:pth]
+ src[:files]=if @opt.fns =~ /\.(?:(?:-|ssm\.)sst|ssm)$/
+ @opt.fns=@opt.fns.gsub(/\.ssm\.sst$/,'.ssm')
+ SiSU_Assemble::CompositeFileList.new(@opt).read
+ else
+ [@opt.fns]
+ end
+ md=SiSU_Param::Parameters.new(@opt).get
+ env=SiSU_Env::InfoEnv.new(@opt.fns)
+ file=SiSU_Env::FileOp.new(md)
+ Po4aCfg.new(@opt,file).po4a_cfg
+ wrap_width=wrap_width_set(md,env)
+ src[:files].each do |fn|
+ process_file(md,env,file,wrap_width,fn)
+ end
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ private
+ class Scroll <Source
+ include SiSU_Po4aUtils
+ @@endnotes={ para: [], end: [] }
+ def initialize(fn,data_src,data_trn,md_src,md_trn,wrap_width)
+ @fn,@data_src,@data_trn,@md_src,@md_trn,@wrap_width=
+ fn, data_src, data_trn, md_src, md_trn, wrap_width
+ @md=(md_trn.nil?) \
+ ? md_src
+ : md_trn
+ @tab="\t"
+ @@endnotes_=(@md.opt.selections.str =~/--endnote/) \
+ ? true
+ : false # --footnote
+ @pot={
+ body: [],
+ open: [],
+ close: [],
+ head: [],
+ metadata: [],
+ tail: []
+ }
+ end
+ def br
+ (@md.opt.selections.str =~/--dos/) ? "\r\n" : "\n" # --unix
+ end
+ def songsheet
+ fn=@fn
+ pot=pot_markup(@data_src,@data_trn)
+ publish(fn,pot)
+ end
+ def pot_structure_wrap(desc,orig,trans,indent=0,hang=0)
+ SiSU_Po4aUtils::Wrap.new(
+ @md,
+ orig,
+ trans,
+ desc,
+ @wrap_width,
+ indent,
+ hang
+ )
+ end
+ def wrap_endnotes(orig_notes='',trn_notes='')
+ nt=@@endnotes_ ? 'endnote' : 'footnote'
+ @fn=0
+ a_l=orig_notes.length
+ 0.upto(a_l-1) do |i|
+ @fn=if orig_notes[i].to_s =~/^\^~([\d*+]+)/ # provides endnote number within paragraph
+ @fn += 1
+ else @fn
+ end
+ d="#{nt} #{@fn}"
+ mark="^~ "
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# footnotes, the preferred sisu markup for a footnote is~{this is a footnote}~ } \
+ + %{however, for translation a footnote reference marker in the text~^ } \
+ + %{with a set of notes following the paragraph starting on a newline with "^~ this is a footnote", } \
+ + %{is easier to deal with, if possible these should be converted back to~{inline notes}~}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=(orig_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (orig_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : orig_notes[i].to_s
+ trans=if trn_notes.is_a?(Array) \
+ and trn_notes.length==orig_notes.length
+ (trn_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (trn_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : trn_notes[i].to_s
+ else ''
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ wrap=util.line_wrap
+ wrap=if wrap =~ /^\s*\^~[\d*+]+\s+.+?\s*\Z/m
+ wrap.gsub(/^\s*(\^~[\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB
+\\1 \\2
+GSUB
+ )
+ else
+ wrap.gsub(/^(.+)\Z/m, <<GSUB
+\\1
+GSUB
+ )
+ end
+ @@endnotes[:para] << wrap
+ @@endnotes[:end] << '' << wrap
+ end
+ @@endnotes[:para].each {|e| @pot[:body] << e << br}
+ @@endnotes[:para]=[]
+ @@endnotes
+ end
+ def pot_metadata_src
+ @po4a_identify_type='type: SiSU doc' #'type: Plain text'
+ meta_src=SiSU_Metadata::Summary.new(@md_src)
+ w=[]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: title",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.title.main,
+ meta_src.metadata_tags.title.sub,
+ meta_src.metadata_tags.title.edition,
+ meta_src.metadata_tags.title.note,
+ meta_src.metadata_tags.title.short,
+ meta_src.metadata_tags.title.language,
+ meta_src.metadata_tags.title.language_char,
+ 'msgstr ""',
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: creator",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.creator.head,
+ meta_src.metadata_tags.creator.author,
+ meta_src.metadata_tags.creator.contributor,
+ meta_src.metadata_tags.creator.illustrator,
+ meta_src.metadata_tags.creator.photographer,
+ meta_src.metadata_tags.creator.translator,
+ meta_src.metadata_tags.creator.audio,
+ meta_src.metadata_tags.creator.digitized_by,
+ meta_src.metadata_tags.creator.prepared_by,
+ 'msgstr ""',
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: rights",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.rights.head,
+ meta_src.metadata_tags.rights.copyright.text,
+ meta_src.metadata_tags.rights.copyright.translation,
+ meta_src.metadata_tags.rights.copyright.illustrations,
+ meta_src.metadata_tags.rights.copyright.photographs,
+ meta_src.metadata_tags.rights.copyright.digitization,
+ meta_src.metadata_tags.rights.copyright.audio,
+ meta_src.metadata_tags.rights.license,
+ 'msgstr ""',
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: classify",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.classify.head,
+ meta_src.metadata_tags.classify.subject,
+ meta_src.metadata_tags.classify.topic_register,
+ meta_src.metadata_tags.classify.loc,
+ meta_src.metadata_tags.classify.dewey,
+ #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 << [
+ "#. #{@po4a_identify_type} - metadata: date",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.date.head,
+ meta_src.metadata_tags.date.added_to_site,
+ meta_src.metadata_tags.date.available,
+ meta_src.metadata_tags.date.created,
+ meta_src.metadata_tags.date.issued,
+ meta_src.metadata_tags.date.modified,
+ meta_src.metadata_tags.date.published,
+ meta_src.metadata_tags.date.valid,
+ 'msgstr ""',
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - processing, make instruction",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.processing_tags.make.language,
+ meta_src.processing_tags.make.headings,
+ meta_src.processing_tags.make.num_top,
+ meta_src.processing_tags.make.breaks,
+ meta_src.processing_tags.make.emphasis,
+ meta_src.processing_tags.make.bold,
+ meta_src.processing_tags.make.italics,
+ meta_src.processing_tags.make.texpdf_font,
+ 'msgstr ""',
+ ]
+ w.each do |y|
+ z=''
+ y.each do |x|
+ if x
+ z += x + "\n" if x =~/^#|^msg(?:id|str)/
+ z += %{"#{x}"\n} if x =~/^@\S+?:(?: |$)/
+ z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
+ end
+ end
+ @pot[:metadata] << z << br
+ #puts z unless z.empty?
+ end
+ end
+ def pot_metadata_src_trn
+ @po4a_identify_type='type: SiSU doc'
+ #@po4a_identify_type='type: Plain text'
+ meta_src=SiSU_Metadata::Summary.new(@md_src)
+ meta_trn=SiSU_Metadata::Summary.new(@md_trn)
+ w=[]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: title",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.title.main,
+ meta_src.metadata_tags.title.sub,
+ meta_src.metadata_tags.title.edition,
+ meta_src.metadata_tags.title.note,
+ meta_src.metadata_tags.title.short,
+ meta_src.metadata_tags.title.language,
+ meta_src.metadata_tags.title.language_char,
+ 'msgstr ""',
+ meta_trn.metadata_tags.title.main,
+ meta_trn.metadata_tags.title.sub,
+ meta_trn.metadata_tags.title.edition,
+ meta_trn.metadata_tags.title.note,
+ meta_trn.metadata_tags.title.short,
+ meta_trn.metadata_tags.title.language,
+ meta_trn.metadata_tags.title.language_char,
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: creator",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.creator.head,
+ meta_src.metadata_tags.creator.author,
+ meta_src.metadata_tags.creator.contributor,
+ meta_src.metadata_tags.creator.illustrator,
+ meta_src.metadata_tags.creator.photographer,
+ meta_src.metadata_tags.creator.translator,
+ meta_src.metadata_tags.creator.audio,
+ meta_src.metadata_tags.creator.digitized_by,
+ meta_src.metadata_tags.creator.prepared_by,
+ 'msgstr ""',
+ meta_trn.metadata_tags.creator.head,
+ meta_trn.metadata_tags.creator.author,
+ meta_trn.metadata_tags.creator.contributor,
+ meta_trn.metadata_tags.creator.illustrator,
+ meta_trn.metadata_tags.creator.photographer,
+ meta_trn.metadata_tags.creator.translator,
+ meta_trn.metadata_tags.creator.audio,
+ meta_trn.metadata_tags.creator.digitized_by,
+ meta_trn.metadata_tags.creator.prepared_by,
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: rights",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.rights.head,
+ meta_src.metadata_tags.rights.copyright.text,
+ meta_src.metadata_tags.rights.copyright.translation,
+ meta_src.metadata_tags.rights.copyright.illustrations,
+ meta_src.metadata_tags.rights.copyright.photographs,
+ meta_src.metadata_tags.rights.copyright.digitization,
+ meta_src.metadata_tags.rights.copyright.audio,
+ meta_src.metadata_tags.rights.license,
+ 'msgstr ""',
+ meta_trn.metadata_tags.rights.head,
+ meta_trn.metadata_tags.rights.copyright.text,
+ meta_trn.metadata_tags.rights.copyright.translation,
+ meta_trn.metadata_tags.rights.copyright.illustrations,
+ meta_trn.metadata_tags.rights.copyright.photographs,
+ meta_trn.metadata_tags.rights.copyright.digitization,
+ meta_trn.metadata_tags.rights.copyright.audio,
+ meta_trn.metadata_tags.rights.license,
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - metadata: classify",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.classify.head,
+ meta_src.metadata_tags.classify.subject,
+ meta_src.metadata_tags.classify.topic_register,
+ meta_src.metadata_tags.classify.loc,
+ meta_src.metadata_tags.classify.dewey,
+ #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.subject,
+ meta_trn.metadata_tags.classify.topic_register,
+ meta_trn.metadata_tags.classify.loc,
+ meta_trn.metadata_tags.classify.dewey,
+ #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",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.metadata_tags.date.head,
+ meta_src.metadata_tags.date.added_to_site,
+ meta_src.metadata_tags.date.available,
+ meta_src.metadata_tags.date.created,
+ meta_src.metadata_tags.date.issued,
+ meta_src.metadata_tags.date.modified,
+ meta_src.metadata_tags.date.published,
+ meta_src.metadata_tags.date.valid,
+ 'msgstr ""',
+ meta_trn.metadata_tags.date.head,
+ meta_trn.metadata_tags.date.added_to_site,
+ meta_trn.metadata_tags.date.available,
+ meta_trn.metadata_tags.date.created,
+ meta_trn.metadata_tags.date.issued,
+ meta_trn.metadata_tags.date.modified,
+ meta_trn.metadata_tags.date.published,
+ meta_trn.metadata_tags.date.valid,
+ ]
+ w << [
+ "#. #{@po4a_identify_type} - processing, make instruction",
+ "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
+ 'msgid ""',
+ meta_src.processing_tags.make.language,
+ meta_src.processing_tags.make.headings,
+ meta_src.processing_tags.make.num_top,
+ meta_src.processing_tags.make.breaks,
+ meta_src.processing_tags.make.emphasis,
+ meta_src.processing_tags.make.bold,
+ meta_src.processing_tags.make.italics,
+ meta_src.processing_tags.make.texpdf_font,
+ 'msgstr ""',
+ meta_trn.processing_tags.make.language,
+ meta_trn.processing_tags.make.headings,
+ meta_trn.processing_tags.make.num_top,
+ meta_trn.processing_tags.make.breaks,
+ meta_trn.processing_tags.make.emphasis,
+ meta_trn.processing_tags.make.bold,
+ meta_trn.processing_tags.make.italics,
+ meta_trn.processing_tags.make.texpdf_font,
+ ]
+ w.each do |y|
+ z=''
+ y.each do |x|
+ if x
+ z += x + "\n" if x =~/^#|^msg(?:id|str)/
+ z += %{"#{x}"\n} if x =~/^@\S+?:(?: |$)/
+ z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
+ end
+ end
+ @pot[:metadata] << z << br
+ #puts z unless z.empty?
+ end
+ end
+ def auto_translate?(set_to=nil)
+ @@auto_translation_=
+ if @md.opt.act[:po4a_lang_trans][:set]==:on
+ set_to \
+ ? set_to
+ : @@auto_translation_
+ else :skip
+ end
+ end
+ def auto_translation(src_txt,markup=:src) # check for an appropriate request flag
+ auto_translate?(:skip)
+ begin
+ src_txt_clean=clean_text(src_txt,markup)
+ src_txt_clean=src_txt_clean.
+ gsub(/\n/,' ').
+ gsub(/"/,'\"').
+ gsub(/([()])/,'\\\\\1')
+ trans=''
+ unless auto_translate? == :skip
+ require 'timeout'
+ Timeout::timeout(60) {
+ trans=`trans -b -no-ansi en:#{@md.opt.f_pth[:lng_is]} #{src_txt_clean}`.strip
+ unless trans.empty?
+ trans + ' {[G.Tr]}http://translate.google.com'
+ end
+ }
+ end
+ trans
+ rescue
+ auto_translate?(:skip)
+ p 'timeout issues with translation, skip remaining'
+ end
+ end
+ def pot_structure
+ def heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ lv=n=n3=nil
+ lv=dob_src.ln
+ n=lv - 1
+ n3=lv + 2
+ util=nil
+ fn=(dob_src.name=~/[a-z\d]/i) ? dob_src.name : ''
+ mark="#{dob_src.lv}~#{fn} "
+ d="#{dob_src.is.to_s} (level #{dob_src.lv})"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# markup for headings is marker at the start of the line/object, } \
+ + %{indicating the heading level, and if provided an associated name tag, } \
+ + %{this heading is "#{mark}"}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig="#{s_mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ wrapped=util.line_wrap
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
+ if @@endnotes[:para] \
+ and notes_s.length > 0 \
+ and not @@endnotes_
+ @pot[:body] << br
+ wrap_endnotes(notes_s,notes_t)
+ elsif @@endnotes[:para] \
+ and @@endnotes_
+ @pot[:body] << br*2
+ end
+ end
+ def para(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ util=nil
+ wrapped=if dob_src.indent =~/[1-9]/ \
+ and dob_src.indent == dob_src.hang
+ s_mark=desc=orig=trans=''
+ if dob_src.bullet_
+ mark="_#{dob_src.indent}* "
+ d="#{dob_src.is.to_s}: indent #{dob_src.indent}, bullet"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# markup for indented bullet text is at the start of the line/object, } \
+ + %{an underscore followed by the indent level and an asterisk "#{mark}"}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ else
+ mark="_#{dob_src.indent} "
+ d="#{dob_src.is.to_s}: indent #{dob_src.indent}"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# markup for indented text is at the start of the line/object, } \
+ + %{an underscore followed by the indent level "#{mark}"}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ end
+ orig="#{s_mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ elsif dob_src.hang =~/[0-9]/ \
+ and dob_src.indent != dob_src.hang
+ s_mark=desc=orig=trans=''
+ mark="_#{dob_src.hang}_#{dob_src.indent} "
+ d="#{dob_src.is.to_s}: hang #{dob_src.hang} indent #{dob_src.indent}"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# markup for indented text with a first line indented } \
+ + %{to a different level from the rest of the paragraph, } \
+ + %{is at the start of the line/object, } \
+ + %{an underscore and the first indent level } \
+ + %{a second underscore and the indent level for the rest of the paragraph, "#{mark1}"}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig="#{s_mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ else
+ s_mark=desc=orig=trans=''
+ if dob_src.bullet_
+ mark='_* '
+ d="#{dob_src.is.to_s}: bullet"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# markup for indented text is at the start of the line/object, } \
+ + %{an underscore followed by an asterisk "#{mark}"}
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig="#{s_mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ else
+ mark=''
+ d=dob_src.is.to_s
+ instruct=%{\n# regular paragraph, no special markup}
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct="\n# "
+ s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ end
+ wrapped=util.line_wrap
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
+ if @@endnotes[:para] \
+ and notes_s.length > 0 \
+ and not @@endnotes_
+ @pot[:body] << br
+ wrap_endnotes(notes_s,notes_t)
+ elsif @@endnotes[:para] \
+ and @@endnotes_
+ @pot[:body] << br*2
+ end
+ end
+ def block(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="block{\\n\\n...\\n\\n}block"
+ d=dob_src.is.to_s
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# block text is a text block with an opening and closing marker, } \
+ + %{the content of which may be wrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def group(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="group{\\n\\n...\\n\\n}group"
+ d=dob_src.is.to_s
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# group text is a text block with an opening and closing marker, } \
+ + %{the content of which may be wrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{s_mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def verse(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="poem{\n\nverse\n\nverse\n\n...\n\n}poem"
+ d=dob_src.is.to_s
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# verse are part of the text block described as a poem, } \
+ + %{the first verse is preceeded by an opening marker, } \
+ + %{and the last verse by a closing marker, } \
+ + %{the content of which should remain unwrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ trans=(dob_trn=='') ? '' : dob_trn.obj
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def code(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="code{\\n\\n...\\n\\n}code"
+ d=dob_src.is.to_s
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# codeblocks are a text block with an opening and closing marker, } \
+ + %{the content of which should remain unwrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ trans=(dob_trn=='') ? '' : dob_trn.obj
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def table(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="table{\\n\\n...\\n\\n}table"
+ d=dob_src.is.to_s
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# tables are a text block with an opening and closing marker, } \
+ + %{the content of which should remain unwrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=dob_src.obj
+ orig=orig.gsub(/#{Mx[:tc_c]}/,"\n")
+ trans=(dob_trn=='') ? '' : dob_trn.obj
+ trans=trans.gsub(/#{Mx[:tc_c]}/,"\n")
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def idx_markup(idx)
+ struct=['={']
+ idx.sort.each do |x|
+ x.each_with_index do |y,i0|
+ case y
+ when String
+ struct << ';' unless struct[-1] =~/=\{/
+ struct << y
+ if x[i0+1].class == Hash \
+ and x[i0+1][:sub].length > 0
+ struct << ':'
+ end
+ when Hash
+ if y[:plus].to_i > 0
+ struct << '+' + y[:plus].to_s
+ end
+ if y[:sub].length > 0
+ y[:sub].each_with_index do |z,i1|
+ z.each_with_index do |a,i2|
+ #p a
+ if z.length > 0
+ struct << a[0]
+ if a[1][:plus].to_i > 0
+ struct << '+' + a[1][:plus].to_s
+ end
+ if (i1 + 1) < y[:sub].length
+ struct << '|'
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ struct << '}'
+ #puts struct.join
+ struct.join
+ end
+ def idx(dob_src='',dob_trn='') #% used for book index but broken as original markup lost, already abstracted, fix
+ mark="={ ... }"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# the book index should be attached unwrapped to the preceding text block } \
+ + %{(there should be a new line, but no empty line)}
+ s_mark="\n# " + %{"\\n#{mark}\\n\\n"}
+ end
+ d='book-idx'
+ desc="#{d}#{s_mark}#{instruct}"
+ orig=pot_structure.idx_markup(dob_src.idx) #'={' + dob_src.idx + '}'
+ trans=if defined? dob_trn.idx \
+ and not dob_trn.idx.nil? \
+ and not dob_trn.idx.empty?
+ pot_structure.idx_markup(dob_trn.idx) #'={' + dob_trn.idx + '}'
+ else ''
+ end
+ util=pot_structure_wrap(desc,orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ self
+ end
+ def pot_markup(data_src,data_trn)
+ #@endnotes,@copen,@pot_contents_close=Array.new(3){[]}
+ a_l=if data_trn
+ a_l=(data_src.length >= data_trn.length) \
+ ? data_src.length
+ : data_trn.length
+ else
+ data_src.length
+ end
+ s,t=0,0
+ if @md.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/
+ (data_trn.nil?) \
+ ? pot_metadata_src
+ : pot_metadata_src_trn
+ end
+ 0.upto(a_l-1) do |i|
+ if data_trn
+ unless data_src[s] \
+ and data_trn[t]
+ break
+ end
+ if data_src[s].of == :comment \
+ and data_trn[t].of == :comment \
+ and (data_src[s].is == data_trn[t].is)
+ s+=1;t+=1
+ next
+ end
+ if ((data_src[s].is == :comment) \
+ || (data_trn[t].is == :comment)) \
+ and (data_src[s].is != data_trn[t].is)
+ if data_src[s].is == :comment
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "src (comment):\n\t" \
+ + data_src[s].obj
+ end
+ s+=1
+ #next if data_src[s].is == :comment
+ elsif data_trn[t].is == :comment
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "trans (comment):\n\t" \
+ + data_trn[t].obj
+ end
+ t+=1
+ #next if data_trn[t].is == :comment
+ end
+ end
+ if ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
+ and (data_src[s].ocn == data_trn[t].ocn)
+ @m_s,@m_t=s,t
+ elsif ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
+ and (data_src[s].ocn != data_trn[t].ocn)
+ p '--- OCN ---'
+ p 'mis-match'
+ p data_src[s].ocn
+ p data_src[s].obj
+ p data_trn[t].ocn
+ p data_trn[t].obj
+ p '---'
+ p 'previous match'
+ p data_src[@m_s].ocn
+ p data_src[@m_s].obj
+ p data_trn[@m_t].ocn
+ p data_trn[@m_t].obj
+ exit
+ elsif (((defined? data_src[s].ocn) \
+ && (defined? data_trn[t].ocn)) \
+ and data_src[s].ocn.class != data_trn[t].ocn.class)
+ p '--- OCN class ---'
+ p 'mis-match'
+ p data_src[s].ocn if defined? data_src[s].ocn
+ p data_src[s].obj
+ p data_trn[t].ocn if defined? data_trn[t].ocn
+ p data_trn[t].obj
+ #p '---'
+ #p 'previous match'
+ #p data_src[@m_s].ocn
+ #p data_src[@m_s].obj
+ #p data_trn[@m_t].ocn
+ #p data_trn[@m_t].obj
+ #elsif (defined? data_src[s].ocn != defined? data_trn[t].ocn) \
+ #and (data_src[s].ocn.nil? != data_trn[t].ocn.nil?)
+ # p '--- missing OCN? ---'
+ # p 'mis-match'
+ # p data_src[s].ocn if defined? data_src[s].ocn
+ # p data_src[s].obj
+ # p data_trn[t].ocn if defined? data_trn[t].ocn
+ # p data_trn[t].obj
+ else
+ end
+ end
+ notes_s,notes_t='',''
+ data_src[s],notes_s=markup(data_src[s])
+ if data_trn
+ data_trn[t],notes_t=markup(data_trn[t])
+ #data_src[s],data_trn[t]=pot_data(data_src[s],notes_s,data_trn[t],notes_t)
+ pot_data(data_src[s],notes_s,data_trn[t],notes_t)
+ else
+ #data_src[s],nul=pot_data(data_src[s],notes_s)
+ pot_data(data_src[s],notes_s)
+ end
+ s+=1;t+=1
+ end
+ @pot #watch
+ end
+ def pot_data(dob_src='',notes_s='',dob_trn='',notes_t='')
+ if dob_src.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
+ if defined? dob_src.ocn \
+ and dob_src.ocn.to_s =~/\d+/
+ paranum=dob_src.ocn.to_s
+ @p_num=SiSU_Po4aUtils::ParagraphNumber.new(paranum)
+ end
+ case dob_src.is
+ when :heading
+ pot_structure.heading(dob_src,notes_s,dob_trn,notes_t)
+ when :para
+ pot_structure.para(dob_src,notes_s,dob_trn,notes_t)
+ when :group
+ pot_structure.group(dob_src,notes_s,dob_trn,notes_t)
+ when :block
+ pot_structure.block(dob_src,notes_s,dob_trn,notes_t)
+ when :verse
+ pot_structure.verse(dob_src,notes_s,dob_trn,notes_t)
+ when :code
+ pot_structure.code(dob_src,notes_s,dob_trn,notes_t)
+ when :table
+ pot_structure.table(dob_src,notes_s,dob_trn,notes_t)
+ end
+ if defined? dob_src.idx \
+ and not dob_src.idx.nil? \
+ and not dob_src.idx.empty?
+ pot_structure.idx(dob_src,dob_trn)
+ end
+ dob_src='' if (dob_src.obj =~/<a name="n\d+">/ \
+ and dob_src.obj =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote
+ if dob_src ## Clean Prepared Text
+ dob_src.obj=dob_src.obj.gsub(/<!.+!>/,' ').
+ gsub(/<:\S+>/,' ') if dob_src ## Clean Prepared Text
+ end
+ end
+ #[dob_src,dob_trn]
+ end
+ def markup(dob)
+ dob,notes=objects.textface_marks_po4a(dob,:separate)
+ [dob,notes]
+ end
+ def publish(fn,pot)
+ content=[]
+ content << pot[:open]
+ content << pot[:head]
+ content << pot[:metadata]
+ content << pot[:body]
+ content << @@endnotes[:end] if @@endnotes_
+ Output.new(fn,content,@md,@process).po4a
+ @@endnotes={ para: [], end: [] }
+ end
+ end
+ class Po4aCfg
+ include SiSU_Composite_Doc_Utils # composite doc, .ssm, extract all related insert files, array of filenames test
+ def initialize(opt,file)
+ @opt,@file=opt,file
+ end
+ def po4a_cfg_filename
+ 'po4a.cfg'
+ end
+ def dir
+ def pwd
+ Dir.pwd
+ end
+ def po4a_
+ 'po4a/' # ''
+ end
+ def pot
+ po4a_ + 'pot'
+ end
+ def po
+ po4a_ + 'po'
+ end
+ self
+ end
+ def po4a_cfg_file
+ File.open("#{Dir.pwd}/#{po4a_cfg_filename}",'w')
+ end
+ def language
+ def sisu_languages_available
+ Px[:lng_lst]
+ end
+ def translation_languages_selected
+ @opt.act[:po4a_lang_trans][:trn] \
+ ? @opt.act[:po4a_lang_trans][:trn]
+ : []
+ end
+ def translation_languages_selected_that_are_available
+ translation_languages_selected & sisu_languages_available
+ end
+ def source_language_selected_str
+ @opt.act[:po4a_lang_trans][:src] \
+ ? @opt.act[:po4a_lang_trans][:src]
+ : 'en'
+ end
+ def translation_languages_selected_that_are_available_str
+ translation_languages_selected_that_are_available.join(' ')
+ end
+ def translation_languages_selected_str
+ @opt.act[:po4a_lang_trans][:trn].join(' ')
+ end
+ self
+ end
+ def po4a_cfg
+ doc_import_list=composite_and_imported_filenames_array(@opt.fno)
+ po4a_cfg_arr=[]
+ po4a_cfg_arr \
+ << "[po4a_langs] #{language.translation_languages_selected_that_are_available_str}"
+ po4a_cfg_arr \
+ << "[po4a_paths] #{dir.pot}/$master.pot $lang:#{dir.po}/$lang/$master.po"
+ doc_import_list.each do |file_src|
+ file_src_fn=
+ file_src.gsub(/#{language.source_language_selected_str}\//,'')
+ po4a_cfg_arr \
+ << "[type: text] #{file_src} $lang:$lang/#{file_src_fn}"
+ end
+ file=@file.write_file.po4a_cfg
+ po4a_cfg_arr.each do |txt|
+ puts txt
+ file << txt << "\n"
+ end
+ file.close
+ end
+ end
+ class Output <Source
+ include SiSU_Param
+ include SiSU_Env
+ def initialize(fn,content,md,process=:complete)
+ @fn,@content,@md,@process=fn,content,md,process
+ @file=SiSU_Env::FileOp.new(md,fn)
+ end
+ def po4a #%pot output
+ file_pot=(@md.opt.f_pth[:lng] == @md.opt.lng_base) \
+ ? @file.write_file.pot
+ : @file.write_file.po
+ @sisu=[]
+ emptyline=0
+ @content.each do |para| # this is a hack
+ if para.is_a?(Array) \
+ and para.length > 0
+ para.each do |line|
+ if line
+ line=line.gsub(/\s+$/m,'').
+ gsub(/^\A[ ]*\Z/m,'')
+ if line=~/^\A[ ]*\Z/m
+ emptyline+=1
+ else emptyline=0
+ end
+ file_pot.puts line if emptyline < 2 #remove extra line spaces (fix upstream)
+ end
+ end
+ else file_pot.puts para #unix plaintext # /^([*=-]|\.){5}/
+ end
+ end
+ file_pot.close
+ SiSU_Po4aUtils::PotNumber.new.reset
+ po4a_git
+ end
+ def po4a_git
+ unless @md.opt.act[:maintenance][:set]==:on
+ require_relative 'git' # git.rb
+ git=SiSU_Git::Source.new(@md.opt,@process)
+ unless FileTest.directory?(@file.output_path.pot_git.dir)
+ git.create_file_structure_git
+ end
+ if @md.opt.f_pth[:lng] == @md.opt.lng_base
+ FileUtils::cp(
+ @file.place_file.pot.dir,
+ @file.output_path.pot_git.dir
+ )
+ else # naive, work on -->
+ FileUtils::cp(
+ @file.place_file.po.dir,
+ @file.output_path.po_git.dir
+ ) #unless FileTest.file?(@file.place_file.po_git.dir)
+ end
+ git.read
+ end
+ end
+ end
+ end
+end
+__END__
+&#033;\|&#035;\|&&#042;\|&#045;\|&#047;\|&#095;\|&#123;\|&#125;\|&#126;\|&#
+
+tables are problematic, difficult to reconstitute instruction, check
+
+metadata, move to top? and work on
+
+footnotes, different types, asterisk, also do you want to have separate
+paragraphs, or breaks within one block?
+
+where no ocn appropriately use ~# or -# or indeed 1~name-
+
+comments in document, what to do about them, not sure they are currently
+retained in dal, could be quite valuable to keep
+
+Translate Shell
+http://www.soimort.org/translate-shell/
+translate.google.com
diff --git a/lib/sisu/v6/po4a_set.rb b/lib/sisu/develop/src_po4a_shelf_set.rb
index 2fc56cb9..a281060d 100644
--- a/lib/sisu/v6/po4a_set.rb
+++ b/lib/sisu/develop/src_po4a_shelf_set.rb
@@ -1,66 +1,64 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** po4a
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/po4a_set.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by flatfile output generators
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_shelf_set.rb;hb=HEAD>
=end
module SiSU_Po4aUtils
class Wrap
def initialize(md,orig='',trans='',is_desc='',n_char_max=76,n_indent=0,n_hang=nil)
- @md,@orig,@trans,@is_desc,@n_char_max,@n_indent=md,orig,trans,is_desc,n_char_max,n_indent
+ @md,@orig,@trans,@is_desc,@n_char_max,@n_indent=
+ md, orig, trans, is_desc, n_char_max, n_indent
@n_char_max_extend = n_char_max
@br="\n"
@n_hang=n_hang ? n_hang : @n_indent
@@ -69,7 +67,8 @@ module SiSU_Po4aUtils
end
def line_wrap
space=' '
- spaces_indent,spaces_hang="#{@br}#{space*@n_indent}",space*@n_hang
+ spaces_indent,spaces_hang=
+ "#{@br}#{space*@n_indent}",space*@n_hang
pot,i=[],0
pot_array=(@trans.empty?) ? [@orig] : [@orig,@trans]
pot_array.each do |pa|
@@ -79,7 +78,7 @@ module SiSU_Po4aUtils
@oldword='' #REMOVE @oldword
pa=pa.gsub(/<br>/,' <br> ').
gsub(/#{Mx[:br_nl]}/,"\n\n")
- words=pa.scan(/\n\n|<br>|\S+/m)
+ words=pa.scan(/\n\n|\\\\\\|<br>|\S+/m)
while words != ''
word=words.shift
if not word
diff --git a/lib/sisu/develop/src_po4a_sst_ao_sst.rb b/lib/sisu/develop/src_po4a_sst_ao_sst.rb
new file mode 100644
index 00000000..c1c85052
--- /dev/null
+++ b/lib/sisu/develop/src_po4a_sst_ao_sst.rb
@@ -0,0 +1,893 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** pot file generation
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_sst_ao_sst.rb;hb=HEAD>
+
+=end
+module SiSU_SStm_AO_SStm
+ require_relative 'ao' # ao.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ require_relative 'ao_composite' # ao_composite.rb
+ require_relative 'shared_metadata' # shared_metadata.rb
+ require_relative 'src_po4a_share' # src_po4a_share.rb
+ require_relative 'src_po4a_sst_ao_sst_set' # src_po4a_sst_ao_sst_set.rb
+ include SiSU_Param
+ require_relative 'object_munge' # object_munge.rb
+ require_relative 'utils_composite' # utils_composite.rb
+ require_relative 'utils_response' # utils_response.rb
+ class Source
+ include SiSU_Object_Munge
+ include SiSU_Languages_Selected
+ include SiSU_Response
+ @@md_src,@@md_master=
+ nil, nil
+ @@auto_translation_ = :go
+ def initialize(opt,fn=nil)
+ @opt,@fn=opt,fn
+ #unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/
+ # puts "#{@opt.fns} not a processed file type"
+ #end
+ file_arr=SiSU_Info_Env::InfoEnv.new.
+ source_file_processing_array(@opt.fno)
+ SiSU_Param::Parameters::Instructions.new(file_arr,@opt).extract
+ r=Px[:lng_lst_rgx].gsub(/\|#{language.source_language_selected_str}\|/,'|')
+ @lang_regx=%r{(?:#{r})}
+ @@todo=if source_language_selected_str == opt.f_pth[:lng]
+ :same_file
+ else :compare
+ end
+ if opt.f_pth[:lng]==@opt.lng_base \
+ and opt.f_pth[:lng]==source_language_selected_str
+ @@md_master=SiSU_Param::Parameters.new(opt).get
+ end
+ end
+ def wrap_width_set(md,env)
+ if defined? md.make.plaintext_wrap \
+ and md.make.plaintext_wrap
+ md.make.plaintext_wrap
+ elsif defined? env.plaintext_wrap \
+ and env.plaintext_wrap
+ #env.plaintext_wrap # 78 use 75
+ 75
+ else 75 #78
+ end
+ end
+ def process_file(md,env,file,wrap_width,fn)
+ if source_language_selected_str == @opt.f_pth[:lng]
+ @@ao_arr_lang_trans=
+ SiSU_AO::Source.new(
+ @opt,
+ fn,
+ :po4a
+ ).get # ao file drawn here
+ end
+ @ao_arr_lang_src=
+ SiSU_AO::Source.new(
+ @opt,
+ fn,
+ :po4a
+ ).get # ao file drawn here
+ SiSU_SStm_AO_SStm::Source::Scroll.new(
+ fn,
+ @ao_arr_lang_src,
+ @@ao_arr_lang_trans,
+ @@md_src,
+ @@md_master,
+ wrap_width
+ ).songsheet
+ end
+ def read_process_src_files
+ begin
+ src={}
+ src[:pth]=@opt.f_pth[:pth]
+ src[:files]=if @opt.fns =~ /\.(?:(?:-|ssm\.)sst|ssm)$/
+ @opt.fns=@opt.fns.gsub(/\.ssm\.sst$/,'.ssm')
+ SiSU_Assemble::CompositeFileList.new(@opt).read
+ else
+ [@opt.fns]
+ end
+ md=SiSU_Param::Parameters.new(@opt).get
+ env=SiSU_Env::InfoEnv.new(@opt.fns)
+ file=SiSU_Env::FileOp.new(md)
+ lng=/\/([^\/]+)$/.match(src[:pth])[1]
+ if language.source_language_selected_str == lng
+ SiSU_Po4a_Project::Po4aDistClean.new(@opt,file).song
+ end
+ wrap_width=wrap_width_set(md,env)
+ lng = /\/([^\/]+)$/.match(src[:pth])[1]
+ ans=response?('process files?')
+ if ans
+ src[:files].each do |fn|
+ puts "[#{lng}] #{fn}"
+ process_file(md,env,file,wrap_width,fn)
+ end
+ end
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ def read_setup
+ begin
+ md=SiSU_Param::Parameters.new(@opt).get
+ file=SiSU_Env::FileOp.new(md)
+ SiSU_Po4a_Project::Po4aCfg.new(@opt,file).song
+ SiSU_Po4a_Project::Po4aProject.new(@opt,file).song
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ private
+ class Scroll <Source
+ include SiSU_Po4aUtils
+ @@endnotes={ para: [], end: [] }
+ def initialize(fn,data_src,data_master,md_src,md_master,wrap_width)
+ @fn,@data_src,@data_master,@md_src,@md_master,@wrap_width=
+ fn, data_src, data_master, md_src, md_master, wrap_width
+ @md=md_src
+ @tab="\t"
+ @@endnotes_=(@md.opt.selections.str =~/--endnote/) \
+ ? true
+ : false # --footnote
+ @pot={
+ body: [],
+ open: [],
+ close: [],
+ head: [],
+ metadata: [],
+ tail: []
+ }
+ end
+ def br
+ (@md.opt.selections.str =~/--dos/) ? "\r\n" : "\n" # --unix
+ end
+ def songsheet
+ fn=@fn
+ pot=compare_structure_src_trn(@data_src,@data_master,@@todo)
+ publish(fn,pot)
+ end
+ def pot_structure_wrap(orig,trans,indent=0,hang=0)
+ SiSU_Po4aUtils::Wrap.new(
+ @md,
+ orig,
+ trans,
+ @wrap_width,
+ indent,
+ hang
+ )
+ end
+ def wrap_endnotes(orig_notes='',trn_notes='')
+ #nt=@@endnotes_ ? 'endnote' : 'footnote'
+ @fn=0
+ a_l=orig_notes.length
+ 0.upto(a_l-1) do |i|
+ @fn=if orig_notes[i].to_s =~/^\^~([\d*+]+)/ # provides endnote number within paragraph
+ @fn += 1
+ else @fn
+ end
+ #mark="^~ "
+ orig=(orig_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (orig_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : orig_notes[i].to_s
+ trans=if trn_notes.is_a?(Array) \
+ and trn_notes.length==orig_notes.length
+ (trn_notes[i].to_s =~/^\^~[\d*+]+/) \
+ ? (trn_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~'))
+ : trn_notes[i].to_s
+ else ''
+ end
+ util=pot_structure_wrap(orig,trans)
+ wrap=util.line_wrap
+ wrap=if wrap =~ /^\s*\^~[\d*+]+\s+.+?\s*\Z/m
+ wrap.gsub(/^\s*(\^~[\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB
+\\1 \\2
+GSUB
+ )
+ else
+ wrap.gsub(/^(.+)\Z/m, <<GSUB
+\\1
+GSUB
+ )
+ end
+ @@endnotes[:para] << wrap
+ @@endnotes[:end] << '' << wrap
+ end
+ @@endnotes[:para].each {|e| @pot[:body] << e << br}
+ @@endnotes[:para]=[]
+ @@endnotes
+ end
+ def pot_metadata_src
+ @po4a_identify_type='type: SiSU doc' #'type: Plain text'
+ meta_src=SiSU_Metadata::Summary.new(@md_src)
+ w=[]
+ w << [
+ meta_src.metadata_tags.title.main,
+ meta_src.metadata_tags.title.sub,
+ meta_src.metadata_tags.title.edition,
+ meta_src.metadata_tags.title.note,
+ meta_src.metadata_tags.title.short,
+ meta_src.metadata_tags.title.language,
+ meta_src.metadata_tags.title.language_char,
+ ]
+ w << [
+ meta_src.metadata_tags.creator.head,
+ meta_src.metadata_tags.creator.author,
+ meta_src.metadata_tags.creator.contributor,
+ meta_src.metadata_tags.creator.illustrator,
+ meta_src.metadata_tags.creator.photographer,
+ meta_src.metadata_tags.creator.translator,
+ meta_src.metadata_tags.creator.audio,
+ meta_src.metadata_tags.creator.digitized_by,
+ meta_src.metadata_tags.creator.prepared_by,
+ ]
+ w << [
+ meta_src.metadata_tags.rights.head,
+ meta_src.metadata_tags.rights.copyright.text,
+ meta_src.metadata_tags.rights.copyright.translation,
+ meta_src.metadata_tags.rights.copyright.illustrations,
+ meta_src.metadata_tags.rights.copyright.photographs,
+ meta_src.metadata_tags.rights.copyright.digitization,
+ meta_src.metadata_tags.rights.copyright.audio,
+ meta_src.metadata_tags.rights.license,
+ ]
+ w << [
+ meta_src.metadata_tags.classify.head,
+ meta_src.metadata_tags.classify.subject,
+ meta_src.metadata_tags.classify.topic_register,
+ meta_src.metadata_tags.classify.loc,
+ meta_src.metadata_tags.classify.dewey,
+ ]
+ w << [
+ meta_src.metadata_tags.date.head,
+ meta_src.metadata_tags.date.added_to_site,
+ meta_src.metadata_tags.date.available,
+ meta_src.metadata_tags.date.created,
+ meta_src.metadata_tags.date.issued,
+ meta_src.metadata_tags.date.modified,
+ meta_src.metadata_tags.date.published,
+ meta_src.metadata_tags.date.valid,
+ ]
+ w << [
+ meta_src.processing_tags.make.language,
+ meta_src.processing_tags.make.headings,
+ meta_src.processing_tags.make.num_top,
+ meta_src.processing_tags.make.breaks,
+ meta_src.processing_tags.make.emphasis,
+ meta_src.processing_tags.make.bold,
+ meta_src.processing_tags.make.italics,
+ meta_src.processing_tags.make.texpdf_font,
+ ]
+ w.each do |y|
+ z=''
+ y.each do |x|
+ if x
+ z += x + "\n" if x =~/^#|^msg(?:id|str)/
+ z += %{#{x}\n} if x =~/^@\S+?:(?: |$)/
+ z += %{#{x}\n} if x =~/^\s+:\S+?: /
+ end
+ end
+ @pot[:metadata] << z << br
+ #puts z unless z.empty?
+ end
+ end
+ def pot_metadata_src_trn
+ #@po4a_identify_type='type: Plain text'
+ meta_src=SiSU_Metadata::Summary.new(@md_src)
+ w=[]
+ w << [
+ meta_src.metadata_tags.title.main,
+ meta_src.metadata_tags.title.sub,
+ meta_src.metadata_tags.title.edition,
+ meta_src.metadata_tags.title.note,
+ meta_src.metadata_tags.title.short,
+ meta_src.metadata_tags.title.language,
+ meta_src.metadata_tags.title.language_char,
+ ]
+ w << [
+ meta_src.metadata_tags.creator.head,
+ meta_src.metadata_tags.creator.author,
+ meta_src.metadata_tags.creator.contributor,
+ meta_src.metadata_tags.creator.illustrator,
+ meta_src.metadata_tags.creator.photographer,
+ meta_src.metadata_tags.creator.translator,
+ meta_src.metadata_tags.creator.audio,
+ meta_src.metadata_tags.creator.digitized_by,
+ meta_src.metadata_tags.creator.prepared_by,
+ ]
+ w << [
+ meta_src.metadata_tags.rights.head,
+ meta_src.metadata_tags.rights.copyright.text,
+ meta_src.metadata_tags.rights.copyright.translation,
+ meta_src.metadata_tags.rights.copyright.illustrations,
+ meta_src.metadata_tags.rights.copyright.photographs,
+ meta_src.metadata_tags.rights.copyright.digitization,
+ meta_src.metadata_tags.rights.copyright.audio,
+ meta_src.metadata_tags.rights.license,
+ ]
+ w << [
+ meta_src.metadata_tags.classify.head,
+ meta_src.metadata_tags.classify.subject,
+ meta_src.metadata_tags.classify.topic_register,
+ meta_src.metadata_tags.classify.loc,
+ meta_src.metadata_tags.classify.dewey,
+ ]
+ w << [
+ meta_src.metadata_tags.date.head,
+ meta_src.metadata_tags.date.added_to_site,
+ meta_src.metadata_tags.date.available,
+ meta_src.metadata_tags.date.created,
+ meta_src.metadata_tags.date.issued,
+ meta_src.metadata_tags.date.modified,
+ meta_src.metadata_tags.date.published,
+ meta_src.metadata_tags.date.valid,
+ ]
+ w << [
+ meta_src.processing_tags.make.language,
+ meta_src.processing_tags.make.headings,
+ meta_src.processing_tags.make.num_top,
+ meta_src.processing_tags.make.breaks,
+ meta_src.processing_tags.make.emphasis,
+ meta_src.processing_tags.make.bold,
+ meta_src.processing_tags.make.italics,
+ meta_src.processing_tags.make.texpdf_font,
+ ]
+ w.each do |y|
+ z=''
+ y.each do |x|
+ if x
+ z += x + "\n" if x =~/^#|^msg(?:id|str)/
+ z += %{#{x}\n} if x =~/^@\S+?:(?: |$)/
+ z += %{#{x}\n} if x =~/^\s+:\S+?: /
+ end
+ end
+ @pot[:metadata] << z << br
+ #puts z unless z.empty?
+ end
+ end
+ def auto_translate?(set_to=nil)
+ @@auto_translation_=
+ if @md.opt.act[:po4a_lang_trans][:set]==:on
+ set_to \
+ ? set_to
+ : @@auto_translation_
+ else :skip
+ end
+ end
+ def auto_translation(src_txt,markup=:src) # check for an appropriate request flag
+ auto_translate?(:skip)
+ begin
+ src_txt_clean=clean_text(src_txt,markup)
+ src_txt_clean=src_txt_clean.
+ gsub(/\n/,' ').
+ gsub(/"/,'\"').
+ gsub(/([()])/,'\\\\\1')
+ trans=''
+ unless auto_translate? == :skip
+ require 'timeout'
+ Timeout::timeout(60) {
+ trans=`trans -b -no-ansi en:#{@md.opt.f_pth[:lng_is]} #{src_txt_clean}`.strip
+ unless trans.empty?
+ trans + ' {[G.Tr]}http://translate.google.com'
+ end
+ }
+ end
+ trans
+ rescue
+ auto_translate?(:skip)
+ p 'timeout issues with translation, skip remaining'
+ end
+ end
+ def pot_structure
+ def heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ lv=n=n3=nil
+ lv=dob_src.ln
+ n=lv - 1
+ n3=lv + 2
+ util=nil
+ fn=(dob_src.name=~/[a-z\d]/i) ? dob_src.name : ''
+ mark="#{dob_src.lv}~#{fn} "
+ orig="#{mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(orig,trans)
+ wrapped=util.line_wrap
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
+ if @@endnotes[:para] \
+ and notes_s.length > 0 \
+ and not @@endnotes_
+ @pot[:body] << br
+ wrap_endnotes(notes_s,notes_t)
+ elsif @@endnotes[:para] \
+ and @@endnotes_
+ @pot[:body] << br*2
+ end
+ end
+ def para(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ util=nil
+ wrapped=if dob_src.indent =~/[1-9]/ \
+ and dob_src.indent == dob_src.hang
+ s_mark=desc=orig=trans=''
+ mark=if dob_src.bullet_
+ "_#{dob_src.indent}* "
+ else
+ "_#{dob_src.indent} "
+ end
+ orig="#{mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(orig,trans)
+ elsif dob_src.hang =~/[0-9]/ \
+ and dob_src.indent != dob_src.hang
+ s_mark=desc=orig=trans=''
+ mark="_#{dob_src.hang}_#{dob_src.indent} "
+ orig="#{mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(orig,trans)
+ else
+ s_mark=desc=orig=trans=''
+ if dob_src.bullet_
+ mark='_* '
+ orig="#{mark}#{dob_src.obj}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ else
+ mark=''
+ orig=dob_src.obj
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark}#{dob_trn.obj}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ end
+ util=pot_structure_wrap(orig,trans)
+ end
+ wrapped=util.line_wrap
+ @pot[:body] << wrapped << br # main text, contents, body KEEP
+ if @@endnotes[:para] \
+ and notes_s.length > 0 \
+ and not @@endnotes_
+ @pot[:body] << br
+ wrap_endnotes(notes_s,notes_t)
+ elsif @@endnotes[:para] \
+ and @@endnotes_
+ @pot[:body] << br*2
+ end
+ end
+ def block(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark_o ="block{\n\n"
+ mark_c ="\n\n}block"
+ orig="#{mark_o}#{dob_src.obj}#{mark_c}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark_o}#{dob_trn.obj}#{mark_c}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def group(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark_o ="group{\n\n"
+ mark_c ="\n\n}group"
+ orig="#{mark_o}#{dob_src.obj}#{mark_c}"
+ trans=((dob_trn=='') \
+ || (dob_src.obj == dob_trn.obj)) \
+ ? ''
+ : "#{mark_o}#{dob_trn.obj}#{mark_c}"
+ if @md.opt.f_pth[:lng_is] !=@md.opt.lng_base \
+ and trans.empty? \
+ and auto_translate?
+ trans=auto_translation(dob_src.obj,:src)
+ end
+ util=pot_structure_wrap(orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def verse(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark="poem{\n\nverse\n\nverse\n\n...\n\n}poem"
+ instruct=s_mark=''
+ if @md.opt.act[:maintenance][:set]==:on
+ instruct=%{\n# verse are part of the text block described as a poem, } \
+ + %{the first verse is preceeded by an opening marker, } \
+ + %{and the last verse by a closing marker, } \
+ + %{the content of which should remain unwrapped}
+ s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
+ end
+ orig=dob_src.obj
+ trans=(dob_trn=='') \
+ ? ''
+ : dob_trn.obj
+ util=pot_structure_wrap(orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def code(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark_o ="code{\n\n"
+ mark_c ="\n\n}code"
+ orig="#{mark_o}#{dob_src.obj}#{mark_c}"
+ trans=(dob_trn=='') \
+ ? ''
+ : "#{mark_o}#{dob_trn.obj}#{mark_c}"
+ util=pot_structure_wrap(orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def table(dob_src='',notes_s='',dob_trn='',notes_t='') #% used to extract the structure of a document
+ mark_o ="table{\n\n"
+ mark_c ="\n\n}table"
+ orig="#{mark_o}#{dob_src.obj}#{mark_c}"
+ orig=orig.gsub(/#{Mx[:tc_c]}/m,"\n")
+ trans=(dob_trn=='') \
+ ? ''
+ : "#{mark_o}#{dob_trn.obj}#{mark_c}"
+ trans=trans.gsub(/#{Mx[:tc_c]}/m,"\n")
+ util=pot_structure_wrap(orig,trans)
+ unwrapped=util.no_line_wrap_block
+ @pot[:body] << unwrapped << br
+ end
+ def idx_markup(idx)
+ struct=['={' + "\n "]
+ idx.sort.each do |x|
+ x.each_with_index do |y,i0|
+ case y
+ when String
+ unless struct[-1] =~/=\{/
+ struct << ' ;' + "\n "
+ end
+ struct << y
+ if x[i0+1].class == Hash \
+ and x[i0+1][:sub].length > 0
+ struct << ' :' + "\n "
+ end
+ when Hash
+ if y[:plus].to_i > 0
+ struct << '+' + y[:plus].to_s
+ end
+ if y[:sub].length > 0
+ y[:sub].each_with_index do |z,i1|
+ z.each_with_index do |a,i2|
+ if z.length > 0
+ struct << a[0]
+ if a[1][:plus].to_i > 0
+ struct << '+' + a[1][:plus].to_s
+ end
+ if (i1 + 1) < y[:sub].length
+ struct << '|'
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ struct << "\n" + '}'
+ #puts struct.join
+ struct.join
+ end
+ def idx(dob_src='') #% used for book index but broken as original markup lost, already abstracted, fix
+ orig=pot_structure.idx_markup(dob_src.idx) #'={' + dob_src.idx + '}'
+ util=pot_structure_wrap(orig,'')
+ unwrapped=util.no_line_wrap_block
+ if @pot[:body][-1] == "\n"
+ @pot[:body][-1] = unwrapped #<< br
+ @pot[:body] << br
+ else # expect to catch all above, problem if wraps, must =~/^=\{/
+ @pot[:body] << unwrapped << br # places idx in separate object
+ end
+ end
+ self
+ end
+ def compare_structure_src_trn(data_src,data_trn,todo)
+ #@endnotes,@copen,@pot_contents_close=Array.new(3){[]}
+ a_l= data_src.length
+ s,t=0,0
+ 0.upto(a_l-1) do |i|
+ if todo==:compare
+ unless data_src[s] \
+ and data_trn[t]
+ break
+ end
+ if data_src[s].of == :comment \
+ and data_trn[t].of == :comment \
+ and (data_src[s].is == data_trn[t].is)
+ s+=1;t+=1
+ next
+ end
+ if ((data_src[s].is == :comment) \
+ || (data_trn[t].is == :comment)) \
+ and (data_src[s].is != data_trn[t].is)
+ if data_src[s].is == :comment
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "src (comment):\n\t" \
+ + data_src[s].obj
+ end
+ s+=1
+ #next if data_src[s].is == :comment
+ elsif data_trn[t].is == :comment
+ if @md.opt.act[:maintenance][:set]==:on
+ puts "trans (comment):\n\t" \
+ + data_trn[t].obj
+ end
+ t+=1
+ #next if data_trn[t].is == :comment
+ end
+ end
+ if ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
+ and (data_src[s].ocn == data_trn[t].ocn)
+ @m_s,@m_t=s,t
+ elsif ((defined? data_src[s].ocn) \
+ && (data_src[s].ocn.is_a?(Fixnum))) \
+ and ((defined? data_trn[t].ocn) \
+ && (data_trn[t].ocn.is_a?(Fixnum))) \
+ and (data_src[s].ocn != data_trn[t].ocn)
+ p '--- OCN ---'
+ p 'mis-match'
+ p data_src[s].ocn if defined? data_src[s].ocn
+ p data_src[s].obj if defined? data_src[s].obj
+ p data_trn[t].ocn if defined? data_trn[t].ocn
+ p data_trn[t].obj if defined? data_trn[t].obj
+ p '---'
+ p 'previous match'
+ p data_src[@m_s].ocn if defined? data_src[@m_s].ocn
+ p data_src[@m_s].obj if defined? data_src[@m_s].obj
+ p data_trn[@m_t].ocn if defined? data_trn[@m_t].ocn
+ p data_trn[@m_t].obj if defined? data_trn[@m_s].obj
+ exit
+ elsif (((defined? data_src[s].ocn) \
+ && (defined? data_trn[t].ocn)) \
+ and data_src[s].ocn.class != data_trn[t].ocn.class)
+ p '--- OCN class ---'
+ p 'mis-match'
+ p data_src[s].ocn if defined? data_src[s].ocn
+ p data_src[s].obj if defined? data_src[s].obj
+ p data_trn[t].ocn if defined? data_trn[t].ocn
+ p data_trn[t].obj if defined? data_trn[t].obj
+ #p '---'
+ #p 'previous match'
+ #p data_src[@m_s].ocn
+ #p data_src[@m_s].obj
+ #p data_trn[@m_t].ocn
+ #p data_trn[@m_t].obj
+ #elsif (defined? data_src[s].ocn != defined? data_trn[t].ocn) \
+ #and (data_src[s].ocn.nil? != data_trn[t].ocn.nil?)
+ # p '--- missing OCN? ---'
+ # p 'mis-match'
+ # p data_src[s].ocn if defined? data_src[s].ocn
+ # p data_src[s].obj
+ # p data_trn[t].ocn if defined? data_trn[t].ocn
+ # p data_trn[t].obj
+ else
+ end
+ end
+ notes_s=''
+ data_src[s],notes_s=markup(data_src[s])
+ data_src[s],nul=pot_data(data_src[s],notes_s)
+ s+=1;t+=1
+ end
+ @pot #watch
+ end
+ def pot_data(dob_src='',notes_s)
+ if dob_src.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
+ if defined? dob_src.ocn \
+ and dob_src.ocn.to_s =~/\d+/
+ paranum=dob_src.ocn.to_s
+ @p_num=SiSU_Po4aUtils::ParagraphNumber.new(paranum)
+ end
+ case dob_src.is
+ when :heading
+ pot_structure.heading(dob_src,notes_s)
+ when :para
+ pot_structure.para(dob_src,notes_s)
+ when :group
+ pot_structure.group(dob_src,notes_s)
+ when :block
+ pot_structure.block(dob_src,notes_s)
+ when :verse
+ pot_structure.verse(dob_src,notes_s)
+ when :code
+ pot_structure.code(dob_src,notes_s)
+ when :table
+ pot_structure.table(dob_src,notes_s)
+ end
+ if defined? dob_src.idx \
+ and not dob_src.idx.nil? \
+ and not dob_src.idx.empty?
+ pot_structure.idx(dob_src)
+ end
+ #if dob_src ## Clean Prepared Text
+ # dob_src.obj=dob_src.obj.gsub(/<!.+!>/,' ').
+ # gsub(/<:\S+>/,' ') if dob_src ## Clean Prepared Text
+ #end
+ end
+ #[dob_src,dob_trn]
+ end
+ def markup(dob)
+ dob,notes=objects.textface_marks_po4a(dob,:separate)
+ [dob,notes]
+ end
+ def publish(fn,pot)
+ content=[]
+ content << pot[:open]
+ content << pot[:head]
+ content << pot[:metadata]
+ content << pot[:body]
+ content << @@endnotes[:end] if @@endnotes_
+ Output.new(fn,content,@md,@process).po4a
+ @@endnotes={ para: [], end: [] }
+ end
+ end
+ class Output <Source
+ include SiSU_Param
+ include SiSU_Env
+ def initialize(fn,content,md,process=:complete)
+ @fn,@content,@md,@process=fn,content,md,process
+ @file=SiSU_Env::FileOp.new(md,fn)
+ end
+ def po4a #%pot output
+ file_pot=@file.write_file.po4a_sst
+ #file_pot=(@md.opt.f_pth[:lng] == @md.opt.lng_base) \
+ #? @file.write_file.pot
+ #: @file.write_file.po
+ @sisu=[]
+ emptyline=0
+ @content.each do |para| # this is a hack
+ if para.is_a?(Array) \
+ and para.length > 0
+ para.each do |line|
+ if line
+ line=line.gsub(/\s+$/m,'').
+ gsub(/^\A[ ]*\Z/m,'')
+ if line=~/^\A[ ]*\Z/m
+ emptyline+=1
+ else emptyline=0
+ end
+ file_pot.puts line if emptyline < 2 #remove extra line spaces (fix upstream)
+ end
+ end
+ else file_pot.puts para #unix plaintext # /^([*=-]|\.){5}/
+ end
+ end
+ file_pot.close
+ SiSU_Po4aUtils::PotNumber.new.reset
+ #po4a_git
+ end
+ def po4a_git
+ unless @md.opt.act[:maintenance][:set]==:on
+ require_relative 'git' # git.rb
+ git=SiSU_Git::Source.new(@md.opt,@process)
+ unless FileTest.directory?(@file.output_path.pot_git.dir)
+ git.create_file_structure_git
+ end
+ if @md.opt.f_pth[:lng] == @md.opt.lng_base
+ FileUtils::cp(
+ @file.place_file.pot.dir,
+ @file.output_path.pot_git.dir
+ )
+ else # naive, work on -->
+ FileUtils::cp(
+ @file.place_file.po.dir,
+ @file.output_path.po_git.dir
+ ) #unless FileTest.file?(@file.place_file.po_git.dir)
+ end
+ git.read
+ end
+ end
+ end
+ end
+end
+__END__
+REMOVE
+&#033;\|&#035;\|&&#042;\|&#045;\|&#047;\|&#095;\|&#123;\|&#125;\|&#126;\|&#
+
+tables are problematic, difficult to reconstitute instruction, check
+
+metadata, move to top? and work on
+
+footnotes, different types, asterisk, also do you want to have separate
+paragraphs, or breaks within one block?
+
+where no ocn appropriately use ~# or -# or indeed 1~name-
+
+comments in document, what to do about them, not sure they are currently
+retained in dal, could be quite valuable to keep
+
+Translate Shell
+http://www.soimort.org/translate-shell/
+translate.google.com
diff --git a/lib/sisu/develop/src_po4a_sst_ao_sst_set.rb b/lib/sisu/develop/src_po4a_sst_ao_sst_set.rb
new file mode 100644
index 00000000..46630866
--- /dev/null
+++ b/lib/sisu/develop/src_po4a_sst_ao_sst_set.rb
@@ -0,0 +1,284 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** po4a
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_sst_ao_sst_set.rb;hb=HEAD>
+
+=end
+module SiSU_Po4aUtils
+ class Wrap
+ def initialize(md,orig='',trans='',n_char_max=76,n_indent=0,n_hang=nil)
+ @md,@orig,@trans,@n_char_max,@n_indent=
+ md, orig, trans, n_char_max, n_indent
+ @n_char_max_extend = n_char_max
+ @br="\n"
+ @n_hang=n_hang ? n_hang : @n_indent
+ @po4a_identify_type='type: SiSU doc'
+ #@po4a_identify_type='type: Plain text'
+ end
+ def line_wrap
+ space=' '
+ spaces_indent,spaces_hang=
+ "#{@br}#{space*@n_indent}",space*@n_hang
+ pot,i=[],0
+ pot_array=(@trans.empty?) ? [@orig] : [@orig,@trans]
+ pot_array.each do |pa|
+ line=0
+ out=[]
+ out[line]=''
+ @oldword='' #REMOVE @oldword
+ pa=pa.gsub(/<br>/,' <br> ').
+ gsub(/#{Mx[:br_nl]}/,"\n\n")
+ words=pa.scan(/\n\n|\\\\\\|<br>|\S+/m)
+ while words != ''
+ word=words.shift
+ if not word
+ out[line] unless out[line].empty? #check
+ break
+ elsif word =~/\n\n/
+ word="\n"
+ @n_char_max_extend = @n_char_max + out[line].length
+ line=line
+ elsif (out[line].length + word.length) > (@n_char_max_extend - @n_indent) \
+ and out[line] =~/\S+/
+ @n_char_max_extend = @n_char_max
+ out[line].squeeze!(' ')
+ line += 1
+ end
+ if word
+ out[line]=if out[line] \
+ and out[line] !~/\S+$/m
+ "#{out[line]}#{word}"
+ elsif out[line] \
+ and out[line] =~/\S+/
+ "#{out[line]} #{word}"
+ else "#{word.strip}"
+ end
+ end
+ @oldword=word if word =~/\S+/
+ end
+ x=out.join(spaces_indent).gsub(/\A\n+/m,'').insert(0,spaces_hang)
+ z=[]
+ x.split(/\n/).each do |y|
+ z << y
+ end
+ pot[i]=z.join("\n")
+ i +=1
+ pot
+ end
+ trans=(pot.length == 2) ? pot[1] : ''
+ po_str=<<WOK
+#{pot[0]}
+WOK
+#{trans}
+ po_str
+ end
+ def no_line_wrap_block
+ pot,i=[],0
+ pot_array=(@trans.empty?) ? [@orig] : [@orig,@trans]
+ pot_array.each do |pa|
+ z=[]
+ pa.split(/\n\n/).each do |y|
+ z << y if not y.empty?
+ end
+ pot[i]=z.join("\n")
+ i +=1
+ pot
+ end
+ trans=(pot.length == 2) ? pot[1] : ''
+ po_str=<<WOK
+#{pot[0]}
+WOK
+#{trans}
+ po_str
+ end
+ def line_wrap_indent1
+ @n_indent,@n_hang=2,2
+ line_wrap
+ end
+ def line_wrap_endnote
+ @n_indent,@n_hang=4,2
+ line_wrap
+ end
+ def array_wrap
+ if @orig.is_a?(Array)
+ @arr=[]
+ @orig.each do |line|
+ @arr << SiSU_TextUtils::Wrap.new(line,@n_char_max,@n_indent,@n_hang).line_wrap
+ end
+ end
+ @arr
+ end
+ end
+ class HeaderScan
+ def initialize(md,para)
+ @md,@p=md,para
+ end
+ def extract(tag,tag_content,type,attrib)
+ if dc_tag \
+ and dc_content
+ [dc_tag,dc_content,{dc_tag=>dc_content}]
+ else nil
+ end
+ end
+ def header(tag,tag_content,type='',attrib='') #this will break stuff and must be tested thoroughly 20060825
+ @tag,@tag_content,@type,@attrib=tag,tag_content,type,attrib
+ def label #element
+ @tag
+ end
+ def type
+ @type
+ end
+ def text
+ @tag_content
+ end
+ def info #element text
+ @tag_content
+ end
+ def attribute
+ @attrib
+ end
+ def element
+ @tag
+ end
+ def attrib
+ @attrib
+ end
+ def el
+ @tag
+ end
+ self
+ end
+ def start_is_match
+ case @p
+ when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,@md.title.full,'meta','dc') #dc 1
+ when /^#{Mx[:meta_o]}(creator|author)#{Mx[:meta_c]}\s*(.+?)$/ then header('creator',$2,'meta','dc') #dc 2
+ when /^#{Mx[:meta_o]}(subject)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 3
+ when /^#{Mx[:meta_o]}(description)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 4
+ when /^#{Mx[:meta_o]}(publisher)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 5
+ when /^#{Mx[:meta_o]}(contributor)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 6
+ when /^#{Mx[:meta_o]}(date)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 7
+ when /^#{Mx[:meta_o]}(date\.created)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(date\.issued)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(date\.available)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(date\.valid)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(date\.modified)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(type)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 8
+ when /^#{Mx[:meta_o]}(format)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 9
+ when /^#{Mx[:meta_o]}(identifier)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 10
+ when /^#{Mx[:meta_o]}(source)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 11
+ when /^#{Mx[:meta_o]}(language)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 12
+ when /^#{Mx[:meta_o]}(relation)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 13
+ when /^#{Mx[:meta_o]}(coverage)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 14
+ when /^#{Mx[:meta_o]}(rights)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','dc') #dc 15
+ when /^#{Mx[:meta_o]}(keywords)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(copyright)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(translator|translated_by)#{Mx[:meta_c]}\s*(.+?)$/ then header('translator',$2)
+ when /^#{Mx[:meta_o]}(illustrator|illustrated_by)#{Mx[:meta_c]}\s*(.+?)$/ then header('illustrator',$2)
+ when /^#{Mx[:meta_o]}(prepared_by)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(digitized_by)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(comments?)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(abstract)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(tags?)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(catalogue)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(class(?:ify)?_loc)#{Mx[:meta_c]}\s*(.+?)$/ then header('classify_loc',$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(class(?:ify)?_dewey)#{Mx[:meta_c]}\s*(.+?)$/ then header('classify_dewey',$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(class(?:ify)?_pg)#{Mx[:meta_c]}\s*(.+?)$/ then header('classify_pg',$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(class(?:ify)?_isbn)#{Mx[:meta_c]}\s*(.+?)$/ then header('classify_isbn',$2,'meta','extra')
+ when /^#{Mx[:meta_o]}(toc|structure)#{Mx[:meta_c]}\s*(.+?)$/ then header('structure',$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(level|page|markup)#{Mx[:meta_c]}\s*(.+?)$/ then header('markup',$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(bold)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(italics|itali[sz]e)#{Mx[:meta_c]}\s*(.+?)$/ then header('italicize',$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(vocabulary|wordlist)#{Mx[:meta_c]}\s*(.+?)$/ then header('vocabulary',$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(css|stylesheet)#{Mx[:meta_c]}\s*(.+?)$/ then header('css',$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(links)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(prefix)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct') #add a & b
+ when /^#{Mx[:meta_o]}(suffix)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(information)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(contact)#{Mx[:meta_c]}\s*(.+?)$/ then header($1,$2,'process','instruct')
+ when /^#{Mx[:meta_o]}(rcs|cvs)#{Mx[:meta_c]}\s*(.+?)$/ then header('version',$2,'process','instruct')
+ else nil
+ end
+ end
+ def dublin
+ (@p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/) \
+ ? start_is_match
+ : nil
+ end
+ def meta
+ (@p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/) \
+ ? start_is_match
+ : nil
+ end
+ end
+ class ParagraphNumber
+ def initialize(paranum)
+ @paranum=/(\d+)/m.match(paranum)[1]
+ end
+ def display
+ @paranum.gsub(/(\d+)/,'#\1')
+ end
+ end
+ class PotNumber
+ @@n=0
+ def initialize
+ @@n +=2
+ end
+ def num
+ @@n
+ end
+ def reset
+ @@n=0
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/src_po4a_sstm.rb b/lib/sisu/develop/src_po4a_sstm.rb
new file mode 100644
index 00000000..74c5ac28
--- /dev/null
+++ b/lib/sisu/develop/src_po4a_sstm.rb
@@ -0,0 +1,135 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** share sisu source markup file, copy it to output directory!
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_po4a_sstm.rb;hb=HEAD>
+
+=end
+module SiSU_Markup
+ require_relative 'src_shared' # src_shared.rb
+ include SiSU_Source
+ require_relative 'src_po4a_share' # src_po4a_share.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source_Po4a < SiSU_Source::SiSUpodSource
+ def initialize(opt,build=nil,place=nil)
+ super(opt,build,place)
+ @opt=opt
+ md=SiSU_Param::Parameters.new(opt).get
+ @file=SiSU_Env::FileOp.new(md,opt.fno)
+ end
+ def dir_mk(dir)
+ unless FileTest.directory?(dir)
+ FileUtils::mkdir_p(dir)
+ end
+ end
+ def make_paths
+ dir_mk(@file.output_path.pot.dir)
+ dir_mk(@file.output_path.po.dir)
+ end
+ def language
+ def source_language_selected_str
+ @opt.act[:po4a_lang][:src] \
+ ? @opt.act[:po4a_lang][:src]
+ : 'en'
+ end
+ self
+ end
+ def read
+ unless @opt.act[:quiet][:set]==:on
+ (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
+ ? SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share document markup text source',
+ @opt.fns
+ ).cyan_hi_blue
+ : SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share document markup text source',
+ @opt.fns
+ ).cyan_title_hi
+ end
+ make_paths
+ if FileTest.directory?(@path_pod[:fnb])
+ FileUtils::mkdir_p(@file.output_path.src.dir) \
+ unless FileTest.directory?(@file.output_path.src.dir)
+ v=(@opt.act[:maintenance][:set]==:on) \
+ ? 'v' : ''
+ system(%{
+ #rsync -a#{v} #{@path_pod[:fnb]}/sisupod/doc/* #{@file.output_path.po4a.dir}
+ rsync -a#{v} #{@path_pod[:fnb]}/sisupod/doc/#{language.source_language_selected_str}* #{@file.output_path.po4a.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}
+ })
+ md=SiSU_Param::Parameters.new(@opt).get
+ file=SiSU_Env::FileOp.new(md)
+ SiSU_Po4a_Project::Po4aCfg.new(@opt,file).song
+ SiSU_Po4a_Project::Po4aProject.new(@opt,file).song
+ else
+ if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ '',
+ "#{@opt.fno} not available"
+ ).blue_tab
+ end
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/src_shared.rb b/lib/sisu/develop/src_shared.rb
index b047fe08..150ce84e 100644
--- a/lib/sisu/v5/src_shared.rb
+++ b/lib/sisu/develop/src_shared.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** create sisupod filetype and copy it to output directory!
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: create sisupod filetype and copy it to output directory!
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_shared.rb;hb=HEAD>
=end
module SiSU_Source
@@ -62,11 +59,13 @@ module SiSU_Source
class SiSUpodSource
require_relative 'se' # se.rb
require_relative 'se_hub_particulars' # se_hub_particulars.rb
+ require_relative 'utils_composite' # utils_composite.rb
+ include SiSU_Composite_Doc_Utils # composite doc, .ssm, extract all related insert files, array of filenames test
def initialize(opt,build=nil,place=nil)
@opt=opt
@date=SiSU_Env::InfoDate.new.dt
@env=SiSU_Env::InfoEnv.new(opt.fns)
- @ver=SiSU_Env::InfoVersion.instance.get_version
+ #@ver=SiSU_Env::InfoVersion.instance.get_version
@v=(@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on) \
? 'v' : ''
@@ -77,7 +76,6 @@ module SiSU_Source
processing_sisupod.make
path_pod=processing_sisupod.paths[:sisupod]
path_pod_fnb=processing_sisupod.paths[:fnb]
- @doc_import_list=[]
FileUtils::mkdir_p(path_pod) unless FileTest.directory?(path_pod)
@path_pod={
fnb: path_pod_fnb,
@@ -105,8 +103,7 @@ module SiSU_Source
end
unless @opt.fns.empty?
directories
- file_array=IO.readlines(@opt.fno,'')
- doc_import_list=pod_source_build(file_array) #this needs to be built in case of multi-lingual for all of them, before single pass tar
+ doc_import_list=composite_and_imported_filenames_array(@opt.fno)
doc_import_list=[@opt.fno, doc_import_list].flatten
image_extraction(doc_import_list)
language_versions
@@ -168,25 +165,37 @@ 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}")
+ FileUtils::cp(
+ "#{images_pwd}/#{i}",
+ "#{@path_pod[:image]}/#{i}"
+ )
else
STDERR.puts \
- %{\t*WARN* did not find image - "#{images_pwd}/#{i}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find image - } \
+ + %{"#{images_pwd}/#{i}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
end
else
STDERR.puts \
- %{\t*WARN* did not find - #{images_pwd} #{@path_pod[:image]} [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find - } \
+ + %{#{images_pwd} #{@path_pod[:image]} } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
end
if doc_import_list.length > 0 \
and @opt.fno =~/\.ssm$/
doc_import_list.each do |f|
if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f}")
- FileUtils::cp("#{@opt.base_path}#{doc_import_dir}/#{f}","#{@path_pod[:doc]}/#{f}")
+ FileUtils::cp(
+ "#{@opt.base_path}#{doc_import_dir}/#{f}",
+ "#{@path_pod[:doc]}/#{f}"
+ )
else
STDERR.puts \
- %{\t*WARN* did not find image - "#{@opt.base_path}#{doc_import_dir}/#{f}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find image - } \
+ + %{"#{@opt.base_path}#{doc_import_dir}/#{f}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
end
end
@@ -197,17 +206,22 @@ module SiSU_Source
if x[:f] \
and x[:f].length > 0 #store multiple document language versions, sisupod
x[:f].each do |f|
- FileUtils::mkdir_p(@path_pod[:doc]) unless FileTest.directory?(@path_pod[:doc])
+ FileUtils::mkdir_p(@path_pod[:doc]) \
+ unless FileTest.directory?(@path_pod[:doc])
if f[:f] =~/\~(\S{2,3})\.ss[tm]$/
lng_f=$1
if @opt.lng == lng_f
if @opt.fno =~/\.ssm$/
if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}")
- FileUtils::cp("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
- "#{@path_pod[:doc]}/#{f[:n]}")
+ FileUtils::cp(
+ "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
+ "#{@path_pod[:doc]}/#{f[:n]}"
+ )
else
STDERR.puts \
- %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find - } \
+ + %{"#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
else
if FileTest.file?("#{@opt.base_path}/#{f[:f]}")
@@ -221,23 +235,31 @@ module SiSU_Source
else :no
end
if cpy == :yes
- FileUtils::cp("#{@opt.base_path}/#{f[:f]}",
- "#{@path_pod[:doc]}/#{f[:n]}")
+ FileUtils::cp(
+ "#{@opt.base_path}/#{f[:f]}",
+ "#{@path_pod[:doc]}/#{f[:n]}"
+ )
end
else
STDERR.puts \
- %{\t*WARN* did not find - "#{@opt.base_path}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find - } \
+ + %{"#{@opt.base_path}/#{f[:f]}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
end
end
else
if @opt.fno =~/\.ssm$/
if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}")
- FileUtils::cp_r("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
- "#{@path_pod[:doc]}/#{f[:n]}")
+ FileUtils::cp_r(
+ "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
+ "#{@path_pod[:doc]}/#{f[:n]}"
+ )
else
STDERR.puts \
- %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find - } \
+ + %{"#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
else
if FileTest.file?("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}")
@@ -251,12 +273,16 @@ module SiSU_Source
else :no
end
if cpy == :yes
- FileUtils::cp("#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
- "#{@path_pod[:doc]}/#{f[:n]}")
+ FileUtils::cp(
+ "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}",
+ "#{@path_pod[:doc]}/#{f[:n]}"
+ )
end
else
STDERR.puts \
- %{\t*WARN* did not find - "#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" [#{__FILE__}:#{__LINE__}]}
+ %{\t*WARN* did not find - } \
+ + %{"#{@opt.base_path}#{doc_import_dir}/#{f[:f]}" } \
+ + %{[#{__FILE__}:#{__LINE__}]}
end
end
end
@@ -266,35 +292,6 @@ module SiSU_Source
def directories
SiSU_Env::InfoEnv.new.sisupod_v4(@opt)
end
- def ssm_doc_import_list(f)
- if @opt.fno =~/\.ss[mi]$/
- doc_import_list=[]
- if f =~@rgx_doc_import
- doc_import_list << f.scan(@rgx_doc_import)
- end
- doc_import_list.flatten.each do |i|
- if i =~/.ssi/
- file_array=IO.readlines(i,'')
- pod_source_build(file_array)
- end
- end
- end
- doc_import_list.uniq.flatten
- end
- def pod_source_build(file_array)
- @pwd=Dir.pwd
- @rgx_doc_import=/^<<\s*(\S+?\.ss[ti])/
- doc_import_list=[]
- file_array.each do |f| #% work area
- if f !~/^%+\s/
- if @opt.fno =~/\.ss[mi]$/
- @doc_import_list << ssm_doc_import_list(f)
- doc_import_list=@doc_import_list.flatten.uniq
- end
- end
- end
- doc_import_list
- end
end
end
__END__
diff --git a/lib/sisu/v6/src_sisupod_make.rb b/lib/sisu/develop/src_sisupod_make.rb
index a8dee5c8..0d3194ba 100644
--- a/lib/sisu/v6/src_sisupod_make.rb
+++ b/lib/sisu/develop/src_sisupod_make.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** create sisupod filetype and copy it to output directory!
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_sisupod_make.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: create sisupod filetype and copy it to output directory!
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_sisupod_make.rb;hb=HEAD>
=end
module SiSU_Doc
diff --git a/lib/sisu/develop/src_sisupod_sstm.rb b/lib/sisu/develop/src_sisupod_sstm.rb
new file mode 100644
index 00000000..e1ffd8cb
--- /dev/null
+++ b/lib/sisu/develop/src_sisupod_sstm.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** share sisu source markup file, copy it to output directory!
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/src_sisupod_sstm.rb;hb=HEAD>
+
+=end
+module SiSU_Markup
+ require_relative 'src_shared' # src_shared.rb
+ include SiSU_Source
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source_Sisupod < SiSU_Source::SiSUpodSource
+ def initialize(opt,build=nil,place=nil)
+ super(opt,build,place)
+ @opt=opt
+ end
+ def read
+ unless @opt.act[:quiet][:set]==:on
+ (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on) \
+ ? SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'Share document markup text source',
+ @opt.fns
+ ).cyan_hi_blue
+ : SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ '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.act[:maintenance][:set]==:on) \
+ ? '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
+ if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ '',
+ "#{@opt.fno} not available"
+ ).blue_tab
+ end
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/sst_convert_markup.rb b/lib/sisu/develop/sst_convert_markup.rb
index 70615d1c..8a63636f 100644
--- a/lib/sisu/v5/sst_convert_markup.rb
+++ b/lib/sisu/develop/sst_convert_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_convert_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_convert_markup.rb;hb=HEAD>
=end
module SiSU_Modify
@@ -64,11 +61,10 @@ module SiSU_Modify
require_relative 'sst_from_xml' # sst_from_xml.rb
require_relative 'utils_response' # utils_response.rb
class ConvertMarkup
+ include SiSU_Response
def initialize(opt)
@opt=opt
@description='This is a script that contains canned text conversions for reuse'
- @response=SiSU_Response::Response.new
- @ask=SiSU_Response::Response.new
@warn='WARNING, PROCEED AT YOUR OWN RISK, will make file changes.'
end
def current_match_and_replace
@@ -78,7 +74,7 @@ module SiSU_Modify
response=''
unless @opt.cmd=~/QQ/ \
or @opt.act[:quiet][:set]==:on
- response=@ask.response?(%{#{ text}\nProceed? })
+ response=response?(%{#{ text}\nProceed? })
end
end
def help
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/develop/sst_do_inline_footnotes.rb
index fab94edf..42e70b05 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/develop/sst_do_inline_footnotes.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** preprocessing, convert bi-footnotemarker-footnote to inline
+ footnotes, invoked using: sisu --to-footnotes filename.sst
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/set_do_inline_footnotes.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: preprocessing, convert bi-footnotemarker-footnote to inline
- footnotes, invoked using: sisu --to-footnotes filename.sst
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/set_do_inline_footnotes.rb;hb=HEAD>
=end
module SiSU_ConvertFootnotes
diff --git a/lib/sisu/v6/sst_from_xml.rb b/lib/sisu/develop/sst_from_xml.rb
index d42d5e6a..6e3f5f47 100644
--- a/lib/sisu/v6/sst_from_xml.rb
+++ b/lib/sisu/develop/sst_from_xml.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Conversion script from kdissert .kdi to sisu markup .ssm (master document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/sst_from_xml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Conversion script from kdissert .kdi to sisu markup .ssm
- (master document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_from_xml.rb;hb=HEAD>
=end
module SiSU_sstFromXML
@@ -120,7 +116,7 @@ module SiSU_sstFromXML
out_file=File.new(@output_file_name,'w')
head=@doc.root.get_elements('//head/header')
body=@doc.root.get_elements('//object/text')
- out_file.puts "% SiSU text #{@ver[:version]} (generated from a SiSU XML markup representation)\n\n"
+ out_file.puts "% SiSU text #{@ver.version} (generated from a SiSU XML markup representation)\n\n"
head.each do |x|
if x.name=='header'
head=markup_head(x.to_s)
diff --git a/lib/sisu/v5/sst_identify_markup.rb b/lib/sisu/develop/sst_identify_markup.rb
index e7cae892..e8cc954f 100644
--- a/lib/sisu/v5/sst_identify_markup.rb
+++ b/lib/sisu/develop/sst_identify_markup.rb
@@ -1,62 +1,59 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** 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
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_identify_markup.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** 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
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_identify_markup.rb;hb=HEAD>
=end
module SiSU_Markup
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/develop/sst_to_s_xml_sax.rb
index 80d6269b..8b1386b2 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/develop/sst_to_s_xml_sax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** simple xml representation (sax style)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/sst_to_s_xml_sax.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: simple xml representation (sax style)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/sst_to_s_xml_sax.rb;hb=HEAD>
=end
module SiSU_SimpleXML_ModelSax
@@ -72,7 +69,7 @@ module SiSU_SimpleXML_ModelSax
include SiSU_XML_Format
require_relative 'rexml' # rexml.rb
include SiSU_Rexml
- @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0
+ @@alt_id_count=0
@@tablefoot=''
class Convert
@@fns=nil
diff --git a/lib/sisu/v6/termsheet.rb b/lib/sisu/develop/termsheet.rb
index bc07dd25..08bba53a 100644
--- a/lib/sisu/v6/termsheet.rb
+++ b/lib/sisu/develop/termsheet.rb
@@ -1,62 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** specialised pre-processing wrapper
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/termsheet.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: SiSU information Structuring Universe, specialised pre-processing wrapper
- ** NOTE wrapper makes little sense without additional components, additional
- sample files must be provided - (saved till later as may confuse)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/termsheet.rb;hb=HEAD>
=end
require_relative 'se' # se.rb
@@ -151,6 +146,9 @@ report_html.join("\n")
summary_file << "#{report_thlnk}"
summary_html << "#{report_html}"
__END__
+** NOTE wrapper makes little sense without additional components, additional
+ sample files must be provided - (saved till later as may confuse)
+*** bits
sisu -t x_bank.and.*
e.g. sisu -t x_bank.and.*.termsheet.rb
e.g. sisu_termsheet.rb -t x_bank.and.c*.termsheet.rb
diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/develop/texinfo.rb
index a82c1542..807173e0 100644
--- a/lib/sisu/v6/texinfo.rb
+++ b/lib/sisu/develop/texinfo.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** texinfo processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/texinfo.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: texinfo processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texinfo.rb;hb=HEAD>
=end
module SiSU_TexInfo
diff --git a/lib/sisu/v5/texinfo_format.rb b/lib/sisu/develop/texinfo_format.rb
index 46a5ed69..18276d7a 100644
--- a/lib/sisu/v5/texinfo_format.rb
+++ b/lib/sisu/develop/texinfo_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** texinfo formatting template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texinfo_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: texinfo formatting template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texinfo_format.rb;hb=HEAD>
=end
module SiSU_TexInfoFormat
@@ -93,7 +90,7 @@ module SiSU_TexInfoFormat
author=@md.author if @md.author
author ||=''
author=author.gsub(/[\*]/,'') #if author
- SiSU_Env::InfoVersion.instance.get_version
+ #SiSU_Env::InfoVersion.instance.get_version
head =<<WOK
\\input texinfo @c -*-texinfo-*-
@comment %**start of header
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/develop/texpdf.rb
index e61595e0..451f9ff8 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/develop/texpdf.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** LaTeX generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: LaTeX generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texpdf.rb;hb=HEAD>
=end
module SiSU_TeX
diff --git a/lib/sisu/v5/texpdf_format.rb b/lib/sisu/develop/texpdf_format.rb
index 96b5dc91..85a2ceeb 100644
--- a/lib/sisu/v5/texpdf_format.rb
+++ b/lib/sisu/develop/texpdf_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** LaTeX formatting template, unicode utf-8 version, used for pdf
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/texpdf_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: LaTeX formatting template, unicode utf-8 version, used for pdf
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/texpdf_format.rb;hb=HEAD>
=end
module SiSU_TeX_Pdf
@@ -893,7 +890,7 @@ module SiSU_TeX_Pdf
end
end
def tex_head_info
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
<<-WOK
@@ -1563,7 +1560,7 @@ module SiSU_TeX_Pdf
<<-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}
+\\\\ 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}
\\\\ Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved.
\\\\ SiSU is software for document structuring, publishing and search (with object citation numbering), \\href{http://www.sisudoc.org}{www.sisudoc.org}
\\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{url_brace.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{url_brace.tex_close}.
@@ -1587,7 +1584,7 @@ module SiSU_TeX_Pdf
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}} \\\\
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]}}
+\\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
\\end{footnotesize}}&
WOK
end
@@ -1599,7 +1596,7 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- ve
Document information: \\\\
\\emph{sourcefile} \\uline{#{@md.fnstex}} \\\\
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]}}
+\\uline{ #{v.project} #{v.version} of #{v.date_stamp}}
\\end{small}}&
WOK
diff --git a/lib/sisu/v6/texpdf_parts.rb b/lib/sisu/develop/texpdf_parts.rb
index dbd669ff..6ede6454 100644
--- a/lib/sisu/v6/texpdf_parts.rb
+++ b/lib/sisu/develop/texpdf_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_parts.rb;hb=HEAD>
=end
module SiSU_Parts_TeXpdf
diff --git a/lib/sisu/v6/txt_asciidoc.rb b/lib/sisu/develop/txt_asciidoc.rb
index 5f27a86a..14bb3f09 100644
--- a/lib/sisu/v6/txt_asciidoc.rb
+++ b/lib/sisu/develop/txt_asciidoc.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, asciidoc
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/plaintext_asciidoc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, asciidoc
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_asciidoc.rb;hb=HEAD>
=end
module SiSU_Txt_AsciiDoc
@@ -63,11 +60,15 @@ module SiSU_Txt_AsciiDoc
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_asciidoc_decorate' # txt_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
include SiSU_Param
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
+ include SiSU_Txt_Read
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -77,46 +78,13 @@ module SiSU_Txt_AsciiDoc
def read
begin
md=SiSU_Param::Parameters.new(@opt).get
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- unless @opt.act[:quiet][:set]==:on
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{md.file.output_path.asciidoc.dir}/#{md.file.base_filename.asciidoc}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'AsciiDoc (plaintext utf-8)',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'AsciiDoc (plaintext utf-8)',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{md.file.output_path.asciidoc.dir}/#{md.file.base_filename.asciidoc}"
- ).flow
- end
- end
- ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Txt_AsciiDoc::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+ specific={
+ description: 'AsciiDoc (plaintext utf-8)',
+ output_path: md.file.output_path.asciidoc.dir,
+ output_file: md.file.base_filename.asciidoc,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_AsciiDoc::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -128,6 +96,7 @@ module SiSU_Txt_AsciiDoc
class Scroll <Source
include SiSU_Parts_Generic
include SiSU_TextUtils
+ include SiSU_Decorate_Txt_AsciiDoc
@@endnotes={ para: [], end: [] }
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@@ -164,7 +133,7 @@ WOK
end
def plaintext_tail
# env=SiSU_Env::InfoEnv.new(@md.fns)
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
@@ -188,153 +157,6 @@ at:
* SiSU #{the_url.sisu_txt}
WOK
end
- def decorate
- def heading
- def inline
- def l0
- '='
- end
- def l1
- '=='
- end
- def l2
- '==='
- end
- def l3
- '===='
- end
- def l4
- '====='
- end
- def l5
- '' #'======' #logical
- end
- self
- end
- def underscore
- def l0
- '='
- end
- def l1
- '-'
- end
- def l2
- '~'
- end
- def l3
- '^'
- end
- def l4
- '+'
- end
- def l5
- '.' #'.' #proposed
- end
- self
- end
- self
- end
- def bold
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def italics
- def open
- '_'
- end
- def close
- '_'
- end
- self
- end
- def underscore
- def open
- ''
- end
- def close
- ''
- end
- self
- end
- #def emphasis
- # def open
- # ''
- # end
- # def close
- # ''
- # end
- # self
- #end
- def cite
- def open
- '"'
- end
- def close
- '"'
- end
- self
- end
- def insert
- def open
- ''
- end
- def close
- ''
- end
- self
- end
- def strike
- def open
- '-'
- end
- def close
- '-'
- end
- self
- end
- def superscript
- def open
- '^'
- end
- def close
- '^'
- end
- self
- end
- def subscript
- def open
- '~'
- end
- def close
- '~'
- end
- self
- end
- def hilite #bold
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def monospace
- def open
- '+'
- end
- def close
- '+'
- end
- self
- end
- self
- end
def heading_decorated_inline(dob)
if dob.is==:heading
heading_inline = case dob.lc
@@ -522,41 +344,11 @@ WOK
content << plaintext[:metadata]
content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
content << plaintext[:tail]
- Output.new(content,@md).asciidoc
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.asciidoc
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(content,md)
- @content,@md=content,md
- end
- def asciidoc
- file_plaintext=SiSU_Env::FileOp.new(@md).write_file.asciidoc
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- file_plaintext.puts line
- end
- end
- end
- else file_plaintext.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_plaintext.close
- end
- end
end
end
__END__
diff --git a/lib/sisu/develop/txt_asciidoc_decorate.rb b/lib/sisu/develop/txt_asciidoc_decorate.rb
new file mode 100644
index 00000000..c63d508d
--- /dev/null
+++ b/lib/sisu/develop/txt_asciidoc_decorate.rb
@@ -0,0 +1,207 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_asciidoc_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_AsciiDoc
+ def decorate
+ def heading
+ def inline
+ def l0
+ '='
+ end
+ def l1
+ '=='
+ end
+ def l2
+ '==='
+ end
+ def l3
+ '===='
+ end
+ def l4
+ '====='
+ end
+ def l5
+ '' #'======' #logical
+ end
+ self
+ end
+ def underscore
+ def l0
+ '='
+ end
+ def l1
+ '-'
+ end
+ def l2
+ '~'
+ end
+ def l3
+ '^'
+ end
+ def l4
+ '+'
+ end
+ def l5
+ '.' #'.' #proposed
+ end
+ self
+ end
+ self
+ end
+ def bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def italics
+ def open
+ '_'
+ end
+ def close
+ '_'
+ end
+ self
+ end
+ def underscore
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ def strike
+ def open
+ '-'
+ end
+ def close
+ '-'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '~'
+ end
+ def close
+ '~'
+ end
+ self
+ end
+ def hilite #bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def monospace
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/txt_markdown.rb b/lib/sisu/develop/txt_markdown.rb
index 9bbd85e4..e927c0ec 100644
--- a/lib/sisu/v5/txt_markdown.rb
+++ b/lib/sisu/develop/txt_markdown.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, markdown
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_markdown.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, markdown
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_markdown.rb;hb=HEAD>
=end
module SiSU_Txt_Markdown
@@ -63,11 +60,15 @@ module SiSU_Txt_Markdown
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_markdown_decorate' # txt_markdown_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
include SiSU_Param
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
+ include SiSU_Txt_Read
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -77,45 +78,13 @@ module SiSU_Txt_Markdown
def read
begin
md=SiSU_Param::Parameters.new(@opt).get
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- unless @opt.act[:quiet][:set]==:on
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{md.file.output_path.markdown.dir}/#{md.file.base_filename.markdown}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Markdown (plaintext utf-8)',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Markdown (plaintext utf-8)',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,"#{md.file.output_path.markdown.dir}/#{md.file.base_filename.markdown}"
- ).flow
- end
- end
- ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Txt_Markdown::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+ specific={
+ description: 'Markdown (plaintext utf-8)',
+ output_path: md.file.output_path.markdown.dir,
+ output_file: md.file.base_filename.markdown,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_Markdown::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -127,6 +96,7 @@ module SiSU_Txt_Markdown
class Scroll <Source
include SiSU_Parts_Generic
include SiSU_TextUtils
+ include SiSU_Decorate_Txt_Markdown
@@endnotes={ para: [], end: [] }
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@@ -155,10 +125,10 @@ module SiSU_Txt_Markdown
if n =~/#{Mx[:br_line]}|#{Mx[:br_nl]}/
fix = n.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/) #watch #added
fix.each do |x|
- unless x.empty?; @n << x
+ unless x.empty? then @n << x
end
end
- else @n << n
+ else @n << n
end
end
notes=@n.flatten
@@ -199,7 +169,7 @@ WOK
end
def plaintext_tail
# env=SiSU_Env::InfoEnv.new(@md.fns)
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
@@ -223,153 +193,6 @@ at:
* SiSU #{the_url.sisu_txt}
WOK
end
- def decorate
- def heading
- def inline #atx
- def l0
- '#'
- end
- def l1
- '##'
- end
- def l2
- '###'
- end
- def l3
- '####'
- end
- def l4
- '#####'
- end
- def l5
- '######'
- end
- self
- end
- def underscore #Setext
- def l1
- '='
- end
- def l2
- '-'
- end
- def l3
- ''
- end
- def l4
- ''
- end
- def l5
- ''
- end
- def l6
- ''
- end
- self
- end
- self
- end
- def bold
- def open
- '**'
- end
- def close
- '**'
- end
- self
- end
- def italics
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def underscore
- def open
- '_'
- end
- def close
- '_'
- end
- self
- end
- #def emphasis
- # def open
- # ''
- # end
- # def close
- # ''
- # end
- # self
- #end
- def cite
- def open
- '"'
- end
- def close
- '"'
- end
- self
- end
- def insert
- def open
- '+'
- end
- def close
- '+'
- end
- self
- end
- def strike
- def open
- '-'
- end
- def close
- '-'
- end
- self
- end
- def superscript
- def open
- '^'
- end
- def close
- '^'
- end
- self
- end
- def subscript
- def open
- '['
- end
- def close
- ']'
- end
- self
- end
- def hilite
- def open
- '**'
- end
- def close
- '**'
- end
- self
- end
- def monospace
- def open
- '`'
- end
- def close
- '`'
- end
- self
- end
- self
- end
def heading_decorated_inline(dob)
if dob.is==:heading
heading_inline = case dob.lc
@@ -556,41 +379,11 @@ WOK
content << plaintext[:metadata]
content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
content << plaintext[:tail]
- Output.new(content,@md).markdown
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.markdown
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(content,md)
- @content,@md=content,md
- end
- def markdown
- file_plaintext=SiSU_Env::FileOp.new(@md).write_file.markdown
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- file_plaintext.puts line
- end
- end
- end
- else file_plaintext.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_plaintext.close
- end
- end
end
end
__END__
diff --git a/lib/sisu/develop/txt_markdown_decorate.rb b/lib/sisu/develop/txt_markdown_decorate.rb
new file mode 100644
index 00000000..20029efd
--- /dev/null
+++ b/lib/sisu/develop/txt_markdown_decorate.rb
@@ -0,0 +1,207 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_markdown_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_Markdown
+ def decorate
+ def heading
+ def inline #atx
+ def l0
+ '#'
+ end
+ def l1
+ '##'
+ end
+ def l2
+ '###'
+ end
+ def l3
+ '####'
+ end
+ def l4
+ '#####'
+ end
+ def l5
+ '######'
+ end
+ self
+ end
+ def underscore #Setext
+ def l1
+ '='
+ end
+ def l2
+ '-'
+ end
+ def l3
+ ''
+ end
+ def l4
+ ''
+ end
+ def l5
+ ''
+ end
+ def l6
+ ''
+ end
+ self
+ end
+ self
+ end
+ def bold
+ def open
+ '**'
+ end
+ def close
+ '**'
+ end
+ self
+ end
+ def italics
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def underscore
+ def open
+ '_'
+ end
+ def close
+ '_'
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ def strike
+ def open
+ '-'
+ end
+ def close
+ '-'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '['
+ end
+ def close
+ ']'
+ end
+ self
+ end
+ def hilite
+ def open
+ '**'
+ end
+ def close
+ '**'
+ end
+ self
+ end
+ def monospace
+ def open
+ '`'
+ end
+ def close
+ '`'
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/develop/txt_orgmode.rb b/lib/sisu/develop/txt_orgmode.rb
new file mode 100644
index 00000000..e8fc38ad
--- /dev/null
+++ b/lib/sisu/develop/txt_orgmode.rb
@@ -0,0 +1,376 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, orgmode structure
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_orgmode.rb;hb=HEAD>
+
+=end
+module SiSU_Txt_OrgMode
+ require_relative 'ao' # ao.rb
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ require_relative 'shared_metadata' # shared_metadata.rb
+ require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
+ require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_orgmode_decorate' # txt_orgmode_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
+ include SiSU_Param
+ @@alt_id_count,@@alt_id_count=0,0
+ @@tablefoot=''
+ class Source
+ include SiSU_Txt_Read
+ def initialize(opt)
+ @opt=opt
+ unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
+ puts "#{sf} not a processed file type"
+ end
+ end
+ def read
+ begin
+ md=SiSU_Param::Parameters.new(@opt).get
+ specific={
+ description: 'OrgMode (plaintext utf-8)',
+ output_path: md.file.output_path.orgmode.dir,
+ output_file: md.file.base_filename.orgmode,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_OrgMode::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+ private
+ class Scroll <Source
+ include SiSU_Parts_Generic
+ include SiSU_TextUtils
+ include SiSU_Decorate_Txt_OrgMode
+ @@endnotes={ para: [], end: [] }
+ def initialize(md,data,wrap_width)
+ @md,@data,@wrap_width=md,data,wrap_width
+ @env=SiSU_Env::InfoEnv.new(@md.fns)
+ @tab="\t"
+ @@endnotes_=case md.opt.selections.str
+ when /--footnote/ then false
+ when /--endnote/ then true
+ else true
+ end
+ @plaintext={ body: [], open: [], close: [], head: [], endnotes: [], metadata: [], tail: [] }
+ end
+ def songsheet
+ plaintext=markup(@data)
+ publish(plaintext)
+ end
+ def break_line
+ "\n"
+ end
+ def extract_endnotes(dob='')
+ notes=dob.obj.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/)
+ @n=[]
+ notes.flatten.each do |n| #high cost to deal with <br> appropriately within plaintext, consider
+ n=n.dup.to_s
+ if n =~/#{Mx[:br_line]}|#{Mx[:br_nl]}/
+ fix = n.split(/#{Mx[:br_line]}|#{Mx[:br_nl]}/) #watch #added
+ fix.each do |x|
+ unless x.empty? then @n << x
+ end
+ end
+ else @n << n
+ end
+ end
+ notes=@n.flatten
+ notes.each do |e|
+ util=(e.to_s =~/^\[[\d*+]+\]:/) \
+ ? (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,4,1))
+ : (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,1,1))
+ wrap=util.line_wrap
+ wrap=if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m
+ wrap.gsub(/^(\s*)([\d*+]+)\s+(.+?)\s*\Z/m, <<-GSUB
+\\1[\\2]: \\3
+ GSUB
+ )
+ else
+ wrap.gsub(/^(.+)\Z/m, <<-GSUB
+\\1
+ GSUB
+ )
+ end
+ @@endnotes[:para] << "-#{wrap}"
+ @@endnotes[:end] << '' << wrap
+ end
+ @@endnotes
+ end
+ # Used for extraction of endnotes from paragraphs
+ def plaintext_metadata
+ array=SiSU_Metadata::Summary.new(@md).plaintext.metadata
+ array.each do |meta|
+ tag,inf=meta.scan(/^.+?:\s|.+/)
+ if tag and inf
+ util=SiSU_TextUtils::Wrap.new(inf,@wrap_width,15,1)
+ txt=util.line_wrap
+ @plaintext[:metadata] <<<<WOK
+
+#{@tab}#{tag}#{txt}
+WOK
+ end
+ end
+ end
+ def plaintext_tail
+# env=SiSU_Env::InfoEnv.new(@md.fns)
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
+ lastdone="Last Generated on: #{Time.now}"
+ rubyv="Ruby version: #{@md.ruby_version}"
+ sc=if @md.sc_info
+ "Source file: #{@md.sc_filename}#{break_line}Version number: #{@md.sc_number}#{break_line}Version date: #{@md.sc_date}#{break_line}"
+ else ''
+ end
+ @plaintext[:tail] <<<<WOK
+** Metadata
+#{break_line}
+plaintext (plain text):
+ #{@md.file.output_path.orgmode.url}/#{@md.file.base_filename.orgmode}#{break_line}
+Other versions of this document: #{break_line}
+manifest:
+ #{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}#{break_line}
+at:
+ #{@md.file.output_path.base.url}#{break_line}
+
+ #{sc}
+ * #{generator}
+ * #{rubyv}
+ * #{lastdone}
+ * SiSU #{the_url.sisu_txt}
+WOK
+ end
+ def heading_decorated_inline(dob)
+ if dob.is==:heading
+ heading_inline = case dob.lc
+ when 0 then decorate.heading.inline.l0
+ when 1 then decorate.heading.inline.l1
+ when 2 then decorate.heading.inline.l2
+ when 3 then decorate.heading.inline.l3
+ when 4 then decorate.heading.inline.l4
+ when 5 then decorate.heading.inline.l5
+ when 6 then decorate.heading.inline.l6
+ end
+ heading_inline + ' ' + dob.obj
+ end
+ end
+ def plaintext_structure(dob='',p_num='') #% Used to extract the structure of a document
+ heading_decoration=:inline #(:inline|:underscore) #switch heading decoration between inline & underscore options
+ util=nil
+ wrapped=if dob.is==:para \
+ || dob.is==:heading
+ if dob.is==:heading
+ util=(heading_decoration== :inline) \
+ ? (SiSU_TextUtils::Wrap.new(heading_decorated_inline(dob),@wrap_width,0))
+ : (SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,0))
+ elsif dob.is==:para
+ if dob.hang \
+ and dob.hang =~/[0-9]/ \
+ and dob.indent != dob.hang
+ util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2,dob.hang.to_i*2)
+ #util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.hang.to_i*2,0)
+ elsif dob.indent =~/[1-9]/
+ util=if dob.bullet_
+ SiSU_TextUtils::Wrap.new("* #{dob.obj}",@wrap_width,dob.indent.to_i*2)
+ else SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2)
+ end
+ else
+ util=if dob.bullet_
+ SiSU_TextUtils::Wrap.new("* #{dob.obj}",@wrap_width,0)
+ else SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,0)
+ end
+ end
+ else util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,0)
+ end
+ dob.is==:heading ? util.no_wrap_no_breaks : util.line_wrap
+ end
+ if dob.is==:para \
+ || dob.is==:heading
+ @plaintext[:body] << wrapped + p_num << break_line # main text, contents, body KEEP
+ end
+# remove ...
+ if @@endnotes[:para] \
+ and not @@endnotes_
+ @@endnotes[:para].each {|e| @plaintext[:body] << e << break_line}
+ elsif @@endnotes[:para] \
+ and @@endnotes_
+ @@endnotes[:para].each {|e| @plaintext[:endnotes] << e << break_line}
+ end
+ @@endnotes[:para]=[]
+ end
+ def markup(data) # Used for major markup instructions
+ SiSU_Env::InfoEnv.new(@md.fns)
+ @data_mod,@endnotes,@level,@cont,@copen,@plaintext_contents_close=Array.new(6){[]}
+ (0..6).each { |x| @cont[x]=@level[x]=false }
+ (4..6).each { |x| @plaintext_contents_close[x]='' }
+ plaintext_tail #($1,$2)
+ plaintext_metadata
+ table_message='[table conversion awaited, see other document formats]'
+ data.each do |dob|
+ dob.obj=dob.obj.gsub(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}.+/um,"#{break_line}#{table_message}"). #fix
+ gsub(/.+?#{Mx[:gl_o]}-##{Mx[:gl_c]}/,''). # remove dummy headings (used by html) #check also [~-]#
+ gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
+ "#{decorate.bold.open}\\1#{decorate.bold.close}").
+ gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,
+ "#{decorate.italics.open}\\1#{decorate.italics.close}").
+ gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,
+ "#{decorate.underscore.open}\\1#{decorate.underscore.close}").
+ gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,
+ "#{decorate.subscript.open}\\1#{decorate.subscript.close}").
+ gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,
+ "#{decorate.superscript.open}\\1#{decorate.superscript.close}").
+ gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,
+ "#{decorate.insert.open}\\1#{decorate.insert.close}").
+ gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,
+ "#{decorate.cite.open}\\1#{decorate.cite.close}").
+ gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,
+ "#{decorate.strike.open}\\1#{decorate.strike.close}").
+ gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,
+ "#{decorate.monospace.open}\\1#{decorate.monospace.close}")
+ unless dob.is==:code
+ dob.obj=dob.obj.gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/,'\1').
+ gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1 [link: <\2>]').
+ gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}image/,'\1 [link: local image]').
+ gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,"#{the_text.url_open}\\1#{the_text.url_close}")
+ extract_endnotes(dob)
+ dob.obj=dob.obj.gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'[^\1]'). # endnote marker marked up
+ gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'[^\1]'). # endnote marker marked up
+ gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
+ gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
+ gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
+ gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
+ gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
+ gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
+ gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
+ gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
+ gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
+ gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
+ gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
+ gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
+ gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©').
+ gsub(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\\')
+ end
+ dob.obj=if dob.of==:block # watch
+ dob.obj.gsub(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/m,"* ").
+ gsub(/\n?#{Mx[:br_line]}\n?|\n?#{Mx[:br_nl]}\n?/m,break_line)
+ else dob.obj.gsub(/\n?#{Mx[:br_line]}\n?|\n?#{Mx[:br_nl]}\n?/m,break_line*2)
+ end
+ if dob.is==:code
+ dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
+ gsub(/(^|[^}])_([<>])/m,'\1\2') # _<_<
+ end
+ dob.obj=dob.obj.gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
+ 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[:lnk_o]}(\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+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]').
+ gsub(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,'[image: "\1"]')
+ if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
+ p_num=''
+ #ocn
+ if dob.is==:heading \
+ or dob.is==:para
+ plaintext_structure(dob,p_num)
+ elsif dob.is==:group \
+ or dob.is==:block \
+ or dob.is==:verse \
+ or dob.is==:code \
+ or dob.is==:table
+ @plaintext[:body] << dob.obj + p_num << break_line
+ elsif dob.is==:break
+ sp=' '
+ ln='<' #ln='-'
+ @plaintext[:body] <<=if dob.obj==Mx[:br_page] \
+ or dob.obj==Mx[:br_page_new] \
+ or dob.obj==Mx[:br_page_line]
+ "#{break_line}#{ln*40}#{break_line*2}"
+ elsif dob.obj ==Mx[:br_obj]
+ "#{break_line}#{sp*20}* * *#{break_line*2}"
+ end # following empty line (break_line) missing, fix
+ end
+ dob='' if (dob.obj =~/<a name="n\d+">/ \
+ and dob.obj =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote
+ if dob ## Clean Prepared Text
+ dob.obj=dob.obj.gsub(/<!.+!>/,' ').
+ gsub(/<:\S+>/,' ')
+ end
+ end
+ end
+ @plaintext
+ end
+ def publish(plaintext)
+ divider='='
+ content=[]
+ content << plaintext[:open]
+ content << plaintext[:head]
+ content << plaintext[:body]
+ if @@endnotes_
+ content << '** Endnotes' << @@endnotes[:end]
+ end
+ content << plaintext[:metadata]
+ content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
+ content << plaintext[:tail]
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.orgmode
+ Txt_Output::Output.new.document(content,outputfile)
+ @@endnotes={ para: [], end: [] }
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/txt_orgmode_decorate.rb b/lib/sisu/develop/txt_orgmode_decorate.rb
new file mode 100644
index 00000000..67813729
--- /dev/null
+++ b/lib/sisu/develop/txt_orgmode_decorate.rb
@@ -0,0 +1,186 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_orgmode_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_OrgMode
+ def decorate
+ def heading
+ def inline
+ def l0
+ '*'
+ end
+ def l1
+ '**'
+ end
+ def l2
+ '***'
+ end
+ def l3
+ '****'
+ end
+ def l4
+ '*****'
+ end
+ def l5
+ '******'
+ end
+ self
+ end
+ self
+ end
+ def bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def italics
+ def open
+ '/'
+ end
+ def close
+ '/'
+ end
+ self
+ end
+ def underscore
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ def strike
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '~'
+ end
+ def close
+ '~'
+ end
+ self
+ end
+ def hilite #bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def monospace
+ def open
+ '~'
+ end
+ def close
+ '~'
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/develop/txt_output.rb b/lib/sisu/develop/txt_output.rb
new file mode 100644
index 00000000..a70776ec
--- /dev/null
+++ b/lib/sisu/develop/txt_output.rb
@@ -0,0 +1,86 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_output.rb;hb=HEAD>
+
+=end
+module Txt_Output
+ class Output
+ include SiSU_Param
+ include SiSU_Env
+ def document(content,outputfile)
+ emptyline=0
+ content.each do |para| # this is a hack
+ if para.is_a?(Array) \
+ and para.length > 0
+ para.each do |line|
+ if line
+ line=line.gsub(/[ \t]+$/m,'').
+ gsub(/^\A[ ]*\Z/m,'')
+ (line=~/^\A\Z/) \
+ ? (emptyline+=1)
+ : emptyline=0
+ if emptyline < 2 #remove additional empty lines
+ outputfile.puts line
+ end
+ end
+ end
+ else outputfile.puts para #unix plaintext # /^([*=-]|\.){5}/
+ end
+ end
+ outputfile.close
+ end
+ end
+end
+__END__
+
diff --git a/lib/sisu/v5/txt_plain.rb b/lib/sisu/develop/txt_plain.rb
index 08f32b2f..2c19c7d2 100644
--- a/lib/sisu/v5/txt_plain.rb
+++ b/lib/sisu/develop/txt_plain.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext text generation, stripped plaintext output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext text generation, stripped plaintext output (unix,
- linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt.rb;hb=HEAD>
=end
module SiSU_Txt_Plain
@@ -64,11 +60,15 @@ module SiSU_Txt_Plain
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_plain_decorate' # txt_plain_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
include SiSU_Param
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
+ include SiSU_Txt_Read
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -78,46 +78,13 @@ module SiSU_Txt_Plain
def read
begin
md=SiSU_Param::Parameters.new(@opt).get
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- unless @opt.act[:quiet][:set]==:on
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Plaintext',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Plaintext',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}"
- ).flow
- end
- end
- ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Txt_Plain::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+ specific={
+ description: 'Plaintext (utf-8)',
+ output_path: md.file.output_path.txt.dir,
+ output_file: md.file.base_filename.txt,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_Plain::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -129,6 +96,7 @@ module SiSU_Txt_Plain
class Scroll <Source
include SiSU_Parts_Generic
include SiSU_TextUtils
+ include SiSU_Decorate_Txt_Plain
@@endnotes={ para: [], end: [] }
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@@ -137,7 +105,7 @@ module SiSU_Txt_Plain
@@endnotes_=case md.opt.selections.str
when /--footnote/ then false
when /--endnote/ then true
- else true
+ else true
end
@plaintext={ body: [], open: [], close: [], head: [], metadata: [], tail: [] }
end
@@ -201,7 +169,7 @@ WOK
end
def plaintext_tail
# env=SiSU_Env::InfoEnv.new(@md.fns)
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
@@ -225,135 +193,6 @@ at:
* SiSU #{the_url.sisu_txt}
WOK
end
- def decorate
- def heading_underscore
- def l0
- '='
- end
- def l1
- '*'
- end
- def l2
- '+'
- end
- def l3
- '~'
- end
- def l4
- '-'
- end
- def l5
- '.'
- end
- def l6
- '.'
- end
- def l7
- '.'
- end
- self
- end
- def bold
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def italics
- def open
- '/'
- end
- def close
- '/'
- end
- self
- end
- def underscore
- def open
- '_'
- end
- def close
- '_'
- end
- self
- end
- #def emphasis
- # def open
- # ''
- # end
- # def close
- # ''
- # end
- # self
- #end
- def cite
- def open
- '"'
- end
- def close
- '"'
- end
- self
- end
- def insert
- def open
- '+'
- end
- def close
- '+'
- end
- self
- end
- def strike
- def open
- '-'
- end
- def close
- '-'
- end
- self
- end
- def superscript
- def open
- '^'
- end
- def close
- '^'
- end
- self
- end
- def subscript
- def open
- '['
- end
- def close
- ']'
- end
- self
- end
- def hilite
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def monospace
- def open
- '#'
- end
- def close
- '#'
- end
- self
- end
- self
- end
def plaintext_structure(dob='',p_num='') #% Used to extract the structure of a document
lv=n=n3=nil
if dob.is==:heading
@@ -539,41 +378,11 @@ WOK
content << plaintext[:metadata]
content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
content << plaintext[:tail]
- Output.new(content,@md).plaintext
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.txt
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(content,md)
- @content,@md=content,md
- end
- def plaintext #%plaintext output
- file_plaintext=SiSU_Env::FileOp.new(@md).write_file.txt
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- file_plaintext.puts line
- end
- end
- end
- else file_plaintext.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_plaintext.close
- end
- end
end
end
__END__
@@ -589,13 +398,13 @@ __END__
subscript_o: '[', subscript_c: ']',
hilite_o: '*', hilite_c: '*',
monospace_o: '', monospace_c: '',
- po_bold_o: '!{', po_bold_c: '}!',
- po_italics_o: '/{', po_italics_c: '}/',
- po_underscore_o: '_{', po_underscore_c: '}_',
- po_cite_o: '"{', po_cite_c: '}"',
- po_insert_o: '+{', po_insert_c: '}+',
- po_strike_o: '-{', po_strike_c: '}-',
- po_superscript_o: '^{', po_superscript_c: '}^',
- po_subscript_o: ',{', po_subscript_c: '},',
- po_hilite_o: '*{', po_hilite_c: '}*',
- po_monospace_o: '#{', po_monospace_c: '}#',
+ p_bold_o: '!{', p_bold_c: '}!',
+ p_italics_o: '/{', p_italics_c: '}/',
+ p_underscore_o: '_{', p_underscore_c: '}_',
+ p_cite_o: '"{', p_cite_c: '}"',
+ p_insert_o: '+{', p_insert_c: '}+',
+ p_strike_o: '-{', p_strike_c: '}-',
+ p_superscript_o: '^{', p_superscript_c: '}^',
+ p_subscript_o: ',{', p_subscript_c: '},',
+ p_hilite_o: '*{', p_hilite_c: '}*',
+ p_monospace_o: '#{', p_monospace_c: '}#',
diff --git a/lib/sisu/develop/txt_plain_decorate.rb b/lib/sisu/develop/txt_plain_decorate.rb
new file mode 100644
index 00000000..6bceb9ce
--- /dev/null
+++ b/lib/sisu/develop/txt_plain_decorate.rb
@@ -0,0 +1,189 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_plain_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_Plain
+ def decorate
+ def heading_underscore
+ def l0
+ '='
+ end
+ def l1
+ '*'
+ end
+ def l2
+ '+'
+ end
+ def l3
+ '~'
+ end
+ def l4
+ '-'
+ end
+ def l5
+ '.'
+ end
+ def l6
+ '.'
+ end
+ def l7
+ '.'
+ end
+ self
+ end
+ def bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def italics
+ def open
+ '/'
+ end
+ def close
+ '/'
+ end
+ self
+ end
+ def underscore
+ def open
+ '_'
+ end
+ def close
+ '_'
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ def strike
+ def open
+ '-'
+ end
+ def close
+ '-'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '['
+ end
+ def close
+ ']'
+ end
+ self
+ end
+ def hilite
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def monospace
+ def open
+ '#'
+ end
+ def close
+ '#'
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/develop/txt_read.rb b/lib/sisu/develop/txt_read.rb
new file mode 100644
index 00000000..eddeaa9c
--- /dev/null
+++ b/lib/sisu/develop/txt_read.rb
@@ -0,0 +1,109 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_read.rb;hb=HEAD>
+
+=end
+module SiSU_Txt_Read
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ def read_generic(opt,specific)
+ begin
+ env=SiSU_Env::InfoEnv.new(opt.fns)
+ unless opt.act[:quiet][:set]==:on
+ tool=(opt.act[:verbose][:set]==:on \
+ || opt.act[:verbose_plus][:set]==:on \
+ || opt.act[:maintenance][:set]==:on) \
+ ? "#{env.program.text_editor} #{specific[:output_path]}/#{specific[:output_file]}"
+ : "[#{opt.f_pth[:lng_is]}] #{opt.fno}"
+ (opt.act[:verbose][:set]==:on \
+ || opt.act[:verbose_plus][:set]==:on \
+ || opt.act[:maintenance][:set]==:on) \
+ ? SiSU_Screen::Ansi.new(
+ opt.act[:color_state][:set],
+ specific[:description],
+ tool
+ ).green_hi_blue
+ : SiSU_Screen::Ansi.new(
+ opt.act[:color_state][:set],
+ specific[:description],
+ tool
+ ).green_title_hi
+ if (opt.act[:verbose_plus][:set]==:on \
+ || opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ opt.act[:color_state][:set],
+ opt.fns,
+ "#{specific[:output_path]}/#{specific[:output_file]}"
+ ).flow
+ end
+ end
+ @ao_array=SiSU_AO::Source.new(opt).get # ao file drawn here
+ @wrap_width=if defined? md.make.plaintext_wrap \
+ and md.make.plaintext_wrap
+ md.make.plaintext_wrap
+ elsif defined? env.plaintext_wrap \
+ and env.plaintext_wrap
+ env.plaintext_wrap
+ else 78
+ end
+ #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,opt.selections.str,opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+end
+
diff --git a/lib/sisu/v5/txt_rst.rb b/lib/sisu/develop/txt_rst.rb
index 297a2457..a596fa85 100644
--- a/lib/sisu/v5/txt_rst.rb
+++ b/lib/sisu/develop/txt_rst.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, rST
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_rst.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, rST
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_rst.rb;hb=HEAD>
=end
module SiSU_Txt_rST
@@ -63,11 +60,15 @@ module SiSU_Txt_rST
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_rst_decorate' # txt_rst_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
include SiSU_Param
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
+ include SiSU_Txt_Read
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -77,46 +78,13 @@ module SiSU_Txt_rST
def read
begin
md=SiSU_Param::Parameters.new(@opt).get
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- unless @opt.act[:quiet][:set]==:on
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{md.file.output_path.rst.dir}/#{md.file.base_filename.rst}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'rST (plaintext utf-8)',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'rST (plaintext utf-8)',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{md.file.output_path.rst.dir}/#{md.file.base_filename.rst}"
- ).flow
- end
- end
- ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Txt_rST::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+ specific={
+ description: 'rST (plaintext utf-8)',
+ output_path: md.file.output_path.rst.dir,
+ output_file: md.file.base_filename.rst,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_rST::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -128,6 +96,7 @@ module SiSU_Txt_rST
class Scroll <Source
include SiSU_Parts_Generic
include SiSU_TextUtils
+ include SiSU_Decorate_Txt_rST
@@endnotes={ para: [], end: [] }
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@@ -200,7 +169,7 @@ WOK
end
def plaintext_tail
# env=SiSU_Env::InfoEnv.new(@md.fns)
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
@@ -224,132 +193,6 @@ at:
* SiSU #{the_url.sisu_txt}
WOK
end
- def decorate
- def heading
- def underscore
- def l0
- '='
- end
- def l1
- '-'
- end
- def l2
- '`'
- end
- def l3
- ':'
- end
- def l4
- "'"
- end
- def l5
- '"'
- end
- self
- end
- self
- end
- def bold
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def italics
- def open
- '/'
- end
- def close
- '/'
- end
- self
- end
- def underscore
- def open
- '_'
- end
- def close
- '_'
- end
- self
- end
- #def emphasis
- # def open
- # ''
- # end
- # def close
- # ''
- # end
- # self
- #end
- def cite
- def open
- '"'
- end
- def close
- '"'
- end
- self
- end
- def insert
- def open
- '+'
- end
- def close
- '+'
- end
- self
- end
- def strike
- def open
- '-'
- end
- def close
- '-'
- end
- self
- end
- def superscript
- def open
- '^'
- end
- def close
- '^'
- end
- self
- end
- def subscript
- def open
- '['
- end
- def close
- ']'
- end
- self
- end
- def hilite
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def monospace
- def open
- '#'
- end
- def close
- '#'
- end
- self
- end
- self
- end
def heading_decorated_underscore(dob,times,p_num)
if dob.is==:heading
#times=@wrap_width if times > @wrap_width
@@ -518,41 +361,11 @@ WOK
content << plaintext[:metadata]
content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
content << plaintext[:tail]
- Output.new(content,@md).rst
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.rst
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(content,md)
- @content,@md=content,md
- end
- def rst
- file_plaintext=SiSU_Env::FileOp.new(@md).write_file.rst
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- file_plaintext.puts line
- end
- end
- end
- else file_plaintext.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_plaintext.close
- end
- end
end
end
__END__
diff --git a/lib/sisu/develop/txt_rst_decorate.rb b/lib/sisu/develop/txt_rst_decorate.rb
new file mode 100644
index 00000000..6f1de7fd
--- /dev/null
+++ b/lib/sisu/develop/txt_rst_decorate.rb
@@ -0,0 +1,186 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_rst_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_rST
+ def decorate
+ def heading
+ def underscore
+ def l0
+ '='
+ end
+ def l1
+ '-'
+ end
+ def l2
+ '`'
+ end
+ def l3
+ ':'
+ end
+ def l4
+ "'"
+ end
+ def l5
+ '"'
+ end
+ self
+ end
+ self
+ end
+ def bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def italics
+ def open
+ '/'
+ end
+ def close
+ '/'
+ end
+ self
+ end
+ def underscore
+ def open
+ '_'
+ end
+ def close
+ '_'
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ def strike
+ def open
+ '-'
+ end
+ def close
+ '-'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '['
+ end
+ def close
+ ']'
+ end
+ self
+ end
+ def hilite
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def monospace
+ def open
+ '#'
+ end
+ def close
+ '#'
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/txt_shared.rb b/lib/sisu/develop/txt_shared.rb
index 30f54f5a..825d8041 100644
--- a/lib/sisu/v5/txt_shared.rb
+++ b/lib/sisu/develop/txt_shared.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** modules shared by flatfile output generators
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/txt_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: modules shared by flatfile output generators
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_shared.rb;hb=HEAD>
=end
module SiSU_TextUtils
diff --git a/lib/sisu/v5/txt_textile.rb b/lib/sisu/develop/txt_textile.rb
index 71268d96..d777587e 100644
--- a/lib/sisu/v5/txt_textile.rb
+++ b/lib/sisu/develop/txt_textile.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** plaintext (smarttext) generation, textile
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/plaintext_textile.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: plaintext (smarttext) generation, textile
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_textile.rb;hb=HEAD>
=end
module SiSU_Txt_Textile
@@ -63,12 +60,16 @@ module SiSU_Txt_Textile
include SiSU_Env
require_relative 'shared_metadata' # shared_metadata.rb
require_relative 'generic_parts' # generic_parts.rb
+ require_relative 'txt_read' # txt_read.rb
require_relative 'txt_shared' # txt_shared.rb
+ require_relative 'txt_textile_decorate' # txt_textile_decorate.rb
+ require_relative 'txt_output' # txt_output.rb
include SiSU_Param
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
- include SiSU_Parts_Generic
+ include SiSU_Txt_Read
+ #include SiSU_Parts_Generic
def initialize(opt)
@opt=opt
unless @opt.fns =~/(.+?)\.(?:-|ssm\.)?sst$/
@@ -78,46 +79,13 @@ module SiSU_Txt_Textile
def read
begin
md=SiSU_Param::Parameters.new(@opt).get
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- unless @opt.act[:quiet][:set]==:on
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{md.file.output_path.textile.dir}/#{md.file.base_filename.textile}"
- : "[#{@opt.f_pth[:lng_is]}] #{@opt.fno}"
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Textile (plaintext utf-8)',
- tool
- ).green_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Textile (plaintext utf-8)',
- tool
- ).green_title_hi
- if (@opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{md.file.output_path.textile.dir}/#{md.file.base_filename.textile}"
- ).flow
- end
- end
- ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Txt_Textile::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+ specific={
+ description: 'Textile (plaintext utf-8)',
+ output_path: md.file.output_path.textile.dir,
+ output_file: md.file.base_filename.textile,
+ }
+ read_generic(@opt,specific)
+ SiSU_Txt_Textile::Source::Scroll.new(md,@ao_array,@wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -129,6 +97,7 @@ module SiSU_Txt_Textile
class Scroll <Source
include SiSU_Parts_Generic
include SiSU_TextUtils
+ include SiSU_Decorate_Txt_Textile
@@endnotes={ para: [], end: [] }
def initialize(md,data,wrap_width)
@md,@data,@wrap_width=md,data,wrap_width
@@ -201,7 +170,7 @@ WOK
end
def plaintext_tail
# env=SiSU_Env::InfoEnv.new(@md.fns)
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
@@ -225,143 +194,19 @@ at:
* SiSU #{the_url.sisu_txt}
WOK
end
- def decorate
- def heading
- def inline
- def l0
- 'h1. '
- end
- def l1
- 'h2. '
- end
- def l2
- 'h3. '
- end
- def l3
- 'h4. '
- end
- def l4
- 'h5. '
- end
- def l5
- 'h6. '
- end
- self
- end
- self
- end
- def bold
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def italics
- def open
- '_'
- end
- def close
- '_'
- end
- self
- end
- def underscore
- def open
- '+'
- end
- def close
- '+'
- end
- self
- end
- #def emphasis
- # def open
- # ''
- # end
- # def close
- # ''
- # end
- # self
- #end
- def cite
- def open
- '"'
- end
- def close
- '"'
- end
- self
- end
- def insert
- def open
- ''
- end
- def close
- ''
- end
- self
- end
- def strike
- def open
- '-'
- end
- def close
- '-'
- end
- self
- end
- def superscript
- def open
- '^'
- end
- def close
- '^'
- end
- self
- end
- def subscript
- def open
- '~'
- end
- def close
- '~'
- end
- self
- end
- def hilite
- def open
- '*'
- end
- def close
- '*'
- end
- self
- end
- def monospace
- def open
- ''
- end
- def close
- ''
- end
- self
- end
- self
- end
def heading_decorated_inline(dob)
- heading_inline = case dob.lc
- when 0 then decorate.heading.inline.l0
- when 1 then decorate.heading.inline.l1
- when 2 then decorate.heading.inline.l2
- when 3 then decorate.heading.inline.l3
- when 4 then decorate.heading.inline.l4
- when 5 then decorate.heading.inline.l5
- when 6 then decorate.heading.inline.l6
+ if dob.is==:heading
+ heading_inline = case dob.lc
+ when 0 then decorate.heading.inline.l0
+ when 1 then decorate.heading.inline.l1
+ when 2 then decorate.heading.inline.l2
+ when 3 then decorate.heading.inline.l3
+ when 4 then decorate.heading.inline.l4
+ when 5 then decorate.heading.inline.l5
+ when 6 then decorate.heading.inline.l6
+ end
+ heading_inline + ' ' + dob.obj
end
- heading_inline + ' ' + dob.obj
end
def plaintext_structure(dob='',p_num='') #% Used to extract the structure of a document
util=nil
@@ -512,41 +357,11 @@ WOK
content << plaintext[:metadata]
content << "#{break_line}#{divider*@wrap_width}#{break_line}" if @md.stmp =~/\w+/ #not used?
content << plaintext[:tail]
- Output.new(content,@md).textile
+ outputfile=SiSU_Env::FileOp.new(@md).write_file.textile
+ Txt_Output::Output.new.document(content,outputfile)
@@endnotes={ para: [], end: [] }
end
end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(content,md)
- @content,@md=content,md
- end
- def textile
- file_plaintext=SiSU_Env::FileOp.new(@md).write_file.textile
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/[ \t]+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- (line=~/^\A\Z/) \
- ? (emptyline+=1)
- : emptyline=0
- if emptyline < 2 #remove additional empty lines
- file_plaintext.puts line
- end
- end
- end
- else file_plaintext.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_plaintext.close
- end
- end
end
end
__END__
diff --git a/lib/sisu/develop/txt_textile_decorate.rb b/lib/sisu/develop/txt_textile_decorate.rb
new file mode 100644
index 00000000..03fdc68b
--- /dev/null
+++ b/lib/sisu/develop/txt_textile_decorate.rb
@@ -0,0 +1,186 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext decoration
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_textile_decorate.rb;hb=HEAD>
+
+=end
+
+module SiSU_Decorate_Txt_Textile
+ def decorate
+ def heading
+ def inline
+ def l0
+ 'h1. '
+ end
+ def l1
+ 'h2. '
+ end
+ def l2
+ 'h3. '
+ end
+ def l3
+ 'h4. '
+ end
+ def l4
+ 'h5. '
+ end
+ def l5
+ 'h6. '
+ end
+ self
+ end
+ self
+ end
+ def bold
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def italics
+ def open
+ '_'
+ end
+ def close
+ '_'
+ end
+ self
+ end
+ def underscore
+ def open
+ '+'
+ end
+ def close
+ '+'
+ end
+ self
+ end
+ #def emphasis
+ # def open
+ # ''
+ # end
+ # def close
+ # ''
+ # end
+ # self
+ #end
+ def cite
+ def open
+ '"'
+ end
+ def close
+ '"'
+ end
+ self
+ end
+ def insert
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ def strike
+ def open
+ '-'
+ end
+ def close
+ '-'
+ end
+ self
+ end
+ def superscript
+ def open
+ '^'
+ end
+ def close
+ '^'
+ end
+ self
+ end
+ def subscript
+ def open
+ '~'
+ end
+ def close
+ '~'
+ end
+ self
+ end
+ def hilite
+ def open
+ '*'
+ end
+ def close
+ '*'
+ end
+ self
+ end
+ def monospace
+ def open
+ ''
+ end
+ def close
+ ''
+ end
+ self
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v5/update.rb b/lib/sisu/develop/update.rb
index 30a184f0..eb1094ea 100644
--- a/lib/sisu/v5/update.rb
+++ b/lib/sisu/develop/update.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** update previous output (with similar output file type formats)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/update.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: update previous output (with similar output file type formats)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/update.rb;hb=HEAD>
=end
module SiSU_UpdateControlFlag
diff --git a/lib/sisu/v6/urls.rb b/lib/sisu/develop/urls.rb
index b4bf9d23..85ec1316 100644
--- a/lib/sisu/v6/urls.rb
+++ b/lib/sisu/develop/urls.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** urls for output files
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/urls.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: urls for output files
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/urls.rb;hb=HEAD>
=end
module SiSU_Urls
@@ -200,6 +197,15 @@ module SiSU_Urls
fn: @fn[:txt_textile],
}
end
+ def orgmode
+ {
+ cmd: '--orgmode',
+ viewer: @prog.web_browser,
+ f_pth: @md.file.output_path.orgmode.dir + '/' \
+ + @md.file.base_filename.orgmode,
+ fn: @fn[:txt_orgmode],
+ }
+ end
self
end
def html
@@ -560,6 +566,10 @@ module SiSU_Urls
show.report(report_info.text.rst)
#show.maintenance(report_info.text.rst)
end
+ if @opt.act[:txt_orgmode][:set]==:on
+ show.report(report_info.text.orgmode)
+ #show.maintenance(report_info.text.orgmode)
+ end
if (@opt.act[:html][:set]==:on \
or @opt.act[:html_scroll][:set]==:on \
or @opt.act[:html_seg][:set]==:on)
@@ -648,7 +658,7 @@ module SiSU_Urls
show.report(report_info.hash_digests)
#show.maintenance(report_info.hash_digests)
end
- if @opt.act[:po4a][:set]==:on
+ if @opt.act[:po4a_shelf][:set]==:on
#if @opt.fns =~/\S+?~\S{2}(?:_\S{2})?\.ss[mt]/
#else
#end
diff --git a/lib/sisu/v6/utils.rb b/lib/sisu/develop/utils.rb
index 42901e42..a43154fd 100644
--- a/lib/sisu/v6/utils.rb
+++ b/lib/sisu/develop/utils.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, debug related
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, debug related
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils.rb;hb=HEAD>
=end
module SiSU_Utils
@@ -135,6 +132,12 @@ module SiSU_Utils
def mark(v=nil,x=nil)
puts set(v,x)
end
+ def tell(v=nil,x=nil)
+ puts set(v,x)
+ end
+ def report(v=nil,x=nil)
+ puts set(v,x)
+ end
def ok(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
diff --git a/lib/sisu/develop/utils_composite.rb b/lib/sisu/develop/utils_composite.rb
new file mode 100644
index 00000000..ee8fe77c
--- /dev/null
+++ b/lib/sisu/develop/utils_composite.rb
@@ -0,0 +1,115 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** system environment, debug related
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_composite.rb;hb=HEAD>
+
+=end
+module SiSU_Composite_Doc_Utils
+ def inserts_array(loadfilename)
+ IO.readlines(loadfilename,'')
+ end
+ def insert_filename?(para)
+ if para =~ /^<<\s+((?:https?|file):\/\/\S+?\.ss[it])$/ # and NetTest
+ url($1.strip)
+ elsif para =~/^<<\s*(\S+?\.ss[it])$/
+ $1.strip
+ end
+ end
+ def extract_filenames(loadfilename,file_names_arr)
+ file_names_arr << loadfilename
+ ssi_files=[]
+ if loadfilename =~/\S+?\.ss[im]$/
+ inserts_array(loadfilename).each do |para|
+ filen=insert_filename?(para)
+ file_names_arr << filen
+ if filen =~/\S+?\.ssi$/
+ ssi_files << filen
+ end
+ end
+ end
+ ssi_files.each do |fn|
+ extract_filenames(fn,file_names_arr)
+ end
+ file_names_arr.flatten.compact.uniq.sort
+ end
+ def composite_and_imported_filenames_array(loadfilename)
+ file_names_arr=[]
+ begin
+ if FileTest.file?(loadfilename)
+ if loadfilename =~/\S+?\.ss[itm]$/
+ if (@opt.act[:verbose][:set]==:on \
+ || @opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'loading:',
+ loadfilename,
+ ).txt_grey
+ end
+ file_names_arr=extract_filenames(loadfilename,file_names_arr)
+ end
+ end
+ if (@opt.act[:verbose_plus][:set]==:on \
+ || @opt.act[:maintenance][:set]==:on)
+ p file_names_arr ;p file_names_arr.length
+ end
+ file_names_arr
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
+ ensure
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/develop/utils_response.rb b/lib/sisu/develop/utils_response.rb
new file mode 100644
index 00000000..a29f2fcd
--- /dev/null
+++ b/lib/sisu/develop/utils_response.rb
@@ -0,0 +1,114 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** Request response
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_response.rb;hb=HEAD>
+
+=end
+module SiSU_Response
+ def available_selections_
+ %{'yes', 'no', 'quit' or 'exit'; [ynqx]}
+ end
+ def response?(ask)
+ response='redo'
+ print ask + %{ [#{available_selections_}]: }
+ response=File.new('/dev/tty').gets.strip
+ case response
+ when /^(?:y|yes)$/ then true
+ when /^(?:n|no)$/ then false
+ when /^(?:[qx]|quit|exit)$/ then exit
+ else puts %{[please type: #{available_selections_}]}
+ response?(ask)
+ end
+ end
+ def query
+ def selections_available_(selections=:strict)
+ short_options=(selections == :strict) ? '' : '; [ynqx]'
+ %{'yes', 'no', 'quit' or 'exit'#{short_options}}
+ end
+ def selection_options
+ def response_strict(resp)
+ case resp
+ when /^(?:yes)$/ then true
+ when /^(?:no)$/ then false
+ when /^(?:quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:strict)}]}
+ answer?('',:strict)
+ end
+ end
+ def response_short(resp)
+ case resp
+ when /^(?:y|yes)$/ then true
+ when /^(?:n|no)$/ then false
+ when /^(?:[qx]|quit|exit)$/ then exit
+ else
+ puts %{response was: #{resp}}
+ puts %{[please type to select: #{selections_available_(:short)}]}
+ answer?('',:short)
+ end
+ end
+ self
+ end
+ def answer?(ask,selections=:strict)
+ resp='redo'
+ print ask + %{PROCEED? [#{selections_available_(selections)}]: }
+ resp=File.new('/dev/tty').gets.strip
+ (selections==:strict) \
+ ? selection_options.response_strict(resp)
+ : selection_options.response_short(resp)
+ end
+ self
+ end
+end
+__END__
diff --git a/lib/sisu/v6/utils_screen_text_color.rb b/lib/sisu/develop/utils_screen_text_color.rb
index a1b194a3..fef7ba77 100644
--- a/lib/sisu/v6/utils_screen_text_color.rb
+++ b/lib/sisu/develop/utils_screen_text_color.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** system environment, screen colors text
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_screen_text_color.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, screen colors text
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_screen_text_color.rb;hb=HEAD>
=end
module SiSU_Screen
diff --git a/lib/sisu/develop/utils_spell.rb b/lib/sisu/develop/utils_spell.rb
new file mode 100644
index 00000000..ba401c69
--- /dev/null
+++ b/lib/sisu/develop/utils_spell.rb
@@ -0,0 +1,99 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** spellchecking
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/utils_spell.rb;hb=HEAD>
+
+=end
+module SiSU_SpellUtility
+ class Spell
+ def initialize(input,filesrc,flg)
+ @flg=flg
+ @filename, @filetype = /(.+?)(\.\w\w\w0$)/.match(filesrc)[1,2] #.gsub(/\.\w\w\w0$/, "")
+ @input=input
+ @allwords=[]
+ puts @filename
+ @speller='aspell' # 'ispell'
+ @dictionary='british'
+ @lang='en_GB'
+ end
+ def check
+ @input.each do |data|
+ data=data.gsub(/(https?|www|ftp|gopher|png|jpg|gif|html|htm)\S+/i,' ').
+ gsub(/(&nbsp;|#{Mx[:nbsp]})/i,' ').
+ gsub(/<\/?(table|tr|td|b|p|href).*?>/i,' ').
+ gsub(/(<==.+|<:\S+>|<!.+?!>|^@\S+?:.+|\{\{\{|~)/,' ').
+ gsub(/(["|<>)(\n'`.;&_-]|\=)/,' ').
+ gsub(/\b(altExternal|
+ target|externalimg|
+ srcimagebext|
+ img|src|toc|pdf|
+ cd|org|
+ helvetica|roman
+ )\b/i,' ').
+ gsub(/EOF/,'')
+ @words=data.scan(/\S+/)
+ @words.each { |y| @allwords << y }
+ end
+ @allwords=@allwords.uniq
+ if @flg =~ /S/
+ File.open('/home/ralph/spell_error','a+') do |file| #fix
+ file.puts %{\n\n<<#{@filename}>>}
+ end
+ @allwords.each { |y| puts y.inspect; system(%{cat #{y} | /usr/bin/#{@speller} -l -d #{@dictionary} >> ~/spell_error })}
+ else
+ @allwords.each { |y| sp=%x{echo #{y}|#{@speller} -l }; puts sp unless sp.empty?}
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/webrick.rb b/lib/sisu/develop/webrick.rb
index 9519f34b..9de19792 100644
--- a/lib/sisu/v5/webrick.rb
+++ b/lib/sisu/develop/webrick.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** webrick share - note sisu by default does not link with file suffixes,
+ see man pages for options
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/webrick.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: webrick share - note sisu by default does not link with file
- suffixes, see man pages for options
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/webrick.rb;hb=HEAD>
=end
module SiSU_Webserv
diff --git a/lib/sisu/v6/wikispeak.rb b/lib/sisu/develop/wikispeak.rb
index b2fe65fc..d1682858 100644
--- a/lib/sisu/v6/wikispeak.rb
+++ b/lib/sisu/develop/wikispeak.rb
@@ -1,60 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** wiki text generation, stripped wiki output (unix, linefeed)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * License: GPL 3 or later:
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- SiSU, a framework for document structuring, publishing and search
+** License: GPL 3 or later:
- Copyright (C) Ralph Amissah
+ SiSU, a framework for document structuring, publishing and search
- 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.
+ Copyright (C) Ralph Amissah
- 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.
+ 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.
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ 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.
- 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>
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
- <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+ 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>
- * SiSU uses:
- * Standard SiSU markup syntax,
- * Standard SiSU meta-markup syntax, and the
- * Standard SiSU object citation numbering and system
+ <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
- * Hompages:
- <http://www.jus.uio.no/sisu>
- <http://www.sisudoc.org>
+** SiSU uses:
+ * Standard SiSU markup syntax,
+ * Standard SiSU meta-markup syntax, and the
+ * Standard SiSU object citation numbering and system
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/wikispeak.rb;hb=HEAD>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: wiki text generation, stripped wiki output (unix, linefeed)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/wikispeak.rb;hb=HEAD>
=end
module SiSU_Wikispeak
@@ -66,7 +64,7 @@ module SiSU_Wikispeak
include Format
require_relative 'html_parts' # html_parts.rb
require_relative 'txt_shared'
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ @@alt_id_count,@@alt_id_count=0,0
@@tablefoot=''
class Source
def initialize(opt)
@@ -187,7 +185,7 @@ WOK
end
end
def wiki_tail
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/develop/xhtml.rb
index 40073ff3..d24a568e 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/develop/xhtml.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Description: xhtml output logic, flow
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xhtml output logic, flow
- ** Notes: tidy -xml scroll.xhtml >> index.tidy
=end
module SiSU_XHTML
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -66,10 +63,11 @@ module SiSU_XHTML
include SiSU_XML_Munge
require_relative 'xml_format' # xml_format.rb
include SiSU_XML_Format
+ require_relative 'xml_persist' # xml_persist.rb
require_relative 'rexml' # rexml.rb
include SiSU_Rexml
require_relative 'shared_metadata' # shared_metadata.rb
- @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0
+ @@alt_id_count=0
@@tablefoot=''
class Source
def initialize(opt)
@@ -147,18 +145,22 @@ module SiSU_XHTML
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
require_relative 'css' # css.rb
- @@xml={ body: [], sisu: [], open: [], close: [], head: [] }
def initialize(particulars)
@env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@tab="\t"
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
+ @per=SiSU_XML_Persist::Persist.new
end
def songsheet
- pre
- @data=markup(@ao_array)
- post
- publish
+ begin
+ pre
+ @data=markup(@ao_array)
+ post
+ publish
+ ensure
+ SiSU_XML_Persist::Persist.new.persist_init
+ end
end
protected
def embedded_endnotes(dob='')
@@ -205,7 +207,7 @@ WOK
end
def xml_head
metadata=SiSU_Metadata::Summary.new(@md).xhtml_scroll.metadata
- @@xml[:head] << metadata
+ @per.head << metadata
end
def name_tags(dob)
tags=''
@@ -231,15 +233,15 @@ WOK
gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>')
util=SiSU_TextUtils::Wrap.new(dob.obj,70)
wrapped=util.line_wrap
- @@xml[:body] << if defined? dob.ocn
+ @per.body << if defined? dob.ocn
%{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
else "#{Ax[:tab]*0}<object>"
end
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="#{type}">#{named}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>} unless lv # main text, contents, body KEEP
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="h#{lv}">#{named}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>} if lv # main text, contents, body KEEP
- @@xml[:body] << @endnotes.compact.join if @endnotes.length > 0 # main text, endnotes KEEP
- @@xml[:body] << "#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>" if defined? dob.ocn
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*1}<text class="#{type}">#{named}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>} unless lv # main text, contents, body KEEP
+ @per.body << %{#{Ax[:tab]*1}<text class="h#{lv}">#{named}\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>} if lv # main text, contents, body KEEP
+ @per.body << @endnotes.compact.join if @endnotes.length > 0 # main text, endnotes KEEP
+ @per.body << "#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>" if defined? dob.ocn
+ @per.body << "#{Ax[:tab]*0}</object>"
@endnotes=[]
end
end
@@ -249,12 +251,12 @@ WOK
dob.obj=dob.obj.strip.
gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'<en>\1</en>'). #footnote/endnote clean
gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="block">#{named}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="block">#{named}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def group_structure(dob)
named=name_tags(dob)
@@ -262,42 +264,42 @@ WOK
dob.obj=dob.obj.strip.
gsub(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'<en>\1</en>'). #footnote/endnote clean
gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="group">#{named}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="group">#{named}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def poem_structure(dob)
named=name_tags(dob)
dob=@trans.markup_group(dob)
dob.obj=dob.obj.strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="verse">#{named}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="verse">#{named}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def code_structure(dob)
named=name_tags(dob)
dob=@trans.markup_group(dob)
dob.obj=dob.obj.gsub(/\s\s/,'&#160;&#160;').strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="code">#{named}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="code">#{named}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def table_structure(dob)
named=name_tags(dob)
table=SiSU_XHTML_Shared::TableXHTML.new(dob)
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*2}#{named}#{table.table.obj}}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*2}#{named}#{table.table.obj}}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def markup(data)
@endnotes=[]
@@ -373,39 +375,38 @@ WOK
end
6.downto(4) do |x|
y=x - 1; v=x - 3
- @@xml[:body] << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>" if @level[x]==true
+ @per.body << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>" if @level[x]==true
end
3.downto(1) do |x|
y=x - 1
- @@xml[:body] << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
+ @per.body << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
end
end
def pre
rdf=SiSU_XML_Tags::RDF.new(@md)
- @@xml[:head],@@xml[:body]=[],[]
+ @per.head,@per.body=[],[]
stylesheet=SiSU_Style::CSS_HeadInfo.new(@md,'xhtml').stylesheet
encoding=(@sys.locale =~/utf-?8/i) \
? '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
: '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
- @@xml[:open] =<<WOK
+ @per.open =<<WOK
#{encoding}
#{stylesheet.css_head_xml}
#{rdf.comment_xml}
<document>
WOK
- @@xml[:head] << %{<head>\n\t<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />}
- @@xml[:body] << '<body>'
+ @per.head << %{<head>\n\t<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />}
+ @per.body << '<body>'
end
def post
- @@xml[:head] << '</head>'
- @@xml[:body] << '</body>'
- @@xml[:close] = '</document>'
+ @per.head << '</head>'
+ @per.body << '</body>'
+ @per.close = '</document>'
end
def publish
content=[]
- content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata]
- content << @@xml[:owner_details] if @md.stmp =~/\w\w/
- content << @@xml[:tail] << @@xml[:close]
+ content << @per.open << @per.head << @per.body << @per.metadata
+ content << @per.tail << @per.close
content=content.flatten.compact
Output.new(content,@md).xhtml
@@xml={}
@@ -443,11 +444,11 @@ WOK
'check document structure'
).colorize
tell=SiSU_Screen::Ansi.new(
- @md.opt.act[:color_state][:set],
- 'invert',
- '',
- ''
- )
+ @md.opt.act[:color_state][:set],
+ 'invert',
+ '',
+ ''
+ )
tell.grey_open
end
tidyfile='/dev/null' #don't want one or screen output, check for alternative flags
@@ -461,6 +462,8 @@ WOK
end
end
__END__
+** Notes:
+tidy -xml scroll.xhtml >> index.tidy
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/develop/xhtml_epub2.rb
index ceed3239..0c4e6245 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/develop/xhtml_epub2.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2
@@ -76,6 +73,7 @@ module SiSU_XHTML_EPUB2
require_relative 'xhtml_epub2_tune' # xhtml_epub2_tune.rb
include SiSU_XHTML_EPUB2_Tune
require_relative 'xhtml_epub2_concordance' # xhtml_epub2_concordance.rb
+ require_relative 'xhtml_epub2_persist' # xhtml_epub2_persist.rb
class Source
def initialize(opt)
@opt=opt
@@ -127,9 +125,9 @@ module SiSU_XHTML_EPUB2
SiSU_Env::FileOp.new(@md).mkdir.output.epub
@tuned_file_array=SiSU_XHTML_EPUB2::Source::XHTML_Environment.new(@particulars).tuned_file_instructions
data=@tuned_file_array
- toc=SiSU_XHTML_EPUB2::Source::Toc.new(@md,data).songsheet
+ per=SiSU_XHTML_EPUB2::Source::Toc.new(@md,data).songsheet
data=@tuned_file_array
- SiSU_XHTML_EPUB2::Source::ScrollHeadAndSegToc.new(@md,toc).in_common #watch
+ SiSU_XHTML_EPUB2::Source::ScrollHeadAndSegToc.new(@md,per).in_common #watch
SiSU_XHTML_EPUB2::Source::Seg.new(@md,data).songsheet
SiSU_XHTML_EPUB2::Source::Output.new(@md).songsheet
rescue
@@ -147,11 +145,10 @@ module SiSU_XHTML_EPUB2
end
end
SiSU_Env::Clear.new(@opt.selections.str,@opt.fns).param_instantiate
- @@flag,@@scr,@@seg,@@seg_endnotes,@@seg_subtoc,@@seg_ad={},{},{},{},{},{}
- @@seg_total,@@tracker,@@loop_count,@@tablehead,@@number_of_cols=0,0,0,0,0
- @@seg_name,@@seg_name_html,@@seg_subtoc_array,@@seg_endnotes_array,@@segtocband,@@tablefoot=Array.new(7){[]}
- @@filename_seg,@@seg_url,@@fn,@@to_lev4,@@get_hash_to,@@get_hash_fn='','','','','','',''
- @@is4=@@is3=@@is2=@@is1=@@heading1=@@heading2=@@heading3=@@heading4=0
+ @@flag,@@scr,@@seg,@@seg_endnotes,@@seg_subtoc={},{},{},{},{}
+ @@tracker=0
+ @@seg_name,@@seg_name_html,@@seg_subtoc_array,@@seg_endnotes_array,@@tablefoot=Array.new(5){[]}
+ @@filename_seg,@@seg_url,@@to_lev4,@@get_hash_to,@@get_hash_fn='','','','',''
end
end
private
@@ -205,7 +202,6 @@ module SiSU_XHTML_EPUB2
end
end
class Toc
- @@toc={ seg: [], seg_mini: [], scr: [], ncx: [], opf: [] }
@@seg_url=''
@@firstseg=nil
def initialize(md=nil,data='')
@@ -213,237 +209,242 @@ module SiSU_XHTML_EPUB2
@epub=SiSU_XHTML_EPUB2_Format::HeadInformation.new(@md)
@tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set]) if @md
@make=SiSU_Env::ProcessingSettings.new(@md)
+ @per=SiSU_XHTML_EPUB2_Persist::PersistTOC.new
end
def songsheet #extracts toc for scroll & seg
- if (@md.opt.act[:verbose][:set]==:on \
- || @md.opt.act[:verbose_plus][:set]==:on \
- || @md.opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @md.opt.act[:color_state][:set],
- 'Toc'
- ).txt_grey
- end
- toc=nil
- @@firstseg=nil
- @@toc={ seg: [], seg_mini: [], scr: [], ncx: [], opf: [] }
- md_opf_a_content,md_opf_a_spine,md_opf_a_guide=[],[],[]
- @nav_no=0
- @s_a_no,@s_b_no,@s_c_no,@s_d_no,@lv5_no,@lv6_no=0,0,0,0,0,0
- @@toc[:ncx] << @epub.toc_ncx.open #epub ncx navmap
- @@toc[:ncx] << @epub.toc_ncx.head_open << @epub.toc_ncx.head << @epub.toc_ncx.head_close
- @@toc[:ncx] << @epub.toc_ncx.doc_title << @epub.toc_ncx.doc_author
- @@toc[:ncx] << @epub.toc_ncx.navmap_open
- @@toc[:opf] << @epub.metadata_opf.package_open
- @@toc[:opf] << @epub.metadata_opf.metadata
- @@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
- md_opf_a_guide << @epub.metadata_opf.guide_sisu_toc
- end
- @ncxo=[false,false,false,false,false,false,false]
- @dob_toc2,@dob_toc3=nil,nil
- @ncx_cls=[]
- @level_a_first_occurrence=true
- @data.each do |dob|
- if dob.is==:heading \
- || dob.is==:heading_insert
- dob_toc=dob.dup
- toc=case dob_toc.ln
- when 0
- @s_a_no +=1
- 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[7]
- @@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]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[2]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[1]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[0]
- @ncxo[0],@ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
- true, false, false, false, false, false, false, false
- @epub.sections(dob_toc,lv_name)
- if @level_a_first_occurrence \
- && @make.build.toc?
- @@toc[:ncx] << @epub.toc_ncx.navmap_sisu_toc(@nav_no) #epub ncx navmap, toc
+ begin
+ if (@md.opt.act[:verbose][:set]==:on \
+ || @md.opt.act[:verbose_plus][:set]==:on \
+ || @md.opt.act[:maintenance][:set]==:on)
+ SiSU_Screen::Ansi.new(
+ @md.opt.act[:color_state][:set],
+ 'Toc'
+ ).txt_grey
+ end
+ toc=nil
+ @@firstseg=nil
+ SiSU_XHTML_EPUB2_Persist::PersistTOC.new.persist_init
+ md_opf_a_content,md_opf_a_spine,md_opf_a_guide=[],[],[]
+ @nav_no=0
+ @s_a_no,@s_b_no,@s_c_no,@s_d_no,@lv5_no,@lv6_no=0,0,0,0,0,0
+ @per.ncx << @epub.toc_ncx.open #epub ncx navmap
+ @per.ncx << @epub.toc_ncx.head_open << @epub.toc_ncx.head << @epub.toc_ncx.head_close
+ @per.ncx << @epub.toc_ncx.doc_title << @epub.toc_ncx.doc_author
+ @per.ncx << @epub.toc_ncx.navmap_open
+ @per.opf << @epub.metadata_opf.package_open
+ @per.opf << @epub.metadata_opf.metadata
+ @per.opf << @epub.metadata_opf.manifest_open
+ @per.seg << %{<div class="content">\n<div class="substance">}
+ @per.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
+ md_opf_a_guide << @epub.metadata_opf.guide_sisu_toc
+ end
+ @ncxo=[false,false,false,false,false,false,false]
+ @dob_toc2,@dob_toc3=nil,nil
+ @ncx_cls=[]
+ @level_a_first_occurrence=true
+ @data.each do |dob|
+ if dob.is==:heading \
+ || dob.is==:heading_insert
+ dob_toc=dob.dup
+ toc=case dob_toc.ln
+ when 0
+ @s_a_no +=1
+ lv_name='section_a' + @s_a_no.to_s
+ @nav_no+=1
+ @nav_no2=@nav_no
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[3]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[2]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[1]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[0]
+ @ncxo[0],@ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false, false, false, false, false, false
+ @epub.sections(dob_toc,lv_name)
+ if @level_a_first_occurrence \
+ && @make.build.toc?
+ @per.ncx << @epub.toc_ncx.navmap_sisu_toc(@nav_no) #epub ncx navmap, toc
+ @nav_no+=1
+ @level_a_first_occurrence=false
+ end
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_0
+ when 1
+ @s_b_no +=1
+ lv_name='section_b' + @s_b_no.to_s
+ @nav_no+=1
+ @nav_no2=@nav_no
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[3]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[2]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[1]
+ @ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false, false, false, false, false
+ @epub.sections(dob_toc,lv_name)
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_1
+ when 2
+ @s_c_no +=1
+ lv_name='section_c' + @s_c_no.to_s
+ @nav_no+=1
+ @nav_no2=@nav_no
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[3]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[2]
+ @ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false, false, false, false
+ @epub.sections(dob_toc,lv_name)
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_2
+ when 3
+ @s_d_no +=1
+ lv_name='section_d' + @s_d_no.to_s
@nav_no+=1
- @level_a_first_occurrence=false
+ @nav_no3=@nav_no
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[3]
+ @ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false, false, false
+ @epub.sections(dob_toc,lv_name)
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_3
+ when 4
+ @ncx_cls=[]
+ lv_name=dob_toc.name
+ @nav_no+=1
+ @dob_name=dob.name
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false, false
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_4
+ when 5
+ @ncx_cls=[]
+ hashtag='#o' + dob_toc.ocn.to_s
+ lv_name=@dob_name
+ @nav_no+=1
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @ncxo[5],@ncxo[6],@ncxo[7]=
+ true, false, false
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_5
+ when 6
+ @ncx_cls=[]
+ hashtag='#o' + dob_toc.ocn.to_s
+ lv_name=@dob_name
+ @nav_no+=1
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @ncxo[6],@ncxo[7]=
+ true, false
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_6
+ when 7
+ @ncx_cls=[]
+ hashtag='#o' + dob_toc.ocn.to_s
+ lv_name=@dob_name
+ @nav_no+=1
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[7]
+ @ncxo[7]=true
+ @per.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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_7
+ else nil
end
- @@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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_0
- when 1
- @s_b_no +=1
- 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[7]
- @@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]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
- @@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],@ncxo[7]=
- true, false, false, false, false, false, false
- @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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_1
- when 2
- @s_c_no +=1
- lv_name='section_c' + @s_c_no.to_s
- @nav_no+=1
- @nav_no2=@nav_no
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[7]
- @@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]
- @@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],@ncxo[7]=
- true, false, false, false, false, false
- @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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_2
- when 3
- @s_d_no +=1
- lv_name='section_d' + @s_d_no.to_s
- @nav_no+=1
- @nav_no3=@nav_no
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[7]
- @@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]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
- @ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6],@ncxo[7]=
- true, false, false, false, false
- @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_XHTML_EPUB2::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[7]
- @@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],@ncxo[7]=
- true, false, false, false
- @@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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_4
- when 5
- @ncx_cls=[]
- hashtag='#o' + dob_toc.ocn.to_s
- lv_name=@dob_name
- @nav_no+=1
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[7]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[5]
- @ncxo[5],@ncxo[6],@ncxo[7]=
- true, false, false
- @@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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_5
- when 6
- @ncx_cls=[]
- hashtag='#o' + dob_toc.ocn.to_s
- lv_name=@dob_name
- @nav_no+=1
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[7]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[6]
- @ncxo[6],@ncxo[7]=
- true, false
- @@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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_6
- when 7
- @ncx_cls=[]
- hashtag='#o' + dob_toc.ocn.to_s
- lv_name=@dob_name
- @nav_no+=1
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[7]
- @ncxo[7]=true
- @@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_XHTML_EPUB2::Source::Toc.new(@md,dob_toc).level_7
- else nil
- end
- toc.each do |k,d|
- d.gsub!(/(?:#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]})\s*/m,' ')
- end if toc
- if @@firstseg.nil? \
- and dob.ln==4 \
- and dob.name =~/\S+/
- @@firstseg=dob.name
- end
- if toc
- begin
- @@toc[:seg] << toc[:seg]
- @@toc[:scr] << toc[:seg]
- rescue
- SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
- __LINE__.to_s + ':' + __FILE__
+ toc.each do |k,d|
+ d.gsub!(/(?:#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]})\s*/m,' ')
+ end if toc
+ if @@firstseg.nil? \
+ and dob.ln==4 \
+ and dob.name =~/\S+/
+ @@firstseg=dob.name
+ end
+ if toc
+ begin
+ @per.seg << toc[:seg]
+ @per.scr << toc[:seg]
+ rescue
+ SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
+ __LINE__.to_s + ':' + __FILE__
+ end
end
end
end
end
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[6]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[5]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[4]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[3]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[2]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[1]
+ @per.ncx << @epub.toc_ncx.navpoint_close if @ncxo[0]
+ @ncxo[0],@ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6]=false,false,false,false,false,false,false
+ md_opf_a_content << @epub.metadata_opf.manifest_images(@md.ec[:image])
+ @per.seg << "</div>\n</div>"
+ @per.scr << "</div>\n</div>"
+ @per.ncx << @epub.toc_ncx.navmap_close
+ @per.ncx << @epub.toc_ncx.close
+ @per.opf << md_opf_a_content << @epub.metadata_opf.manifest_close
+ @per.opf << @epub.metadata_opf.spine_open << md_opf_a_spine << @epub.metadata_opf.spine_close
+ @per.opf << @epub.metadata_opf.guide_open << md_opf_a_guide << @epub.metadata_opf.guide_close
+ @per.opf << @epub.metadata_opf.package_close
+ @per.opf=@per.opf.flatten
+ SiSU_XHTML_EPUB2::Source::Output.new(@md,@per.opf).epub_metadata_opf
+ SiSU_XHTML_EPUB2::Source::Output.new(@md,@per.ncx).epub_toc_ncx
+ @md.firstseg=@@firstseg
+ @per
+ ensure
+ SiSU_XHTML_EPUB2_Persist::Persist.new.persist_init
end
- @@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]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[3]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[2]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[1]
- @@toc[:ncx] << @epub.toc_ncx.navpoint_close if @ncxo[0]
- @ncxo[0],@ncxo[1],@ncxo[2],@ncxo[3],@ncxo[4],@ncxo[5],@ncxo[6]=false,false,false,false,false,false,false
- md_opf_a_content << @epub.metadata_opf.manifest_images(@md.ec[:image])
- @@toc[:seg] << "</div>\n</div>"
- @@toc[:scr] << "</div>\n</div>"
- @@toc[:ncx] << @epub.toc_ncx.navmap_close
- @@toc[:ncx] << @epub.toc_ncx.close
- @@toc[:opf] << md_opf_a_content << @epub.metadata_opf.manifest_close
- @@toc[:opf] << @epub.metadata_opf.spine_open << md_opf_a_spine << @epub.metadata_opf.spine_close
- @@toc[:opf] << @epub.metadata_opf.guide_open << md_opf_a_guide << @epub.metadata_opf.guide_close
- @@toc[:opf] << @epub.metadata_opf.package_close
- @@toc[:opf]=@@toc[:opf].flatten
- SiSU_XHTML_EPUB2::Source::Output.new(@md,@@toc[:opf]).epub_metadata_opf
- SiSU_XHTML_EPUB2::Source::Output.new(@md,@@toc[:ncx]).epub_toc_ncx
- @md.firstseg=@@firstseg
- @@toc
end
protected
def level_0
@@ -457,7 +458,7 @@ module SiSU_XHTML_EPUB2
toc[:seg]=format_toc.lev1
title=if dob.ocn ==0 then linkname
else
- @@toc[:scr] << '<br />'
+ @per.scr << '<br />'
link=(dob.ln) \
? dob.ln
: ''
@@ -493,7 +494,7 @@ module SiSU_XHTML_EPUB2
else linkname
end
else
- @@toc[:scr] << '<br />'
+ @per.scr << '<br />'
link=(dob.ln) \
? dob.ln
: ''
@@ -639,8 +640,8 @@ module SiSU_XHTML_EPUB2
end
end
class ScrollHeadAndSegToc < Toc
- def initialize(md='',toc='',links_guide_toc='')
- @md,@toc,@links_guide_toc=md,toc,links_guide_toc
+ def initialize(md='',per='',links_guide_toc='')
+ @md,@per,@links_guide_toc=md,per,links_guide_toc
end
def in_common
toc_shared=[]
@@ -702,9 +703,9 @@ module SiSU_XHTML_EPUB2
toc_shared << prefix_b
end
#Table of Contents added/appended here
- toc_shared << @toc[:scr]
+ toc_shared << @per.scr
segtoc << @links_guide_toc
- segtoc << @toc[:seg]
+ segtoc << @per.seg
if defined? @md.rights.all \
and @md.rights.all
segtoc << rights
@@ -719,7 +720,7 @@ module SiSU_XHTML_EPUB2
SiSU_XHTML_EPUB2::Source::Output.new(@md).make_cover_image
SiSU_XHTML_EPUB2::Source::Output.new(@md,segtoc).make_segtoc
segtoc=[]
- @toc[:scr],@toc[:seg]=[],[]
+ @per.scr,@per.seg=[],[]
toc_shared
end
end
diff --git a/lib/sisu/v6/xhtml_epub2_concordance.rb b/lib/sisu/develop/xhtml_epub2_concordance.rb
index 0c70d858..024a5a5e 100644
--- a/lib/sisu/v6/xhtml_epub2_concordance.rb
+++ b/lib/sisu/develop/xhtml_epub2_concordance.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub concordance file (wordmap, linked index of words in document)
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/epub_concordance.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub concordance file (html concordance, wordmap, linked index
- of words in document)
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_concordance.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Concordance
diff --git a/lib/sisu/v5/xhtml_epub2_format.rb b/lib/sisu/develop/xhtml_epub2_format.rb
index bbd02a6d..54c79434 100644
--- a/lib/sisu/v5/xhtml_epub2_format.rb
+++ b/lib/sisu/develop/xhtml_epub2_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub formating, css template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub formating, css template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_format.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Format
@@ -1254,8 +1251,9 @@ module SiSU_XHTML_EPUB2_Format
@md=md
# DublinCore 1 - title
@css=SiSU_Env::CSS_Stylesheet.new(md)
- @seg_name_xhtml=(SiSU_XHTML_EPUB2::Source::Seg.new.seg_name_xhtml || [])
- @seg_name_xhtml_tracker=(SiSU_XHTML_EPUB2::Source::Seg.new.seg_name_xhtml_tracker || [])
+ @per=SiSU_XHTML_EPUB2_Persist::Persist.new
+ @per.seg_name_x=SiSU_XHTML_EPUB2::Seg.new.seg_name_x
+ @per.seg_name_x_tracker=SiSU_XHTML_EPUB2::Seg.new.seg_name_x_tracker
@tocband_scroll,@tocband_segtoc=nil,nil
@index,@metalink='index','#metadata'
end
@@ -1830,7 +1828,7 @@ output_epub_cont_seg.close
%{#{doc_type}
<head>
<title>
- #{@seg_name_xhtml[@seg_name_xhtml_tracker]} -
+ #{@per.seg_name_x[@per.seg_name_x_tracker]} -
#{@md.html_title}
</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
diff --git a/lib/sisu/develop/xhtml_epub2_persist.rb b/lib/sisu/develop/xhtml_epub2_persist.rb
new file mode 100644
index 00000000..889cd1a3
--- /dev/null
+++ b/lib/sisu/develop/xhtml_epub2_persist.rb
@@ -0,0 +1,278 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** html segment generation, processing
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_persist.rb;hb=HEAD>
+
+=end
+module SiSU_XHTML_EPUB2_Persist
+ class Persist
+ @@persist=nil
+ attr_accessor :is0,:is1,:is2,:is3,:is4,:heading0,:heading1,:heading2,:heading3,:heading4, :title, :nav, :tocband_banner, :tocband_bannerless, :headings, :heading_endnotes, :main, :endnote_all, :tail, :credits, :heading_idx, :idx, :seg_endnotes, :seg_endnotes_array, :closed, :get_hash_fn, :get_hash_to, :seg_subtoc, :seg_subtoc_array, :fn, :seg_name ,:seg_name_x,:seg_name_x_tracker
+ def initialize(args=nil)
+ @@persist=args=(args ? args : (@@persist || persist_init_hash_values))
+ @is0=args[:is0]
+ @is1=args[:is1]
+ @is2=args[:is2]
+ @is3=args[:is3]
+ @is4=args[:is4]
+ @heading0=args[:heading0]
+ @heading1=args[:heading1]
+ @heading2=args[:heading2]
+ @heading3=args[:heading3]
+ @heading4=args[:heading4]
+ @title=args[:title]
+ @nav=args[:nav]
+ @tocband_banner=args[:tocband_banner]
+ @tocband_bannerless=args[:tocband_bannerless]
+ @headings=args[:headings]
+ @heading_endnotes=args[:heading_endnotes]
+ @main=args[:main]
+ @endnote_all=args[:endnote_all]
+ @tail=args[:tail]
+ @credits=args[:credits]
+ #@heading_idx=args[:heading_idx]
+ @idx=args[:idx]
+ @seg_endnotes=args[:seg_endnotes]
+ @seg_endnotes_array=args[:seg_endnotes_array]
+ @closed=args[:closed]
+ @get_hash_to=args[:get_hash_to]
+ @get_hash_fn=args[:get_hash_fn]
+ @seg_subtoc=args[:seg_subtoc]
+ @seg_subtoc_array=args[:seg_subtoc_array]
+ @fn=args[:fn]
+ @seg_name=args[:seg_name]
+ @seg_name_x=args[:seg_name_x]
+ @seg_name_x_tracker=args[:seg_name_x_tracker]
+ end
+ def is0
+ @is0
+ end
+ def is1
+ @is1
+ end
+ def is2
+ @is2
+ end
+ def is3
+ @is3
+ end
+ def is4
+ @is4
+ end
+ def heading0
+ @heading0
+ end
+ def heading1
+ @heading1
+ end
+ def heading2
+ @heading2
+ end
+ def heading3
+ @heading3
+ end
+ def heading4
+ @heading4
+ end
+ def title
+ @title
+ end
+ def nav
+ @nav
+ end
+ def tocband_banner
+ @tocband_banner
+ end
+ def tocband_bannerless
+ @tocband_bannerless
+ end
+ def headings
+ @headings
+ end
+ def heading_endnotes
+ @heading_endnotes
+ end
+ def main
+ @main
+ end
+ def endnote_all
+ @endnote_all
+ end
+ def tail
+ @tail
+ end
+ def credits
+ @credits
+ end
+ def heading_idx
+ @heading_idx
+ end
+ def idx
+ @idx
+ end
+ def seg_endnotes
+ @seg_endnotes
+ end
+ def seg_endnotes_array
+ @seg_endnotes_array
+ end
+ def closed
+ @closed
+ end
+ def get_hash_to
+ @get_hash_to
+ end
+ def get_hash_fn
+ @get_hash_fn
+ end
+ def seg_subtoc
+ @seg_subtoc
+ end
+ def seg_subtoc_array
+ @seg_subtoc_array
+ end
+ def fn
+ @fn
+ end
+ def seg_name
+ @seg_name
+ end
+ def seg_name_x
+ @seg_name_x
+ end
+ def seg_name_x_tracker
+ @seg_name_x_tracker
+ end
+ def persist_init_hash_values
+ {
+ is0: 0,
+ is1: 0,
+ is2: 0,
+ is3: 0,
+ is4: 0,
+ heading0: '',
+ heading1: '',
+ heading2: '',
+ heading3: '',
+ heading4: '',
+ tocband_banner: [],
+ tocband_bannerless: [],
+ title: [],
+ nav: [],
+ headings: [],
+ main: [],
+ idx: [],
+ tail: [],
+ credits: [],
+ endnote_all: [],
+ heading_endnotes: '',
+ seg_endnotes: {},
+ seg_endnotes_array: [],
+ closed: [],
+ get_hash_fn: '',
+ get_hash_to: '',
+ seg_subtoc: {},
+ seg_subtoc_array: [],
+ fn: '',
+ seg_name: [],
+ seg_name_x: [],
+ seg_name_x_tracker: 0,
+ }
+ end
+ def persist_init
+ @@persist=nil
+ Persist.new(persist_init_hash_values)
+ end
+ end
+ class PersistTOC
+ @@persist=nil
+ attr_accessor :seg,:seg_mini,:scr,:ncx,:opf
+ def initialize(args=nil)
+ @@persist=args=(args ? args : (@@persist || persist_init_hash_values))
+ @seg=args[:seg]
+ @seg_mini=args[:seg_mini]
+ @scr=args[:scr]
+ @ncx=args[:ncx]
+ @opf=args[:opf]
+ end
+ def seg
+ @seg
+ end
+ def seg_mini
+ @seg_mini
+ end
+ def scr
+ @scr
+ end
+ def ncx
+ @ncx
+ end
+ def opf
+ @opf
+ end
+ def persist_init_hash_values
+ {
+ seg: [],
+ seg_mini: [],
+ scr: [],
+ ncx: [],
+ opf: [],
+ }
+ end
+ def persist_init
+ @@persist=nil
+ PersistTOC.new(persist_init_hash_values)
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/xhtml_epub2_segments.rb b/lib/sisu/develop/xhtml_epub2_segments.rb
index fca2e729..436cf845 100644
--- a/lib/sisu/v6/xhtml_epub2_segments.rb
+++ b/lib/sisu/develop/xhtml_epub2_segments.rb
@@ -1,96 +1,116 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub segment generation, processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/epub_segments.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub segment generation, processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_segments.rb;hb=HEAD>
=end
module SiSU_XHTML_EPUB2_Seg
require_relative 'xhtml_shared' # xhtml_shared.rb
require_relative 'xhtml_epub2' # xhtml_epub2.rb
+ require_relative 'xhtml_epub2_persist' # xhtml_epub2_persist.rb
require_relative 'shared_metadata' # shared_metadata.rb
class Output
- def initialize(md,outputfile,seg,type='')
- @md,@output_epub_cont_seg,@seg,@type=md,outputfile,seg,type
+ def initialize(md,outputfile,per,type='')
+ @md, @output_epub_cont_seg,@per,@type=
+ md,outputfile, per, type
end
- def output #CONSIDER
- if @seg[:title] =~/\S/
+ def output
+ if @per.title =~/\S/
filename_seg=[]
- filename_seg << @seg[:title] << @seg[:nav]
+ filename_seg \
+ << @per.title \
+ << @per.nav
if @type=='endnotes'
- @seg[:headings]=[] #watch
+ @per.headings=[] #watch
txt_obj={ txt: 'Endnotes', ocn_display: ''}
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
- filename_seg << @seg[:heading_endnotes] << @seg[:headings] << %{\n<div class="content">\n} << @seg[:endnote_all] << '</div>'
+ @per.headings \
+ << format_seg.title_heading1
+ filename_seg \
+ << @per.heading_endnotes \
+ << @per.headings \
+ << %{\n<div class="content">\n} \
+ << @per.endnote_all \
+ << '</div>'
elsif @type=='idx'
- @seg[:headings]=[]
+ @per.headings=[]
txt_obj={ txt: 'Index', ocn_display: ''}
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
- filename_seg << @seg[:heading_idx] << @seg[:headings] << %{\n<div class="content">\n} << @seg[:idx] << '</div>'
+ @per.headings << format_seg.title_heading1
+ filename_seg \
+ << @per.heading_idx \
+ << @per.headings \
+ << %{\n<div class="content">\n} \
+ << @per.idx \
+ << '</div>'
elsif @type=='metadata'
metadata=SiSU_Metadata::Summary.new(@md).xhtml_display.metadata
- @seg[:headings]=[]
+ @per.headings=[]
txt_obj={ txt: 'Metadata', ocn_display: ''}
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
- filename_seg << @seg[:heading_idx] << @seg[:headings] << %{\n<div class="content">\n} << metadata << '</div>'
+ @per.headings \
+ << format_seg.title_heading1
+ filename_seg \
+ << @per.heading_idx \
+ << @per.headings \
+ << %{\n<div class="content">\n} \
+ << metadata \
+ << '</div>'
elsif @type=='sisu_manifest'
env=SiSU_Env::InfoEnv.new(@md.fns)
- path_and_name,url_and_name="#{env.path.output}/#{@md.fnb}/sisu_manifest.html","#{env.url.root}/#{@md.fnb}/sisu_manifest.html"
+ path_and_name,url_and_name= \
+ "#{env.path.output}/#{@md.fnb}/sisu_manifest.html",
+ "#{env.url.root}/#{@md.fnb}/sisu_manifest.html"
manifest=if FileTest.file?("#{path_and_name}")==true
<<WOK
<p>A list of available output types may be available at the following url:</p>
@@ -98,19 +118,32 @@ module SiSU_XHTML_EPUB2_Seg
WOK
else ''
end
- @seg[:headings]=[]
+ @per.headings=[]
txt_obj={ txt: 'Manifest', ocn_display: ''}
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @seg[:headings] << format_seg.title_heading1
- filename_seg << @seg[:heading_idx] << @seg[:headings] << %{\n<div class="content">\n} << manifest << '</div>'
+ @per.headings \
+ << format_seg.title_heading1
+ filename_seg \
+ << @per.heading_idx \
+ << @per.headings \
+ << %{\n<div class="content">\n} \
+ << manifest \
+ << '</div>'
else
- filename_seg << @seg[:headings] << @seg[:main] << "\n</div>\n"
+ filename_seg \
+ << @per.headings \
+ << @per.main \
+ << "\n</div>\n"
end
- filename_seg << @seg[:tail] << @seg[:nav] << @seg[:close]
+ filename_seg \
+ << @per.tail \
+ << @per.nav \
+ << @per.closed
filename_seg=filename_seg.flatten.compact #watch
filename_seg.each do |str|
unless str =~/\A\s*\Z/
- @output_epub_cont_seg << str.strip
+ @output_epub_cont_seg \
+ << str.strip
end
end
@output_epub_cont_seg.close
@@ -118,68 +151,68 @@ WOK
end
end
class Seg
- @@seg,@@seg_subtoc,@@seg_endnotes,@@seg_ad={},{},{},{}
- @@seg_name,@@seg_name_xhtml=[],[]
- @@seg_url=@@fn=@@get_hash_to=@@get_hash_fn=''
- @@loop_count=@@seg_total=@@tracker=0
- @@is4=@@is3=@@is2=@@is1=@@is0=0
- @@heading0=@@heading1=@@heading2=@@heading3=@@heading4=0
- @@seg[:headings],@@seg[:main],@@seg[:idx],@@seg[:tail],@@seg_subtoc_array,@@seg_endnotes_array,@@seg[:endnote_all]=Array.new(7){[]}
- @@seg[:heading_endnotes]=''
- @@tablehead,@@number_of_cols=0,0
- @@fns_previous=''
- attr_reader :seg_name_xhtml,:seg_name_xhtml_tracker
+ @@seg_name=[]
+ @@seg_url=''
+ @@tracker=0
+ attr_reader :seg_name_x,:seg_name_x_tracker
def initialize(md='',data='')
@md,@data=md,data
- @seg_name_xhtml=@@seg_name_xhtml || nil
- @seg_name_xhtml_tracker=@@tracker || nil
+ @per=SiSU_XHTML_EPUB2_Persist::Persist.new
+ @seg_name_x=@per.seg_name_x=(@@seg_name || [])
+ @seg_name_x_tracker=@per.seg_name_x_tracker=(@@tracker || 0)
@make=SiSU_Env::ProcessingSettings.new(@md) if @md
end
def songsheet
begin
- data=get_subtoc_endnotes(@data)
- data=articles(data)
- SiSU_XHTML_EPUB2_Seg::Seg.new.cleanup # (((( added ))))
+ data=get_subtoc_endnotes(@data,@per)
+ data=articles(data,@per)
+ SiSU_XHTML_EPUB2_Seg::Seg.new.cleanup(@md,@per) # (((( added ))))
#### (((( END )))) ####
rescue
SiSU_Errors::Rescued.new($!,$@,@md.opt.selections.str,@md.fns).location do
__LINE__.to_s + ':' + __FILE__
end
ensure
- @@seg_name=[]
+ SiSU_XHTML_EPUB2_Persist::Persist.new.persist_init
+ @@seg_name=@per.seg_name=[]
end
end
protected
- def articles(data)
+ def articles(data,per)
+ @per=per
tracking,newfile=0,0
- @@is4=@@is3=@@is2=@@is1=@@is0=0
printed_endnote_seg='n'
idx_xhtml=nil
if @md.book_idx
- idx_xhtml=SiSU_Particulars::CombinedSingleton.instance.get_idx_xhtml(@md).xhtml_idx
- idx_xhtml.each {|x| @@seg[:idx] << x }
- @@seg[:heading_idx]=''
+ idx_xhtml=SiSU_Particulars::CombinedSingleton.
+ instance.get_idx_xhtml(@md).xhtml_idx
+ idx_xhtml.each do |x|
+ @per.idx << x
+ end
+ @per.heading_idx=''
end
data.each do |dob|
- if (dob.is==:heading \
- || dob.is==:heading_insert) \
- and dob.ln==4
+ if (dob.is == :heading \
+ || dob.is == :heading_insert) \
+ && dob.ln == 4
@@seg_name << dob.name
+ @per.seg_name = @@seg_name
dob.name
end
end
- @@seg_name_xhtml=@@seg_name
- @@seg_total=@@seg_name.length
- testforartnum=@@seg_name_xhtml
+ @per.seg_name_x=@per.seg_name
+ @per.seg_name.length
+ testforartnum=@per.seg_name_x
if (@md.opt.act[:verbose][:set]==:on \
|| @md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(
@md.opt.act[:color_state][:set],
- @@seg_name.length
+ @per.seg_name.length
)
end
- SiSU_Particulars::CombinedSingleton.instance.get_map_nametags(@md).nametags_map #p map_nametags
+ SiSU_Particulars::CombinedSingleton.
+ instance.get_map_nametags(@md).nametags_map #p map_nametags
data.each do |dob|
#if defined? dob.obj \
#and dob.obj =~/href="#{Xx[:segment]}#+\S+?"/
@@ -197,41 +230,41 @@ WOK
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==4
- @@heading4=dob.obj
- @@is4=newfile=1
+ @per.heading4=dob.obj
+ @per.is4=newfile=1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==3
- @@heading3=dob.obj
- @@is4,@@is3=0,1
+ @per.heading3=dob.obj
+ @per.is4,@per.is3=0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==2
- @@heading2=dob.obj
- @@is4,@@is3,@@is2=0,0,1
+ @per.heading2=dob.obj
+ @per.is4,@per.is3,@per.is2=0,0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==1
- @@heading1=dob.obj
- @@is4,@@is3,@@is2,@@is1=0,0,0,1
+ @per.heading1=dob.obj
+ @per.is4,@per.is3,@per.is2,@per.is1=0,0,0,1
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==0
- @@heading0=dob.obj
- @@is4,@@is3,@@is2,@@is1,@@is0=0,0,0,0,1
+ @per.heading0=dob.obj
+ @per.is4,@per.is3,@per.is2,@per.is1,@per.is0=0,0,0,0,1
end
- if (@@is0 && !@@is1 && !@@is2 && !@@is3 && !@@is4)
+ if (@per.is0 && !@per.is1 && !@per.is2 && !@per.is3 && !@per.is4)
if not (dob.is==:heading \
|| dob.is==:heading_insert) \
&& dob.ln==0
$_ #; check
end
end
- if @@is4==1
+ if @per.is4==1
dir_epub_cont="#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}"
if newfile==1 \
or dob.obj =~/^#{Mx[:br_endnotes]}|^#{Mx[:br_eof]}/
@@ -240,34 +273,36 @@ WOK
|| dob.is==:heading_insert) \
&& dob.ln==4
if tracking != 0
- SiSU_XHTML_EPUB2_Seg::Seg.new(@md).tail
- segfilename="#{dir_epub_cont}/#{@@seg_name_xhtml[tracking-1]}#{Sfx[:epub_xhtml]}"
- output_epub_cont_seg=File.new(segfilename,'w') if @@seg_name_xhtml[tracking-1]
+ tail(@md,@per)
+ #SiSU_XHTML_EPUB2_Seg::Seg.new(@md,@per).tail
+ segfilename="#{dir_epub_cont}/#{@per.seg_name_x[tracking-1]}#{Sfx[:epub_xhtml]}"
+ output_epub_cont_seg=File.new(segfilename,'w') if @per.seg_name_x[tracking-1]
if dob.is==:heading \
- or @@seg_name_xhtml[tracking-1] !~/endnotes|book_index|metadata/
- SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@@seg).output
+ or @per.seg_name_x[tracking-1] !~/endnotes|book_index|metadata/
+ SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@per).output
elsif dob.is==:heading_insert
- if @@seg_name_xhtml[tracking-1]=='endnotes'
- SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@@seg,'endnotes').output
- elsif @@seg_name_xhtml[tracking-1]=='book_index'
- SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@@seg,'idx').output
- @@seg[:idx]=[]
- elsif @@seg_name_xhtml[tracking-1]=='metadata' # navigation bug FIX
- SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@@seg,'metadata').output
+ if @per.seg_name_x[tracking-1]=='endnotes'
+ SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@per,'endnotes').output
+ elsif @per.seg_name_x[tracking-1]=='book_index'
+ SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@per,'idx').output
+ @per.idx=[]
+ elsif @per.seg_name_x[tracking-1]=='metadata' # navigation bug FIX
+ SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@per,'metadata').output
else puts "#{__FILE__}::#{__LINE__}"
end
else puts "#{__FILE__}::#{__LINE__}"
end
- SiSU_XHTML_EPUB2_Seg::Seg.new.reinitialise
+ SiSU_XHTML_EPUB2_Seg::Seg.new.reinitialise(per)
heading_art(dob)
head(dob)
- if @@seg_name_xhtml[tracking] =='metadata'
- segfilename="#{dir_epub_cont}/#{@@seg_name_xhtml[tracking]}#{Sfx[:epub_xhtml]}"
+ if @per.seg_name_x[tracking] =='metadata'
+ segfilename="#{dir_epub_cont}/#{@per.seg_name_x[tracking]}#{Sfx[:epub_xhtml]}"
output_epub_cont_seg=File.new(segfilename,'w')
- SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@@seg,'metadata').output
- SiSU_XHTML_EPUB2_Seg::Seg.new.reinitialise #BUG navigation bug with items following metadata, and occurring before manifest, this becomes a bug ... work area for book index, FIX
+ SiSU_XHTML_EPUB2_Seg::Output.new(@md,output_epub_cont_seg,@per,'metadata').output
+ SiSU_XHTML_EPUB2_Seg::Seg.new.reinitialise(per)
+ #BUG navigation bug with items following metadata, and occurring before manifest, this becomes a bug ... work area for book index, FIX
end
- #@output_epub_cont_seg.close #%(((( EOF )))) -->
+ #@output_epub_cont_seg.closed #%(((( EOF )))) -->
end
if tracking==0
heading_art(dob)
@@ -280,8 +315,8 @@ WOK
|| dob.is==:heading_insert) \
&& dob.ln==4 \
&& dob.name
- @@get_hash_to=dob.name
- @@get_hash_fn=dob.name
+ @per.get_hash_to=dob.name
+ @per.get_hash_fn=dob.name
end
if dob.obj.is_a?(String)
markup(dob)
@@ -300,51 +335,56 @@ WOK
data
end
def heading_art(dob)
- @@seg[:title]=SiSU_XHTML_EPUB2_Format::HeadSeg.new(@md).head
+ @per.title=SiSU_XHTML_EPUB2_Format::HeadSeg.new(@md).head
end
def head(dob)
clean=/<!.*?!>|<:.*?>$/
@p_num ||= ''
- if @@is0==1
+ if @per.is0==1
if defined? @md.creator.author \
and @md.creator.author
@author=%{<b>#{@md.creator.author}</b>\n}
end
@p_num=SiSU_XHTML_EPUB2_Format::ParagraphNumber.new(@md,dob.ocn)
- txt_obj={ txt: @@heading0, ocn_display: @p_num.ocn_display }
+ txt_obj={ txt: @per.heading0, ocn_display: @p_num.ocn_display }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] << format_seg.title_heading0.gsub(clean,'')
- @@heading0=@@heading0.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
+ @per.headings << format_seg.title_heading0.gsub(clean,'')
+ @per.heading0=@per.heading0.
+ gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
- if @@is1==1
+ if @per.is1==1
@p_num=SiSU_XHTML_EPUB2_Format::ParagraphNumber.new(@md,dob.ocn)
- txt_obj={ txt: @@heading1, ocn_display: @p_num.ocn_display }
+ txt_obj={ txt: @per.heading1, ocn_display: @p_num.ocn_display }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] << format_seg.title_heading1.gsub(clean,'')
- @@heading1=@@heading1.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
+ @per.headings << format_seg.title_heading1.gsub(clean,'')
+ @per.heading1=@per.heading1.
+ gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
- if @@is2==1
- heading2=@@heading2
+ if @per.is2==1
+ heading2=@per.heading2
@p_num=SiSU_XHTML_EPUB2_Format::ParagraphNumber.new(@md,dob.ocn)
txt_obj={ txt: heading2, ocn_display: @p_num.ocn_display }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] << format_seg.title_heading2.gsub(clean,'')
- @@heading2=@@heading2.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
+ @per.headings << format_seg.title_heading2.gsub(clean,'')
+ @per.heading2=@per.heading2.
+ gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
- if @@is3==1
- heading3=@@heading3
+ if @per.is3==1
+ heading3=@per.heading3
@p_num=SiSU_XHTML_EPUB2_Format::ParagraphNumber.new(@md,dob.ocn)
txt_obj={ txt: heading3, ocn_display: @p_num.ocn_display }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] << format_seg.title_heading3.gsub(clean,'')
- @@heading3=@@heading3.gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
+ @per.headings << format_seg.title_heading3.gsub(clean,'')
+ @per.heading3=@per.heading3.
+ gsub(/#{$ep[:hsp]}<a name="-[\d*+]+" href="#_[\d*+]+">#{$ep[:hsp]}<sup>[\d*+]+<\/sup>#{$ep[:hsp]}<\/a>/,'')
end
- if @@is4==1
- heading4=@@heading4
+ if @per.is4==1
+ heading4=@per.heading4
@p_num=SiSU_XHTML_EPUB2_Format::ParagraphNumber.new(@md,dob.ocn)
txt_obj={ txt: heading4, ocn_display: @p_num.ocn_display }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- @@seg[:headings] << format_seg.title_heading4.gsub(clean,'')
+ @per.headings \
+ << format_seg.title_heading4.gsub(clean,'')
end
@@tracker=@@tracker+1
end
@@ -389,21 +429,23 @@ WOK
else sto.para
end
end
- elsif dob.is ==:block \
- || dob.is ==:group \
- || dob.is ==:alt
- sto.para #fix this should be block type specific #FIX
- elsif dob.is==:verse
- sto.verse
- elsif dob.is==:code
- sto.code
- elsif dob.is==:table
- sto.table
- elsif dob.is==:break
- sto.break
+ elsif dob.is ==:block \
+ || dob.is ==:group \
+ || dob.is ==:alt
+ sto.para #fix this should be block type specific #FIX
+ elsif dob.is==:verse
+ sto.verse
+ elsif dob.is==:code
+ sto.code
+ elsif dob.is==:table
+ sto.table
+ elsif dob.is==:break
+ sto.break
end
if @md.flag_separate_endnotes # may need to revisit, check
- dob.obj=dob.obj.gsub(/"\s+href="##{Mx[:note_ref]}(\d+)">/,%{" href=\"endnotes#{Sfx[:epub_xhtml]}##{Mx[:note_ref]}\\1">}) #endnote- twice #removed file type
+ dob.obj=dob.obj.gsub(/"\s+href="##{Mx[:note_ref]}(\d+)">/,
+ %{" href=\"endnotes#{Sfx[:epub_xhtml]}##{Mx[:note_ref]}\\1">})
+ #endnote- twice #removed file type
end
if (dob.is ==:heading \
|| dob.is==:heading_insert \
@@ -414,77 +456,82 @@ WOK
if (dob.is==:heading \
|| dob.is==:heading_insert \
|| dob.is==:para) \
- and dob.note_ #dob.obj =~/<a href="#note_ref\d+">&nbsp;<sup id=/ #endnote- note-
+ and dob.note_
+ #dob.obj =~/<a href="#note_ref\d+">&nbsp;<sup id=/ #endnote- note-
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,dob)
dob.obj=format_seg.no_paranum
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
and dob.ln==4
- @@seg[:main] << %{\n<div class="content">\n}
- @@seg[:main] << dob_xhtml
+ @per.main << %{\n<div class="content">\n}
+ @per.main << dob_xhtml
if @make.build.segsubtoc?
- @@seg[:main] << @@seg_subtoc[@@get_hash_fn] #% insertion of sub-toc
+ @per.main << @per.seg_subtoc[@per.get_hash_fn]
+ #% insertion of sub-toc
end
else
- @@seg[:main] << dob_xhtml
+ @per.main << dob_xhtml
end
end
- def tail
+ def tail(md,per)
+ @md,@per=md,per
format_head_seg=SiSU_XHTML_EPUB2_Format::HeadSeg.new(@md)
if @md.flag_auto_endnotes \
- and @@seg_endnotes[@@get_hash_fn]
- @@seg[:tail] << %{\n<div class="content">\n<div class="endnote">\n}
- if @@seg_endnotes[@@get_hash_fn].flatten.length > 0
- @@seg[:tail] << format_head_seg.endnote_mark
- @@seg[:tail] << @@seg_endnotes[@@get_hash_fn].flatten #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
+ and @per.seg_endnotes[@per.get_hash_fn]
+ @per.tail << %{\n<div class="content">\n<div class="endnote">\n}
+ if @per.seg_endnotes[@per.get_hash_fn].flatten.length > 0
+ @per.tail << format_head_seg.endnote_mark
+ @per.tail << @per.seg_endnotes[@per.get_hash_fn].flatten
+ #endnotes deposited at end of individual segments ||@|EXTRACTION OF ENDNOTES|
end
- @@seg[:tail] << '</div>'
- @@seg[:tail] << '</div>' #this div closes div class content
+ @per.tail << '</div>'
+ @per.tail << '</div>' #this div closes div class content
end
- @@seg[:close]=[]
- @@seg[:close] << format_head_seg.xhtml_close
+ @per.closed=[]
+ @per.closed << format_head_seg.xhtml_close
end
- def reinitialise
- @@seg[:headings],@@seg[:main],@@seg[:tail],@@seg[:credits]=Array.new(4){[]}
+ def reinitialise(per)
+ per.headings,per.main,per.tail,per.credits=Array.new(4){[]}
end
- def cleanup
- reinitialise
- @@seg_total,@@tracker=0,0
- @@seg_endnotes,@@seg_subtoc={},{}
- @@seg_endnotes_array,@@seg_subtoc_array=[],[]
- @@seg[:endnote_all]=[]
+ def cleanup(md,per)
+ reinitialise(per)
+ @@tracker=0
+ @per.seg_endnotes,@per.seg_subtoc={},{}
+ @per.seg_endnotes_array,@per.seg_subtoc_array=[],[]
+ per.endnote_all=[]
end
- def get_subtoc_endnotes(data) #get endnotes & sub-table of contents subtoc
+ def get_subtoc_endnotes(data,per) #get endnotes & sub-table of contents subtoc
+ @per=per
data.each do |dob|
dob.obj=dob.obj.gsub(/<a name=\"h\d.*?\">(.+?)<\/a>/mi,'\1')
if @md.flag_auto_endnotes
if (dob.is==:heading \
|| dob.is==:heading_insert) \
- and dob.ln.to_s =~/^[1234]/ \
- and not @@fn.to_s.empty?
- @@seg_endnotes[@@fn]=[]
- @@seg_endnotes[@@fn] << @@seg_endnotes_array
- @@seg_endnotes_array=[] if dob.ln==4
- @@fns_previous=@md.fns if dob.ln==4 and dob.name =~/^meta/
+ && dob.ln.to_s =~/^[1-4]/ \
+ and not @per.fn.to_s.empty?
+ @per.seg_endnotes[@per.fn]=[]
+ @per.seg_endnotes[@per.fn] << @per.seg_endnotes_array
+ @per.seg_endnotes_array=[] if dob.ln==4
end
if (dob.is==:heading \
|| dob.is==:heading_insert) \
- and dob.ln==4 #% EXTRACTION OF SUB-TOCs & SEGMENT NAME, after EXTRACTION OF ENDNOTES & SUB-TOCs
- @@seg_subtoc[@@fn]=@@seg_subtoc_array
- @@seg_subtoc_array=[]
+ && dob.ln==4
+ #% EXTRACTION OF SUB-TOCs & SEGMENT NAME, after EXTRACTION OF ENDNOTES & SUB-TOCs
+ @per.seg_subtoc[@per.fn]=@per.seg_subtoc_array
+ @per.seg_subtoc_array=[]
if dob.name \
and dob.obj
- @@fn=dob.name
+ @per.fn=dob.name
else
- @@fn=(dob.name =~/\S+/) \
+ @per.fn=(dob.name =~/\S+/) \
? dob.name
: ''
end
end
end
if dob.is==:heading \
- and dob.ln.to_s =~/^[5-7]/
+ && dob.ln.to_s =~/^[5-7]/
case dob.ln
when 5
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,dob)
@@ -496,7 +543,7 @@ WOK
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,dob)
subtoc=format_seg.subtoc_lev7 #keep and make available, this is the subtoc
end
- @@seg_subtoc_array << subtoc
+ @per.seg_subtoc_array << subtoc
end
if @md.flag_auto_endnotes
ast,pls='&#042;','&#043;'
@@ -507,17 +554,19 @@ WOK
endnote_array << dob.obj.scan(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/m)
end
if dob.obj=~/#{Mx[:en_b_o]}#{ast}\d+\s.+?#{Mx[:en_b_c]}/m
- endnote_array << dob.obj.scan(/#{Mx[:en_b_o]}#{ast}\d+\s.+?#{Mx[:en_b_c]}/m)
+ endnote_array \
+ << dob.obj.scan(/#{Mx[:en_b_o]}#{ast}\d+\s.+?#{Mx[:en_b_c]}/m)
end
if dob.obj=~/#{Mx[:en_b_o]}#{pls}\d+\s.+?#{Mx[:en_b_c]}/m
- endnote_array << dob.obj.scan(/#{Mx[:en_b_o]}#{pls}\d+\s.+?#{Mx[:en_b_c]}/m)
+ endnote_array \
+ << dob.obj.scan(/#{Mx[:en_b_o]}#{pls}\d+\s.+?#{Mx[:en_b_c]}/m)
end
endnote_array=endnote_array.flatten #.compact #check compacting
endnote_array.each do |note|
note_match=note.dup
note_match_seg=note.dup
e_n=note_match_seg[/(?:#{Mx[:en_a_o]}(?:\d|#{ast}|#{pls})+|#{Mx[:en_b_o]}(?:#{ast}|#{pls})\d+)\s+(.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/m,1]
- try=e_n.split(/<br \/>/)
+ try=e_n.split(/<br(?: \/)?>/)
try.each do |e|
txt_obj={ txt: e }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
@@ -525,17 +574,20 @@ WOK
format_seg.endnote_body_indent
else format_seg.endnote_body
end
- @@seg_endnotes_array << note_match
+ @per.seg_endnotes_array << note_match
end
try.join('<br \/>')
#% creation of separate end segment/page of all endnotes referenced back to reference segment
- m=/(?:#{Mx[:en_a_o]}(?:\d|#{ast}|#{pls})+|#{Mx[:en_b_o]}(?:#{ast}|#{pls})\d+)\s+(.+?href=")(#note_ref(?:\d|_a|_b)+".+)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/mi
+ m=/(?:#{Mx[:en_a_o]}(?:\d|#{ast}|#{pls})+|#{Mx[:en_b_o]}(?:#{ast}|#{pls})\d+)\s+(.+?href=")(##{Mx[:note_ref]}(?:\d|_a|_b)+".+)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/mi
endnote_part_a=note_match_seg[m,1]
endnote_part_b=note_match_seg[m,2]
- txt_obj={ endnote_part_a: endnote_part_a, endnote_part_b: endnote_part_b }
+ txt_obj={
+ endnote_part_a: endnote_part_a,
+ endnote_part_b: endnote_part_b
+ }
format_seg=SiSU_XHTML_EPUB2_Format::FormatSeg.new(@md,txt_obj)
- note_match_all_seg=format_seg.endnote_seg_body(@@fn) #BUG WATCH 200408
- @@seg[:endnote_all] << note_match_all_seg
+ note_match_all_seg=format_seg.endnote_seg_body(@per.fn) #BUG WATCH 200408
+ @per.endnote_all << note_match_all_seg
end
dob.obj=dob.obj.gsub(/(?:#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]})\s*/m,' ')
end
diff --git a/lib/sisu/v5/xhtml_epub2_tune.rb b/lib/sisu/develop/xhtml_epub2_tune.rb
index b4142e2e..4f965fa5 100644
--- a/lib/sisu/v5/xhtml_epub2_tune.rb
+++ b/lib/sisu/develop/xhtml_epub2_tune.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** epub generation, epub pre-processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/epub_tune.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: epub generation, epub pre-processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_epub2_tune.rb;hb=HEAD>
=end
require_relative 'dp' # dp.rb
diff --git a/lib/sisu/v6/xhtml_parts.rb b/lib/sisu/develop/xhtml_parts.rb
index 7be47079..85d18ba7 100644
--- a/lib/sisu/v6/xhtml_parts.rb
+++ b/lib/sisu/develop/xhtml_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_parts.rb;hb=HEAD>
=end
module SiSU_Parts_XHTML
@@ -177,7 +174,7 @@ module SiSU_Proj_XHTML
end
def credits_sisu_epub
%{<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>
+<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
diff --git a/lib/sisu/develop/xhtml_shared.rb b/lib/sisu/develop/xhtml_shared.rb
new file mode 100644
index 00000000..84d6a36b
--- /dev/null
+++ b/lib/sisu/develop/xhtml_shared.rb
@@ -0,0 +1,62 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_shared.rb;hb=HEAD>
+
+=end
+module SiSU_XHTML_Shared
+ require_relative 'xhtml_table' # xhtml_table.rb
+ class TableXHTML < SiSU_XHTML_Table::TableXHTML
+ end
+end
+__END__
diff --git a/lib/sisu/develop/xhtml_table.rb b/lib/sisu/develop/xhtml_table.rb
new file mode 100644
index 00000000..9c3618c5
--- /dev/null
+++ b/lib/sisu/develop/xhtml_table.rb
@@ -0,0 +1,97 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** shared html parts
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xhtml_table.rb;hb=HEAD>
+
+=end
+module SiSU_XHTML_Table
+ require_relative 'xhtml_parts' # xhtml_parts.rb
+ class TableXHTML
+ include SiSU_Parts_XHTML
+ @@tablefoot=[] #watch
+ def initialize(table)
+ @table_obj=table
+ end
+ def table
+ table_obj=@table_obj
+ if table_obj.obj !~/^<table\s/m
+ table_obj=table_rows_and_columns_array(table_obj)
+ else p __LINE__; p caller
+ end
+ table_obj
+ end
+ def table_rows_and_columns_array(table_obj) # provides basic (x)html table
+ table_rows,nr=[],0
+ table_obj.obj.split(Mx[:tc_c]).each do |table_row|
+ table_row_with_columns=table_row.split(Mx[:tc_p])
+ trc,nc=[],0
+ table_row_with_columns.each do |c|
+ c=c.gsub(/^~$/,''). # tilde / empty cell
+ gsub(/<:br>/,the_line_break)
+ trc <<= if table_obj.head_ and nr==0; %{<th width="#{table_obj.widths[nc]}%">#{c}</th>}
+ else %{<td width="#{table_obj.widths[nc]}%">#{c}</td>}
+ end
+ nc+=1
+ end
+ trc=(trc.is_a?(Array)) ? trc.flatten.join : trc
+ trc=" <tr>#{trc}</tr>\n"
+ nr+=1
+ table_rows << trc
+ end
+ table_rows=table_rows.flatten.join
+ table_obj.obj=%{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">\n#{table_rows} </table>}
+ table_obj
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/develop/xml_docbook5.rb
index 5cd6fc66..bfdfed7c 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/develop/xml_docbook5.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Docbook book XML rendition
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_docbook_book.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Docbook book XML rendition
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_docbook_book.rb;hb=HEAD>
=end
module SiSU_XML_Docbook_Book
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/develop/xml_dom.rb
index 58fd4b64..199faed5 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/develop/xml_dom.rb
@@ -1,61 +1,58 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** xml (dom style) output processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_dom.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_dom.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml (dom style) output processing
- ** Notes: tidy -xml dom.xml >> index.tidy
=end
module SiSU_XML_DOM
require_relative 'se_hub_particulars' # se_hub_particulars.rb
@@ -67,10 +64,11 @@ module SiSU_XML_DOM
include SiSU_XML_Munge
require_relative 'xml_format' # xml_format.rb
include SiSU_XML_Format
+ require_relative 'xml_persist' # xml_persist.rb
require_relative 'rexml' # rexml.rb
include SiSU_Rexml
require_relative 'shared_metadata' # shared_metadata.rb
- @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0
+ @@alt_id_count=0
@@tablefoot=''
class Source
def initialize(opt)
@@ -161,18 +159,22 @@ module SiSU_XML_DOM
require_relative 'txt_shared' # txt_shared.rb
include SiSU_TextUtils
require_relative 'xhtml_shared' # decide use, whether xml rather than xhtml
- @@xml={ body: [], open: [], close: [], head: [], sc: [] }
def initialize(particulars)
@env, @md, @ao_arr=
particulars.env,particulars.md,particulars.ao_array
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
+ @per=SiSU_XML_Persist::Persist.new
end
def songsheet
- pre
- @data=markup(@ao_arr)
- post
- publish
+ begin
+ pre
+ @data=markup(@ao_arr)
+ post
+ publish
+ ensure
+ SiSU_XML_Persist::Persist.new.persist_init
+ end
end
protected
def xml_markup(dob='')
@@ -185,7 +187,7 @@ module SiSU_XML_DOM
end
def xml_head
metadata=SiSU_Metadata::Summary.new(@md).xml_dom.metadata
- @@xml[:head] << metadata
+ @per.head << metadata
end
def xml_sc(md='')
sc=if @md.sc_info
@@ -207,7 +209,7 @@ module SiSU_XML_DOM
WOK
else ''
end
- @@xml[:sc]=sc
+ @per.sc=sc
end
def xml_element(dob,xml_el='',xml_content='',type='norm')
n=n1=n2=n3=0
@@ -224,7 +226,7 @@ WOK
else ''
end
xml_el ||=''
- @@xml[:body] <<<<WOK
+ @per.body <<<<WOK
#{Ax[:tab]*n}#{xml_el}
#{Ax[:tab]*n1}<heading>
#{Ax[:tab]*n2}<object id="#{dob.ocn}">
@@ -265,26 +267,26 @@ WOK
if @cont[1] \
or @cont[2] \
or @cont[3]
- @@xml[:body] << "#{Ax[:tab]*5}</content>"
+ @per.body << "#{Ax[:tab]*5}</content>"
end
@cont[1]=false if @cont[1]
@cont[2]=false if @cont[2]
@cont[3]=false if @cont[3]
####### attempt to close contents
if @copen[4] # 4~
- [4,3,2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [4,3,2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
@copen[1]=@copen[2]=@copen[3]=@copen[4]=false
elsif @copen[3] # 3~
- [3,2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [3,2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
@copen[1]=@copen[2]=@copen[3]=false
elsif @copen[2] # 2~
- [2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
@copen[1]=@copen[2]=@copen[3]=false
elsif @copen[1] # 1~
- [1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
@copen[1]=@copen[2]=@copen[3]=false
end
- @@xml[:body] << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]
+ @per.body << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]
@level[x]=false
end
when 4..7
@@ -298,29 +300,29 @@ WOK
xml_content="\n#{Ax[:tab]*5}<content>"
case lv
when 4
- @@xml[:body] << "#{Ax[:tab]*5}</content>" if @cont[1]
+ @per.body << "#{Ax[:tab]*5}</content>" if @cont[1]
if @copen[4]==true # 4~
- [4,3,2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [4,3,2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[3]==true # 3~
- [3,2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [3,2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[2]==true # 2~
- [2,1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [2,1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[1]==true # 1~
- [1].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [1].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
end
@cont[1]=true
when 5
if @cont[3] \
or @cont[2] \
or @cont[1]
- @@xml[:body] << "#{Ax[:tab]*5}</content>"
+ @per.body << "#{Ax[:tab]*5}</content>"
end
if @copen[4]==true #4~
- [4,3,2].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [4,3,2].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[3]==true #3~
- [3,2].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [3,2].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[2]==true #2~
- [2].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [2].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
end
@cont[2]=true
when 6
@@ -328,12 +330,12 @@ WOK
or @cont[3] \
or @cont[2] \
or @cont[1]
- @@xml[:body] << "#{Ax[:tab]*5}</content>"
+ @per.body << "#{Ax[:tab]*5}</content>"
end
if @copen[4] #4~
- [4,3].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [4,3].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
elsif @copen[3] #3~
- [3].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [3].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
end
@cont[3]=true
when 7
@@ -341,10 +343,10 @@ WOK
or @cont[3] \
or @cont[2] \
or @cont[1]
- @@xml[:body] << "#{Ax[:tab]*5}</content>"
+ @per.body << "#{Ax[:tab]*5}</content>"
end
if @copen[4] #4~
- [4].each { |v| @@xml[:body] << "#{Ax[:tab]*n}</contents#{v}>" }
+ [4].each { |v| @per.body << "#{Ax[:tab]*n}</contents#{v}>" }
end
@cont[4]=true
end
@@ -360,15 +362,15 @@ WOK
if defined? dob.obj # main text, contents, body KEEP
if defined? dob.ocn \
and dob.ocn
- @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>} if defined? dob.ocn
+ @per.body << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>} if defined? dob.ocn
end
- #@@xml[:body] << %{#{Ax[:tab]*7}<text class="#{type}">#{dob.obj}</text>}
- #@@xml[:body] << %{#{Ax[:tab]*7}<text class="#{dob.is}">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*7}<text class="#{type}">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*7}</text>}
- @@xml[:body] << %{#{Ax[:tab]*6}</object>}
+ #@per.body << %{#{Ax[:tab]*7}<text class="#{type}">#{dob.obj}</text>}
+ #@per.body << %{#{Ax[:tab]*7}<text class="#{dob.is}">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*7}<text class="#{type}">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*7}</text>}
+ @per.body << %{#{Ax[:tab]*6}</object>}
end
end
def block_structure(dob)
@@ -526,16 +528,16 @@ WOK
y=x - 1; v=x - 3
if @level[x]==true #2004w36 bug fix? watch/test previous logic broke on free.for.all @coontent_flag introduced
if @content_flag==true
- @@xml[:body] << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>"
+ @per.body << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>"
@content_flag=false
else
- @@xml[:body] << "\n#{Ax[:tab]*y}</contents#{v}>"
+ @per.body << "\n#{Ax[:tab]*y}</contents#{v}>"
end
end
end
3.downto(1) do |x|
y=x - 1
- @@xml[:body] << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
+ @per.body << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
end
end
def pre
@@ -544,29 +546,28 @@ WOK
encoding=if @sys.locale =~/utf-?8/i then '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
else '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
end
- @@xml[:open] =<<WOK
+ @per.open =<<WOK
#{encoding}
#{stylesheet.css_head_xml}
#{rdf.comment_xml}
<document>
WOK
- @@xml[:head] << '<head>'
- @@xml[:body] << '<body>'
+ @per.head << '<head>'
+ @per.body << '<body>'
end
def post
- @@xml[:head] << @@xml[:sc]
- @@xml[:head] << '</head>'
- @@xml[:body] << '</body>'
- @@xml[:close] = '</document>'
+ @per.head << @per.sc
+ @per.head << '</head>'
+ @per.body << '</body>'
+ @per.close << '</document>'
end
def publish
content=[]
- content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata]
- content << @@xml[:owner_details] if @md.stmp =~/\w\w/
- content << @@xml[:tail] << @@xml[:close]
+ content << @per.open << @per.head << @per.body # << @per.metadata
+ content << @per.tail << @per.close
content=content.flatten.compact
Output.new(content,@md).xml
- @@xml[:head],@@xml[:body],@@xml[:tail]=[],[],[] # check whether should be nil
+ @per.head,@per.body,@per.tail=[],[],[] # check whether should be nil
end
end
class Output
@@ -594,19 +595,21 @@ WOK
if @prog.tidy !=false
if (@md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @md.opt.act[:color_state][:set],
- 'invert',
- 'Using XML Tidy',
- 'check document structure'
- ).colorize unless @md.opt.act[:quiet][:set]==:on
- tell=SiSU_Screen::Ansi.new(
- @md.opt.act[:color_state][:set],
- 'invert',
- '',
- ''
- )
- tell.grey_open unless @md.opt.act[:quiet][:set]==:on
+ unless @md.opt.act[:quiet][:set]==:on
+ SiSU_Screen::Ansi.new(
+ @md.opt.act[:color_state][:set],
+ 'invert',
+ 'Using XML Tidy',
+ 'check document structure'
+ ).colorize
+ tell=SiSU_Screen::Ansi.new(
+ @md.opt.act[:color_state][:set],
+ 'invert',
+ '',
+ ''
+ )
+ tell.grey_open
+ end
tidyfile='/dev/null' #don't want one or screen output, check for alternative flags
tidy=SiSU_Env::SystemCall.new(@file,tidyfile)
tidy.well_formed?
@@ -618,3 +621,4 @@ WOK
end
end
__END__
+** Notes: tidy -xml dom.xml >> index.tidy
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/develop/xml_fictionbook2.rb
index 94fac895..f3c1a0eb 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/develop/xml_fictionbook2.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** Fictionbook XML rendition
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_fictionbook.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Fictionbook XML rendition
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_fictionbook.rb;hb=HEAD>
=end
module SiSU_XML_Fictionbook
@@ -207,8 +204,8 @@ module SiSU_XML_Fictionbook
<last-name/>
<nickname/>
</author>
- <program-used>#{version[:project]} #{version[:version]} and #{rb_ver}</program-used>
- <date value="#{version[:date]}">#{version[:date]}</date>
+ <program-used>#{version.project} #{version.version} and #{rb_ver}</program-used>
+ <date value="#{version.date}">#{version.date}</date>
<src-url>#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}</src-url>
<id></id>
<version>1.0</version>
diff --git a/lib/sisu/v5/xml_format.rb b/lib/sisu/develop/xml_format.rb
index 0b319683..80610911 100644
--- a/lib/sisu/v5/xml_format.rb
+++ b/lib/sisu/develop/xml_format.rb
@@ -1,61 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+** xml template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml template
- ** Notes: tidy -xml index.xml >> index.tidy
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_format.rb;hb=HEAD>
=end
module SiSU_XML_Format
@@ -866,3 +862,4 @@ WOK
end
end
__END__
+** Notes: tidy -xml index.xml >> index.tidy
diff --git a/lib/sisu/v6/xml_md_oai_pmh_dc.rb b/lib/sisu/develop/xml_md_oai_pmh_dc.rb
index 3394d9c5..6d366f2d 100644
--- a/lib/sisu/v6/xml_md_oai_pmh_dc.rb
+++ b/lib/sisu/develop/xml_md_oai_pmh_dc.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** summary of generated outputs and metadata
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_md_oai_pmh_dc.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: summary of generated outputs and metadata
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_md_oai_pmh_dc.rb;hb=HEAD>
=end
module SiSU_XML_Metadata
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/develop/xml_odf_odt.rb
index b2957e54..85a85ddd 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/develop/xml_odf_odt.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** opendocument text generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: opendocument text generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/odf.rb;hb=HEAD>
=end
module SiSU_XML_ODF_ODT
@@ -70,7 +67,8 @@ module SiSU_XML_ODF_ODT
require_relative 'txt_shared' # txt_shared.rb
require_relative 'xml_shared' # xml_shared.rb
include SiSU_XML_Munge
- @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0
+ require_relative 'xml_persist' # xml_persist.rb
+ @@alt_id_count,@@alt_id_count=0,0
class Source
begin
require 'zlib'
@@ -131,7 +129,6 @@ module SiSU_XML_ODF_ODT
require_relative 'txt_shared' # txt_shared.rb
include SiSU_Parts_XML
@@img_count=0
- @@odf={ body: [], head: [], toc: [], metadata: [], tail: [], book_idx: [], endnotes: [] }
@@docstart=true
@@fns=nil
def initialize(particulars)
@@ -143,10 +140,12 @@ module SiSU_XML_ODF_ODT
end
def songsheet
begin
+ @per=SiSU_XML_Persist::Persist.new
pre
@data=markup(@ao_array)
publish
ensure
+ SiSU_XML_Persist::Persist.new.persist_init
unless (@md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
if @env.processing_path.odt =~/od[ft]/
@@ -190,18 +189,18 @@ module SiSU_XML_ODF_ODT
end
idx_arr << x.strip if x.is_a?(String)
end
- @@odf[:book_idx]=idx_arr.join
+ @per.book_idx=idx_arr.join
end
end
def odf_metadata
- @@odf[:metadata]=SiSU_Metadata::Summary.new(@md).
+ @per.metadata=SiSU_Metadata::Summary.new(@md).
odf.metadata
end
def odf_tail
manifest="#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}"
- @@odf[:tail] << %{<text:p text:style-name="P_normal">Available document outputs: <br /> &lt;<text:a xl:type="simple" xl:href="#{manifest}">#{manifest}</text:a>&gt;</text:p>}
- @@odf[:tail] << %{\n<text:p text:style-name="P_normal">SiSU: &lt;<text:a xl:type="simple" xl:href="http://www.jus.uio.no/lm">www.jus.uio.no/sisu</text:a>&gt; and &lt;<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>&gt;</text:p>}
- @@odf[:tail] << "\n</office:text></office:body></office:document-content>"
+ @per.tail << %{<text:p text:style-name="P_normal">Available document outputs: <br /> &lt;<text:a xl:type="simple" xl:href="#{manifest}">#{manifest}</text:a>&gt;</text:p>}
+ @per.tail << %{\n<text:p text:style-name="P_normal">SiSU: &lt;<text:a xl:type="simple" xl:href="http://www.jus.uio.no/lm">www.jus.uio.no/sisu</text:a>&gt; and &lt;<text:a xl:type="simple" xl:href="http://www.sisudoc.org">www.sisudoc.org</text:a>&gt;</text:p>}
+ @per.tail << "\n</office:text></office:body></office:document-content>"
end
def set_bookmark_tag(dob)
SiSU_XML_ODF_ODT_Format::Tags.new.set_bookmark_tag(dob)
@@ -619,26 +618,26 @@ module SiSU_XML_ODF_ODT
end
end
if dob.is==:heading
- @@odf[:body] << heading(dob,p_num).obj << break_line*2
+ @per.body << heading(dob,p_num).obj << break_line*2
if SiSU_Env::ProcessingSettings.new(md).build.toc?
if dob.lv =~/[A-D1]/i
- @@odf[:toc] << toc(dob,p_num).obj
+ @per.toc << toc(dob,p_num).obj
end
end
elsif dob.is ==:verse
- @@odf[:body] << poem(dob,p_num).obj << break_line*2
+ @per.body << poem(dob,p_num).obj << break_line*2
elsif dob.is==:group
- @@odf[:body] << group(dob,p_num).obj << break_line*2
+ @per.body << group(dob,p_num).obj << break_line*2
elsif dob.is==:block
- @@odf[:body] << block(dob,p_num).obj << break_line*2
+ @per.body << block(dob,p_num).obj << break_line*2
elsif dob.is==:code
- @@odf[:body] << code(dob,p_num).obj << break_line*2
+ @per.body << code(dob,p_num).obj << break_line*2
elsif dob.is==:table #elsif dob.obj =~ /<!Th?¡/u
- @@odf[:body] << table(dob,p_num).obj << break_line*2
+ @per.body << table(dob,p_num).obj << break_line*2
elsif dob.is==:break
- @@odf[:body] << obj_break(dob).obj << break_line*2
+ @per.body << obj_break(dob).obj << break_line*2
else
- @@odf[:body] << normal(dob,p_num).obj << break_line*2 # main text, contents, body KEEP
+ @per.body << normal(dob,p_num).obj << break_line*2 # main text, contents, body KEEP
end
@@endnotes_para=[]
end
@@ -806,20 +805,20 @@ WOK
WOK
x=x.strip
x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
- @@odf[:head] << x
+ @per.head << x
end
def publish
content=[]
br_pg='<text:p text:style-name="P_normal_page_new"> </text:p>'
content <<
- @@odf[:head] <<
- @@odf[:toc] <<
+ @per.head <<
+ @per.toc <<
br_pg <<
- @@odf[:body] <<
- @@odf[:book_idx] <<
+ @per.body <<
+ @per.book_idx <<
br_pg <<
- @@odf[:metadata] <<
- @@odf[:tail]
+ @per.metadata <<
+ @per.tail
SiSU_XML_ODF_ODT::Source::Output.new(content,@md,@env).odf
@@odf={ head: [], toc: [], body: [], tail: [], book_idx: [], metadata: [] }
end
diff --git a/lib/sisu/v5/xml_odf_odt_format.rb b/lib/sisu/develop/xml_odf_odt_format.rb
index 64bf1315..efe5e733 100644
--- a/lib/sisu/v5/xml_odf_odt_format.rb
+++ b/lib/sisu/develop/xml_odf_odt_format.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** opendocument formatting, default opendocument template
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/odf_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: opendocument formatting, default opendocument template
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/odf_format.rb;hb=HEAD>
=end
module SiSU_XML_ODF_ODT_Format
@@ -165,7 +162,7 @@ module SiSU_XML_ODF_ODT_Format
end
end
class Table
- @@tablehead,@@table_counter=0,0 #reinitialise on new file
+ @@table_counter=0
@@tablefoot=[] #watch
@@fns=''
def initialize(md,dob,p_num)
@@ -268,7 +265,7 @@ module SiSU_XML_ODF_ODT_Format
class ODT_Head_1_2
def initialize(md)
@md=md
- @generator="#{@md.sisu_version[:project]} #{@md.sisu_version[:version]} #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})"
+ @generator="#{@md.project_details.project} #{@md.project_details.version} #{@md.project_details.date_stamp} (#{@md.project_details.date})"
end
def manifest_rdf
x=<<WOK
diff --git a/lib/sisu/v6/xml_parts.rb b/lib/sisu/develop/xml_parts.rb
index e4d30de6..6974efa2 100644
--- a/lib/sisu/v6/xml_parts.rb
+++ b/lib/sisu/develop/xml_parts.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** shared xml parts
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/html_parts.rb;hb=HEAD>
=end
module SiSU_Parts_XML
diff --git a/lib/sisu/develop/xml_persist.rb b/lib/sisu/develop/xml_persist.rb
new file mode 100644
index 00000000..6fb52eba
--- /dev/null
+++ b/lib/sisu/develop/xml_persist.rb
@@ -0,0 +1,126 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** html segment generation, processing
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_persist.rb;hb=HEAD>
+
+=end
+module SiSU_XML_Persist
+ class Persist
+ @@persist=nil
+ attr_accessor :head,:toc,:body,:tail,:open,:close,:sc,:endnotes,:book_idx,:metadata
+ #attr_accessor :head,:body,:tail,:open,:close,:sc
+#@@odf={ body: [], head: [], toc: [], metadata: [], tail: [], book_idx: [], endnotes: [] }
+ def initialize(args=nil)
+ @@persist=args=(args ? args : (@@persist || persist_init_hash_values))
+ @head=args[:head]
+ @toc=args[:toc]
+ @body=args[:body]
+ @tail=args[:tail]
+ @open=args[:open]
+ @close=args[:close]
+ @sc=args[:sc]
+ @endnotes=args[:endnotes]
+ @book_idx=args[:book_idx]
+ @metadata=args[:metadata]
+ end
+ def head
+ @head
+ end
+ def toc
+ @toc
+ end
+ def body
+ @body
+ end
+ def tail
+ @tail
+ end
+ def open
+ @open
+ end
+ def close
+ @close
+ end
+ def sc
+ @sc
+ end
+ def endnotes
+ @endnotes
+ end
+ def book_idx
+ @book_idx
+ end
+ def metadata
+ @metadata
+ end
+ def persist_init_hash_values
+ {
+ head: [],
+ toc: [],
+ body: [],
+ tail: [],
+ open: [],
+ close: [],
+ sc: [],
+ endnotes: [],
+ book_idx: [],
+ metadata: [],
+ }
+ end
+ def persist_init
+ @@persist=nil
+ Persist.new(persist_init_hash_values)
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/develop/xml_sax.rb
index 5603dcaf..8d552f92 100644
--- a/lib/sisu/v6/xml_sax.rb
+++ b/lib/sisu/develop/xml_sax.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** xml output (sax style) processing
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: xml output (sax style) processing
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml.rb;hb=HEAD>
=end
module SiSU_XML_SAX
@@ -66,10 +63,11 @@ module SiSU_XML_SAX
include SiSU_XML_Munge
require_relative 'xml_format' # xml_format.rb
include SiSU_XML_Format
+ require_relative 'xml_persist' # xml_persist.rb
require_relative 'rexml' # rexml.rb
include SiSU_Rexml
require_relative 'shared_metadata' # shared_metadata.rb
- @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0
+ @@alt_id_count=0
@@tablefoot=''
class Source
def initialize(opt)
@@ -162,18 +160,22 @@ module SiSU_XML_SAX
include SiSU_TextUtils
require_relative 'css' # css.rb
require_relative 'xhtml_shared' # decide use, whether xml rather than xhtml
- @@xml={ body: [], open: [], close: [], head: [] }
def initialize(particulars)
@env, @md, @ao_arr=
particulars.env,particulars.md,particulars.ao_array
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
+ @per=SiSU_XML_Persist::Persist.new
end
def songsheet
- pre
- @data=markup(@ao_arr)
- post
- publish
+ begin
+ pre
+ @data=markup(@ao_arr)
+ post
+ publish
+ ensure
+ SiSU_XML_Persist::Persist.new.persist_init
+ end
end
protected
def embedded_endnotes(dob='')
@@ -222,7 +224,7 @@ WOK
end
def xml_head
metadata=SiSU_Metadata::Summary.new(@md).xml_sax.metadata
- @@xml[:head] << metadata
+ @per.head << metadata
end
def xml_sc(md='')
sc=if @md.sc_info
@@ -244,7 +246,7 @@ WOK
WOK
else ''
end
- @@xml[:sc]=sc
+ @per.sc=sc
end
def xml_structure(dob,type='norm')
if dob.is==:heading
@@ -260,16 +262,16 @@ WOK
util=SiSU_TextUtils::Wrap.new(dob.obj,70)
wrapped=util.line_wrap
#end
- @@xml[:body] << if defined? dob.ocn; %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << if defined? dob.ocn; %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
else "#{Ax[:tab]*0}<object>"
end
- @@xml[:body] << "#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>" if defined? dob.ocn
- @@xml[:body] << if lv; %{#{Ax[:tab]*1}<text class="h#{lv}">\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>" if defined? dob.ocn
+ @per.body << if lv; %{#{Ax[:tab]*1}<text class="h#{lv}">\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>}
else %{#{Ax[:tab]*1}<text class="#{type}">\n#{Ax[:tab]*2}#{wrapped}\n#{Ax[:tab]*1}</text>} # main text, contents, body KEEP
end
- @@xml[:body] << @endnotes if @endnotes
- ##@@xml[:body] << "#{Ax[:tab]*1}<text>#{dob[@regx,2]}</text>" if dob[@regx,2] # old unwrapped main text, contents, body KEEP
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << @endnotes if @endnotes
+ ##@per.body << "#{Ax[:tab]*1}<text>#{dob[@regx,2]}</text>" if dob[@regx,2] # old unwrapped main text, contents, body KEEP
+ @per.body << "#{Ax[:tab]*0}</object>"
@endnotes=[]
end
def block_structure(dob='')
@@ -278,13 +280,13 @@ WOK
gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean
dob=@trans.markup_block(dob)
dob.obj=dob.obj.strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="block">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
- @@xml[:body] << @endnotes if @endnotes
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="block">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
+ @per.body << @endnotes if @endnotes
@endnotes=[]
end
def group_structure(dob='')
@@ -293,48 +295,48 @@ WOK
gsub(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean
dob=@trans.markup_group(dob)
dob.obj=dob.obj.strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="group">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
- @@xml[:body] << @endnotes if @endnotes
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="group">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
+ @per.body << @endnotes if @endnotes
@endnotes=[]
end
def poem_structure(dob='')
dob=@trans.markup_group(dob)
#dob.obj.gsub(/\s\s/,'&#160;&#160;')
dob.obj=dob.obj.strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="verse">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << %{#{Ax[:tab]*0}</object>}
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="verse">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << %{#{Ax[:tab]*0}</object>}
end
def code_structure(dob='')
dob=@trans.markup_group(dob)
dob.obj=dob.obj.gsub(/\s\s/,'&#160;&#160;').strip
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="code">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="code">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{dob.obj}#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
end
def table_structure(dob)
table=SiSU_XHTML_Shared::TableXHTML.new(dob)
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="table">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{table.table.obj}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- #@@xml[:body] << %{#{tab*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
- #@@xml[:body] << %{#{Ax[:tab]*0}<object id="#{ocn}">}
- #@@xml[:body] << %{#{Ax[:tab]*1}#{table}\n#{Ax[:tab]*1}} # unless lv # main text, contents, body KEEP
- #@@xml[:body] << "#{Ax[:tab]*0}</object>"
+ @per.body << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
+ @per.body << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
+ @per.body << %{#{Ax[:tab]*1}<text class="table">#{Ax[:tab]*1}}
+ @per.body << %{#{Ax[:tab]*2}#{table.table.obj}}
+ @per.body << %{#{Ax[:tab]*1}</text>}
+ #@per.body << %{#{tab*1}</text>}
+ @per.body << "#{Ax[:tab]*0}</object>"
+ #@per.body << %{#{Ax[:tab]*0}<object id="#{ocn}">}
+ #@per.body << %{#{Ax[:tab]*1}#{table}\n#{Ax[:tab]*1}} # unless lv # main text, contents, body KEEP
+ #@per.body << "#{Ax[:tab]*0}</object>"
#@endnotes=[]
end
def markup(data)
@@ -406,7 +408,7 @@ WOK
elsif dob.obj =~/(Owner Details)/
# txt_obj={ txt: '<br /><a name="owner.details">Owner Details</a>' }
# format_scroll=FormatScroll.new(@md,txt_obj)
-# @@xml[:owner_details]=format_scroll.bold_para
+# @per.owner_details=format_scroll.bold_para
dob.obj=''
end
if dob.obj =~/<a name="n\d+">/ \
@@ -427,41 +429,41 @@ WOK
end
7.downto(4) do |x|
y=x - 1; v=x - 3
- @@xml[:body] << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>" if @level[x]==true
+ @per.body << "#{Ax[:tab]*5}</content>\n#{Ax[:tab]*y}</contents#{v}>" if @level[x]==true
end
3.downto(1) do |x|
y=x - 1
- @@xml[:body] << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
+ @per.body << "#{Ax[:tab]*y}</heading#{x}>" if @level[x]==true
end
- #7.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}</level #{x}>" if @level[x]==true }
+ #7.downto(1) { |x| y=x - 1; @per.body << "#{Ax[:tab]*y}</level #{x}>" if @level[x]==true }
end
def pre
rdf=SiSU_XML_Tags::RDF.new(@md)
- @@xml[:head],@@xml[:body]=[],[]
+ @per.head,@per.body=[],[]
stylesheet=SiSU_Style::CSS_HeadInfo.new(@md,'xml_sax').stylesheet
encoding=if @sys.locale =~/utf-?8/i then '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
else '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>'
end
- @@xml[:open] =<<WOK
+ @per.open =<<WOK
#{encoding}
#{stylesheet.css_head_xml}
#{rdf.comment_xml}
<document>
WOK
- @@xml[:head] << '<head>'
- @@xml[:body] << '<body>'
+ @per.head << '<head>'
+ @per.body << '<body>'
end
def post
- @@xml[:head] << @@xml[:sc]
- @@xml[:head] << '</head>'
- @@xml[:body] << '</body>'
- @@xml[:close] = '</document>'
+ @per.head << @per.sc
+ @per.head << '</head>'
+ @per.body << '</body>'
+ @per.close = '</document>'
end
def publish
content=[]
- content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata]
- content << @@xml[:owner_details] if @md.stmp =~/\w\w/
- content << @@xml[:tail] << @@xml[:close]
+ content << @per.open << @per.head << @per.body #<< @per.metadata
+ #content << @per.owner_details if @md.stmp =~/\w\w/
+ content << @per.tail << @per.close
content=content.flatten.compact
Output.new(content,@md).xml
@@xml={}
@@ -499,11 +501,11 @@ WOK
'check document structure'
).colorize
tell=SiSU_Screen::Ansi.new(
- @md.opt.act[:color_state][:set],
- 'invert',
- '',
- ''
- )
+ @md.opt.act[:color_state][:set],
+ 'invert',
+ '',
+ ''
+ )
tell.grey_open
end
tidyfile='/dev/null' #don't want one or screen output, check for alternative flags
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/develop/xml_scaffold_structure_collapsed.rb
index 2f4bea17..72708e45 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/develop/xml_scaffold_structure_collapsed.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** extract and print an XML rendition of document structure to screen
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_scaffold.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: extract and print an XML rendition of document structure to screen
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_scaffold.rb;hb=HEAD>
=end
module SiSU_XML_Scaffold_Structure_Collapse
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/develop/xml_scaffold_structure_sisu.rb
index ea76bc7c..39c71d80 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/develop/xml_scaffold_structure_sisu.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** extract and print an XML rendition of document structure to screen
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_scaffold.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: extract and print an XML rendition of document structure to screen
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_scaffold.rb;hb=HEAD>
=end
module SiSU_XML_Scaffold_Structure_Sisu
diff --git a/lib/sisu/v6/xml_shared.rb b/lib/sisu/develop/xml_shared.rb
index 601b6d69..03e5a2a1 100644
--- a/lib/sisu/v6/xml_shared.rb
+++ b/lib/sisu/develop/xml_shared.rb
@@ -1,60 +1,60 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xml_shared.rb;hb=HEAD>
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_shared.rb;hb=HEAD>
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
+** Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- ** Description: common file for xml generation
=end
module SiSU_XML_Munge
require_relative 'xml_parts' # xml_parts.rb
@@ -608,7 +608,7 @@ module SiSU_XML_Tags #Format
rdftoc
end
def comment_xml(extra='')
- 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]
+ generator="Generated by: #{@md.project_details.project} #{@md.project_details.version} of #{@md.project_details.date_stamp} (#{@md.project_details.date})" if @md.project_details.version
lastdone="Last Generated on: #{Time.now}"
rubyv="Ruby version: #{@md.ruby_version}"
sc=if @md.sc_info
diff --git a/lib/sisu/v5/xml_tables.rb b/lib/sisu/develop/xml_tables.rb
index 76ecffe1..998266c8 100644
--- a/lib/sisu/v5/xml_tables.rb
+++ b/lib/sisu/develop/xml_tables.rb
@@ -1,60 +1,57 @@
# encoding: utf-8
=begin
- * Name: SiSU
+* Name: SiSU
- * Description: a framework for document structuring, publishing and search
+** Description: documents, structuring, processing, publishing, search
+*** common file for xml table generation
- * Author: Ralph Amissah
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah,
- All Rights Reserved.
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+ All Rights Reserved.
- * License: GPL 3 or later:
+** License: GPL 3 or later:
- SiSU, a framework for document structuring, publishing and search
+ SiSU, a framework for document structuring, publishing and search
- Copyright (C) Ralph Amissah
+ 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 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.
+ 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/>.
+ 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>
+ 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>
+ <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
+** 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>
+** Hompages:
+ <http://www.jus.uio.no/sisu>
+ <http://www.sisudoc.org>
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xml_tables.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: common file for xml table generation
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/xml_tables.rb;hb=HEAD>
=end
module SiSU_Tables
diff --git a/lib/sisu/develop/zap.rb b/lib/sisu/develop/zap.rb
new file mode 100644
index 00000000..50a6cd54
--- /dev/null
+++ b/lib/sisu/develop/zap.rb
@@ -0,0 +1,90 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** zap wipe clean previous output of the type specified
+
+** Author: Ralph Amissah
+ <ralph@amissah.com>
+ <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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>
+
+** Git
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/zap.rb;hb=HEAD>
+
+=end
+module SiSU_Zap
+ require_relative 'se' # se.rb
+ include SiSU_Env
+ class Source
+ def initialize(opt)
+ @opt=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')
+ unless @opt.act[:quiet][:set]==:on
+ tell=SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ "Clean files related to processing #{@opt.selections.str} ->",
+ "#{@opt.fns} -> #{zap_path}"
+ )
+ tell.warn
+ end
+ z.zap.remove_output
+ else
+ unless @opt.act[:quiet][:set]==:on
+ tell=SiSU_Screen::Ansi.new(
+ @opt.act[:color_state][:set],
+ 'use of -Z (zap) has not enabled in sisurc.yml'
+ )
+ tell.warn
+ end
+ end
+ end
+ end
+end
+__END__
diff --git a/lib/sisu/v5/air.rb b/lib/sisu/v5/air.rb
deleted file mode 100644
index f09f02c9..00000000
--- a/lib/sisu/v5/air.rb
+++ /dev/null
@@ -1,83 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/air.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Air
- require_relative 'se_hub_particulars' # se_hub_particulars.rb
- class Source
- @@ao_array=[]
- @@fns=nil
- def initialize(opt)
- @opt=opt
- @@fns||@opt.fns
- @particulars=SiSU_Particulars::Combined.new(opt)
- #@env=@particulars.env
- #@md=@particulars.md
- #@ao_array=@particulars.ao_array
- end
- def read
- end
- protected
- def print
- puts @particulars.md.inspect
- puts @particulars.env.inspect
- puts @particulars.ao_array
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/ao_character_check.rb b/lib/sisu/v5/ao_character_check.rb
deleted file mode 100644
index 8602f5e9..00000000
--- a/lib/sisu/v5/ao_character_check.rb
+++ /dev/null
@@ -1,106 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_character_check.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_AO_CharacterCheck
- class Check
- def initialize(data)
- @data=data
- @comment='%'
- @endnote_array=[]
- end
- def character_check_and_oldstyle_endnote_array
- data=@data
- @tuned_file,@endnote_array=[],[]
- endnote_no=1
- data.each do |dob|
- unless dob.is ==:table
- dob.obj=dob.obj.strip.
- gsub(/^[{~}]\s*$/,'').
- gsub(/~#\s*/,"#{Mx[:pa_non_object_no_heading]}").
- gsub(/-#\s*/,"#{Mx[:pa_non_object_dummy_heading]}").
- gsub(/(#{Mx[:en_a_o]})\s*\s+/,'\1 ').
- gsub(/(~\{\s*)\s+/,'\1 ').
- gsub(/ \/\//,"#{Mx[:br_line]}").
- gsub(/<br>/,"#{Mx[:br_line]}"). #needed by xml, xhtml etc.
- gsub(/\t/,' ').
- gsub(/\342\200\231/u,"'"). #if dob =~/’/ #Avoid #&lsquo; &rsquo; #&ldquo; &rdquo;
- gsub(/\\copy(?:right)?\b/,'&#169;').
- gsub(/\\trademark\b|\\tm\b/,'&#174;')
- dob.obj=dob.obj + "\n"
- unless dob.is ==:code
- case dob.obj
- when /\^~/ #% Note must do this first (earlier loop) and then enter gathered data into ~^\d+
- sub_dob=dob.obj.dup
- @endnote_array << sub_dob.gsub(/\n/,'').
- gsub(/\^~\s+(.+)\s*/,
- %{#{Mx[:en_a_o]}#{endnote_no} \\1 #{Mx[:en_a_c]}}).
- strip
- endnote_no+=1
- dob=nil if dob.obj =~/\^~ .+/ #watch, removes 'binary' endnote now in endnote array for later insertion
- end
- end
- end
- @tuned_file << dob if dob.is_a?(Object)
- end
- @tuned_file=@tuned_file.flatten.compact
- [@tuned_file,@endnote_array]
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/ao_metadata.rb b/lib/sisu/v5/ao_metadata.rb
deleted file mode 100644
index e1f8eb79..00000000
--- a/lib/sisu/v5/ao_metadata.rb
+++ /dev/null
@@ -1,89 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_metadata.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_AO_Metadata
- class Metadata
- def initialize(md,metad)
- @md,@metadata=md,metad
- l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
- language=l[:n]
- @tr=SiSU_Translate::Source.new(md,language)
- end
- def make_para(obj,ocn)
- h={
- obj: obj,
- ocn: 0
- }
- SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
- end
- def make_heading(obj,ocn,name,lv,ln)
- h={
- lv: lv,
- ln: ln,
- name: name,
- obj: obj,
- ocn: 0
- }
- SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
- end
- def metadata
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/cgi.rb b/lib/sisu/v5/cgi.rb
deleted file mode 100644
index 5b0e5831..00000000
--- a/lib/sisu/v5/cgi.rb
+++ /dev/null
@@ -1,88 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/cgi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database
- (pgsql sqlite)
-
-=end
-module SiSU_CGI #% database building documents
- require_relative 'se' # se.rb
- require_relative 'cgi_pgsql' # cgi_pgsql.rb
- require_relative 'cgi_sqlite' # cgi_sqlite.rb
- class SearchSQL
- def initialize(opt)
- @opt=opt
- @webserv=@opt.files[0].to_s.strip
- end
- def read
- if @opt.act[:sample_search_form][:db]==:pg # cgi_pgsql.rb
- SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
- elsif @opt.act[:sample_search_form][:db]==:sqlite # cgi_sqlite.rb
- SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
- else
- puts <<-WOK
- please select database type for which sample search form should be built (pgsql or sqlite)
- sisu --sample-search-form --db=sqlite
- sisu --sample-search-form --db=pg
- other options include
- --webserv-cgi='[cgi-server-name]'
- --webserv-output='[sisu-output-server-with-base-path]'
- WOK
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/errors.rb b/lib/sisu/v5/errors.rb
deleted file mode 100644
index 007100bd..00000000
--- a/lib/sisu/v5/errors.rb
+++ /dev/null
@@ -1,87 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/errors.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, error screen reporting
-
-=end
-module SiSU_Errors
- require_relative 'se' # se.rb
- include SiSU_Env; include SiSU_Screen
- class Rescued <CreateFile
- def initialize(error,errorlist,cmd,fns='')
- @fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
- @cmd=(cmd \
- && (cmd =~/c/)) \
- ? 'Vc'
- : 'V'
- end
- def location
- file=@fns \
- ? (SiSU_Env::CreateFile.new(@fns).file_error)
- : (File.new('/tmp/errorlog.sisu','w+'))
- file << @fns << "\n" << @error << "\n" << @errorlist
- file.close
- if @cmd=~/[vVM]/
- SiSU_Screen::Ansi.new('',$!,$@).rescue do
- (block_given?) ? yield : __LINE__.to_s + ':' + __FILE__
- end
- else
- SiSU_Screen::Ansi.new('',"rescued, exception raised, silenced").puts_grey
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/generic_parts.rb b/lib/sisu/v5/generic_parts.rb
deleted file mode 100644
index c7a702e9..00000000
--- a/lib/sisu/v5/generic_parts.rb
+++ /dev/null
@@ -1,134 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_Parts_Generic
- def the_url
- def urify(uri)
- URI.parse(uri)
- end
- def sisu
- 'http://www.sisudoc.org/'
- end
- def sisudoc
- 'http://www.sisudoc.org'
- end
- def footer_signature
- 'http://www.sisudoc.org/'
- end
- def rl_root
- '/sisu' #watch
- end
- def root_http
- 'http://www.sisudoc.org/' #watch
- end
- def home
- 'http://www.sisudoc.org/' # used in pdf header
- end
- def site #used as stub... where there are subdirectories and is different from home
- home
- end
- def home_txt
- 'www.sisudoc.org'
- end
- def sisu_txt
- 'www.sisudoc.org'
- end
- self
- end
- def the_text
- def home
- 'SiSU'
- 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
- def url_open
- '<'
- end
- def url_close
- '>'
- end
- self
- end
- def the_icon
- def i_ico
- 'rb7.ico'
- end
- def i_home_button
- 'sisu.png'
- end
- def i_choice
- 'b_choice.png'
- end
- def i_new
- 'b_new.png'
- end
- self
- end
-end
-__END__
diff --git a/lib/sisu/v5/html_harvest.rb b/lib/sisu/v5/html_harvest.rb
deleted file mode 100644
index c3a4030b..00000000
--- a/lib/sisu/v5/html_harvest.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# encoding: utf-8
-=begin
-
- * Name: SiSU
-
- * Description: a framework for document structuring, publishing and search
- harvest metadata from document corpus (suitable for medium sized sites)
- (concept example, [to remove size constraint: implement SQL equivalent])
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Harvest
- @@the_idx_topics,@@the_idx_authors={},{}
- class Source
- require_relative 'hub_options' # hub_options.rb
- require_relative 'html_harvest_topics' # html_harvest_topics.rb
- require_relative 'html_harvest_authors' # html_harvest_authors.rb
- require_relative 'se' # se.rb
- include SiSU_Env
- def initialize(opt)
- @opt=opt
- @env=SiSU_Env::InfoEnv.new
- end
- def read
- begin
- harvest_pth=@env.path.webserv + '/' + @opt.base_stub
- FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- cases(@opt,@env)
- rescue
- ensure
- SiSU_Env::CreateSite.new(@opt).cp_css
- end
- end
- def help
- puts <<WOK
- harvest --harvest extracts document index metadata
-
-WOK
- end
- def css(opt)
- require_relative 'css' # css.rb
- css=SiSU_Style::CSS.new
- fn_css=SiSU_Env::CSS_Default.new
- style=File.new("#{@env.path.pwd}/#{fn_css.harvest}",'w')
- style << css.harvest
- style.close
- end
- def cases(opt,env)
- case opt.selections.str.inspect
- when/--harvest/i
- css(opt) if @opt.act[:maintenance][:set]==:on
- SiSU_HarvestAuthors::Songsheet.new(opt,env).songsheet
- SiSU_HarvestTopics::Songsheet.new(opt,env).songsheet
- if @opt.act[:rsync][:set]==:on
- require_relative 'remote' # remote.rb
- SiSU_Remote::Put.new(opt).rsync_harvest
- end
- else
- help
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/html_harvest_author_format.rb b/lib/sisu/v5/html_harvest_author_format.rb
deleted file mode 100644
index 92709673..00000000
--- a/lib/sisu/v5/html_harvest_author_format.rb
+++ /dev/null
@@ -1,114 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/harvest_author_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_FormatAuthor
- class Author
- def initialize(author_param)
- @author_param=author_param
- end
- def author_details
- @authors,@author_array=[],[]
- authors=@author_param.scan(/[^;]+/)
- authors.each do |a|
- a=a.strip
- if a =~/"(.+?)"/
- @authors << { the: $1 }
- @author_array << $1.upcase
- else #if a =~/,/
- x=a.scan(/[^,]+/)
- x[0]=x[0].strip
- x[1]=x[1].strip if x[1]
- if x.length==1
- @authors << { the: x[0] }
- @author_array << x[0].upcase
- elsif x.length==2
- @authors << { the: x[0], others: x[1] }
- @author_array << "#{x[0].upcase}, #{x[1]}"
- else #p x.length
- end
- end
- end
- l = @authors.length
- authors_string=''
- @authors.each_with_index do |a,i|
- authors_string += if a[:others]
- if (l - i) > 1
- "#{a[:others]} #{a[:the]}, "
- else
- "#{a[:others]} #{a[:the]}"
- end
- else
- if (l - i) > 2
- "#{a[:the]}, "
- else
- "#{a[:the]}"
- end
- end
- end
- {
- last_first_a: authors,
- last_first_format_a: @author_array,
- authors_h: @authors,
- authors_s: authors_string,
- authors_param: @author_param
- }
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/html_shared.rb b/lib/sisu/v5/html_shared.rb
deleted file mode 100644
index 04617e74..00000000
--- a/lib/sisu/v5/html_shared.rb
+++ /dev/null
@@ -1,65 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_HTML_Shared
- require_relative 'html_table' # html_table.rb
- class TableHTML < SiSU_HTML_Table::TableHTML
- end
-end
-__END__
diff --git a/lib/sisu/v5/html_table.rb b/lib/sisu/v5/html_table.rb
deleted file mode 100644
index f29256a7..00000000
--- a/lib/sisu/v5/html_table.rb
+++ /dev/null
@@ -1,67 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/html_table.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_HTML_Table
- require_relative 'xhtml_table' # xhtml_table.rb
- require_relative 'html_parts' # html_parts.rb
- class TableHTML < SiSU_XHTML_Table::TableXHTML
- include SiSU_Parts_HTML
- end
-end
-__END__
diff --git a/lib/sisu/v5/manpage_format.rb b/lib/sisu/v5/manpage_format.rb
deleted file mode 100644
index 98f37f67..00000000
--- a/lib/sisu/v5/manpage_format.rb
+++ /dev/null
@@ -1,88 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/manpage_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: manpage formatting template
-
-=end
-module SiSU_ManpageFormat
- require_relative 'dp' # dp.rb
- include SiSU_Param
- class ParagraphNumber
- def initialize(paranum)
- @paranum=/(\d+)/m.match(paranum)[1]
- end
- def display
- @paranum.gsub(/(\d+)/,'<font size="1" color="#777777">&nbsp;&nbsp;\1</font>')
- end
- def name
- @paranum.gsub(/(\d+)/,'<a name="\1"></a>')
- end
- def goto
- @paranum.gsub(/(\d+)/,'<a href="#\1">')
- end
- end
- class FormatTextObject
- def initialize(md,dob)
- @md,@dob=md,dob
- rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
- @dob.obj.gsub!(rgx,'\1') if @dob.obj =~rgx
- end
- def scr_endnote_body
- "<endnote>#{@dob.obj}</endnote> "
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/se_clear.rb b/lib/sisu/v5/se_clear.rb
deleted file mode 100644
index 7deb44ec..00000000
--- a/lib/sisu/v5/se_clear.rb
+++ /dev/null
@@ -1,109 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_clear.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Clear
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- require_relative 'se_info_env' # se_info_env.rb
- begin
- require 'singleton'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('singleton NOT FOUND (LoadError)')
- end
- class Clear < SiSU_Info_Env::InfoEnv # se_info_env.rb
- #todo unify with FileOp
- def initialize(cmd,fns,operation='')
- @cmd=cmd
- begin
- super(fns)
- @env=SiSU_Env::InfoEnv.new(fns)
- SiSU_Env::InfoVersion.instance
- if operation.class.inspect =~/SiSU_Param/
- @md=operation
- end
- case operation #watch
- when /pdf/ then @env_out=''
- when /sql/
- when /xml|plaintext|ascii/ then @env_out=@env.path.output + @fnb #check change of name to plaintext from ascii
- else
- if defined? @md.sfx_src \
- and @md.sfx_src =~/ss[ftsumc]/
- @env_out_root=@env.path.output
- @env_out="#{@env.path.output}/#{@fnb}"
- @@publisher='SiSU http://www.jus.uio.no/sisu'
- @env_pdf="#{@env_out_root}/pdf"
- end
- end
- rescue
- SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue do
- __LINE__.to_s + ':' + __FILE__
- end
- ensure
- end
- end
- def param_instantiate
- @cX||=SiSU_Screen::Ansi.new(@cmd)
- @@date=SiSU_Env::InfoDate.new
- @@proc=@@filename_txt=@@filename_texinfo=@@filename_lout_portrait=@@filename_lout_landscape=@@filename_html_scroll=@@filename_html_index=@@filename_html_segtoc=@@filename_semantic=@@filename_rss=@@newfile=@@drr=@@yaml=@@yamladdr=nil
- @@publisher='SiSU scribe'
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/se_date.rb b/lib/sisu/v5/se_date.rb
deleted file mode 100644
index 0e72d1d5..00000000
--- a/lib/sisu/v5/se_date.rb
+++ /dev/null
@@ -1,95 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_date.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Info_Date
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- class InfoDate
- begin
- require 'date'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('date NOT FOUND (LoadError)')
- end
- attr_accessor :dt,:t
- def initialize
- @dt,@t=Date.today.to_s,Time.now
- end
- def week
- w=@t.strftime('%W')
- "#{@t.year}w#{w}"
- end
- def month
- "#{@t.year}#{@t.month}"
- end
- def year
- @t.year
- end
- def weekonly
- @t.strftime('%W')
- end
- def monthonly
- @t.month
- end
- def year_static
- YEAR
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/se_info_port.rb b/lib/sisu/v5/se_info_port.rb
deleted file mode 100644
index 87c96861..00000000
--- a/lib/sisu/v5/se_info_port.rb
+++ /dev/null
@@ -1,73 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_info_port.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Info_Port
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- require_relative 'se_info_env' # se_info_env.rb
- class InfoPort < SiSU_Info_Env::InfoEnv # se_info_env.rb
- def initialize
- @env=SiSU_Env::InfoEnv.new
- end
- def webrick
- @env.port.webrick_port
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/se_load.rb b/lib/sisu/v5/se_load.rb
deleted file mode 100644
index c5fda092..00000000
--- a/lib/sisu/v5/se_load.rb
+++ /dev/null
@@ -1,111 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_load.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Load
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- class Load
- def initialize(prog,mandatory=false)
- @prog,@mandatory=prog,mandatory
- end
- def prog
- load_prog=false
- $:.each do |reqpath|
- if FileTest.exist?("#{reqpath}/#{@prog}.rb")
- load_prog=true
- #SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).ok("#{reqpath}/#{@prog}.rb loaded")
- break
- #else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{reqpath}/#{@prog}.rb not found")
- end
- end
- if load_prog \
- and @prog=~/dbi/
- begin
- require 'dbi'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('dbi NOT FOUND (LoadError)')
- end
- end
- if load_prog
- begin
- require @prog
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error("#{@prog} NOT FOUND (LoadError)")
- end
- else
- @mandatory \
- ? (SiSU_Screen::Ansi.new(@prog,"*WARN* module required: #{@prog}").warn)
- : '' #(SiSU_Screen::Ansi.new(@prog,"*WARN* #{@prog} load requested").warn)
- end
- load_prog
- end
- def prog?
- load_prog=false
- $:.each do |reqpath|
- if FileTest.exist?("#{reqpath}/#{@prog}.rb"); load_prog=true
- break
- end
- end
- load_prog
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/se_version.rb b/lib/sisu/v5/se_version.rb
deleted file mode 100644
index 0243491d..00000000
--- a/lib/sisu/v5/se_version.rb
+++ /dev/null
@@ -1,155 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/se_version.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Info_Version
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- require_relative 'se_info_env' # se_info_env.rb
- begin
- require 'singleton'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('singleton NOT FOUND (LoadError)')
- end
- class InfoVersion < SiSU_Info_Env::InfoEnv # se_info_env.rb
- include Singleton
- begin
- require 'rbconfig'
- require 'yaml'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('rbconfig or yaml NOT FOUND (LoadError)')
- end
- @@lib_path=nil
- def get_version
- @version={}
- @pwd=ENV['PWD']
- lib_path=
- @@lib_path \
- ? @@lib_path
- : `echo $RUBYLIB`.split(':')
- @@lib_path ||=lib_path
- if File.exist?(SiSU_is[:version_info_path])
- @version=YAML::load(File::open(SiSU_is[:version_info_path]))
- end
- @version[:install_method]=if SiSU_is[:run_from]==:gem_install
- spec = Gem::Specification.find_by_name("sisu")
- gem_root = spec.gem_dir
- (File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_is[:version_dir]}/,'')) == gem_root) \
- ? ' (ruby gem install)' : ''
- else ''
- end
- @version
- end
- def rbversion
- %x{ruby -v}.strip
- end
- end
-end
-module SiSU_Info_About
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- begin
- require 'singleton'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('singleton NOT FOUND (LoadError)')
- end
- class InfoAbout
- def initialize(color='')
- @color=color
- end
- def sisu_version
- version=SiSU_Env::InfoVersion.instance.get_version
- rb_ver=SiSU_Env::InfoVersion.instance.rbversion
- if version[: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],
- version[:install_method],
- rb_ver
- ).version
- else puts 'SiSU (version information not available)'
- end
- end
- def sisu_about
- puts <<-WOK
- sisu: documents; markup, structuring, publishing in multiple standard formats, & search
- most (not all) useful commands (are made in a directory containing a sisu markup file &) take the form:
- sisu [action(s)] [filename(s)]
- where filename refers to a valid sisu marked up file, e.g.:
- cd /usr/share/doc/sisu/markup-samples/sisu_manual
- sisu --html --verbose sisu_commands.sst
- sisu --txt --html --epub --odt --pdf --sqlite --manpage --texinfo --concordance --qrcode --verbose sisu.ssm
- cd -
- See output produced, or see man pages: man sisu
- <http://www.sisudoc.org/> <http://www.jus.uio.no/sisu/>
- WOK
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/src_kdissert_share.rb b/lib/sisu/v5/src_kdissert_share.rb
deleted file mode 100644
index 54e1cc4e..00000000
--- a/lib/sisu/v5/src_kdissert_share.rb
+++ /dev/null
@@ -1,105 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_share_kdissert.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: share sisu source markup file, copy it to output directory!
-
-=end
-module SiSU_KdiSource
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source
- begin
- require 'fileutils'
- include FileUtils
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('fileutils NOT FOUND (LoadError)')
- end
- def initialize(opt)
- @opt=opt
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
- @output_path="#{@env.path.output}/#{@opt.fnb}"
- end
- def read
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Share Kdissert Source Document!',
- @opt.fnb
- ).green_hi_blue unless @opt.act[:quiet][:set]==:on
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Copy kdissert file to output directory",
- "#{@opt.fnb} -> #{@output_path}"
- ).warn unless @opt.act[:quiet][:set]==:on
- FileUtils::mkdir_p(@env.path.output) unless FileTest.directory?(@env.path.output)
- FileUtils::mkdir_p(@output_path) unless FileTest.directory?(@output_path)
- if FileTest.directory?(@output_path)
- if @opt.fns =~/\.kdi\._sst$/ \
- and FileTest.file?(@opt.fnb)
- FileUtils::cp(@opt.fnb,@output_path)
- end
- else
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Output directory does not exist",
- "#{@opt.fnb} -> #{@output_path}"
- ).warn unless @opt.act[:quiet][:set]==:on
- exit
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/src_share.rb b/lib/sisu/v5/src_share.rb
deleted file mode 100644
index 1ecd1107..00000000
--- a/lib/sisu/v5/src_share.rb
+++ /dev/null
@@ -1,112 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/src_share.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: share sisu source markup file, copy it to output directory!
-
-=end
-module SiSU_Markup
- require_relative 'src_shared' # src_shared.rb
- include SiSU_Source
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source < SiSU_Source::SiSUpodSource
- def initialize(opt,build=nil,place=nil)
- super(opt,build,place)
- @opt=opt
- end
- def read
- unless @opt.act[:quiet][:set]==:on
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Share document markup text source',
- @opt.fns
- ).cyan_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- '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.act[:maintenance][:set]==:on) \
- ? '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
- if (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- '',
- "#{@opt.fno} not available"
- ).blue_tab
- end
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/utils_response.rb b/lib/sisu/v5/utils_response.rb
deleted file mode 100644
index 4979048e..00000000
--- a/lib/sisu/v5/utils_response.rb
+++ /dev/null
@@ -1,76 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_response.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Request response
-
-=end
-module SiSU_Response
- class Response
- def response?(ask) #move to more appropriate directory later
- response='redo'
- print ask + " ['yes', 'no' or 'quit']: "
- response=File.new('/dev/tty').gets.strip
- ans=if response=='yes' then true
- elsif response=='no' then false
- elsif response =~/^quit|exit$/ then exit
- else puts "[please type: 'yes', 'no' or 'quit']"
- response?(ask)
- end
- ans
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/utils_spell.rb b/lib/sisu/v5/utils_spell.rb
deleted file mode 100644
index 7c453262..00000000
--- a/lib/sisu/v5/utils_spell.rb
+++ /dev/null
@@ -1,102 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/utils_spell.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: spellchecking
-
-=end
-module SiSU_SpellUtility
- class Spell
- def initialize(input,filesrc,flg)
- @flg=flg
- @filename, @filetype = /(.+?)(\.\w\w\w0$)/.match(filesrc)[1,2] #.gsub(/\.\w\w\w0$/, "")
- @input=input
- @allwords=[]
- puts @filename
- @speller='aspell' # 'ispell'
- @dictionary='british'
- @lang='en_GB'
- end
- def check
- @input.each do |data|
- data=data.gsub(/(https?|www|ftp|gopher|png|jpg|gif|html|htm)\S+/i,' ').
- gsub(/(&nbsp;|#{Mx[:nbsp]})/i,' ').
- gsub(/<\/?(table|tr|td|b|p|href).*?>/i,' ').
- gsub(/(<==.+|<:\S+>|<!.+?!>|^@\S+?:.+|\{\{\{|~)/,' ').
- gsub(/(["|<>)(\n'`.;&_-]|\=)/,' ').
- gsub(/\b(altExternal|
- target|externalimg|
- srcimagebext|
- img|src|toc|pdf|
- cd|org|
- helvetica|roman
- )\b/i,' ').
- gsub(/EOF/,'')
- @words=data.scan(/\S+/)
- @words.each { |y| @allwords << y }
- end
- @allwords=@allwords.uniq
- if @flg =~ /S/
- File.open('/home/ralph/spell_error','a+') do |file| #fix
- file.puts %{\n\n<<#{@filename}>>}
- end
- @allwords.each { |y| puts y.inspect; system(%{cat #{y} | /usr/bin/#{@speller} -l -d #{@dictionary} >> ~/spell_error })}
- else
- @allwords.each { |y| sp=%x{echo #{y}|#{@speller} -l }; puts sp unless sp.empty?}
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/xhtml_shared.rb b/lib/sisu/v5/xhtml_shared.rb
deleted file mode 100644
index 0e7fcf3c..00000000
--- a/lib/sisu/v5/xhtml_shared.rb
+++ /dev/null
@@ -1,65 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_XHTML_Shared
- require_relative 'xhtml_table' # xhtml_table.rb
- class TableXHTML < SiSU_XHTML_Table::TableXHTML
- end
-end
-__END__
diff --git a/lib/sisu/v5/xhtml_table.rb b/lib/sisu/v5/xhtml_table.rb
deleted file mode 100644
index 5e6b2c57..00000000
--- a/lib/sisu/v5/xhtml_table.rb
+++ /dev/null
@@ -1,101 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/xhtml_table.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_XHTML_Table
- require_relative 'xhtml_parts' # xhtml_parts.rb
- class TableXHTML
- include SiSU_Parts_XHTML
- @@tablehead=0
- @@tablefoot=[] #watch
- def initialize(table)
- @table_obj=table
- end
- def table
- table_obj=@table_obj
- if table_obj.obj !~/^<table\s/m
- table_obj=table_rows_and_columns_array(table_obj)
- else p __LINE__; p caller
- end
- table_obj
- end
- def table_rows_and_columns_array(table_obj) # provides basic (x)html table
- table_rows,nr=[],0
- table_obj.obj.split(Mx[:tc_c]).each do |table_row|
- table_row_with_columns=table_row.split(Mx[:tc_p])
- trc,nc=[],0
- table_row_with_columns.each do |c|
- c=c.gsub(/^~$/,''). # tilde / empty cell
- gsub(/<:br>/,the_line_break)
- trc <<= if table_obj.head_ and nr==0; %{<th width="#{table_obj.widths[nc]}%">#{c}</th>}
- else %{<td width="#{table_obj.widths[nc]}%">#{c}</td>}
- end
- nc+=1
- end
- trc=(trc.is_a?(Array)) ? trc.flatten.join : trc
- trc=" <tr>#{trc}</tr>\n"
- nr+=1
- table_rows << trc
- end
- table_rows=table_rows.flatten.join
- table_obj.obj=%{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">\n#{table_rows} </table>}
- table_obj
- end
- end
-end
-__END__
diff --git a/lib/sisu/v5/zap.rb b/lib/sisu/v5/zap.rb
deleted file mode 100644
index b309b793..00000000
--- a/lib/sisu/v5/zap.rb
+++ /dev/null
@@ -1,93 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v5/zap.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: zap wipe clean previous output of the type specified
-
-=end
-module SiSU_Zap
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source
- def initialize(opt)
- @opt=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')
- unless @opt.act[:quiet][:set]==:on
- tell=SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Clean files related to processing #{@opt.selections.str} ->",
- "#{@opt.fns} -> #{zap_path}"
- )
- tell.warn
- end
- z.zap.remove_output
- else
- unless @opt.act[:quiet][:set]==:on
- tell=SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'use of -Z (zap) has not enabled in sisurc.yml'
- )
- tell.warn
- end
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/air.rb b/lib/sisu/v6/air.rb
deleted file mode 100644
index 85cbc1e4..00000000
--- a/lib/sisu/v6/air.rb
+++ /dev/null
@@ -1,83 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/air.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Air
- require_relative 'se_hub_particulars' # se_hub_particulars.rb
- class Source
- @@ao_array=[]
- @@fns=nil
- def initialize(opt)
- @opt=opt
- @@fns||@opt.fns
- @particulars=SiSU_Particulars::Combined.new(opt)
- #@env=@particulars.env
- #@md=@particulars.md
- #@ao_array=@particulars.ao_array
- end
- def read
- end
- protected
- def print
- puts @particulars.md.inspect
- puts @particulars.env.inspect
- puts @particulars.ao_array
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/ao_metadata.rb b/lib/sisu/v6/ao_metadata.rb
deleted file mode 100644
index 33db841c..00000000
--- a/lib/sisu/v6/ao_metadata.rb
+++ /dev/null
@@ -1,89 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/ao_metadata.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_AO_Metadata
- class Metadata
- def initialize(md,metad)
- @md,@metadata=md,metad
- l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
- language=l[:n]
- @tr=SiSU_Translate::Source.new(md,language)
- end
- def make_para(obj,ocn)
- h={
- obj: obj,
- ocn: 0
- }
- SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
- end
- def make_heading(obj,ocn,name,lv,ln)
- h={
- lv: lv,
- ln: ln,
- name: name,
- obj: obj,
- ocn: 0
- }
- SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
- end
- def metadata
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/cgi.rb b/lib/sisu/v6/cgi.rb
deleted file mode 100644
index 8ce8596f..00000000
--- a/lib/sisu/v6/cgi.rb
+++ /dev/null
@@ -1,88 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/cgi.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: generates naive cgi search form for search of sisu database
- (pgsql sqlite)
-
-=end
-module SiSU_CGI #% database building documents
- require_relative 'se' # se.rb
- require_relative 'cgi_pgsql' # cgi_pgsql.rb
- require_relative 'cgi_sqlite' # cgi_sqlite.rb
- class SearchSQL
- def initialize(opt)
- @opt=opt
- @webserv=@opt.files[0].to_s.strip
- end
- def read
- if @opt.act[:sample_search_form][:db]==:pg # cgi_pgsql.rb
- SiSU_CGI_PgSQL::SearchPgSQL.new(@opt,@webserv).pgsql
- elsif @opt.act[:sample_search_form][:db]==:sqlite # cgi_sqlite.rb
- SiSU_CGI_SQLite::SearchSQLite.new(@opt,@webserv).sqlite
- else
- puts <<-WOK
- please select database type for which sample search form should be built (pgsql or sqlite)
- sisu --sample-search-form --db=sqlite
- sisu --sample-search-form --db=pg
- other options include
- --webserv-cgi='[cgi-server-name]'
- --webserv-output='[sisu-output-server-with-base-path]'
- WOK
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/errors.rb b/lib/sisu/v6/errors.rb
deleted file mode 100644
index b56f80a3..00000000
--- a/lib/sisu/v6/errors.rb
+++ /dev/null
@@ -1,87 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/errors.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, error screen reporting
-
-=end
-module SiSU_Errors
- require_relative 'se' # se.rb
- include SiSU_Env; include SiSU_Screen
- class Rescued <CreateFile
- def initialize(error,errorlist,cmd,fns='')
- @fns,@cmd,@error,@errorlist=fns,cmd,error,errorlist
- @cmd=(cmd \
- && (cmd =~/c/)) \
- ? 'Vc'
- : 'V'
- end
- def location
- file=@fns \
- ? (SiSU_Env::CreateFile.new(@fns).file_error)
- : (File.new('/tmp/errorlog.sisu','w+'))
- file << @fns << "\n" << @error << "\n" << @errorlist
- file.close
- if @cmd=~/[vVM]/
- SiSU_Screen::Ansi.new('',$!,$@).rescue do
- (block_given?) ? yield : __LINE__.to_s + ':' + __FILE__
- end
- else
- SiSU_Screen::Ansi.new('',"rescued, exception raised, silenced").puts_grey
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/generic_parts.rb b/lib/sisu/v6/generic_parts.rb
deleted file mode 100644
index bb3b3371..00000000
--- a/lib/sisu/v6/generic_parts.rb
+++ /dev/null
@@ -1,134 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_parts.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_Parts_Generic
- def the_url
- def urify(uri)
- URI.parse(uri)
- end
- def sisu
- 'http://www.sisudoc.org/'
- end
- def sisudoc
- 'http://www.sisudoc.org'
- end
- def footer_signature
- 'http://www.sisudoc.org/'
- end
- def rl_root
- '/sisu' #watch
- end
- def root_http
- 'http://www.sisudoc.org/' #watch
- end
- def home
- 'http://www.sisudoc.org/' # used in pdf header
- end
- def site #used as stub... where there are subdirectories and is different from home
- home
- end
- def home_txt
- 'www.sisudoc.org'
- end
- def sisu_txt
- 'www.sisudoc.org'
- end
- self
- end
- def the_text
- def home
- 'SiSU'
- 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
- def url_open
- '<'
- end
- def url_close
- '>'
- end
- self
- end
- def the_icon
- def i_ico
- 'rb7.ico'
- end
- def i_home_button
- 'sisu.png'
- end
- def i_choice
- 'b_choice.png'
- end
- def i_new
- 'b_new.png'
- end
- self
- end
-end
-__END__
diff --git a/lib/sisu/v6/html_harvest.rb b/lib/sisu/v6/html_harvest.rb
deleted file mode 100644
index b1bd7ca5..00000000
--- a/lib/sisu/v6/html_harvest.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# encoding: utf-8
-=begin
-
- * Name: SiSU
-
- * Description: a framework for document structuring, publishing and search
- harvest metadata from document corpus (suitable for medium sized sites)
- (concept example, [to remove size constraint: implement SQL equivalent])
-
- * Author: Ralph Amissah
-
- * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Harvest
- @@the_idx_topics,@@the_idx_authors={},{}
- class Source
- require_relative 'hub_options' # hub_options.rb
- require_relative 'html_harvest_topics' # html_harvest_topics.rb
- require_relative 'html_harvest_authors' # html_harvest_authors.rb
- require_relative 'se' # se.rb
- include SiSU_Env
- def initialize(opt)
- @opt=opt
- @env=SiSU_Env::InfoEnv.new
- end
- def read
- begin
- harvest_pth=@env.path.webserv + '/' + @opt.base_stub
- FileUtils::mkdir_p(harvest_pth) unless FileTest.directory?(harvest_pth)
- cases(@opt,@env)
- rescue
- ensure
- SiSU_Env::CreateSite.new(@opt).cp_css
- end
- end
- def help
- puts <<WOK
- harvest --harvest extracts document index metadata
-
-WOK
- end
- def css(opt)
- require_relative 'css' # css.rb
- css=SiSU_Style::CSS.new
- fn_css=SiSU_Env::CSS_Default.new
- style=File.new("#{@env.path.pwd}/#{fn_css.harvest}",'w')
- style << css.harvest
- style.close
- end
- def cases(opt,env)
- case opt.selections.str.inspect
- when/--harvest/i
- css(opt) if @opt.act[:maintenance][:set]==:on
- SiSU_HarvestAuthors::Songsheet.new(opt,env).songsheet
- SiSU_HarvestTopics::Songsheet.new(opt,env).songsheet
- if @opt.act[:rsync][:set]==:on
- require_relative 'remote' # remote.rb
- SiSU_Remote::Put.new(opt).rsync_harvest
- end
- else
- help
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/html_harvest_author_format.rb b/lib/sisu/v6/html_harvest_author_format.rb
deleted file mode 100644
index c5081193..00000000
--- a/lib/sisu/v6/html_harvest_author_format.rb
+++ /dev/null
@@ -1,114 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/harvest_author_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_FormatAuthor
- class Author
- def initialize(author_param)
- @author_param=author_param
- end
- def author_details
- @authors,@author_array=[],[]
- authors=@author_param.scan(/[^;]+/)
- authors.each do |a|
- a=a.strip
- if a =~/"(.+?)"/
- @authors << { the: $1 }
- @author_array << $1.upcase
- else #if a =~/,/
- x=a.scan(/[^,]+/)
- x[0]=x[0].strip
- x[1]=x[1].strip if x[1]
- if x.length==1
- @authors << { the: x[0] }
- @author_array << x[0].upcase
- elsif x.length==2
- @authors << { the: x[0], others: x[1] }
- @author_array << "#{x[0].upcase}, #{x[1]}"
- else #p x.length
- end
- end
- end
- l = @authors.length
- authors_string=''
- @authors.each_with_index do |a,i|
- authors_string += if a[:others]
- if (l - i) > 1
- "#{a[:others]} #{a[:the]}, "
- else
- "#{a[:others]} #{a[:the]}"
- end
- else
- if (l - i) > 2
- "#{a[:the]}, "
- else
- "#{a[:the]}"
- end
- end
- end
- {
- last_first_a: authors,
- last_first_format_a: @author_array,
- authors_h: @authors,
- authors_s: authors_string,
- authors_param: @author_param
- }
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/html_shared.rb b/lib/sisu/v6/html_shared.rb
deleted file mode 100644
index fe1d83d0..00000000
--- a/lib/sisu/v6/html_shared.rb
+++ /dev/null
@@ -1,65 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_HTML_Shared
- require_relative 'html_table' # html_table.rb
- class TableHTML < SiSU_HTML_Table::TableHTML
- end
-end
-__END__
diff --git a/lib/sisu/v6/html_table.rb b/lib/sisu/v6/html_table.rb
deleted file mode 100644
index c789dc71..00000000
--- a/lib/sisu/v6/html_table.rb
+++ /dev/null
@@ -1,67 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/html_table.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_HTML_Table
- require_relative 'xhtml_table' # xhtml_table.rb
- require_relative 'html_parts' # html_parts.rb
- class TableHTML < SiSU_XHTML_Table::TableXHTML
- include SiSU_Parts_HTML
- end
-end
-__END__
diff --git a/lib/sisu/v6/manpage_format.rb b/lib/sisu/v6/manpage_format.rb
deleted file mode 100644
index 13b70980..00000000
--- a/lib/sisu/v6/manpage_format.rb
+++ /dev/null
@@ -1,88 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/manpage_format.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: manpage formatting template
-
-=end
-module SiSU_ManpageFormat
- require_relative 'dp' # dp.rb
- include SiSU_Param
- class ParagraphNumber
- def initialize(paranum)
- @paranum=/(\d+)/m.match(paranum)[1]
- end
- def display
- @paranum.gsub(/(\d+)/,'<font size="1" color="#777777">&nbsp;&nbsp;\1</font>')
- end
- def name
- @paranum.gsub(/(\d+)/,'<a name="\1"></a>')
- end
- def goto
- @paranum.gsub(/(\d+)/,'<a href="#\1">')
- end
- end
- class FormatTextObject
- def initialize(md,dob)
- @md,@dob=md,dob
- rgx=/#{Mx[:en_a_o]}[\d*+]+\s+(.+?)#{Mx[:en_a_c]}/
- @dob.obj.gsub!(rgx,'\1') if @dob.obj =~rgx
- end
- def scr_endnote_body
- "<endnote>#{@dob.obj}</endnote> "
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/po4a.rb b/lib/sisu/v6/po4a.rb
deleted file mode 100644
index da294e12..00000000
--- a/lib/sisu/v6/po4a.rb
+++ /dev/null
@@ -1,984 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/po4a.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: pot file generation
- linefeed)
-
-=end
-module SiSU_Po4a
- require_relative 'ao' # ao.rb
- require_relative 'se' # se.rb
- include SiSU_Env
- require_relative 'ao_composite' # ao_composite.rb
- require_relative 'shared_metadata' # shared_metadata.rb
- require_relative 'po4a_set' # po4a_set.rb
- include SiSU_Param
- class Source
- @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn=nil,nil,nil,nil,nil,nil
- def initialize(opt,fn=nil)
- @opt,@fn=opt,fn
- #unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/
- # puts "#{@opt.fns} not a processed file type"
- #end
- r=Px[:lng_lst_rgx].gsub(/\|en\|/,'|')
- @lang_regx=%r{(?:#{r})}
- if opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
- and opt.f_pth[:lng]!=@opt.lng_base
- @@opt_src_=false
- @@opt_trn=opt
- @@md_trn=SiSU_Param::Parameters.new(opt).get
- else
- @@opt_src_=true
- @@opt_src=opt
- @@md_src=SiSU_Param::Parameters.new(opt).get
- end
- end
- def read
- begin
- src={}
- src[:pth]=@opt.f_pth[:pth]
- src[:files]=if @opt.fns =~ /\.(?:(?:-|ssm\.)sst|ssm)$/
- @opt.fns=@opt.fns.gsub(/\.ssm\.sst$/,'.ssm')
- SiSU_Assemble::CompositeFileList.new(@opt).read
- else
- [@opt.fns]
- end
- md=SiSU_Param::Parameters.new(@opt).get
- src[:files].each do |fn|
- SiSU_AO::Source.new(@opt,fn).read # -m
- env=SiSU_Env::InfoEnv.new(@opt.fns)
- m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm|ssi)$/ #watch added match for sss
- @fnn,@fnb,@fnt=fn[m,1],fn[m,2],fn[m,3]
- unless @opt.act[:quiet][:set]==:on
- path=env.path.output_tell
- tool=(@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? "#{env.program.text_editor} #{path}/#{md.fnb}/#{md.fn[:plain]}"
- : @opt.fns
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Pot po4a',tool).green_hi_blue
- : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Pot po4a',tool).green_title_hi
- if (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- @opt.fns,
- "#{path}/#{md.fnb}/#{md.fn[:plain]}"
- ).flow
- end
- end
- if @opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
- or @opt.f_pth[:lng] !=@opt.lng_base
- opt_lang_trn_fn=fn
- @ao_array_lang_translation=SiSU_AO::Source.new(@opt,opt_lang_trn_fn).get # ao file drawn here
- opt_lang_src_fn=if fn =~/\S+?~\S{2}(?:_\S{2})?\.ss[mti]/
- fn.gsub(/(\S+?)~\S{2}(?:_\S{2})?(\.ss[mti])/,'\1\2') #check i
- else fn
- end
- transdir,srcdir=Dir.pwd,Dir.pwd
- if Dir.pwd.to_s =~/\/#{@lang_regx}$/
- transdir=Dir.pwd
- srcdir=transdir.gsub(/\/#{@lang_regx}$/,"/#{@opt.lng_base}")
- if FileTest.directory?(srcdir)
- Dir.chdir(srcdir)
- end
- else nil
- end
- if FileTest.file?("#{srcdir}/#{opt_lang_src_fn}")
- @ao_array_lang_src=SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn).get # ao file drawn here
- else
- puts "no identified source document"
- exit
- end
- Dir.chdir(transdir) if transdir
- else
- @ao_array_lang_src=SiSU_AO::Source.new(@opt,fn).get # ao file drawn here
- @ao_array_lang_translation=nil
- end
- wrap_width=if defined? md.make.plaintext_wrap \
- and md.make.plaintext_wrap
- md.make.plaintext_wrap
- elsif defined? env.plaintext_wrap \
- and env.plaintext_wrap
- env.plaintext_wrap
- else 78
- end
- SiSU_Po4a::Source::Scroll.new(fn,@ao_array_lang_src,@ao_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
- end
- rescue
- SiSU_Errors::Rescued.new($!,$@,@opt.selections.str,@opt.fns).location do
- __LINE__.to_s + ':' + __FILE__
- end
- ensure
- end
- end
- private
- class Scroll <Source
- include SiSU_Po4aUtils
- @@endnotes={ para: [], end: [] }
- def initialize(fn,data_src,data_trn,md_src,md_trn,wrap_width)
- @fn,@data_src,@data_trn,@md_src,@md_trn,@wrap_width=fn,data_src,data_trn,md_src,md_trn,wrap_width
- @md=(md_trn.nil?) \
- ? md_src
- : md_trn
- @tab="\t"
- @@endnotes_=(@md.opt.selections.str =~/--endnote/) ? true : false # --footnote
- @br=(@md.opt.selections.str =~/--dos/) ? "\r\n" : "\n" # --unix
- @pot={ body: [], open: [], close: [], head: [], metadata: [], tail: [] }
- end
- def songsheet
-############## BUG @fn changes value
- fn=@fn
- pot=pot_markup(@data_src,@data_trn)
- publish(fn,pot)
- end
- def extract_endnotes(dob='') #% Used for extraction of endnotes from paragraphs
- notes_a=dob.obj.scan(/#{Mx[:en_a_o]}([\d]+\s+.+?)#{Mx[:en_a_c]}/)
- ##notes_a=dob.obj.scan(/#{Mx[:en_a_o]}([\d*+]+\s+.+?)#{Mx[:en_a_c]}/)
- #notes_b=dob.obj.scan(/#{Mx[:en_b_o]}([\d*+]+\s+.+?)#{Mx[:en_b_c]}/)
- @n=[]
- notes_a.flatten.each do |n| #high cost to deal with <br> appropriately within plaintext, consider
- n=n.dup.to_s
- n=n.gsub(/^([\d]+)\s+/,'^~\1 ').
- #gsub(/^([\d*+]+)\s+/,'^~\1 ').
- gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'<br>')
- @n << n
- end
- notes_a=@n.flatten
- end
- def wrap_endnotes(orig_notes='',trn_notes='')
- nt=@@endnotes_ ? 'endnote' : 'footnote'
- @fn=0
- a_l=orig_notes.length
- 0.upto(a_l-1) do |i|
- @fn=if orig_notes[i].to_s =~/^\^~([\d*+]+)/ # provides endnote number within paragraph
- @fn += 1
- else @fn
- end
- d="#{nt} #{@fn}"
- mark="^~ "
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# footnotes, the preferred sisu markup for a footnote is~{this is a footnote}~ however, for translation a footnote reference marker in the text~^ with a set of notes following the paragraph starting on a newline with "^~ this is a footnote", is easier to deal with, if possible these should be converted back to~{inline notes}~}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=(orig_notes[i].to_s =~/^\^~[\d*+]+/) ? (orig_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~')) : orig_notes[i].to_s
- trans=if trn_notes.is_a?(Array) \
- and trn_notes.length==orig_notes.length
- (trn_notes[i].to_s =~/^\^~[\d*+]+/) ? (trn_notes[i].to_s.gsub(/^\^~[\d*+]+/,'^~')) : trn_notes[i].to_s
- else ''
- end
- util=pot_structure(desc,orig,trans)
- wrap=util.line_wrap
- wrap=if wrap =~ /^\s*\^~[\d*+]+\s+.+?\s*\Z/m
- wrap.gsub(/^\s*(\^~[\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB
-\\1 \\2
-GSUB
- )
- else
- wrap.gsub(/^(.+)\Z/m, <<GSUB
-\\1
-GSUB
- )
- end
- @@endnotes[:para] << wrap
- @@endnotes[:end] << '' << wrap
- end
- @@endnotes[:para].each {|e| @pot[:body] << e << @br}
- @@endnotes[:para]=[]
- @@endnotes
- end
- def pot_metadata_src
- @po4a_identify_type='type: SiSU doc' #'type: Plain text'
- meta_src=SiSU_Metadata::Summary.new(@md_src)
- w=[]
- w << [
- "#. #{@po4a_identify_type} - metadata: title",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.title.main,
- meta_src.metadata_tags.title.sub,
- meta_src.metadata_tags.title.edition,
- meta_src.metadata_tags.title.note,
- meta_src.metadata_tags.title.short,
- meta_src.metadata_tags.title.language,
- meta_src.metadata_tags.title.language_char,
- 'msgstr ""',
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: creator",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.creator.head,
- meta_src.metadata_tags.creator.author,
- meta_src.metadata_tags.creator.contributor,
- meta_src.metadata_tags.creator.illustrator,
- meta_src.metadata_tags.creator.photographer,
- meta_src.metadata_tags.creator.translator,
- meta_src.metadata_tags.creator.audio,
- meta_src.metadata_tags.creator.digitized_by,
- meta_src.metadata_tags.creator.prepared_by,
- 'msgstr ""',
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: rights",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.rights.head,
- meta_src.metadata_tags.rights.copyright.text,
- meta_src.metadata_tags.rights.copyright.translation,
- meta_src.metadata_tags.rights.copyright.illustrations,
- meta_src.metadata_tags.rights.copyright.photographs,
- meta_src.metadata_tags.rights.copyright.digitization,
- meta_src.metadata_tags.rights.copyright.audio,
- meta_src.metadata_tags.rights.license,
- 'msgstr ""',
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: classify",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.classify.head,
- meta_src.metadata_tags.classify.subject,
- meta_src.metadata_tags.classify.topic_register,
- meta_src.metadata_tags.classify.loc,
- meta_src.metadata_tags.classify.dewey,
- 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 << [
- "#. #{@po4a_identify_type} - metadata: date",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.date.head,
- meta_src.metadata_tags.date.added_to_site,
- meta_src.metadata_tags.date.available,
- meta_src.metadata_tags.date.created,
- meta_src.metadata_tags.date.issued,
- meta_src.metadata_tags.date.modified,
- meta_src.metadata_tags.date.published,
- meta_src.metadata_tags.date.valid,
- 'msgstr ""',
- ]
- w << [
- "#. #{@po4a_identify_type} - processing, make instruction",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.processing_tags.make.language,
- meta_src.processing_tags.make.headings,
- meta_src.processing_tags.make.num_top,
- meta_src.processing_tags.make.breaks,
- meta_src.processing_tags.make.emphasis,
- meta_src.processing_tags.make.bold,
- meta_src.processing_tags.make.italics,
- meta_src.processing_tags.make.texpdf_font,
- 'msgstr ""',
- ]
- w.each do |y|
- z=''
- y.each do |x|
- if x
- z += x + "\n" if x =~/^#|^msg(?:id|str)/
- z += %{"#{x}"\n} if x =~/^@\S+?:(?: |$)/
- z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
- end
- end
- @pot[:metadata] << z << @br
- #puts z unless z.empty?
- end
- end
- def pot_metadata_src_trn
- @po4a_identify_type='type: SiSU doc'
- #@po4a_identify_type='type: Plain text'
- meta_src=SiSU_Metadata::Summary.new(@md_src)
- meta_trn=SiSU_Metadata::Summary.new(@md_trn)
- w=[]
- w << [
- "#. #{@po4a_identify_type} - metadata: title",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.title.main,
- meta_src.metadata_tags.title.sub,
- meta_src.metadata_tags.title.edition,
- meta_src.metadata_tags.title.note,
- meta_src.metadata_tags.title.short,
- meta_src.metadata_tags.title.language,
- meta_src.metadata_tags.title.language_char,
- 'msgstr ""',
- meta_trn.metadata_tags.title.main,
- meta_trn.metadata_tags.title.sub,
- meta_trn.metadata_tags.title.edition,
- meta_trn.metadata_tags.title.note,
- meta_trn.metadata_tags.title.short,
- meta_trn.metadata_tags.title.language,
- meta_trn.metadata_tags.title.language_char,
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: creator",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.creator.head,
- meta_src.metadata_tags.creator.author,
- meta_src.metadata_tags.creator.contributor,
- meta_src.metadata_tags.creator.illustrator,
- meta_src.metadata_tags.creator.photographer,
- meta_src.metadata_tags.creator.translator,
- meta_src.metadata_tags.creator.audio,
- meta_src.metadata_tags.creator.digitized_by,
- meta_src.metadata_tags.creator.prepared_by,
- 'msgstr ""',
- meta_trn.metadata_tags.creator.head,
- meta_trn.metadata_tags.creator.author,
- meta_trn.metadata_tags.creator.contributor,
- meta_trn.metadata_tags.creator.illustrator,
- meta_trn.metadata_tags.creator.photographer,
- meta_trn.metadata_tags.creator.translator,
- meta_trn.metadata_tags.creator.audio,
- meta_trn.metadata_tags.creator.digitized_by,
- meta_trn.metadata_tags.creator.prepared_by,
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: rights",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.rights.head,
- meta_src.metadata_tags.rights.copyright.text,
- meta_src.metadata_tags.rights.copyright.translation,
- meta_src.metadata_tags.rights.copyright.illustrations,
- meta_src.metadata_tags.rights.copyright.photographs,
- meta_src.metadata_tags.rights.copyright.digitization,
- meta_src.metadata_tags.rights.copyright.audio,
- meta_src.metadata_tags.rights.license,
- 'msgstr ""',
- meta_trn.metadata_tags.rights.head,
- meta_trn.metadata_tags.rights.copyright.text,
- meta_trn.metadata_tags.rights.copyright.translation,
- meta_trn.metadata_tags.rights.copyright.illustrations,
- meta_trn.metadata_tags.rights.copyright.photographs,
- meta_trn.metadata_tags.rights.copyright.digitization,
- meta_trn.metadata_tags.rights.copyright.audio,
- meta_trn.metadata_tags.rights.license,
- ]
- w << [
- "#. #{@po4a_identify_type} - metadata: classify",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.classify.head,
- meta_src.metadata_tags.classify.subject,
- meta_src.metadata_tags.classify.topic_register,
- meta_src.metadata_tags.classify.loc,
- meta_src.metadata_tags.classify.dewey,
- 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.subject,
- meta_trn.metadata_tags.classify.topic_register,
- meta_trn.metadata_tags.classify.loc,
- meta_trn.metadata_tags.classify.dewey,
- 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",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.metadata_tags.date.head,
- meta_src.metadata_tags.date.added_to_site,
- meta_src.metadata_tags.date.available,
- meta_src.metadata_tags.date.created,
- meta_src.metadata_tags.date.issued,
- meta_src.metadata_tags.date.modified,
- meta_src.metadata_tags.date.published,
- meta_src.metadata_tags.date.valid,
- 'msgstr ""',
- meta_trn.metadata_tags.date.head,
- meta_trn.metadata_tags.date.added_to_site,
- meta_trn.metadata_tags.date.available,
- meta_trn.metadata_tags.date.created,
- meta_trn.metadata_tags.date.issued,
- meta_trn.metadata_tags.date.modified,
- meta_trn.metadata_tags.date.published,
- meta_trn.metadata_tags.date.valid,
- ]
- w << [
- "#. #{@po4a_identify_type} - processing, make instruction",
- "#: en/#{@md.fns}:#{SiSU_Po4aUtils::PotNumber.new.num}",
- 'msgid ""',
- meta_src.processing_tags.make.language,
- meta_src.processing_tags.make.headings,
- meta_src.processing_tags.make.num_top,
- meta_src.processing_tags.make.breaks,
- meta_src.processing_tags.make.emphasis,
- meta_src.processing_tags.make.bold,
- meta_src.processing_tags.make.italics,
- meta_src.processing_tags.make.texpdf_font,
- 'msgstr ""',
- meta_trn.processing_tags.make.language,
- meta_trn.processing_tags.make.headings,
- meta_trn.processing_tags.make.num_top,
- meta_trn.processing_tags.make.breaks,
- meta_trn.processing_tags.make.emphasis,
- meta_trn.processing_tags.make.bold,
- meta_trn.processing_tags.make.italics,
- meta_trn.processing_tags.make.texpdf_font,
- ]
- w.each do |y|
- z=''
- y.each do |x|
- if x
- z += x + "\n" if x =~/^#|^msg(?:id|str)/
- z += %{"#{x}"\n} if x =~/^@\S+?:(?: |$)/
- z += %{"#{x}"\n} if x =~/^\s+:\S+?: /
- end
- end
- @pot[:metadata] << z << @br
- #puts z unless z.empty?
- end
- end
- def pot_structure(desc,orig,trans,indent=0,hang=0)
- SiSU_Po4aUtils::Wrap.new(@md,orig,trans,desc,@wrap_width,indent,hang)
- end
- def pot_structure_heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- lv=n=n3=nil
- lv=dob_src.ln
- n=lv - 1
- n3=lv + 2
- util=nil
- fn=(dob_src.name=~/[a-z\d]/i) ? dob_src.name : ''
- mark="#{dob_src.lv}~#{fn} "
- d="#{dob_src.is.to_s} (level #{dob_src.lv})"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for headings is marker at the start of the line/object, indicating the heading level, and if provided an associated name tag, this heading is "#{mark}"}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig="#{s_mark}#{dob_src.obj}"
- trans=(dob_trn=='') ? '' : "#{s_mark}#{dob_trn.obj}"
- util=pot_structure(desc,orig,trans)
- wrapped=util.line_wrap
- @pot[:body] << wrapped << @br # main text, contents, body KEEP
- if @@endnotes[:para] \
- and notes_s.length > 0 \
- and not @@endnotes_
- @pot[:body] << @br
- wrap_endnotes(notes_s,notes_t)
- elsif @@endnotes[:para] \
- and @@endnotes_
- @pot[:body] << @br*2
- end
- end
- def pot_structure_para(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- util=nil
- wrapped=if dob_src.indent =~/[1-9]/ \
- and dob_src.indent == dob_src.hang
- s_mark=desc=orig=trans=''
- if dob_src.bullet_
- mark="_#{dob_src.indent}* "
- d="#{dob_src.is.to_s}: indent #{dob_src.indent}, bullet"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented bullet text is at the start of the line/object, an underscore followed by the indent level and an asterisk "#{mark}"}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- else
- mark="_#{dob_src.indent} "
- d="#{dob_src.is.to_s}: indent #{dob_src.indent}"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text is at the start of the line/object, an underscore followed by the indent level "#{mark}"}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- end
- orig="#{s_mark}#{dob_src.obj}"
- trans=(dob_trn=='') ? '' : "#{s_mark}#{dob_trn.obj}"
- util=pot_structure(desc,orig,trans)
- elsif dob_src.hang =~/[0-9]/ \
- and dob_src.indent != dob_src.hang
- s_mark=desc=orig=trans=''
- mark="_#{dob_src.hang}_#{dob_src.indent} "
- d="#{dob_src.is.to_s}: hang #{dob_src.hang} indent #{dob_src.indent}"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text with a first line indented to a different level from the rest of the paragraph, is at the start of the line/object, an underscore and the first indent level a second underscore and the indent level for the rest of the paragraph, "#{mark1}"}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig="#{s_mark}#{dob_src.obj}"
- trans=(dob_trn=='') ? '' : "#{s_mark}#{dob_trn.obj}"
- util=pot_structure(desc,orig,trans)
- else
- s_mark=desc=orig=trans=''
- if dob_src.bullet_
- mark='_* '
- d="#{dob_src.is.to_s}: bullet"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct=%{\n# markup for indented text is at the start of the line/object, an underscore followed by an asterisk "#{mark}"}
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig="#{s_mark}#{dob_src.obj}"
- trans=(dob_trn=='') ? '' : "#{s_mark}#{dob_trn.obj}"
- else
- mark=''
- d=dob_src.is.to_s
- instruct=%{\n# regular paragraph, no special markup}
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# "
- s_mark="\n# " + %{"\\n\\n#{mark}...\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- trans=(dob_trn=='') ? '' : dob_trn.obj
- end
- util=pot_structure(desc,orig,trans)
- end
- wrapped=util.line_wrap
- @pot[:body] << wrapped << @br # main text, contents, body KEEP
- if @@endnotes[:para] \
- and notes_s.length > 0 \
- and not @@endnotes_
- @pot[:body] << @br
- wrap_endnotes(notes_s,notes_t)
- elsif @@endnotes[:para] \
- and @@endnotes_
- @pot[:body] << @br*2
- end
- end
- def pot_structure_block(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- mark="block{\\n\\n...\\n\\n}block"
- d=dob_src.is.to_s
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# block text is a text block with an opening and closing marker, the content of which may be wrapped"
- s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- trans=(dob_trn=='') ? '' : dob_trn.obj
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_structure_group(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- mark="group{\\n\\n...\\n\\n}group"
- d=dob_src.is.to_s
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# group text is a text block with an opening and closing marker, the content of which may be wrapped"
- s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- trans=(dob_trn=='') ? '' : dob_trn.obj
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_structure_verse(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- mark="poem{\n\nverse\n\nverse\n\n...\n\n}poem"
- d=dob_src.is.to_s
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# verse are part of the text block described as a poem, the first verse is preceeded by an opening marker, and the last verse by a closing marker, the content of which should remain unwrapped"
- s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- trans=(dob_trn=='') ? '' : dob_trn.obj
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_structure_code(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- mark="code{\\n\\n...\\n\\n}code"
- d=dob_src.is.to_s
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# codeblocks are a text block with an opening and closing marker, the content of which should remain unwrapped"
- s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- trans=(dob_trn=='') ? '' : dob_trn.obj
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_structure_table(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document
- mark="table{\\n\\n...\\n\\n}table"
- d=dob_src.is.to_s
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# tables are a text block with an opening and closing marker, the content of which should remain unwrapped"
- s_mark="\n# " + %{"\\n\\n#{mark}\\n\\n"}
- end
- desc="#{d}#{s_mark}#{instruct}"
- orig=dob_src.obj
- orig=orig.gsub(/#{Mx[:tc_c]}/,"\n")
- trans=(dob_trn=='') ? '' : dob_trn.obj
- trans=trans.gsub(/#{Mx[:tc_c]}/,"\n")
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_structure_idx(dob_src='',dob_trn='') #% Used to extract the structure of a document
- mark="={ ... }"
- instruct=s_mark=''
- if @md.opt.act[:maintenance][:set]==:on
- instruct="\n# the book index should be attached unwrapped to the preceding text block (there should be a new line, but no empty line)"
- s_mark="\n# " + %{"\\n#{mark}\\n\\n"}
- end
- d='book-idx'
- desc="#{d}#{s_mark}#{instruct}"
- orig='={' + dob_src.idx + '}'
- trans=if defined? dob_trn.idx \
- and not dob_trn.idx.nil? \
- and not dob_trn.idx.empty?
- '={' + dob_trn.idx + '}'
- else ''
- end
- util=pot_structure(desc,orig,trans)
- unwrapped=util.no_line_wrap_block
- @pot[:body] << unwrapped << @br
- end
- def pot_markup(data_src,data_trn)
- #@endnotes,@copen,@pot_contents_close=Array.new(3){[]}
- a_l=if data_trn
- a_l=(data_src.length >= data_trn.length) \
- ? data_src.length
- : data_trn.length
- else
- data_src.length
- end
- s,t=0,0
- if @md.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/
- (data_trn.nil?) \
- ? pot_metadata_src
- : pot_metadata_src_trn
- end
- 0.upto(a_l-1) do |i|
- if data_trn
- unless data_src[s] \
- and data_trn[t]
- break
- end
- if data_src[s].of == :comment \
- and data_trn[t].of == :comment \
- and (data_src[s].is == data_trn[t].is)
- s+=1;t+=1
- next
- end
- if (data_src[s].is == :comment or data_trn[t].is == :comment) \
- and (data_src[s].is != data_trn[t].is)
- if data_src[s].is == :comment
- puts "src (comment):\n\t" + data_src[s].obj if @md.opt.act[:maintenance][:set]==:on
- s+=1
- #next if data_src[s].is == :comment
- elsif data_trn[t].is == :comment
- puts "trans (comment):\n\t" + data_trn[t].obj if @md.opt.act[:maintenance][:set]==:on
- t+=1
- #next if data_trn[t].is == :comment
- end
- end
- if (defined? data_src[s].ocn and data_src[s].ocn.is_a?(Fixnum)) \
- and (defined? data_trn[t].ocn and data_trn[t].ocn.is_a?(Fixnum)) \
- and (data_src[s].ocn == data_trn[t].ocn)
- @m_s,@m_t=s,t
- elsif (defined? data_src[s].ocn and data_src[s].ocn.is_a?(Fixnum)) \
- and (defined? data_trn[t].ocn and data_trn[t].ocn.is_a?(Fixnum)) \
- and (data_src[s].ocn != data_trn[t].ocn)
- p '--- OCN ---'
- p 'mis-match'
- p data_src[s].ocn
- p data_src[s].obj
- p data_trn[t].ocn
- p data_trn[t].obj
- p '---'
- p 'previous match'
- p data_src[@m_s].ocn
- p data_src[@m_s].obj
- p data_trn[@m_t].ocn
- p data_trn[@m_t].obj
- exit
- elsif (defined? data_src[s].ocn and defined? data_trn[t].ocn \
- and data_src[s].ocn.class != data_trn[t].ocn.class)
- p '--- OCN class ---'
- p 'mis-match'
- p data_src[s].ocn if defined? data_src[s].ocn
- p data_src[s].obj
- p data_trn[t].ocn if defined? data_trn[t].ocn
- p data_trn[t].obj
- #p '---'
- #p 'previous match'
- #p data_src[@m_s].ocn
- #p data_src[@m_s].obj
- #p data_trn[@m_t].ocn
- #p data_trn[@m_t].obj
- #elsif (defined? data_src[s].ocn != defined? data_trn[t].ocn) \
- #and (data_src[s].ocn.nil? != data_trn[t].ocn.nil?)
- # p '--- missing OCN? ---'
- # p 'mis-match'
- # p data_src[s].ocn if defined? data_src[s].ocn
- # p data_src[s].obj
- # p data_trn[t].ocn if defined? data_trn[t].ocn
- # p data_trn[t].obj
- else
- end
- end
- notes_s,notes_t='',''
- data_src[s],notes_s=markup(data_src[s])
- if data_trn
- data_trn[t],notes_t=markup(data_trn[t])
- #data_src[s],data_trn[t]=pot_data(data_src[s],notes_s,data_trn[t],notes_t)
- pot_data(data_src[s],notes_s,data_trn[t],notes_t)
- else
- #data_src[s],nul=pot_data(data_src[s],notes_s)
- pot_data(data_src[s],notes_s)
- end
- s+=1;t+=1
- end
- @pot #watch
- end
- def pot_data(dob_src='',notes_s='',dob_trn='',notes_t='')
- if dob_src.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
- if defined? dob_src.ocn \
- and dob_src.ocn.to_s =~/\d+/
- paranum=dob_src.ocn.to_s
- @p_num=SiSU_Po4aUtils::ParagraphNumber.new(paranum)
- end
- case dob_src.is
- when :heading then pot_structure_heading(dob_src,notes_s,dob_trn,notes_t)
- when :para then pot_structure_para(dob_src,notes_s,dob_trn,notes_t)
- when :group then pot_structure_group(dob_src,notes_s,dob_trn,notes_t)
- when :block then pot_structure_block(dob_src,notes_s,dob_trn,notes_t)
- when :verse then pot_structure_verse(dob_src,notes_s,dob_trn,notes_t)
- when :code then pot_structure_code(dob_src,notes_s,dob_trn,notes_t)
- when :table then pot_structure_table(dob_src,notes_s,dob_trn,notes_t)
- end
- if defined? dob_src.idx \
- and not dob_src.idx.nil? \
- and not dob_src.idx.empty?
- pot_structure_idx(dob_src,dob_trn)
- end
- dob_src='' if (dob_src.obj =~/<a name="n\d+">/ \
- and dob_src.obj =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/) # -endnote
- if dob_src ## Clean Prepared Text
- dob_src.obj=dob_src.obj.gsub(/<!.+!>/,' ').
- gsub(/<:\S+>/,' ') if dob_src ## Clean Prepared Text
- end
- end
- #[dob_src,dob_trn]
- end
- def markup(dob) # Used for major markup instructions
- SiSU_Env::InfoEnv.new(@md.fns)
- dob.obj=dob.obj.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,
- "#{Px[:po_bold_o]}\\1#{Px[:po_bold_c]}").
- gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,
- "#{Px[:po_italics_o]}\\1#{Px[:po_italics_c]}").
- gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,
- "#{Px[:po_underscore_o]}\\1#{Px[:po_underscore_c]}").
- gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,
- "#{Px[:po_subscript_o]}\\1#{Px[:po_subscript_c]}").
- gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,
- "#{Px[:po_superscript_o]}\\1#{Px[:po_superscript_c]}").
- gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,
- "#{Px[:po_insert_o]}\\1#{Px[:po_insert_c]}").
- gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,
- "#{Px[:po_cite_o]}\\1#{Px[:po_cite_c]}").
- gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,
- "#{Px[:po_strike_o]}\\1#{Px[:po_strike_c]}").
- gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,
- "#{Px[:po_monospace_o]}\\1#{Px[:po_monospace_c]}")
- notes=''
- unless dob.is==:code
- dob.obj=dob.obj.gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/,'\1').
- gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
- gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1 [link: <\2>]').
- gsub(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}image/,'\1 [link: local image]').
- gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1')
- notes=extract_endnotes(dob)
- #% ### footnotes current state - extracted
- dob.obj=dob.obj.gsub(/#{Mx[:en_a_o]}([\d]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'~^'). # endnote marker marked up
- #% ### footnotes current state - keep inline
- #dob.obj.gsub!(/#{Mx[:en_a_o]}[\d]+\s+(.+?)#{Mx[:en_a_c]}/,'~{ \1 }~') # inline endnote with marker marked up
- gsub(/#{Mx[:en_b_o]}[\d]+\s+(.+?)#{Mx[:en_b_c]}/,'~[ \1 ]~'). # inline endnote with marker marked up
- gsub(/#{Mx[:en_a_o]}([*+]+)\s+(.+?)#{Mx[:en_a_c]}/,'~{\1 \2 }~'). # inline endnote with marker marked up
- gsub(/#{Mx[:en_b_o]}([*+]+)\s+(.+?)#{Mx[:en_b_c]}/,'~[\1 \2 ]~'). # inline endnote with marker marked up
- gsub(/#{Mx[:gl_o]}(?:#lt|#060)#{Mx[:gl_c]}/,'<').
- gsub(/#{Mx[:gl_o]}(?:#gt|#062)#{Mx[:gl_c]}/,'>').
- gsub(/#{Mx[:gl_o]}#(?:038|amp)#{Mx[:gl_c]}/,'&').
- gsub(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!').
- gsub(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#').
- gsub(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*').
- gsub(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-').
- gsub(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/').
- gsub(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_').
- gsub(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{').
- gsub(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}').
- gsub(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~').
- gsub(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©')
- end
- dob.obj=if dob.of==:block # watch
- dob.obj.gsub(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/,"* ").
- gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n")
- else dob.obj.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,"\n\n")
- end
- if dob.is==:code
- dob.obj=dob.obj.gsub(/(^|[^}])_([<>])/m,'\1\2'). # _> _<
- gsub(/(^|[^}])_([<>])/m,'\1\2') # _<_<
- end
- dob.obj=dob.obj.gsub(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,''). # remove page breaks
- gsub(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1').
- 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[:lnk_o]}(\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+?\.(?:png|jpg|gif)) .+?#{Mx[:lnk_c]}image/,' [ \1 ]'). #"[ #{dir.url.images_local}\/\\1 ]")
- gsub(/(?:^|[^_\\])\{\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*\}\S+/,'[image: "\1"]')
- [dob,notes]
- end
- def publish(fn,pot)
- content=[]
- content << pot[:open]
- content << pot[:head]
- content << pot[:metadata]
- content << pot[:body]
- content << @@endnotes[:end] if @@endnotes_
- Output.new(fn,content,@md).po4a
- @@endnotes={ para: [], end: [] }
- end
- end
- class Output <Source
- include SiSU_Param
- include SiSU_Env
- def initialize(fn,content,md)
- @fn,@content,@md=fn,content,md
- @file=SiSU_Env::FileOp.new(md,fn)
- end
- def po4a #%pot output
- file_pot=(@md.opt.f_pth[:lng] ==@md.opt.lng_base) \
- ? @file.write_file.pot
- : @file.write_file.po
- @sisu=[]
- emptyline=0
- @content.each do |para| # this is a hack
- if para.is_a?(Array) \
- and para.length > 0
- para.each do |line|
- if line
- line=line.gsub(/\s+$/m,'').
- gsub(/^\A[ ]*\Z/m,'')
- if line=~/^\A[ ]*\Z/m
- emptyline+=1
- else emptyline=0
- end
- file_pot.puts line if emptyline < 2 #remove extra line spaces (fix upstream)
- end
- end
- else file_pot.puts para #unix plaintext # /^([*=-]|\.){5}/
- end
- end
- file_pot.close
- SiSU_Po4aUtils::PotNumber.new.reset
- po4a_git
- end
- def po4a_git
- unless @md.opt.act[:maintenance][:set]==:on
- require_relative 'git' # git.rb
- git=SiSU_Git::Source.new(@md.opt)
- git.create_file_structure_git unless FileTest.directory?(@file.output_path.pot_git.dir)
- if @md.opt.f_pth[:lng] ==@md.opt.lng_base
- FileUtils::cp(@file.place_file.pot.dir, @file.output_path.pot_git.dir)
- else # naive, work on -->
- FileUtils::cp(@file.place_file.po.dir, @file.output_path.po_git.dir) #unless FileTest.file?(@file.place_file.po_git.dir)
- end
- git.read
- end
- end
- end
- end
-end
-__END__
-&#033;\|&#035;\|&&#042;\|&#045;\|&#047;\|&#095;\|&#123;\|&#125;\|&#126;\|&#
-
-tables are problematic, difficult to reconstitute instruction, check
-
-metadata, move to top? and work on
-
-footnotes, different types, asterisk, also do you want to have separate
-paragraphs, or breaks within one block?
-
-where no ocn appropriately use ~# or -# or indeed 1~name-
-
-comments in document, what to do about them, not sure they are currently
-retained in dal, could be quite valuable to keep
diff --git a/lib/sisu/v6/se_clear.rb b/lib/sisu/v6/se_clear.rb
deleted file mode 100644
index 7eab9765..00000000
--- a/lib/sisu/v6/se_clear.rb
+++ /dev/null
@@ -1,109 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_clear.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Clear
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- require_relative 'se_info_env' # se_info_env.rb
- begin
- require 'singleton'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('singleton NOT FOUND (LoadError)')
- end
- class Clear < SiSU_Info_Env::InfoEnv # se_info_env.rb
- #todo unify with FileOp
- def initialize(cmd,fns,operation='')
- @cmd=cmd
- begin
- super(fns)
- @env=SiSU_Env::InfoEnv.new(fns)
- SiSU_Env::InfoVersion.instance
- if operation.class.inspect =~/SiSU_Param/
- @md=operation
- end
- case operation #watch
- when /pdf/ then @env_out=''
- when /sql/
- when /xml|plaintext|ascii/ then @env_out=@env.path.output + @fnb #check change of name to plaintext from ascii
- else
- if defined? @md.sfx_src \
- and @md.sfx_src =~/ss[ftsumc]/
- @env_out_root=@env.path.output
- @env_out="#{@env.path.output}/#{@fnb}"
- @@publisher='SiSU http://www.jus.uio.no/sisu'
- @env_pdf="#{@env_out_root}/pdf"
- end
- end
- rescue
- SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue do
- __LINE__.to_s + ':' + __FILE__
- end
- ensure
- end
- end
- def param_instantiate
- @cX||=SiSU_Screen::Ansi.new(@cmd)
- @@date=SiSU_Env::InfoDate.new
- @@proc=@@filename_txt=@@filename_texinfo=@@filename_lout_portrait=@@filename_lout_landscape=@@filename_html_scroll=@@filename_html_index=@@filename_html_segtoc=@@filename_semantic=@@filename_rss=@@newfile=@@drr=@@yaml=@@yamladdr=nil
- @@publisher='SiSU scribe'
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/se_date.rb b/lib/sisu/v6/se_date.rb
deleted file mode 100644
index 31446a60..00000000
--- a/lib/sisu/v6/se_date.rb
+++ /dev/null
@@ -1,95 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_date.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Info_Date
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- class InfoDate
- begin
- require 'date'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('date NOT FOUND (LoadError)')
- end
- attr_accessor :dt,:t
- def initialize
- @dt,@t=Date.today.to_s,Time.now
- end
- def week
- w=@t.strftime('%W')
- "#{@t.year}w#{w}"
- end
- def month
- "#{@t.year}#{@t.month}"
- end
- def year
- @t.year
- end
- def weekonly
- @t.strftime('%W')
- end
- def monthonly
- @t.month
- end
- def year_static
- YEAR
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/se_info_port.rb b/lib/sisu/v6/se_info_port.rb
deleted file mode 100644
index ccd75bd2..00000000
--- a/lib/sisu/v6/se_info_port.rb
+++ /dev/null
@@ -1,73 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_info_port.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Info_Port
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- require_relative 'se_info_env' # se_info_env.rb
- class InfoPort < SiSU_Info_Env::InfoEnv # se_info_env.rb
- def initialize
- @env=SiSU_Env::InfoEnv.new
- end
- def webrick
- @env.port.webrick_port
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/se_load.rb b/lib/sisu/v6/se_load.rb
deleted file mode 100644
index 238930dd..00000000
--- a/lib/sisu/v6/se_load.rb
+++ /dev/null
@@ -1,111 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/se_load.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: system environment, resource control and configuration details
-
-=end
-module SiSU_Load
- require_relative 'constants' # constants.rb
- require_relative 'utils' # utils.rb
- class Load
- def initialize(prog,mandatory=false)
- @prog,@mandatory=prog,mandatory
- end
- def prog
- load_prog=false
- $:.each do |reqpath|
- if FileTest.exist?("#{reqpath}/#{@prog}.rb")
- load_prog=true
- #SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).ok("#{reqpath}/#{@prog}.rb loaded")
- break
- #else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{reqpath}/#{@prog}.rb not found")
- end
- end
- if load_prog \
- and @prog=~/dbi/
- begin
- require 'dbi'
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('dbi NOT FOUND (LoadError)')
- end
- end
- if load_prog
- begin
- require @prog
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error("#{@prog} NOT FOUND (LoadError)")
- end
- else
- @mandatory \
- ? (SiSU_Screen::Ansi.new(@prog,"*WARN* module required: #{@prog}").warn)
- : '' #(SiSU_Screen::Ansi.new(@prog,"*WARN* #{@prog} load requested").warn)
- end
- load_prog
- end
- def prog?
- load_prog=false
- $:.each do |reqpath|
- if FileTest.exist?("#{reqpath}/#{@prog}.rb"); load_prog=true
- break
- end
- end
- load_prog
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/src_kdissert_share.rb b/lib/sisu/v6/src_kdissert_share.rb
deleted file mode 100644
index 7b70344f..00000000
--- a/lib/sisu/v6/src_kdissert_share.rb
+++ /dev/null
@@ -1,105 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_share_kdissert.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: share sisu source markup file, copy it to output directory!
-
-=end
-module SiSU_KdiSource
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source
- begin
- require 'fileutils'
- include FileUtils
- rescue LoadError
- SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).
- error('fileutils NOT FOUND (LoadError)')
- end
- def initialize(opt)
- @opt=opt
- @env=SiSU_Env::InfoEnv.new(@opt.fns)
- @output_path="#{@env.path.output}/#{@opt.fnb}"
- end
- def read
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Share Kdissert Source Document!',
- @opt.fnb
- ).green_hi_blue unless @opt.act[:quiet][:set]==:on
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Copy kdissert file to output directory",
- "#{@opt.fnb} -> #{@output_path}"
- ).warn unless @opt.act[:quiet][:set]==:on
- FileUtils::mkdir_p(@env.path.output) unless FileTest.directory?(@env.path.output)
- FileUtils::mkdir_p(@output_path) unless FileTest.directory?(@output_path)
- if FileTest.directory?(@output_path)
- if @opt.fns =~/\.kdi\._sst$/ \
- and FileTest.file?(@opt.fnb)
- FileUtils::cp(@opt.fnb,@output_path)
- end
- else
- SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Output directory does not exist",
- "#{@opt.fnb} -> #{@output_path}"
- ).warn unless @opt.act[:quiet][:set]==:on
- exit
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/src_share.rb b/lib/sisu/v6/src_share.rb
deleted file mode 100644
index 6bd76bb9..00000000
--- a/lib/sisu/v6/src_share.rb
+++ /dev/null
@@ -1,112 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/src_share.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: share sisu source markup file, copy it to output directory!
-
-=end
-module SiSU_Markup
- require_relative 'src_shared' # src_shared.rb
- include SiSU_Source
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source < SiSU_Source::SiSUpodSource
- def initialize(opt,build=nil,place=nil)
- super(opt,build,place)
- @opt=opt
- end
- def read
- unless @opt.act[:quiet][:set]==:on
- (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on) \
- ? SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'Share document markup text source',
- @opt.fns
- ).cyan_hi_blue
- : SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- '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.act[:maintenance][:set]==:on) \
- ? '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
- if (@opt.act[:verbose][:set]==:on \
- || @opt.act[:verbose_plus][:set]==:on \
- || @opt.act[:maintenance][:set]==:on)
- SiSU_Screen::Ansi.new(
- '',
- "#{@opt.fno} not available"
- ).blue_tab
- end
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/utils_response.rb b/lib/sisu/v6/utils_response.rb
deleted file mode 100644
index 0e10f66c..00000000
--- a/lib/sisu/v6/utils_response.rb
+++ /dev/null
@@ -1,76 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_response.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: Request response
-
-=end
-module SiSU_Response
- class Response
- def response?(ask) #move to more appropriate directory later
- response='redo'
- print ask + " ['yes', 'no' or 'quit']: "
- response=File.new('/dev/tty').gets.strip
- ans=if response=='yes' then true
- elsif response=='no' then false
- elsif response =~/^quit|exit$/ then exit
- else puts "[please type: 'yes', 'no' or 'quit']"
- response?(ask)
- end
- ans
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/utils_spell.rb b/lib/sisu/v6/utils_spell.rb
deleted file mode 100644
index 0e5d8158..00000000
--- a/lib/sisu/v6/utils_spell.rb
+++ /dev/null
@@ -1,102 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/utils_spell.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: spellchecking
-
-=end
-module SiSU_SpellUtility
- class Spell
- def initialize(input,filesrc,flg)
- @flg=flg
- @filename, @filetype = /(.+?)(\.\w\w\w0$)/.match(filesrc)[1,2] #.gsub(/\.\w\w\w0$/, "")
- @input=input
- @allwords=[]
- puts @filename
- @speller='aspell' # 'ispell'
- @dictionary='british'
- @lang='en_GB'
- end
- def check
- @input.each do |data|
- data=data.gsub(/(https?|www|ftp|gopher|png|jpg|gif|html|htm)\S+/i,' ').
- gsub(/(&nbsp;|#{Mx[:nbsp]})/i,' ').
- gsub(/<\/?(table|tr|td|b|p|href).*?>/i,' ').
- gsub(/(<==.+|<:\S+>|<!.+?!>|^@\S+?:.+|\{\{\{|~)/,' ').
- gsub(/(["|<>)(\n'`.;&_-]|\=)/,' ').
- gsub(/\b(altExternal|
- target|externalimg|
- srcimagebext|
- img|src|toc|pdf|
- cd|org|
- helvetica|roman
- )\b/i,' ').
- gsub(/EOF/,'')
- @words=data.scan(/\S+/)
- @words.each { |y| @allwords << y }
- end
- @allwords=@allwords.uniq
- if @flg =~ /S/
- File.open('/home/ralph/spell_error','a+') do |file| #fix
- file.puts %{\n\n<<#{@filename}>>}
- end
- @allwords.each { |y| puts y.inspect; system(%{cat #{y} | /usr/bin/#{@speller} -l -d #{@dictionary} >> ~/spell_error })}
- else
- @allwords.each { |y| sp=%x{echo #{y}|#{@speller} -l }; puts sp unless sp.empty?}
- end
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/xhtml_shared.rb b/lib/sisu/v6/xhtml_shared.rb
deleted file mode 100644
index c324474f..00000000
--- a/lib/sisu/v6/xhtml_shared.rb
+++ /dev/null
@@ -1,65 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_shared.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_XHTML_Shared
- require_relative 'xhtml_table' # xhtml_table.rb
- class TableXHTML < SiSU_XHTML_Table::TableXHTML
- end
-end
-__END__
diff --git a/lib/sisu/v6/xhtml_table.rb b/lib/sisu/v6/xhtml_table.rb
deleted file mode 100644
index 8df539aa..00000000
--- a/lib/sisu/v6/xhtml_table.rb
+++ /dev/null
@@ -1,101 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/xhtml_table.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: shared html parts
-
-=end
-module SiSU_XHTML_Table
- require_relative 'xhtml_parts' # xhtml_parts.rb
- class TableXHTML
- include SiSU_Parts_XHTML
- @@tablehead=0
- @@tablefoot=[] #watch
- def initialize(table)
- @table_obj=table
- end
- def table
- table_obj=@table_obj
- if table_obj.obj !~/^<table\s/m
- table_obj=table_rows_and_columns_array(table_obj)
- else p __LINE__; p caller
- end
- table_obj
- end
- def table_rows_and_columns_array(table_obj) # provides basic (x)html table
- table_rows,nr=[],0
- table_obj.obj.split(Mx[:tc_c]).each do |table_row|
- table_row_with_columns=table_row.split(Mx[:tc_p])
- trc,nc=[],0
- table_row_with_columns.each do |c|
- c=c.gsub(/^~$/,''). # tilde / empty cell
- gsub(/<:br>/,the_line_break)
- trc <<= if table_obj.head_ and nr==0; %{<th width="#{table_obj.widths[nc]}%">#{c}</th>}
- else %{<td width="#{table_obj.widths[nc]}%">#{c}</td>}
- end
- nc+=1
- end
- trc=(trc.is_a?(Array)) ? trc.flatten.join : trc
- trc=" <tr>#{trc}</tr>\n"
- nr+=1
- table_rows << trc
- end
- table_rows=table_rows.flatten.join
- table_obj.obj=%{<table summary="normal text css" width="100%" border="0" bgcolor="white" cellpadding="2" align="center">\n#{table_rows} </table>}
- table_obj
- end
- end
-end
-__END__
diff --git a/lib/sisu/v6/zap.rb b/lib/sisu/v6/zap.rb
deleted file mode 100644
index c99eab77..00000000
--- a/lib/sisu/v6/zap.rb
+++ /dev/null
@@ -1,93 +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, 2014 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>
-
- * Git
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
- <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/v6/zap.rb;hb=HEAD>
-
- * Ralph Amissah
- <ralph@amissah.com>
- <ralph.amissah@gmail.com>
-
- ** Description: zap wipe clean previous output of the type specified
-
-=end
-module SiSU_Zap
- require_relative 'se' # se.rb
- include SiSU_Env
- class Source
- def initialize(opt)
- @opt=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')
- unless @opt.act[:quiet][:set]==:on
- tell=SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "Clean files related to processing #{@opt.selections.str} ->",
- "#{@opt.fns} -> #{zap_path}"
- )
- tell.warn
- end
- z.zap.remove_output
- else
- unless @opt.act[:quiet][:set]==:on
- tell=SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- 'use of -Z (zap) has not enabled in sisurc.yml'
- )
- tell.warn
- end
- end
- end
- end
-end
-__END__
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index e0f63624..ee8890c9 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -2373,6 +2373,148 @@ page (break) line across page (dividing paragraphs):
-..-
.fi
+.SH BIBLIOGRAPHY / REFERENCES
+
+
+.BR
+There are three ways to prepare a bibliography using sisu: (i) manually
+preparing and marking up as regular text in sisu a list of references; (ii)
+(tagging citations for inclusion) using a restricted form for citations and
+marking them up to identify them as such (which sisu then parses and attempts
+to build a bibliography from), or; (iii) preparing a bibliography, using
+metadata tags for author: title: year: and the like, including an id: and
+shortname: the id can be inserted in footnotes in place of the citation, and it
+will be substituted there by the short title for the work.
+
+.BR
+For the heading/section sequence: endnotes, bibliography then book index to
+occur, the name biblio or bibliography must be given to the bibliography
+section, like so:
+.nf
+1~biblio Bibliography
+.fi
+
+.SH A MARKUP TAGGED METADATA BIBLIOGRAPHY SECTION
+
+
+.BR
+Here instead of writing your full citations directly in footnotes, each time
+you have new material to cite, you add it to your bibliography section (if it
+has not been added yet) providing the information you need against an available
+list of tags. At the time of writing, for articles: au|author; ti|title;
+lng|language; jo|journal; vo|volume; edr|editor; yr|year; pst|publisher_state;
+url; note; sn|shortname; id; and
+for books: au|author; ti|title; st|subtitle; lng|language; pb|publisher;
+edn|edition; yr|year; pst|publisher_state; url; note; sn|shortname; id.
+
+.BR
+The required tags are au: ti: and year: [^10] an short quick example might be
+as follows:
+.nf
+1~biblio Bibliography
+
+au: von Hippel, E.
+ti: Perspective: User Toolkits for Innovation
+lng: (language)
+jo: Journal of Product Innovation Management
+vo: 18
+edr: (editor)
+yr: 2001
+note:
+sn: Hippel, /{User Toolkits}/ (2001)
+id: vHippel_2001
+% form:
+
+au: Benkler, Yochai
+ti: The Wealth of Networks
+st: How Social Production Transforms Markets and Freedom
+lng: (language)
+pb: Harvard University Press
+edn: (edition)
+yr: 2006
+pst: U.S.
+url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
+note:
+sn: Benkler, /{Wealth of Networks}/ (2006)
+id: Benkler2006
+
+au: Quixote, Don; Panza, Sancho
+ti: Taming Windmills, Keeping True
+jo: Imaginary Journal
+yr: 1605
+url: https://en.wikipedia.org/wiki/Don_Quixote
+note: made up to provide an example of author markup for an article with two authors
+sn: Quixote and Panza, /{Taming Windmills}/ (1605)
+id: quixote1605
+.fi
+
+
+.BR
+Note that the section name biblio (or bibliography) is required for the
+bibliography to be recognized as such, parsed correctly, and placed after the
+auto-generated endnote section.
+
+.BR
+Using this method, work goes into preparing the bibliography, which will be
+automatically sorted by surname and presented, under the References or
+Bibliography section using the format for books:
+
+.BR
+ number, author (firstname & initials, surname), fulltitle, publisher, year,
+ url (if any)
+
+.BR
+and for articles:
+
+.BR
+ number, author (firstname & initials, surname), title, journal, volume, year,
+ url (if any)
+
+.BR
+The metadata tags may include shortname and id, if provided, every time the
+given id is found within the text it will be replaced by the given short title
+of the work (it is for this reason the short title has sisu markup to italicize
+the title), it should work with any page numbers to be added, the short title
+should be one that can easily be used to look up the full description in the
+bibliography.
+.nf
+The following footnote~{ quixote1605, pp 1000 - 1001, also Benkler2006 p 1. }~
+.fi
+
+
+.BR
+would be presented as:
+
+.BR
+Quixote and Panza,
+.I Taming Windmills
+(1605), pp 1000 - 1001 also, Benkler,
+.I Wealth of Networks,
+(2006) p 1 or rather[^11]
+.SH TAGGING CITATIONS FOR INCLUSION IN THE BIBLIOGRAPHY
+
+
+.BR
+Here whenever you make a citation that you wish be included in the
+bibliography, you tag the citation as such using special delimiters (which are
+subsequently removed from the final text produced by sisu)
+
+.BR
+Here you would write something like the following, either in regular text or a
+footnote
+.nf
+See .: Quixote, Don; Panza, Sancho /{Taming Windmills, Keeping True}/ (1605) :.
+.fi
+
+
+.BR
+
+.B SiSU
+will parse for a number of patterns within the delimiters to try make out the
+authors, title, date etc. and from that create a Bibliography. This is more
+limited than the previously described method of preparing a tagged
+bibliography, and using an id within text to identify the work, which also
+lends itself to greater consistency.
.SH BOOK INDEX
@@ -2582,7 +2724,7 @@ contain other documents.
.BR
Note: a secondary file of the composite document is built prior to processing
-with the same prefix and the suffix ._sst [^10]
+with the same prefix and the suffix ._sst [^12]
.SH SISU INSERT FILES (.SSI)
@@ -2782,7 +2924,7 @@ The default homepage may use homepage.css or html. css
.BR
Under consideration is to permit the placement of a CSS file with a different
-name in directory _sisu/css directory or equivalent.[^11]
+name in directory _sisu/css directory or equivalent.[^13]
.SH ORGANISING CONTENT - DIRECTORY STRUCTURE AND MAPPING
@@ -3281,9 +3423,9 @@ formats.
.B SiSU
feeds sisu markupd documents into sql type databases
.I PostgreSQL
-[^12] and/or
+[^14] and/or
.I SQLite
-[^13] database together with information related to document structure.
+[^15] database together with information related to document structure.
.BR
This is one of the more interesting output forms, as all the structural data of
@@ -3553,10 +3695,10 @@ INCLUDING OBJECT CITATION NUMBERING (BACKEND CURRENTLY POSTGRESQL)
.BR
-Sample search frontend <http://search.sisudoc.org> [^14] A small database and
+Sample search frontend <http://search.sisudoc.org> [^16] A small database and
sample query front-end (search from) that makes use of the citation system, .I
object citation numbering
-to demonstrates functionality.[^15]
+to demonstrates functionality.[^17]
.BR
@@ -3581,7 +3723,7 @@ 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.[^16]
+meet the search criteria.[^18]
.TP
.B sisu -F --webserv-webrick
builds a cgi web search frontend for the database created
@@ -3971,6 +4113,16 @@ Table from the Wealth of Networks by Yochai Benkler
.BR
.TP
.BI 10.
+for which you may alternatively use the full form author: title: and year:
+
+.BR
+.TP
+.BI 11.
+Quixote and Panza, Taming Windmills (1605), pp 1000 - 1001 also, Benkler, Wealth of Networks (2006), p 1
+
+.BR
+.TP
+.BI 12.
\.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
@@ -3979,37 +4131,37 @@ appropriate suffix to use.
.BR
.TP
-.BI 11.
+.BI 13.
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.
.BR
.TP
-.BI 12.
+.BI 14.
<http://www.postgresql.org/> <http://advocacy.postgresql.org/>
<http://en.wikipedia.org/wiki/Postgresql>
.BR
.TP
-.BI 13.
+.BI 15.
<http://www.hwaci.com/sw/sqlite/> <http://en.wikipedia.org/wiki/Sqlite>
.BR
.TP
-.BI 14.
+.BI 16.
<http://search.sisudoc.org>
.BR
.TP
-.BI 15.
+.BI 17.
(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.
.BR
.TP
-.BI 16.
+.BI 18.
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
diff --git a/qi b/qi
index 6bfddf62..ef67bbf6 100755
--- a/qi
+++ b/qi
@@ -1,41 +1,20 @@
#!/usr/bin/env ruby
=begin
- Common Rakefile, Rantfile installer for SiSU
- softlink Rakefile and Rantfile to this file
- * Homepage: <http://www.jus.uio.no/sisu/SiSU>
- <http://search.sisudoc.org>
- * Download: <http://www.jus.uio.no/sisu/download>
-
- Copyright (C) 2007 Ralph Amissah
-
- * License: LGPL - GNU Lesser General Public License
- [same license as Rant provided within the Rant package]
+** Description:
- * Ralph Amissah <ralph@amissah.com>
- Ralph Amissah <ralph.amissah@gmail.com>
-
- Rake is a Ruby build program by Jim Weirich
- * Rake may be downloaded and installed from:
- <http://rake.rubyforge.org/>
+** Homepage: <http://www.jus.uio.no/sisu/SiSU>
+ <http://search.sisudoc.org>
+** Download: <http://www.jus.uio.no/sisu/download>
- Rant is a Ruby build program by Stefan Lang
- * Rant may be downloaded and installed from:
- <http://make.rubyforge.org/>
+** Copyright: (C) 2007 - 2015 Ralph Amissah
- Notes on use:
- [if rake is preferred and installed]
- rake -T
- [if rant is preferred and installed]
- rant -T
+** License:
- SiSU can also be Setup/Installation using:
- * Minero Aoki's setup.rb, provided along with SiSU, or
+** Ralph Amissah <ralph@amissah.com>
+ Ralph Amissah <ralph.amissah@gmail.com>
=end
-#%% produce a makefile suitable for the target platform
-#require 'mkmf'
-#create_makefile("sisu")
#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
begin
require 'thor'
@@ -59,7 +38,7 @@ require 'yaml'
module SiSUconf
class Configure < Thor
class_option :verbose, :type => :boolean
- desc 'setup --all --bin --lib --conf --data --alt',
+ desc 'setup --all --bin --lib --conf --data --alt --dryrun',
'setup sisu'
options \
:all => :boolean,
@@ -70,7 +49,9 @@ module SiSUconf
:share => :boolean,
:man => :boolean,
:vim => :boolean,
- :alt => :boolean
+ :alt => :boolean,
+ :dryrun => :boolean,
+ :is => :boolean
def setup
unless options.length >= 1 \
and not (options[:bin] \
@@ -82,73 +63,118 @@ module SiSUconf
or options[:vim])
puts 'setup --all --bin --lib --conf --data --share --man --vim'
end
+ act=(options[:dryrun]) ? (:dryrun) : (:action)
+ if options[:is]
+ puts Version_info.version_number_info_stable
+ puts Version_info.version_number_info_unstable
+ end
if not options[:alt]
if options[:all] \
or options[:bin]
exclude_files=['sisugem']
- Install.setup_find_create('bin',Project_details.dir.bin,exclude_files) \
- if File.directory?('bin')
+ Install.setup_find_create(
+ 'bin',
+ Project_details.dir.bin,
+ exclude_files,
+ act
+ ) if File.directory?('bin')
end
if options[:all] \
or options[:lib]
- Install.setup_find_create('lib',Project_details.dir.lib) \
- if File.directory?('lib')
+ Install.setup_find_create(
+ 'lib',
+ Project_details.dir.lib,
+ act
+ ) if File.directory?('lib')
end
if options[:all] \
or options[:conf]
- Install.setup_find_create('conf',Project_details.dir.conf) \
- if File.directory?('conf')
+ Install.setup_find_create(
+ 'conf',
+ Project_details.dir.conf,
+ act
+ ) if File.directory?('conf')
end
if options[:all] \
or options[:data]
- Install.setup_find_create('data',Project_details.dir.data) \
- if File.directory?('data')
+ Install.setup_find_create(
+ 'data',
+ Project_details.dir.data,
+ act
+ ) if File.directory?('data')
end
if options[:all] \
or options[:share]
- Install.setup_find_create('data/sisu',Project_details.dir.share) \
- if File.directory?('data/sisu')
+ Install.setup_find_create(
+ 'data/sisu',
+ Project_details.dir.share,
+ act
+ ) if File.directory?('data/sisu')
end
if options[:all] \
or options[:man]
- Install.setup_find_create('man',Project_details.dir.man) \
- if File.directory?('man')
+ Install.setup_find_create(
+ 'man',
+ Project_details.dir.man,
+ act
+ ) if File.directory?('man')
end
if options[:all] \
or options[:vim]
- Install.setup_find_create('data/vim',Project_details.dir.vim) \
- if File.directory?('data/vim')
+ Install.setup_find_create(
+ 'data/vim',
+ Project_details.dir.vim,
+ act
+ ) if File.directory?('data/vim')
end
else
if options[:all] \
or options[:bin]
- Install.setup_find_cp_r('bin',Project_details.dir.bin) \
- if File.directory?('bin')
+ Install.setup_find_cp_r(
+ 'bin',
+ Project_details.dir.bin,
+ act
+ ) if File.directory?('bin')
end
if options[:all] \
or options[:bin]
- Install.setup_find_cp_r('lib',Project_details.dir.lib) \
- if File.directory?('lib')
+ Install.setup_find_cp_r(
+ 'lib',
+ Project_details.dir.lib,
+ act
+ ) if File.directory?('lib')
end
if options[:all] \
or options[:conf]
- Install.setup_find_cp_r('conf',Project_details.dir.conf) \
- if File.directory?('conf')
+ Install.setup_find_cp_r(
+ 'conf',
+ Project_details.dir.conf,
+ act
+ ) if File.directory?('conf')
end
if options[:all] \
or options[:data]
- Install.setup_find_cp_r('data',Project_details.dir.data) \
- if File.directory?('data')
+ Install.setup_find_cp_r(
+ 'data',
+ Project_details.dir.data,
+ act
+ ) if File.directory?('data')
end
if options[:all] \
or options[:share]
- Install.setup_find_cp_r('data/sisu',Project_details.dir.share) \
- if File.directory?('data/sisu') #
+ Install.setup_find_cp_r(
+ 'data/sisu',
+ Project_details.dir.share,
+ act
+ ) if File.directory?('data/sisu') #
end
if options[:all] \
or options[:man]
- Install.setup_find_cp_r('man',Project_details.dir.man) \
- if File.directory?('man')
+ Install.setup_find_cp_r(
+ 'man',
+ Project_details.dir.man,
+ act
+ ) if File.directory?('man')
end
#if options[:all] \
#or options[:vim]
@@ -164,9 +190,13 @@ module SiSUconf
:unstable => :boolean,
:create => :boolean,
:build => :boolean,
- :install => :boolean
+ :install => :boolean,
+ :is => :boolean
def gem
if options[:unstable]
+ if options[:is]
+ puts Version_info.version_number_info_unstable
+ end
if options[:create]
Gemspecs::Current.create_unstable
#Gemspecs::Next.create_unstable
@@ -188,6 +218,9 @@ module SiSUconf
end
if options[:stable] \
or not options[:unstable]
+ if options[:is]
+ puts Version_info.version_number_info_stable
+ end
if options[:create]
Gemspecs::Current.create_stable
#Gemspecs::Current.create_unstable
@@ -212,19 +245,35 @@ module SiSUconf
end
end
desc 'pkg',
- 'package maintenance tasks, of no general interest (maintainer specific for package maintainer\'s convenience)'
+ 'package maintenance tasks, ' \
+ + 'of no general interest ' \
+ + '(maintainer specific for package maintainer\'s convenience)'
options \
- :update_version=> :boolean,
- :tip => :boolean
+ :open_version=> :boolean,
+ :version_and_tag_for_release=> :boolean,
+ :tip => :boolean,
+ :is => :boolean
def pkg
+ if options[:is]
+ puts Version_info.version_number_info_stable
+ puts Version_info.version_number_info_unstable
+ end
if options[:tip]
Package.sequence
end
- if options[:update_version]
- Version_info::Update.update_stable
- Version_info::Update.update_unstable
- puts "\n" + Version_info::Update.changelog_header_stable
- puts "\n" + Version_info::Update.changelog_header_unstable
+ if options[:open_version]
+ Version_info::Update.update_stable(:pre_release)
+ Version_info::Update.update_unstable(:pre_release)
+ Version_info::Update.changelog_header_stable_pre_release
+ Version_info::Update.changelog_header_unstable_pre_release
+ Version_info::Update.changelog_header_commit(:pre_release)
+ end
+ if options[:version_and_tag_for_release]
+ Version_info::Update.update_stable(:release)
+ Version_info::Update.update_unstable(:release)
+ Version_info::Update.changelog_header_stable
+ Version_info::Update.changelog_header_unstable
+ Version_info::Update.changelog_header_commit_tag_upstream(:release)
end
if options.length == 0
system("#{$called_as} help pkg")
diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb
index 6fa6cde7..cad5e68a 100644
--- a/setup/qi_libs.rb
+++ b/setup/qi_libs.rb
@@ -5,6 +5,9 @@ module Project_details
def self.name
'SiSU'
end
+ def self.description
+ 'documents - structuring, publishing in multiple formats and search'
+ end
def self.thor
"ruby-thor files for the installation/setup of #{name}"
end
@@ -61,7 +64,7 @@ module Project_details
end
def self.version
stamp={}
- v="#{dir.pwd}/conf/sisu/version.yml"
+ v="#{dir.pwd}/data/sisu/version.yml"
if File.exist?(v)
stamp=YAML::load(File::open(v))
stamp[:version]
@@ -138,21 +141,25 @@ module Utils
end
module Install
#%% using a directory and its mapping
- def self.setup_find_create(dir_get,dir_put,exclude_files=['']) #primary,
+ def self.setup_find_create(dir_get,dir_put,exclude_files=['\*'],act) #primary,
begin
Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
place="#{dir_put}/#{stub}"
action=case
when File.file?(f)
- unless f =~/#{exclude_files.inspect}/
- cp(f,place)
- Utils.chmod_file(place)
+ unless f =~/#{exclude_files.join("|")}/
+ unless act==:dryrun
+ cp(f,place)
+ Utils.chmod_file(place)
+ end
"-> #{dir_put}/"
end
when File.directory?(f)
- FileUtils.mkpath(place) \
- unless FileTest.directory?(place)
+ if not FileTest.directory?(place) \
+ and not act==:dryrun
+ FileUtils.mkpath(place)
+ end
"./#{dir_get}/"
else '?'
end
@@ -162,18 +169,27 @@ module Install
puts "\n\n[ are you root? required for install ]"
end
end
- def self.setup_find_cp_r(dir_get,dir_put) #secondary, using recursive copy
+ def self.setup_find_cp_r(dir_get,dir_put,act) #secondary, using recursive copy
begin
Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
place="#{dir_put}/#{stub}"
case
when File.file?(f)
- cp_r(f,place)
- Utils.chmod_util(place)
+ unless act==:dryrun
+ cp_r(f,place)
+ Utils.chmod_util(place)
+ else
+ puts "--> #{place}"
+ end
when File.directory?(f)
- mkdir(place) \
- unless FileTest.directory?(place)
+ unless FileTest.directory?(place)
+ unless act==:dryrun
+ mkdir(place)
+ else
+ puts "mkdir -p #{place}"
+ end
+ end
end
end
rescue
@@ -182,18 +198,55 @@ module Install
end
end
module Version_info
- def self.contents(vi)
+ def self.contents(vi,rel=:release)
+ release=rel ==:pre_release \
+ ? '_pre_rel'
+ : ''
<<-WOK
---
:project: #{vi[:project]}
-:version: #{vi[:version]}
+:version: #{vi[:version]}#{release}
:date_stamp: #{vi[:date_stamp]}
:date: "#{vi[:date]}"
WOK
end
+ def self.git_version_extract
+ if FileTest.file?('/usr/bin/git')
+ x=`git describe --long --tags 2>&1`.strip.
+ gsub(/^[a-z_-]*([0-9.]+)/,'\1').
+ gsub(/([^-]*-g)/,'r\1').
+ gsub(/-/,'.')
+ x=(x=~/^[0-9]+\.[0-9]+\.[0-9]+\.r[0-9]+\.g[0-9a-f]{7}/) \
+ ? x
+ : nil
+ else nil
+ end
+ end
+ def self.version_number_use(vi)
+ (git_version_extract.nil?) \
+ ? (vi[:version])
+ : git_version_extract
+ end
+ def self.version_number_info(vi)
+ (Version_info.version_number_use(vi) != vi[:version_number]) \
+ ? (%{#{vi[:version_number]} from git #{Version_info.version_number_use(vi)}})
+ : vi[:version_number]
+ end
+ def self.version_number_info_stable
+ vi=Version_info::Current.setting_stable
+ (Version_info.version_number_use(vi) != vi[:version_number]) \
+ ? (%{#{vi[:version_number]} from git #{Version_info.version_number_use(vi)}})
+ : vi[:version_number]
+ end
+ def self.version_number_info_unstable
+ vi=Version_info::Current.setting_unstable
+ (Version_info.version_number_use(vi) != vi[:version_number]) \
+ ? (%{#{vi[:version_number]} from git #{Version_info.version_number_use(vi)}})
+ : vi[:version_number]
+ end
module Current
def self.yml_file_path(version)
- "data/sisu/#{version}/v/version.yml"
+ "data/sisu/version/#{version}.yml"
end
def self.settings(file)
v="#{Dir.pwd}/#{file}"
@@ -202,6 +255,12 @@ module Version_info
else ''
end
end
+ def self.changelog_file_stable
+ 'data/doc/sisu/CHANGELOG_v5'
+ end
+ def self.changelog_file_unstable
+ 'data/doc/sisu/CHANGELOG_v6'
+ end
def self.file_stable
yml_file_path(SiSU_version_dir_stable)
end
@@ -209,10 +268,16 @@ module Version_info
yml_file_path(SiSU_version_dir_unstable)
end
def self.setting_stable
- settings(file_stable)
+ hsh=settings(file_stable)
+ hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+ match(hsh[:version])[1]
+ hsh
end
def self.setting_unstable
- settings(file_unstable)
+ hsh=settings(file_unstable)
+ hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+ match(hsh[:version])[1]
+ hsh
end
def self.content_stable
Version_info.contents(setting_stable)
@@ -236,21 +301,29 @@ module Version_info
def self.setting_unstable
settings(SiSU_version_next_unstable)
end
- def self.content_stable
- Version_info.contents(setting_stable)
+ def self.content_stable(rel)
+ Version_info.contents(setting_stable,rel)
end
- def self.content_unstable
- Version_info.contents(setting_unstable)
+ def self.content_unstable(rel)
+ Version_info.contents(setting_unstable,rel)
end
end
module Update
+ def self.version_number(vi)
+ /([0-9]+\.[0-9]+\.[0-9]+)/.match(vi[:version])[1]
+ end
+ def self.version_number_stable
+ vi=Version_info::Current.setting_stable
+ /([0-9]+\.[0-9]+\.[0-9]+)/.match(vi[:version])[1]
+ end
def self.version_info_update_commit(filename,vi_hash_current,vi_content_current,vi_hash_next,vi_content_next)
ans=%{update #{Project_details.name.downcase} version info replacing:
#{vi_hash_current.sort}
with:
#{vi_hash_next.sort}
-#{vi_content_current} becoming:
+#{vi_content_current}
+becoming:
#{vi_content_next}
proceed? }
resp=Utils.answer?(ans)
@@ -265,39 +338,162 @@ proceed? }
end
end
end
- def self.update_stable
+ def self.update_stable(rel=:release)
version_info_update_commit(
Version_info::Current.file_stable,
Version_info::Current.setting_stable,
Version_info::Current.content_stable,
Version_info::Next.setting_stable,
- Version_info::Next.content_stable
+ Version_info::Next.content_stable(rel),
)
end
- def self.update_unstable
+ def self.update_unstable(rel=:release)
version_info_update_commit(
Version_info::Current.file_unstable,
Version_info::Current.setting_unstable,
Version_info::Current.content_unstable,
Version_info::Next.setting_unstable,
- Version_info::Next.content_unstable
+ Version_info::Next.content_unstable(rel),
)
end
def self.changelog_header(vi)
+ vn=version_number(vi)
<<-WOK
-%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
-http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
- sisu_#{vi[:version]}.orig.tar.xz
- sisu_#{vi[:version]}-1.dsc
+** #{vn}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz
+ sisu_#{vn}.orig.tar.xz
WOK
end
+ def self.changelog_header_release(filename,ch,vi)
+ ans=%{update #{Project_details.name.downcase} changelog header, open version:
+
+ #{ch}
+proceed? }
+ resp=Utils.answer?(ans)
+ if resp
+ fn="#{Dir.pwd}/#{filename}"
+ if File.writable?(fn)
+ changelog_arr_current = IO.readlines(fn)
+ changelog_arr_next=changelog_arr_current.each.map do |line|
+ if line =~/^\*\* [0-9]+\.[0-9]+\.[0-9]+(?:_pre_rel)?\.orig\.tar\.xz \(Open commit window: [0-9]{4}-[0-9]{2}-[0-9]{2}; Pre-Release\)\)$/
+ "** #{vi[:version]}.orig.tar.xz " \
+ + "(#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})\n"
+ else line
+ end
+ end
+ if changelog_arr_current.length == changelog_arr_next.length
+ changelog_file=File.new(fn,'w+')
+ changelog_arr_next.flatten.each do |line|
+ changelog_file << line
+ end
+ changelog_file.close
+ else puts "expected changelog arrays to have same length, in: #{changelog_arr_current.length}, out: #{changelog_arr_next.length}"
+ end
+ else
+ puts %{*WARN* is the file or directory writable? could not create #{filename}}
+ end
+ end
+ end
+ def self.changelog_header_stable_filename
+ Version_info::Current.changelog_file_stable
+ end
+ def self.changelog_header_unstable_filename
+ Version_info::Current.changelog_file_unstable
+ end
def self.changelog_header_stable
- changelog_header(Version_info::Current.setting_stable)
+ ch=changelog_header(Version_info::Current.setting_stable)
+ changelog_header_release(
+ changelog_header_stable_filename,
+ ch,
+ Version_info::Current.setting_stable
+ )
end
def self.changelog_header_unstable
- changelog_header(Version_info::Current.setting_unstable)
+ ch=changelog_header(Version_info::Current.setting_unstable)
+ changelog_header_release(
+ changelog_header_unstable_filename,
+ ch,
+ Version_info::Current.setting_unstable
+ )
+ end
+ def self.changelog_header_pre_release(vi)
+ vn=version_number(vi)
+ <<-WOK
+** #{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release))
+http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
+http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz
+ sisu_#{vn}.orig.tar.xz
+ WOK
+ end
+ def self.changelog_header_pre_release_write(filename,ch)
+ ans=%{update #{Project_details.name.downcase} changelog header, open version:
+
+ #{ch}
+proceed? }
+ resp=Utils.answer?(ans)
+ if resp
+ fn="#{Dir.pwd}/#{filename}"
+ if File.writable?(fn)
+ changelog_arr_current = IO.readlines(fn)
+ changelog_arr_next=changelog_arr_current.each.map do |line|
+ if line =~/^--- HEAD ---$/
+ line << ("\n" + ch)
+ else line
+ end
+ end
+ if changelog_arr_current.length == changelog_arr_next.length
+ changelog_file=File.new(fn,'w+')
+ changelog_arr_next.flatten.each do |line|
+ changelog_file << line
+ end
+ changelog_file.close
+ else puts "expected changelog arrays to have same length, in: #{changelog_arr_current.length}, out: #{changelog_arr_next.length}"
+ end
+ else
+ puts %{*WARN* is the file or directory writable? could not create #{filename}}
+ end
+ end
+ end
+ def self.changelog_header_stable_pre_release
+ ch=changelog_header_pre_release(Version_info::Current.setting_stable)
+ changelog_header_pre_release_write(changelog_header_stable_filename,ch)
+ end
+ def self.changelog_header_unstable_pre_release
+ ch=changelog_header_pre_release(Version_info::Current.setting_unstable)
+ changelog_header_pre_release_write(changelog_header_unstable_filename,ch)
+ end
+ def self.commit_changelog(rel=:release,msg)
+ system(%{
+ git commit -a -m"#{msg}"
+ git commit --amend
+ })
+ end
+ def self.tag_upstream
+ system(%{
+ git tag -a sisu_#{SiSU_version_next_stable} -m"SiSU #{SiSU_version_next_stable}"
+ })
+ end
+ def self.changelog_header_commit(rel=:release)
+ msg=(rel == :pre_release) \
+ ? "version & changelog, open commit window"
+ : "version & changelog, tag for release"
+ ans=%{commit #{msg}:\n\nproceed? }
+ resp=Utils.answer?(ans)
+ if resp
+ commit_changelog(rel,msg)
+ end
+ end
+ def self.changelog_header_commit_tag_upstream(rel=:release)
+ msg=(rel == :pre_release) \
+ ? "version & changelog, open commit window"
+ : "version & changelog, tag for release"
+ ans=%{commit #{msg}:\n\nproceed? }
+ resp=Utils.answer?(ans)
+ if resp
+ commit_changelog(rel,msg)
+ tag_upstream
+ end
end
end
self
@@ -333,18 +529,7 @@ module GitExtractTaggedVersionBuild
puts commands
begin
system(commands)
- rescue # shell error not caught by ruby, using rake
- #install_branches=[]
- #install_branches << 'gem_create_build_stable' \
- # if options[:stable]
- #install_branches << 'gem_create_build_unstable' \
- # if options[:unstable]
- #commands =%{git checkout #{ver} && }
- #install_branches.each do |install_branch|
- # commands += %{rake #{install_branch};}
- #end
- #puts commands
- #system(commands)
+ rescue
end
rescue
ensure
@@ -359,23 +544,23 @@ module Gemspecs
puts <<-WOK
--
name: #{vi[:project].downcase}
-version: #{vi[:version]}
+version: #{vi[:version_number]}
date: #{vi[:date]}
summary: #{vi[:project]}
WOK
end
- def self.contents(vi,version)
+ def self.contents(vi,branch)
<<-WOK
Gem::Specification.new do |s|
s.name = '#{vi[:project].downcase}'
- s.version = '#{vi[:version]}'
+ s.version = '#{vi[:version_number]}'
s.date = '#{vi[:date]}'
- s.summary = '#{vi[:project]}'
- s.description = '#{Project_details.name} gem'
+ s.summary = '#{Version_info.version_number_info(vi)}'
+ s.description = '#{Project_details.description}'
s.authors = ["Ralph Amissah"]
s.email = 'ralph.amissah@gmail.com'
- s.files = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] +
- Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] +
+ s.files = Dir['lib/#{Project_details.name.downcase}/#{branch}/*.rb'] +
+ Dir['data/#{Project_details.name.downcase}/version/#{branch}.yml'] +
Dir['data/#{Project_details.name.downcase}/image/*'] +
Dir['bin/#{Project_details.name.downcase}gem'] +
Dir['bin/#{Project_details.name.downcase}']
@@ -406,12 +591,12 @@ end
def self.filename_stable
Project_details.name.downcase \
+ '-' \
- + Version_info::Current.setting_stable[:version]
+ + Version_info::Current.setting_stable[:version_number]
end
def self.filename_unstable
Project_details.name.downcase \
+ '-' \
- + Version_info::Current.setting_unstable[:version]
+ + Version_info::Current.setting_unstable[:version_number]
end
def self.info_stable
Gemspecs.info(Version_info::Current.setting_stable)
@@ -462,12 +647,12 @@ end
def self.filename_stable
Project_details.name.downcase \
+ '-' \
- + Version_info::Next.setting_stable[:version]
+ + Version_info::Next.setting_stable[:version_number]
end
def self.filename_unstable
Project_details.name.downcase \
+ '-' \
- + Version_info::Next.setting_unstable[:version]
+ + Version_info::Next.setting_unstable[:version_number]
end
def self.setting_stable
Gemspecs.contents(
@@ -504,18 +689,17 @@ end
module Package
def self.sequence
puts <<-WOK
- --update-version # update package version
+ --open-version # update package version
+ --version-and-tag-for-release # git tags upstream version
# not included:
- # --tag # git tags upstream version
- # --merge # git merge upstream tag into debian/sid
- # --dch # dch create and edit
- # --dch-commit # dch commit
- # --build # git-buildpackage
- # --git_push # git push changes
- # --dput # dput package
- # --reprepro_update # reprepro update
- # --reprepro_push # reprepro rsync changes
+ # --merge # git merge upstream tag into debian/sid
+ # --dch # dch create and edit
+ # --dch-commit # dch commit
+ # --build # git-buildpackage
+ # --git_push # git push changes
+ # --dput # dput package
+ # --reprepro_update # reprepro update
+ # --reprepro_push # reprepro rsync changes
WOK
end
end
-
diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb
index ec01af19..4126fa3f 100644
--- a/setup/qi_libs_base.rb
+++ b/setup/qi_libs_base.rb
@@ -142,7 +142,7 @@ module Version_info
end
module Current
def self.yml_file_path(version)
- "data/sisu/#{version}/v/version.yml"
+ "data/sisu/version/#{version}.yml"
end
def self.settings(file)
v="#{Dir.pwd}/#{file}"
@@ -234,12 +234,10 @@ proceed? }
end
def self.changelog_header(vi)
<<-WOK
-%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
+** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
-http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
sisu_#{vi[:version]}.orig.tar.xz
- sisu_#{vi[:version]}-1.dsc
WOK
end
def self.changelog_header_stable
diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb
index 8389c836..5345631b 100644
--- a/setup/rbuild_libs.rb
+++ b/setup/rbuild_libs.rb
@@ -137,14 +137,14 @@ module Utils
end
module Install
#%% using a directory and its mapping
- def self.setup_find_create(dir_get,dir_put,exclude_files=['']) #primary,
+ def self.setup_find_create(dir_get,dir_put,exclude_files=['\*'],act) #primary,
begin
Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f|
stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join
place="#{dir_put}/#{stub}"
action=case
when File.file?(f)
- unless f =~/#{exclude_files.inspect}/
+ unless f =~/#{exclude_files.join("|")}/
cp(f,place)
Utils.chmod_file(place)
"-> #{dir_put}/"
@@ -192,7 +192,7 @@ module Version_info
end
module Current
def self.yml_file_path(version)
- "data/sisu/#{version}/v/version.yml"
+ "data/sisu/version/#{version}.yml"
end
def self.settings(file)
v="#{Dir.pwd}/#{file}"
@@ -208,10 +208,16 @@ module Version_info
yml_file_path(SiSU_version_dir_unstable)
end
def self.setting_stable
- settings(file_stable)
+ hsh=settings(file_stable)
+ hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+ match(hsh[:version])[1]
+ hsh
end
def self.setting_unstable
- settings(file_unstable)
+ hsh=settings(file_unstable)
+ hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/.
+ match(hsh[:version])[1]
+ hsh
end
def self.content_stable
Version_info.contents(setting_stable)
@@ -284,7 +290,7 @@ proceed? }
end
def self.changelog_header(vi)
<<-WOK
-%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
+** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
@@ -373,7 +379,7 @@ module Gemspecs
puts <<-WOK
--
name: #{vi[:project].downcase}
-version: #{vi[:version]}
+version: #{vi[:version_number]}
date: #{vi[:date]}
summary: #{vi[:project]}
WOK
@@ -382,14 +388,14 @@ summary: #{vi[:project]}
<<-WOK
Gem::Specification.new do |s|
s.name = '#{vi[:project].downcase}'
- s.version = '#{vi[:version]}'
+ s.version = '#{vi[:version_number]}'
s.date = '#{vi[:date]}'
s.summary = '#{vi[:project]}'
s.description = '#{Project_details.name} gem'
s.authors = ["Ralph Amissah"]
s.email = 'ralph.amissah@gmail.com'
s.files = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] +
- Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] +
+ Dir['data/#{Project_details.name.downcase}/#{version}/version.yml'] +
Dir['data/#{Project_details.name.downcase}/image/*'] +
Dir['bin/#{Project_details.name.downcase}gem'] +
Dir['bin/#{Project_details.name.downcase}']
@@ -420,12 +426,12 @@ end
def self.filename_stable
Project_details.name.downcase \
+ '-' \
- + Version_info::Current.setting_stable[:version]
+ + Version_info::Current.setting_stable[:version_number]
end
def self.filename_unstable
Project_details.name.downcase \
+ '-' \
- + Version_info::Current.setting_unstable[:version]
+ + Version_info::Current.setting_unstable[:version_number]
end
def self.info_stable
Gemspecs.info(Version_info::Current.setting_stable)
@@ -476,12 +482,12 @@ end
def self.filename_stable
Project_details.name.downcase \
+ '-' \
- + Version_info::Next.setting_stable[:version]
+ + Version_info::Next.setting_stable[:version_number]
end
def self.filename_unstable
Project_details.name.downcase \
+ '-' \
- + Version_info::Next.setting_unstable[:version]
+ + Version_info::Next.setting_unstable[:version_number]
end
def self.setting_stable
Gemspecs.contents(
@@ -515,4 +521,3 @@ end
end
end
end
-
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index bc90bc71..38216303 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -1,12 +1,10 @@
#% constants
module SiSUversion
- SiSU_version_next_stable = '5.7.1' #% set version stable current
- SiSU_version_next_unstable = '6.3.1' #% set version unstable dev
+ SiSU_version_next_stable = '5.8.0' #% set version stable current
+ SiSU_version_next_unstable = '6.4.0' #% set version unstable dev
#% qi quick install file
- SiSU_version_generic_next_stable = '5.4.x'
- SiSU_version_generic_next_unstable = '6.0.x'
- SiSU_version_dir_stable = 'v5'
- SiSU_version_dir_unstable = 'v6'
+ SiSU_version_dir_stable = 'current'
+ SiSU_version_dir_unstable = 'develop'
end
module Dev
GPGpubKey = '1BB4B289'
diff --git a/sisu.org b/sisu.org
index cdc01b2b..b986b035 120000
--- a/sisu.org
+++ b/sisu.org
@@ -1 +1 @@
-data/doc/sisu/sisu.org \ No newline at end of file
+data/doc/sisu/org/sisu.org \ No newline at end of file