diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
| commit | a9642d67f69d83d3fdb56ab115ef3c10bcd1895c (patch) | |
| tree | 352c633d6b60a54a9ef74ff143162ac07c981b18 | |
| parent | debian/changelog (3.0.7-1) (diff) | |
| parent | v3: i18n, sysenv, class variable to prevent unnecessary re-construction of hash (diff) | |
Merge branch 'upstream' into debian/sid
68 files changed, 3989 insertions, 2914 deletions
@@ -2,25 +2,24 @@ # encoding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information begin - def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def ruby_version_ok?(base_version) + @v ||=RUBY_VERSION.scan(/\d+/) + vb=base_version.scan(/\d+/) + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i + raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end end def check_incompatible_ruby_build? require 'rbconfig' e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - and e['PATCHLEVEL'].to_i < 180 + if RUBY_VERSION == '1.9.2' \ + && e['PATCHLEVEL'].to_i < 180 raise <<WOK There are known issues with early versions of ruby1.9.2. Please, use Ruby 1.9.2p180 or later, @@ -30,6 +29,14 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']} WOK end end + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + ruby_version_ok?(rbv_sisu_stable) + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + ruby_version_ok?(rbv_sisu_dev) + end $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* @@ -2,25 +2,24 @@ # encoding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information begin - def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def ruby_version_ok?(base_version) + @v ||=RUBY_VERSION.scan(/\d+/) + vb=base_version.scan(/\d+/) + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i + raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end end def check_incompatible_ruby_build? require 'rbconfig' e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - and e['PATCHLEVEL'].to_i < 180 + if RUBY_VERSION == '1.9.2' \ + && e['PATCHLEVEL'].to_i < 180 raise <<WOK There are known issues with early versions of ruby1.9.2. Please, use Ruby 1.9.2p180 or later, @@ -30,6 +29,14 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']} WOK end end + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + ruby_version_ok?(rbv_sisu_stable) + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + ruby_version_ok?(rbv_sisu_dev) + end $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet index 10318191..5566a962 100644 --- a/bin/sisu_termsheet +++ b/bin/sisu_termsheet @@ -2,25 +2,24 @@ # encoding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information begin - def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def ruby_version_ok?(base_version) + @v ||=RUBY_VERSION.scan(/\d+/) + vb=base_version.scan(/\d+/) + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i + raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end end def check_incompatible_ruby_build? require 'rbconfig' e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - and e['PATCHLEVEL'].to_i < 180 + if RUBY_VERSION == '1.9.2' \ + && e['PATCHLEVEL'].to_i < 180 raise <<WOK There are known issues with early versions of ruby1.9.2. Please, use Ruby 1.9.2p180 or later, @@ -30,6 +29,14 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']} WOK end end + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + ruby_version_ok?(rbv_sisu_stable) + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + ruby_version_ok?(rbv_sisu_dev) + end $VERBOSE=nil argv=$* SiSU_version_dir=case argv.inspect diff --git a/bin/sisu_webrick b/bin/sisu_webrick index 8f79a51f..b9ac031a 100644 --- a/bin/sisu_webrick +++ b/bin/sisu_webrick @@ -2,17 +2,16 @@ # encoding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information begin - def check_sisu_stable_ruby_version? - rbv_sisu_stable='1.8.7' - if RUBY_VERSION < rbv_sisu_stable - raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_sisu_dev_ruby_version? - rbv_sisu_dev='1.9.2' - if RUBY_VERSION < rbv_sisu_dev - raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + def ruby_version_ok?(base_version) + @v ||=RUBY_VERSION.scan(/\d+/) + vb=base_version.scan(/\d+/) + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i + raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end end @@ -20,7 +19,7 @@ begin require 'rbconfig' e=Config::CONFIG if RUBY_VERSION == '1.9.2' \ - and e['PATCHLEVEL'].to_i < 180 + && e['PATCHLEVEL'].to_i < 180 raise <<WOK There are known issues with early versions of ruby1.9.2. Please, use Ruby 1.9.2p180 or later, @@ -30,6 +29,14 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']} WOK end end + def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + ruby_version_ok?(rbv_sisu_stable) + end + def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + ruby_version_ok?(rbv_sisu_dev) + end $VERBOSE=nil argv=$* SiSU_version_dir=case argv.inspect diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index dc024147..1420cfe6 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,6 +12,55 @@ Reverse Chronological: %% STABLE Branch +%% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8] +http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1 + + * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet + * improved ruby version check + + * vim + * sisu syntax change of a couple of color groups (Delimiter instead of + Include) + * 8 color cterm colorschemes + * sparse series uses dark grey on black, usually looks better, but only + works with a fixed color cursor, preferred in terms where you can get + away with using it + * frugal series avoids dark grey + * slate for cterm now incorporates frugal-cterm-sisu + * *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are + preferred for programming / sisu markup + + * sysenv, lowriter (instead of oowriter) + + * manpage, reinstate escape of hyphens (clearly preferred, else lintian + reports hyphen-used-as-minus-sign) + + * NOTE: generated cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1 + reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The + cgi sample search scripts for postgresql and sqlite3 are almost identical, + both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very + similar bug is reported about the mysql library. Should #596103 and the + upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than + libdbd-pg-ruby1.9.1? + * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103> + * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967> + * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View> + fix/workaround options include: + * await bugfix, (bug has existed at least since 2010-09) + * rewrite for ruby-dbi using other constructs + e.g. s.fetch {|row| ...} + * revert to ruby 1.8.7 for the cgi script (they work independently of the + rest of the program anyway) + * rewrite for individual database dbi re: psql and sqlite3 + * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian + <rdbi https://github.com/RDBI/rdbi> + <http://rdbi.hollensbe.org/> + <http://rdbi.hollensbe.org/files/README_rdoc.html> + and develop for that + or some meaningful combination of any of the above. + + * vim colors colorscheme sparse-* frugal-* Slate minor changes + %% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index d69759ef..2fdc9575 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,12 +13,93 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.0.8.orig.tar.gz (2011-05-05:18/4) +http://git.sisudoc.org/?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 + sisu_3.0.8.orig.tar.gz + sisu_3.0.8-1.dsc + sisu_3.0.8-1.debian.tar.gz + + * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet + * improved ruby version check + + * options, language setting, based on directory structure or filename + * sysenv, language setting from options + * affects multiple libraries + + * i18n, sysenv, options, language setting changes affecting many files + * must be able to set language at options stage from filename or directory + + * prog_text_translation, renamed from what was i18n, i18n name reused + + * db, directory structure changed, database prefix renamed + * language_document_char field made larger + [consider renaming language_document_code or ..._id] + * title, src_filename and language_document_char fields mandatory + (title, title_main, src_filename, language_document_char) + + * NOTE: cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1 reported + reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The + cgi sample search scripts for postgresql and sqlite3 are almost identical, + both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very + similar bug is reported about the mysql library. Should #596103 and the + upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than + libdbd-pg-ruby1.9.1? + * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103> + * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967> + * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View> + fix/workaround options include: + * await bugfix, (bug has existed at least since 2010-09) + * rewrite for ruby-dbi using other constructs + e.g. s.fetch {|row| ...} + * revert to ruby 1.8.7 for the cgi script (they work independently of the + rest of the program anyway) + * rewrite for individual database dbi re: psql and sqlite3 + * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian + <rdbi https://github.com/RDBI/rdbi> + <http://rdbi.hollensbe.org/> + <http://rdbi.hollensbe.org/files/README_rdoc.html> + and develop for that + * use some other programming language for sample search form + or some meaningful combination of any of the above. + + * sample search form, revert to generating ruby 1.8.7 sample + * sisu3 using ruby >=1.9.2p180 generates search form for ruby 1.8.7, so: + generate sample form using sisu3 -F (options), then; start webrick using + ruby 1.8.7 & sisu -W (not sisu3) + * take account of alternative output directory structures [work on, test] + + * manpage, reinstate escape of hyphens (clearly preferred, else lintian + reports hyphen-used-as-minus-sign) + + * manpages, escaped hyphens reinstated (remove lintian info) + + * urls, a fix, sqlite + + * sysenv, lowriter (instead of libreoffice) + + * db_select, ansi screen reporting, correction for sqlite db update + + * concordance, output path, screen info correction + + * vim + * sisu syntax change of a couple of color groups (Delimiter instead of + Include) + * 8 color cterm colorschemes + * sparse series uses dark grey on black, usually looks better, but only + works with a fixed color cursor, preferred in terms where you can get + away with using it + * frugal series avoids dark grey + * slate for cterm now incorporates frugal-cterm-sisu + * *-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) http://git.sisudoc.org/?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 - sisu_3.0.7.orig.tar.gz - sisu_3.0.7-1.dsc - sisu_3.0.7-1.debian.tar.gz + 08474012bd979f4c18881be47d0b2e6c5add9a013b886ea6f7f943464db84825 1929419 sisu_3.0.7.orig.tar.gz + 0028f57ed75fb1e358a0a14e197c607091d8a99c18b856750bd1d820c760ff6c 1216 sisu_3.0.7-1.dsc + 9a9a9d139cc0f4c7ccdfcb41be7eaba517ce96914b68a483d08debd233c76929 285739 sisu_3.0.7-1.debian.tar.gz * param, md remove md.cmd and md.mod shortcut methods, use use md.opt (md.opt.cmd md.opt.mod) diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim index 9d2e6edb..773f87cb 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim @@ -1,8 +1,9 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "8" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=bold,reverse cterm=bold,reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=3 -:hi IncSearch term=reverse cterm=reverse -:hi SpecialKey term=bold ctermfg=4 -:hi Visual term=reverse cterm=reverse -:hi VisualNOS term=bold,underline cterm=bold,underline -:hi MoreMsg term=bold ctermfg=2 -:hi ModeMsg term=bold cterm=bold -:hi Question term=standout ctermfg=2 -:hi Title term=bold ctermfg=1 -:hi NonText term=bold cterm=bold ctermfg=4 -:hi LineNr term=underline ctermbg=7 ctermfg=0 -":hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* -:hi Directory term=bold ctermfg=4 -:hi WildMenu term=standout ctermbg=3 ctermfg=0 -:hi VertSplit term=reverse cterm=reverse -:hi Folded term=standout ctermbg=7 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=standout -:hi SpellCap term=standout -:hi SpellLocal term=standout -:hi SpellRare term=standout -:hi WarningMsg term=standout ctermfg=1 -:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 -:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=bold,reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse ctermbg=2 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=none ctermbg=7 ctermfg=0 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment cterm=none ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=3 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim new file mode 100644 index 00000000..38197f2d --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-ruby" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim new file mode 100644 index 00000000..b15cd3a6 --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-sisu" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold cterm=bold ctermfg=3 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline ctermfg=6 +:hi Statement term=bold ctermfg=6 +:hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermbg=7 ctermfg=1 +:hi Type term=underline ctermfg=2 +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 +:hi Define ctermfg=3 +:hi Function ctermfg=6 +:hi Structure ctermfg=2 +:hi CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim index 8128790f..18d341c8 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim @@ -1,8 +1,9 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "frugal" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=reverse cterm=reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=2 -:hi IncSearch term=reverse cterm=reverse -:hi SpecialKey term=bold ctermfg=4 -:hi Visual term=reverse cterm=reverse -:hi VisualNOS term=bold,underline cterm=bold,underline -:hi MoreMsg term=bold ctermfg=2 +:hi Normal ctermbg=0 ctermfg=7 guibg=black guifg=white +:hi Cursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi lCursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse gui=reverse +:hi Search term=reverse ctermbg=2 guifg=green +:hi IncSearch term=reverse cterm=reverse gui=reverse +:hi SpecialKey term=bold ctermfg=4 guifg=blue +:hi Visual term=reverse cterm=reverse gui=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=green :hi ModeMsg term=bold cterm=bold -:hi Question term=standout ctermfg=2 -:hi Title term=bold ctermfg=1 -:hi NonText term=bold cterm=bold ctermfg=4 -:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* -":hi LineNr term=underline ctermbg=7 ctermfg=0 -:hi Directory term=bold ctermfg=4 -:hi WildMenu term=standout ctermbg=3 ctermfg=0 -:hi VertSplit term=reverse cterm=reverse -:hi Folded term=standout ctermbg=242 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellCap term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellLocal term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellRare term=underline,standout ctermbg=7 ctermfg=5 -:hi WarningMsg term=standout ctermfg=1 -:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 -:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 +:hi Question term=standout ctermfg=2 guifg=green +:hi Title term=bold ctermfg=1 guifg=red +:hi NonText term=bold cterm=bold ctermfg=4 guifg=blue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* gui=bold guibg=black guifg=grey +:hi Directory term=bold ctermfg=4 guifg=blue +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 gui=none guibg=black guifg=white +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi DiffText cterm=none ctermbg=6 ctermfg=0 gui=none guibg=magenta guifg=black +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 gui=none guibg=green guifg=black +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi String cterm=none ctermfg=3 gui=none guifg=yellow +:hi Comment cterm=none ctermbg=0 ctermfg=4 gui=bold guibg=black guifg=grey +:hi Constant term=underline ctermfg=1 guifg=red +:hi Special term=bold ctermfg=3 guifg=yellow +:hi Identifier term=underline cterm=none ctermfg=6 gui=none guifg=magenta +:hi Statement term=bold cterm=none ctermfg=2 gui=none guifg=green +":hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermfg=1 guifg=red +:hi Type term=underline cterm=bold ctermfg=3 gui=bold guifg=yellow +:hi Delimiter cterm=none ctermfg=2 gui=none guifg=green +:hi Ignore cterm=bold ctermfg=7 gui=bold guifg=white +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi Underlined term=underline cterm=underline gui=underline +":hi Include ctermfg=1 guifg=red +":hi Define ctermfg=3 guifg=yellow +":hi Function ctermfg=6 guifg=magenta +":hi Structure ctermfg=2 guifg=green +":hi CursorLine ctermbg=4 guibg=blue +":hi CursorColumn ctermbg=4 guibg=blue +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi WarningMsg term=standout ctermfg=1 guifg=red +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim index 57f7925b..2aad27ca 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim @@ -1,72 +1,75 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-05-04 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD> -" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) +" Notes: cterm now uses frugal-sisu 8 colors for term +" (for gui originally looked at desert Hans Fugal <hans@fugal.net> +" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) :set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif +:hi clear +if exists("syntax_on") + syntax reset endif :let colors_name = "slate" -:hi Normal ctermbg=black guibg=grey15 guifg=white -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Folded ctermbg=black ctermfg=grey guibg=black guifg=grey40 -:hi FoldColumn ctermbg=grey ctermfg=darkblue guibg=black guifg=grey20 -:hi IncSearch cterm=none ctermbg=green ctermfg=yellow guibg=black guifg=green -:hi ModeMsg cterm=none ctermfg=brown guifg=goldenrod -:hi MoreMsg ctermfg=darkgreen guifg=SeaGreen -:hi NonText cterm=bold ctermfg=blue guibg=grey15 guifg=RoyalBlue -:hi Question ctermfg=green guifg=springgreen -:hi Search ctermbg=yellow ctermfg=darkgreen guibg=peru guifg=wheat -:hi SpecialKey ctermfg=darkgreen guifg=yellowgreen -:hi StatusLine cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black -:hi StatusLineNC cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Title cterm=bold ctermfg=yellow gui=bold guifg=gold -:hi Statement ctermfg=lightblue guifg=CornflowerBlue -:hi Visual cterm=reverse gui=none guibg=olivedrab guifg=khaki -:hi String ctermfg=darkcyan guifg=SkyBlue -:hi Comment term=bold ctermfg=grey guifg=grey40 -:hi Constant ctermfg=brown guifg=#ffa0a0 -:hi Special ctermfg=brown guifg=darkkhaki -:hi Identifier ctermfg=red guifg=salmon -:hi Include ctermfg=red guifg=red -:hi PreProc ctermfg=red guibg=white guifg=red -:hi Operator ctermfg=red guifg=red -:hi Define ctermfg=yellow gui=bold guifg=gold -:hi Type ctermfg=darkgreen guifg=CornflowerBlue -:hi Function ctermfg=brown guifg=navajowhite -:hi Structure ctermfg=green guifg=green -:hi LineNr ctermbg=darkgrey ctermfg=black guifg=grey50 -:hi Ignore cterm=bold ctermfg=grey guifg=grey40 -:hi Todo guibg=yellow2 guifg=orangered -:hi Directory ctermfg=darkcyan -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermbg=darkyellow ctermfg=black guibg=darkyellow guifg=black -:hi DiffChange cterm=none ctermbg=darkgrey ctermfg=white guibg=darkgrey guifg=white -:hi DiffText cterm=none ctermbg=darkcyan ctermfg=white guibg=darkcyan guifg=white -:hi DiffAdd cterm=none ctermbg=darkgreen ctermfg=white guibg=darkgreen guifg=white -:hi DiffDelete cterm=none ctermbg=darkgrey ctermfg=black guibg=darkgrey guifg=black -:hi Underlined term=underline ctermfg=darkmagenta -:hi WarningMsg ctermbg=darkmagenta ctermfg=black guibg=darkmagenta guifg=salmon -:hi ErrorMsg cterm=bold ctermbg=darkmagenta ctermfg=white guibg=darkmagenta guifg=white -:hi Error cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellErrors cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellBad cterm=bold ctermbg=magenta ctermfg=black guibg=darkmagenta guifg=white -:hi SpellLocal ctermbg=blue ctermfg=white guibg=darkmagenta guifg=white -:hi CursorLine ctermbg=black guibg=black -:hi CursorColumn ctermbg=black guibg=black -:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black -:hi Red ctermbg=black ctermfg=red guibg=black guifg=red -:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta -:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue -:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan -:hi Green ctermbg=black ctermfg=green guibg=black guifg=green -:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow -:hi White ctermbg=black ctermfg=white guibg=black guifg=white - +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 guibg=grey15 guifg=white +:hi Cursor term=reverse cterm=reverse guibg=khaki guifg=slategrey +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black +:hi StatusLineNC term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 guibg=peru guifg=wheat +:hi IncSearch term=reverse cterm=reverse guibg=black guifg=green +:hi SpecialKey term=bold ctermfg=4 guifg=yellowgreen +:hi Visual term=reverse cterm=reverse gui=none guibg=olivedrab guifg=khaki +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=SeaGreen +:hi ModeMsg term=bold cterm=bold guifg=goldenrod +:hi Question term=standout ctermfg=2 guifg=springgreen +:hi Title term=bold cterm=bold ctermfg=3 gui=bold guifg=gold +:hi NonText term=bold cterm=bold ctermfg=4 guibg=grey15 guifg=RoyalBlue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* guifg=grey50 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=darkyellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 guibg=black guifg=grey40 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 guibg=black guifg=grey20 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=white +:hi DiffText cterm=none ctermbg=6 ctermfg=0 guibg=darkcyan guifg=white +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 guibg=darkgreen guifg=white +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=black +:hi String cterm=none ctermfg=3 guifg=SkyBlue +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 guifg=grey40 +:hi Constant term=underline ctermfg=1 guifg=#ffa0a0 +:hi Special term=bold ctermfg=6 guifg=darkkhaki +:hi Identifier term=underline ctermfg=6 guifg=salmon +:hi Statement term=bold ctermfg=6 guifg=CornflowerBlue +:hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermbg=7 ctermfg=1 guibg=white guifg=red +:hi Type term=underline ctermfg=2 guifg=CornflowerBlue +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 guifg=grey40 +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow2 guifg=orangered +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 guifg=red +:hi Define ctermfg=3 gui=bold guifg=gold +:hi Function ctermfg=6 guifg=navajowhite +:hi Structure ctermfg=2 guifg=green +:hi CursorLine ctermbg=4 guibg=black +:hi CursorColumn ctermbg=4 guibg=black +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 guibg=darkmagenta guifg=salmon +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black +:hi Red ctermbg=black ctermfg=red guibg=black guifg=red +:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta +:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue +:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan +:hi Green ctermbg=black ctermfg=green guibg=black guifg=green +:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow +:hi White ctermbg=black ctermfg=white guibg=black guifg=white diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim new file mode 100644 index 00000000..17b67557 --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-ruby" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0* +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0* +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=0* +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim new file mode 100644 index 00000000..3d1b8bad --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "sparse-cterm-sisu" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold cterm=bold ctermfg=3 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0* +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0* +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=0* +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline ctermfg=6 +:hi Statement term=bold ctermfg=6 +:hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermbg=7 ctermfg=1 +:hi Type term=underline ctermfg=2 +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 +:hi Define ctermfg=3 +:hi Function ctermfg=6 +:hi Structure ctermfg=2 +:hi CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim index 751202cc..ef7207a3 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,8 @@ -"SiSU Vim syntax file -"SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-2.8.3, 2011-03-20) +" SiSU Vim syntax file +" SiSU Maintainer: Ralph Amissah <ralph@amissah.com> +" SiSU Markup: SiSU (sisu-3.0.8) +" Last Change: 2011-04-23 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -12,13 +14,16 @@ endif " Errors: syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>" - " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" syn match sisu_break contains=@NoSpell "<br>\|<br />" syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$" syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pr\|o\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pr\|o\)\]\s*$" syn match sisu_marktail "[~-]#" syn match sisu_control "\"" syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)" @@ -166,11 +171,11 @@ hi def link sisu_sub_header_make Statement hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include -hi def link sisu_mark_endnote Include +hi def link sisu_mark_endnote Delimiter hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String -hi def link sisu_fontface Include +hi def link sisu_fontface Delimiter hi def link sisu_strikeout DiffDelete hi def link sisu_content_alt Special hi def link sisu_sem_content SpecialKey @@ -186,7 +191,7 @@ hi def link sisu_sem_ex_block Comment hi def link sisu_index SpecialKey hi def link sisu_index_block Visual hi def link sisu_content_endnote Special -hi def link sisu_control Define +hi def link sisu_control Delimiter hi def link sisu_ocn Include hi def link sisu_number Number hi def link sisu_identifier Function diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index f83eb61d..9a5dd08a 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.9.2 -:date_stamp: 2011w16/3 -:date: "2011-04-20" +:version: 2.9.3 +:date_stamp: 2011w17/3 +:date: "2011-04-27" :project: SiSU diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim index 9d2e6edb..773f87cb 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim @@ -1,8 +1,9 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "8" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=bold,reverse cterm=bold,reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=3 -:hi IncSearch term=reverse cterm=reverse -:hi SpecialKey term=bold ctermfg=4 -:hi Visual term=reverse cterm=reverse -:hi VisualNOS term=bold,underline cterm=bold,underline -:hi MoreMsg term=bold ctermfg=2 -:hi ModeMsg term=bold cterm=bold -:hi Question term=standout ctermfg=2 -:hi Title term=bold ctermfg=1 -:hi NonText term=bold cterm=bold ctermfg=4 -:hi LineNr term=underline ctermbg=7 ctermfg=0 -":hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* -:hi Directory term=bold ctermfg=4 -:hi WildMenu term=standout ctermbg=3 ctermfg=0 -:hi VertSplit term=reverse cterm=reverse -:hi Folded term=standout ctermbg=7 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=standout -:hi SpellCap term=standout -:hi SpellLocal term=standout -:hi SpellRare term=standout -:hi WarningMsg term=standout ctermfg=1 -:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 -:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=bold,reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse ctermbg=2 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=none ctermbg=7 ctermfg=0 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment cterm=none ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=3 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim new file mode 100644 index 00000000..38197f2d --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-ruby" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim new file mode 100644 index 00000000..b15cd3a6 --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-sisu" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold cterm=bold ctermfg=3 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 +:hi String cterm=none ctermfg=3 +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline ctermfg=6 +:hi Statement term=bold ctermfg=6 +:hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermbg=7 ctermfg=1 +:hi Type term=underline ctermfg=2 +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 +:hi Define ctermfg=3 +:hi Function ctermfg=6 +:hi Structure ctermfg=2 +:hi CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim index 8128790f..18d341c8 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim @@ -1,8 +1,9 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "frugal" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=reverse cterm=reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=2 -:hi IncSearch term=reverse cterm=reverse -:hi SpecialKey term=bold ctermfg=4 -:hi Visual term=reverse cterm=reverse -:hi VisualNOS term=bold,underline cterm=bold,underline -:hi MoreMsg term=bold ctermfg=2 +:hi Normal ctermbg=0 ctermfg=7 guibg=black guifg=white +:hi Cursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi lCursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse gui=reverse +:hi Search term=reverse ctermbg=2 guifg=green +:hi IncSearch term=reverse cterm=reverse gui=reverse +:hi SpecialKey term=bold ctermfg=4 guifg=blue +:hi Visual term=reverse cterm=reverse gui=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=green :hi ModeMsg term=bold cterm=bold -:hi Question term=standout ctermfg=2 -:hi Title term=bold ctermfg=1 -:hi NonText term=bold cterm=bold ctermfg=4 -:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* -":hi LineNr term=underline ctermbg=7 ctermfg=0 -:hi Directory term=bold ctermfg=4 -:hi WildMenu term=standout ctermbg=3 ctermfg=0 -:hi VertSplit term=reverse cterm=reverse -:hi Folded term=standout ctermbg=242 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellCap term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellLocal term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellRare term=underline,standout ctermbg=7 ctermfg=5 -:hi WarningMsg term=standout ctermfg=1 -:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 -:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 +:hi Question term=standout ctermfg=2 guifg=green +:hi Title term=bold ctermfg=1 guifg=red +:hi NonText term=bold cterm=bold ctermfg=4 guifg=blue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* gui=bold guibg=black guifg=grey +:hi Directory term=bold ctermfg=4 guifg=blue +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 gui=none guibg=black guifg=white +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi DiffText cterm=none ctermbg=6 ctermfg=0 gui=none guibg=magenta guifg=black +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 gui=none guibg=green guifg=black +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi String cterm=none ctermfg=3 gui=none guifg=yellow +:hi Comment cterm=none ctermbg=0 ctermfg=4 gui=bold guibg=black guifg=grey +:hi Constant term=underline ctermfg=1 guifg=red +:hi Special term=bold ctermfg=3 guifg=yellow +:hi Identifier term=underline cterm=none ctermfg=6 gui=none guifg=magenta +:hi Statement term=bold cterm=none ctermfg=2 gui=none guifg=green +":hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermfg=1 guifg=red +:hi Type term=underline cterm=bold ctermfg=3 gui=bold guifg=yellow +:hi Delimiter cterm=none ctermfg=2 gui=none guifg=green +:hi Ignore cterm=bold ctermfg=7 gui=bold guifg=white +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi Underlined term=underline cterm=underline gui=underline +":hi Include ctermfg=1 guifg=red +":hi Define ctermfg=3 guifg=yellow +":hi Function ctermfg=6 guifg=magenta +":hi Structure ctermfg=2 guifg=green +":hi CursorLine ctermbg=4 guibg=blue +":hi CursorColumn ctermbg=4 guibg=blue +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi WarningMsg term=standout ctermfg=1 guifg=red +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim index 57f7925b..2aad27ca 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim @@ -1,72 +1,75 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-05-04 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD> -" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) +" Notes: cterm now uses frugal-sisu 8 colors for term +" (for gui originally looked at desert Hans Fugal <hans@fugal.net> +" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) :set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif +:hi clear +if exists("syntax_on") + syntax reset endif :let colors_name = "slate" -:hi Normal ctermbg=black guibg=grey15 guifg=white -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Folded ctermbg=black ctermfg=grey guibg=black guifg=grey40 -:hi FoldColumn ctermbg=grey ctermfg=darkblue guibg=black guifg=grey20 -:hi IncSearch cterm=none ctermbg=green ctermfg=yellow guibg=black guifg=green -:hi ModeMsg cterm=none ctermfg=brown guifg=goldenrod -:hi MoreMsg ctermfg=darkgreen guifg=SeaGreen -:hi NonText cterm=bold ctermfg=blue guibg=grey15 guifg=RoyalBlue -:hi Question ctermfg=green guifg=springgreen -:hi Search ctermbg=yellow ctermfg=darkgreen guibg=peru guifg=wheat -:hi SpecialKey ctermfg=darkgreen guifg=yellowgreen -:hi StatusLine cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black -:hi StatusLineNC cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Title cterm=bold ctermfg=yellow gui=bold guifg=gold -:hi Statement ctermfg=lightblue guifg=CornflowerBlue -:hi Visual cterm=reverse gui=none guibg=olivedrab guifg=khaki -:hi String ctermfg=darkcyan guifg=SkyBlue -:hi Comment term=bold ctermfg=grey guifg=grey40 -:hi Constant ctermfg=brown guifg=#ffa0a0 -:hi Special ctermfg=brown guifg=darkkhaki -:hi Identifier ctermfg=red guifg=salmon -:hi Include ctermfg=red guifg=red -:hi PreProc ctermfg=red guibg=white guifg=red -:hi Operator ctermfg=red guifg=red -:hi Define ctermfg=yellow gui=bold guifg=gold -:hi Type ctermfg=darkgreen guifg=CornflowerBlue -:hi Function ctermfg=brown guifg=navajowhite -:hi Structure ctermfg=green guifg=green -:hi LineNr ctermbg=darkgrey ctermfg=black guifg=grey50 -:hi Ignore cterm=bold ctermfg=grey guifg=grey40 -:hi Todo guibg=yellow2 guifg=orangered -:hi Directory ctermfg=darkcyan -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermbg=darkyellow ctermfg=black guibg=darkyellow guifg=black -:hi DiffChange cterm=none ctermbg=darkgrey ctermfg=white guibg=darkgrey guifg=white -:hi DiffText cterm=none ctermbg=darkcyan ctermfg=white guibg=darkcyan guifg=white -:hi DiffAdd cterm=none ctermbg=darkgreen ctermfg=white guibg=darkgreen guifg=white -:hi DiffDelete cterm=none ctermbg=darkgrey ctermfg=black guibg=darkgrey guifg=black -:hi Underlined term=underline ctermfg=darkmagenta -:hi WarningMsg ctermbg=darkmagenta ctermfg=black guibg=darkmagenta guifg=salmon -:hi ErrorMsg cterm=bold ctermbg=darkmagenta ctermfg=white guibg=darkmagenta guifg=white -:hi Error cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellErrors cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellBad cterm=bold ctermbg=magenta ctermfg=black guibg=darkmagenta guifg=white -:hi SpellLocal ctermbg=blue ctermfg=white guibg=darkmagenta guifg=white -:hi CursorLine ctermbg=black guibg=black -:hi CursorColumn ctermbg=black guibg=black -:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black -:hi Red ctermbg=black ctermfg=red guibg=black guifg=red -:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta -:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue -:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan -:hi Green ctermbg=black ctermfg=green guibg=black guifg=green -:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow -:hi White ctermbg=black ctermfg=white guibg=black guifg=white - +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 guibg=grey15 guifg=white +:hi Cursor term=reverse cterm=reverse guibg=khaki guifg=slategrey +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black +:hi StatusLineNC term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 guibg=peru guifg=wheat +:hi IncSearch term=reverse cterm=reverse guibg=black guifg=green +:hi SpecialKey term=bold ctermfg=4 guifg=yellowgreen +:hi Visual term=reverse cterm=reverse gui=none guibg=olivedrab guifg=khaki +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=SeaGreen +:hi ModeMsg term=bold cterm=bold guifg=goldenrod +:hi Question term=standout ctermfg=2 guifg=springgreen +:hi Title term=bold cterm=bold ctermfg=3 gui=bold guifg=gold +:hi NonText term=bold cterm=bold ctermfg=4 guibg=grey15 guifg=RoyalBlue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* guifg=grey50 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=darkyellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 guibg=black guifg=grey40 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 guibg=black guifg=grey20 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=white +:hi DiffText cterm=none ctermbg=6 ctermfg=0 guibg=darkcyan guifg=white +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 guibg=darkgreen guifg=white +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=black +:hi String cterm=none ctermfg=3 guifg=SkyBlue +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 guifg=grey40 +:hi Constant term=underline ctermfg=1 guifg=#ffa0a0 +:hi Special term=bold ctermfg=6 guifg=darkkhaki +:hi Identifier term=underline ctermfg=6 guifg=salmon +:hi Statement term=bold ctermfg=6 guifg=CornflowerBlue +:hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermbg=7 ctermfg=1 guibg=white guifg=red +:hi Type term=underline ctermfg=2 guifg=CornflowerBlue +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 guifg=grey40 +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow2 guifg=orangered +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 guifg=red +:hi Define ctermfg=3 gui=bold guifg=gold +:hi Function ctermfg=6 guifg=navajowhite +:hi Structure ctermfg=2 guifg=green +:hi CursorLine ctermbg=4 guibg=black +:hi CursorColumn ctermbg=4 guibg=black +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 guibg=darkmagenta guifg=salmon +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black +:hi Red ctermbg=black ctermfg=red guibg=black guifg=red +:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta +:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue +:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan +:hi Green ctermbg=black ctermfg=green guibg=black guifg=green +:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow +:hi White ctermbg=black ctermfg=white guibg=black guifg=white diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim new file mode 100644 index 00000000..17b67557 --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "frugal-cterm-ruby" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold ctermfg=1 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0* +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0* +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=0* +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline cterm=none ctermfg=6 +:hi Statement term=bold cterm=none ctermfg=2 +":hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermfg=1 +:hi Type term=underline cterm=bold ctermfg=3 +:hi Delimiter cterm=none ctermfg=2 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +":hi Include ctermfg=1 +":hi Define ctermfg=3 +":hi Function ctermfg=6 +":hi Structure ctermfg=2 +":hi CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim new file mode 100644 index 00000000..3d1b8bad --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +endif +:let colors_name = "sparse-cterm-sisu" +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 +:hi Cursor term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +:hi SpecialKey term=bold ctermfg=4 +:hi Visual term=reverse cterm=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 +:hi ModeMsg term=bold cterm=bold +:hi Question term=standout ctermfg=2 +:hi Title term=bold cterm=bold ctermfg=3 +:hi NonText term=bold cterm=bold ctermfg=4 +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 +:hi VertSplit term=reverse cterm=reverse +:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0* +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 +:hi DiffText cterm=none ctermbg=6 ctermfg=0 +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 +:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0* +:hi String cterm=none ctermfg=3 +:hi Comment cterm=bold ctermbg=0 ctermfg=0* +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=6 +:hi Identifier term=underline ctermfg=6 +:hi Statement term=bold ctermfg=6 +:hi Operator term=bold ctermfg=1 +:hi PreProc term=underline ctermbg=7 ctermfg=1 +:hi Type term=underline ctermfg=2 +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 +:hi Todo term=standout ctermbg=3 ctermfg=0 +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 +:hi Define ctermfg=3 +:hi Function ctermfg=6 +:hi Structure ctermfg=2 +:hi CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim index 00cdbea4..ef7207a3 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,8 @@ -"SiSU Vim syntax file -"SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-3.0.5, 2011-03-20) +" SiSU Vim syntax file +" SiSU Maintainer: Ralph Amissah <ralph@amissah.com> +" SiSU Markup: SiSU (sisu-3.0.8) +" Last Change: 2011-04-23 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -12,7 +14,6 @@ endif " Errors: syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>" - " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" @@ -170,11 +171,11 @@ hi def link sisu_sub_header_make Statement hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include -hi def link sisu_mark_endnote Include +hi def link sisu_mark_endnote Delimiter hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String -hi def link sisu_fontface Include +hi def link sisu_fontface Delimiter hi def link sisu_strikeout DiffDelete hi def link sisu_content_alt Special hi def link sisu_sem_content SpecialKey @@ -190,7 +191,7 @@ hi def link sisu_sem_ex_block Comment hi def link sisu_index SpecialKey hi def link sisu_index_block Visual hi def link sisu_content_endnote Special -hi def link sisu_control Define +hi def link sisu_control Delimiter hi def link sisu_ocn Include hi def link sisu_number Number hi def link sisu_identifier Function diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index e4915326..65a09a0e 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.0.7-beta-rb1.9.2p180 -:date_stamp: 2011w16/3 -:date: "2011-04-20" +:version: 3.0.8-beta-rb1.9.2p180 +:date_stamp: 2011w18/4 +:date: "2011-05-05" :project: SiSU diff --git a/lib/sisu/v2/manpage.rb b/lib/sisu/v2/manpage.rb index a040f1a0..f9c75227 100644 --- a/lib/sisu/v2/manpage.rb +++ b/lib/sisu/v2/manpage.rb @@ -293,6 +293,7 @@ WOK dob.obj.gsub!(/┆/,'|') dob.obj.gsub!(/\s\.(\S+)/,' \\.\1') dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2') + dob.obj.gsub!(/-/,'\-') #manpages use this dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this if dob.is =~/group|verse|alt|code/ if dob.is =='code' diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index c500c282..656490d9 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -733,12 +733,14 @@ module SiSU_Param end if manpage['name'] manpage['name']=manpage['name'].join("\n.br\n") + manpage['name'].gsub!(/(-)/m,"\\\\\\1") manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n") else manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]' end if manpage['synopsis'] manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n") + manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1") manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n") else manpage['synopsis']='' diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 72b1ffc7..d3152947 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1983,7 +1983,7 @@ WOK ((defined? @rc['program_select']['odf_viewer']) \ && @rc['program_select']['odf_viewer'] =~/\S\S+/) \ ? @rc['program_select']['odf_viewer'] \ - : 'oowriter' #'odf-viewer','oowriter' + : 'lowriter' #'odf-viewer','oowriter' end def manpage_viewer 'man' diff --git a/lib/sisu/v3/cgi_pgsql.rb b/lib/sisu/v3/cgi_pgsql.rb index 48211068..fc802f03 100644 --- a/lib/sisu/v3/cgi_pgsql.rb +++ b/lib/sisu/v3/cgi_pgsql.rb @@ -115,12 +115,12 @@ module SiSU_CGI_pgsql a="postgresql db used for present directory: #{@db.psql.db}" b="\n\t(to create and populate postgresql database see 'man sisu' and in particular the -D flag)\n\t[the database to be used for this directory (#{@db.psql.db}) will have to be created manually if it does not exist,\n\tsee 'sisu --help sql'\n\tif you have permission to create databases:\n\t'sisu -d --createdb'\n\tor using postgresql tools directly:\n\t'createdb #{@db.psql.db}'\n\tfor a list of existing databases try 'psql --list']" SiSU_Screen::Ansi.new(@opt.cmd,a,b).txt_cyan - else puts 'failed in attempt to write sisu_pgsql.cgi to present directory, is directory writable?' + else puts 'failed in attempt to write #{@cgi_file_name} to present directory, is directory writable?' end end def header0 <<-WOK_SQL -#!/usr/bin/env ruby +#!/usr/bin/ruby1.8 =begin #{about} * Description: generates naive cgi search form for search of sisu database (pgsql) @@ -145,7 +145,7 @@ module SiSU_CGI_pgsql @l,@t,@q,@c=l,t,q,cse end def string - search={ search: [], flag: false } + search={ :search => [], :flag => false } if @t =~/\S+/ or @q =~/\S+/ if @t =~/\S+/; unescaped_search=CGI.unescape(@t) elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q) diff --git a/lib/sisu/v3/cgi_sql_common.rb b/lib/sisu/v3/cgi_sql_common.rb index 924b1533..1174be6e 100644 --- a/lib/sisu/v3/cgi_sql_common.rb +++ b/lib/sisu/v3/cgi_sql_common.rb @@ -299,9 +299,9 @@ module SiSU_CGI_sql end def text_to_match(identifier='') m={ - string: /#{identifier}\s*(.+?)/, - string: /#{identifier}\s*(.+?)(?:;|\n|\r|$)/, - word: /#{identifier}[\s(]*(\S+)/ + :string => /#{identifier}\s*(.+?)/, + :string => /#{identifier}\s*(.+?)(?:;|\n|\r|$)/, + :word => /#{identifier}[\s(]*(\S+)/ } search_string=if @search_field =~m[:word] search_string=if @search_field =~m[:braces]; m[:braces].match(@search_field)[1] @@ -328,10 +328,10 @@ module SiSU_CGI_sql def initialize(conn,search_for,q,c) @conn=conn @text_search_flag=false - @sql_statement={ body: '', endnotes: '',range: '' } + @sql_statement={ :body => '', :endnotes => '', :range => '' } #@offset||=@@offset #@offset+=@@limit - search={ text: [], endnotes: [] } + search={ :text => [], :endnotes => [] } cse=(c =~/\S/) ? true : false st=Dbi_search_string.new('doc_objects.clean',search_for.text1,q['s1'],cse).string se=Dbi_search_string.new('endnotes.clean',search_for.text1,q['s1'],cse).string @@ -645,7 +645,7 @@ module SiSU_CGI_sql @counters_txt,@counters_endn,@sql_select_body,@sql_select_endnotes='','','','' FCGI.each_cgi do |cgi| begin # all code goes in begin section - @search={ text: [], endnotes: [] } + @search={ :text => [], :endnotes => [] } q=CGI.new @db=if cgi['db'] =~/\S+/; @stub=/#{@db_name_prefix}(\S+)/.match(cgi['db'])[1] @@ -656,13 +656,13 @@ module SiSU_CGI_sql end checked_url,checked_stats,checked_searched,checked_tip,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,selected_db='','','','','','','','','' result_type=(cgi['view']=~/text/) \ - ? result_type={ index: '', text: 'checked'} \ - : result_type={ index: 'checked', text: ''} + ? result_type={ :index => '', :text => 'checked'} \ + : result_type={ :index => 'checked', :text => ''} @@limit=if cgi['sql_match_limit'].to_s=~/2500/ - checked_sql_limit={ l1000: '', l2500: 'checked'} + checked_sql_limit={ :l1000 => '', :l2500 => 'checked'} '2500' else - checked_sql_limit={ l1000: 'checked', l2500: ''} + checked_sql_limit={ :l1000 => 'checked', :l2500 => ''} '1000' end checked_echo='checked' if cgi['echo'] =~/\S/ @@ -792,7 +792,7 @@ module SiSU_CGI_sql </font> WOK #eg = %{canned search e.g.:<br /> <a href="#{url}">#{url}</a><br />find: #{analyze}<br />database: #{database}} - #dbi_canning + #% dbi_canning @header=Form.new(@base,search_field,selected_db,result_type,checked_sql_limit,checked_tip,checked_stats,checked_searched,checked_url,checked_case,checked_echo,checked_sql,checked_all,checked_none,checked_selected,checked_default,search_note,the_can).submission_form #% form unless q['s1'] =~/\S/ or q['au'] =~/\S/ or @search[:text][1] =~/\S/ print "Content-type: text/html\n\n" @@ -808,13 +808,13 @@ module SiSU_CGI_sql @search[:text]<<%{doc_objects.clean~*'#{CGI.unescape(s1)}'} @search[:endnotes]<<%{endnotes.clean~*'#{CGI.unescape(s1)}'} end - #dbi_request + #% dbi_request dbi_statement=Dbi_search_statement.new(@conn,@search_for,q,checked_case) @text_search_flag=false @text_search_flag=dbi_statement.text_search_flag s_contents=dbi_statement.contents s_endnotes=dbi_statement.endnotes - @body_main,@endnotes=[],[] + @body_main,@endnotes='','' @search_regx=nil oldtid=0 if @text_search_flag @@ -827,7 +827,48 @@ module SiSU_CGI_sql @endnotes << '<p><hr><br /><b>Endnotes:</b><br />' << sql_select_endnotes else end - #text_objects_body + @hostpath="#{@hosturl_files}/#{@stub}" + @ln='en' + def output_dir_structure + def by_language_code? + true + end + def by_filetype? + false + end + def by_filename? + false + end + self + end + def path_manifest(fn,ln=nil) + if output_dir_structure.by_language_code? + manifest_at="#{@hostpath}/#{ln}/manifest/#{fn}.manifest.html" + elsif output_dir_structure.by_filetype? + manifest_at="#{@hostpath}/manifest/#{fn}.manifest.html" + elsif output_dir_structure.by_filename? + manifest_at="#{@hostpath}/#{fn}/manifest.html" + end + end + def path_html_seg(fn,ln=nil) + if output_dir_structure.by_language_code? + html_at="#{@hostpath}/#{ln}/html/#{fn}" + elsif output_dir_structure.by_filetype? + html_at="#{@hostpath}/html/#{fn}" + elsif output_dir_structure.by_filename? + html_at="#{@hostpath}/#{fn}" + end + end + def path_html_doc(fn,ln=nil) + if output_dir_structure.by_language_code? + html_at="#{@hostpath}/#{ln}/html/#{fn}.html" + elsif output_dir_structure.by_filetype? + html_at="#{@hostpath}/html/#{fn}.html" + elsif output_dir_structure.by_filename? + html_at="#{@hostpath}/#{fn}/doc.html" + end + end + #% text_objects_body s_contents.each do |c| #% text body location=c['src_filename'][/(.+?)\.(?:ssm\.sst|sst)$/,1] file_suffix=c['src_filename'][/.+?\.(_?sst|ssm)$/,1] @@ -837,13 +878,13 @@ module SiSU_CGI_sql l=".#{l}" else '' end - #metadata_found_body + #% metadata_found_body if c['tid'].to_i != oldtid.to_i ti=c['title'] can_txt_srch=(cgi['view']=~/index/) \ ? %{<a href="#{@canned_base_url}&fns=#{c['src_filename']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a> } \ : %{<a href="#{@canned_base_url}&fns=#{c['src_filename']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a> } - title=%{<span style="background-color: #{@color_heading}"><a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"> #{ti}</a></span> by #{c['creator_author']} #{can_txt_srch}<a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a> <a href="#{@hosturl_files}/#{@stub}/epub/#{location}#{lang}.epub"><img border="0" width="15" height="15" src="#{@image_src}/b_epub.png" alt="epub"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/portrait#{lang}.pdf"><img border="0" width="15" height="18" src="#{@image_src}/b_pdf.png" alt="pdf portrait"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/landscape#{lang}.pdf"><img border="0" width="18" height="15" src="#{@image_src}/b_pdf.png" alt="pdf landscape"></a></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#{@image_src}/b_odf.png" alt="odf"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ #hmm watch file_suffix + title=%{<span style="background-color: #{@color_heading}"><a href="#{path_html_seg(location,@ln)}/toc.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"> #{ti}</a></span> by #{c['creator_author']} #{can_txt_srch}<a href="#{path_html_seg(location,@ln)}/toc.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a> <a href="#{path_manifest(location,@ln)}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ #hmm watch file_suffix title=@text_search_flag \ ? '<br /><hr>'+title \ : '<br />'+title @@ -880,7 +921,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="#{@hosturl_files}/#{@stub}/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}} + %{<hr><p><font size="2">ocn <b><a href="#{path_html_seg(location,@ln)}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a></b>:</font></p>#{matched_para}} elsif c['suffix'] =~/1/ #doc %{#{title}<hr><p><font size="2">ocn #{c['ocn']}:#{c['body']}} end @@ -888,9 +929,9 @@ module SiSU_CGI_sql output=title+text else #elsif cgi['view']=~/index/ #% idx body if c['suffix'] !~/1/ #seg - index=%{<a href="#{@hosturl_files}/#{@stub}/#{location}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag - elsif c['suffix'] =~/1/ #doc - index=%{<a href="#{@hosturl_files}/#{@stub}/#{location}/doc#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } + index=%{<a href="#{path_html_seg(location,@ln)}/#{c['seg']}#{lang}.html##{c['ocn']}">#{c['ocn']}</a>, } if @text_search_flag + elsif c['suffix'] =~/1/ #doc #FIX + index=%{<a href="#{path_html_doc(location,@ln)}##{c['ocn']}">#{c['ocn']}</a>, } end if c['seg'] =~/\S+/ if @text_search_flag @@ -936,7 +977,7 @@ module SiSU_CGI_sql can_txt_srch=(cgi['view']=~/index/) \ ? %{<a href="#{@canned_base_url}&fns=#{e['src_filename']}&view=text"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a> } \ : %{<a href="#{@canned_base_url}&fns=#{e['src_filename']}&view=index"><img border="0" width="24" height="16" src="#{@image_src}/b_search.png" alt="search"></a> } - title=%{<br /><hr><span style="background-color: #{@color_heading}"><a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"> #{ti}</a></span> by #{e['creator_author']} #{can_txt_srch}<a href="#{@hosturl_files}/#{@stub}/#{location}/toc#{lang}.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a> <a href="#{@hosturl_files}/#{@stub}/epub/#{location}#{lang}.epub"><img border="0" width="15" height="15" src="#{@image_src}/b_epub.png" alt="epub"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/portrait.pdf"><img border="0" width="15" height="18" src="#{@image_src}/b_pdf.png" alt="pdf portrait"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/landscape.pdf"><img border="0" width="18" height="15" src="#{@image_src}/b_pdf.png" alt="pdf landscape"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/opendocument#{lang}.odt"><img border="0" width="15" height="15" src="#{@image_src}/b_odf.png" alt="odf"></a> <a href="#{@hosturl_files}/#{@stub}/#{location}/sisu_manifest#{lang}.html"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ + title=%{<br /><hr><span style="background-color: #{@color_heading}"><a href="#{path_html_seg(location,@ln)}/toc.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"> #{ti}</a></span> by #{e['creator_author']} #{can_txt_srch}<a href="#{path_html_seg(location,@ln)}/toc.html"><img border="0" width="15" height="18" src="#{@image_src}/b_toc.png" alt="toc html"></a> <a href="#{path_manifest(location,@ln)}"><img border="0" width="15" height="15" src="#{@image_src}/b_info.png" alt="manifest"></a><br />} if file_suffix=~/s/ @counter_endn_doc+=1 oldtid=e['metadata_tid'].to_i else title = '' @@ -947,10 +988,10 @@ module SiSU_CGI_sql matched_endnote=(@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) \ ? matched=e['body'].gsub(/(<a\s+href="https?:\/\/[^><\s]+#{@search_regx}[^>]+?>|#{@search_regx})/mi,%{<span style="background-color: #{@color_match}">\\1</span>}) \ : e['body'] - output=%{#{title}<hr><font size="2">note <b><a href="#{@hosturl_files}/#{@stub}/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#{@hosturl_files}/#{@stub}/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}} - else #elsif cgi['view']=~/index/ #% idx endnotes + output=%{#{title}<hr><font size="2">note <b><a href="#{path_html_seg(location,@ln)}/endnotes.html#_#{e['nr']}">#{e['nr']}</a></b> referred to from ocn <a href="#{path_html_doc(location,@ln)}##{e['ocn']}">#{e['ocn']}</a>:</font> #{matched_endnote}} + else #elsif cgi['view']=~/index/ #doc #FIX #% idx endnotes @counter_endn_ocn+=1 - output=%{#{title}<a href="#{@hosturl_files}/#{@stub}/#{location}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [§ <a href="#{@hosturl_files}/#{@stub}/#{location}/doc.html##{e['ocn']}">#{e['ocn']}</a>], } + output=%{#{title}<a href="#{path_html_seg(location,@ln)}/endnotes.html#_#{e['nr']}">#{e['nr']}</a> [§ <a href="#{path_html_doc(location,@ln)}##{e['ocn']}">#{e['ocn']}</a>], } end @counters_endn=if @counter_endn_doc > 0 if checked_stats =~/\S/ @@ -964,7 +1005,7 @@ module SiSU_CGI_sql end end @endnotes << output #+ details - else @endnotes=[] #does not take out yet + else @endnotes='' #does not take out yet end end offset=dbi_statement.sql_offset.to_s @@ -974,7 +1015,7 @@ module SiSU_CGI_sql ? dbi_statement.pre_next(true,@image_src).to_s \ : dbi_statement.pre_next(false,@image_src).to_s limit=dbi_statement.sql_match_limit.to_s - cgi.out{@header + @counters_txt + @counters_endn + canned + @body_main.join + @endnotes.join + canned + @tail} #% print cgi_output_header+counters+body+endnotes + cgi.out{@header + @counters_txt + @counters_endn + canned + @body_main + @endnotes + canned + @tail} #% print cgi_output_header+counters+body+endnotes end rescue Exception => e s='<pre>' + CGI::escapeHTML(e.backtrace.reverse.join("\n")) diff --git a/lib/sisu/v3/cgi_sqlite.rb b/lib/sisu/v3/cgi_sqlite.rb index 5a415b0d..4a5838ab 100644 --- a/lib/sisu/v3/cgi_sqlite.rb +++ b/lib/sisu/v3/cgi_sqlite.rb @@ -66,6 +66,7 @@ module SiSU_CGI_sqlite @env=SiSU_Env::Info_env.new('',opt) @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys" @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt.cmd,@image_src,@env) + @cgi_file_name="#{Db[:name_prefix_db]}sqlite.cgi" end def sqlite serve=[] @@ -95,7 +96,7 @@ module SiSU_CGI_sqlite end f3 << %{ else '#{@env.path.webserv}/#{serve[0]}/sisu_sqlite.db'\n end\n} if FileTest.writable?('.') - output=File.open('sisu_sqlite.cgi','w') + output=File.open(@cgi_file_name,'w') output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << f3 << dbi_connect << @common.main2 a=%{ generated sisu_sqlite.cgi, BASED ON ALREADY CREATED sisu_sqlite.db OUTPUT, (-d) @@ -104,21 +105,22 @@ module SiSU_CGI_sqlite c=case @webserv when /pwd/; '' else "if necessary make the directory /usr/lib/cgi-bin : - sudo cp -vi #{Dir.pwd}/sisu_sqlite.cgi /usr/lib/cgi-bin/. - sudo chmod -v 755 /usr/lib/cgi-bin/sisu_sqlite.cgi - (copy sisu_sqlite.cgi to your cgi directory) and set file permissions to 755" + sudo cp -vi #{Dir.pwd}/#{@cgi_file_name} /usr/lib/cgi-bin/. + sudo chmod -v 755 /usr/lib/cgi-bin/#{@cgi_file_name} + sudo ln -s /usr/lib/cgi-bin/#{@cgi_file_name} /usr/lib/cgi-bin/sisu_sqlite.cgi + (copy #{@cgi_file_name} to your cgi directory) set file permissions to 755, and make symbolic link to sisu_sqlite.cgi" end a=%{#{c} #{@env.webserv_base_cgi}/cgi-bin/sisu_sqlite.cgi } b='(to create and populate sisu sqlite database see "man sisu" and in particular the -d flag)' SiSU_Screen::Ansi.new(@opt.cmd,a,b).warn - else puts 'failed in attempt to write sisu_sqlite.cgi to present directory, is directory writable?' + else puts "failed in attempt to write #{@cgi_file_name} to present directory, is directory writable?" end end def header0 <<-WOK_SQL -#!/usr/bin/env ruby +#!/usr/bin/ruby1.8 =begin #{about} * Description: generates naive cgi search form for search of sisu database (sqlite) @@ -141,7 +143,7 @@ module SiSU_CGI_sqlite @l,@t,@q=l,t,q end def string - search={ search: [], flag: false } + search={ :search => [], :flag => false } if @t =~/\S+/ or @q =~/\S+/ if @t =~/\S+/; unescaped_search=CGI.unescape(@t) elsif @q =~/\S+/; unescaped_search=CGI.unescape(@q) diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb index 8b70fdc5..d97c7786 100644 --- a/lib/sisu/v3/concordance.rb +++ b/lib/sisu/v3/concordance.rb @@ -77,7 +77,7 @@ module SiSU_Concordance @env,@md=@particulars.env,@particulars.md loc=@env.url.output_tell unless @md.opt.cmd =~/q/ - tool=(@md.opt.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{loc}/#{@md.fnb}/#{@md.fn[:concordance]}" : @md.fns + tool=(@md.opt.cmd =~/[MVv]/) ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance}/#{@md.file.base_filename.html_concordance}" : @md.fns @md.opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@md.opt.cmd,"Concordance",tool).grey_title_hi \ : SiSU_Screen::Ansi.new(@md.opt.cmd,'Concordance',tool).green_title_hi @@ -337,7 +337,7 @@ WOK end credits=@vz.credits_sisu @file_concordance << %{</div></body>\n</html>} # footer - SiSU_Screen::Ansi.new(@md.opt.cmd,@md.fns,"#{@env.path.output_tell}/#{@md.fn[:concordance]}").flow if @md.opt.cmd =~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,@md.fns,"#{@md.file.output_path.html_concordance}/#{@md.file.base_filename.html_concordance}").flow if @md.opt.cmd =~/[MV]/ end end end diff --git a/lib/sisu/v3/constants.rb b/lib/sisu/v3/constants.rb index d94da654..57491a7c 100644 --- a/lib/sisu/v3/constants.rb +++ b/lib/sisu/v3/constants.rb @@ -147,20 +147,18 @@ Px[:lng_lst]=%w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi h Px[:lv1]= '*' Px[:lv2]= '=' Px[:lv3]= '=' -#Px[:lv2_3]= '=' Px[:lv4]= '-' Px[:lv5]= '.' Px[:lv6]= '.' -#Px[:lv5_6]= '.' -Db[:name_prefix]="SiSU#{SiSU_version_dir}c_" -Db[:name_prefix_db]="sisu_#{SiSU_version_dir}c_" +Db[:name_prefix]="SiSU#{SiSU_version_dir}d_" +Db[:name_prefix_db]="sisu_#{SiSU_version_dir}d_" Db[:col_title]=800 Db[:col_title_part]=400 Db[:col_title_edition]=10 Db[:col_name]=600 Db[:col_creator_misc_short]=100 Db[:col_language]=100 -Db[:col_language_char]=3 +Db[:col_language_char]=6 Db[:col_date_text]=10 Db[:col_classify_txt_long]=600 Db[:col_classify_txt_short]=600 @@ -312,7 +310,7 @@ see polyglossia for subset * es_GA (Spanish, as spoken in Gabon) * es_GT (Spanish, as spoken in Guatemala) * es_HN (Spanish, as spoken in Honduras) -* es_LA (Spanish, as spoken in Lao People's Democratic Republic) +* es_LA (Spanish, as spoken in Lao People''s Democratic Republic) * es_MX (Spanish, as spoken in Mexico) * es_NI (Spanish, as spoken in Nicaragua) * es_PA (Spanish, as spoken in Panama) diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb index a25f0f99..28e7193d 100644 --- a/lib/sisu/v3/dal.rb +++ b/lib/sisu/v3/dal.rb @@ -77,7 +77,7 @@ module SiSU_DAL require_relative 'dal_character_check' # dal_character_check.rb require_relative 'dal_substitutions_and_insertions' # dal_substitutions_and_insertions.rb require_relative 'dal_expand_insertions' # dal_expand_insertions.rb - require_relative 'i18n' # i18n.rb + require_relative 'prog_text_translation' # prog_text_translation.rb require_relative 'shared_sem' # shared_sem.rb class Instantiate < SiSU_Param::Parameters::Instructions def initialize diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb index 61348d28..ed289015 100644 --- a/lib/sisu/v3/dal_doc_str.rb +++ b/lib/sisu/v3/dal_doc_str.rb @@ -482,8 +482,8 @@ module SiSU_document_structure_extract meta=[] dir=SiSU_Env::Info_env.new(@md.fns) base_html="#{dir.url.root}/#{@md.fnb}" - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] tr=SiSU_Translate::Source.new(@md,language) meta << @pb h={ ln: 2, obj: 'Metadata', ocn_: false } diff --git a/lib/sisu/v3/dal_metadata.rb b/lib/sisu/v3/dal_metadata.rb index 31a7e4b2..2e68c944 100644 --- a/lib/sisu/v3/dal_metadata.rb +++ b/lib/sisu/v3/dal_metadata.rb @@ -60,8 +60,8 @@ module SiSU_metadata class Metadata def initialize(md,metad) @md,@metadata=md,metad - l=SiSU_Env::Standardise_language.new.file_to_language(md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] @tr=SiSU_Translate::Source.new(md,language) end def make_para(obj,ocn) diff --git a/lib/sisu/v3/db_columns.rb b/lib/sisu/v3/db_columns.rb index 8b669b12..d8a6f3cf 100644 --- a/lib/sisu/v3/db_columns.rb +++ b/lib/sisu/v3/db_columns.rb @@ -64,6 +64,7 @@ module SiSU_DB_columns def initialize(md=nil) @md=md @db=SiSU_Env::Info_db.new #watch + @lang ||=SiSU_i18n::Languages.new if defined? md.opt.mod \ and md.opt.mod.inspect=~/import|update/ \ and FileTest.exist?(md.fns) @@ -98,7 +99,7 @@ module SiSU_DB_columns 'title' end def create_column - "#{name} VARCHAR(#{Db[:col_title]}) NULL," + "#{name} VARCHAR(#{Db[:col_title]}) NOT NULL," end def column_comment %{COMMENT ON COLUMN metadata_and_text.#{name} @@ -120,7 +121,7 @@ module SiSU_DB_columns 'title_main' end def create_column - "#{name} VARCHAR(#{Db[:col_title_part]}) NULL," + "#{name} VARCHAR(#{Db[:col_title_part]}) NOT NULL," end def column_comment %{COMMENT ON COLUMN metadata_and_text.#{name} @@ -237,9 +238,8 @@ module SiSU_DB_columns IS 'metadata document language [DC12]';} end def tuple - t=if defined? @md.title.language \ - and @md.title.language=~/\S+/ - txt=@md.title.language + t=if @lang.list[@md.opt.lng][:n] + txt=@lang.list[@md.opt.lng][:n] special_character_escape(txt) ["#{name}, ","'#{txt}', "] else ['',''] @@ -259,9 +259,9 @@ module SiSU_DB_columns IS 'metadata document language iso code';} end def tuple - t=if defined? @md.title.language_char \ - and @md.title.language_char=~/\S+/ - txt=@md.title.language_char + t=if defined? @md.opt.lng \ + and @md.opt.lng=~/\S+/ + txt=@md.opt.lng special_character_escape(txt) ["#{name}, ","'#{txt}', "] else ['',''] @@ -599,9 +599,8 @@ module SiSU_DB_columns IS 'metadata document language';} end def tuple - t=if defined? @md.language.document \ - and @md.language.document=~/\S+/ - txt=@md.language.document + t=if @lang.list[@md.opt.lng][:n] + txt=@lang.list[@md.opt.lng][:n] special_character_escape(txt) ["#{name}, ","'#{txt}', "] else ['',''] @@ -614,16 +613,17 @@ module SiSU_DB_columns 'language_document_char' end def create_column - "#{name} VARCHAR(#{Db[:col_language_char]}) NULL," + "#{name} VARCHAR(#{Db[:col_language_char]}) NOT NULL," end def column_comment %{COMMENT ON COLUMN metadata_and_text.#{name} IS 'metadata document language';} end def tuple - t=if defined? @md.language.document_char \ - and @md.language.document_char=~/\S+/ - txt=@md.language.document_char + #modify check, is now required, SiSUv3d_ + t=if defined? @md.opt.lng \ + and @md.opt.lng=~/\S+/ + txt=@md.opt.lng special_character_escape(txt) ["#{name}, ","'#{txt}', "] else ['',''] @@ -1832,7 +1832,7 @@ module SiSU_DB_columns 'src_filename' end def create_column - "#{name} VARCHAR(#{Db[:col_filename]}) NULL," + "#{name} VARCHAR(#{Db[:col_filename]}) NOT NULL," end def column_comment %{COMMENT ON COLUMN metadata_and_text.#{name} diff --git a/lib/sisu/v3/db_import.rb b/lib/sisu/v3/db_import.rb index f1e7f064..541399a9 100644 --- a/lib/sisu/v3/db_import.rb +++ b/lib/sisu/v3/db_import.rb @@ -96,17 +96,17 @@ module SiSU_DB_import @col[:lid] ||=0 @col[:lid]=@driver_sqlite3 \ ? @conn.execute( sql ).join.to_i \ - : @conn.execute( sql ) { |x| x.fetch_all.to_s.to_i } + : @conn.execute( sql ) { |x| x.fetch_all.flatten[0] } rescue puts "#{__FILE__}:#{__LINE__}" if @opt.cmd =~/M/ end @col[:lid]=0 if @col[:lid].nil? or @col[:lid].to_s.empty? sql='SELECT MAX(nid) FROM endnotes' begin - @id_n ||=0 @id_n=@driver_sqlite3 \ ? @conn.execute( sql ).join.to_i \ - : @id_n=@conn.execute( sql ) { |x| x.fetch_all.to_s.to_i } + : @id_n=@conn.execute( sql ) { |x| x.fetch_all.flatten[0] } + @id_n ||=0 rescue puts "#{__FILE__}:#{__LINE__}" if @opt.cmd =~/M/ end @@ -120,7 +120,13 @@ module SiSU_DB_import @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here SiSU_Screen::Ansi.new(@opt.cmd,"#{@db.psql.db}::#{@opt.fns}").puts_blue if @opt.cmd =~/vVM/ SiSU_Screen::Ansi.new(@opt.cmd,'Marshal Load',@fnc).puts_grey if @opt.cmd =~/v/ - select_first_match=%{ SELECT metadata_and_text.tid FROM metadata_and_text WHERE metadata_and_text.src_filename = '#{@opt.fns}'; } +#% + select_first_match=%{ + SELECT metadata_and_text.tid + FROM metadata_and_text + WHERE metadata_and_text.src_filename = '#{@opt.fns}' + AND metadata_and_text.language_document_char = '#{@opt.lng}' + ;} file_exist=@sql_type=~/sqlite/ \ ? @conn.get_first_value(select_first_match) \ : @conn.select_one(select_first_match) @@ -187,7 +193,7 @@ module SiSU_DB_import else if file_exist @db=SiSU_Env::Info_db.new - puts "\n#{@cX.grey}file #{@cX.off} #{@cX.blue}#{@opt.fns}#{@cX.off} #{@cX.grey}already exists in database#{@cX.off} #{@cX.blue}#{@db.psql.db}#{@cX.off} #{@cX.brown}update instead?#{@cX.off}" + puts "\n#{@cX.grey}file #{@cX.off} #{@cX.blue}#{@opt.fns}#{@cX.off} in language code #{cX.blue}#{@opt.lng}#{cX.off} #{@cX.grey}already exists in database#{@cX.off} #{@cX.blue}#{@db.psql.db}#{@cX.off} #{@cX.brown}update instead?#{@cX.off}" end end end @@ -215,18 +221,18 @@ module SiSU_DB_import #@tp[:title]=@md.title.full #special_character_escape(@tp[:title]) #@tp[:title_f],@tp[:title_i]='title, ',"'#{@tp[:title]}', " - sql='SELECT MAX(tid) FROM metadata_and_text' + sql='SELECT MAX(tid) FROM metadata_and_text;' begin @@id_t ||=0 id_t=if @driver_sqlite3 @conn.execute( sql ).join.to_i # { |x| id_t=x.join.to_i } - else @conn.execute( sql ) { |x| x.fetch_all.to_s.to_i } + else + @conn.execute( sql ) { |x| x.fetch_all.flatten[0] } end @@id_t=id_t if id_t rescue puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/ end - @@id_t =0 if @col[:lid].nil? or @col[:lid].to_s.empty? @@id_t+=1 #bug related, needs to be performed once at start of file, but consider moving, as, placed here it means program will fail if document header lacks @title: puts %{\n#{@cX.grey}Processing file number#{@cX.off}: #{@cX.green}#{@@id_t}#{@@cX.off}} if @opt.cmd =~/vVM/ end @@ -421,7 +427,8 @@ module SiSU_DB_import txt=%{\n\nLARGE TEXT BLOCK OMITTED\n\n} end if txt - en={ type: 'endnotes', + en={ + type: 'endnotes', id: @id_n, lid: @col[:lid], nr: nr, @@ -459,7 +466,8 @@ module SiSU_DB_import txt=%{\n\nLARGE TEXT BLOCK OMITTED\n\n} end if txt - en={ type: 'endnotes_asterisk', + en={ + type: 'endnotes_asterisk', id: @id_n, lid: @col[:lid], nr: nr, @@ -497,7 +505,8 @@ module SiSU_DB_import txt=%{\n\nLARGE TEXT BLOCK OMITTED\n\n} end if txt - en={ type: 'endnotes_plus', + en={ + type: 'endnotes_plus', id: @id_n, lid: @col[:lid], nr: nr, diff --git a/lib/sisu/v3/db_indexes.rb b/lib/sisu/v3/db_indexes.rb index de20e4c4..64a51474 100644 --- a/lib/sisu/v3/db_indexes.rb +++ b/lib/sisu/v3/db_indexes.rb @@ -93,6 +93,7 @@ module SiSU_DB_index %{CREATE INDEX idx_title ON metadata_and_text(title);}, %{CREATE INDEX idx_author ON metadata_and_text(creator_author);}, %{CREATE INDEX idx_filename ON metadata_and_text(src_filename);}, + %{CREATE INDEX idx_language ON metadata_and_text(language_document_char);}, %{CREATE INDEX idx_topics ON metadata_and_text(classify_topic_register)}, ] conn_execute_array(sql_arr) diff --git a/lib/sisu/v3/db_remove.rb b/lib/sisu/v3/db_remove.rb index 025514b1..cfa19c9f 100644 --- a/lib/sisu/v3/db_remove.rb +++ b/lib/sisu/v3/db_remove.rb @@ -72,9 +72,19 @@ module SiSU_DB_remove : false end del_id=if driver_sqlite3 - @conn.get_first_value(%{ SELECT tid FROM metadata_and_text WHERE src_filename = '#{@opt.fns}'; }).to_i + @conn.get_first_value(%{ + SELECT tid + FROM metadata_and_text + WHERE src_filename = '#{@opt.fns}' + AND metadata_and_text.language_document_char = '#{@opt.lng}' + ;}).to_i else - x=@conn.select_one(%{ SELECT metadata_and_text.tid FROM metadata_and_text WHERE metadata_and_text.src_filename = '#{@opt.fns}'; }) + x=@conn.select_one(%{ + SELECT metadata_and_text.tid + FROM metadata_and_text + WHERE metadata_and_text.src_filename = '#{@opt.fns}' + AND metadata_and_text.language_document_char = '#{@opt.lng}' + ;}) x ? (x.join.to_i) : nil end if del_id diff --git a/lib/sisu/v3/db_select.rb b/lib/sisu/v3/db_select.rb index 9bf8acbc..0cd34bcd 100644 --- a/lib/sisu/v3/db_select.rb +++ b/lib/sisu/v3/db_select.rb @@ -164,7 +164,7 @@ module SiSU_DB_select db_exist? @sdb_import.marshal_load tell=case @sql_type - when /sqlite/; SiSU_Screen::Ansi.new(@opt.cmd,"sqlite #{@db.sqlite.db} database?") + when /sqlite/; SiSU_Screen::Ansi.new(@opt.cmd,"sqlite3 #{@db.sqlite.db} database?") when /pg/; SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?") else '???' end @@ -173,7 +173,13 @@ module SiSU_DB_select db_exist? @sdb_remove_doc.remove @sdb_import.marshal_load - SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?").puts_grey if @opt.cmd =~/v/ + tell=case @sql_type + when /sqlite/; SiSU_Screen::Ansi.new(@opt.cmd,"sqlite3 #{@db.sqlite.db} database?") + when /pg/; SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?") + else '???' + end + tell.puts_grey if @opt.cmd =~/v/ + when /^--update$/ when /^--remove$/ db_exist? @sdb_remove_doc.remove diff --git a/lib/sisu/v3/digests.rb b/lib/sisu/v3/digests.rb index e11ac945..e7b303ba 100644 --- a/lib/sisu/v3/digests.rb +++ b/lib/sisu/v3/digests.rb @@ -58,7 +58,7 @@ =end module SiSU_Digest_view require_relative 'particulars' # particulars.rb - require_relative 'i18n' # i18n.rb + require_relative 'prog_text_translation' # prog_text_translation.rb require_relative 'shared_markup_alt.rb' # shared_markup_alt.rb pwd=Dir.pwd class Source @@ -101,8 +101,8 @@ module SiSU_Digest_view @@dg ||=@env.digest.type @@dl ||=@env.digest.length @dg,@dl=@@dg,@@dl - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - @language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + @language=l[:n] @tr=SiSU_Translate::Source.new(@md,@language) @sp=' ' end diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v3/git.rb index 9d1d9332..bef93bc3 100644 --- a/lib/sisu/v3/git.rb +++ b/lib/sisu/v3/git.rb @@ -67,7 +67,7 @@ module SiSU_Git @env=SiSU_Env::Info_env.new @md=SiSU_Param::Parameters.new(@opt).get @file=SiSU_Env::SiSU_file.new(@md) - l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language unless @md.i18n[0]==l[:c] p "using: #{@md.i18n[0]} (@make: :language:); filename #{@md.fns} filename language: #{l[:c]}, mismatch" end diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb index e20b4293..ed3aad1d 100644 --- a/lib/sisu/v3/hub.rb +++ b/lib/sisu/v3/hub.rb @@ -105,6 +105,7 @@ module SiSU @opt.fns=fns @opt.pth=@opt.paths[i] @opt.f_pth=@opt.f_pths[i] + @opt.lng=@opt.lngs[i] @@pwd=@opt.pth Dir.chdir(@opt.pth) #watch env=SiSU_Env::Info_env.new(fns) diff --git a/lib/sisu/v3/i18n.rb b/lib/sisu/v3/i18n.rb index 9fbe8c3e..1001b6fb 100644 --- a/lib/sisu/v3/i18n.rb +++ b/lib/sisu/v3/i18n.rb @@ -57,6 +57,160 @@ =end module SiSU_i18n + @@language_table,@@language_list=nil,nil + class Languages + def language + def table + @@language_table ||= { + am: { c: 'am', n: 'Amharic', xlp: 'amharic'}, + bg: { c: 'bg', n: 'Bulgarian', xlp: 'bulgarian'}, + bn: { c: 'bn', n: 'Bengali', xlp: 'bengali'}, + br: { c: 'br', n: 'Breton', xlp: 'breton'}, + ca: { c: 'ca', n: 'Catalan', xlp: 'catalan'}, + cs: { c: 'cs', n: 'Czech', xlp: 'czech'}, + cy: { c: 'cy', n: 'Welsh', xlp: 'welsh'}, + da: { c: 'da', n: 'Danish', xlp: 'danish'}, + de: { c: 'de', n: 'German', xlp: 'german'}, + el: { c: 'el', n: 'Greek', xlp: 'greek'}, + en: { c: 'en', n: 'English', xlp: 'english'}, + eo: { c: 'eo', n: 'Esperanto', xlp: 'esperanto'}, + es: { c: 'es', n: 'Spanish', xlp: 'spanish'}, + et: { c: 'et', n: 'Estonian', xlp: 'estonian'}, + eu: { c: 'eu', n: 'Basque', xlp: 'basque'}, + fi: { c: 'fi', n: 'Finnish', xlp: 'finnish'}, + fr: { c: 'fr', n: 'French', xlp: 'french'}, + ga: { c: 'ga', n: 'Irish', xlp: 'irish'}, + gl: { c: 'gl', n: 'Galician', xlp: 'galician'}, + he: { c: 'he', n: 'Hebrew', xlp: 'hebrew'}, + hi: { c: 'hi', n: 'Hindi', xlp: 'hindi'}, + hr: { c: 'hr', n: 'Croatian', xlp: 'croatian'}, + hy: { c: 'hy', n: 'Armenian', xlp: 'armenian'}, + ia: { c: 'ia', n: 'Interlingua', xlp: 'interlingua'}, + is: { c: 'is', n: 'Icelandic', xlp: 'icelandic'}, + it: { c: 'it', n: 'Italian', xlp: 'italian'}, + la: { c: 'la', n: 'Latin', xlp: 'latin'}, + lo: { c: 'lo', n: 'Lao', xlp: 'lao'}, + lt: { c: 'lt', n: 'Lithuanian', xlp: 'lithuanian'}, + lv: { c: 'lv', n: 'Latvian', xlp: 'latvian'}, + ml: { c: 'ml', n: 'Malayalam', xlp: 'malayalam'}, + mr: { c: 'mr', n: 'Marathi', xlp: 'marathi'}, + nl: { c: 'nl', n: 'Dutch', xlp: 'dutch'}, + no: { c: 'no', n: 'Norwegian', xlp: 'norsk'}, + nn: { c: 'nn', n: 'Norwegian Nynorsk', xlp: 'nynorsk'}, + oc: { c: 'oc', n: 'Occitan', xlp: 'occitan'}, + pl: { c: 'pl', n: 'Polish', xlp: 'polish'}, + pt: { c: 'pt', n: 'Portuguese', xlp: 'portuges'}, + pt_BR: { c: 'pt_BR', n: 'Portuguese Brazil', xlp: 'brazilian'}, + ro: { c: 'ro', n: 'Romanian', xlp: 'romanian'}, + ru: { c: 'ru', n: 'Russian', xlp: 'russian'}, + sa: { c: 'sa', n: 'Sanskrit', xlp: 'sanskrit'}, + se: { c: 'se', n: 'Sami', xlp: 'samin'}, + sk: { c: 'sk', n: 'Slovak', xlp: 'slovak'}, + sl: { c: 'sl', n: 'Slovenian', xlp: 'slovenian'}, + sq: { c: 'sq', n: 'Albanian', xlp: 'albanian'}, + sr: { c: 'sr', n: 'Serbian', xlp: 'serbian'}, + sv: { c: 'sv', n: 'Swedish', xlp: 'swedish'}, + ta: { c: 'ta', n: 'Tamil', xlp: 'tamil'}, + te: { c: 'te', n: 'Telugu', xlp: 'telugu'}, + th: { c: 'th', n: 'Thai', xlp: 'thai'}, + tk: { c: 'tk', n: 'Turkmen', xlp: 'turkmen'}, + tr: { c: 'tr', n: 'Turkish', xlp: 'turkish'}, + uk: { c: 'uk', n: 'Ukranian', xlp: 'ukrainian'}, + ur: { c: 'ur', n: 'Urdu', xlp: 'urdu'}, + us: { c: 'en', n: 'English (American)',xlp: 'english'}, + vi: { c: 'vi', n: 'Vietnamese', xlp: 'vietnamese'}, + en: { c: 'en', n: 'English', xlp: 'english'}, + xx: { c: 'xx', n: 'Default', xlp: 'english'}, + } + end + def list + @@language_list ||= { + 'am' => table[:am], + 'bg' => table[:bg], + 'bn' => table[:bn], + 'br' => table[:br], + 'ca' => table[:ca], + 'cs' => table[:cs], + 'cy' => table[:cy], + 'da' => table[:da], + 'de' => table[:de], + 'el' => table[:el], + 'en' => table[:en], + 'eo' => table[:eo], + 'es' => table[:es], + 'et' => table[:et], + 'eu' => table[:eu], + 'fi' => table[:fi], + 'fr' => table[:fr], + 'ga' => table[:ga], + 'gl' => table[:gl], + 'he' => table[:he], + 'hi' => table[:hi], + 'hr' => table[:hr], + 'hy' => table[:hy], + 'ia' => table[:ia], + 'is' => table[:is], + 'it' => table[:it], + 'la' => table[:la], + 'lo' => table[:lo], + 'lt' => table[:lt], + 'lv' => table[:lv], + 'ml' => table[:ml], + 'mr' => table[:mr], + 'nl' => table[:nl], + 'no' => table[:no], + 'nn' => table[:nn], + 'oc' => table[:oc], + 'pl' => table[:pl], + 'pt' => table[:pt], + 'pt_BR' => table[:pt_BR], + 'ro' => table[:ro], + 'ru' => table[:ru], + 'sa' => table[:sa], + 'se' => table[:se], + 'sk' => table[:sk], + 'sl' => table[:sl], + 'sq' => table[:sq], + 'sr' => table[:sr], + 'sv' => table[:sv], + 'ta' => table[:ta], + 'te' => table[:te], + 'th' => table[:th], + 'tk' => table[:tk], + 'tr' => table[:tr], + 'uk' => table[:uk], + 'ur' => table[:ur], + 'us' => table[:en], + 'vi' => table[:vi], + 'en' => table[:en], + 'xx' => table[:en] + } + end + self + end + end +end +__END__ +Language Lists +* po4a c: + <http://www.debian.org/international/l10n/po/> + Px[:lng_lst]=%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 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] +* polyglossia xlp: + <http://mirrors.ctan.org/macros/xetex/latex/polyglossia/polyglossia.pdf> + missing from (:c) list: + arabic asturian bahasai bahasam coptic divehi farsi lsorbian magyar scottish syriac usorbian +note ISO_639-1 + <http://en.wikipedia.org/wiki/ISO_639-1> + <http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes> +also note ISO_639-2 + <http://en.wikipedia.org/wiki/ISO_639-2> + <http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes> + +Px[:lng_lst] # constants.rb + + + +module SiSU_text_translation class Language def initialize(md) @md=md @@ -140,1642 +294,3 @@ module SiSU_i18n end end end -module SiSU_Translate - require_relative 'sysenv' # sysenv.rb - include SiSU_Env; include SiSU_Param - class Source - def initialize(md,doc_lang,trans_str='') - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - @lang_class=case @doc_lang - when /American/i; English.new(md,doc_lang,trans_str) # tag depreciated, see iso 639-2 - when /English/i; English.new(md,doc_lang,trans_str) - when /French/i; French.new(md,doc_lang,trans_str) - when /German/i; German.new(md,doc_lang,trans_str) - when /Italian/i; Italian.new(md,doc_lang,trans_str) - when /Spanish/i; Spanish.new(md,doc_lang,trans_str) - when /Brazilian(?: Portuguese)?/i; Portuguese.new(md,doc_lang,trans_str) # tag depreciated, see iso 639-2 - when /Portuguese/i; Portuguese.new(md,doc_lang,trans_str) - when /Swedish/i; Swedish.new(md,doc_lang,trans_str) - when /Danish/i; Danish.new(md,doc_lang,trans_str) - when /Finnish/i; Finnish.new(md,doc_lang,trans_str) - when /Norwegian/i; Norwegian.new(md,doc_lang,trans_str) - when /Icelandic/i; Icelandic.new(md,doc_lang,trans_str) - when /Dutch/i; Dutch.new(md,doc_lang,trans_str) - when /Estonian/i; Estonian.new(md,doc_lang,trans_str) - when /Hungarian/i; Hungarian.new(md,doc_lang,trans_str) - when /Polish/i; Polish.new(md,doc_lang,trans_str) - when /Romanian/i; Romanian.new(md,doc_lang,trans_str) - when /Russian/i; Russian.new(md,doc_lang,trans_str) - when /Greek/i; Greek.new(md,doc_lang,trans_str) - when /Ukranian/i; Ukranian.new(md,doc_lang,trans_str) - when /Turkish/i; Turkish.new(md,doc_lang,trans_str) - when /Slovenian/i; Slovenian.new(md,doc_lang,trans_str) - when /Croatian/i; Croatian.new(md,doc_lang,trans_str) - when /Slovak(?:ian)?/i; Slovak.new(md,doc_lang,trans_str) - when /Czech/i; Czech.new(md,doc_lang,trans_str) - when /Bulgarian/i; Bulgarian.new(md,doc_lang,trans_str) - else English.new(md,doc_lang,trans_str) - end - end - - def filename - @lang_class.filename - end - def description - @lang_class.description - end - def metadata - @lang_class.metadata - end - def filetype_description - @lang_class.filetype_description - end - def file_size - @lang_class.file_size - end - def sourcefile - @lang_class.sourcefile - end - def sourcefile_digest - @lang_class.sourcefile_digest - end - def full_title #dc - @lang_class.full_title - end - def title - @lang_class.title - end - def subtitle - @lang_class.subtitle - end - def author - @lang_class.author - end - def contributor - @lang_class.contributor - end - def translator - @lang_class.translator - end - def illustrator - @lang_class.illustrator - end - def publisher - @lang_class.publisher - end - def prepared_by - @lang_class.prepared_by - end - def digitized_by - @lang_class.digitized_by - end - def subject - @lang_class.subject - end - def description #dc (watch) - @lang_class.description - end - def abstract - @lang_class.abstract - end - def type - @lang_class.type - end - def rights - @lang_class.rights - end - def digitized_by - @lang_class.digitized_by - end - def date - @lang_class.date - end - def date_created - @lang_class.date_created - end - def date_available - @lang_class.date_available - end - def date_valid - @lang_class.date_valid - end - def date_modified - @lang_class.date_modified - end - def date_issued - @lang_class.date_issued - end - def language - @lang_class.language - end - def language_original - @lang_class.language_original - end - def format - @lang_class.format - end - def identifier - @lang_class.identifier - end - def source - @lang_class.source - end - def relation - @lang_class.relation - end - def coverage - @lang_class.coverage - end - def keywords - @lang_class.keywords - end - def comments - @lang_class.comments - end - def cls_loc - @lang_class.cls_loc - end - def cls_dewey - @lang_class.cls_dewey - end - def cls_oclc - @lang_class.cls_oclc - end - def cls_gutenberg - @lang_class.cls_gutenberg - end - def cls_isbn - @lang_class.cls_isbn - end - def prefix_a - @lang_class.prefix_a - end - def prefix_b - @lang_class.prefix_b - end - def topic_register - @lang_class.topic_register - end - def fns - @lang_class.fns - end - def word_count - @lang_class.word_count - end - def dgst - @lang_class.dgst - end - def sc_number - @lang_class.sc_number - end - def sc_date - @lang_class.sc_date - end - def last_generated - @lang_class.last_generated - end - def sisu_version - @lang_class.sisu_version - end - def ruby_version - @lang_class.ruby_version - end - def suggested_links - @lang_class.suggested_links - end - def language_version_list - @lang_class.language_version_list - end - def language - @lang_class.language - end - def manifest_description - @lang_class.manifest_description - end - def manifest_description_output - @lang_class.manifest_description_output - end - def manifest_description_metadata - @lang_class.manifest_description_metadata - end - def language_list_translated - @lang_class.language_list - end - def language_list - lang=case @trans_str - when /American/i; 'American English' # tag depreciated, see iso 639-2 - when /English/i; 'English' - when /French/i; 'français' - when /German/i; 'Deutsch' - when /Italian/i; 'Italiano' - when /Spanish/i; 'español' - when /Brazilian(?: Portuguese)?/i; 'Brazilian Português' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Português' - when /Swedish/i; 'svenska' - when /Danish/i; 'dansk' - when /Finnish/i; 'suomi' - when /Norwegian/i; 'norsk' - when /Icelandic/i; 'Icelandic' - when /Dutch/i; 'Nederlands' - when /Estonian/i; 'Estonian' - when /Hungarian/i; 'Hungarian' - when /Polish/i; 'polski' - when /Romanian/i; 'română' - when /Russian/i; 'Русский (Russkij)' - when /Greek/i; 'Ελληνικά (Ellinika)' - when /Ukranian/i; 'українська (ukrajins\'ka)' - when /Turkish/i; 'Türkçe' - when /Slovenian/i; 'Slovenian' - when /Croatian/i; 'Croatian' - when /Slovak(?:ian)?/i; 'slovensky' #slovensky ? - when /Czech/i; 'česky' - when /Bulgarian/i; 'Български (Bəlgarski)' - when /Japanese/i; '日本語 (Nihongo)' - when /Korean/i; '한국어 (Hangul)' - #when /Catalan/i; 'català' - else 'English' - end - #check on 中文 and عربي - end - end - class English - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'filename' - end - def description - 'description' - end - def filetype_description - 'filetype description' - end - def metadata - 'metadata' - end - def file_size - 'file size' - end - def full_title #dc - 'Title' - end - def title - 'Title' - end - def subtitle - 'Subtitle' - end - def author - 'Author' - end - def author #dc - 'Creator' - end - def contributor #dc - 'Contributor' - end - def translator - 'Translator' - end - def illustrator - 'Illustrator' - end - def publisher #dc - 'Publisher' - end - def prepared_by - 'Prepared by' - end - def digitized_by - 'Digitized by' - end - def subject #dc - 'Subject' - end - def description #dc (watch) - 'Description' - end - def abstract #dc - 'Abstract' - end - def type #dc - 'Type' - end - def rights #dc - 'Rights' - end - def date #dc - 'Date' - end - def date_created #dc - 'Date created' - end - def date_issued #dc - 'Date issued' - end - def date_available #dc - 'Date available' - end - def date_modified #dc - 'Date modified' - end - def date_valid #dc - 'Date valid' - end - def language #dc - 'Language' - end - def language_original - 'Original Language' - end - def format #dc - 'Format' - end - def identifier #dc - 'Identifier' - end - def source #dc - 'Source' - end - def relation #dc - 'Relation' - end - def coverage #dc - 'Coverage' - end - def keywords - 'Keywords' - end - def comments - 'Comments' - end - def cls_loc - 'Classify Library of Congress' - end - def cls_dewey - 'Classify Dewey' - end - def cls_oclc - 'Classify OCLC number' - end - def cls_gutenberg - 'Classify Project Gutenberg' - end - def cls_isbn - 'Classify ISBN' - end - def prefix_a - 'Prefix (a)' - end - def prefix_b - 'Prefix (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Sourcefile' - end - def word_count - 'Word Count approximate' - end - def sourcefile_digest - 'Sourcefile Digest' - end - def digest_md5 - 'Sourcefile Digest (md5)' - end - def digest_sha256 - 'Sourcefile Digest (sha256)' - end - def sc_number - 'Document (RCS/CVS) number' - end - def sc_date - 'Document (RCS/CVS) number' - end - def last_generated - 'Document (dal) last generated' - end - def sisu_version - 'Generated by' - end - def ruby_version - 'Ruby version' - end - def suggested_links - 'metadata suggested links' - end - def language_version_list - 'Document Language Versions, manifests' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'Available document filetypes' - end - def manifest_description_metadata - 'Document Metadata' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'American English' # tag depreciated, see iso 639-2 - when /English/i; 'English' - when /French/i; 'French' - when /German/i; 'German' - when /Italian/i; 'Italian' - when /Spanish/i; 'Spanish' - when /Brazilian(?: Portuguese)?/i; 'Brazilian Portuguese' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portuguese' - when /Swedish/i; 'Swedish' - when /Danish/i; 'Danish' - when /Finnish/i; 'Finnish' - when /Norwegian/i; 'Norwegian' - when /Icelandic/i; 'Icelandic' - when /Dutch/i; 'Dutch' - when /Estonian/i; 'Estonian' - when /Hungarian/i; 'Hungarian' - when /Polish/i; 'Polish' - when /Romanian/i; 'Romanian' - when /Russian/i; 'Russian' - when /Greek/i; 'Greek' - when /Ukranian/i; 'Ukranian' - when /Turkish/i; 'Turkish' - when /Slovenian/i; 'Slovenian' - when /Croatian/i; 'Croatian' - when /Slovak(?:ian)?/i; 'Slovakian' - when /Czech/i; 'Czech' - when /Bulgarian/i; 'Bulgarian' - else @trans_str - end - end - end - class French - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'nom de fichier' - end - def description - 'description' - end - def filetype_description - description - end - def metadata - 'metadonnées' - end - def file_size - 'taille' - end - def full_title #dc - 'Titre' - end - def title - 'Titre' - end - def subtitle - 'Sous titre' - end - def author - 'Auteur' - end - def author #dc - 'Auteur' - end - def contributor #dc - 'Contributeur' - end - def translator - 'Traducteur' - end - def illustrator - 'Illustrateur' - end - def publisher #dc - 'Éditeur' - end - def prepared_by - 'Préparé par' - end - def digitized_by - 'Numérisé par' - end - def subject #dc - 'Sujet' - end - def description #dc (watch) - 'Description' - end - def abstract #dc - 'Résumé' - end - def type #dc - 'Type' - end - def rights #dc - 'Droits relatifs à la ressource' - end - def date #dc - 'Date' - end - def date_created #dc - 'Date de création' - end - def date_issued #dc - 'Date de publication' - end - def date_available #dc - 'Date de mise à disposition' - end - def date_modified #dc - 'Date de modification' - end - def date_valid #dc - 'Date de validité' - end - def language #dc - 'Langue' - end - def language_original - 'Langue originale' - end - def format #dc - 'Format' - end - def identifier #dc - 'Identifiant' - end - def source #dc - 'Source' - end - def relation #dc - 'Lien' - end - def coverage #dc - 'Portée du document' - end - def keywords - 'Mots clef' - end - def comments - 'Commentaires' - end - def cls_loc - 'Classification de la bibliothèque du congres' - end - def cls_dewey - 'Classification Dewey' - end - def cls_oclc # fix - 'Classify OCLC number' - end - def cls_gutenberg - 'Classification du project Gutenberg' - end - def cls_isbn - 'Classification ISBN' - end - def prefix_a - 'Préfixe (a)' - end - def prefix_b - 'Préfixe (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Fichier source' - end - def word_count - 'Nombre approximatif de mots' - end - def sourcefile_digest - 'Condensé du fichier source' - end - def digest_md5 - 'Condensé du fichier source (md5)' - end - def digest_sha256 - 'Condensé du fichier source (sha256)' - end - def sc_number - 'Numéro (RCS/CVS) du document' - end - def sc_date - 'Numéro (RCS/CVS) du document' - end - def last_generated - 'Dernière production du document (metaverse)' - end - def sisu_version - 'Généré par' - end - def ruby_version - 'Version de Ruby' - end - def suggested_links - 'Liens suggérés' - end - def language_version_list - 'Versions des langues du document, manifestes' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'Manifeste SiSU du document généré' - end - def manifest_description_metadata - 'Manifeste SiSU des métadonnées du document' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'Anglais americain' # tag depreciated, see iso 639-2 - when /English/i; 'Anglais' - when /French/i; 'Français' - when /German/i; 'Allemand' - when /Italian/i; 'Italien' - when /Spanish/i; 'Espagnol' - when /Brazilian(?: Portuguese)?/i; 'Portugais brésilien' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portugais' - when /Swedish/i; 'Suédois' - when /Danish/i; 'Danois' - when /Finnish/i; 'Finnois' - when /Norwegian/i; 'Norvégien' - when /Icelandic/i; 'Islandais' - when /Dutch/i; 'Néerlandais' - when /Estonian/i; 'Estonien' - when /Hungarian/i; 'Hongrois' - when /Polish/i; 'Polonais' - when /Romanian/i; 'Roumain' - when /Russian/i; 'Russe' - when /Greek/i; 'Grec' - when /Ukranian/i; 'Ukrainien' - when /Turkish/i; 'Turc' - when /Slovenian/i; 'Slovène' - when /Croatian/i; 'Croate' - when /Slovak(?:ian)?/i; 'Slovaque' - when /Czech/i; 'Tcheque' - when /Bulgarian/i; 'Bulgare' - else @trans_str - end - end - end - class German - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'Dateiname' - end - def description - 'Beschreibung' - end - def filetype_description - description - end - def metadata - 'Metadata' - end - def file_size - 'Dateigrösse' - end - def full_title #dc - 'Titel' - end - def title - 'Titel' - end - def subtitle - 'Untertitel' - end - def author - 'Autor' - end - def contributor #dc - 'Mitautor' - end - def translator - 'Übersetzung' - end - def illustrator - 'Illustrator' - end - def publisher - 'Herausgeber' - end - def prepared_by - 'gesetzt von' - end - def digitized_by - 'digitalisiert von' - end - def subject - 'Titel' - end - def description #dc (watch) - 'Beschreibung' - end - def abstract #dc - 'Abstract' - end - def type - 'Typ' - end - def rights - 'Rechte' - end - def date - 'Datum' - end - def date_created - 'Erstellung' - end - def date_issued - 'Herausgabe' - end - def date_available - 'Veröffentlichung' - end - def date_modified - 'Modifikation' - end - def date_valid - 'Gültigkeit' - end - def language - 'Sprache' - end - def language_original - 'Ursprungssprache' - end - def format #dc - 'Format' - end - def identifier #dc - 'Bezeichnung' - end - def source #dc - 'Quelle' - end - def relation #dc - 'Beziehung' - end - def coverage #dc - 'Eingrenzung' - end - def keywords - 'Schlüsselwörter' - end - def comments - 'Kommentare' - end - def cls_loc - 'Klassifikation nach Library of Congress' - end - def cls_dewey - 'Klassifikation nach Dewey' - end - def cls_oclc # fix - 'Classify OCLC number' - end - def cls_gutenberg - 'Klassifikation nach Projekt Gutenberg' - end - def cls_isbn - 'Klassifikation nach ISBN' - end - def prefix_a - 'Präfix (a)' - end - def prefix_b - 'Präfix (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Quelldatei' - end - def word_count - 'Anzahl Wörter' - end - def sourcefile_digest - 'Quelldatei Digest' - end - def digest_md5 - 'Prüfsumme der Quelldatei (MD5)' - end - def digest_sha256 - 'Prüfsumme der Quelldatei (SHA256)' - end - def sc_number - 'Dokumentversion (RCS/CVS)' - end - def sc_date - 'Dokumentdatum (RCS/CVS)' - end - def last_generated - 'Letzte Erstellung (metaverse)' - end - def sisu_version - 'erstellt bei' - end - def ruby_version - 'Ruby Version' - end - def suggested_links - 'empfohlene Links' - end - def language_version_list - 'verfügbare Sprachen' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'SiSU Zusammenfassung des Dokumentes' - end - def manifest_description_metadata - 'SiSU Zusammenfassung der Metadaten' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'Amerikanisch-Englisch' # tag depreciated, see iso 639-2 - when /English/i; 'Englisch' - when /French/i; 'Französisch' - when /German/i; 'Deutsch' - when /Italian/i; 'Italienisch' - when /Spanish/i; 'Spanisch' - when /Brazilian(?: Portuguese)?/i; 'Brasilianisch-Portugiesisch' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portugiesisch' - when /Swedish/i; 'Schwedisch' - when /Danish/i; 'Dänisch' - when /Finnish/i; 'Finnisch' - when /Norwegian/i; 'Norwegisch' - when /Icelandic/i; 'Isländisch' - when /Dutch/i; 'Niederländisch' - when /Estonian/i; 'Estnisch' - when /Hungarian/i; 'Ungarisch' - when /Polish/i; 'Polnisch' - when /Romanian/i; 'Rumänisch' - when /Russian/i; 'Russisch' - when /Greek/i; 'Griechisch' - when /Ukranian/i; 'Ukrainisch' - when /Turkish/i; 'Türkisch' - when /Slovenian/i; 'Slovenisch' - when /Croatian/i; 'Kroatisch' - when /Slovak(?:ian)?/i; 'Slovakisch' - when /Czech/i; 'Tschechisch' - when /Bulgarian/i; 'Bulgarisch' - else @trans_str - end - end - end - class Spanish - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'nombre del fichero' - end - def description - 'descripción' - end - def filetype_description - description - end - def metadata - 'metadatos' - end - def file_size - 'tamaño del fichero' - end - def full_title #dc - 'Título' - end - def title - 'Título' - end - def subtitle - 'Subtítulo' - end - def author #dc - 'Creador' - end - def contributor #dc - 'Contribuidor' - end - def translator - 'Traductor' - end - def illustrator - 'Ilustrador' - end - def publisher #dc - 'Editor' - end - def prepared_by - 'Preparado por' - end - def digitized_by - 'Digitalizado por' - end - def subject #dc - 'Asunto' - end - def description #dc (watch) - 'Descripción' - end - def abstract #dc - 'Resumen' - end - def type #dc - 'Tipo' - end - def rights #dc - 'Derechos' - end - def date #dc - 'Fecha' - end - def date_created #dc - 'Fecha de creación' - end - def date_issued #dc - 'Fecha de publicación' - end - def date_available #dc - 'Fecha de disponibilidad' - end - def date_modified #dc - 'Fecha de modificación' - end - def date_valid #dc - 'Fecha de valided' - end - def language #dc - 'Idioma' - end - def language_original - 'Lenguaje original' - end - def format #dc - 'Formato' - end - def identifier #dc - 'Identificador' - end - def source #dc - 'Fuente' - end - def relation #dc - 'Relación' - end - def coverage #dc - 'Cobertura' - end - def keywords - 'Palabras claves' - end - def comments - 'Comentarios' - end - def cls_loc - 'Clasificación Biblioteca del Congreso' - end - def cls_dewey - 'Clasificación Dewey' - end - def cls_oclc # fix - 'Classify OCLC number' - end - def cls_gutenberg - 'Clasificación Proyecto Gutenberg' - end - def cls_isbn - 'Clasificación ISBN' - end - def prefix_a - 'Prefijo (a)' - end - def prefix_b - 'Prefijo (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Fichero fuente' - end - def word_count - 'Número de palabras apróximado' - end - def sourcefile_digest - 'Resumen del fichero fuente' - end - def digest_md5 - 'Resumen del fichero fuente (md5)' - end - def digest_sha256 - 'Resumen del fichero fuente (sha256)' - end - def sc_number - 'Versión (RCS/CVS) del documento' - end - def sc_date - 'Versión (RCS/CVS) del documento' - end - def last_generated - 'Última generación (metaverse) del documento' - end - def sisu_version - 'Generado por' - end - def ruby_version - 'Versión de Ruby' - end - def suggested_links - 'enlaces sugeridos de metadatos' - end - def language_version_list - 'Document Language Versions, manifests' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'Manifiesto SiSU de salida generada' - end - def manifest_description_metadata - 'Manifiesto SiSU de metadatos de documento' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'Inglés Americano' # tag depreciated, see iso 639-2 - when /English/i; 'Inglés' - when /French/i; 'Francés' - when /German/i; 'Alemán' - when /Italian/i; 'Italiano' - when /Spanish/i; 'Español' - when /Brazilian(?: Portuguese)?/i; 'Portugués de Brasil' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portugués' - when /Swedish/i; 'Sueco' - when /Danish/i; 'Danés' - when /Finnish/i; 'Finés' - when /Norwegian/i; 'Noruego' - when /Icelandic/i; 'Islandés' - when /Dutch/i; 'Holandés' - when /Estonian/i; 'Estonio' - when /Hungarian/i; 'Húngaro' - when /Polish/i; 'Polaco' - when /Romanian/i; 'Rumano' - when /Russian/i; 'Ruso' - when /Greek/i; 'Griego' - when /Ukranian/i; 'Ucraniano' - when /Turkish/i; 'Turco' - when /Slovenian/i; 'Eslovaco' - when /Croatian/i; 'Croata' - when /Slovak(?:ian)?/i; 'Eslovaco' - when /Czech/i; 'Checo' - when /Bulgarian/i; 'Búlgaro' - else @trans_str - end - end - end - class Italian - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'nome del file' - end - def description - 'descrizione' - end - def filetype_description - description - end - def metadata - 'metadati' - end - def file_size - 'dimensione' - end - def full_title #dc - 'Titolo' - end - def title - 'Titolo' - end - def subtitle - 'Sottotitolo' - end - def author #dc - 'Autore' - end - def contributor #dc - 'Contributore' - end - def translator - 'Traduttore' - end - def illustrator - 'Illustratore' - end - def publisher #dc - 'Casa editrice' - end - def prepared_by - 'Preparato da' - end - def digitized_by - 'Convertito in digitale da' - end - def subject #dc - 'Oggetto' - end - def description #dc (watch) - 'Descrizione' - end - def abstract #dc - 'Abstract' - end - def type #dc - 'Tipo' - end - def rights #dc - 'Diritti del lettore' - end - def date #dc - 'Data' - end - def date_created #dc - 'Data di creazione' - end - def date_issued #dc - 'Data di pubblicazione' - end - def date_available #dc - 'Data di effettiva disponibilità' - end - def date_modified #dc - 'Data di ultima modifica' - end - def date_valid #dc - 'Data di inizo validità' - end - def language #dc - 'Lingua' - end - def language_original - 'Lingua originale' - end - def format #dc - 'Formato' - end - def identifier #dc - 'Indentificatore' - end - def source #dc - 'Fonte' - end - def relation #dc - 'Collegamento' - end - def coverage #dc - 'Ambito' - end - def keywords - 'Parole chiave' - end - def comments - 'Commenti' - end - def cls_loc - 'Classificazione della Library of Congress' - end - def cls_dewey - 'Classificazione Dewey' - end - def cls_oclc # fix - 'Classify OCLC number' - end - def cls_gutenberg - 'Classificazione del Progetto Gutenberg' - end - def cls_isbn - 'Numero ISBN' - end - def prefix_a - 'Premessa (a)' - end - def prefix_b - 'Premessa (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Sorgente' - end - def word_count - 'Numero approssimativo di parole' - end - def sourcefile_digest - 'Checksum file sorgente' - end - def digest_md5 - 'Checksum file sorgente (md5)' - end - def digest_sha256 - 'Checksum file sorgente (sha256)' - end - def sc_number - 'Numero di revisione (RCS/CVS)' - end - def sc_date - 'Numero di revisione (RCS/CVS)' - end - def last_generated - 'Data di ultima generazione (dal metaverse)' - end - def sisu_version - 'Generato da' - end - def ruby_version - 'Ruby versione' - end - def suggested_links - 'Link suggeriti' - end - def language_version_list - 'Traduzioni disponibili' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'Inventario SiSU dell\'output generato' - end - def manifest_description_metadata - 'Inventario SiSU dei metadati' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'Inglese USA' # tag depreciated, see iso 639-2 - when /English/i; 'Inglese' - when /French/i; 'Francese' - when /German/i; 'Tedesco' - when /Italian/i; 'Italiano' - when /Spanish/i; 'Spagnolo' - when /Brazilian(?: Portuguese)?/i; 'Portoguese (Brasile)' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portoguese' - when /Swedish/i; 'Svedese' - when /Danish/i; 'Danese' - when /Finnish/i; 'Finlandese' - when /Norwegian/i; 'Norvegese' - when /Icelandic/i; 'Islandese' - when /Dutch/i; 'Olandese' - when /Estonian/i; 'Estone' - when /Hungarian/i; 'Ungherese' - when /Polish/i; 'Polacco' - when /Romanian/i; 'Romeno' - when /Russian/i; 'Russo' - when /Greek/i; 'Greco' - when /Ukranian/i; 'Ucraino' - when /Turkish/i; 'Turco' - when /Slovenian/i; 'Sloveno' - when /Croatian/i; 'Croato' - when /Slovak(?:ian)?/i; 'Slovacco' - when /Czech/i; 'Ceco' - when /Bulgarian/i; 'Bulgaro' - else @trans_str - end - end - end - class Finnish - def initialize(md,doc_lang,trans_str) - @md,@doc_lang,@trans_str=md,doc_lang,trans_str - end - def filename - 'tiedostonimi' - end - def description - 'kuvaus' - end - def filetype_description - description - end - def metadata - 'metadata' - end - def file_size - 'tiedoston koko' - end - def full_title #dc - 'otsikko' - end - def title - 'Otsikko' - end - def subtitle - 'Alaotsikko' - end - def author #dc - 'tekijä' - end - def contributor #dc - 'osallistuja' - end - def translator - 'Kääntäjä' - end - def illustrator - 'Kuvittaja' - end - def publisher #dc - 'julkaisija' - end - def prepared_by - 'Valmistaja' - end - def digitized_by - 'Digitalisoinut' - end - def subject #dc - 'aihe' - end - def description #dc (watch) - 'kuvaus' - end - def abstract #dc - 'tiivistelmä' - end - def type #dc - 'tyyppi' - end - def rights #dc - 'oikeudet' - end - def date #dc - 'päiväys' - end - def date_created #dc - 'luontipäivä' - end - def date_issued #dc - 'julkaisupäivä' - end - def date_available #dc - 'saantipäivä' - end - def date_modified #dc - 'muokkauspäivä' - end - def date_valid #dc - 'kelpoisuuspäivä' - end - def language #dc - 'kieli' - end - def language_original - 'Alkuperäiskieli' - end - def format #dc - 'muoto' - end - def identifier #dc - 'tunnus' - end - def source #dc - 'lähde' - end - def relation #dc - 'suhde' - end - def coverage #dc - 'kattavuus' - end - def keywords - 'Avainsanat' - end - def comments - 'Kommentit' - end - def cls_loc - 'Classify Library of Congress' - end - def cls_dewey - 'Classify Dewey' - end - def cls_oclc # fix - 'Classify OCLC number' - end - def cls_gutenberg - 'Classify Project Gutenberg' - end - def cls_isbn - 'Classify ISBN' - end - def prefix_a - 'Prefix (a)' - end - def prefix_b - 'Prefix (b)' - end - def topic_register - 'Topics Registered' - end - def sourcefile - 'Lähdetiedosto' - end - def word_count - 'Arvioitu sanamäärä' - end - def sourcefile_digest - 'Lähdetiedoston tiiviste' - end - def digest_md5 - 'Lähdetiedoston tiiviste (md5)' - end - def digest_sha256 - 'Lähdetiedoston tiiviste (sha256)' - end - def sc_number - 'Dokumentin RCS/CVS-numero' - end - def sc_date - 'Dokumentin RCS/CVS-päiväys' - end - def last_generated - 'Viimeksi tuotettu dokumentti (metaverse)' - end - def sisu_version - 'Generoinut' - end - def ruby_version - 'Ruby-versio' - end - def suggested_links - 'metadatan ehdottamat linkit' - end - def language_version_list - 'Dokumentin kieliversiot, manifestit' - end - def manifest_description - 'SiSU manifest of document filetypes and metadata' - end - def manifest_description_output - 'Tuotetun tuloksen SISU-manifesti' - end - def manifest_description_metadata - 'Dokumenttimetadatan SISU-manifesti' - end - def language_list_translated - lang=case @trans_str - when /American/i; 'Amerikanenglanti' # tag depreciated, see iso 639-2 - when /English/i; 'Englanti' - when /French/i; 'Ranska' - when /German/i; 'Saksa' - when /Italian/i; 'Italia' - when /Spanish/i; 'Espanja' - when /Brazilian(?: Portuguese)?/i; 'Brasilian portugali' # tag depreciated, see iso 639-2 - when /Portuguese/i; 'Portugali' - when /Swedish/i; 'Ruotsi' - when /Danish/i; 'Tanska' - when /Finnish/i; 'Suomi' - when /Norwegian/i; 'Norja' - when /Icelandic/i; 'Islanti' - when /Dutch/i; 'Hollanti' - when /Estonian/i; 'Viro' - when /Hungarian/i; 'Unkari' - when /Polish/i; 'Puola' - when /Romanian/i; 'Romania' - when /Russian/i; 'Venäjä' - when /Greek/i; 'Kreikka' - when /Ukranian/i; 'Ukraina' - when /Turkish/i; 'Turkki' - when /Slovenian/i; 'Slovenia' - when /Croatian/i; 'Kroatia' - when /Slovak(?:ian)?/i; 'Slovakki' - when /Czech/i; 'Tsekki' - when /Bulgarian/i; 'Bulgaria' - else @trans_str - end - end - end - class Porguguese < English - end - class Swedish < English - end - class Danish < English - end - class Norwegian < English - end - class Icelandic < English - end - class Dutch < English - end - class Estonian < English - end - class Hungarian < English - end - class Polish < English - end - class Romanian < English - end - class Russian < English - end - class Greek < English - end - class Ukranian < English - end - class Turkish < English - end - class Croatian < English - end - class Slovakian < English - end - class Czech < English - end - class Bulgarian < English - end -end -__END__ -http://www.debian.org/international/l10n/po/ -http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes -http://www.loc.gov/standards/iso639-2/php/code_list.php -albanian sq -amharic am -arabic ar -armenian hy -asturian -bahasai -bahasam -basque eu -bengali bn -brazil[ian] pt_BR -breton br -bulgarian bg -catalan ca -coptic -croatian hr -czech cs -danish da -divehi -dutch nl -english en -esperanto eo -estonian et -galician gl -german de -greek el -hebrew he -hindi hi -icelandic is -interlingua ia -irish ga -italian it -farsi -finnish fi -french fr -lao lo -latin la -latvian lv -lithuanian lt -lsorbian -magyar -malayalam ml -marathi mr -norsk no -nynorsk nn -occitan oc -polish pl -portuges pt -romanian ro -russian ru -samin se (check sami?) -sanskrit sa -scottish # (gd (Gaelic (Scots))) -serbian sr -slovak sk -slovenian sl -spanish es -swedish sv -syriac # (ar_SY (Arabic, as spoken in Syrian Arab Republic)) -tamil ta -telugu te -thai th -turkish tr -turkmen tk -ukrainian uk -urdu ur -usorbian -vietnamese vi -welsh cy diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index 38dc994c..4373ad26 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -59,7 +59,7 @@ module SiSU_Manifest require_relative 'sysenv' # sysenv.rb include SiSU_Env - require_relative 'i18n' # i18n.rb + require_relative 'prog_text_translation' # prog_text_translation.rb require_relative 'particulars' # particulars.rb include SiSU_Particulars require_relative 'html_minitoc' # html_minitoc.rb @@ -72,8 +72,8 @@ module SiSU_Manifest def initialize(opt) @opt=opt @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) - l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) - @doc_language=l[:l] + l=SiSU_Env::Standardise_language.new(@opt.lng).language + @doc_language=l[:n] end def read begin @@ -108,8 +108,8 @@ module SiSU_Manifest @base_path=@md.file.output_path.manifest @@dg ||=SiSU_Env::Info_env.new.digest.type @dg=@@dg - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - @language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + @language=l[:n] @translate=SiSU_Translate::Source.new(@md,@language) @brace_url=SiSU_Viz::Skin.new.url_decoration end @@ -149,7 +149,7 @@ module SiSU_Manifest flv=@env.published_manifests?(@base_path) @manifest[:html] << %{<tr><th class="left"><div id="horizontal_links"><ul id="horizontal">\n} flv.each do |l| - lang=SiSU_Translate::Source.new(@md,@language,l[:l]).language_list + lang=SiSU_Translate::Source.new(@md,@language,l[:n]).language_list @manifest[:txt] << "#{l[:m]} #{lang}\n" @manifest[:html] << %{<li class="norm"><a href="#{l[:m]}">#{lang}</a> </li>} end @@ -158,7 +158,7 @@ module SiSU_Manifest def published_languages(id,file) flv=@env.published_manifests?(@base_path) flv.each do |l| - lang=SiSU_Translate::Source.new(@md,@language,l[:l]).language_list + lang=SiSU_Translate::Source.new(@md,@language,l[:n]).language_list @manifest[:txt] << "#{l[:m]} #{lang}\n" @manifest[:html] << %{<tr><th class="left"><p class="bold"><a href="#{l[:m]}">#{lang}</a></p></th><td><p class="norm">#{lang}</p><p class="tiny">#{@brace_url.xml_open}<a href="#{@base_url}/#{l[:m]}">#{@base_url}/#{l[:m]}</a>#{@brace_url.xml_close}</p></td><td class="right"><p class="right"> </p></td></tr>\n} end diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index 362d9cda..17fef80b 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -293,6 +293,7 @@ WOK dob.obj.gsub!(/┆/,'|') dob.obj.gsub!(/\s\.(\S+)/,' \\.\1') dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2') + dob.obj.gsub!(/-/,'\-') #manpages use this dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this if dob.is =~/block|group|verse|alt|code/ if dob.is =='code' diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb index a1a448e6..110ebd85 100644 --- a/lib/sisu/v3/options.rb +++ b/lib/sisu/v3/options.rb @@ -61,10 +61,10 @@ module SiSU_commandline require "pathname" require_relative 'sysenv' # sysenv.rb class Options - attr_accessor :cmd,:mod,:act,:f_pths,:files,:paths,:f_pth,:pth,:fns,:fnb,:fnc,:fncb,:lng,:what + attr_accessor :cmd,:mod,:act,:f_pths,:files,:paths,:lngs,:f_pth,:pth,:fns,:fnb,:fnc,:fncb,:lng,:what def initialize(a) @a=a - @cmd,@f_pth,@pth,@fns,@fnb,@fnc,@fncb,@what='','','','','','','','','' + @cmd,@f_pth,@pth,@fns,@fnb,@fnc,@fncb,@what,@lng='','','','','','','','','','' @f_pths,@files,@paths,@mod,@act=Array.new(5){[]} @env=SiSU_Env::Info_env.new r=Px[:lng_lst].join('|') @@ -109,6 +109,7 @@ module SiSU_commandline @paths = q[:paths] @files = q[:files] @f_pths = q[:f_pths] + @lngs = q[:lngs] if @files.length > 0 \ and @cmd.empty? \ and @mod.length==0 #% if no other action called on filename given, default is sisu -0 [filename(s)] configured as flag default @@ -122,7 +123,7 @@ module SiSU_commandline end def set_files_and_paths_and_general_extract(s) c,w='','' - m,f,pth,z,lng=[],[],[],[],[] + m,f,pth,z,lng,lngs=[],[],[],[],[],[] a=s.split(/\s+/) a.each do |x| if x =~/^-[a-z0-5]+/i \ @@ -138,12 +139,20 @@ module SiSU_commandline pt=Pathname.new(x) pth << pt.split[0].realpath.to_s #remove? f << pt.split[1].to_s #remove? - u=/.+?\/([^\/]+)(?:(?:\/(?:en|fr|es)$)|$)/ - t=/.+\/(en|fr|es)/ - lng << (pt.split[0].realpath.to_s[t,1]) \ + r=Px[:lng_lst].join('|') + u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/ + t=/.+\/(#{r})$/ + l_p = (pt.split[0].realpath.to_s[t,1]) \ ? pt.split[0].realpath.to_s[t,1] \ : nil #: '' + lng << l_p + lngs << if l_p + l_p + elsif x =~/~(#{r})\.ss[tm]/ + $1 + else 'en' + end f_pths << { pth: pt.split[0].realpath.to_s, f: pt.split[1].to_s, @@ -163,7 +172,7 @@ module SiSU_commandline puts "#{x} in #{a.join(' ')}?" end end - { cmd: c, mod: m, what: w, paths: pth, files: f, f_pths: f_pths, lng: lng } + { cmd: c, mod: m, what: w, paths: pth, files: f, f_pths: f_pths, lng: lng, lngs: lngs } end def expand_numeric_shortcuts(a) shortcut=SiSU_Env::Info_processing_flag.new diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index c2968564..87a556ec 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -272,7 +272,7 @@ module SiSU_Param l,n=Db[:col_language],'title.language' validate_length(s,l,n) end - def language_char + def language_char # look into, this must be set, from 1 directory stub (.fi), 2 filename (~fi), [3 (not used) document header (@title:\n :language_char: fi)] s=@h['language_char'] l,n=Db[:col_language_char],'title.language_char' validate_length(s,l,n) @@ -744,12 +744,14 @@ module SiSU_Param end if manpage['name'] manpage['name']=manpage['name'].join("\n.br\n") + manpage['name'].gsub!(/(-)/m,"\\\\\\1") manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n") else manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]' end if manpage['synopsis'] manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n") + manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1") manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n") else manpage['synopsis']='' @@ -1230,7 +1232,7 @@ module SiSU_Param end end @publisher ||= "#@@publisher (this copy)" - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@fns) + fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language unless @language[:code] \ and @language[:name] lang=@env.i18n.language #default language settings for directory by name, or in sysrc.yml @@ -1239,18 +1241,19 @@ module SiSU_Param end unless fn_set_lang[:d]==true #decide, naming convention overrides other settings, within document, etc. @language[:code]=fn_set_lang[:c] - @language[:name]=fn_set_lang[:l] - end - @fnl=@env.i18n.lang_filename(fn_set_lang[:c]) - @flv.each do |l| - lang=SiSU_Env::Standardise_language.new.file_to_language(l) - c={ a: '', b: '', c: '' } - if @fnl[:pre] =~/\S/; c[:a]="#{lang[:c]}." - elsif @fnl[:mid] =~/\S/; c[:b]=".#{lang[:c]}" - elsif @fnl[:post] =~/\S/; c[:c]=".#{lang[:c]}" - end - @lang << [lang[:l],"#{c[:a]}sisu_manifest#{c[:b]}.html#{c[:c]}"] - end if @flv + @language[:name]=fn_set_lang[:n] + end + @fnl=@env.i18n.lang_filename(fn_set_lang[:n]) +#fix +# @flv.each do |l| +# lang=SiSU_Env::Standardise_language.new.file_to_language(l) +# c={ a: '', b: '', c: '' } +# if @fnl[:pre] =~/\S/; c[:a]="#{lang[:c]}." +# elsif @fnl[:mid] =~/\S/; c[:b]=".#{lang[:c]}" +# elsif @fnl[:post] =~/\S/; c[:c]=".#{lang[:c]}" +# end +# @lang << [lang[:n],"#{c[:a]}sisu_manifest#{c[:b]}.html#{c[:c]}"] +# end if @flv @lang.uniq! @fn=SiSU_Env::Env_call.new(@fns).lang(fn_set_lang[:c]) @identifier="#{@env.url.root}/#{@fnb}/#{@fn[:toc]}" #DC note constructed dc identifier diff --git a/lib/sisu/v3/prog_text_translation.rb b/lib/sisu/v3/prog_text_translation.rb new file mode 100644 index 00000000..e5a78e92 --- /dev/null +++ b/lib/sisu/v3/prog_text_translation.rb @@ -0,0 +1,1697 @@ +# encoding: utf-8 +=begin + + * Name: SiSU + + * Description: a framework for document structuring, publishing and search + + * Author: Ralph Amissah + + * Copyright: (C) 1997 - 2011, 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.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> + + * SiSU uses: + * Standard SiSU markup syntax, + * Standard SiSU meta-markup syntax, and the + * Standard SiSU object citation numbering and system + + * Hompages: + <http://www.jus.uio.no/sisu> + <http://www.sisudoc.org> + + * Download: + <http://www.jus.uio.no/sisu/SiSU/download.html> + + * Ralph Amissah + <ralph@amissah.com> + <ralph.amissah@gmail.com> + + ** Description: internationalisation + +=end +module SiSU_Translate + require_relative 'sysenv' # sysenv.rb + include SiSU_Env; include SiSU_Param + class Source + def initialize(md,doc_lang,trans_str='') + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + @lang_class=case @doc_lang + when /American/i; English.new(md,doc_lang,trans_str) # tag depreciated, see iso 639-2 + when /English/i; English.new(md,doc_lang,trans_str) + when /French/i; French.new(md,doc_lang,trans_str) + when /German/i; German.new(md,doc_lang,trans_str) + when /Italian/i; Italian.new(md,doc_lang,trans_str) + when /Spanish/i; Spanish.new(md,doc_lang,trans_str) + when /Brazilian(?: Portuguese)?/i; Portuguese.new(md,doc_lang,trans_str) # tag depreciated, see iso 639-2 + when /Portuguese/i; Portuguese.new(md,doc_lang,trans_str) + when /Swedish/i; Swedish.new(md,doc_lang,trans_str) + when /Danish/i; Danish.new(md,doc_lang,trans_str) + when /Finnish/i; Finnish.new(md,doc_lang,trans_str) + when /Norwegian/i; Norwegian.new(md,doc_lang,trans_str) + when /Icelandic/i; Icelandic.new(md,doc_lang,trans_str) + when /Dutch/i; Dutch.new(md,doc_lang,trans_str) + when /Estonian/i; Estonian.new(md,doc_lang,trans_str) + when /Hungarian/i; Hungarian.new(md,doc_lang,trans_str) + when /Polish/i; Polish.new(md,doc_lang,trans_str) + when /Romanian/i; Romanian.new(md,doc_lang,trans_str) + when /Russian/i; Russian.new(md,doc_lang,trans_str) + when /Greek/i; Greek.new(md,doc_lang,trans_str) + when /Ukranian/i; Ukranian.new(md,doc_lang,trans_str) + when /Turkish/i; Turkish.new(md,doc_lang,trans_str) + when /Slovenian/i; Slovenian.new(md,doc_lang,trans_str) + when /Croatian/i; Croatian.new(md,doc_lang,trans_str) + when /Slovak(?:ian)?/i; Slovak.new(md,doc_lang,trans_str) + when /Czech/i; Czech.new(md,doc_lang,trans_str) + when /Bulgarian/i; Bulgarian.new(md,doc_lang,trans_str) + else English.new(md,doc_lang,trans_str) + end + end + + def filename + @lang_class.filename + end + def description + @lang_class.description + end + def metadata + @lang_class.metadata + end + def filetype_description + @lang_class.filetype_description + end + def file_size + @lang_class.file_size + end + def sourcefile + @lang_class.sourcefile + end + def sourcefile_digest + @lang_class.sourcefile_digest + end + def full_title #dc + @lang_class.full_title + end + def title + @lang_class.title + end + def subtitle + @lang_class.subtitle + end + def author + @lang_class.author + end + def contributor + @lang_class.contributor + end + def translator + @lang_class.translator + end + def illustrator + @lang_class.illustrator + end + def publisher + @lang_class.publisher + end + def prepared_by + @lang_class.prepared_by + end + def digitized_by + @lang_class.digitized_by + end + def subject + @lang_class.subject + end + def description #dc (watch) + @lang_class.description + end + def abstract + @lang_class.abstract + end + def type + @lang_class.type + end + def rights + @lang_class.rights + end + def digitized_by + @lang_class.digitized_by + end + def date + @lang_class.date + end + def date_created + @lang_class.date_created + end + def date_available + @lang_class.date_available + end + def date_valid + @lang_class.date_valid + end + def date_modified + @lang_class.date_modified + end + def date_issued + @lang_class.date_issued + end + def language + @lang_class.language + end + def language_original + @lang_class.language_original + end + def format + @lang_class.format + end + def identifier + @lang_class.identifier + end + def source + @lang_class.source + end + def relation + @lang_class.relation + end + def coverage + @lang_class.coverage + end + def keywords + @lang_class.keywords + end + def comments + @lang_class.comments + end + def cls_loc + @lang_class.cls_loc + end + def cls_dewey + @lang_class.cls_dewey + end + def cls_oclc + @lang_class.cls_oclc + end + def cls_gutenberg + @lang_class.cls_gutenberg + end + def cls_isbn + @lang_class.cls_isbn + end + def prefix_a + @lang_class.prefix_a + end + def prefix_b + @lang_class.prefix_b + end + def topic_register + @lang_class.topic_register + end + def fns + @lang_class.fns + end + def word_count + @lang_class.word_count + end + def dgst + @lang_class.dgst + end + def sc_number + @lang_class.sc_number + end + def sc_date + @lang_class.sc_date + end + def last_generated + @lang_class.last_generated + end + def sisu_version + @lang_class.sisu_version + end + def ruby_version + @lang_class.ruby_version + end + def suggested_links + @lang_class.suggested_links + end + def language_version_list + @lang_class.language_version_list + end + def language + @lang_class.language + end + def manifest_description + @lang_class.manifest_description + end + def manifest_description_output + @lang_class.manifest_description_output + end + def manifest_description_metadata + @lang_class.manifest_description_metadata + end + def language_list_translated + @lang_class.language_list + end + def language_list + lang=case @trans_str + when /American/i; 'American English' # tag depreciated, see iso 639-2 + when /English/i; 'English' + when /French/i; 'français' + when /German/i; 'Deutsch' + when /Italian/i; 'Italiano' + when /Spanish/i; 'español' + when /Brazilian(?: Portuguese)?/i; 'Brazilian Português' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Português' + when /Swedish/i; 'svenska' + when /Danish/i; 'dansk' + when /Finnish/i; 'suomi' + when /Norwegian/i; 'norsk' + when /Icelandic/i; 'Icelandic' + when /Dutch/i; 'Nederlands' + when /Estonian/i; 'Estonian' + when /Hungarian/i; 'Hungarian' + when /Polish/i; 'polski' + when /Romanian/i; 'română' + when /Russian/i; 'Русский (Russkij)' + when /Greek/i; 'Ελληνικά (Ellinika)' + when /Ukranian/i; 'українська (ukrajins\'ka)' + when /Turkish/i; 'Türkçe' + when /Slovenian/i; 'Slovenian' + when /Croatian/i; 'Croatian' + when /Slovak(?:ian)?/i; 'slovensky' #slovensky ? + when /Czech/i; 'česky' + when /Bulgarian/i; 'Български (Bəlgarski)' + when /Japanese/i; '日本語 (Nihongo)' + when /Korean/i; '한국어 (Hangul)' + #when /Catalan/i; 'català' + else 'English' + end + #check on 中文 and عربي + end + end + class English + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'filename' + end + def description + 'description' + end + def filetype_description + 'filetype description' + end + def metadata + 'metadata' + end + def file_size + 'file size' + end + def full_title #dc + 'Title' + end + def title + 'Title' + end + def subtitle + 'Subtitle' + end + def author + 'Author' + end + def author #dc + 'Creator' + end + def contributor #dc + 'Contributor' + end + def translator + 'Translator' + end + def illustrator + 'Illustrator' + end + def publisher #dc + 'Publisher' + end + def prepared_by + 'Prepared by' + end + def digitized_by + 'Digitized by' + end + def subject #dc + 'Subject' + end + def description #dc (watch) + 'Description' + end + def abstract #dc + 'Abstract' + end + def type #dc + 'Type' + end + def rights #dc + 'Rights' + end + def date #dc + 'Date' + end + def date_created #dc + 'Date created' + end + def date_issued #dc + 'Date issued' + end + def date_available #dc + 'Date available' + end + def date_modified #dc + 'Date modified' + end + def date_valid #dc + 'Date valid' + end + def language #dc + 'Language' + end + def language_original + 'Original Language' + end + def format #dc + 'Format' + end + def identifier #dc + 'Identifier' + end + def source #dc + 'Source' + end + def relation #dc + 'Relation' + end + def coverage #dc + 'Coverage' + end + def keywords + 'Keywords' + end + def comments + 'Comments' + end + def cls_loc + 'Classify Library of Congress' + end + def cls_dewey + 'Classify Dewey' + end + def cls_oclc + 'Classify OCLC number' + end + def cls_gutenberg + 'Classify Project Gutenberg' + end + def cls_isbn + 'Classify ISBN' + end + def prefix_a + 'Prefix (a)' + end + def prefix_b + 'Prefix (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Sourcefile' + end + def word_count + 'Word Count approximate' + end + def sourcefile_digest + 'Sourcefile Digest' + end + def digest_md5 + 'Sourcefile Digest (md5)' + end + def digest_sha256 + 'Sourcefile Digest (sha256)' + end + def sc_number + 'Document (RCS/CVS) number' + end + def sc_date + 'Document (RCS/CVS) number' + end + def last_generated + 'Document (dal) last generated' + end + def sisu_version + 'Generated by' + end + def ruby_version + 'Ruby version' + end + def suggested_links + 'metadata suggested links' + end + def language_version_list + 'Document Language Versions, manifests' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'Available document filetypes' + end + def manifest_description_metadata + 'Document Metadata' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'American English' # tag depreciated, see iso 639-2 + when /English/i; 'English' + when /French/i; 'French' + when /German/i; 'German' + when /Italian/i; 'Italian' + when /Spanish/i; 'Spanish' + when /Brazilian(?: Portuguese)?/i; 'Brazilian Portuguese' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portuguese' + when /Swedish/i; 'Swedish' + when /Danish/i; 'Danish' + when /Finnish/i; 'Finnish' + when /Norwegian/i; 'Norwegian' + when /Icelandic/i; 'Icelandic' + when /Dutch/i; 'Dutch' + when /Estonian/i; 'Estonian' + when /Hungarian/i; 'Hungarian' + when /Polish/i; 'Polish' + when /Romanian/i; 'Romanian' + when /Russian/i; 'Russian' + when /Greek/i; 'Greek' + when /Ukranian/i; 'Ukranian' + when /Turkish/i; 'Turkish' + when /Slovenian/i; 'Slovenian' + when /Croatian/i; 'Croatian' + when /Slovak(?:ian)?/i; 'Slovakian' + when /Czech/i; 'Czech' + when /Bulgarian/i; 'Bulgarian' + else @trans_str + end + end + end + class French + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'nom de fichier' + end + def description + 'description' + end + def filetype_description + description + end + def metadata + 'metadonnées' + end + def file_size + 'taille' + end + def full_title #dc + 'Titre' + end + def title + 'Titre' + end + def subtitle + 'Sous titre' + end + def author + 'Auteur' + end + def author #dc + 'Auteur' + end + def contributor #dc + 'Contributeur' + end + def translator + 'Traducteur' + end + def illustrator + 'Illustrateur' + end + def publisher #dc + 'Éditeur' + end + def prepared_by + 'Préparé par' + end + def digitized_by + 'Numérisé par' + end + def subject #dc + 'Sujet' + end + def description #dc (watch) + 'Description' + end + def abstract #dc + 'Résumé' + end + def type #dc + 'Type' + end + def rights #dc + 'Droits relatifs à la ressource' + end + def date #dc + 'Date' + end + def date_created #dc + 'Date de création' + end + def date_issued #dc + 'Date de publication' + end + def date_available #dc + 'Date de mise à disposition' + end + def date_modified #dc + 'Date de modification' + end + def date_valid #dc + 'Date de validité' + end + def language #dc + 'Langue' + end + def language_original + 'Langue originale' + end + def format #dc + 'Format' + end + def identifier #dc + 'Identifiant' + end + def source #dc + 'Source' + end + def relation #dc + 'Lien' + end + def coverage #dc + 'Portée du document' + end + def keywords + 'Mots clef' + end + def comments + 'Commentaires' + end + def cls_loc + 'Classification de la bibliothèque du congres' + end + def cls_dewey + 'Classification Dewey' + end + def cls_oclc # fix + 'Classify OCLC number' + end + def cls_gutenberg + 'Classification du project Gutenberg' + end + def cls_isbn + 'Classification ISBN' + end + def prefix_a + 'Préfixe (a)' + end + def prefix_b + 'Préfixe (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Fichier source' + end + def word_count + 'Nombre approximatif de mots' + end + def sourcefile_digest + 'Condensé du fichier source' + end + def digest_md5 + 'Condensé du fichier source (md5)' + end + def digest_sha256 + 'Condensé du fichier source (sha256)' + end + def sc_number + 'Numéro (RCS/CVS) du document' + end + def sc_date + 'Numéro (RCS/CVS) du document' + end + def last_generated + 'Dernière production du document (metaverse)' + end + def sisu_version + 'Généré par' + end + def ruby_version + 'Version de Ruby' + end + def suggested_links + 'Liens suggérés' + end + def language_version_list + 'Versions des langues du document, manifestes' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'Manifeste SiSU du document généré' + end + def manifest_description_metadata + 'Manifeste SiSU des métadonnées du document' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'Anglais americain' # tag depreciated, see iso 639-2 + when /English/i; 'Anglais' + when /French/i; 'Français' + when /German/i; 'Allemand' + when /Italian/i; 'Italien' + when /Spanish/i; 'Espagnol' + when /Brazilian(?: Portuguese)?/i; 'Portugais brésilien' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portugais' + when /Swedish/i; 'Suédois' + when /Danish/i; 'Danois' + when /Finnish/i; 'Finnois' + when /Norwegian/i; 'Norvégien' + when /Icelandic/i; 'Islandais' + when /Dutch/i; 'Néerlandais' + when /Estonian/i; 'Estonien' + when /Hungarian/i; 'Hongrois' + when /Polish/i; 'Polonais' + when /Romanian/i; 'Roumain' + when /Russian/i; 'Russe' + when /Greek/i; 'Grec' + when /Ukranian/i; 'Ukrainien' + when /Turkish/i; 'Turc' + when /Slovenian/i; 'Slovène' + when /Croatian/i; 'Croate' + when /Slovak(?:ian)?/i; 'Slovaque' + when /Czech/i; 'Tcheque' + when /Bulgarian/i; 'Bulgare' + else @trans_str + end + end + end + class German + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'Dateiname' + end + def description + 'Beschreibung' + end + def filetype_description + description + end + def metadata + 'Metadata' + end + def file_size + 'Dateigrösse' + end + def full_title #dc + 'Titel' + end + def title + 'Titel' + end + def subtitle + 'Untertitel' + end + def author + 'Autor' + end + def contributor #dc + 'Mitautor' + end + def translator + 'Übersetzung' + end + def illustrator + 'Illustrator' + end + def publisher + 'Herausgeber' + end + def prepared_by + 'gesetzt von' + end + def digitized_by + 'digitalisiert von' + end + def subject + 'Titel' + end + def description #dc (watch) + 'Beschreibung' + end + def abstract #dc + 'Abstract' + end + def type + 'Typ' + end + def rights + 'Rechte' + end + def date + 'Datum' + end + def date_created + 'Erstellung' + end + def date_issued + 'Herausgabe' + end + def date_available + 'Veröffentlichung' + end + def date_modified + 'Modifikation' + end + def date_valid + 'Gültigkeit' + end + def language + 'Sprache' + end + def language_original + 'Ursprungssprache' + end + def format #dc + 'Format' + end + def identifier #dc + 'Bezeichnung' + end + def source #dc + 'Quelle' + end + def relation #dc + 'Beziehung' + end + def coverage #dc + 'Eingrenzung' + end + def keywords + 'Schlüsselwörter' + end + def comments + 'Kommentare' + end + def cls_loc + 'Klassifikation nach Library of Congress' + end + def cls_dewey + 'Klassifikation nach Dewey' + end + def cls_oclc # fix + 'Classify OCLC number' + end + def cls_gutenberg + 'Klassifikation nach Projekt Gutenberg' + end + def cls_isbn + 'Klassifikation nach ISBN' + end + def prefix_a + 'Präfix (a)' + end + def prefix_b + 'Präfix (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Quelldatei' + end + def word_count + 'Anzahl Wörter' + end + def sourcefile_digest + 'Quelldatei Digest' + end + def digest_md5 + 'Prüfsumme der Quelldatei (MD5)' + end + def digest_sha256 + 'Prüfsumme der Quelldatei (SHA256)' + end + def sc_number + 'Dokumentversion (RCS/CVS)' + end + def sc_date + 'Dokumentdatum (RCS/CVS)' + end + def last_generated + 'Letzte Erstellung (metaverse)' + end + def sisu_version + 'erstellt bei' + end + def ruby_version + 'Ruby Version' + end + def suggested_links + 'empfohlene Links' + end + def language_version_list + 'verfügbare Sprachen' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'SiSU Zusammenfassung des Dokumentes' + end + def manifest_description_metadata + 'SiSU Zusammenfassung der Metadaten' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'Amerikanisch-Englisch' # tag depreciated, see iso 639-2 + when /English/i; 'Englisch' + when /French/i; 'Französisch' + when /German/i; 'Deutsch' + when /Italian/i; 'Italienisch' + when /Spanish/i; 'Spanisch' + when /Brazilian(?: Portuguese)?/i; 'Brasilianisch-Portugiesisch' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portugiesisch' + when /Swedish/i; 'Schwedisch' + when /Danish/i; 'Dänisch' + when /Finnish/i; 'Finnisch' + when /Norwegian/i; 'Norwegisch' + when /Icelandic/i; 'Isländisch' + when /Dutch/i; 'Niederländisch' + when /Estonian/i; 'Estnisch' + when /Hungarian/i; 'Ungarisch' + when /Polish/i; 'Polnisch' + when /Romanian/i; 'Rumänisch' + when /Russian/i; 'Russisch' + when /Greek/i; 'Griechisch' + when /Ukranian/i; 'Ukrainisch' + when /Turkish/i; 'Türkisch' + when /Slovenian/i; 'Slovenisch' + when /Croatian/i; 'Kroatisch' + when /Slovak(?:ian)?/i; 'Slovakisch' + when /Czech/i; 'Tschechisch' + when /Bulgarian/i; 'Bulgarisch' + else @trans_str + end + end + end + class Spanish + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'nombre del fichero' + end + def description + 'descripción' + end + def filetype_description + description + end + def metadata + 'metadatos' + end + def file_size + 'tamaño del fichero' + end + def full_title #dc + 'Título' + end + def title + 'Título' + end + def subtitle + 'Subtítulo' + end + def author #dc + 'Creador' + end + def contributor #dc + 'Contribuidor' + end + def translator + 'Traductor' + end + def illustrator + 'Ilustrador' + end + def publisher #dc + 'Editor' + end + def prepared_by + 'Preparado por' + end + def digitized_by + 'Digitalizado por' + end + def subject #dc + 'Asunto' + end + def description #dc (watch) + 'Descripción' + end + def abstract #dc + 'Resumen' + end + def type #dc + 'Tipo' + end + def rights #dc + 'Derechos' + end + def date #dc + 'Fecha' + end + def date_created #dc + 'Fecha de creación' + end + def date_issued #dc + 'Fecha de publicación' + end + def date_available #dc + 'Fecha de disponibilidad' + end + def date_modified #dc + 'Fecha de modificación' + end + def date_valid #dc + 'Fecha de valided' + end + def language #dc + 'Idioma' + end + def language_original + 'Lenguaje original' + end + def format #dc + 'Formato' + end + def identifier #dc + 'Identificador' + end + def source #dc + 'Fuente' + end + def relation #dc + 'Relación' + end + def coverage #dc + 'Cobertura' + end + def keywords + 'Palabras claves' + end + def comments + 'Comentarios' + end + def cls_loc + 'Clasificación Biblioteca del Congreso' + end + def cls_dewey + 'Clasificación Dewey' + end + def cls_oclc # fix + 'Classify OCLC number' + end + def cls_gutenberg + 'Clasificación Proyecto Gutenberg' + end + def cls_isbn + 'Clasificación ISBN' + end + def prefix_a + 'Prefijo (a)' + end + def prefix_b + 'Prefijo (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Fichero fuente' + end + def word_count + 'Número de palabras apróximado' + end + def sourcefile_digest + 'Resumen del fichero fuente' + end + def digest_md5 + 'Resumen del fichero fuente (md5)' + end + def digest_sha256 + 'Resumen del fichero fuente (sha256)' + end + def sc_number + 'Versión (RCS/CVS) del documento' + end + def sc_date + 'Versión (RCS/CVS) del documento' + end + def last_generated + 'Última generación (metaverse) del documento' + end + def sisu_version + 'Generado por' + end + def ruby_version + 'Versión de Ruby' + end + def suggested_links + 'enlaces sugeridos de metadatos' + end + def language_version_list + 'Document Language Versions, manifests' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'Manifiesto SiSU de salida generada' + end + def manifest_description_metadata + 'Manifiesto SiSU de metadatos de documento' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'Inglés Americano' # tag depreciated, see iso 639-2 + when /English/i; 'Inglés' + when /French/i; 'Francés' + when /German/i; 'Alemán' + when /Italian/i; 'Italiano' + when /Spanish/i; 'Español' + when /Brazilian(?: Portuguese)?/i; 'Portugués de Brasil' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portugués' + when /Swedish/i; 'Sueco' + when /Danish/i; 'Danés' + when /Finnish/i; 'Finés' + when /Norwegian/i; 'Noruego' + when /Icelandic/i; 'Islandés' + when /Dutch/i; 'Holandés' + when /Estonian/i; 'Estonio' + when /Hungarian/i; 'Húngaro' + when /Polish/i; 'Polaco' + when /Romanian/i; 'Rumano' + when /Russian/i; 'Ruso' + when /Greek/i; 'Griego' + when /Ukranian/i; 'Ucraniano' + when /Turkish/i; 'Turco' + when /Slovenian/i; 'Eslovaco' + when /Croatian/i; 'Croata' + when /Slovak(?:ian)?/i; 'Eslovaco' + when /Czech/i; 'Checo' + when /Bulgarian/i; 'Búlgaro' + else @trans_str + end + end + end + class Italian + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'nome del file' + end + def description + 'descrizione' + end + def filetype_description + description + end + def metadata + 'metadati' + end + def file_size + 'dimensione' + end + def full_title #dc + 'Titolo' + end + def title + 'Titolo' + end + def subtitle + 'Sottotitolo' + end + def author #dc + 'Autore' + end + def contributor #dc + 'Contributore' + end + def translator + 'Traduttore' + end + def illustrator + 'Illustratore' + end + def publisher #dc + 'Casa editrice' + end + def prepared_by + 'Preparato da' + end + def digitized_by + 'Convertito in digitale da' + end + def subject #dc + 'Oggetto' + end + def description #dc (watch) + 'Descrizione' + end + def abstract #dc + 'Abstract' + end + def type #dc + 'Tipo' + end + def rights #dc + 'Diritti del lettore' + end + def date #dc + 'Data' + end + def date_created #dc + 'Data di creazione' + end + def date_issued #dc + 'Data di pubblicazione' + end + def date_available #dc + 'Data di effettiva disponibilità' + end + def date_modified #dc + 'Data di ultima modifica' + end + def date_valid #dc + 'Data di inizo validità' + end + def language #dc + 'Lingua' + end + def language_original + 'Lingua originale' + end + def format #dc + 'Formato' + end + def identifier #dc + 'Indentificatore' + end + def source #dc + 'Fonte' + end + def relation #dc + 'Collegamento' + end + def coverage #dc + 'Ambito' + end + def keywords + 'Parole chiave' + end + def comments + 'Commenti' + end + def cls_loc + 'Classificazione della Library of Congress' + end + def cls_dewey + 'Classificazione Dewey' + end + def cls_oclc # fix + 'Classify OCLC number' + end + def cls_gutenberg + 'Classificazione del Progetto Gutenberg' + end + def cls_isbn + 'Numero ISBN' + end + def prefix_a + 'Premessa (a)' + end + def prefix_b + 'Premessa (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Sorgente' + end + def word_count + 'Numero approssimativo di parole' + end + def sourcefile_digest + 'Checksum file sorgente' + end + def digest_md5 + 'Checksum file sorgente (md5)' + end + def digest_sha256 + 'Checksum file sorgente (sha256)' + end + def sc_number + 'Numero di revisione (RCS/CVS)' + end + def sc_date + 'Numero di revisione (RCS/CVS)' + end + def last_generated + 'Data di ultima generazione (dal metaverse)' + end + def sisu_version + 'Generato da' + end + def ruby_version + 'Ruby versione' + end + def suggested_links + 'Link suggeriti' + end + def language_version_list + 'Traduzioni disponibili' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'Inventario SiSU dell\'output generato' + end + def manifest_description_metadata + 'Inventario SiSU dei metadati' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'Inglese USA' # tag depreciated, see iso 639-2 + when /English/i; 'Inglese' + when /French/i; 'Francese' + when /German/i; 'Tedesco' + when /Italian/i; 'Italiano' + when /Spanish/i; 'Spagnolo' + when /Brazilian(?: Portuguese)?/i; 'Portoguese (Brasile)' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portoguese' + when /Swedish/i; 'Svedese' + when /Danish/i; 'Danese' + when /Finnish/i; 'Finlandese' + when /Norwegian/i; 'Norvegese' + when /Icelandic/i; 'Islandese' + when /Dutch/i; 'Olandese' + when /Estonian/i; 'Estone' + when /Hungarian/i; 'Ungherese' + when /Polish/i; 'Polacco' + when /Romanian/i; 'Romeno' + when /Russian/i; 'Russo' + when /Greek/i; 'Greco' + when /Ukranian/i; 'Ucraino' + when /Turkish/i; 'Turco' + when /Slovenian/i; 'Sloveno' + when /Croatian/i; 'Croato' + when /Slovak(?:ian)?/i; 'Slovacco' + when /Czech/i; 'Ceco' + when /Bulgarian/i; 'Bulgaro' + else @trans_str + end + end + end + class Finnish + def initialize(md,doc_lang,trans_str) + @md,@doc_lang,@trans_str=md,doc_lang,trans_str + end + def filename + 'tiedostonimi' + end + def description + 'kuvaus' + end + def filetype_description + description + end + def metadata + 'metadata' + end + def file_size + 'tiedoston koko' + end + def full_title #dc + 'otsikko' + end + def title + 'Otsikko' + end + def subtitle + 'Alaotsikko' + end + def author #dc + 'tekijä' + end + def contributor #dc + 'osallistuja' + end + def translator + 'Kääntäjä' + end + def illustrator + 'Kuvittaja' + end + def publisher #dc + 'julkaisija' + end + def prepared_by + 'Valmistaja' + end + def digitized_by + 'Digitalisoinut' + end + def subject #dc + 'aihe' + end + def description #dc (watch) + 'kuvaus' + end + def abstract #dc + 'tiivistelmä' + end + def type #dc + 'tyyppi' + end + def rights #dc + 'oikeudet' + end + def date #dc + 'päiväys' + end + def date_created #dc + 'luontipäivä' + end + def date_issued #dc + 'julkaisupäivä' + end + def date_available #dc + 'saantipäivä' + end + def date_modified #dc + 'muokkauspäivä' + end + def date_valid #dc + 'kelpoisuuspäivä' + end + def language #dc + 'kieli' + end + def language_original + 'Alkuperäiskieli' + end + def format #dc + 'muoto' + end + def identifier #dc + 'tunnus' + end + def source #dc + 'lähde' + end + def relation #dc + 'suhde' + end + def coverage #dc + 'kattavuus' + end + def keywords + 'Avainsanat' + end + def comments + 'Kommentit' + end + def cls_loc + 'Classify Library of Congress' + end + def cls_dewey + 'Classify Dewey' + end + def cls_oclc # fix + 'Classify OCLC number' + end + def cls_gutenberg + 'Classify Project Gutenberg' + end + def cls_isbn + 'Classify ISBN' + end + def prefix_a + 'Prefix (a)' + end + def prefix_b + 'Prefix (b)' + end + def topic_register + 'Topics Registered' + end + def sourcefile + 'Lähdetiedosto' + end + def word_count + 'Arvioitu sanamäärä' + end + def sourcefile_digest + 'Lähdetiedoston tiiviste' + end + def digest_md5 + 'Lähdetiedoston tiiviste (md5)' + end + def digest_sha256 + 'Lähdetiedoston tiiviste (sha256)' + end + def sc_number + 'Dokumentin RCS/CVS-numero' + end + def sc_date + 'Dokumentin RCS/CVS-päiväys' + end + def last_generated + 'Viimeksi tuotettu dokumentti (metaverse)' + end + def sisu_version + 'Generoinut' + end + def ruby_version + 'Ruby-versio' + end + def suggested_links + 'metadatan ehdottamat linkit' + end + def language_version_list + 'Dokumentin kieliversiot, manifestit' + end + def manifest_description + 'SiSU manifest of document filetypes and metadata' + end + def manifest_description_output + 'Tuotetun tuloksen SISU-manifesti' + end + def manifest_description_metadata + 'Dokumenttimetadatan SISU-manifesti' + end + def language_list_translated + lang=case @trans_str + when /American/i; 'Amerikanenglanti' # tag depreciated, see iso 639-2 + when /English/i; 'Englanti' + when /French/i; 'Ranska' + when /German/i; 'Saksa' + when /Italian/i; 'Italia' + when /Spanish/i; 'Espanja' + when /Brazilian(?: Portuguese)?/i; 'Brasilian portugali' # tag depreciated, see iso 639-2 + when /Portuguese/i; 'Portugali' + when /Swedish/i; 'Ruotsi' + when /Danish/i; 'Tanska' + when /Finnish/i; 'Suomi' + when /Norwegian/i; 'Norja' + when /Icelandic/i; 'Islanti' + when /Dutch/i; 'Hollanti' + when /Estonian/i; 'Viro' + when /Hungarian/i; 'Unkari' + when /Polish/i; 'Puola' + when /Romanian/i; 'Romania' + when /Russian/i; 'Venäjä' + when /Greek/i; 'Kreikka' + when /Ukranian/i; 'Ukraina' + when /Turkish/i; 'Turkki' + when /Slovenian/i; 'Slovenia' + when /Croatian/i; 'Kroatia' + when /Slovak(?:ian)?/i; 'Slovakki' + when /Czech/i; 'Tsekki' + when /Bulgarian/i; 'Bulgaria' + else @trans_str + end + end + end + class Porguguese < English + end + class Swedish < English + end + class Danish < English + end + class Norwegian < English + end + class Icelandic < English + end + class Dutch < English + end + class Estonian < English + end + class Hungarian < English + end + class Polish < English + end + class Romanian < English + end + class Russian < English + end + class Greek < English + end + class Ukranian < English + end + class Turkish < English + end + class Croatian < English + end + class Slovakian < English + end + class Czech < English + end + class Bulgarian < English + end +end +__END__ +http://www.debian.org/international/l10n/po/ +http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes +http://www.loc.gov/standards/iso639-2/php/code_list.php +albanian sq +amharic am +arabic ar +armenian hy +asturian +bahasai +bahasam +basque eu +bengali bn +brazil[ian] pt_BR +breton br +bulgarian bg +catalan ca +coptic +croatian hr +czech cs +danish da +divehi +dutch nl +english en +esperanto eo +estonian et +galician gl +german de +greek el +hebrew he +hindi hi +icelandic is +interlingua ia +irish ga +italian it +farsi +finnish fi +french fr +lao lo +latin la +latvian lv +lithuanian lt +lsorbian +magyar +malayalam ml +marathi mr +norsk no +nynorsk nn +occitan oc +polish pl +portuges pt +romanian ro +russian ru +samin se (check sami?) +sanskrit sa +scottish # (gd (Gaelic (Scots))) +serbian sr +slovak sk +slovenian sl +spanish es +swedish sv +syriac # (ar_SY (Arabic, as spoken in Syrian Arab Republic)) +tamil ta +telugu te +thai th +turkish tr +turkmen tk +ukrainian uk +urdu ur +usorbian +vietnamese vi +welsh cy diff --git a/lib/sisu/v3/shared_metadata.rb b/lib/sisu/v3/shared_metadata.rb index 167af5c4..c40bf68d 100644 --- a/lib/sisu/v3/shared_metadata.rb +++ b/lib/sisu/v3/shared_metadata.rb @@ -67,8 +67,8 @@ module Metadata meta,tag=[],[] dir=SiSU_Env::Info_env.new(@md.fns) base_html="#{dir.url.root}/#{@md.fnb}" - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] tr=SiSU_Translate::Source.new(@md,language) @attrib='md' if @display_heading @@ -997,8 +997,8 @@ WOK meta=[] dir=SiSU_Env::Info_env.new(@md.fns) base_html="#{dir.url.root}/#{@md.fnb}" - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] tr=SiSU_Translate::Source.new(@md,language) tag="Document Manifest @" inf="#{@br}#{base_html}/#{@md.fn[:manifest]}" diff --git a/lib/sisu/v3/sitemaps.rb b/lib/sisu/v3/sitemaps.rb index 2241b5e6..c306ee99 100644 --- a/lib/sisu/v3/sitemaps.rb +++ b/lib/sisu/v3/sitemaps.rb @@ -75,7 +75,7 @@ module SiSU_Sitemaps def songsheet begin @sys=SiSU_Env::System_call.new - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) + fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) if @opt.cmd =~/Y/ @md=SiSU_Param::Parameters.new(@opt).get diff --git a/lib/sisu/v3/sst_do_inline_footnotes.rb b/lib/sisu/v3/sst_do_inline_footnotes.rb index 27ccf6db..60247060 100644 --- a/lib/sisu/v3/sst_do_inline_footnotes.rb +++ b/lib/sisu/v3/sst_do_inline_footnotes.rb @@ -170,8 +170,8 @@ module SiSU_Convert_footnotes @@word_mode=[] @env=SiSU_Env::Info_env.new(@md.fns) @skin=SiSU_Env::Info_skin.new(@md) - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - @language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + @language=l[:n] @translate=SiSU_Translate::Source.new(@md,@language) end def reset diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 6f69296a..a1c6228b 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -58,6 +58,7 @@ =end @@cX=nil @@current_document=Dir.pwd #nil #'' +@@lang_info=nil module SiSU_Env require_relative 'constants' # constants.rb require 'fileutils' @@ -444,7 +445,7 @@ module SiSU_Env end self end - def document_language_versions_found + def document_language_versions_found #REVISIT @fn={} unless (@fns.nil? \ or @fns.empty?) @@ -499,12 +500,12 @@ module SiSU_Env fns_c="#{@fn[:m]}~#{lng.code}.#{@fn[:t]}" fns_l="#{@fn[:m]}~#{lng.name}.#{@fn[:t]}" if FileTest.file?(fns_c) - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(fns_c) - lng=fn_set_lang[:l] + fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(fns_c) #reconsider file_to_language + lng=fn_set_lang[:n] fn=SiSU_Env::Env_call.new(fns_c).lang(fn_set_lang[:c]) @m << { m: fn[:manifest], l: lng } elsif FileTest.file?(fns_l) - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(fns_l) + fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(fns_l) #reconsider file_to_language @fnl=dir.i18n.lang_filename(fn_set_lang[:c]) fn=SiSU_Env::Env_call.new(fns_l).lang(fn_set_lang[:c]) @m << { m: fn[:manifest], l: lng } @@ -790,68 +791,111 @@ module SiSU_Env end end class Standardise_language + require_relative 'i18n' # i18n.rb def initialize(l='') @language=l if @language.empty? @language=Info_env.new.defaults[:language] end + @r=%{(?:#{Px[:lng_lst].join('|')})} + @lang_info=SiSU_i18n::Languages.new end - def language #use ISO_639-2 - lang={} + def lang_lst # from i18n + @@lang_info ||=@lang_info.language.list + end + def lang(l='') # from i18n + x=if l =~/^#{@r}$/ + @lang_info.language.list[l] + elsif @language =~/^#{@r}$/ + @lang_info.language.list[@language] + else nil + end + end + def language + lng={} case @language - when /American|^us$/i; d,c,l=false,'en','American English' #depreciated, see iso 639-2 - when /English|^en$/i; d,c,l=false,'en','English' - when /French|Francais|^fr$/i; d,c,l=false,'fr','French' - when /German|^de$/i; d,c,l=false,'de','German' - when /Italian|^it$/i; d,c,l=false,'it','Italian' - when /Spanish|Espanol|^es$/i; d,c,l=false,'es','Spanish' - when /Brazilian(?: Portuguese)?|^br$/i; d,c,l=false,'pt','Brazilian Portuguese' #depreciated, see iso 639-2 - when /Portuguese|^pt$/i; d,c,l=false,'pt','Portuguese' - when /Swedish|Svensk|^sv$/i; d,c,l=false,'sv','Swedish' - when /Danish|Dansk|^da$/i; d,c,l=false,'da','Danish' - when /Finnish|Finsk|Suomi|^fi$/i; d,c,l=false,'fi','Finnish' - when /Norwegian|Norsk|^no$/i; d,c,l=false,'no','Norwegian' - when /Icelandic|^is$/i; d,c,l=false,'is','Icelandic' - when /Dutch|^nl$/i; d,c,l=false,'nl','Dutch' - when /Estonian|^et$/i; d,c,l=false,'et','Estonian' - when /Hungarian|^hu$/i; d,c,l=false,'hu','Hungarian' - when /Polish|^pl$/i; d,c,l=false,'pl','Polish' - when /Romanian|^ro$/i; d,c,l=false,'ro','Romanian' - when /Russian|^ru$/i; d,c,l=false,'ru','Russian' - when /Greek|^el$/i; d,c,l=false,'el','Greek' - when /Ukranian|^uk$/i; d,c,l=false,'uk','Ukranian' - when /Turkish|^tr$/i; d,c,l=false,'tr','Turkish' - #when /Serbian/i; d,c,l=false,'', 'Serbian' - #when /Welsh/i; d,c,l=false,'', 'Welsh' - #when /Basque/i; d,c,l=false,'', 'Basque' - #when /Breton/i; d,c,l=false,'', 'Breton' - #when /Catalan/i; d,c,l=false,'', 'Catalan' - #when /Galician/i; d,c,l=false,'', 'Galician' - #when /Saa?mi/i; d,c,l=false,'', 'Saami' - #when /Hebrew/i; d,c,l=false,'', 'Hebrew' - #when /Latin/i; d,c,l=false,'', 'Latin' - #when /Esperanto/i; d,c,l=false,'', 'Esperanto' - when /Slovenian|^sl$/i; d,c,l=false,'sl','Slovenian' - when /Croatian|^hr$/i; d,c,l=false,'hr','Croatian' - when /Slovak(?:ian)?|^sk$/i; d,c,l=false,'sk','Slovakian' - when /Czech|^cs$/i; d,c,l=false,'cs','Czech' - when /Bulgarian|^bg$/i; d,c,l=false,'bg','Bulgarian' - else d,c,l=true,'en','English (default)' - #else d,c,l=true,'xx','Default' - end - lang[:d],lang[:c],lang[:l]=d,c,l - lang + when /^am$|Amharic/i; d,c,l=false,lang_lst['am'][:c], lang_lst['am'][:n] + when /^bg$|Bulgarian/i; d,c,l=false,lang_lst['bg'][:c], lang_lst['bg'][:n] + when /^bn$|Bengali/i; d,c,l=false,lang_lst['bn'][:c], lang_lst['bn'][:n] + when /^br$|Breton/i; d,c,l=false,lang_lst['br'][:c], lang_lst['br'][:n] + when /^ca$|Catalan/i; d,c,l=false,lang_lst['ca'][:c], lang_lst['ca'][:n] + when /^cs$|Czech/i; d,c,l=false,lang_lst['cs'][:c], lang_lst['cs'][:n] + when /^cy$|Welsh/i; d,c,l=false,lang_lst['cy'][:c], lang_lst['cy'][:n] + when /^da$|Danish|Dansk/i; d,c,l=false,lang_lst['da'][:c], lang_lst['da'][:n] + when /^de$|German/i; d,c,l=false,lang_lst['de'][:c], lang_lst['de'][:n] + when /^el$|Greek/i; d,c,l=false,lang_lst['el'][:c], lang_lst['el'][:n] + when /^en$|English/i; d,c,l=false,lang_lst['en'][:c], lang_lst['en'][:n] + when /^eo$|Esperanto/i; d,c,l=false,lang_lst['eo'][:c], lang_lst['eo'][:n] + when /^es$|Spanish|Espanol/i; d,c,l=false,lang_lst['es'][:c], lang_lst['es'][:n] + when /^et$|Estonian/i; d,c,l=false,lang_lst['et'][:c], lang_lst['et'][:n] + when /^eu$|Basque/i; d,c,l=false,lang_lst['eu'][:c], lang_lst['eu'][:n] + when /^fi$|Finnish|Finsk|Suomi/i; d,c,l=false,lang_lst['fi'][:c], lang_lst['fi'][:n] + when /^fr$|French|Francais/i; d,c,l=false,lang_lst['fr'][:c], lang_lst['fr'][:n] + when /^ga$|Irish/i; d,c,l=false,lang_lst['ga'][:c], lang_lst['ga'][:n] + when /^gl$|Galician/i; d,c,l=false,lang_lst['gl'][:c], lang_lst['gl'][:n] + when /^he$|Hebrew/i; d,c,l=false,lang_lst['he'][:c], lang_lst['he'][:n] + when /^hi$|Hindi/i; d,c,l=false,lang_lst['hi'][:c], lang_lst['hi'][:n] + when /^hr$|Croatian/i; d,c,l=false,lang_lst['hr'][:c], lang_lst['hr'][:n] + when /^hy$|Armenian/i; d,c,l=false,lang_lst['hy'][:c], lang_lst['hy'][:n] + when /^ia$|Interlingua/i; d,c,l=false,lang_lst['ia'][:c], lang_lst['ia'][:n] + when /^is$|Icelandic/i; d,c,l=false,lang_lst['is'][:c], lang_lst['is'][:n] + when /^it$|Italian/i; d,c,l=false,lang_lst['it'][:c], lang_lst['it'][:n] + when /^la$|Latin/i; d,c,l=false,lang_lst['la'][:c], lang_lst['la'][:n] + when /^lo$|Lao/i; d,c,l=false,lang_lst['lo'][:c], lang_lst['lo'][:n] + when /^lt$|Lithuanian/i; d,c,l=false,lang_lst['lt'][:c], lang_lst['lt'][:n] + when /^lv$|Latvian/i; d,c,l=false,lang_lst['lv'][:c], lang_lst['lv'][:n] + when /^ml$|Malayalam/i; d,c,l=false,lang_lst['ml'][:c], lang_lst['ml'][:n] + when /^mr$|Marathi/i; d,c,l=false,lang_lst['mr'][:c], lang_lst['mr'][:n] + when /^nl$|Dutch/i; d,c,l=false,lang_lst['nl'][:c], lang_lst['nl'][:n] + when /^no$|Norwegian|Norsk/i; d,c,l=false,lang_lst['no'][:c], lang_lst['no'][:n] + when /^nn$|Norwegian Nynorsk/i; d,c,l=false,lang_lst['nn'][:c], lang_lst['nn'][:n] + when /^oc$|Occitan/i; d,c,l=false,lang_lst['oc'][:c], lang_lst['oc'][:n] + when /^pl$|Polish/i; d,c,l=false,lang_lst['pl'][:c], lang_lst['pl'][:n] + when /^pt$|Portuguese/i; d,c,l=false,lang_lst['pt'][:c], lang_lst['pt'][:n] + when /^pt_BR$|Portuguese Brazil/i; d,c,l=false,lang_lst['pt_BR'][:c], lang_lst['pt_BR'][:n] + when /^ro$|Romanian/i; d,c,l=false,lang_lst['ro'][:c], lang_lst['ro'][:n] + when /^ru$|Russian/i; d,c,l=false,lang_lst['ru'][:c], lang_lst['ru'][:n] + when /^sa$|Sanskrit/i; d,c,l=false,lang_lst['sa'][:c], lang_lst['sa'][:n] + when /^se$|Sami/i; d,c,l=false,lang_lst['se'][:c], lang_lst['se'][:n] + when /^sk$|Slovak/i; d,c,l=false,lang_lst['sk'][:c], lang_lst['sk'][:n] + when /^sl$|Slovenian/i; d,c,l=false,lang_lst['sl'][:c], lang_lst['sl'][:n] + when /^sq$|Albanian/i; d,c,l=false,lang_lst['sq'][:c], lang_lst['sq'][:n] + when /^sr$|Serbian/i; d,c,l=false,lang_lst['sr'][:c], lang_lst['sr'][:n] + when /^sv$|Swedish|Svensk/i; d,c,l=false,lang_lst['sv'][:c], lang_lst['sv'][:n] + when /^ta$|Tamil/i; d,c,l=false,lang_lst['ta'][:c], lang_lst['ta'][:n] + when /^te$|Telugu/i; d,c,l=false,lang_lst['te'][:c], lang_lst['te'][:n] + when /^th$|Thai/i; d,c,l=false,lang_lst['th'][:c], lang_lst['th'][:n] + when /^tk$|Turkmen/i; d,c,l=false,lang_lst['tk'][:c], lang_lst['tk'][:n] + when /^tr$|Turkish/i; d,c,l=false,lang_lst['tr'][:c], lang_lst['tr'][:n] + when /^uk$|Ukranian/i; d,c,l=false,lang_lst['uk'][:c], lang_lst['uk'][:n] + when /^ur$|Urdu/i; d,c,l=false,lang_lst['ur'][:c], lang_lst['ur'][:n] + when /^us|American$|/i; d,c,l=false,lang_lst['en'][:c], lang_lst['en'][:n] + when /^vi$|Vietnamese/i; d,c,l=false,lang_lst['vi'][:c], lang_lst['vi'][:n] + else d,c,l=true, lang_lst['en'][:c], lang_lst['en'][:n] #default + end + lng[:d],lng[:c],lng[:n]=d,c,l + lng end def name - language[:l].downcase + #lang(@language)[:n].downcase + #lang[@language][:n].downcase + #language[:n].downcase + language[:n].downcase end def title - language[:l] + #lang(@language)[:n] + #lang[@language][:n] + language[:n] end def code + #lang[@language][:c] + #lang(@language)[:c] language[:c] end - def file_to_language(file) + def tex_name + language[:xlp] + end + def file_to_language(file) # used, fix and remove m=/.+?\~(\w{2,3})\.(?:-|ssm\.)?sst$/ @language=if file =~m ; file[m,1] else '' @@ -859,7 +903,15 @@ module SiSU_Env language end def codes - codes=['us','en','fr','de','it','es','br','pt','sv','da','fi','no','is','nl','et','hu','pl','ro','ru','el','uk','tr','sk','hr','sl','cs','bg'] # remove us and br see iso-639-2 + # Language List po4a + # <http://www.debian.org/international/l10n/po/> + # Px[:lng_lst]=%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 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] + # see polyglossia for subset + # <http://mirrors.ctan.org/macros/xetex/latex/polyglossia/polyglossia.pdf> + # also note ISO_639-2 + # <http://en.wikipedia.org/wiki/ISO_639-2> + # <http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes> + Px[:lng_lst] # constants.rb end end class Info_env < Env_call @@ -2091,7 +2143,7 @@ WOK elsif defined? @rc['program_select']['console_web_browser'] \ and @rc['program_select']['console_web_browser'] =~/\S\S+/ @rc['program_select']['console_web_browser'] - else 'console-www-browser' #'lynx' 'links2' 'elinks' 'epiphany' + else 'console-www-browser' #'lynx' 'links' 'links2' 'elinks' 'w3m' end end def console_www_browser @@ -2104,7 +2156,7 @@ WOK elsif defined? @rc['program_select']['epub_viewer'] \ and @rc['program_select']['epub_viewer'] =~/\S\S+/ @rc['program_select']['epub_viewer'] - else 'ebook-viewer' #'calibre' 'fbreader' + else 'ebook-viewer' #'calibre' 'fbreader' end end def xml_viewer @@ -2120,7 +2172,7 @@ WOK ((defined? @rc['program_select']['odf_viewer']) \ && @rc['program_select']['odf_viewer'] =~/\S\S+/) \ ? @rc['program_select']['odf_viewer'] \ - : 'libreoffice' #'odf-viewer','oowriter' + : 'lowriter' #'odf-viewer','oowriter' end def manpage_viewer 'man' @@ -3382,14 +3434,9 @@ WOK end self end - def lang_part - (@md.opt.f_pth[:lng]) \ - ? @md.opt.f_pth[:lng] \ - : @md.i18n[0] - end def set_path_abc(ft) if @env.output_dir_structure.by_language_code? - "#{output_path.base}/#{lang_part}/#{ft}" + "#{output_path.base}/#{@md.opt.lng}/#{ft}" elsif @env.output_dir_structure.by_filetype? "#{output_path.base}/#{ft}" else @@ -3398,14 +3445,14 @@ WOK end def set_path_ab(ft) if @env.output_dir_structure.by_language_code? - "#{output_path.base}/#{lang_part}/#{ft}" + "#{output_path.base}/#{@md.opt.lng}/#{ft}" else "#{output_path.base}/#{ft}" end end def set_path_ab_src(ft) if @env.output_dir_structure.by_language_code? - "#{output_path.base}/#{ft}/#{lang_part}" + "#{output_path.base}/#{ft}/#{@md.opt.lng}" else "#{output_path.base}/#{ft}" end @@ -3429,14 +3476,14 @@ WOK path=set_path_ab_src(ft) end def po - "#{output_path.base}/po4a/#{@md.fnb}/po/#{lang_part}" + "#{output_path.base}/po4a/#{@md.fnb}/po/#{@md.opt.lng}" end def pot "#{output_path.base}/po4a/#{@md.fnb}/pot" end def po_git ft=Gt[:po] - pth=@env.processing_path.git + '/' + @md.fnb + '/' + ft + '/' + lang_part + pth=@env.processing_path.git + '/' + @md.fnb + '/' + ft + '/' + @md.opt.lng mkdir_p(pth) unless FileTest.directory?(pth) pth end @@ -3512,6 +3559,9 @@ WOK ft='sitemaps' path=set_path_ab(ft) end + def sqlite + path=output_path.base + end self end end @@ -3638,8 +3688,12 @@ WOK @@pwd ||=Dir.pwd @pwd=Dir.pwd @env=SiSU_Env::Info_env.new - m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m - @pwd_stub=@pwd[m,1] + #m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m + #@pwd_stub=@pwd[m,1] + pt=Pathname.new(@pwd) + r=Px[:lng_lst].join('|') + u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/ + @pwd_stub=pt.realpath.to_s[u,1] @rc=@@rc ||=Get_init.instance.sisu_yaml.rc @defaults=Info_env.new.defaults end diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index 90dd7452..8c53b458 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -614,7 +614,7 @@ module SiSU_TeX_Pdf end end class Format_head - require_relative 'i18n' # defaults.rb + require_relative 'prog_text_translation' # prog_text_translation.rb def initialize(md,t_o) @md,@t_o=md,t_o @env=SiSU_Env::Info_env.new(@md.fns) @@ -632,14 +632,14 @@ module SiSU_TeX_Pdf @brace_url=SiSU_Viz::Skin.new.url_decoration @tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine @ps=@txt if @txt=~/(?:a4|letter|legal|book|a5|b5)/i - @lang ||=SiSU_i18n::Language.new(@md) + @lang ||=SiSU_i18n::Languages.new #.list[@md.opt.lng][:xlp] end def tex_head_lang #babel 18n lang_char_arr=@md.i18n mainlang_char=lang_char_arr.slice(0) - mainlang=@lang.tex_name(mainlang_char) + mainlang=@lang.list[mainlang_char][:xlp] otherlang=[] - lang_char_arr.slice(1..9).each { |ch| otherlang << @lang.tex_name(ch) } + lang_char_arr.slice(1..9).each { |ch| otherlang << @lang.list[ch][:xlp] } otherlang=otherlang.join(',') { mainlang: mainlang, otherlang: otherlang } end @@ -893,7 +893,7 @@ WOK end def document_head_with_orientation endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/)||'' #not implemented see also def endnotes - @lang.tex_name(@md.i18n[0]) + @lang.list[@md.i18n[0]][:xlp] <<WOK #{tex_head_paper} #{tex_head_encode} @@ -956,7 +956,7 @@ WOK {-\\baselineskip}{0.5\\baselineskip}% {\\normalfont\\normalsize\\itshape\\raggedright}} % \\makeatother -\\selectlanguage{#{@lang.tex_name(@md.i18n[0])}} +\\selectlanguage{#{@lang.list[@md.i18n[0]][:xlp]}} WOK end def a4generic diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 77952d0b..c963c97e 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -79,12 +79,11 @@ module SiSU_urls def initialize(opt) @opt=opt @particulars=SiSU_Particulars::Combined_singleton.instance.get_env_md(opt) - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @cmd=@opt.cmd @md=@particulars.md @env=@particulars.env @fnb=@env.fnb - fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) + fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language @fnl=@env.i18n.lang_filename(fn_set_lang[:c]) @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/ @@ -216,7 +215,7 @@ module SiSU_urls SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result end def sqlite(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db", "#{y}").result end self end diff --git a/man/man1/sisu-concordance.1 b/man/man1/sisu-concordance.1 index cccb57f5..2b5a981f 100644 --- a/man/man1/sisu-concordance.1 +++ b/man/man1/sisu-concordance.1 @@ -1,38 +1,38 @@ -.TH SISU-CONCORDANCE 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-CONCORDANCE 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-concordance\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-concordance\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-concordance\fR command is an alias for \fBsisu --concordance\fR (or \fBsisu -w\fR) which produces an HTML concordance file (wordlist) of a SiSU markup file. +The \fBsisu\-concordance\fR command is an alias for \fBsisu \-\-concordance\fR (or \fBsisu \-w\fR) which produces an HTML concordance file (wordlist) of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-epub.1 b/man/man1/sisu-epub.1 index ddc3e5f3..ab6a4d6e 100644 --- a/man/man1/sisu-epub.1 +++ b/man/man1/sisu-epub.1 @@ -1,38 +1,38 @@ -.TH SISU-EPUB 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-EPUB 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-epub\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-epub\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-epub\fR command is an alias for \fBsisu --epub\fR (or \fBsisu -e\fR) which produces EPUB output of a SiSU markup file. +The \fBsisu\-epub\fR command is an alias for \fBsisu \-\-epub\fR (or \fBsisu \-e\fR) which produces EPUB output of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-git.1 b/man/man1/sisu-git.1 index c0d8a229..c5c612eb 100644 --- a/man/man1/sisu-git.1 +++ b/man/man1/sisu-git.1 @@ -1,36 +1,36 @@ -.TH SISU-GIT 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-GIT 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-git\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-git\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-git\fR command is an alias for \fBsisu --git\fR (or \fBsisu -g\fR) which produces a git repository of the sisu source document and associated parts (images, ). +The \fBsisu\-git\fR command is an alias for \fBsisu \-\-git\fR (or \fBsisu \-g\fR) which produces a git repository of the sisu source document and associated parts (images, ). .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-harvest.1 b/man/man1/sisu-harvest.1 index 79b1116c..3967c18e 100644 --- a/man/man1/sisu-harvest.1 +++ b/man/man1/sisu-harvest.1 @@ -1,38 +1,38 @@ -.TH SISU-HARVEST 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-HARVEST 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-harvest\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-harvest\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-harvest\fR command is an alias for \fBsisu --harvest\fR which based on the @classify: :topic_register: headers in each SiSU markup file, produces HTML output in the form of an index of authors and their texts and an index of topics and related texts. +The \fBsisu\-harvest\fR command is an alias for \fBsisu \-\-harvest\fR which based on the @classify: :topic_register: headers in each SiSU markup file, produces HTML output in the form of an index of authors and their texts and an index of topics and related texts. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-html.1 b/man/man1/sisu-html.1 index 4b5e9888..7d80cb69 100644 --- a/man/man1/sisu-html.1 +++ b/man/man1/sisu-html.1 @@ -1,38 +1,38 @@ -.TH SISU-HTML 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-HTML 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-html\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-html\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-html\fR command is an alias for \fBsisu --html\fR (or \fBsisu -h\fR) which produces HTML output of a SiSU markup file. +The \fBsisu\-html\fR command is an alias for \fBsisu \-\-html\fR (or \fBsisu \-h\fR) which produces HTML output of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-odf.1 b/man/man1/sisu-odf.1 index 8fe09344..9e3bbbba 100644 --- a/man/man1/sisu-odf.1 +++ b/man/man1/sisu-odf.1 @@ -1,38 +1,38 @@ -.TH SISU-ODF 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-ODF 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-odf\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-odf\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-odf\fR command is an alias for \fBsisu --odt\fR (or \fBsisu -o\fR) which produces OpenDocument output of a SiSU markup file. +The \fBsisu\-odf\fR command is an alias for \fBsisu \-\-odt\fR (or \fBsisu \-o\fR) which produces OpenDocument output of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-pdf.1 b/man/man1/sisu-pdf.1 index 28e9dff1..49a86ef1 100644 --- a/man/man1/sisu-pdf.1 +++ b/man/man1/sisu-pdf.1 @@ -1,38 +1,38 @@ -.TH SISU-PDF 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-PDF 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-pdf\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-pdf\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-pdf\fR command is an alias for \fBsisu --pdf\fR (or \fBsisu -p\fR) which produces PDF output of a SiSU markup file. +The \fBsisu\-pdf\fR command is an alias for \fBsisu \-\-pdf\fR (or \fBsisu \-p\fR) which produces PDF output of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-pg.1 b/man/man1/sisu-pg.1 index 55bac1b4..81125ff2 100644 --- a/man/man1/sisu-pg.1 +++ b/man/man1/sisu-pg.1 @@ -1,38 +1,38 @@ -.TH SISU-PG 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-PG 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-pq\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-pq\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-pq\fR command is an alias for \fBsisu --pg\fR (or \fBsisu -D\fR) which populates a PostgreSQL database with SiSU content (for search) from a SiSU markup file. +The \fBsisu\-pq\fR command is an alias for \fBsisu \-\-pg\fR (or \fBsisu \-D\fR) which populates a PostgreSQL database with SiSU content (for search) from a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-po.1 b/man/man1/sisu-po.1 index e8da6c16..7581369d 100644 --- a/man/man1/sisu-po.1 +++ b/man/man1/sisu-po.1 @@ -1,38 +1,38 @@ -.TH SISU-PO 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-PO 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-po\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-po\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-po\fR command is an alias for \fBsisu --po4a\fR (or \fBsisu -o\fR) which provided two sisu markup files of the same document in different languages produces .pot and .po output of a SiSU markup file. Experimental, and under development. +The \fBsisu\-po\fR command is an alias for \fBsisu \-\-po4a\fR (or \fBsisu \-o\fR) which provided two sisu markup files of the same document in different languages produces .pot and .po output of a SiSU markup file. Experimental, and under development. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-sqlite.1 b/man/man1/sisu-sqlite.1 index 91041900..07b68619 100644 --- a/man/man1/sisu-sqlite.1 +++ b/man/man1/sisu-sqlite.1 @@ -1,38 +1,38 @@ -.TH SISU-SQLITE 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-SQLITE 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-sqlite\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-sqlite\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-sqlite\fR command is an alias for \fBsisu --sqlite\fR (or \fBsisu -d\fR) which populates a SQLite database with SiSU content (for search) from a SiSU markup file. +The \fBsisu\-sqlite\fR command is an alias for \fBsisu \-\-sqlite\fR (or \fBsisu \-d\fR) which populates a SQLite database with SiSU content (for search) from a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu-txt.1 b/man/man1/sisu-txt.1 index e606123a..68d1b080 100644 --- a/man/man1/sisu-txt.1 +++ b/man/man1/sisu-txt.1 @@ -1,38 +1,38 @@ -.TH SISU-TXT 1 "2011-03-05" "2.8.1" "SiSU" +.TH SISU\-TXT 1 "2011\-03\-05" "2.8.1" "SiSU" .SH NAME -\fBSiSU\fR - Structured information, Serialized Units - a document publishing system +\fBSiSU\fR \- Structured information, Serialized Units \- a document publishing system .SH SYNOPSIS -\fBsisu-txt\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR +\fBsisu\-txt\fR \fIsisu_document.sst\fR | \fIsisu_document.ssm\fR .SH DESCRIPTION \fBSiSU\fR is a lightweight markup based document structuring, publishing and search framework for document collections. .PP -The \fBsisu-txt\fR command is an alias for \fBsisu --txt\fR (or \fBsisu -t\fR) which produces plain text output of a SiSU markup file. +The \fBsisu\-txt\fR command is an alias for \fBsisu \-\-txt\fR (or \fBsisu \-t\fR) which produces plain text output of a SiSU markup file. .SH SEE ALSO \fIsisu\fR(1), .br -\fIsisu-concordance\fR(1), +\fIsisu\-concordance\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-git\fR(1), +\fIsisu\-git\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-po\fR(1), +\fIsisu\-po\fR(1), .br -\fIsisu-sqlite\fR(1). +\fIsisu\-sqlite\fR(1). .SH HOMEPAGE More information about \fBSiSU\fR can be found at <\fIhttp://www.sisudoc.org/\fR> or <\fIhttp://www.jus.uio.no/sisu/\fR>. diff --git a/man/man1/sisu.1 b/man/man1/sisu.1 index 255b21a1..9f77082d 100644 --- a/man/man1/sisu.1 +++ b/man/man1/sisu.1 @@ -1,35 +1,35 @@ -.TH "sisu" "1" "2011-04-17" "3.0.7-beta-rb1.9.2p180" "SiSU" +.TH "sisu" "1" "2011\-04\-17" "3.0.7\-beta\-rb1.9.2p180" "SiSU" .br .SH NAME .br -sisu - documents: markup, structuring, publishing in multiple standard formats, and search +sisu \- documents: markup, structuring, publishing in multiple standard formats, and search .br .SH SYNOPSIS .br -sisu [-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard] +sisu [\-abcDdFehIiMmNnopqRrSsTtUuVvwXxYyZz0\-9] [filename/wildcard] .br -sisu [-Ddcv] [instruction] [filename/wildcard] +sisu [\-Ddcv] [instruction] [filename/wildcard] .br -sisu [-CcFLSVvW] +sisu [\-CcFLSVvW] .br -sisu --v2 [operations] +sisu \-\-v2 [operations] .br -sisu --v3 [operations] +sisu \-\-v3 [operations] .br sisu3 [operations] -.SH SISU - MANUAL, +.SH SISU \- MANUAL, RALPH AMISSAH .br .SH WHAT IS SISU? .br -.SH 1. INTRODUCTION - WHAT IS SISU? +.SH 1. INTRODUCTION \- WHAT IS SISU? .br .br @@ -49,7 +49,7 @@ case for development is work with medium to large document sets and cope with evolving document formats/ representation technologies. Documents are prepared once, and generated as need be to update the technical presentation or add additional output formats. Various output formats (including search related -output) share a common mechanism for cross-output-format citation. +output) share a common mechanism for cross\-output\-format citation. .br .B SiSU @@ -75,14 +75,14 @@ Source document preparation and output generation is a two step process: (i) document source is prepared, that is, marked up in sisu markup syntax and (ii) the desired output subsequently generated by running the sisu engine against document source. Output representations if updated (in the sisu engine) can be -generated by re-running the engine against the prepared source. Using +generated by re\-running the engine against the prepared source. Using .B SiSU markup applied to a document, .B SiSU custom builds (to take advantage of the strengths of different ways of representing documents) various standard open output formats including plain text, HTML, XHTML, XML, EPUB, OpenDocument, LaTeX or PDF files, and populate an -SQL database with objects[^1] (equating generally to paragraph-sized chunks) so +SQL database with objects[^1] (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 @@ -126,7 +126,7 @@ have that old proprietary formats will remain (or can be read without proprietary software/equipment) in 15 years time, or the way the way in which html has evolved over its relatively short span of existence. .B SiSU -provides the flexibility of producing documents in multiple non-proprietary +provides the flexibility of producing documents in multiple non\-proprietary open formats including html, pdf[^5] ODF,[^6] and EPUB.[^7] Whilst .B SiSU relies on software, the markup is uncomplicated and minimalistic which @@ -151,7 +151,7 @@ which is currently under development, the html module will again be updated allowing all existing documents to be regenerated as html 5). .br -The document formats are written to the file-system and available for indexing +The document formats are written to the file\-system and available for indexing by independent indexing tools, whether off the web like Google and Yahoo or on the site like Lucene and Hyperestraier. @@ -190,7 +190,7 @@ content prepared in .br .B SiSU .B SiSU -is a document publishing system, that from a simple single marked-up +is a document publishing system, that from a simple single marked\-up document, produces multiple of output formats including: plaintext, html, xhtml, XML, epub, odt (odf text), LaTeX, pdf, info, and SQL (PostgreSQL and SQLite), which share numbered text objects ("object citation numbering") and @@ -200,104 +200,104 @@ the same document structure information. For more see: .SH 2.2 DOCUMENT PROCESSING COMMAND FLAGS .TP -.B -a [filename/wildcard] +.B \-a [filename/wildcard] produces plaintext with Unix linefeeds and without markup, (object numbers -are omitted), has footnotes at end of each paragraph that contains them [ \ -A -\ for \ equivalent \ dos \ (linefeed) \ output \ file] [see \ -e \ for \ -endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes -at the end of each paragraph --unix for unix linefeed (default) --msdos for +are omitted), has footnotes at end of each paragraph that contains them [ \ \-A +\ for \ equivalent \ dos \ (linefeed) \ output \ file] [see \ \-e \ for \ +endnotes]. (Options include: \-\-endnotes for endnotes \-\-footnotes for footnotes +at the end of each paragraph \-\-unix for unix linefeed (default) \-\-msdos for msdos linefeed) .TP -.B -b [filename/wildcard] -see --xhtml +.B \-b [filename/wildcard] +see \-\-xhtml .TP -.B --color-toggle [filename/wildcard] +.B \-\-color\-toggle [filename/wildcard] screen toggle ansi screen colour on or off depending on default set (unless --c flag is used: if sisurc colour default is set to 'true', output to screen +\-c flag is used: if sisurc colour default is set to 'true', output to screen will be with colour, if sisurc colour default is set to 'false' or is undefined -screen output will be without colour). Alias -c +screen output will be without colour). Alias \-c .TP -.B --concordance [filename/wildcard] +.B \-\-concordance [filename/wildcard] produces concordance (wordmap) a rudimentary index of all the words in a document. (Concordance files are not generated for documents of over 260,000 -words unless this limit is increased in the file sisurc.yml). Alias -w +words unless this limit is increased in the file sisurc.yml). Alias \-w .TP -.B -C [--init-site] +.B \-C [\-\-init\-site] configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they -already exist unless modifier is used). -C --init-site configure/initialise -site more extensive than -C on its own, shared output directory files/force +already exist unless modifier is used). \-C \-\-init\-site configure/initialise +site more extensive than \-C on its own, shared output directory files/force update, existing shared output config files such as css and dtd files are updated if this modifier is used. .TP -.B -CC +.B \-CC configure/initialise shared output directory files initialize shared output directory (config files such as css and dtd files are not updated if they -already exist unless modifier is used). The equivalent of: -C --init-site -configure/initialise site, more extensive than -C on its own, shared output +already exist unless modifier is used). The equivalent of: \-C \-\-init\-site +configure/initialise site, more extensive than \-C on its own, shared output directory files/force update, existing shared output config files such as css -and dtd files are updated if -CC is used. +and dtd files are updated if \-CC is used. .TP -.B -c [filename/wildcard] -see --color-toggle +.B \-c [filename/wildcard] +see \-\-color\-toggle .TP -.B --dal [filename/wildcard/url] +.B \-\-dal [filename/wildcard/url] assumed for most other flags, creates new intermediate files for processing (document abstraction) that is used in all subsequent processing of other -output. This step is assumed for most processing flags. To skip it see -n. -Alias -m +output. This step is assumed for most processing flags. To skip it see \-n. +Alias \-m .TP -.B --delete [filename/wildcard] -see --zap +.B \-\-delete [filename/wildcard] +see \-\-zap .TP -.B -D [instruction] [filename] -see --pg +.B \-D [instruction] [filename] +see \-\-pg .TP -.B -d [--db-[database \ type \ (sqlite|pg)]] --[instruction] [filename] -see --sqlite +.B \-d [\-\-db\-[database \ type \ (sqlite|pg)]] \-\-[instruction] [filename] +see \-\-sqlite .TP -.B --epub [filename/wildcard] +.B \-\-epub [filename/wildcard] produces an epub document, [sisu \ version \ 2 \ only] (filename.epub). Alias --e +\-e .TP -.B -e [filename/wildcard] -see --epub +.B \-e [filename/wildcard] +see \-\-epub .TP -.B -F [--webserv=webrick] -see --sample-search-form +.B \-F [\-\-webserv=webrick] +see \-\-sample\-search\-form .TP -.B --git [filename/wildcard] +.B \-\-git [filename/wildcard] produces or updates markup source file structure in a git repo (experimental -and subject to change). Alias -g +and subject to change). Alias \-g .TP -.B -g [filename/wildcard] -see --git +.B \-g [filename/wildcard] +see \-\-git .TP -.B --harvest *.ss[tm] +.B \-\-harvest *.ss[tm] makes two lists of sisu output based on the sisu markup documents in a directory: list of author and authors works (year and titles), and; list by topic with titles and author. Makes use of header metadata fields (author, -title, date, topic_register). Can be used with maintenance (-M) and remote -placement (-R) flags. +title, date, topic_register). Can be used with maintenance (\-M) and remote +placement (\-R) flags. .TP -.B --help [topic] +.B \-\-help [topic] provides help on the selected topic, where topics (keywords) include: list, (com)mands, short(cuts), (mod)ifiers, (env)ironment, markup, syntax, headers, headings, endnotes, tables, example, customise, skin, (dir)ectories, path, @@ -305,102 +305,102 @@ headings, endnotes, tables, example, customise, skin, (dir)ectories, path, features, license .TP -.B --html [filename/wildcard] +.B \-\-html [filename/wildcard] produces html output, segmented text with table of contents (toc.html and -index.html) and the document in a single file (scroll.html). Alias -h +index.html) and the document in a single file (scroll.html). Alias \-h .TP -.B -h [filename/wildcard] -see --html +.B \-h [filename/wildcard] +see \-\-html .TP -.B -I [filename/wildcard] -see --texinfo +.B \-I [filename/wildcard] +see \-\-texinfo .TP -.B -i [filename/wildcard] -see --manpage +.B \-i [filename/wildcard] +see \-\-manpage .TP -.B --keep-processing-files [filename/wildcard/url] -see --maintenance +.B \-\-keep\-processing\-files [filename/wildcard/url] +see \-\-maintenance .TP -.B -L +.B \-L prints license information. .TP -.B --machine [filename/wildcard/url] -see --dal (document abstraction level/layer) +.B \-\-machine [filename/wildcard/url] +see \-\-dal (document abstraction level/layer) .TP -.B --maintenance [filename/wildcard/url] +.B \-\-maintenance [filename/wildcard/url] maintenance mode, interim processing files are preserved and their locations -indicated. (also see -V). Aliases -M and --keep-processing-files +indicated. (also see \-V). Aliases \-M and \-\-keep\-processing\-files .TP -.B --manpage [filename/wildcard] -produces man page of file, not suitable for all outputs. Alias -i +.B \-\-manpage [filename/wildcard] +produces man page of file, not suitable for all outputs. Alias \-i .TP -.B -M [filename/wildcard/url] -see --maintenance +.B \-M [filename/wildcard/url] +see \-\-maintenance .TP -.B -m [filename/wildcard/url] -see --dal (document abstraction level/layer) +.B \-m [filename/wildcard/url] +see \-\-dal (document abstraction level/layer) .TP -.B --no-ocn -[with \ --html \ --pdf \ or \ --epub] switches off object citation numbering. +.B \-\-no\-ocn +[with \ \-\-html \ \-\-pdf \ or \ \-\-epub] switches off object citation numbering. Produce output without identifying numbers in margins of html or LaTeX/pdf output. .TP -.B -N [filename/wildcard/url] +.B \-N [filename/wildcard/url] document digest or document content certificate ( DCC ) as md5 digest tree of the document: the digest for the document, and digests for each object contained within the document (together with information on software versions -that produced it) (digest.txt). -NV for verbose digest output to screen. +that produced it) (digest.txt). \-NV for verbose digest output to screen. .TP -.B -n [filename/wildcard/url] +.B \-n [filename/wildcard/url] skip the creation of intermediate processing files (document abstraction) if -they already exist, this skips the equivalent of -m which is otherwise assumed +they already exist, this skips the equivalent of \-m which is otherwise assumed by most processing flags. .TP -.B --odf [filename/wildcard/url] -see --odt +.B \-\-odf [filename/wildcard/url] +see \-\-odt .TP -.B --odt [filename/wildcard/url] +.B \-\-odt [filename/wildcard/url] output basic document in opendocument file format (opendocument.odt). Alias --o +\-o .TP -.B -o [filename/wildcard/url] -see --odt +.B \-o [filename/wildcard/url] +see \-\-odt .TP -.B --pdf [filename/wildcard] +.B \-\-pdf [filename/wildcard] produces LaTeX pdf (portrait.pdf & landscape.pdf). Default paper size is set in config file, or document header, or provided with additional command line -parameter, e.g. --papersize-a4 preset sizes include: 'A4', U.S. 'letter' and -'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Alias -p +parameter, e.g. \-\-papersize\-a4 preset sizes include: 'A4', U.S. 'letter' and +'legal' and book sizes 'A5' and 'B5' (system defaults to A4). Alias \-p .TP -.B --pg [instruction] [filename] -database postgresql ( --pgsql may be used instead) possible instructions, -include: --createdb; --create; --dropall; --import [filename]; --update -[filename]; --remove [filename]; see database section below. Alias -D +.B \-\-pg [instruction] [filename] +database postgresql ( \-\-pgsql may be used instead) possible instructions, +include: \-\-createdb; \-\-create; \-\-dropall; \-\-import [filename]; \-\-update +[filename]; \-\-remove [filename]; see database section below. Alias \-D .TP -.B --po [language_directory/filename \ language_directory] -see --po4a +.B \-\-po [language_directory/filename \ language_directory] +see \-\-po4a .TP -.B --po4a [language_directory/filename \ language_directory] +.B \-\-po4a [language_directory/filename \ language_directory] produces \.pot and po files for the file in the languages specified by the language directory. .B SiSU @@ -409,75 +409,75 @@ es/. The sisu config file must set the output directory structure to multilingual. v3, experimental .TP -.B -P [language_directory/filename \ language_directory] -see --po4a +.B \-P [language_directory/filename \ language_directory] +see \-\-po4a .TP -.B -p [filename/wildcard] -see --pdf +.B \-p [filename/wildcard] +see \-\-pdf .TP -.B --quiet [filename/wildcard] +.B \-\-quiet [filename/wildcard] quiet less output to screen. .TP -.B -q [filename/wildcard] -see --quiet +.B \-q [filename/wildcard] +see \-\-quiet .TP -.B --rsync [filename/wildcard] +.B \-\-rsync [filename/wildcard] copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync -different if -R is used with other flags from if used alone. Alone the rsync ---delete parameter is sent, useful for cleaning the remote directory (when -R -is used together with other flags, it is not). Also see --scp. Alias -R +different if \-R is used with other flags from if used alone. Alone the rsync +\-\-delete parameter is sent, useful for cleaning the remote directory (when \-R +is used together with other flags, it is not). Also see \-\-scp. Alias \-R .TP -.B -R [filename/wildcard] -see --rsync +.B \-R [filename/wildcard] +see \-\-rsync .TP -.B -r [filename/wildcard] -see --scp +.B \-r [filename/wildcard] +see \-\-scp .TP -.B --sample-search-form [--webserv=webrick] +.B \-\-sample\-search\-form [\-\-webserv=webrick] generate examples of (naive) cgi search form for sqlite and pgsql depends on your already having used sisu to populate an sqlite and/or pgsql database, (the sqlite version scans the output directories for existing sisu_sqlite databases, so it is first necessary to create them, before generating the search form) see --d -D and the database section below. If the optional parameter ---webserv=webrick is passed, the cgi examples created will be set up to use the +\-d \-D and the database section below. If the optional parameter +\-\-webserv=webrick is passed, the cgi examples created will be set up to use the default port set for use by the webrick server, (otherwise the port is left blank and the system setting used, usually 80). The samples are dumped in the present work directory which must be writable, (with screen instructions given -that they be copied to the cgi-bin directory). -Fv (in addition to the above) -provides some information on setting up hyperestraier for sisu. Alias -F +that they be copied to the cgi\-bin directory). \-Fv (in addition to the above) +provides some information on setting up hyperestraier for sisu. Alias \-F .TP -.B --scp [filename/wildcard] +.B \-\-scp [filename/wildcard] copies sisu output files to remote host using scp. This requires that sisurc.yml has been provided with information on hostname and username, and -that you have your "keys" and ssh agent in place. Also see --rsync. Alias -r +that you have your "keys" and ssh agent in place. Also see \-\-rsync. Alias \-r .TP -.B --sqlite --[instruction] [filename] -database type default set to sqlite, (for which --sqlite may be used instead) -or to specify another database --db-[pgsql, \ sqlite] (however see -D) possible -instructions include: --createdb; --create; --dropall; --import [filename]; ---update [filename]; --remove [filename]; see database section below. Alias -d +.B \-\-sqlite \-\-[instruction] [filename] +database type default set to sqlite, (for which \-\-sqlite may be used instead) +or to specify another database \-\-db\-[pgsql, \ sqlite] (however see \-D) possible +instructions include: \-\-createdb; \-\-create; \-\-dropall; \-\-import [filename]; +\-\-update [filename]; \-\-remove [filename]; see database section below. Alias \-d .TP -.B --sisupod +.B \-\-sisupod produces a sisupod a zipped sisu directory of markup files including sisu markup source files and the directories local configuration file, images and skins. Note: this only includes the configuration files or skins contained in - \./_sisu not those in ~/.sisu -S [filename/wildcard] option. Note: (this option -is tested only with zsh). Alias -S + \./_sisu not those in ~/.sisu \-S [filename/wildcard] option. Note: (this option +is tested only with zsh). Alias \-S .TP -.B --sisupod [filename/wildcard] +.B \-\-sisupod [filename/wildcard] produces a zipped file of the prepared document specified along with associated images, by default named sisupod.zip they may alternatively be named with the filename extension \.ssp This provides a quick way of gathering the @@ -489,289 +489,289 @@ images and skin. commands can be run directly against a sisupod contained in a local directory, or provided as a url on a remote site. As there is a security issue with skins provided by other users, they are not applied unless the flag ---trust or --trusted is added to the command instruction, it is recommended +\-\-trust or \-\-trusted is added to the command instruction, it is recommended that file that are not your own are treated as untrusted. The directory structure of the unzipped file is understood by sisu, and sisu commands can be run within it. Note: if you wish to send multiple files, it quickly becomes more space efficient to zip the sisu markup directory, rather than the -individual files for sending). See the -S option without [filename/wildcard]. -Alias -S +individual files for sending). See the \-S option without [filename/wildcard]. +Alias \-S .TP -.B --source [filename/wildcard] -copies sisu markup file to output directory. Alias -s +.B \-\-source [filename/wildcard] +copies sisu markup file to output directory. Alias \-s .TP -.B -S -see --sisupod +.B \-S +see \-\-sisupod .TP -.B -S [filename/wildcard] -see --sisupod +.B \-S [filename/wildcard] +see \-\-sisupod .TP -.B -s [filename/wildcard] -see --source +.B \-s [filename/wildcard] +see \-\-source .TP -.B --texinfo [filename/wildcard] -produces texinfo and info file, (view with pinfo). Alias -I +.B \-\-texinfo [filename/wildcard] +produces texinfo and info file, (view with pinfo). Alias \-I .TP -.B --txt [filename/wildcard] +.B \-\-txt [filename/wildcard] produces plaintext with Unix linefeeds and without markup, (object numbers -are omitted), has footnotes at end of each paragraph that contains them [ \ -A -\ for \ equivalent \ dos \ (linefeed) \ output \ file] [see \ -e \ for \ -endnotes]. (Options include: --endnotes for endnotes --footnotes for footnotes -at the end of each paragraph --unix for unix linefeed (default) --msdos for -msdos linefeed). Alias -t +are omitted), has footnotes at end of each paragraph that contains them [ \ \-A +\ for \ equivalent \ dos \ (linefeed) \ output \ file] [see \ \-e \ for \ +endnotes]. (Options include: \-\-endnotes for endnotes \-\-footnotes for footnotes +at the end of each paragraph \-\-unix for unix linefeed (default) \-\-msdos for +msdos linefeed). Alias \-t .TP -.B -T [filename/wildcard \ (*.termsheet.rb)] +.B \-T [filename/wildcard \ (*.termsheet.rb)] standard form document builder, preprocessing feature .TP -.B -t [filename/wildcard] -see --txt +.B \-t [filename/wildcard] +see \-\-txt .TP -.B --urls [filename/wildcard] +.B \-\-urls [filename/wildcard] prints url output list/map for the available processing flags options and resulting files that could be requested, (can be used to get a list of processing options in relation to a file, together with information on the -output that would be produced), -u provides url output mapping for those flags +output that would be produced), \-u provides url output mapping for those flags requested for processing. The default assumes sisu_webrick is running and provides webrick url mappings where appropriate, but these can be switched to -file system paths in sisurc.yml. Alias -U +file system paths in sisurc.yml. Alias \-U .TP -.B -U [filename/wildcard] -see --urls +.B \-U [filename/wildcard] +see \-\-urls .TP -.B -u [filename/wildcard] +.B \-u [filename/wildcard] provides url mapping of output files for the flags requested for processing, -also see -U +also see \-U .TP -.B --v2 [filename/wildcard] +.B \-\-v2 [filename/wildcard] invokes the sisu v2 document parser/generator. This is the default and is normally omitted. .TP -.B --v3 [filename/wildcard] +.B \-\-v3 [filename/wildcard] invokes the sisu v3 document parser/generator. Currently under development and incomplete, v3 requires >= ruby1.9.2p180. You may run sisu3 instead. .TP -.B --verbose [filename/wildcard] +.B \-\-verbose [filename/wildcard] provides verbose output of what is being generated, where output is placed -(and error messages if any), as with -u flag provides a url mapping of files -created for each of the processing flag requests. Alias -v +(and error messages if any), as with \-u flag provides a url mapping of files +created for each of the processing flag requests. Alias \-v .TP -.B -V +.B \-V on its own, provides .B SiSU -version and environment information (sisu --help env) +version and environment information (sisu \-\-help env) .TP -.B -V [filename/wildcard] -even more verbose than the -v flag. +.B \-V [filename/wildcard] +even more verbose than the \-v flag. .TP -.B -v +.B \-v on its own, provides .B SiSU version information .TP -.B -v [filename/wildcard] -see --verbose +.B \-v [filename/wildcard] +see \-\-verbose .TP -.B --webrick +.B \-\-webrick starts ruby's webrick webserver points at sisu output directories, the default port is set to 8081 and can be changed in the resource configuration files. [tip: \ the \ webrick \ server \ requires \ link \ suffixes, \ so \ html -\ output \ should \ be \ created \ using \ the \ -h \ option \ rather \ than \ --H \ ; \ also, \ note \ -F \ webrick \ ]. Alias -W +\ output \ should \ be \ created \ using \ the \ \-h \ option \ rather \ than \ +\-H \ ; \ also, \ note \ \-F \ webrick \ ]. Alias \-W .TP -.B -W -see --webrick +.B \-W +see \-\-webrick .TP -.B --wordmap [filename/wildcard] -see --concordance +.B \-\-wordmap [filename/wildcard] +see \-\-concordance .TP -.B -w [filename/wildcard] -see --concordance +.B \-w [filename/wildcard] +see \-\-concordance .TP -.B --xhtml [filename/wildcard] -produces xhtml/XML output for browser viewing (sax parsing). Alias -b +.B \-\-xhtml [filename/wildcard] +produces xhtml/XML output for browser viewing (sax parsing). Alias \-b .TP -.B --xml-dom [filename/wildcard] +.B \-\-xml\-dom [filename/wildcard] produces XML output with deep document structure, in the nature of dom. Alias --X +\-X .TP -.B --xml-sax [filename/wildcard] -produces XML output shallow structure (sax parsing). Alias -x +.B \-\-xml\-sax [filename/wildcard] +produces XML output shallow structure (sax parsing). Alias \-x .TP -.B -X [filename/wildcard] -see --xml-dom +.B \-X [filename/wildcard] +see \-\-xml\-dom .TP -.B -x [filename/wildcard] -see --xml-sax +.B \-x [filename/wildcard] +see \-\-xml\-sax .TP -.B -Y [filename/wildcard] +.B \-Y [filename/wildcard] produces a short sitemap entry for the document, based on html output and the -sisu_manifest. --sitemaps generates/updates the sitemap index of existing +sisu_manifest. \-\-sitemaps generates/updates the sitemap index of existing sitemaps. (Experimental, [g,y,m \ announcement \ this \ week]) .TP -.B -y [filename/wildcard] +.B \-y [filename/wildcard] produces an html summary of output generated (hyperlinked to content) and document specific metadata (sisu_manifest.html). This step is assumed for most processing flags. .TP -.B --zap [filename/wildcard] +.B \-\-zap [filename/wildcard] Zap, if used with other processing flags deletes output files of the type -about to be processed, prior to processing. If -Z is used as the lone -processing related flag (or in conjunction with a combination of -[mMvVq]), -will remove the related document output directory. Alias -Z +about to be processed, prior to processing. If \-Z is used as the lone +processing related flag (or in conjunction with a combination of \-[mMvVq]), +will remove the related document output directory. Alias \-Z .TP -.B -Z [filename/wildcard] -see --zap +.B \-Z [filename/wildcard] +see \-\-zap .SH 3. COMMAND LINE MODIFIERS .br .TP -.B --no-ocn -[with \ --html \ --pdf \ or \ --epub] switches off object citation numbering. +.B \-\-no\-ocn +[with \ \-\-html \ \-\-pdf \ or \ \-\-epub] switches off object citation numbering. Produce output without identifying numbers in margins of html or LaTeX/pdf output. .TP -.B --no-annotate +.B \-\-no\-annotate strips output text of editor endnotes[^*1] denoted by asterisk or dagger/plus sign .TP -.B --no-asterisk +.B \-\-no\-asterisk strips output text of editor endnotes[^*2] denoted by asterisk sign .TP -.B --no-dagger +.B \-\-no\-dagger strips output text of editor endnotes[^+1] denoted by dagger/plus sign .SH 4. DATABASE COMMANDS .br .br -dbi - database interface +dbi \- database interface .br --D or --pgsql set for postgresql -d or --sqlite default set for sqlite -d is -modifiable with --db=[database \ type \ (pgsql \ or \ sqlite)] +\-D or \-\-pgsql set for postgresql \-d or \-\-sqlite default set for sqlite \-d is +modifiable with \-\-db=[database \ type \ (pgsql \ or \ sqlite)] .TP -.B --pg -v --createall +.B \-\-pg \-v \-\-createall initial step, creates required relations (tables, indexes) in existing postgresql database (a database should be created manually and given the same -name as working directory, as requested) (rb.dbi) [ \ -dv \ --createall \ -sqlite \ equivalent] it may be necessary to run sisu -Dv --createdb initially +name as working directory, as requested) (rb.dbi) [ \ \-dv \ \-\-createall \ +sqlite \ equivalent] it may be necessary to run sisu \-Dv \-\-createdb initially NOTE: at the present time for postgresql it may be necessary to manually create the database. The command would be 'createdb [database \ name]' where database name would be SiSU_[present \ working \ directory \ name \ (without \ path)]. Please use only alphanumerics and underscores. .TP -.B --pg -v --import -[filename/wildcard] imports data specified to postgresql db (rb.dbi) [ \ -dv -\ --import \ sqlite \ equivalent] +.B \-\-pg \-v \-\-import +[filename/wildcard] imports data specified to postgresql db (rb.dbi) [ \ \-dv +\ \-\-import \ sqlite \ equivalent] .TP -.B --pg -v --update +.B \-\-pg \-v \-\-update [filename/wildcard] updates/imports specified data to postgresql db (rb.dbi) -[ \ -dv \ --update \ sqlite \ equivalent] +[ \ \-dv \ \-\-update \ sqlite \ equivalent] .TP -.B --pg --remove -[filename/wildcard] removes specified data to postgresql db (rb.dbi) [ \ -d \ ---remove \ sqlite \ equivalent] +.B \-\-pg \-\-remove +[filename/wildcard] removes specified data to postgresql db (rb.dbi) [ \ \-d \ +\-\-remove \ sqlite \ equivalent] .TP -.B --pg --dropall -kills data" and drops (postgresql or sqlite) db, tables & indexes [ \ -d \ ---dropall \ sqlite \ equivalent] +.B \-\-pg \-\-dropall +kills data" and drops (postgresql or sqlite) db, tables & indexes [ \ \-d \ +\-\-dropall \ sqlite \ equivalent] .br -The -v is for verbose output. +The \-v is for verbose output. .SH 5. SHORTCUTS, SHORTHAND FOR MULTIPLE FLAGS .br .TP -.B --update [filename/wildcard] +.B \-\-update [filename/wildcard] Checks existing file output and runs the flags required to update this output. This means that if only html and pdf output was requested on previous -runs, only the -hp files will be applied, and only these will be generated this +runs, only the \-hp files will be applied, and only these will be generated this time, together with the summary. This can be very convenient, if you offer different outputs of different files, and just want to do the same again. .TP -.B -0 to -5 [filename \ or \ wildcard] +.B \-0 to \-5 [filename \ or \ wildcard] Default shorthand mappings (note that the defaults can be changed/configured in the sisurc.yml file): .TP -.B -0 --mNhwpAobxXyYv [this \ is \ the \ default \ action \ run \ when \ no \ +.B \-0 +\-mNhwpAobxXyYv [this \ is \ the \ default \ action \ run \ when \ no \ options \ are \ give, \ i.e. \ on \ 'sisu \ [filename]'] .TP -.B -1 --mhewpy +.B \-1 +\-mhewpy .TP -.B -2 --mhewpaoy +.B \-2 +\-mhewpaoy .TP -.B -3 --mhewpAobxXyY +.B \-3 +\-mhewpAobxXyY .TP -.B -4 --mhewpAobxXDyY --import +.B \-4 +\-mhewpAobxXDyY \-\-import .TP -.B -5 --mhewpAobxXDyY --update +.B \-5 +\-mhewpAobxXDyY \-\-update .br -add -v for verbose mode and -c for color, e.g. sisu -2vc [filename \ or \ +add \-v for verbose mode and \-c for color, e.g. sisu \-2vc [filename \ or \ wildcard] .br -consider -u for appended url info or -v for verbose output +consider \-u for appended url info or \-v for verbose output -.SH 5.1 COMMAND LINE WITH FLAGS - BATCH PROCESSING +.SH 5.1 COMMAND LINE WITH FLAGS \- BATCH PROCESSING .br -In the data directory run sisu -mh filename or wildcard eg. "sisu -h cisg.sst" -or "sisu -h *.{sst,ssm}" to produce html version of all documents. +In the data directory run sisu \-mh filename or wildcard eg. "sisu \-h cisg.sst" +or "sisu \-h *.{sst,ssm}" to produce html version of all documents. .br Running sisu (alone without any flags, filenames or wildcards) brings up the @@ -796,10 +796,10 @@ The manual can be generated from source, found respectively, either within the tarball or installed locally at: .br - ./data/doc/sisu/markup-samples/sisu_manual + ./data/doc/sisu/markup\-samples/sisu_manual .br - /usr/share/doc/sisu/markup-samples/sisu_manual + /usr/share/doc/sisu/markup\-samples/sisu_manual .br move to the respective directory and type e.g.: @@ -826,13 +826,13 @@ the sisu manual, the sources files for which are located within the tarball at: .br - ./data/doc/sisu/markup-samples/sisu_manual + ./data/doc/sisu/markup\-samples/sisu_manual .br Once installed, directory equivalent to: .br - /usr/share/doc/sisu/markup-samples/sisu_manual + /usr/share/doc/sisu/markup\-samples/sisu_manual .br Available man pages are converted back to html using man2html: @@ -852,38 +852,38 @@ An online version of the sisu man page is available here: .br * sisu.1 <http://www.jus.uio.no/sisu/man/sisu.1.html> [^9] -.SH 6.3 SISU BUILT-IN INTERACTIVE HELP +.SH 6.3 SISU BUILT\-IN INTERACTIVE HELP .br This is particularly useful for getting the current sisu setup/environment information: .br - sisu --help + sisu \-\-help .br - sisu --help [subject] + sisu \-\-help [subject] .br - sisu --help commands + sisu \-\-help commands .br - sisu --help markup + sisu \-\-help markup .br - sisu --help env [for \ feedback \ on \ the \ way \ your \ system \ is \ + sisu \-\-help env [for \ feedback \ on \ the \ way \ your \ system \ is \ setup \ with \ regard \ to \ sisu] .br - sisu -V [environment \ information, \ same \ as \ above \ command] + sisu \-V [environment \ information, \ same \ as \ above \ command] .br sisu (on its own provides version and some help information) .br -Apart from real-time information on your current configuration the +Apart from real\-time information on your current configuration the .B SiSU -manual and man pages are likely to contain more up-to-date information than +manual and man pages are likely to contain more up\-to\-date information than the sisu interactive help (for example on commands and markup). .br @@ -898,7 +898,7 @@ recognised. Enter to escape. .br .B SiSU -source documents are plaintext (UTF-8)[^11] files +source documents are plaintext (UTF\-8)[^11] files .br All paragraphs are separated by an empty line. @@ -907,7 +907,7 @@ All paragraphs are separated by an empty line. Markup is comprised of: .br -* at the top of a document, the document header made up of semantic meta-data +* at the top of a document, the document header made up of semantic meta\-data about the document and if desired additional processing instructions (such an instruction to automatically number headings from a particular level down) @@ -933,29 +933,29 @@ primary outline of the document structure. Markup of substantive text includes: * linked text and images .br - * paragraph actions, such as indent, bulleted, numbered-lists, etc. + * paragraph actions, such as indent, bulleted, numbered\-lists, etc. .br Some interactive help on markup is available, by typing sisu and selecting -markup or sisu --help markup +markup or sisu \-\-help markup .br To check the markup in a file: .br - sisu --identify [filename].sst + sisu \-\-identify [filename].sst .br For brief descriptive summary of markup history .br - sisu --query-history + sisu \-\-query\-history .br or if for a particular version: .br - sisu --query-0.38 + sisu \-\-query\-0.38 .SH 7.2 MARKUP EXAMPLES @@ -980,15 +980,15 @@ an alternative presentation of markup syntax: .br With .B SiSU -installed sample skins may be found in: /usr/share/doc/sisu/markup-samples -(or equivalent directory) and if sisu-markup-samples is installed also under: -/usr/share/doc/sisu/markup-samples-non-free +installed sample skins may be found in: /usr/share/doc/sisu/markup\-samples +(or equivalent directory) and if sisu\-markup\-samples is installed also under: +/usr/share/doc/sisu/markup\-samples\-non\-free .SH 8. MARKUP OF HEADERS .br .br -Headers contain either: semantic meta-data about a document, which can be used +Headers contain either: semantic meta\-data about a document, which can be used by any output module of the program, or; processing instructions. .br @@ -1021,23 +1021,23 @@ to this one: citation systems, search % used_by: manual @date: - :published: 2008-05-22 - :created: 2002-08-28 - :issued: 2002-08-28 - :available: 2002-08-28 - :modified: 2010-03-03 + :published: 2008\-05\-22 + :created: 2002\-08\-28 + :issued: 2002\-08\-28 + :available: 2002\-08\-28 + :modified: 2010\-03\-03 @make: :num_top: 1 :breaks: new=C; break=1 :skin: skin_sisu_manual :bold: /Gnu|Debian|Ruby|SiSU/ - :manpage: name=sisu - documents: markup, structuring, publishing + :manpage: name=sisu \- documents: markup, structuring, publishing in multiple standard formats, and search; - synopsis=sisu \ [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] \ [filename/wildcard \ ] - . sisu \ [-Ddcv] \ [instruction] - . sisu \ [-CcFLSVvW] - . sisu --v2 \ [operations] - . sisu --v3 \ [operations] + synopsis=sisu \ [\-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0\-9] \ [filename/wildcard \ ] + . sisu \ [\-Ddcv] \ [instruction] + . sisu \ [\-CcFLSVvW] + . sisu \-\-v2 \ [operations] + . sisu \-\-v3 \ [operations] @links: { SiSU Homepage }http://www.sisudoc.org/ { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/ @@ -1077,7 +1077,7 @@ structure, and can be useful to know. This is a sample header .nf - % SiSU 2.0 \ [declared \ file-type \ identifier \ with \ markup \ version] + % SiSU 2.0 \ [declared \ file\-type \ identifier \ with \ markup \ version] .fi .nf @@ -1096,14 +1096,14 @@ This is a sample header .nf @date: - :published: \ [year \ or \ yyyy-mm-dd] - :created: \ [year \ or \ yyyy-mm-dd] - :issued: \ [year \ or \ yyyy-mm-dd] - :available: \ [year \ or \ yyyy-mm-dd] - :modified: \ [year \ or \ yyyy-mm-dd] - :valid: \ [year \ or \ yyyy-mm-dd] - :added_to_site: \ [year \ or \ yyyy-mm-dd] - :translated: \ [year \ or \ yyyy-mm-dd] + :published: \ [year \ or \ yyyy\-mm\-dd] + :created: \ [year \ or \ yyyy\-mm\-dd] + :issued: \ [year \ or \ yyyy\-mm\-dd] + :available: \ [year \ or \ yyyy\-mm\-dd] + :modified: \ [year \ or \ yyyy\-mm\-dd] + :valid: \ [year \ or \ yyyy\-mm\-dd] + :added_to_site: \ [year \ or \ yyyy\-mm\-dd] + :translated: \ [year \ or \ yyyy\-mm\-dd] .fi .nf @@ -1165,10 +1165,10 @@ This is a sample header .SH 9.1 HEADING LEVELS .br -Heading levels are :A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ \... :A - :C being part / section -headings, followed by other heading levels, and 1 -6 being headings followed by -substantive text or sub-headings. :A~ usually the title :A~? conditional level -1 heading (used where a stand-alone document may be imported into another) +Heading levels are :A~ ,:B~ ,:C~ ,1~ ,2~ ,3~ \... :A \- :C being part / section +headings, followed by other heading levels, and 1 \-6 being headings followed by +substantive text or sub\-headings. :A~ usually the title :A~? conditional level +1 heading (used where a stand\-alone document may be imported into another) .br .B :A~ [heading \ text] @@ -1186,7 +1186,7 @@ Third level heading [this \ is \ a \ heading \ level \ divider] .br .B 1~ [heading \ text] -Top level heading preceding substantive text of document or sub-heading 2, +Top level heading preceding substantive text of document or sub\-heading 2, the heading level that would normally be marked 1. or 2. or 3. etc. in a document, and the level on which sisu by default would break html output into named segments, names are provided automatically if none are given (a number), @@ -1194,7 +1194,7 @@ otherwise takes the form 1~my_filename_for_this_segment .br .B 2~ [heading \ text] -Second level heading preceding substantive text of document or sub-heading 3 +Second level heading preceding substantive text of document or sub\-heading 3 , the heading level that would normally be marked 1.1 or 1.2 or 1.3 or 2.1 etc. in a document. @@ -1217,7 +1217,7 @@ normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document .nf normal text, *{emphasis}*, !{bold text}!, /{italics}/, _{underscore}_, "{citation}", - ^{superscript}^, ,{subscript},, +{inserted text}+, -{strikethrough}-, #{monospace}# + ^{superscript}^, ,{subscript},, +{inserted text}+, \-{strikethrough}\-, #{monospace}# normal text .br *{emphasis}* \ [note: \ can \ be \ configured \ to \ be \ represented \ by \ bold, \ italics \ or \ underscore] @@ -1236,7 +1236,7 @@ normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document .br +{inserted text}+ .br - \-{strikethrough}\- + \\-{strikethrough}\\- .br #{monospace}# .fi @@ -1254,7 +1254,7 @@ normal text, , .I underscore , "citation", ^superscript^, [subscript], ++inserted text++, ---strikethrough--, monospace +\-\-strikethrough\-\-, monospace .br normal text @@ -1286,7 +1286,7 @@ normal text ++inserted text++ .br ---strikethrough-- +\-\-strikethrough\-\- .br monospace @@ -1470,7 +1470,7 @@ An escaped url without decoration .nf normal text _http://www.sisudoc.org/ continues - deb http://www.jus.uio.no/sisu/archive unstable main non-free + deb http://www.jus.uio.no/sisu/archive unstable main non\-free .fi .br @@ -1480,7 +1480,7 @@ An escaped url without decoration normal text <_http://www.sisudoc.org/> continues .br -deb <_http://www.jus.uio.no/sisu/archive> unstable main non-free +deb <_http://www.jus.uio.no/sisu/archive> unstable main non\-free .br where a code block is used there is neither decoration nor hyperlinking, code @@ -1490,9 +1490,9 @@ blocks are discussed later in this document .B resulting output: .nf - deb http://www.jus.uio.no/sisu/archive unstable main non-free + deb http://www.jus.uio.no/sisu/archive unstable main non\-free .br - deb-src http://www.jus.uio.no/sisu/archive unstable main non-free + deb\-src http://www.jus.uio.no/sisu/archive unstable main non\-free .fi .SH 9.5.2 LINKING TEXT @@ -1543,10 +1543,10 @@ about SiSU <http://www.sisudoc.org/> [^14] markup {tux.png 64x80 "a better way" }http://www.sisudoc.org/ .br .br - {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/ + {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better \- with Gnu/Linux, Debian and Ruby" }http://www.sisudoc.org/ .br .br - {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ + {~^ ruby_logo.png "Ruby" }http://www.ruby\-lang.org/en/ .br .br .fi @@ -1558,13 +1558,13 @@ about SiSU <http://www.sisudoc.org/> [^14] markup [ tux.png ] .br -tux.png 64x80 "Gnu/Linux - a better way" <http://www.sisudoc.org/> +tux.png 64x80 "Gnu/Linux \- a better way" <http://www.sisudoc.org/> .br [ \ ruby_logo \ (png \ missing) \ ] [^15] .br -GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian +GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better \- with Gnu/Linux, Debian and Ruby" <http://www.jus.uio.no/sisu/> .br @@ -1573,7 +1573,7 @@ and Ruby" <http://www.jus.uio.no/sisu/> .nf {~^ \ [text \ to \ link] }http://url.org % maps to: { \ [text \ to \ link] }http://url.org ~{ http://url.org }~ - % which produces hyper-linked text within a document/paragraph, + % which produces hyper\-linked text within a document/paragraph, % with an endnote providing the url for the text location used in the hyperlink .fi @@ -1584,7 +1584,7 @@ and Ruby" <http://www.jus.uio.no/sisu/> .br note at a heading level the same is automatically achieved by providing names to headings 1, 2 and 3 i.e. 2~[name] and 3~[name] or in the case of -auto-heading numbering, without further intervention. +auto\-heading numbering, without further intervention. .SH 9.6 GROUPED TEXT @@ -1621,7 +1621,7 @@ information in each column [^16] .nf - !_ Table 3.1: Contributors to Wikipedia, January 2001 - June 2005 + !_ Table 3.1: Contributors to Wikipedia, January 2001 \- June 2005 {table~h 24; 12; 12; 12; 12; 12; 12;} |Jan. 2001|Jan. 2002|Jan. 2003|Jan. 2004|July 2004|June 2006 Contributors* | 10| 472| 2,188| 9,653| 25,011| 48,721 @@ -1636,7 +1636,7 @@ information in each column .B resulting output: .br -.B Table 3.1: Contributors to Wikipedia, January 2001 - June 2005 +.B Table 3.1: Contributors to Wikipedia, January 2001 \- June 2005 [table omitted, see other document formats] @@ -1669,7 +1669,7 @@ than 100 times in last month. both go to law: I will prosecute - YOU. --Come, + YOU. \-\-Come, I'll take no denial; We must have a @@ -1727,7 +1727,7 @@ than 100 times in last month. .br prosecute .br - YOU. --Come, + YOU. \-\-Come, .br I'll take no .br @@ -1829,7 +1829,7 @@ than 100 times in last month. both go to law: I will prosecute - YOU. --Come, + YOU. \-\-Come, I'll take no denial; We must have a @@ -1887,7 +1887,7 @@ than 100 times in last month. .br prosecute .br - YOU. --Come, + YOU. \-\-Come, .br I'll take no .br @@ -1971,7 +1971,7 @@ markup. You cannot however use code tags to escape code tags. They are however used in the same way as group or poem tags. .br -A code-block is treated as an object and given a single object number. [an \ +A code\-block is treated as an object and given a single object number. [an \ option \ to \ number \ each \ line \ of \ code \ may \ be \ considered \ at \ some \ later \ time] @@ -1987,7 +1987,7 @@ some \ later \ time] both go to law: I will prosecute - YOU. --Come, + YOU. \-\-Come, I'll take no denial; We must have a @@ -2040,7 +2040,7 @@ tag code{# as demonstrated here: 6 | both go to 7 | law: I will 8 | prosecute -9 | YOU. --Come, +9 | YOU. \-\-Come, 10 | I'll take no 11 | denial; We 12 | must have a @@ -2085,12 +2085,12 @@ To make an index append to paragraph the book index term relates to it, using an equal sign and curly braces. .br -Currently two levels are provided, a main term and if needed a sub-term. -Sub-terms are separated from the main term by a colon. +Currently two levels are provided, a main term and if needed a sub\-term. +Sub\-terms are separated from the main term by a colon. .nf - Paragraph containing main term and sub-term. - ={Main term:sub-term} + Paragraph containing main term and sub\-term. + ={Main term:sub\-term} .fi .br @@ -2102,7 +2102,7 @@ The structure of the resulting index would be: .nf Main term, 1 - sub-term, 1 + sub\-term, 1 .fi .br @@ -2110,8 +2110,8 @@ Several terms may relate to a paragraph, they are separated by a semicolon. If the term refers to more than one paragraph, indicate the number of paragraphs. .nf - Paragraph containing main term, second term and sub-term. - ={first term; second term: sub-term} + Paragraph containing main term, second term and sub\-term. + ={first term; second term: sub\-term} .fi .br @@ -2120,27 +2120,27 @@ The structure of the resulting index would be: .nf First term, 1, Second term, 1, - sub-term, 1 + sub\-term, 1 .fi .br -If multiple sub-terms appear under one paragraph, they are separated under the +If multiple sub\-terms appear under one paragraph, they are separated under the main term heading from each other by a pipe symbol. .nf - Paragraph containing main term, second term and sub-term. - ={Main term:sub-term+1|second sub-term - A paragraph that continues discussion of the first sub-term + Paragraph containing main term, second term and sub\-term. + ={Main term:sub\-term+1|second sub\-term + A paragraph that continues discussion of the first sub\-term .fi .br -The plus one in the example provided indicates the first sub-term spans one +The plus one in the example provided indicates the first sub\-term spans one additional paragraph. The logical structure of the resulting index would be: .nf Main term, 1, - sub-term, 1-3, - second sub-term, 1, + sub\-term, 1\-3, + second sub\-term, 1, .fi .SH 10. COMPOSITE DOCUMENTS MARKUP @@ -2189,7 +2189,7 @@ documents under consideration, and occasionally supported have been. .SH MARKUP SYNTAX HISTORY .br -.SH 11. NOTES RELATED TO FILES-TYPES AND MARKUP SYNTAX +.SH 11. NOTES RELATED TO FILES\-TYPES AND MARKUP SYNTAX .br 2.0 introduced new headers and is therefore incompatible with 1.0 though @@ -2202,7 +2202,7 @@ otherwise the same with the addition of a couple of tags (i.e. a superset) depreciated 0.16 supported, though file names were changed at 0.37 .br -* sisu --query=[sisu \ version \ [0.38] or 'history] +* sisu \-\-query=[sisu \ version \ [0.38] or 'history] .br provides a short history of changes to @@ -2211,7 +2211,7 @@ markup .br .B SiSU 2.0 -(2010-03-06:09/6) same as 1.0, apart from the changing of headers and the +(2010\-03\-06:09/6) same as 1.0, apart from the changing of headers and the addition of a monospace tag related headers now grouped, e.g. .nf @@ -2229,7 +2229,7 @@ addition of a monospace tag related headers now grouped, e.g. .fi .br -see document markup samples, and sisu --help headers +see document markup samples, and sisu \-\-help headers .br the monospace tag takes the form of a hash '#' @@ -2240,11 +2240,11 @@ the monospace tag takes the form of a hash '#' .br .B 1.0 -(2009-12-19:50/6) same as 0.69 +(2009\-12\-19:50/6) same as 0.69 .br .B 0.69 -(2008-09-16:37/2) (same as 1.0) and as previous (0.57) with the addition of +(2008\-09\-16:37/2) (same as 1.0) and as previous (0.57) with the addition of book index tags .nf @@ -2252,7 +2252,7 @@ book index tags .fi .br -e.g. appended to a paragraph, on a new-line (without a blank line in between) +e.g. appended to a paragraph, on a new\-line (without a blank line in between) logical structure produced assuming this is the first text "object" .nf @@ -2260,20 +2260,20 @@ logical structure produced assuming this is the first text "object" .fi .nf - Free Software Foundation, 1-6 + Free Software Foundation, 1\-6 GNU/Linux community distribution, 1 - Debian, 1-3 + Debian, 1\-3 Fedora, 1 Gentoo, .fi .br .B 0.66 -(2008-02-24:07/7) same as previous, adds semantic tags, [experimental \ and \ -not-used] +(2008\-02\-24:07/7) same as previous, adds semantic tags, [experimental \ and \ +not\-used] .nf - /[:;]{.+?}[:;][a-z+]/ + /[:;]{.+?}[:;][a\-z+]/ .fi .br @@ -2307,7 +2307,7 @@ or, backward compatible using the comment marker: .br variations include ' .B SiSU -(text|master|insert) [version]' and 'sisu-[version]' +(text|master|insert) [version]' and 'sisu\-[version]' .br .B 0.51 @@ -2379,8 +2379,8 @@ The internal document markup of .br .B SiSU -has in effect two sets of levels to be considered, using 0.38 notation A-C -headings/levels, pre-ordinary paragraphs /pre-substantive text, and 1-3 +has in effect two sets of levels to be considered, using 0.38 notation A\-C +headings/levels, pre\-ordinary paragraphs /pre\-substantive text, and 1\-3 headings/levels, levels which are followed by ordinary text. This may be conceptualised as levels A,B,C, 1,2,3, and using such letter number notation, in effect: A must exist, optional B and C may follow in sequence (not strict) 1 @@ -2424,7 +2424,7 @@ The internal document markup remains unchanged, from .br .B 0.23 -(2005w36/2) utf-8 for markup file +(2005w36/2) utf\-8 for markup file .br .B 0.22 @@ -2438,7 +2438,7 @@ relied upon .br .B 0.16 (2005w25/2) substantial changes introduced to make markup cleaner, header -0~title type, and headings [1-6]~ introduced, also percentage sign (%) at start +0~title type, and headings [1\-6]~ introduced, also percentage sign (%) at start of a text line as comment marker .br @@ -2467,7 +2467,7 @@ has plaintext and binary filetypes, and can process either type of document. .br .B SiSU -documents are prepared as plain-text (utf-8) files with +documents are prepared as plain\-text (utf\-8) files with .B SiSU markup. They may make reference to and contain images (for example), which are stored in the directory beneath them _sisu/image. @@ -2488,9 +2488,9 @@ located locally or on a remote server for which a url is provided. source markup can be shared with the command: .br - sisu -s [filename] + sisu \-s [filename] -.SH 12.1.1 SISU TEXT - REGULAR FILES (.SST) +.SH 12.1.1 SISU TEXT \- REGULAR FILES (.SST) .br The most common form of document in @@ -2558,13 +2558,13 @@ A sisupod is a zipped text file or set of .B SiSU text files and any associated images that they contain (this will be extended -to include sound and multimedia-files) +to include sound and multimedia\-files) .br .B SiSU plaintext files rely on a recognised directory structure to find contents such as images associated with documents, but all images for example for all -documents contained in a directory are located in the sub-directory +documents contained in a directory are located in the sub\-directory _sisu/image. Without the ability to create a sisupod it can be inconvenient to manually identify all other files associated with a document. A sisupod automatically bundles all associated files with the document that is turned @@ -2582,13 +2582,13 @@ documents. The command to create a sisupod is: .br - sisu -S [filename] + sisu \-S [filename] .br Alternatively, make a pod of the contents of a whole directory: .br - sisu -S + sisu \-S .br .B SiSU @@ -2616,25 +2616,25 @@ incomplete and should be handled with care. .B convert from sst to simple xml representations (sax, dom and node): .br - sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard] + sisu \-\-to\-sax [filename/wildcard] or sisu \-\-to\-sxs [filename/wildcard] .br - sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard] + sisu \-\-to\-dom [filename/wildcard] or sisu \-\-to\-sxd [filename/wildcard] .br - sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard] + sisu \-\-to\-node [filename/wildcard] or sisu \-\-to\-sxn [filename/wildcard] .br .B convert to sst from any sisu xml representation (sax, dom and node): .br - sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .br or the same: .br - sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .SH 13.1.1 XML SAX REPRESENTATION @@ -2642,19 +2642,19 @@ or the same: To convert from sst to simple xml (sax) representation: .br - sisu --to-sax [filename/wildcard] or sisu --to-sxs [filename/wildcard] + sisu \-\-to\-sax [filename/wildcard] or sisu \-\-to\-sxs [filename/wildcard] .br To convert from any sisu xml representation back to sst .br - sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .br or the same: .br - sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .SH 13.1.2 XML DOM REPRESENTATION @@ -2662,19 +2662,19 @@ or the same: To convert from sst to simple xml (dom) representation: .br - sisu --to-dom [filename/wildcard] or sisu --to-sxd [filename/wildcard] + sisu \-\-to\-dom [filename/wildcard] or sisu \-\-to\-sxd [filename/wildcard] .br To convert from any sisu xml representation back to sst .br - sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .br or the same: .br - sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .SH 13.1.3 XML NODE REPRESENTATION @@ -2682,19 +2682,19 @@ or the same: To convert from sst to simple xml (node) representation: .br - sisu --to-node [filename/wildcard] or sisu --to-sxn [filename/wildcard] + sisu \-\-to\-node [filename/wildcard] or sisu \-\-to\-sxn [filename/wildcard] .br To convert from any sisu xml representation back to sst .br - sisu --from-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-xml2sst [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .br or the same: .br - sisu --from-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] + sisu \-\-from\-sxml [filename/wildcard \ [.sxs.xml,.sxd.xml,sxn.xml]] .SH 14. CONFIGURATION .br @@ -2707,13 +2707,13 @@ Information on the current configuration of should be available with the help command: .br - sisu -v + sisu \-v .br which is an alias for: .br - sisu --help env + sisu \-\-help env .br Either of these should be executed from within a directory that contains sisu @@ -2781,7 +2781,7 @@ directory, or site wide basis. Skins are looked for in the following locations: .br .B Within the skin directory -are the following the default sub-directories for document skins: +are the following the default sub\-directories for document skins: .br ./skin/doc @@ -2836,23 +2836,23 @@ installed sample skins may be found in: .br /etc/sisu/skin/doc and - /usr/share/doc/sisu/markup-samples/samples/_sisu/skin/doc + /usr/share/doc/sisu/markup\-samples/samples/_sisu/skin/doc .br -(or equivalent directory) and if sisu-markup-samples is installed also under: +(or equivalent directory) and if sisu\-markup\-samples is installed also under: .br - /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/doc + /usr/share/doc/sisu/markup\-samples\-non\-free/samples/_sisu/skin/doc .br Samples of list.yml and promo.yml (which are used to create the right column list) may be found in: .br - /usr/share/doc/sisu/markup-samples-non-free/samples/_sisu/skin/yml (or + /usr/share/doc/sisu/markup\-samples\-non\-free/samples/_sisu/skin/yml (or equivalent directory) -.SH 16. CSS - CASCADING STYLE SHEETS (FOR HTML, XHTML AND XML) +.SH 16. CSS \- CASCADING STYLE SHEETS (FOR HTML, XHTML AND XML) .br .br @@ -2860,7 +2860,7 @@ CSS files to modify the appearance of .B SiSU html, XHTML or XML may be placed in the configuration directory: \./_sisu/css ; ~/.sisu/css or; /etc/sisu/css and these will be copied to the output -directories with the command sisu -CC. +directories with the command sisu \-CC. .br The basic CSS file for html output is html.css, placing a file of that name in @@ -2903,7 +2903,7 @@ subdirectory of the same name as the document with the filetype identifier stripped (.sst \.ssm) .br -The last part of a directory path, representing the sub-directory in which a +The last part of a directory path, representing the sub\-directory in which a document set resides, is the directory name that will be used for the output directory. This has implications for the organisation of document collections as it could make sense to place documents of a particular subject, or type @@ -2923,7 +2923,7 @@ appearance. .br .B SiSU -is about the ability to auto-generate documents. Home pages are regarded as +is about the ability to auto\-generate documents. Home pages are regarded as custom built items, and are not created by .B SiSU . More accurately, @@ -2945,7 +2945,7 @@ Document sets are contained in directories, usually organised by site or subject. Each directory can/should have its own homepage. See the section on directory structure and organisation of content. -.SH 18.1 HOME PAGE AND OTHER CUSTOM BUILT PAGES IN A SUB-DIRECTORY +.SH 18.1 HOME PAGE AND OTHER CUSTOM BUILT PAGES IN A SUB\-DIRECTORY .br Custom built pages, including the home page index.html may be placed within the @@ -2954,7 +2954,7 @@ for the configuration directory, namely \./_sisu ; ~/_sisu ; /etc/sisu From there they are copied to the root of the output directory with the command: .br - sisu -CC + sisu \-CC .SH 18.2 HOME PAGE WITHIN A SKIN @@ -3001,7 +3001,7 @@ For some documents hardly any markup at all is required at all, other than a header, and an indication that the levels to be taken into account by the program in generating its output are. -.SH 20. SISU SEARCH - INTRODUCTION +.SH 20. SISU SEARCH \- INTRODUCTION .br .br @@ -3047,14 +3047,14 @@ four tables: subject, (the Dublin Core...); .br - * another the substantive texts by individual "paragraph" (or object) - along + * another the substantive texts by individual "paragraph" (or object) \- along with structural information, each paragraph being identifiable by its paragraph number (if it has one which almost all of them do), and the substantive text of each paragraph quite naturally being searchable (both in formatted and clean text versions for searching); and .br - * a third containing endnotes cross-referenced back to the paragraph from + * a third containing endnotes cross\-referenced back to the paragraph from which they are referenced (both in formatted and clean text versions for searching). @@ -3097,7 +3097,7 @@ that as well). .br .B SiSU -- Structured information, Serialized Units - a document publishing system, +\- Structured information, Serialized Units \- a document publishing system, postgresql dependency package .SH 22.2 DESCRIPTION @@ -3109,67 +3109,67 @@ dependencies needed for .B SiSU to populate a postgresql database, this being part of .B SiSU -- man sisu). +\- man sisu). .SH 22.3 SYNOPSIS .br - sisu -D [instruction] [filename/wildcard \ if \ required] + sisu \-D [instruction] [filename/wildcard \ if \ required] .br - sisu -D --pg --[instruction] [filename/wildcard \ if \ required] + sisu \-D \-\-pg \-\-[instruction] [filename/wildcard \ if \ required] .SH 22.4 COMMANDS .br Mappings to two databases are provided by default, postgresql and sqlite, the same commands are used within sisu to construct and populate databases however --d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql, -alternatively --sqlite or --pgsql may be used +\-d (lowercase) denotes sqlite and \-D (uppercase) denotes postgresql, +alternatively \-\-sqlite or \-\-pgsql may be used .br -.B -D or --pgsql +.B \-D or \-\-pgsql may be used interchangeably. .SH 22.4.1 CREATE AND DESTROY DATABASE .TP -.B --pgsql --createall +.B \-\-pgsql \-\-createall initial step, creates required relations (tables, indexes) in existing (postgresql) database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi) .TP -.B sisu -D --createdb +.B sisu \-D \-\-createdb creates database where no database existed before .TP -.B sisu -D --create +.B sisu \-D \-\-create creates database tables where no database tables existed before .TP -.B sisu -D --Dropall +.B sisu \-D \-\-Dropall destroys database (including all its content)! kills data and drops tables, indexes and database associated with a given directory (and directories of the same name). .TP -.B sisu -D --recreate +.B sisu \-D \-\-recreate destroys existing database and builds a new empty database structure .SH 22.4.2 IMPORT AND REMOVE DOCUMENTS .TP -.B sisu -D --import -v [filename/wildcard] +.B sisu \-D \-\-import \-v [filename/wildcard] populates database with the contents of the file. Imports documents(s) specified to a postgresql database (at an object level). .TP -.B sisu -D --update -v [filename/wildcard] +.B sisu \-D \-\-update \-v [filename/wildcard] updates file contents in database .TP -.B sisu -D --remove -v [filename/wildcard] +.B sisu \-D \-\-remove \-v [filename/wildcard] removes specified document from postgresql database. .SH 23. SQLITE @@ -3179,7 +3179,7 @@ removes specified document from postgresql database. .br .B SiSU -- Structured information, Serialized Units - a document publishing system. +\- Structured information, Serialized Units \- a document publishing system. .SH 23.2 DESCRIPTION @@ -3189,78 +3189,78 @@ dependency package, which is a dummy package to install dependencies needed for .B SiSU to populate an sqlite database, this being part of .B SiSU -- man sisu). +\- man sisu). .SH 23.3 SYNOPSIS .br - sisu -d [instruction] [filename/wildcard \ if \ required] + sisu \-d [instruction] [filename/wildcard \ if \ required] .br - sisu -d --(sqlite|pg) --[instruction] [filename/wildcard \ if \ required] + sisu \-d \-\-(sqlite|pg) \-\-[instruction] [filename/wildcard \ if \ required] .SH 23.4 COMMANDS .br Mappings to two databases are provided by default, postgresql and sqlite, the same commands are used within sisu to construct and populate databases however --d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql, -alternatively --sqlite or --pgsql may be used +\-d (lowercase) denotes sqlite and \-D (uppercase) denotes postgresql, +alternatively \-\-sqlite or \-\-pgsql may be used .br -.B -d or --sqlite +.B \-d or \-\-sqlite may be used interchangeably. .SH 23.4.1 CREATE AND DESTROY DATABASE .TP -.B --sqlite --createall +.B \-\-sqlite \-\-createall initial step, creates required relations (tables, indexes) in existing (sqlite) database (a database should be created manually and given the same name as working directory, as requested) (rb.dbi) .TP -.B sisu -d --createdb +.B sisu \-d \-\-createdb creates database where no database existed before .TP -.B sisu -d --create +.B sisu \-d \-\-create creates database tables where no database tables existed before .TP -.B sisu -d --dropall +.B sisu \-d \-\-dropall destroys database (including all its content)! kills data and drops tables, indexes and database associated with a given directory (and directories of the same name). .TP -.B sisu -d --recreate +.B sisu \-d \-\-recreate destroys existing database and builds a new empty database structure .SH 23.4.2 IMPORT AND REMOVE DOCUMENTS .TP -.B sisu -d --import -v [filename/wildcard] +.B sisu \-d \-\-import \-v [filename/wildcard] populates database with the contents of the file. Imports documents(s) specified to an sqlite database (at an object level). .TP -.B sisu -d --update -v [filename/wildcard] +.B sisu \-d \-\-update \-v [filename/wildcard] updates file contents in database .TP -.B sisu -d --remove -v [filename/wildcard] +.B sisu \-d \-\-remove \-v [filename/wildcard] removes specified document from sqlite database. .SH 24. INTRODUCTION .br -.SH 24.1 SEARCH - DATABASE FRONTEND SAMPLE, UTILISING DATABASE AND SISU FEATURES, +.SH 24.1 SEARCH \- DATABASE FRONTEND SAMPLE, UTILISING DATABASE AND SISU FEATURES, INCLUDING OBJECT CITATION NUMBERING (BACKEND CURRENTLY POSTGRESQL) .br Sample search frontend <http://search.sisudoc.org> [^21] A small database and -sample query front-end (search from) that makes use of the citation system, +sample query front\-end (search from) that makes use of the citation system, .I object citation numbering to demonstrates functionality.[^22] @@ -3280,7 +3280,7 @@ the names of the documents matched along with the objects (paragraphs) that meet the search criteria.[^23] .TP -.B sisu -F --webserv-webrick +.B sisu \-F \-\-webserv\-webrick builds a cgi web search frontend for the database created .br @@ -3288,7 +3288,7 @@ The following is feedback on the setup on a machine provided by the help command: .br - sisu --help sql + sisu \-\-help sql .nf Postgresql @@ -3315,21 +3315,21 @@ necessary] .SH 24.2 SEARCH FORM .TP -.B sisu -F -generates a sample search form, which must be copied to the web-server cgi +.B sisu \-F +generates a sample search form, which must be copied to the web\-server cgi directory .TP -.B sisu -F --webserv-webrick +.B sisu \-F \-\-webserv\-webrick generates a sample search form for use with the webrick server, which must be -copied to the web-server cgi directory +copied to the web\-server cgi directory .TP -.B sisu -Fv +.B sisu \-Fv as above, and provides some information on setting up hyperestraier .TP -.B sisu -W +.B sisu \-W starts the webrick server which should be available wherever sisu is properly installed @@ -3360,7 +3360,7 @@ directory /home/ralph/sisu_www (A) to generate the index within the webserver directory to be indexed: .br - estcmd gather -sd [index \ name] [directory \ path \ to \ index] + estcmd gather \-sd [index \ name] [directory \ path \ to \ index] .br the following are examples that will need to be tailored according to your @@ -3370,15 +3370,15 @@ needs: cd /home/ralph/sisu_www .br - estcmd gather -sd casket /home/ralph/sisu_www + estcmd gather \-sd casket /home/ralph/sisu_www .br you may use the 'find' command together with 'egrep' to limit indexing to particular document collection directories within the web server directory: .br - find /home/ralph/sisu_www -type f | egrep - '/home/ralph/sisu_www/sisu/.+?.html$' |estcmd gather -sd casket - + find /home/ralph/sisu_www \-type f | egrep + '/home/ralph/sisu_www/sisu/.+?.html$' |estcmd gather \-sd casket \- .br Check which directories in the webserver/output directory (~/sisu_www or @@ -3391,20 +3391,20 @@ desirable to exclude files 'plain.txt', 'toc.html' and 'concordance.html', as these duplicate information held in other html output e.g. .br - find /home/ralph/sisu_www -type f | egrep - '/sisu_www/(sisu|bookmarks)/.+?.html$' | egrep -v '(doc|concordance).html$' - |estcmd gather -sd casket - + find /home/ralph/sisu_www \-type f | egrep + '/sisu_www/(sisu|bookmarks)/.+?.html$' | egrep \-v '(doc|concordance).html$' + |estcmd gather \-sd casket \- .br from your current document preparation/markup directory, you would construct a rune along the following lines: .br - find /home/ralph/sisu_www -type f | egrep '/home/ralph/sisu_www/([specify \ + find /home/ralph/sisu_www \-type f | egrep '/home/ralph/sisu_www/([specify \ first \ directory \ for \ inclusion]|[specify \ second \ directory \ for \ inclusion]|[another \ directory \ for \ inclusion? \ \...])/.+?.html$' | - egrep -v '(doc|concordance).html$' |estcmd gather -sd - /home/ralph/sisu_www/casket - + egrep \-v '(doc|concordance).html$' |estcmd gather \-sd + /home/ralph/sisu_www/casket \- .br (B) to set up the search form @@ -3413,13 +3413,13 @@ rune along the following lines: (i) copy estseek.cgi to your cgi directory and set file permissions to 755: .br - sudo cp -vi /usr/lib/estraier/estseek.cgi /usr/lib/cgi-bin + sudo cp \-vi /usr/lib/estraier/estseek.cgi /usr/lib/cgi\-bin .br - sudo chmod -v 755 /usr/lib/cgi-bin/estseek.cgi + sudo chmod \-v 755 /usr/lib/cgi\-bin/estseek.cgi .br - sudo cp -v /usr/share/hyperestraier/estseek.* /usr/lib/cgi-bin + sudo cp \-v /usr/share/hyperestraier/estseek.* /usr/lib/cgi\-bin .br [see \ estraier \ documentation \ for \ paths] @@ -3441,10 +3441,10 @@ rune along the following lines: (C) to test using webrick, start webrick: .br - sisu -W + sisu \-W .br -and try open the url: <http://localhost:8081/cgi-bin/estseek.cgi> +and try open the url: <http://localhost:8081/cgi\-bin/estseek.cgi> .SH 26. SISU_WEBRICK .br @@ -3453,7 +3453,7 @@ and try open the url: <http://localhost:8081/cgi-bin/estseek.cgi> .br .B SiSU -- Structured information, Serialized Units - a document publishing system +\- Structured information, Serialized Units \- a document publishing system .SH 26.2 SYNOPSIS @@ -3464,7 +3464,7 @@ sisu_webrick [port] or .br -sisu -W [port] +sisu \-W [port] .SH 26.3 DESCRIPTION @@ -3473,7 +3473,7 @@ sisu_webrick is part of .B SiSU (man sisu) sisu_webrick starts .B Ruby -' s Webrick web-server and points it to the directories to which +' s Webrick web\-server and points it to the directories to which .B SiSU output is written, providing a list of these directories (assuming .B SiSU @@ -3488,7 +3488,7 @@ yaml file: ~/.sisu/sisurc.yml a sample of which is provided as .br sisu_webrick, may be started on it's own with the command: sisu_webrick [port] -or using the sisu command with the -W flag: sisu -W [port] +or using the sisu command with the \-W flag: sisu \-W [port] .br where no port is given and settings are unchanged the default port is 8081 @@ -3496,9 +3496,9 @@ where no port is given and settings are unchanged the default port is 8081 .SH 26.5 DOCUMENT PROCESSING COMMAND FLAGS .br -sisu -W [port] starts +sisu \-W [port] starts .B Ruby -Webrick web-server, serving +Webrick web\-server, serving .B SiSU output directories, on the port provided, or if no port is provided and the defaults have not been changed in ~/.sisu/sisurc.yaml then on port 8081 @@ -3539,7 +3539,7 @@ documents can either be sisu marked up files in plaintext \.sst or \.ssm or; zipped sisu files, sisupod.zip or filename.ssp .br -.B \.sst / \.ssm - sisu text files +.B \.sst / \.ssm \- sisu text files .br .B SiSU @@ -3548,7 +3548,7 @@ processing instruction and the url. The source file and any associated parts (such as images) will be downloaded and generated locally. .nf - sisu -3 http://[provide \ url \ to \ valid \ \.sst \ or \ \.ssm \ file] + sisu \-3 http://[provide \ url \ to \ valid \ \.sst \ or \ \.ssm \ file] .fi .br @@ -3563,7 +3563,7 @@ documents in this way, images should be in the directory relative to the document source \../_sisu/image .br -.B sisupod - zipped sisu files +.B sisupod \- zipped sisu files .br A sisupod is the zipped content of a sisu marked up text or texts and any other @@ -3576,7 +3576,7 @@ processing instruction and the url, the sisupod will be downloaded and the documents it contains generated locally. .nf - sisu -3 http://[provide \ url \ to \ valid \ sisupod.zip \ or \ \.ssp \ file] + sisu \-3 http://[provide \ url \ to \ valid \ sisupod.zip \ or \ \.ssp \ file] .fi .br @@ -3599,34 +3599,34 @@ machine using either rsync, or scp. .br In order to do this some ssh authentication agent and keychain or similar tool will need to be configured. Once that is done the placement on a remote host -can be done seamlessly with the -r (for scp) or -R (for rsync) flag, which may +can be done seamlessly with the \-r (for scp) or \-R (for rsync) flag, which may be used in conjunction with other processing flags, e.g. .nf - sisu -3R sisu_remote.sst + sisu \-3R sisu_remote.sst .fi .SH 28.1 COMMANDS .TP -.B -R [filename/wildcard] +.B \-R [filename/wildcard] copies sisu output files to remote host using rsync. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Note the behavior of rsync -different if -R is used with other flags from if used alone. Alone the rsync ---delete parameter is sent, useful for cleaning the remote directory (when -R -is used together with other flags, it is not). Also see -r +different if \-R is used with other flags from if used alone. Alone the rsync +\-\-delete parameter is sent, useful for cleaning the remote directory (when \-R +is used together with other flags, it is not). Also see \-r .TP -.B -r [filename/wildcard] +.B \-r [filename/wildcard] copies sisu output files to remote host using scp. This requires that sisurc.yml has been provided with information on hostname and username, and -that you have your "keys" and ssh agent in place. Also see -R +that you have your "keys" and ssh agent in place. Also see \-R .SH 28.2 CONFIGURATION .br -[expand \ on \ the \ setting \ up \ of \ an \ ssh-agent \ / \ keychain] +[expand \ on \ the \ setting \ up \ of \ an \ ssh\-agent \ / \ keychain] .SH 29. REMOTE SERVERS .br @@ -3641,7 +3641,7 @@ the program and all documents can just as easily be on a remote server, to which you are logged on using a terminal, and commands and operations would be pretty much the same as they would be on your local machine. -.SH 30. QUICKSTART - GETTING STARTED HOWTO +.SH 30. QUICKSTART \- GETTING STARTED HOWTO .br .SH 30.1 INSTALLATION @@ -3663,7 +3663,7 @@ Sid and testing archives (and possibly Ubuntu), assuming your .nf aptitude update - aptitude install sisu-complete + aptitude install sisu\-complete .fi .br @@ -3673,9 +3673,9 @@ markup samples: .nf #/etc/apt/sources.list .br - deb http://ftp.fi.debian.org/debian/ unstable main non-free contrib + deb http://ftp.fi.debian.org/debian/ unstable main non\-free contrib .br - deb-src http://ftp.fi.debian.org/debian/ unstable main non-free contrib + deb\-src http://ftp.fi.debian.org/debian/ unstable main non\-free contrib .br .fi @@ -3686,7 +3686,7 @@ The aptitude commands become: .nf aptitude update .br - aptitude install sisu-complete sisu-markup-samples + aptitude install sisu\-complete sisu\-markup\-samples .fi .br @@ -3699,8 +3699,8 @@ archives, they will be available by adding the following to your .nf #/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 + 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 .fi .br @@ -3708,11 +3708,11 @@ repeat the aptitude commands .nf aptitude update - aptitude install sisu-complete sisu-markup-samples + aptitude install sisu\-complete sisu\-markup\-samples .fi .br -Note however that it is not necessary to install sisu-complete if not all +Note however that it is not necessary to install sisu\-complete if not all components of sisu are to be used. Installing just the package sisu will provide basic functionality. @@ -3732,7 +3732,7 @@ They may be downloaded from: as root type: .br - rpm -i [rpm \ package \ name] + rpm \-i [rpm \ package \ name] .SH 30.1.3 INSTALLATION FROM SOURCE @@ -3821,7 +3821,7 @@ or This makes use of Rant (by Stefan Lang) and the provided Rantfile. It has been configured to do post installation setup setup configuration and generation of first test file. Note however, that additional external package dependencies, -such as tetex-extra are not taken care of for you. +such as tetex\-extra are not taken care of for you. .br Further information on "rant" is available from: @@ -3839,7 +3839,7 @@ For a list of alternative actions you may type: ruby install help .br - ruby install -T + ruby install \-T .SH 30.2 TESTING SISU, GENERATING OUTPUT @@ -3847,7 +3847,7 @@ For a list of alternative actions you may type: To check which version of sisu is installed: .br -sisu -v +sisu \-v .br Depending on your mode of installation one or a number of markup sample files @@ -3866,7 +3866,7 @@ or change directory to the appropriate one: .br -cd /usr/share/doc/sisu/markup-samples/samples +cd /usr/share/doc/sisu/markup\-samples/samples .SH 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB @@ -3875,7 +3875,7 @@ Having moved to the directory that contains the markup samples (see instructions above if necessary), choose a file and run sisu against it .br -sisu -NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst +sisu \-NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst .br this will generate html including a concordance file, opendocument text format, @@ -3885,7 +3885,7 @@ plaintext, XHTML and various forms of XML, and OpenDocument text .br Assuming a LaTeX engine such as tetex or texlive is installed with the required -modules (done automatically on selection of sisu-pdf in +modules (done automatically on selection of sisu\-pdf in .B Debian ) @@ -3894,37 +3894,37 @@ Having moved to the directory that contains the markup samples (see instructions above if necessary), choose a file and run sisu against it .br -sisu -pv free_as_in_freedom.rms_and_free_software.sam_williams.sst +sisu \-pv free_as_in_freedom.rms_and_free_software.sam_williams.sst .br -sisu -3 free_as_in_freedom.rms_and_free_software.sam_williams.sst +sisu \-3 free_as_in_freedom.rms_and_free_software.sam_williams.sst .br should generate most available output formats: html including a concordance file, opendocument text format, plaintext, XHTML and various forms of XML, and OpenDocument text and pdf -.SH 30.2.3 RELATIONAL DATABASE - POSTGRESQL, SQLITE +.SH 30.2.3 RELATIONAL DATABASE \- POSTGRESQL, SQLITE .br -Relational databases need some setting up - you must have permission to create +Relational databases need some setting up \- you must have permission to create the database and write to it when you run sisu. .br Assuming you have the database installed and the requisite permissions .br -sisu --sqlite --recreate +sisu \-\-sqlite \-\-recreate .br -sisu --sqlite -v --import +sisu \-\-sqlite \-v \-\-import free_as_in_freedom.rms_and_free_software.sam_williams.sst .br -sisu --pgsql --recreate +sisu \-\-pgsql \-\-recreate .br -sisu --pgsql -v --import +sisu \-\-pgsql \-v \-\-import free_as_in_freedom.rms_and_free_software.sam_williams.sst .SH 30.3 GETTING HELP @@ -3953,16 +3953,16 @@ as within the package itself: .SH 30.3.2 BUILT IN HELP .br -sisu --help +sisu \-\-help .br -sisu --help --env +sisu \-\-help \-\-env .br -sisu --help --commands +sisu \-\-help \-\-commands .br -sisu --help --markup +sisu \-\-help \-\-markup .SH 30.3.3 THE HOME PAGE @@ -3992,8 +3992,8 @@ Additional markup samples are packaged separately in the file: .br On .B Debian -they are available in non-free[^28] to include them it is necessary to -include non-free in your /etc/apt/source.list or obtain them from the sisu home +they are available in non\-free[^28] to include them it is necessary to +include non\-free in your /etc/apt/source.list or obtain them from the sisu home site. .SH 31. EDITOR FILES, SYNTAX HIGHLIGHTING @@ -4003,16 +4003,16 @@ site. The directory: .br - \./data/sisu/v2/conf/editor-syntax-etc/ + \./data/sisu/v2/conf/editor\-syntax\-etc/ .br - \./data/sisu/v3/conf/editor-syntax-etc/ + \./data/sisu/v3/conf/editor\-syntax\-etc/ .br - /usr/share/sisu/v2/conf/editor-syntax-etc + /usr/share/sisu/v2/conf/editor\-syntax\-etc .br - /usr/share/sisu/v3/conf/editor-syntax-etc + /usr/share/sisu/v3/conf/editor\-syntax\-etc .br contains rudimentary sisu syntax highlighting files for: @@ -4021,7 +4021,7 @@ contains rudimentary sisu syntax highlighting files for: * (g)vim <http://www.vim.org> .br - package: sisu-vim + package: sisu\-vim .br status: largely done @@ -4042,13 +4042,13 @@ status: largely done place in: .br - /usr/share/gtksourceview-1.0/language-specs + /usr/share/gtksourceview\-1.0/language\-specs .br or .br - ~/.gnome2/gtksourceview-1.0/language-specs + ~/.gnome2/gtksourceview\-1.0/language\-specs .br status: very basic syntax highlighting @@ -4057,7 +4057,7 @@ or comments: this editor features display line wrap and is used by Goby! .br -* nano <http://www.nano-editor.org> +* nano <http://www.nano\-editor.org> .br file: nanorc @@ -4072,7 +4072,7 @@ save as: status: basic syntax highlighting .br - comments: assumes dark background; no display line-wrap; does line breaks + comments: assumes dark background; no display line\-wrap; does line breaks .br * diakonos (an editor written in ruby) <http://purepistos.net/diakonos> @@ -4093,7 +4093,7 @@ includes: status: basic syntax highlighting .br -comments: assumes dark background; no display line-wrap +comments: assumes dark background; no display line\-wrap .br * kate & kwrite <http://kate.kde.org> @@ -4126,7 +4126,7 @@ comments: assumes dark background; no display line-wrap file: sisu_nedit.pats .br - nedit -import sisu_nedit.pats + nedit \-import sisu_nedit.pats .br status: a very clumsy first attempt [not \ really \ done] @@ -4138,17 +4138,17 @@ comments: assumes dark background; no display line-wrap * emacs <http://www.gnu.org/software/emacs/emacs.html> .br - files: sisu-mode.el + files: sisu\-mode.el .br to file ~/.emacs add the following 2 lines: .br - (add-to-list 'load-path - "/usr/share/sisu/v2/conf/editor-syntax-etc/emacs") + (add\-to\-list 'load\-path + "/usr/share/sisu/v2/conf/editor\-syntax\-etc/emacs") .br - (require 'sisu-mode.el) + (require 'sisu\-mode.el) .br [not \ done \ / \ not \ yet \ included] @@ -4175,7 +4175,7 @@ NOTE: .br [ \ .B \ SiSU \ parses \ files \ with \ long \ lines \ or \ line \ breaks, \ -but, \ display \ linewrap \ (without \ line-breaks) \ is \ a \ convenient \ +but, \ display \ linewrap \ (without \ line\-breaks) \ is \ a \ convenient \ editor \ feature \ to \ have \ for \ sisu \ markup] .SH 32. HOW DOES SISU WORK? @@ -4206,8 +4206,8 @@ ways of representing documents, (or indeed to create new ones). .br .br -* sparse/minimal markup (clean utf-8 source texts). Documents are prepared in a -single UTF-8 file using a minimalistic mnemonic syntax. Typical literature, +* sparse/minimal markup (clean utf\-8 source texts). Documents are prepared in a +single UTF\-8 file using a minimalistic mnemonic syntax. Typical literature, documents like "War and Peace" require almost no markup, and most of the headers are optional. @@ -4218,8 +4218,8 @@ and more sparse than the most basic HTML), [this \ may \ also \ be \ converted .br * 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 +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. @@ -4237,7 +4237,7 @@ different strengths of various standard formats for representing documents, amongst the output formats currently supported are: .br - * html - both as a single scrollable text and a segmented document + * html \- both as a single scrollable text and a segmented document .br * xhtml @@ -4246,20 +4246,20 @@ amongst the output formats currently supported are: * epub .br - * XML - both in sax and dom style xml structures for further development as + * XML \- both in sax and dom style xml structures for further development as required .br - * ODF - open document format, the iso standard for document storage + * ODF \- open document format, the iso standard for document storage .br - * LaTeX - used to generate pdf + * LaTeX \- used to generate pdf .br * pdf (via LaTeX) .br - * sql - population of an sql database, (at the same object level that is used + * sql \- population of an sql database, (at the same object level that is used to cite text within a document) .br @@ -4293,8 +4293,8 @@ tools \ like \ hyperestraier]. .br * long term maintainability of document collections in a world of changing -formats, having a very sparsely marked-up source document base. there is a -considerable degree of future-proofing, output representations are +formats, having a very sparsely marked\-up source document base. there is a +considerable degree of future\-proofing, output representations are "upgradeable", and new document formats may be added. e.g. addition of odf (open document text) module in 2006, epub in 2009 and in future html5 output sometime in future, without modification of existing prepared texts @@ -4310,7 +4310,7 @@ to be done only once but may be repeated for various reasons as desired presentations/representations) .br -* document source (plaintext utf-8) if shared on the net may be used as input +* document source (plaintext utf\-8) if shared on the net may be used as input and processed locally to produce the different document outputs .br @@ -4371,37 +4371,37 @@ document. man sisu .br - man sisu-concordance + man sisu\-concordance .br - man sisu-epub + man sisu\-epub .br - man sisu-git + man sisu\-git .br - man sisu-harvest + man sisu\-harvest .br - man sisu-html + man sisu\-html .br - man sisu-odf + man sisu\-odf .br - man sisu-pdf + man sisu\-pdf .br - man sisu-pg + man sisu\-pg .br - man sisu-po + man sisu\-po .br - man sisu-sqlite + man sisu\-sqlite .br - man sisu-txt + man sisu\-txt .br man 7 sisu_complete @@ -4421,7 +4421,7 @@ document. .br man sisu_webrick -.SH 34.2 SISU GENERATED OUTPUT - LINKS TO HTML +.SH 34.2 SISU GENERATED OUTPUT \- LINKS TO HTML .br Note @@ -4498,18 +4498,18 @@ a saved version of the odf, or the pdf being a saved version of the html. .br 4. units of text, primarily paragraphs and headings, also any tables, poems, -code-blocks +code\-blocks .br 5. Specification submitted by Adobe to ISO to become a full open ISO specification -<http://www.linux-watch.com/news/NS7542722606.html> +<http://www.linux\-watch.com/news/NS7542722606.html> .br 6. ISO standard ISO/IEC 26300:2006 .br -7. An open standard format for e-books +7. An open standard format for e\-books .br *1. square brackets @@ -4531,7 +4531,7 @@ specification markup using SiSU, which though not an original design goal is useful. .br -11. files should be prepared using UTF-8 character encoding +11. files should be prepared using UTF\-8 character encoding .br 12. a footnote or endnote @@ -4556,7 +4556,7 @@ required 14 <http://www.sisudoc.org/> .br -15. <http://www.ruby-lang.org/en/> +15. <http://www.ruby\-lang.org/en/> .br 16. Table from the Wealth of Networks by Yochai Benkler @@ -4583,7 +4583,7 @@ subsequent processing. It may be however that when the resulting file is shared 21. <http://search.sisudoc.org> .br -22. (which could be extended further with current back-end). As regards +22. (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. @@ -4612,7 +4612,7 @@ matches are found. .B Debian Free Software guidelines require that everything distributed within .B Debian -can be changed - and the documents are authors' works that while freely +can be changed \- and the documents are authors' works that while freely distributable are not freely changeable. .br @@ -4623,21 +4623,21 @@ distributable are not freely changeable. .br \fIsisu\fR(1), .br -\fIsisu-epub\fR(1), +\fIsisu\-epub\fR(1), .br -\fIsisu-harvest\fR(1), +\fIsisu\-harvest\fR(1), .br -\fIsisu-html\fR(1), +\fIsisu\-html\fR(1), .br -\fIsisu-odf\fR(1), +\fIsisu\-odf\fR(1), .br -\fIsisu-pdf\fR(1), +\fIsisu\-pdf\fR(1), .br -\fIsisu-pg\fR(1), +\fIsisu\-pg\fR(1), .br -\fIsisu-sqlite\fR(1), +\fIsisu\-sqlite\fR(1), .br -\fIsisu-txt\fR(1). +\fIsisu\-txt\fR(1). .br \fIsisu_vim\fR(7) diff --git a/man/man7/sisu_vim.7 b/man/man7/sisu_vim.7 index 9ea91846..7678f370 100644 --- a/man/man7/sisu_vim.7 +++ b/man/man7/sisu_vim.7 @@ -1,4 +1,4 @@ -.TH "sisu_vim" "1" "2008-02-12" "0.64.4" "SiSU" +.TH "sisu_vim" "1" "2008\-02\-12" "0.64.4" "SiSU" .SH NAME sisu_vim \- vim syntax and folds file for sisu: markup, structuring, publishing in multiple standard formats, and search .SH @@ -23,7 +23,7 @@ has syntax highlighting for a number of editors including vim which are documented under: .BR - /usr/share/doc/sisu/markup-samples/sisu_manual/sisu_syntax_highlighting.sst + /usr/share/doc/sisu/markup\-samples/sisu_manual/sisu_syntax_highlighting.sst .BR <http://www.sisudoc.org/sisu/sisu_manual/sisu_syntax_highlighting/index.html> |