From cd0c1c83b20c97b2579a6b9ffd8c3c942297eecd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 9 Jun 2011 23:24:04 -0400 Subject: sha256 (3.0.12) --- data/doc/sisu/CHANGELOG_v3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 5af32fc2..928a84d3 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -16,9 +16,9 @@ v3 branch once stable will supersede & replace current stable v2 branch %% 3.0.12.orig.tar.gz (2011-06-09:23/4) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz - sisu_3.0.12.orig.tar.gz - sisu_3.0.12-1.dsc - sisu_3.0.12-1.debian.tar.gz + 87b54e241067766c67233889ac973310d25ae12264ed65e9fd847626c9b95b2a 1943781 sisu_3.0.12.orig.tar.gz + dad744f0f6521a9f6b0f0ba07dadee0dc6a6bcfb009fb5311b92528da15d6c1f 1223 sisu_3.0.12-1.dsc + 4d3f83d9d923b3c8a9ac2c88dd119e93bb146c963b54b9e56fdb83d5cfdb58d7 288488 sisu_3.0.12-1.debian.tar.gz * harvest * correct paths to document manifests etc. for the possible output dir -- cgit v1.2.3 From 3ef6432902a4d589c8c4edf58e65df008d11b777 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 13:45:23 -0400 Subject: v2 v3: 2.9.7 & 3.0.13 version & changelog "opened" --- data/doc/sisu/CHANGELOG_v2 | 3 +++ data/doc/sisu/CHANGELOG_v3 | 7 +++++++ data/sisu/v2/v/version.yml | 6 +++--- data/sisu/v3/v/version.yml | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index f621f7be..47ff5b31 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,6 +12,9 @@ Reverse Chronological: %% STABLE Branch +%% 2.9.7.orig.tar.gz (2011-06-26:25/7) [see 3.0.13] +http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 + %% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 928a84d3..c127cb00 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,6 +13,13 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.0.13.orig.tar.gz (2011-06-26:25/7) +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.13-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz + sisu_3.0.13.orig.tar.gz + sisu_3.0.13-1.dsc + sisu_3.0.13-1.debian.tar.gz + %% 3.0.12.orig.tar.gz (2011-06-09:23/4) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 562ae361..b0209fd9 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.9.6 -:date_stamp: 2011w23/2 -:date: "2011-06-07" +:version: 2.9.7 +:date_stamp: 2011w25/7 +:date: "2011-06-26" :project: SiSU diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index a997c557..681fd4c9 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.0.12-beta-rb1.9.2p180 -:date_stamp: 2011w23/4 -:date: "2011-06-09" +:version: 3.0.13-beta-rb1.9.2p180 +:date_stamp: 2011w25/7 +:date: "2011-06-26" :project: SiSU -- cgit v1.2.3 From 533909b0d94d8bc14b4e52688e19a783f729c7ec Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 13:53:28 -0400 Subject: v2 v3: vim colors, added cursor line & cursor column --- data/doc/sisu/CHANGELOG_v2 | 3 +++ data/doc/sisu/CHANGELOG_v3 | 3 +++ data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim | 7 ++++--- .../v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim | 6 +++--- .../v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim | 6 +++--- data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim | 7 ++++--- data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim | 6 +++--- .../v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim | 6 +++--- .../v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim | 6 +++--- data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim | 7 ++++--- .../v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim | 6 +++--- .../v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim | 6 +++--- data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim | 7 ++++--- data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim | 6 +++--- .../v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim | 6 +++--- .../v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim | 6 +++--- 16 files changed, 52 insertions(+), 42 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 47ff5b31..a4d7cc20 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -15,6 +15,9 @@ Reverse Chronological: %% 2.9.7.orig.tar.gz (2011-06-26:25/7) [see 3.0.13] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 + * vim + * colors, added cursor line & column + %% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index c127cb00..94d8fcaf 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -20,6 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz sisu_3.0.13-1.dsc sisu_3.0.13-1.debian.tar.gz + * vim + * colors, added cursor line & column + %% 3.0.12.orig.tar.gz (2011-06-09:23/4) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz 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 9f1e7222..46d618f3 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,7 +1,7 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark @@ -53,8 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index c8d7333b..aad6de0f 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: frugal-cterm-ruby " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,9 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index 0190c699..03f192df 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: frugal-cterm-sisu " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,9 +53,9 @@ endif :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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 18d341c8..1ff26a58 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,7 +1,7 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah -" Last Change: 2011-04-25 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,8 +53,9 @@ endif ":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 MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 9648534e..238b27df 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,7 +1,7 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Notes: cterm now uses frugal-sisu 8 colors for term " (for gui originally looked at desert Hans Fugal @@ -55,9 +55,9 @@ endif :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 CursorLine cterm=bold,underline guibg=black +:hi CursorColumn cterm=bold,underline guibg=black :hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white :hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 :hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white 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 index d17c3e5e..3d8f92e1 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: sparse-cterm-ruby " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & frugal :set background=dark @@ -53,9 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index 13d9f02f..9704dbd2 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: sparse-cterm-sisu " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & frugal :set background=dark @@ -53,9 +53,9 @@ endif :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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 9f1e7222..46d618f3 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,7 +1,7 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark @@ -53,8 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index c8d7333b..aad6de0f 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: frugal-cterm-ruby " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,9 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index 0190c699..03f192df 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: frugal-cterm-sisu " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,9 +53,9 @@ endif :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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 18d341c8..1ff26a58 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,7 +1,7 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah -" Last Change: 2011-04-25 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark @@ -53,8 +53,9 @@ endif ":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 MatchParen cterm=bold ctermbg=4 ctermfg=7 +:hi CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 9648534e..238b27df 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,7 +1,7 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Notes: cterm now uses frugal-sisu 8 colors for term " (for gui originally looked at desert Hans Fugal @@ -55,9 +55,9 @@ endif :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 CursorLine cterm=bold,underline guibg=black +:hi CursorColumn cterm=bold,underline guibg=black :hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white :hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 :hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white 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 index d17c3e5e..3d8f92e1 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: sparse-cterm-ruby " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & frugal :set background=dark @@ -53,9 +53,9 @@ endif ":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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 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 index 13d9f02f..9704dbd2 100644 --- 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 @@ -1,7 +1,7 @@ " Vim color file " Name: sparse-cterm-sisu " Maintainer: Ralph Amissah -" Last Change: 2011-05-10 +" Last Change: 2011-06-26 " URL: " Note: 8 color cterm, related colorschemes 8 & frugal :set background=dark @@ -53,9 +53,9 @@ endif :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 CursorLine cterm=bold,underline +:hi CursorColumn cterm=bold,underline :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 -- cgit v1.2.3 From 833558063f14471bf46512ae7bf69bf4e5de49c9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 14:03:16 -0400 Subject: v2 v3: dal_syntax, linebreak in regular text object: ' \\ ' ('
' depreciated) * thanks to Jonas Stein for making me look at this (see bug: #617298 & comments in upstream CHANGELOG_v3) * testing required, downstream outputs affected --- data/doc/sisu/CHANGELOG_v2 | 3 +++ data/doc/sisu/CHANGELOG_v3 | 6 ++++++ lib/sisu/v2/dal_syntax.rb | 21 +++++++++++++-------- lib/sisu/v3/dal_syntax.rb | 21 +++++++++++++-------- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index a4d7cc20..8df2759b 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -15,6 +15,9 @@ Reverse Chronological: %% 2.9.7.orig.tar.gz (2011-06-26:25/7) [see 3.0.13] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 + * dal_syntax, linebreak within regular objects is \\ (
depreciated) + [test, affects downstream outputs, there is the potential for breakage] + * vim * colors, added cursor line & column diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 94d8fcaf..1eb5b4bf 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -20,6 +20,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz sisu_3.0.13-1.dsc sisu_3.0.13-1.debian.tar.gz + * dal_syntax, linebreak within regular objects is \\ (
depreciated) + [test, affects downstream outputs, there is the potential for breakage] + [thanks to Jonas Stein for making me look at this, see bug: #617298,
+ was not documented because there has been no intention to keep it, but + there was no markup replacement until now] + * vim * colors, added cursor line & column diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 76287464..35505d12 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -122,6 +122,7 @@ module SiSU_Syntax def songsheet @data.compact! @data.each do |dob| + dob=breaks(dob) dob=if @md.sem_tag then sem(dob) else dob end #revisit dob=wordlist_italics(dob) dob=wordlist_bold(dob) @@ -133,6 +134,13 @@ module SiSU_Syntax def sem(dob) #revisit dob=SiSU_sem::Tags.new(dob,@md).rm.all end + def breaks(dob) + if dob.is !~/^(?:meta|comment|code|table)/ + dob.obj.gsub!(/ \\\\(?: |$)/,"#{Mx[:br_line]}") + dob.obj.gsub!(/(?:<:?br>|
)/,"#{Mx[:br_line]}") # depreciated + end + dob + end def wordlist_italics(dob) dob=dob.dup if (defined? @md.make.italics[:str] \ @@ -166,11 +174,11 @@ module SiSU_Syntax dob end def embolden(given) - given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}\\2") given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*)/, "#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}") - given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)\s+((?:[*]~\S+\s*)+)/, "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") @@ -180,7 +188,7 @@ module SiSU_Syntax "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}") end def italicise(given) - given.gsub!(/^\/_\s*(.+?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/^\/_\s*(.+?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") given.gsub!(/^\/_\s*(.+?)\s+((?:[*]~\S+\s*)+)/, "#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") @@ -314,7 +322,7 @@ module SiSU_Syntax dob.obj.gsub!(/\s*@title\b/," #{@md.title.full}") if defined? @md.creator.author \ and @md.creator.author - dob.obj.gsub!(/\s+(?:@creator|@author)/,",
#{@md.creator.author}") + dob.obj.gsub!(/\s+(?:@creator|@author)/,",#{Mx[:br_line]}#{@md.creator.author}") else dob.obj.gsub!(/\s+(?:@creator|@author)/,'') end end @@ -352,7 +360,6 @@ module SiSU_Syntax dob.obj.gsub!(/\\\\/,"#{Mx[:gl_o]}#092#{Mx[:gl_c]}") #escaped special character dob.obj.gsub!(/\\\*/,"#{Mx[:gl_o]}#042#{Mx[:gl_c]}") #escaped special character dob.obj.gsub!(/\\\!/,"#{Mx[:gl_o]}#033#{Mx[:gl_c]}") #escaped special character - dob.obj.gsub!(/(?:<:?br>|
)/,"#{Mx[:br_line]}") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') if dob.obj=~/(?:https?:|ftp:|\{([^{}]+?)\}(?:#|:|[.]{1,2}\/))\S+/m if dob.obj=~/(?:^|[#{Mx[:gl_c]}#{Mx[:nbsp]} ])\{~\^ (?:.+?)\s*\}(?:(?:https?:|ftp:|:|[.]{1,2}\/)\S+?)\s*#{Mx[:en_a_o]}(.+?)#{Mx[:en_a_c]}/m dob.obj.gsub!(/(^|[#{Mx[:gl_c]}#{Mx[:nbsp]} ])\{~\^ ([^}]+?)\s*\}((?:https?:|ftp:|:|[.]{1,2}\/)\S+?)\s*#{Mx[:en_a_o]}(.+?)#{Mx[:en_a_c]}/m, @@ -388,8 +395,6 @@ module SiSU_Syntax "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}#{Mx[:gl_bullet]}") #bullets, shortcut dob.obj.gsub!(/^\s*_([1-9])\s+/, "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}") #indent - dob.obj.gsub!(/(?:<:?br>|
)/, - "#{Mx[:br_line]}") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') dob.obj.gsub!(/<:hi>/,"#{Mx[:fa_hilite_o]}") #'') # bright yellow rgb(255,255,0) pale yellow rgb(255,255,200) dob.obj.gsub!(/<:\/hi>/,"#{Mx[:fa_hilite_c]}") #'') dob.obj.gsub!(/(#{Mx[:gr_o]}verse#{Mx[:gr_c]}.+)/m,"\\1\n") @@ -507,7 +512,7 @@ module SiSU_Syntax "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}#{Mx[:fa_o]}\\2#{Mx[:fa_c_o]}") #bullets, shortcut line.gsub!(/^\s*_\([1-9]\)\s+/, "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}") - line.gsub!(/(?:<:?br>|
)\s*_[12]\s+/, + line.gsub!(/#{Mx[:br_line]}\s*_[12]\s+/, "#{Mx[:br_line]} ") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') end @data diff --git a/lib/sisu/v3/dal_syntax.rb b/lib/sisu/v3/dal_syntax.rb index 2f6353bc..4595d6e1 100644 --- a/lib/sisu/v3/dal_syntax.rb +++ b/lib/sisu/v3/dal_syntax.rb @@ -122,6 +122,7 @@ module SiSU_Syntax def songsheet @data.compact! @data.each do |dob| + dob=breaks(dob) dob=if @md.sem_tag then sem(dob) else dob end #revisit dob=wordlist_italics(dob) dob=wordlist_bold(dob) @@ -133,6 +134,13 @@ module SiSU_Syntax def sem(dob) #revisit dob=SiSU_sem::Tags.new(dob,@md).rm.all end + def breaks(dob) + if dob.is !~/^(?:meta|comment|code|table)/ + dob.obj.gsub!(/ \\\\(?: |$)/,"#{Mx[:br_line]}") + dob.obj.gsub!(/(?:<:?br>|
)/,"#{Mx[:br_line]}") # depreciated + end + dob + end def wordlist_italics(dob) dob=dob.dup if (defined? @md.make.italics[:str] \ @@ -166,11 +174,11 @@ module SiSU_Syntax dob end def embolden(given) - given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}\\2") given.gsub!(/^!_\s+((?:\{|#{Mx[:lnk_o]})(?:~^ )?.+?(?:\}|#{Mx[:lnk_o]})https?:\/\/\S+.*)/, "#{Mx[:fa_bold_o]} \\1 #{Mx[:fa_bold_c]}") - given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") given.gsub!(/(?:^!_|^#{Mx[:lv_o]}[7-9]:\S*?#{Mx[:lv_c]})\s*(.+?)\s+((?:[*]~\S+\s*)+)/, "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}\\2") @@ -180,7 +188,7 @@ module SiSU_Syntax "#{Mx[:fa_bold_o]}\\1#{Mx[:fa_bold_c]}") end def italicise(given) - given.gsub!(/^\/_\s*(.+?)(
|[#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, + given.gsub!(/^\/_\s*(.+?)([#{Mx[:br_line]}#{Mx[:br_paragraph]}#{Mx[:br_nl]}])/, "#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") given.gsub!(/^\/_\s*(.+?)\s+((?:[*]~\S+\s*)+)/, "#{Mx[:fa_italics_o]}\\1#{Mx[:fa_italics_c]}\\2") @@ -314,7 +322,7 @@ module SiSU_Syntax dob.obj.gsub!(/\s*@title\b/," #{@md.title.full}") if defined? @md.creator.author \ and @md.creator.author - dob.obj.gsub!(/\s+(?:@creator|@author)/,",
#{@md.creator.author}") + dob.obj.gsub!(/\s+(?:@creator|@author)/,",#{Mx[:br_line]}#{@md.creator.author}") else dob.obj.gsub!(/\s+(?:@creator|@author)/,'') end end @@ -358,7 +366,6 @@ module SiSU_Syntax dob.obj.gsub!(/\\\\/,"#{Mx[:gl_o]}#092#{Mx[:gl_c]}") #escaped special character dob.obj.gsub!(/\\\*/,"#{Mx[:gl_o]}#042#{Mx[:gl_c]}") #escaped special character dob.obj.gsub!(/\\\!/,"#{Mx[:gl_o]}#033#{Mx[:gl_c]}") #escaped special character - dob.obj.gsub!(/(?:<:?br>|
)/,"#{Mx[:br_line]}") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') if dob.obj=~/(?:https?:|ftp:|\{([^{}]+?)\}(?:#|:|[.]{1,2}\/))\S+/m if dob.obj=~/(?:^|[#{Mx[:gl_c]}#{Mx[:nbsp]} ])\{~\^ (?:.+?)\s*\}(?:(?:https?:|ftp:|:|[.]{1,2}\/)\S+?)\s*#{Mx[:en_a_o]}(.+?)#{Mx[:en_a_c]}/m dob.obj.gsub!(/(^|[#{Mx[:gl_c]}#{Mx[:nbsp]} ])\{~\^ ([^}]+?)\s*\}((?:https?:|ftp:|:|[.]{1,2}\/)\S+?)\s*#{Mx[:en_a_o]}(.+?)#{Mx[:en_a_c]}/m, @@ -394,8 +401,6 @@ module SiSU_Syntax "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}#{Mx[:gl_bullet]}") #bullets, shortcut dob.obj.gsub!(/^\s*_([1-9])\s+/, "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}") #indent - dob.obj.gsub!(/(?:<:?br>|
)/, - "#{Mx[:br_line]}") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') dob.obj.gsub!(/<:hi>/,"#{Mx[:fa_hilite_o]}") #'') # bright yellow rgb(255,255,0) pale yellow rgb(255,255,200) dob.obj.gsub!(/<:\/hi>/,"#{Mx[:fa_hilite_c]}") #'') dob.obj.gsub!(/(#{Mx[:gr_o]}verse#{Mx[:gr_c]}.+)/m,"\\1\n") @@ -513,7 +518,7 @@ module SiSU_Syntax "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}#{Mx[:fa_o]}\\2#{Mx[:fa_c_o]}") #bullets, shortcut line.gsub!(/^\s*_\([1-9]\)\s+/, "#{Mx[:pa_o]}:i\\1#{Mx[:pa_c]}") - line.gsub!(/(?:<:?br>|
)\s*_[12]\s+/, + line.gsub!(/#{Mx[:br_line]}\s*_[12]\s+/, "#{Mx[:br_line]} ") #indent used in endnotes, not implemented, replace when ready with: line.gsub!(/(?:
|
)\s*_([12])\s+/,'
<:i\1> ') end @data -- cgit v1.2.3 From 8294a1dc2d6316a9133a38bf916935f57ab2fb53 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 14:10:13 -0400 Subject: v2 v3: vim, sisu syntax highlighting, linebreak \\ added (
kept) --- data/doc/sisu/CHANGELOG_v2 | 1 + data/doc/sisu/CHANGELOG_v3 | 1 + data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim | 5 +++-- data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 8df2759b..610d61ba 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -19,6 +19,7 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 [test, affects downstream outputs, there is the potential for breakage] * vim + * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column %% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12] diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 1eb5b4bf..ca518566 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -27,6 +27,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz there was no markup replacement until now] * vim + * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column %% 3.0.12.orig.tar.gz (2011-06-09:23/4) 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 ef7207a3..00c02a34 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,7 +1,7 @@ " SiSU Vim syntax file " SiSU Maintainer: Ralph Amissah -" SiSU Markup: SiSU (sisu-3.0.8) -" Last Change: 2011-04-23 +" SiSU Markup: SiSU (sisu-3.0.13) +" Last Change: 2011-06-26 " URL: "(originally looked at Ruby Vim by Mirko Nasato) @@ -17,6 +17,7 @@ syn match sisu_error contains=sisu_link,sisu_error_wspace "" " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" + syn match sisu_break contains=@NoSpell " \\\\\( \|$\)" syn match sisu_break contains=@NoSpell "
\|
" syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$" "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$" 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 ef7207a3..00c02a34 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,7 +1,7 @@ " SiSU Vim syntax file " SiSU Maintainer: Ralph Amissah -" SiSU Markup: SiSU (sisu-3.0.8) -" Last Change: 2011-04-23 +" SiSU Markup: SiSU (sisu-3.0.13) +" Last Change: 2011-06-26 " URL: "(originally looked at Ruby Vim by Mirko Nasato) @@ -17,6 +17,7 @@ syn match sisu_error contains=sisu_link,sisu_error_wspace "" " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" + syn match sisu_break contains=@NoSpell " \\\\\( \|$\)" syn match sisu_break contains=@NoSpell "
\|
" syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$" "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$" -- cgit v1.2.3 From 60bd031de5561592c97a40345ea9791d895ee8d0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 14:21:07 -0400 Subject: v3: ansi screen reporting include document language code --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/composite.rb | 2 +- lib/sisu/v3/concordance.rb | 4 +++- lib/sisu/v3/dal.rb | 2 +- lib/sisu/v3/digests.rb | 2 +- lib/sisu/v3/epub.rb | 2 +- lib/sisu/v3/html.rb | 2 +- lib/sisu/v3/manifest.rb | 2 +- lib/sisu/v3/manpage.rb | 11 +++++++---- lib/sisu/v3/odf.rb | 2 +- lib/sisu/v3/plaintext.rb | 2 +- lib/sisu/v3/texinfo.rb | 15 +++++++++------ lib/sisu/v3/texpdf.rb | 4 ++-- lib/sisu/v3/xhtml.rb | 2 +- lib/sisu/v3/xml.rb | 2 +- lib/sisu/v3/xml_dom.rb | 2 +- 16 files changed, 34 insertions(+), 24 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index ca518566..5d32bfc0 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column + * ansi screen reporting include document language code + %% 3.0.12.orig.tar.gz (2011-06-09:23/4) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.12-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.12.orig.tar.gz diff --git a/lib/sisu/v3/composite.rb b/lib/sisu/v3/composite.rb index 674618f9..33c15cc0 100644 --- a/lib/sisu/v3/composite.rb +++ b/lib/sisu/v3/composite.rb @@ -186,7 +186,7 @@ module SiSU_Assemble def insertions? data=@fns_array tuned_file,imagedir=[],[] - SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fns).grey_title_hi unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").grey_title_hi unless @opt.cmd =~/q/ para=data.each do |para| if para =~/^<<\s+(\S+?\.ss[it])$/ \ or para =~/^<<\{(\S+?\.ss[it])\}$/ \ diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb index 91b63778..2c1c9ddf 100644 --- a/lib/sisu/v3/concordance.rb +++ b/lib/sisu/v3/concordance.rb @@ -77,7 +77,9 @@ 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} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}" : @md.fns + tool=(@md.opt.cmd =~/[MVv]/) \ + ? "#{@env.program.web_browser} #{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}" \ + : "[#{@opt.f_pth[:lng_is]}]" @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 diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb index 28e7193d..2475a6ea 100644 --- a/lib/sisu/v3/dal.rb +++ b/lib/sisu/v3/dal.rb @@ -240,7 +240,7 @@ module SiSU_DAL unless @opt.cmd =~/q/ tell=(@opt.cmd=~/[vVM]/) \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') \ - : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',@opt.fns) + : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}") tell.green_title_hi end fn=(@fnx && @fnx =~/\.ss[tmi]$/) \ diff --git a/lib/sisu/v3/digests.rb b/lib/sisu/v3/digests.rb index 8f89bbe3..a4be38e4 100644 --- a/lib/sisu/v3/digests.rb +++ b/lib/sisu/v3/digests.rb @@ -77,7 +77,7 @@ module SiSU_Digest_view unless @opt.cmd =~/q/ tool=(@opt.cmd =~/[MVv]/) \ ? "#{@env.program.text_editor} file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}" \ - : @opt.fns + : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_title_hi diff --git a/lib/sisu/v3/epub.rb b/lib/sisu/v3/epub.rb index 7293c601..2522b68a 100644 --- a/lib/sisu/v3/epub.rb +++ b/lib/sisu/v3/epub.rb @@ -86,7 +86,7 @@ module SiSU_EPUB loc=@env.path.url.output_tell unless @opt.cmd =~/q/ tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.epub_viewer} #{@md.file.output_path.epub.dir}/#{@md.file.base_filename.epub}" - else @opt.fns + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'EPUB',tool).green_hi_blue \ diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb index d77d3df6..744cceca 100644 --- a/lib/sisu/v3/html.rb +++ b/lib/sisu/v3/html.rb @@ -88,7 +88,7 @@ module SiSU_HTML loc=@env.url.output_tell unless @opt.cmd =~/q/ tool=if @opt.cmd =~/[MVvz]/; "#{@env.program.web_browser} file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}" - else @opt.fns + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'HTML',tool).green_hi_blue \ diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index a21b31f9..bed74aab 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -88,7 +88,7 @@ module SiSU_Manifest url_html="file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue \ - : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',@opt.fns).green_title_hi + : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i end data=SiSU_HTML::Source::Html_environment.new(@particulars).tuned_file_instructions diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index 17fef80b..00515e7f 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -84,10 +84,13 @@ module SiSU_Manpage @env=SiSU_Env::Info_env.new(@opt.fns) path=@env.path.output_tell tool=(@opt.cmd =~/[MVv]/) \ - ? "#{@env.program.text_editor} #{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}" \ - : '' - SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue unless @opt.cmd =~/q/ - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/ + ? "#{@env.program.text_editor} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}" \ + : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" + @opt.cmd=~/[MVvz]/ \ + && @opt.cmd !~/q/ \ + ? SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_hi_blue \ + : SiSU_Screen::Ansi.new(@opt.cmd,'Manpage',tool).green_title_hi + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow if @opt.cmd =~/[MV]/ @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet SiSU_Env::Info_skin.new(@md).select #watch diff --git a/lib/sisu/v3/odf.rb b/lib/sisu/v3/odf.rb index a223600e..c42ce349 100644 --- a/lib/sisu/v3/odf.rb +++ b/lib/sisu/v3/odf.rb @@ -85,7 +85,7 @@ module SiSU_ODF unless @opt.cmd =~/q/ tool=(@opt.cmd =~/[MVv]/) \ ? "#{@env.program.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}" \ - : @opt.fns + : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'Opendocument (ODF:ODT)',tool).green_title_hi diff --git a/lib/sisu/v3/plaintext.rb b/lib/sisu/v3/plaintext.rb index 09ecf56c..cd5e2ea3 100644 --- a/lib/sisu/v3/plaintext.rb +++ b/lib/sisu/v3/plaintext.rb @@ -85,7 +85,7 @@ module SiSU_Plaintext path=env.path.output_tell tool=(@opt.cmd =~/[MVv]/) \ ? "#{env.program.text_editor} #{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}" \ - : @opt.fns + : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_hi_blue \ : SiSU_Screen::Ansi.new(@opt.cmd,'Plaintext',tool).green_title_hi diff --git a/lib/sisu/v3/texinfo.rb b/lib/sisu/v3/texinfo.rb index f7693056..7281a7f9 100644 --- a/lib/sisu/v3/texinfo.rb +++ b/lib/sisu/v3/texinfo.rb @@ -96,17 +96,20 @@ module SiSU_TexInfo end def song begin - unless @opt.cmd =~/q/ - tell=SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo') - tell.green_title_hi - end + tool=(@opt.cmd =~/[MVv]/) \ + ? "#{@env.program.texinfo} #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}" \ + : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" + tell=@opt.cmd=~/[MVvz]/ \ + && @opt.cmd !~/q/ \ + ? SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo',tool).green_hi_blue \ + : SiSU_Screen::Ansi.new(@opt.cmd,'TexInfo',tool).green_title_hi + tell @md=SiSU_Param::Parameters.new(@opt).get - puts "\t#{@@cX.grey}TexInfo#{@@cX.off}" directories @marshalfile=SiSU_Env::Info_file.new(@opt.fns).marshal.dal_content if FileTest.file?(@marshalfile)==true File.open(@marshalfile) { |f| @@tuned_file=Marshal.load(f)} - tell.meta_verse_skipped unless @opt.cmd =~/q/ + #tell.meta_verse_skipped if @opt.cmd =~/[vVM]/ else tex_array=IO.readlines(@opt.fns,'') SiSU_Metaverse.songsheet(tex_array) diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb index 918e00a2..c9e0f032 100644 --- a/lib/sisu/v3/texpdf.rb +++ b/lib/sisu/v3/texpdf.rb @@ -103,11 +103,11 @@ module SiSU_TeX def song begin @md=@particulars.md - SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',@md.fns).green_title_hi unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF',"[#{@opt.f_pth[:lng_is]}] #{@opt.fns}").green_title_hi unless @opt.cmd =~/q/ if @opt.cmd =~/[MVv]/ path=@env.url.output_tell SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").flow - SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@opt.fns} #{@env.program.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").flow end @md=@particulars.md $flag=@md.opt.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format diff --git a/lib/sisu/v3/xhtml.rb b/lib/sisu/v3/xhtml.rb index a1b393f2..ba8238d2 100644 --- a/lib/sisu/v3/xhtml.rb +++ b/lib/sisu/v3/xhtml.rb @@ -86,7 +86,7 @@ module SiSU_XHTML tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}#{path}/#{@md.fnb}/#{@md.fn[:xhtml]}" elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}" - else @opt.fns + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XHTML',tool).colorize \ diff --git a/lib/sisu/v3/xml.rb b/lib/sisu/v3/xml.rb index e821cfd4..23cfb5bc 100644 --- a/lib/sisu/v3/xml.rb +++ b/lib/sisu/v3/xml.rb @@ -85,7 +85,7 @@ module SiSU_XML_SAX loc=@env.url.output_tell tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}" - else @opt.fns + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML SAX',tool).colorize \ diff --git a/lib/sisu/v3/xml_dom.rb b/lib/sisu/v3/xml_dom.rb index db6a8786..22b11ebc 100644 --- a/lib/sisu/v3/xml_dom.rb +++ b/lib/sisu/v3/xml_dom.rb @@ -83,7 +83,7 @@ module SiSU_XML_DOM loc=@env.url.output_tell tool=if @opt.cmd =~/[MV]/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}\n\t#{@env.program.xml_viewer} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}" elsif @opt.cmd =~/v/; "#{@env.program.web_browser} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}" - else @opt.fns + else "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}" end @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'invert','XML DOM',tool).colorize \ -- cgit v1.2.3 From 7ef0302aa8c9e810bd9d8de86a2b92a2d9bea0fe Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 14:40:52 -0400 Subject: v2 v3: texpdf, define hardspace & provide backslash * define \hardspace to simplify placing a hardspace * provide backslash character in code block --- data/doc/sisu/CHANGELOG_v2 | 4 ++++ data/doc/sisu/CHANGELOG_v3 | 4 ++++ lib/sisu/v2/texpdf.rb | 4 ++++ lib/sisu/v2/texpdf_format.rb | 5 +++++ lib/sisu/v3/texpdf.rb | 4 ++++ lib/sisu/v3/texpdf_format.rb | 5 +++++ 6 files changed, 26 insertions(+) diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 610d61ba..08ecd407 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -22,6 +22,10 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column + * texpdf + * define \hardspace to simplify placing a hardspace (within a code block) + * provide backslash character in code block + %% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 5d32bfc0..830bdf12 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -30,6 +30,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column + * texpdf + * define \hardspace to simplify placing a hardspace (within a code block) + * provide backslash character in code block + * ansi screen reporting include document language code %% 3.0.12.orig.tar.gz (2011-06-09:23/4) diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb index a1a2813f..6503c931 100644 --- a/lib/sisu/v2/texpdf.rb +++ b/lib/sisu/v2/texpdf.rb @@ -341,6 +341,8 @@ module SiSU_TeX if dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/ dob.tmp=SiSU_TeX_Pdf::Format_text_object.new(@md,dob.tmp).url_str_internal(dob.tmp) end + elsif dob.is =='code' + dob.tmp=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp).special_characters_code elsif dob.is =='break' if dob.obj==Mx[:br_page]; dob.tmp='\newpage' elsif dob.obj==Mx[:br_page_new]; dob.tmp='\clearpage' @@ -573,6 +575,8 @@ module SiSU_TeX \\newcommand{\\Codeblock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1} \\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1} \\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\} +\\newcommand{\\hardspace}{{~}} +%\\newcommand{\\hardspace}{\\hspace{.5em}} % \\sloppy \\begin{document} WOK diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index b2dd0e32..018232ac 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -1162,6 +1162,11 @@ WOK str=xetex_special_characters_2(str,is) unless str.nil? # remove this to start with, causes issues @txt=str end + def special_characters_code + str=@txt + str.gsub!(/ \\\\([ #{Mx[:br_nl]}]+|$)/,' \textbackslash\textbackslash\hardspace\1') + str + end end class Use_TeX attr_accessor :url,:txt,:date diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb index c9e0f032..0f16e991 100644 --- a/lib/sisu/v3/texpdf.rb +++ b/lib/sisu/v3/texpdf.rb @@ -349,6 +349,8 @@ module SiSU_TeX if dob.tmp =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}/ dob.tmp=SiSU_TeX_Pdf::Format_text_object.new(@md,dob.tmp).url_str_internal(dob.tmp) end + elsif dob.is =='code' + dob.tmp=SiSU_TeX_Pdf::Special_characters.new(@md,dob.tmp).special_characters_code elsif dob.is =='break' if dob.obj==Mx[:br_page]; dob.tmp='\newpage' elsif dob.obj==Mx[:br_page_new]; dob.tmp='\clearpage' @@ -582,6 +584,8 @@ module SiSU_TeX \\newcommand{\\Codeblock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1} \\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1} \\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\} +\\newcommand{\\hardspace}{{~}} +%\\newcommand{\\hardspace}{\\hspace{.5em}} % \\sloppy \\begin{document} WOK diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index 8c53b458..f7e63066 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -1164,6 +1164,11 @@ WOK str=xetex_special_characters_2(str,is) unless str.nil? # remove this to start with, causes issues @txt=str end + def special_characters_code + str=@txt + str.gsub!(/ \\\\([ #{Mx[:br_nl]}]+|$)/,' \textbackslash\textbackslash\hardspace\1') + str + end end class Use_TeX attr_accessor :url,:txt,:date -- cgit v1.2.3 From d95f8574ec670222f7236033e7b188c7b5a099ab Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 14:50:18 -0400 Subject: v3: define latex \newcommands for some special characters (for sisu code) * \newcommands for some special characters to simplify dealing with them in sisu code \hardspace \caret \pipe \curlyopen \curlyclose \lt \gt \slash \backslash \underscore \exclaim --- data/doc/sisu/CHANGELOG_v3 | 4 ++- lib/sisu/v3/texpdf.rb | 18 +++++++------ lib/sisu/v3/texpdf_format.rb | 63 ++++++++++++++++---------------------------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 830bdf12..eb21f67e 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -31,7 +31,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * colors, added cursor line & column * texpdf - * define \hardspace to simplify placing a hardspace (within a code block) + * define latex \newcommands for some special characters to simplify + dealing with them in sisu code \hardspace \caret \pipe \curlyopen + \curlyclose \lt \gt \slash \backslash \underscore \exclaim * provide backslash character in code block * ansi screen reporting include document language code diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb index 0f16e991..522480fd 100644 --- a/lib/sisu/v3/texpdf.rb +++ b/lib/sisu/v3/texpdf.rb @@ -462,10 +462,6 @@ module SiSU_TeX dob else 'error' #should never occur end - if dob.tmp =~/<=curly/ #takes care of escaped curly braces, expand - sp_char=SiSU_TeX_Pdf::Special_characters.new(@md,dob) - dob.tmp=sp_char.special_characters_curly(dob.tmp) - end dob=enclose(dob) unless dob.tmp =~/^$/ dob else @@ -533,10 +529,6 @@ module SiSU_TeX dob.tmp.gsub!(/\s*(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,' \newline ') #% tread with care dob.tmp.gsub!(/(\.#{Tex[:tilde]}\S*\s*|<:\S+>|#{Mx[:fa_o]}.*?#{Mx[:fa_c]}|#{Mx[:gr_o]}.*?#{Mx[:gr_c]}||)/,' ') #% tread with care end - if dob.tmp =~/<=curly/ #takes care of escaped curly braces, expand - sp_char=SiSU_TeX_Pdf::Special_characters.new(@md,dob) - dob.tmp=sp_char.special_characters_curly(dob.tmp) - end dob end if dob.tmp =~/(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image\b)/m \ @@ -586,6 +578,16 @@ module SiSU_TeX \\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\} \\newcommand{\\hardspace}{{~}} %\\newcommand{\\hardspace}{\\hspace{.5em}} +\\newcommand{\\caret}{{\\^{~}}} +\\newcommand{\\pipe}{{\\textbar}} +\\newcommand{\\curlyopen}{\{} +\\newcommand{\\curlyclose}{\}} +\\newcommand{\\lt}{{\UseTextSymbol{OML}{<}}} +\\newcommand{\\gt}{{\UseTextSymbol{OML}{>}}} +\\newcommand{\\slash}{{/}} +\\newcommand{\\underscore}{\\_} +\\newcommand{\\exclaim}{\\Verbatim{!}} +% (tilde hash amp affected by http) % \\sloppy \\begin{document} WOK diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index f7e63066..d7942121 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -983,7 +983,7 @@ WOK w.gsub!(/[\\]?~/,'<=tilde>') w.gsub!(/[#{Mx[:br_line]}#{Mx[:br_paragraph]}]/,' \newline ') #watch w.gsub!(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/,'<=tilde>') #126 usual - w.gsub!(/\\?\||#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'<=pipe>') #unless is=='code' #unless w=~/<~\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+>/ # | SiSU not really special sisu character but done, also LaTeX + w.gsub!(/\\?\||#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'\pipe') #unless is=='code' #unless w=~/<~\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+>/ # | SiSU not really special sisu character but done, also LaTeX if w !~/#{Mx[:rel_o]}/ \ and w !~/#{Mx[:gl_o]}#/ w.gsub!(/\#/,'<=hash>') @@ -1000,26 +1000,26 @@ WOK str.gsub!(/#{Mx[:br_eof]}/,'') str.gsub!(/#{Mx[:br_endnotes]}/,'') #problem sequence -> - str.gsub!(/&(?:nbsp);|#{Mx[:nbsp]}/,'<=hardspace>') unless is=='code' # < SiSU special character also LaTeX - str.gsub!(/&(?:lt|#060);/,'<=lt>') # < SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#(?:gt|062)#{Mx[:gl_c]}/,'<=gt>') # > SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'<=curlyopen>') # { SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'<=curlyclose>') # } SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/,'<=tilde>') # ~ SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'\#') # # SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!') # ! SiSU not really special sisu character but done, also LaTeX - str.gsub!(/(^|\s)\*\s/,'\1\asterisk ') # * should you wish to escape astrisk e.g. describing \*{bold}* - str.gsub!(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'\*') # * should you wish to escape astrisk e.g. describing \*{bold}* - str.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-') # - SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#043#{Mx[:gl_c]}/,'+') # + SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#044#{Mx[:gl_c]}/,',') # + SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @txt=~/<:code>/ # / SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'<=slash>') # / SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'<=backslash>') # \ SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'<=underscore>') # _ SiSU special character also LaTeX - str.gsub!(/#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'|') # | SiSU not really special sisu character but done, also LaTeX - str.gsub!(/#{Mx[:gl_o]}#058#{Mx[:gl_c]}/,':') # : SiSU not really special sisu character but done, also LaTeX - str.gsub!(/#{Mx[:gl_o]}#094#{Mx[:gl_c]}|\^/,'<=caret>') # ^ SiSU not really special sisu character but done, also LaTeX + str.gsub!(/&(?:nbsp);|#{Mx[:nbsp]}/,'\hardspace') unless is=='code' # < SiSU special character also LaTeX + str.gsub!(/&(?:lt|#060);/,'\lt') # < SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#(?:gt|062)#{Mx[:gl_c]}/,'\gt') # > SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'\curlyopen') # { SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'\curlyclose') # } SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/,'<=tilde>') # ~ SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'\#') # # SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#033#{Mx[:gl_c]}/,'!') # ! SiSU not really special sisu character but done, also LaTeX + str.gsub!(/(^|\s)\*\s/,'\1\asterisk ') # * should you wish to escape astrisk e.g. describing \*{bold}* + str.gsub!(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'\*') # * should you wish to escape astrisk e.g. describing \*{bold}* + str.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-') # - SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#043#{Mx[:gl_c]}/,'+') # + SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#044#{Mx[:gl_c]}/,',') # + SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @txt=~/<:code>/ # / SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'\slash') # / SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\textbackslash') # \ SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'<=underscore>') # _ SiSU special character also LaTeX + str.gsub!(/#{Mx[:gl_o]}#124#{Mx[:gl_c]}/,'|') # | SiSU not really special sisu character but done, also LaTeX + str.gsub!(/#{Mx[:gl_o]}#058#{Mx[:gl_c]}/,':') # : SiSU not really special sisu character but done, also LaTeX + str.gsub!(/#{Mx[:gl_o]}#094#{Mx[:gl_c]}|\^/,'\caret') # ^ SiSU not really special sisu character but done, also LaTeX ##watch placement, problem sequence ^ str.gsub!(/&atild;<\/font><\/sup>/,' ') str.gsub!(/\\copy(right|mark)?/,'<=copymark>') # ok problem with superscript @@ -1043,8 +1043,6 @@ WOK str.gsub!(/\\~(\[)/,'{$\tilde$}\1') str.gsub!(/(\])\\~/,'\1{$\tilde$}') str.gsub!(/<=tilde>/,'{$\tilde$}') - str.gsub!(/<=pipe>/,'{\textbar}') - str.gsub!(/<=caret>/,'{\^{~}}') str.gsub!(/<=hash>/,'{\#}') else str.gsub!(/ |#{Mx[:nbsp]}/,'~') # ~ character for hardspace @@ -1099,44 +1097,27 @@ WOK def xetex_special_characters_3(str) str.gsub!(/])/,'\1') # clean up, incredibly messy :-( footnote indents, problems if match exists in ordinary paragraphs? check! Work Area 200501 a bit tricky as must be able to match multiple times, and to clean remainder str.gsub!(/([^<][^b][^r]\s+)\/>/,'\1') # clean up, incredibly messy :-( footnote indents, problems if match exists in ordinary paragraphs? check! Work Area 200501 a bit tricky as must be able to match multiple times, and to clean remainder - #problem sequence (another kludge) -> - str.gsub!(/<=lt>/m,'{\UseTextSymbol{OML}{<}}') - str.gsub!(/<=gt>/m,'{\UseTextSymbol{OML}{>}}') - str.gsub!(/<=underscore>/,'\_') while str =~/(https?:\/\/\S+?)(?:<=tilde>\S+)+/ #tilde in urls \href treated differently from text #FIX str.gsub!(/(https?:\/\/\S+?)(?:<=tilde>(\S+))+/,'\1~\2') end str.gsub!(/<=tilde>/,'{$\tilde$}') - str.gsub!(/<=pipe>/,'{\textbar}') - str.gsub!(/<=caret>/,'{\^{~}}') - str.gsub!(/<=exclaim>/,'\Verbatim{!}') str.gsub!(/(https?:\/\/\S+?)(?:(?:<=hash>)(\S+))+/,'\1#\2') #hash in urls \href treated differently from text #FIX str.gsub!(/<=hash>/,'{\#}') - str.gsub!(/<=hardspace>/,'{~}') #changed ... 2005 while str =~/(https?:\/\/\S+?)(?:<=amp>\S+)+/ #amp in urls \href treated differently from text #FIX str.gsub!(/(https?:\/\/\S+?)(?:<=amp>(\S+))+/,'\1&\2') end str.gsub!(/<=amp>/,'{\\\&}') #changed ... 2005 - str.gsub!(/<=slash>/,'{/}') - str.gsub!(/<=backslash>/,'{\textbackslash}') str.gsub!(/<=copymark>\s*(.+)/, '^\copyright \textnormal{\1} \2') # watch likely to be problematic str end - def special_characters_curly(str) - str.gsub!(/<=curlyopen>/,'\{') - str.gsub!(/<=curlyclose>/,'\}') - str - end def special_characters_code_fix(str) - str.gsub!(/<=hardspace>/,'{~}') - str.gsub!(/<=pipe>/,'{\textbar}') str.gsub!(/<=tilde>/,'{$\tilde$}') str end def special_characters_unsafe_1(str) #depreciated, make obsolete # some substitutions are sequence sensitive, rearrange with care. - str.gsub!(/\\backslash (copyright|clearpage|newpage)/,"\\\\\\1") #kludge bad solution, find out where tail is sent through specChar ! + str.gsub!(/\\textbackslash (copyright|clearpage|newpage)/,"\\\\\\1") #kludge bad solution, find out where tail is sent through specChar ! str end def special_characters #special characters - some substitutions are sequence sensitive, rearrange with care. -- cgit v1.2.3 From 3dafcaeb713a8b343c8ba7594fd4e1e4f7b0b52b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:02:38 -0400 Subject: v3: constants, a sisupod & an xml related addition --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/constants.rb | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index eb21f67e..ca39457b 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -36,6 +36,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz \curlyclose \lt \gt \slash \backslash \underscore \exclaim * provide backslash character in code block + * constants, a sisupod & an xml related addition + * ansi screen reporting include document language code %% 3.0.12.orig.tar.gz (2011-06-09:23/4) diff --git a/lib/sisu/v3/constants.rb b/lib/sisu/v3/constants.rb index 5e268f4f..ae2a3b18 100644 --- a/lib/sisu/v3/constants.rb +++ b/lib/sisu/v3/constants.rb @@ -114,9 +114,10 @@ Rx[:mx_fa_clean]= /#{Mx[:fa_o]}.+?#{Mx[:fa_c]}|#{Mx[:pa_o]}.+?#{Mx[:pa_c]}|# Rx[:lv],Rx[:lv_1],Rx[:lv_2],Rx[:lv_3],Rx[:lv_4],Rx[:lv_5],Rx[:lv_6],Rx[:lv_7],Rx[:lv_8],Rx[:lv_9]= /〔([1-9]):(\S*?)〕/,/#{Mx[:lv_o_1]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_2]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_3]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_4]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_5]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_6]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_7]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_8]}(\S*?)#{Mx[:lv_c]}/,/#{Mx[:lv_o_9]}(\S*?)#{Mx[:lv_c]}/ Rx[:meta]=/#{Mx[:meta_o]}(\S+?)#{Mx[:meta_c]}/ -Dx[:url_o]='‹'; Dx[:url_c]='›' +Dx[:url_o]='‹'; Dx[:url_c]='›' Dx[:url_o_xml]='<'; Dx[:url_c_xml]='>' -Dx[:rel_o]='‹'; Dx[:rel_c]='›' # Dx[:rel_o]='「'; Dx[:rel_c]='」' +Dx[:rel_o]='‹'; Dx[:rel_c]='›' # Dx[:rel_o]='「'; Dx[:rel_c]='」' +Dx[:lt_xml]='<'; Dx[:gt_xml]='>' Tex[:backslash]="\\\\" Tex[:backslash]="\\\\" Tex[:tilde]='\\\\\\~' @@ -172,6 +173,7 @@ Db[:col_filesize]=10 Db[:col_info_note]=2500 Gt[:grotto]='sisu:' Gt[:src]='src' +Gt[:pod]='pod' Gt[:po]='po4a/po' Gt[:pot]='po4a/pot' Gt[:image]='mm/image' -- cgit v1.2.3 From 561b3d6e0c2d6b2275ff6db36911b26aa11a62e8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:05:20 -0400 Subject: v3: plaintext, codeblock keep backslashes --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/plaintext.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index ca39457b..fd2fd32e 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -36,6 +36,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz \curlyclose \lt \gt \slash \backslash \underscore \exclaim * provide backslash character in code block + * plaintext, codeblock keep backslashes + * constants, a sisupod & an xml related addition * ansi screen reporting include document language code diff --git a/lib/sisu/v3/plaintext.rb b/lib/sisu/v3/plaintext.rb index cd5e2ea3..b7ad1680 100644 --- a/lib/sisu/v3/plaintext.rb +++ b/lib/sisu/v3/plaintext.rb @@ -316,6 +316,7 @@ WOK dob.obj.gsub!(/#{Mx[:gl_o]}#125#{Mx[:gl_c]}/,'}') dob.obj.gsub!(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~') dob.obj.gsub!(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©') + dob.obj.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\\') end if dob.of=='block' # watch dob.obj.gsub!(/#{Mx[:gl_o]}●#{Mx[:gl_c]}/,"* ") -- cgit v1.2.3 From b975bd03d29ea9046021ebedc07301ce7d8c7550 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:14:45 -0400 Subject: v3: html_tune, reduce loops; deal with angle-brackets * deal with angle brackets in markup (test, could cause breakage) * reduce loops in code --- data/doc/sisu/CHANGELOG_v3 | 5 ++ lib/sisu/v3/html_tune.rb | 179 ++++++++++++++++++++++++--------------------- 2 files changed, 99 insertions(+), 85 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index fd2fd32e..4f2f4713 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -38,6 +38,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * plaintext, codeblock keep backslashes + * html_tune revision + * deal with angle brackets in markup (test, could cause breakage) + * reduce loops + + * constants, a sisupod & an xml related addition * ansi screen reporting include document language code diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v3/html_tune.rb index 26072704..c97183f1 100644 --- a/lib/sisu/v3/html_tune.rb +++ b/lib/sisu/v3/html_tune.rb @@ -82,7 +82,12 @@ module SiSU_HTML_Tune def hard_output @filename_tune=@file.write_file_processing.html_tune data=[] - @data.each {|x| x.obj.strip; data << x if not x.obj.empty?} #1.9 array? + @data.each do |x| + unless x.obj.empty? + x.obj.strip! + data << x + end + end data.each do |dob| @filename_tune.puts dob, "\n" end @@ -204,48 +209,28 @@ module SiSU_HTML_Tune begin @cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/ - data=Tune.new(@data,@md).endnotes_html - data=Tune.new(data,@md).url_markup - data=Tune.new(data,@md).markup + songsheet_array(@data) + #data=songsheet_array(@data) if @md.opt.cmd =~/M/ #Hard Output Tune Optional on/off here - data=Output.new(data,@md).hard_output - Output.new(data,@md).marshal + data=Output.new(@data,@md).hard_output + Output.new(@data,@md).marshal end tuned=Tune.new(@data,@md).output rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error ensure end end - def para_numbers - data=@data - @tuned_file=[] + def songsheet_array(data) + data_tuned=[] + #@tuned_file=[] data.each do |dob| - dob.gsub!(/#{Mx[:lv_o]}\d:(\S?)#{Mx[:lv_c]}/,'\0#\1. ') #fix Mx[:lv_o] - @tuned_file << dob - end - end - def markup - @tuned_file=[] - @data.each do |dob| - dob.obj.gsub!(/#{Mx[:mk_o]}#([a-zA-Z]+)#{Mx[:mk_c]}/,'&\1;') - dob.obj.gsub!(/#{Mx[:mk_o]}(#[0-9]+)#{Mx[:mk_c]}/,'&\1;') - dob.obj.gsub!(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'
') unless dob.is=='table' - dob.obj.gsub!(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'\1') - dob.obj.gsub!(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'\1') # tt, kbd - dob.obj.gsub!(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'') - dob.obj.gsub!(/^#{Mx[:gl_bullet]}/m,'●  ') - dob.obj.gsub!(/#{Mx[:nbsp]}/,' ') - dob.obj.gsub!(/<(p|br)>/,'<\1 />') - dob=SiSU_HTML_Tune::Clean_html.new(dob).clean - @tuned_file << dob + dob=angle_brackets(dob) + dob=endnotes_html(dob) + dob=url_markup(dob) + dob=markup(dob) + data_tuned << dob end + data_tuned end def urls(data) @words=[] @@ -297,67 +282,91 @@ module SiSU_HTML_Tune end @words=@words.join(' ') end - def url_markup - data=@data - @tuned_file=[] - data.each do |dob| - unless dob.is=='code' - if dob.obj =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)/ - @word_mode=dob.obj.scan(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)[()\[\]]*[,.;:!?'"]{0,2}|(?:#{Mx[:gl_o]}\S+?#{Mx[:gl_c]})+|[^#{Mx[:lnk_o]}#{Mx[:lnk_c]}]+/mu) - words=urls(@word_mode) - dob.obj.gsub!(/.+/m,words) - end #consider change, do a while loop - dob.obj.gsub!(/\\copyright/i,%{©}) - if (dob.obj !~/\<:ad\s+\.\.\//) - dob.obj.gsub!(/\<:ad\s+(\S+)?\s+(\S+\.png)\s+(.+)?\;\s+(.+)?\;\s*!\>/, - %{\n
\\3
\n}) - else - dob.obj.gsub!(/\<:ad\s+(\S+)?\s+(\S+\.png)\s+(.+)?\;\s+(.+)?\;\s*\>/, - %{\n
\\3
\n}) - end - dob.obj.gsub!(/!pick/,%{stellar}) - dob.obj.gsub!(/!new/,%{ new}) - dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') - dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') - dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration - dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) - dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration - if dob.obj =~/#{Xx[:html_relative2]}\/\S+/ \ - and dob.obj !~/(\"#{Xx[:html_relative2]}\/\S+?\"|>\s*#{Xx[:html_relative2]}\/\S+<)/ - dob.obj.gsub!(/(#{Xx[:html_relative2]}\/\S+)/,'\1') - end - if dob.obj =~/..\/\S+/ \ - and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/ - dob.obj.gsub!(/\.\.(\/\S+)/,%{\1}) - end - dob.obj.gsub!(/©}) + if (dob.obj !~/\<:ad\s+\.\.\//) + dob.obj.gsub!(/\<:ad\s+(\S+)?\s+(\S+\.png)\s+(.+)?\;\s+(.+)?\;\s*!\>/, + %{\n
\\3
\n}) else - dob.obj.gsub!(/(^|[^}])_/m,'\1>') #code-block: angle brackets special characters - dob.obj.gsub!(/(^|[^}])_/m,'\1>') + dob.obj.gsub!(/\<:ad\s+(\S+)?\s+(\S+\.png)\s+(.+)?\;\s+(.+)?\;\s*\>/, + %{\n
\\3
\n}) end - @tuned_file << dob + dob.obj.gsub!(/!pick/,%{stellar}) + dob.obj.gsub!(/!new/,%{ new}) + dob.obj.gsub!(/<:h(.{1,7}?)>/,'\1') + dob.obj.gsub!(/<:to(\d{1,7}?)>/,'to { \1 } ') + dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1') #http ftp matches escaped, no decoration + dob.obj.gsub!(/#{Mx[:url_o]}([a-zA-Z0-9._-]+\@\S+?\.[a-zA-Z0-9._-]+)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) + dob.obj.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@brace_url.xml_open}\\1#{@brace_url.xml_close}}) #http ftp matches with decoration + if dob.obj =~/#{Xx[:html_relative2]}\/\S+/ \ + and dob.obj !~/(\"#{Xx[:html_relative2]}\/\S+?\"|>\s*#{Xx[:html_relative2]}\/\S+<)/ + dob.obj.gsub!(/(#{Xx[:html_relative2]}\/\S+)/,'\1') + end + if dob.obj =~/..\/\S+/ \ + and dob.obj !~/(\"..\/\S+?\"|>\s*..\/\S+<)/ + dob.obj.gsub!(/\.\.(\/\S+)/,%{\1}) + end + dob.obj.gsub!(//m,'\1>') #code-block: angle brackets special characters + dob.obj.gsub!(/(^|[^}])_/m,'\1>') end + dob end - def endnotes_html + def para_numbers data=@data @tuned_file=[] data.each do |dob| - unless dob.is =~/^code/ - dob.obj.gsub!(/(#{Mx[:en_a_o]}|#{Mx[:en_b_o]})(\d+)\s+(.+?)(#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/, - '  \2  ' + #note- endnote- - '\1\2  \2. \3 \4') #endnote- note- (careful may have switched) - dob.obj.gsub!(/(#{Mx[:en_b_o]})([*+]\d+)\s+(.+?)(#{Mx[:en_b_c]})/, - '  \2  ' + #note- endnote- - '\1\2  \2. \3 \4') #endnote- note- (careful may have switched) - dob.obj.gsub!(/(#{Mx[:en_a_o]})([*+]+)\s+(.+?)(#{Mx[:en_a_c]})/, - '  \2  ' + #note- endnote- - '\1\2  \2 \3 \4') #endnote- note- (careful may have switched) - end + dob.gsub!(/#{Mx[:lv_o]}\d:(\S?)#{Mx[:lv_c]}/,'\0#\1. ') #fix Mx[:lv_o] @tuned_file << dob end end + def angle_brackets(dob) + dob.obj.gsub!(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}") + dob + end + def endnotes_html(dob) + unless dob.is =~/^code/ + dob.obj.gsub!(/(#{Mx[:en_a_o]}|#{Mx[:en_b_o]})(\d+)\s+(.+?)(#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/, + '  \2  ' + #note- endnote- + '\1\2  \2. \3 \4') #endnote- note- (careful may have switched) + dob.obj.gsub!(/(#{Mx[:en_b_o]})([*+]\d+)\s+(.+?)(#{Mx[:en_b_c]})/, + '  \2  ' + #note- endnote- + '\1\2  \2. \3 \4') #endnote- note- (careful may have switched) + dob.obj.gsub!(/(#{Mx[:en_a_o]})([*+]+)\s+(.+?)(#{Mx[:en_a_c]})/, + '  \2  ' + #note- endnote- + '\1\2  \2 \3 \4') #endnote- note- (careful may have switched) + end + dob + end + def markup(dob) + dob.obj.gsub!(/#{Mx[:mk_o]}#([a-zA-Z]+)#{Mx[:mk_c]}/,'&\1;') + dob.obj.gsub!(/#{Mx[:mk_o]}(#[0-9]+)#{Mx[:mk_c]}/,'&\1;') + dob.obj.gsub!(/#{Mx[:br_line]}|#{Mx[:br_nl]}/,'
') unless dob.is=='table' + dob.obj.gsub!(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'\1') + dob.obj.gsub!(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'\1') # tt, kbd + dob.obj.gsub!(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'') + dob.obj.gsub!(/^#{Mx[:gl_bullet]}/m,'●  ') + dob.obj.gsub!(/#{Mx[:nbsp]}/,' ') + dob.obj.gsub!(/<(p|br)>/,'<\1 />') + dob=SiSU_HTML_Tune::Clean_html.new(dob).clean + dob + end def output data=@data @tuned_file=[] -- cgit v1.2.3 From def544be45f5961df774b517542934b92141fc66 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:24:48 -0400 Subject: v3: manpage (sysenv), move output; line-breaks within object * start to honor line-breaks within objects (revisit) * show double escape \\ (backslashes) in code blocks * place under web server directory * sysenv, accommodate manpage changes --- data/doc/sisu/CHANGELOG_v3 | 7 +++++++ lib/sisu/v3/manpage.rb | 31 +++++++++++++++++-------------- lib/sisu/v3/sysenv.rb | 23 +++++++++++++---------- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 4f2f4713..3aef8703 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -42,6 +42,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * deal with angle brackets in markup (test, could cause breakage) * reduce loops + * manpage + * start to honor line-breaks within objects (revisit) + * show double escape \\ (backslashes) in code blocks + * place under web server directory + + * sysenv, accomodate + * manpage * constants, a sisupod & an xml related addition diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb index 00515e7f..0a2c2fcc 100644 --- a/lib/sisu/v3/manpage.rb +++ b/lib/sisu/v3/manpage.rb @@ -266,14 +266,14 @@ WOK dob.obj.gsub!(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'--\1--') dob.obj.gsub!(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'"\1"') dob.obj.gsub!(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'\1') - dob.obj.gsub!(/\A\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}#{Mx[:br_line]}/m,"#{Mx[:br_line]}.I \\1#{Mx[:br_line]}") - dob.obj.gsub!(/\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/m,"#{Mx[:br_line]}.I \\1#{Mx[:br_line]}") - dob.obj.gsub!(/\A\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}#{Mx[:br_line]}/m,"#{Mx[:br_line]}.BI \\1#{Mx[:br_line]}") - dob.obj.gsub!(/\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,"#{Mx[:br_line]}.B \\1#{Mx[:br_line]}") - dob.obj.gsub!(/\s*#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,"#{Mx[:br_line]}.I \\1#{Mx[:br_line]}") + dob.obj.gsub!(/\A\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}#{Mx[:br_line]}([,.:!?](?: |$))?/m,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}") + dob.obj.gsub!(/\s*#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}([,.:!?](?: |$))?/m,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}") + dob.obj.gsub!(/\A\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?#{Mx[:br_line]}/m,"#{Mx[:br_line]}.BI \\1\\2#{Mx[:br_line]}") + dob.obj.gsub!(/\s*#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}([,.:!?](?: |$))?/,"#{Mx[:br_line]}.B \\1\\2#{Mx[:br_line]}") + dob.obj.gsub!(/\s*#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}([,.:!?](?: |$))?/,"#{Mx[:br_line]}.I \\1\\2#{Mx[:br_line]}") unless dob.is=='code' - dob.obj.gsub!(/(?:^|\s)#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,"\\1 #{@brace_url.txt_open}\\2#{@brace_url.txt_close}") - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,"\\1#{@brace_url.txt_open}\\2#{@brace_url.txt_close}") + dob.obj.gsub!(/(?:^|\s)#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,"\\1 #{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3") + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}([,.:!?](?: |$))?/,"\\1#{@brace_url.txt_open}\\2#{@brace_url.txt_close}\\3") @manpage[:endnotes]=extract_endnotes(dob.obj) dob.obj.gsub!(/#{Mx[:en_a_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_a_c]}/m,'[^\1]') # endnote marker marked up dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s*(?:.+?)#{Mx[:en_b_c]}/m,'[^\1]') # endnote marker marked up @@ -282,6 +282,7 @@ WOK dob.obj.gsub!(/#{Mx[:gl_o]}#035#{Mx[:gl_c]}/,'#') dob.obj.gsub!(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*') dob.obj.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-') + dob.obj.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\e') dob.obj.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/') dob.obj.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_') dob.obj.gsub!(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{') @@ -289,6 +290,7 @@ WOK dob.obj.gsub!(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~') dob.obj.gsub!(/#{Mx[:gl_o]}#169#{Mx[:gl_c]}/,'©') else + dob.obj.gsub!(/\\/,'\e') dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") # watch #dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n") # watch end @@ -304,10 +306,9 @@ WOK dob.obj.gsub!(/(^|[^}])_([<>])/m,'\1\2') # _<_< dob.obj.gsub!(/\A(.+)?\Z/m,".nf\n\n\\1\n\n.fi") end - else - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") #unless para =~/#{Mx[:lv_o]}\d:/ #watch introduces a bug end - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/,"\n\n.br\n\n") # watch + #dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n.br\n") # watch + dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})+\s*/m,"\n\n") # watch blit=dob.obj.scan(/\[[^\]]+\]|[^\[]+/) blit_array=[] blit.each do |x| @@ -319,7 +320,7 @@ WOK end dob.obj=blit_array.join dob.obj.gsub!(/#{Mx[:gl_o]}:name#\S+?#{Mx[:gl_c]}/mi,'') #added - dob.obj.gsub!(/\s\\\s+(#{Mx[:br_line]}|#{Mx[:br_nl]})/,'\1') #a messy solution + #dob.obj.gsub!(/\s\\\s+(#{Mx[:br_line]}|#{Mx[:br_nl]})/,'\1') #a messy solution dob.obj.gsub!(/#{Mx[:br_page]}\s*|#{Mx[:br_page_new]}/,'') # remove page breaks dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,'\1\2') dob.obj.gsub!(/(.+?)<\/a>/m,'\1') @@ -358,12 +359,14 @@ WOK end if dob.obj dob.obj.gsub!(/\s(\[)/m,' \ \1') - dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})/,"\n\n") + dob.obj.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") # watch dob.obj.gsub!(/#{Mx[:gl_o]}#126#{Mx[:gl_c]}/,'~') dob.obj.gsub!(/#{Mx[:gl_o]}#123#{Mx[:gl_c]}/,'{') dob.obj.gsub!(/#{Mx[:pa_o]}\S+#{Mx[:pa_c]}/,' ') - dob.obj.gsub!(//,' ') - dob.obj.gsub!(/<:\S+>/,' ') + unless dob.is =='code' + dob.obj.gsub!(//,' ') + dob.obj.gsub!(/<:\S+>/,' ') + end end dob end diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index d0c88deb..5134b6c2 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -3457,6 +3457,15 @@ WOK end self end + def manpage + def dir + output_path.manpage.dir + '/' + base_filename.manpage + end + def rel + output_path.manpage.rel + '/' + base_filename.manpage + end + self + end def manifest def dir output_path.manifest.dir + '/' + base_filename.manifest @@ -3614,11 +3623,11 @@ WOK pdf_l + @md.fn[:pdf_l_legal] end def manpage - ft='.1' + ft='1' if @env.output_dir_structure.by_language_code? - @md.fnb + ft + @md.fnb + '.' + ft else - @md.fnb + @md.lang_code_insert + ft + @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft end end def hash_digest @@ -4224,13 +4233,7 @@ WOK set_path(ft).rcp.ab end def rel_sm - if @env.output_dir_structure.by_language_code? - '' - elsif @env.output_dir_structure.by_filetype? - '' - else - '' - end + set_path(ft).rel_sm.ab end self end -- cgit v1.2.3 From 408bf6b65fcbdecd8cbcc810e1fe9f7be95da5a1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:44:15 -0400 Subject: v3: info (texinfo) (sysenv), move output; line-breaks within object * backslashes & line-breaks * place under web server directory * info tool setting prompt * sysenv, accommodate info page changes --- data/doc/sisu/CHANGELOG_v3 | 6 ++++++ lib/sisu/v3/sysenv.rb | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/sisu/v3/texinfo.rb | 5 +++++ lib/sisu/v3/texinfo_format.rb | 3 ++- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 3aef8703..23f078c6 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -47,8 +47,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * show double escape \\ (backslashes) in code blocks * place under web server directory + * texinfo + * backslashes & line-breaks + * place under web server directory + * info tool setting prompt + * sysenv, accomodate * manpage + * info (texinfo) * constants, a sisupod & an xml related addition diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 5134b6c2..e89d77c5 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2286,6 +2286,12 @@ WOK ? @rc['program_select']['man'] \ : 'nroff -man' #'nroff -man' #'groff -man -Tascii' end + def texinfo + ((defined? @rc['program_select']['info_viewer']) \ + && @rc['program_select']['info_viewer'] =~/\S\S+/) \ + ? @rc['program_select']['info_viewer'] \ + : 'pinfo -f' #'pinfo -f' 'info' 'tkinfo' + end def file_encoding is=(defined? @rc['program_set']['file_encoding']) ? @rc['program_set']['encoding'] : '' (is.nil? || is==true) ? 'encoding' : is @@ -3262,6 +3268,12 @@ WOK fn=base_filename.manpage file=make_file(path,fn) end + def texinfo + path=output_path.texinfo.dir + make_path(path) + fn=base_filename.texinfo + file=make_file(path,fn) + end def hash_digest path=output_path.hash_digest.dir make_path(path) @@ -3466,6 +3478,15 @@ WOK end self end + def texinfo + def dir + output_path.texinfo.dir + '/' + base_filename.texinfo + end + def rel + output_path.texinfo.rel + '/' + base_filename.texinfo + end + self + end def manifest def dir output_path.manifest.dir + '/' + base_filename.manifest @@ -3630,6 +3651,14 @@ WOK @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft end end + def texinfo + ft='info' + if @env.output_dir_structure.by_language_code? + @md.fnb + '.' + ft + else + @md.fnb + '.' + @md.opt.f_pth[:lng_is] + '.' + ft + end + end def hash_digest ft='.txt' if @env.output_dir_structure.by_language_code? @@ -4237,6 +4266,27 @@ WOK end self end + def texinfo + def ft + 'texinfo' + end + def dir + set_path(ft).dir.ab + end + def url + set_path(ft).url.ab + end + def rel + set_path(ft).rel.ab + end + def rcp + set_path(ft).rcp.ab + end + def rel_sm + set_path(ft).rel_sm.ab + end + self + end def sitemaps def ft 'sitemaps' diff --git a/lib/sisu/v3/texinfo.rb b/lib/sisu/v3/texinfo.rb index 7281a7f9..f1e3d5a2 100644 --- a/lib/sisu/v3/texinfo.rb +++ b/lib/sisu/v3/texinfo.rb @@ -77,6 +77,7 @@ module SiSU_TexInfo include SiSU_TexInfo def initialize(opt) @opt=opt + @md=SiSU_Param::Parameters.new(@opt).get @env=SiSU_Env::Info_env.new(@opt.fns) @vz=SiSU_Env::Get_init.instance.skin end @@ -367,6 +368,10 @@ module SiSU_TexInfo puts filename if @md.opt.cmd =~/M/ data.each {|s| (filename_texinfo.puts s,"\n") if s} filename_texinfo.close + file_info_src=%{#{@env.processing_path.texi}/#{@md.fnb}.info} + file_info="#{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}" + SiSU_Env::SiSU_file.new(@md).mkdir + system("cp #{file_info_src} #{file_info}") end def makeinfo if @md.fns =~/\.(?:-|ssm\.)?sst$/ diff --git a/lib/sisu/v3/texinfo_format.rb b/lib/sisu/v3/texinfo_format.rb index b9fb3256..cd98754a 100644 --- a/lib/sisu/v3/texinfo_format.rb +++ b/lib/sisu/v3/texinfo_format.rb @@ -376,7 +376,8 @@ WOK txt.gsub!(/#{Mx[:gl_o]}#042#{Mx[:gl_c]}/,'*') txt.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'/') txt.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'_') - txt.gsub!(/#{Mx[:br_nl]}+/,"\n") + txt.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'\\') + txt.gsub!(/(?:#{Mx[:br_line]}|#{Mx[:br_nl]})\s*/,"\n\n") # watch txt.gsub!(/&atild;<\/font><\/sup>/,' ') #txt.gsub!(/\\/,'\\backslash ') txt.gsub!(/<:pb>/,'\\newpage') -- cgit v1.2.3 From f6f89c95513d33f60cdfaedce19c4de3f45dd387 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 15:59:13 -0400 Subject: v3: sysenv, fix some output paths (markup source); accommodate manpage * shared source markup (.sst .ssm & sisupod.zip) fix some paths * placement of markup source, output_path.src.dir, fix * output_path.src.url, fix * manifest info * (epub viewer cosmetic rearrangement) --- data/doc/sisu/CHANGELOG_v3 | 5 ++++ lib/sisu/v3/sysenv.rb | 61 +++++++++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 23f078c6..f02f7bac 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -53,8 +53,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * info tool setting prompt * sysenv, accomodate + * manifest * manpage * info (texinfo) + * sisupod + * shared source markup (.sst .ssm & sisupod.zip) fix some paths + * placement of markup source, output_path.src.dir, fix + * output_path.src.url, fix * constants, a sisupod & an xml related addition diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index e89d77c5..d709cd52 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -2253,14 +2253,10 @@ WOK web_browser end def epub_viewer - if defined? @rc['program_select']['epub_viewer'] \ - and @rc['program_select']['epub_viewer'] =~/\S\S+/ - @rc['program_select']['epub_viewer'] - 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' - end + ((defined? @rc['program_select']['epub_viewer']) \ + && @rc['program_select']['epub_viewer'] =~/\S\S+/) \ + ? @rc['program_select']['epub_viewer'] \ + : 'ebook-viewer' #'calibre' 'fbreader' end def xml_viewer ((defined? @rc['program_select']['xml_viewer']) \ @@ -3730,9 +3726,9 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{output_path.base.url}/#{@ft}/#{@md.opt.lng}" + "#{output_path.base.dir}/#{@ft}/#{@md.opt.lng}" else - "#{output_path.base.url}/#{@ft}" + "#{output_path.base.dir}/#{@ft}" end end self @@ -3756,9 +3752,9 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{output_path.base.dir}/#{@ft}/#{@md.opt.lng}" + "#{output_path.base.url}/#{@ft}/#{@md.opt.lng}" else - "#{output_path.base.dir}/#{@ft}" + "#{output_path.base.url}/#{@ft}" end end self @@ -3782,7 +3778,7 @@ WOK end def ab_src if @env.output_dir_structure.by_language_code? - "#{@ft}/#{@md.opt.lng}" + "../../#{@ft}/#{@md.opt.lng}" else "#{@ft}" end @@ -3866,24 +3862,6 @@ WOK end self end - def sisupod - def dir - "#{output_path.base.dir}/pod" - end - def url - "#{output_path.base.url}/pod" - end - def rel - "#{output_path.base.rel}/pod" - end - def rcp - "#{output_path.base.rcp}/pod" - end - def rel_sm - #"#{output_path.base.rel}/pod" - end - self - end def sisugit def dir "#{output_path.base.dir}/git" @@ -3933,6 +3911,27 @@ WOK end self end + def sisupod + def ft + Gt[:src] + '/' + Gt[:pod] + end + def dir + set_path(ft).dir.ab_src + end + def url + set_path(ft).url.ab_src + end + def rel + set_path(ft).rel.ab_src + end + def rcp + set_path(ft).rcp.ab_src + end + def rel_sm + #"#{output_path.base.rel}/pod" + end + self + end def po def dir "#{output_path.base.dir}/po4a/#{@md.fnb}/po/#{@md.opt.lng}" -- cgit v1.2.3 From b232545a79348473d23bc84df838876edea5ecbb Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 16:15:27 -0400 Subject: v3: manifest, manifest enable additional output & source (if shared) * manpage (in fututure have config setting with default false/off) * info (texinfo) (in fututure have config setting with default false/off) * hash digests * locate markup source (if shared) * sisupod (if shared) --- data/doc/sisu/CHANGELOG_v3 | 11 +++++++++++ lib/sisu/v3/manifest.rb | 36 ++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index f02f7bac..16ac3c0e 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -25,6 +25,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz [thanks to Jonas Stein for making me look at this, see bug: #617298,
was not documented because there has been no intention to keep it, but there was no markup replacement until now] + * ok for plaintext, html, xhtml, xml, epub, pdf, manpage + * not properly honored in paragraph objects for odt [todo fix, but issue] * vim * sisu syntax highlighting, linebreak \\ added (
kept) @@ -52,6 +54,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * place under web server directory * info tool setting prompt + * shared source markup (.sst .ssm & sisupod.zip) + + * manifest enable + * manpage (in fututure have config setting with default false/off) + * info (texinfo) (in fututure have config setting with default false/off) + * hash digests + * locate markup source + * sisupod + * sysenv, accomodate * manifest * manpage diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index bed74aab..06745c35 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -143,8 +143,7 @@ module SiSU_Manifest size=(File.size("#{pth}/#{file}")/1024.00).to_s kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1] @manifest[:txt] << "#{file} #{id} #{kb}\n" - @manifest[:html] << %{

#{id}

#{file}   #{dgst[1]}
#{@brace_url.xml_open}#{url}/#{file}#{@brace_url.xml_close}

#{kb}

- \n} if kb and kb =~/\d+/ + @manifest[:html] << %{

#{id}

#{file}   #{dgst[1]}
#{@brace_url.xml_open}#{url}/#{file}#{@brace_url.xml_close}

#{kb}

\n} if kb and kb =~/\d+/ end def published_manifests? @f=SiSU_Env::SiSU_file.new(@md) #.base_filename @@ -384,11 +383,25 @@ module SiSU_Manifest pth,rel,url='','','' summarize(id,file,pth,rel,url) end - if FileTest.file?("#{@base_path}/#{@md.fn[:digest]}")==true - id,file="Digest/DCC - Document Content Certificate (#{@dg})",@md.fn[:digest] - pth=@base_path - rel,url='','' - #pth='' + if FileTest.file?(@f.place_file.manpage.dir)==true + pth=@f.output_path.manpage.dir + rel=@f.output_path.manpage.rel_sm + url=@f.output_path.manpage.url + id,file='Manpage',@f.base_filename.manpage + summarize(id,file,pth,rel,url) + end + if FileTest.file?(@f.place_file.texinfo.dir)==true + pth=@f.output_path.texinfo.dir + rel=@f.output_path.texinfo.rel_sm + url=@f.output_path.texinfo.url + id,file='Texinfo',@f.base_filename.texinfo + summarize(id,file,pth,rel,url) + end + if FileTest.file?(@f.place_file.hash_digest.dir)==true + pth=@f.output_path.hash_digest.dir + rel=@f.output_path.hash_digest.rel_sm + url=@f.output_path.hash_digest.url + id,file="Digest/DCC - Document Content Certificate (#{@dg})",@f.base_filename.hash_digest summarize(id,file,pth,rel,url) end end @@ -407,7 +420,8 @@ module SiSU_Manifest req=@md.fns if FileTest.file?(@f.place_file.src.dir)==true pth=@f.output_path.src.dir - rel=@f.output_path.src.rel_sm + rel=@f.output_path.src.rel + #rel=@f.output_path.src.rel_sm url=@f.output_path.src.url id,file='Markup Composite File (SiSU source)',@f.base_filename.src summarize_sources(id,file,pth,rel,url) @@ -415,7 +429,8 @@ module SiSU_Manifest else if FileTest.file?(@f.place_file.src.dir)==true pth=@f.output_path.src.dir - rel=@f.output_path.src.rel_sm + rel=@f.output_path.src.rel + #rel=@f.output_path.src.rel_sm url=@f.output_path.src.url id,file='Markup (SiSU source)',@f.base_filename.src summarize_sources(id,file,pth,rel,url) @@ -423,7 +438,8 @@ module SiSU_Manifest end if FileTest.file?(@f.place_file.sisupod.dir)==true pth=@f.output_path.sisupod.dir - rel=@f.output_path.sisupod.rel_sm + rel=@f.output_path.sisupod.rel + #rel=@f.output_path.sisupod.rel_sm url=@f.output_path.sisupod.url id,file='SiSU doc (zip)',@f.base_filename.sisupod summarize_sources(id,file,pth,rel,url) -- cgit v1.2.3 From ae914fdb570299f6d8209ddee66b4b579b938b63 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 20:12:18 -0400 Subject: v3: urls (ansi screen reporting), add document language code --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/urls.rb | 48 +++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 16ac3c0e..67708e7c 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -63,6 +63,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * locate markup source * sisupod + * urls (ansi screen reporting), add document language code + * sysenv, accomodate * manifest * manpage diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index ee81786c..2e73a91f 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -131,57 +131,57 @@ module SiSU_urls def show def source def src(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@md.file.output_path.src.dir}/#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.text_editor} #{@md.file.output_path.src.dir}/#{y}").result end def pod(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/pod/#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} #{@env.url.output_tell}/pod/#{y}").result end self end def generic(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/#{@fnb}/#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} #{@env.url.output_tell}/#{@fnb}/#{y}").result end def meta(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} ~#{y}/#{@fnb}.#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.text_editor} ~#{y}/#{@fnb}.#{y}").result end def text(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.txt.dir}/#{@md.file.base_filename.txt}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.txt.dir}/#{@md.file.base_filename.txt}").result end def epub(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.epub_viewer} #{@md.file.output_path.epub.dir}/#{@md.file.base_filename.epub}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.epub_viewer} #{@md.file.output_path.epub.dir}/#{@md.file.base_filename.epub}").result end def html def scroll(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_scroll}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_scroll.dir}/#{@md.file.base_filename.html_scroll}").result end def toc(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}").result end def concordance(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.html_concordance.dir}/#{@md.file.base_filename.html_concordance}").result end def manifest(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").result end self end def odt(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.odf_viewer} file://#{@md.file.output_path.odt.dir}/#{@md.file.base_filename.odt}").result end def pdf def portrait(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_p}pdf").result end def landscape(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.pdf_viewer} #{@md.file.output_path.pdf.dir}/#{@md.file.base_filename.pdf_l}pdf").result end self end def manpage(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.manpage_viewer} #{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").result end def pinfo(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","cd #{@env.processing_path.texinfo}; pinfo ./#{@fnb}.#{y}; cd -").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","pinfo -f #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}").result end def po4a def po(x,y) @@ -193,29 +193,29 @@ module SiSU_urls self end def xhtml(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xhtml.dir}/#{@md.file.base_filename.xhtml}").result end def xml def sax(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_sax.dir}/#{@md.file.base_filename.xml_sax}").result end def dom(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.xml_dom.dir}/#{@md.file.base_filename.xml_dom}").result end def sitemap(x) #BROKEN - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.sitemaps.dir}/#{@md.file.base_filename.sitemap}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.sitemaps.dir}/#{@md.file.base_filename.sitemap}").result end self end def hash_digest(x) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x}","#{@prog.web_browser} file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").result end def db def psql(x,y) - SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{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.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db", "#{y}").result + SiSU_Screen::Ansi.new(@opt.cmd,"[#{@opt.f_pth[:lng_is]}] -#{x} DBI sqlite","sqlite3 #{@env.path.webserv}/#{@md.opt.f_pth[:pth_stub]}/sisu_sqlite.db", "#{y}").result end self end @@ -272,7 +272,7 @@ module SiSU_urls end def urls_select unless @opt.cmd =~/q/ - i="(output manifest) #{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}" + i="(output manifest) [#{@opt.f_pth[:lng_is]}] #{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi \ : SiSU_Screen::Ansi.new(@opt.cmd,'URL',i).green_hi_blue @@ -383,7 +383,7 @@ module SiSU_urls end end def urls_all - i="(output manifest) #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html" + i="(output manifest) [#{@opt.f_pth[:lng_is]}] #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html" SiSU_Screen::Ansi.new(@opt.cmd,'URLs',i).grey_title_hi @u.each do |x,y| tell=case x -- cgit v1.2.3 From c55233314a98e319ecc6c42309fb39fbd4c275bf Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 20:41:41 -0400 Subject: v2 v3: sisurc.yml, config settings --- conf/sisu/v2/sisurc.yml | 63 ++++---- conf/sisu/v3/sisurc.yml | 78 +++++----- data/doc/sisu/CHANGELOG_v2 | 2 + data/doc/sisu/CHANGELOG_v3 | 2 + .../markup-samples/sisu_manual/_sisu/sisurc.yml | 172 --------------------- .../markup-samples/sisu_manual/_sisu/v2/sisurc.yml | 132 ++++++++++++++++ .../markup-samples/sisu_manual/_sisu/v3/sisurc.yml | 137 ++++++++++++++++ 7 files changed, 342 insertions(+), 244 deletions(-) delete mode 100644 data/doc/sisu/markup-samples/sisu_manual/_sisu/sisurc.yml create mode 100644 data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml create mode 100644 data/doc/sisu/markup-samples/sisu_manual/_sisu/v3/sisurc.yml diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml index 982274d1..1b1437f4 100644 --- a/conf/sisu/v2/sisurc.yml +++ b/conf/sisu/v2/sisurc.yml @@ -30,10 +30,12 @@ # base_path: ~ # port: '8081' # user: ~ + show_output_on: 'filesystem_url' #texinfo display output #texinfo: # stub: 'texinfo' + ##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv #processing: # path: '~' @@ -43,16 +45,18 @@ show_output_on: 'filesystem_url' # latex: 'tex' # texinfo: 'texinfo' # concord_max: 400000 + #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) flag: color: true # making colour default -c is toggle, and will now toggle colour off - default: '-NhwepoabxXyYv' # -m run by default; includes verbose - i: '-hwpoay' # -m run by default - ii: '-NhwepoabxXy' # -m run by default - iii: '-NhwepoabxXyY' # -m run by default - iv: '-NhwepoabxXYDy --update' # -m run by default - v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose + default: '-NhewpotbxXyYv' # -m run by default; includes verbose + i: '-Nhewpoty' # -m run by default + ii: '-NhewpotbxX' # -m run by default + iii: '-NhewpotbxXY' # -m run by default + iv: '-NhwepoabxXYD --update' # -m run by default + v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal + default: papersize: 'A4,letter' #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif' @@ -62,7 +66,9 @@ default: #multilingual: false #language_file: 2 #language: 'English' + #% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold' + #% settings used by ssh scp #remote: # - @@ -73,9 +79,11 @@ default: # user: '[usrname]' # host: '[remote.hostname]' # path: '.' #no trailing slash eg 'sisu/www' + #% webrick information #webrick: # port: '8081' + #% sql database info, postgresql and sqlite #db: # share_source: false # boolean, default is false @@ -90,14 +98,12 @@ default: #html: # quick_ref: true #default false # seg_title_banner: true #default false -#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'. -#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file -#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S' -#on value true system defaults used, to change, e.g. editor specify + permission_set: zap: false css_modify: false # remote_base_site: true + program_set: rmagick: false # wc: true @@ -107,25 +113,24 @@ program_set: # tidy: true # rexml: true # pdflatex: true + #program_select: -# editor: 'gvim -c :R -c :S' -# pdf_viewer: 'evince' -# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase' -# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' -# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader' -# odf_viewer: 'oowriter' #'abiword' -# xml_viewer: 'xml-viewer' -# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man' -#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + #search: # sisu: -# flag: true -## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi -# action: http://search.sisudoc.org -# db: sisu -# title: sample search form -# hyperestraier: -# flag: true -# action: http://search.sisudoc.org/cgi-bin/estseek.cgi? -#manifest: -# minitoc: true +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form + +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v3/sisurc.yml index f250b71d..f5473c79 100644 --- a/conf/sisu/v3/sisurc.yml +++ b/conf/sisu/v3/sisurc.yml @@ -30,10 +30,12 @@ # base_path: ~ # port: '8081' # user: ~ + show_output_on: 'filesystem_url' #texinfo display output #texinfo: # stub: 'texinfo' + ##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv #processing: # path: '~' @@ -43,15 +45,17 @@ show_output_on: 'filesystem_url' # latex: 'tex' # texinfo: 'texinfo' # concord_max: 400000 + #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) flag: color: true # making colour default -c is toggle, and will now toggle colour off - default: '-NhwepoabxXyYv' # -m run by default; includes verbose - i: '-hwpoay' # -m run by default - ii: '-NhwepoabxXy' # -m run by default - iii: '-NhwepoabxXyY' # -m run by default - iv: '-NhwepoabxXYDy --update' # -m run by default - v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose + default: '-NhewpotbxXyYv' # -m run by default; includes verbose + i: '-Nhewpoty' # -m run by default + ii: '-NhewpotbxX' # -m run by default + iii: '-NhewpotbxXY' # -m run by default + iv: '-NhewpotbxXiIY' # -m run by default + v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose + #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal default: papersize: 'A4,letter' @@ -63,6 +67,7 @@ default: #language_file: 2 #language: 'English' #% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold' + #% settings used by ssh scp #remote: # - @@ -73,9 +78,11 @@ default: # user: '[usrname]' # host: '[remote.hostname]' # path: '.' #no trailing slash eg 'sisu/www' + #% webrick information #webrick: # port: '8081' + #% sql database info, postgresql and sqlite #db: # share_source: false # boolean, default is false @@ -87,6 +94,7 @@ default: # sqlite: # path: ~ # './sisu_sqlite.db' # port: "**" + #html: # quick_ref: true #default false # seg_title_banner: true #default false @@ -96,30 +104,15 @@ default: # ocn: true #% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) +#output_dir_structure_by: filename +#output_dir_structure_by: filetype output_dir_structure_by: language -##% output_strucure: by_language: and/or by_filetype: (else default "bundled" -##output) possible values ~, true, false, (default where not set, false), -##output_structure: by_language: (language code directories with filetype -##subdirectories); by_filetype: (filetype directories output_structure) the -##previous default was by_language: false by_filetype: false. Note that where -##by_language is true, by_filetype is (forced) true. If e.g. using po4a -##by_langauge should be used and set true: -#output_structure: -# by_language: true -# by_filetype: true - -#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c -#:R -c :S'. will only ignore if value set to false, absence or nil will not -#remove program as should operate without rc file ie in case of ~ will ignore -#and use hard coded defaults within program), true, false, or command -#instruction e.g. editor: 'gvim -c :R -c :S' on value true system defaults used, -#to change, e.g. editor specify - permission_set: zap: false css_modify: false # remote_base_site: true + program_set: rmagick: false # wc: true @@ -129,25 +122,24 @@ program_set: # tidy: true # rexml: true # pdflatex: true + #program_select: -# editor: 'gvim -c :R -c :S' -# pdf_viewer: 'evince' -# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase' -# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' -# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader' -# odf_viewer: 'libreoffice' #'oowriter' #'abiword' -# xml_viewer: 'xml-viewer' -# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man' -#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + #search: # sisu: -# flag: true -## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi -# action: http://search.sisudoc.org -# db: sisu -# title: sample search form -# hyperestraier: -# flag: true -# action: http://search.sisudoc.org/cgi-bin/estseek.cgi? -#manifest: -# minitoc: true +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form + +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 08ecd407..03611430 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -26,6 +26,8 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.13-1 * define \hardspace to simplify placing a hardspace (within a code block) * provide backslash character in code block + * sisurc.yml, config settings + %% 2.9.6.orig.tar.gz (2011-06-07:23/2) [see 3.0.12] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.12-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 67708e7c..8984a2ef 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * ok for plaintext, html, xhtml, xml, epub, pdf, manpage * not properly honored in paragraph objects for odt [todo fix, but issue] + * sisurc.yml, config settings + * vim * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisurc.yml deleted file mode 100644 index 2b3df4db..00000000 --- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/sisurc.yml +++ /dev/null @@ -1,172 +0,0 @@ -# Name: SiSU - Simple information Structuring Universe -# Author: Ralph@Amissah.com -# Description: Site wide envionment defaults set here -# system environment info / resource configuration file, for sisu -# License: GPL v3 or later -# this file should be configured and live in -# /etc/sisu #per environment settings, overridden by: -# ~/.sisu #per user settings, overridden by: -# ./_sisu/config #per local directory settings -# $Date$ -# $Id$ -# Notes: implemented 2004w03 -# Site environment configuration file -# this file should be configured and live in -# /etc/sisu #per environment settings, overridden by: -# ~/.sisu #per user settings, overridden by: -# ./_sisu #per local markup directory settings -#% #image source directory, main path and subdirectories -#image: -## path: 'grotto/theatre/working' -# path: 'sisu_working' -# public: 'sisu_image' -# #all: 'image' -#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) -webserv: - url_root: 'http://www.jus.uio.no' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu - path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home - #images: 'sisu/image' - #man: 'man' - #php: 'php' - #cgi: '/usr/local/lib/sisu-cgi' - feed: 'feed' - sqlite: 'sisu/sqlite' -# webrick_url: true -#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' -#show_output_on: 'local:8111' -webserv_cgi: -# host: localhost -# base_path: ~ -# port: '8081' -# user: ~ - file_links: webserv -# file_links: www.jus.uio.no -show_output_on: 'filesystem_url' -#texinfo display output -#texinfo: -# stub: 'texinfo' -#% processing directories, main path and subdirectories -processing: -# path: 'sisu_processing' -# metaverse: 'metaverse' -# tune: 'tune' -# latex: 'tex' -# texinfo: 'texinfo' -# concord_max: 400000 -#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) -flag: - color: true # making colour default -c is toggle, and will now toggle colour off - default: '-NhewpoabxXyYv' # includes verbose; -m would in any event be run by default - i: '-Nhewpoayv' # includes verbose; -m run by default - ii: '-NhewpoabxXyv' # includes verbose; -m run by default - iii: '-NhewpoabxXyYv' # includes verbose; -m run by default - iv: '-NhewpoabxXYDyv --import' # includes verbose; -m run by default - v: '-NhewpoabxXYDyv --update' # includes verbose; -m run by default -#flag: -# color: false # colour off default -c is toggle, and will toggle colour on -# i: '-mhwpcyv' # adding colour and verbosity to defaults (note: another -c won't toggle off) -# ii: '-mhwpaocyv' # adding colour and verbosity to defaults (note: another -c won't toggle off) -# iii: '-mhwpaobxXcyv' # adding colour and verbosity to defaults (note: another -c won't toggle off) -# iv: '-mhwpaobxXDcyv --import' # adding colour and verbosity to defaults (note: another -c won't toggle off) -# v: '-mhwpaobxXDcyv --update' # adding colour and verbosity to defaults (note: another -c won't toggle off) -#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible -default: - #papersize: 'a4,letter' - papersize: 'A4' - language_file: 2 - #digest: 'sha' #sha is sha256, default is md5 - #multilingual: false - #language: 'English' -#% settings used by ssh scp -remote: - user: 'ralpha' - host: 'ulrik.uio.no' - #host: 'klodrik.uio.no' - path: '.' #no trailing slash eg 'sisu/www' -#% webrick information -#sql database info, postgresql and sqlite -db: - postgresql: - port: '5432' # '5432' - #user: 'tst' # '[provide username]' - #host: 'sisudoc.org' - #password: 'alternate1' - #user: 'ralph' - ##port: '5433' - #port: '5432' - sqlite: - user: 'ralph' - path: ~ # './sisu_sqlite.db' - port: "**" - multi: true -# single: true -#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'. -#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file -#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S' -#on value true system defaults used, to change, e.g. editor specify -permission_set: - zap: true - css_modify: true - remote_base_site: true -program_set: - rmagick: true - wc: true - editor: true - postgresql: true - sqlite: true - tidy: true - rexml: true - pdflatex: true -program_select: - editor: 'gvim -c :R' - pdf_viewer: 'evince' - web_browser: 'kazehakase' - console_web_browser: 'links2' - odf_viewer: 'oowriter' - xml_viewer: 'xml-viewer' -search: - sisu: - flag: true -# action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi - action: http://search.sisudoc.org - db: sisu - title: sample search form - hyperestraier: - flag: true - action: http://search.sisudoc.org/cgi-bin/estseek.cgi? -promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby -#promo: sisu_search_libre, ad, sisu_icon, sisu, open_society, fsf, ruby -#promo: ad, sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby -## on (unless file says off); off (unless file says on); off regardless of file status -#promo: -# default_status: true -# switch_off: false -# list: -# ad: -# adsense: -# sisu: -# site: -# - sisu -# open_society: -# site: -# - twon -# - fc -# - faif -# - twobits -# # - ffa -# - catb -# sisu_icon: -# site: -# - sisu_icon -# ruby: -# site: -# - ruby_logo -# fsf: -# site: -# - fsf -# gpl: -# site: -# - gpl -# sisu_search_libre: -# search: -# - sisu_books_libre_sisusearch diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml new file mode 100644 index 00000000..433c6967 --- /dev/null +++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml @@ -0,0 +1,132 @@ +# Name: SiSU - Simple information Structuring Universe +# Author: Ralph@Amissah.com +# Description: Site wide envionment defaults set here +# system environment info / resource configuration file, for sisu +# License: GPL v3 or later +# site environment configuration file +# this file should be configured and live in +# /etc/sisu #per environment settings, overridden by: +# ~/.sisu #per user settings, overridden by: +# ./_sisu #per local markup directory settings +#% #image source directory, main path and subdirectories +#image: +# path: 'sisu_working' +# public: '_sisu/image' +# #all: 'image' +#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) +#webserv: +# url_root: 'http://www.your.url' #without dir stub +# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home +# images: '_sisu/image' +# man: 'man' +# cgi: '/usr/local/lib/sisu-cgi' +# feed: 'feed' +# sqlite: 'sisu/sqlite' +# webrick_url: true +#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' +#show_output_on: 'local:8111' +#webserv_cgi: +# host: localhost +# base_path: ~ +# port: '8081' +# user: ~ +# file_links: webserv + +show_output_on: 'filesystem_url' +#texinfo display output +#texinfo: +# stub: 'texinfo' + +#% processing directories, main path and subdirectories +#processing: +# path: 'sisu_processing' +# metaverse: 'metaverse' +# tune: 'tune' +# latex: 'tex' +# texinfo: 'texinfo' +# concord_max: 400000 + +#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) +flag: + color: true # making colour default -c is toggle, and will now toggle colour off + default: '-NhewpotbxXyYv' # -m run by default; includes verbose + i: '-Nhewpoty' # -m run by default + ii: '-NhewpotbxX' # -m run by default + iii: '-NhewpotbxXY' # -m run by default + iv: '-NhewpotbxXiIY' # -m run by default + v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose + +#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible +default: + papersize: 'a4,letter' + language_file: 2 + #digest: 'sha' #sha is sha256, default is md5 + #language: 'English' + #emphasis: 'italics' + +#% settings used by ssh scp +#remote: +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' + +#% webrick information +#webrick: +# port: '8081' + +#sql database info, postgresql and sqlite +db: + postgresql: + port: '5432' # '5432' + #user: 'tst' # '[provide username]' + #host: 'sisudoc.org' + #user: 'ralph' + ##port: '5433' + #port: '5432' + sqlite: + user: 'ralph' + path: ~ # './sisu_sqlite.db' + port: "**" + multi: true +# single: true + +permission_set: + zap: true + css_modify: true + remote_base_site: true + +program_set: + rmagick: false +# wc: true +# editor: true +# postgresql: true +# sqlite: true +# tidy: true +# rexml: true +# pdflatex: true + +#program_select: +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + +#search: +# sisu: +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form + +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v3/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v3/sisurc.yml new file mode 100644 index 00000000..ed452402 --- /dev/null +++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v3/sisurc.yml @@ -0,0 +1,137 @@ +# Name: SiSU - Simple information Structuring Universe +# Author: Ralph@Amissah.com +# Description: Site wide envionment defaults set here +# system environment info / resource configuration file, for sisu +# License: GPL v3 or later +# site environment configuration file +# this file should be configured and live in +# /etc/sisu #per environment settings, overridden by: +# ~/.sisu #per user settings, overridden by: +# ./_sisu #per local markup directory settings +#% #image source directory, main path and subdirectories +#image: +# path: 'sisu_working' +# public: '_sisu/image' +# #all: 'image' +#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name) +#webserv: +# url_root: 'http://www.your.url' #without dir stub +# path: '/var/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home +# images: '_sisu/image' +# man: 'man' +# cgi: '/usr/local/lib/sisu-cgi' +# feed: 'feed' +# sqlite: 'sisu/sqlite' +# webrick_url: true +#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path' +#show_output_on: 'local:8111' +#webserv_cgi: +# host: localhost +# base_path: ~ +# port: '8081' +# user: ~ +# file_links: webserv + +show_output_on: 'filesystem_url' +#texinfo display output +#texinfo: +# stub: 'texinfo' + +#% processing directories, main path and subdirectories +#processing: +# path: 'sisu_processing' +# metaverse: 'metaverse' +# tune: 'tune' +# latex: 'tex' +# texinfo: 'texinfo' +# concord_max: 400000 + +#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default) +flag: + color: true # making colour default -c is toggle, and will now toggle colour off + default: '-NhewpotbxXyYv' # -m run by default; includes verbose + i: '-Nhewpoty' # -m run by default + ii: '-NhewpotbxX' # -m run by default + iii: '-NhewpotbxXY' # -m run by default + iv: '-NhewpotbxXiIY' # -m run by default + v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose + +#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible +default: + papersize: 'a4,letter' + language_file: 2 + #digest: 'sha' #sha is sha256, default is md5 + #language: 'English' + #emphasis: 'italics' + +#% settings used by ssh scp +#remote: +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' +# - +# user: '[usrname]' +# host: '[remote.hostname]' +# path: '.' #no trailing slash eg 'sisu/www' + +#% webrick information +#webrick: +# port: '8081' + +#sql database info, postgresql and sqlite +db: + postgresql: + port: '5432' # '5432' + #user: 'tst' # '[provide username]' + #host: 'sisudoc.org' + #user: 'ralph' + ##port: '5433' + #port: '5432' + sqlite: + user: 'ralph' + path: ~ # './sisu_sqlite.db' + port: "**" + multi: true +# single: true + +#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2) +#output_dir_structure_by: filename +#output_dir_structure_by: filetype +output_dir_structure_by: language + +permission_set: + zap: true + css_modify: true + remote_base_site: true + +program_set: + rmagick: true +# wc: true +# editor: true +# postgresql: true +# sqlite: true +# tidy: true +# rexml: true +# pdflatex: true + +#program_select: +# editor: 'vim' +# pdf_viewer: 'evince' +# web_browser: 'iceweasel' +# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links' +# odf_viewer: 'lowriter' #'oowriter' #'abiword' +# xml_viewer: 'xml-viewer' +# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular' +# info_viewer: 'pinfo -f' +# man: 'man' #'groff -man -Tascii' # 'nroff -man' + +#search: +# sisu: +# flag: true +## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi +# action: http://search.sisudoc.org +# db: sisu +# title: sample search form + +#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby -- cgit v1.2.3 From 1d239f2504dffc05c39efd38a10a27dba9e9c85e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 26 Jun 2011 21:26:07 -0400 Subject: v3: documentation, on additional breaks in document, (remove some old info) * linebreak \\ (previously undocumented
kept but depreciated) [it is intended that this should close #617298 (post mail)] * page break (breaks column if column, else breaks page) * page new (new page, breaks page) * sisurc.yml set output directory structure by language * removed section on hyperestraier, too specialised for general manpage (also section not checked recently) --- data/doc/sisu/CHANGELOG_v3 | 10 +- data/doc/sisu/html/sisu.1.html | 578 +++++++++------------ data/doc/sisu/markup-samples/sisu_manual/sisu.ssm | 2 - .../markup-samples/sisu_manual/sisu_commands.sst | 2 +- .../markup-samples/sisu_manual/sisu_markup.sst | 39 ++ man/man1/sisu.1 | 255 ++++----- 6 files changed, 402 insertions(+), 484 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 8984a2ef..7f2093b0 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -34,6 +34,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * sisu syntax highlighting, linebreak \\ added (
kept) * colors, added cursor line & column + * documentation, on additional breaks in document + * linebreak \\ (previously undocumented
kept but depreciated) + [it is intended that this should close #617298] + * page break (breaks column if column, else breaks page) + * page new (new page, breaks page) + * removed section on hyperestraier, too specialised for general manpage + (also section not checked recently) + * texpdf * define latex \newcommands for some special characters to simplify dealing with them in sisu code \hardspace \caret \pipe \curlyopen @@ -67,7 +75,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.13.orig.tar.gz * urls (ansi screen reporting), add document language code - * sysenv, accomodate + * sysenv, accommodate * manifest * manpage * info (texinfo) diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html index 06fa3f15..fb74b10d 100644 --- a/data/doc/sisu/html/sisu.1.html +++ b/data/doc/sisu/html/sisu.1.html @@ -148,7 +148,7 @@ offers great possibilities. citation system to reliably reference its documents. SiSU works well in a complementary manner with such collaborative technologies as Wikis, which can take advantage of and be used to discuss the substance of content prepared -in SiSU +in SiSU.


<http://www.sisudoc.org/ > @@ -193,8 +193,8 @@ footnotes at end of each paragraph that contains them [  -A  for   [filename/wildcard]

screen toggle ansi screen colour on or off depending on default set (unless -c flag is used: if sisurc colour default is set -to ’true’, output to screen will be with colour, if sisurc colour default is -set to ’false’ or is undefined screen output will be without colour). Alias -c +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

--concordance [filename/wildcard]
@@ -347,7 +347,8 @@ file (scroll.html). Alias -h
prints license information.

-
--machine [filename/wildcard/url]
+
--machine [filename/wildcard/url] +
see --dal (document abstraction level/layer)

@@ -361,7 +362,8 @@ indicated. (also see -V). Aliases -M and --keep-processing-files

-M [filename/wildcard/url]
-
see --maintenance +
+

see --maintenance

-m [filename/wildcard/url]
@@ -393,7 +395,7 @@ by most processing flags.
see --odt

-
--odt [filename/wildcard/url]
+
--odt [filename/wildcard/url]
output basic document in opendocument file format (opendocument.odt). Alias -o

@@ -587,8 +589,8 @@ paths in sisurc.yml. Alias -U

-u [filename/wildcard]
-
provides url mapping of output files for the flags -requested for processing, also see -U +
provides url mapping of output files for the flags requested for processing, +also see -U

--v2 [filename/wildcard]
@@ -597,9 +599,9 @@ This is the default and is normally omitted.

--v3 [filename/wildcard]
-
invokes the sisu v3 document parser/generator. Currently -under development and incomplete, v3 requires >= ruby1.9.2p180. You may run -sisu3 instead. +
invokes +the sisu v3 document parser/generator. Currently under development and incomplete, +v3 requires >= ruby1.9.2p180. You may run sisu3 instead.

--verbose [filename/wildcard]
@@ -609,7 +611,8 @@ created for each of the processing flag requests. Alias -v

-V
-
on its own, provides SiSU version and environment information (sisu --help env) +
on its own, +provides SiSU version and environment information (sisu --help env)

-V [filename/wildcard]
@@ -618,7 +621,6 @@ created for each of the processing flag requests. Alias -v
-v
on its own, provides SiSU version information -

-v [filename/wildcard]
@@ -646,11 +648,13 @@ webserver points at sisu output directories, the default port is set to

--xhtml [filename/wildcard]
-
produces xhtml/XML output for browser viewing (sax parsing). Alias -b +
produces xhtml/XML output for +browser viewing (sax parsing). Alias -b

--xml-dom [filename/wildcard]
-
produces XML output with deep document structure, in the nature of dom. Alias -X +
produces +XML output with deep document structure, in the nature of dom. Alias -X

--xml-sax [filename/wildcard]
@@ -757,7 +761,7 @@ updates/imports specified data to postgresql db (rb.dbi) [  -dv  --upd
--pg --remove
[filename/wildcard] removes specified data to postgresql -db (rb.dbi) [  -d --remove  sqlite  equivalent] +db (rb.dbi) [  -d  --remove  sqlite  equivalent]

--pg --dropall
@@ -1270,10 +1274,9 @@ html


resulting output:


-normal text, emphasis , bold text , italics , underscore , "citation", -^superscript^, [subscript], ++inserted text++, --strikethrough--, monospace -

-
+normal text, emphasis, bold text, italics, underscore , "citation", ^superscript^, +[subscript], ++inserted text++, --strikethrough--, monospace +


normal text


@@ -2037,7 +2040,48 @@ opening code tag code{# as demonstrated here: 44 | death."’

-

9.7 Book Index

+

9.7 Additional Breaks - Linebreaks Within Objects, Column and Page-breaks

+ +

+ +

9.7.1 Line-breaks

+ +


+To break a line within a "paragraph object", two backslashes \\ with a space +before and a space or newline after them may be used. +


+

  To break a line within a "paragraph object",
+  two backslashes \\ with a space before
+  and a space or newline after them \\
+  may be used.
+
+


+The html break br enclosed in angle brackets (though undocumented) is available +in versions prior to 3.0.13 and 2.9.7 (it remains available for the time being, +but is depreciated). +

+

9.7.2 Page Breaks

+ +


+Page breaks are only relevant and honored in some output formats. A page +break or a new page may be inserted manually using the following markup +on a line on its own: +


+

  <:pb>
+
+


+ +

or +


+

  <:pn>
+
+


+page new <:pn> breaks the page, starts a new page. +


+page break <:pb> breaks a column, starts a new column, if using columns, +else breaks the page, starts a new page. +

+

9.8 Book Index


To make an index append to paragraph the book index term relates to it, @@ -2091,7 +2135,7 @@ be: second sub-term, 1,

-

10. Composite Documents Markup

+

10. Composite Documents Markup



@@ -2127,11 +2171,11 @@ documents under consideration, and occasionally supported have been. << |filename.ssi|@|^|

-

Markup Syntax History

+

Markup Syntax History


-

11. Notes Related to Files-types and Markup Syntax

+

11. Notes Related to Files-types and Markup Syntax


2.0 introduced new headers and is therefore incompatible with 1.0 though @@ -2323,14 +2367,14 @@ in place of the 0.1 header, heading/structure notation SiSU 0.1 headers and headings structure represented by header 0{~ and headings/structure 1{ 2{ 3{ 4{~ 5{ 6{

-

12. Sisu Filetypes

+

12. Sisu Filetypes



SiSU has plaintext and binary filetypes, and can process either type of document.

-

12.1 .sst .ssm .ssi Marked Up Plain Text

+

12.1 .sst .ssm .ssi Marked Up Plain Text


SiSU documents are prepared as plain-text (utf-8) files with SiSU markup. @@ -2351,7 +2395,7 @@ be located locally or on a remote server for which a url is provided. sisu -s [filename]

-

12.1.1 Sisu Text - Regular Files (.sst)

+

12.1.1 Sisu Text - Regular Files (.sst)


The most common form of document in SiSU , see the section on SiSU markup. @@ -2363,7 +2407,7 @@ The most common form of document in SiSU , see the section on SiSU <http://www.sisudoc.org/sisu/sisu_manual >

-

12.1.2 Sisu Master Files (.ssm)

+

12.1.2 Sisu Master Files (.ssm)


Composite documents which incorporate other SiSU documents which may be @@ -2388,7 +2432,7 @@ with the same prefix and the suffix ._sst [^17] <http://www.sisudoc.org/sisu/sisu_manual >

-

12.1.3 Sisu Insert Files (.ssi)

+

12.1.3 Sisu Insert Files (.ssi)


Inserts are documents prepared solely for the purpose of being incorporated @@ -2397,7 +2441,7 @@ except they are ignored by the SiSU processor. Making a file a .ssi file is a quick and convenient way of flagging that it is not intended that the file should be processed on its own.

-

12.2 Sisupod, Zipped Binary Container +

12.2 Sisupod, Zipped Binary Container (sisupod.zip, .ssp)


@@ -2437,12 +2481,12 @@ locally or on a remote server for which a url is provided. <http://www.sisudoc.org/sisu/sisu_manual >

-

13. Experimental Alternative Input +

13. Experimental Alternative Input Representations


-

13.1 Alternative Xml

+

13.1 Alternative Xml


SiSU offers alternative XML input representations of documents as a proof @@ -2470,7 +2514,7 @@ or the same: sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

-

13.1.1 Xml Sax Representation

+

13.1.1 Xml Sax Representation


To convert from sst to simple xml (sax) representation: @@ -2489,7 +2533,7 @@ or the same: sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

-

13.1.2 Xml Dom Representation

+

13.1.2 Xml Dom Representation


To convert from sst to simple xml (dom) representation: @@ -2508,7 +2552,7 @@ or the same: sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

-

13.1.3 Xml Node Representation

+

13.1.3 Xml Node Representation


To convert from sst to simple xml (node) representation: @@ -2527,11 +2571,11 @@ or the same: sisu --from-sxml [filename/wildcard  [.sxs.xml,.sxd.xml,sxn.xml]]

-

14. Configuration

+

14. Configuration


-

14.1 Determining the Current Configuration

+

14.1 Determining the Current Configuration


Information on the current configuration of SiSU should be available with @@ -2548,7 +2592,7 @@ which is an alias for: Either of these should be executed from within a directory that contains sisu markup source documents.

-

14.2 Configuration Files (config.yml)

+

14.2 Configuration Files (config.yml)


SiSU configration parameters are adjusted in the configuration file, which @@ -2583,7 +2627,7 @@ database access details.

If SiSU is installed a sample sisurc.yml may be found in /etc/sisu/sisurc.yml

-

15. Skins

+

15. Skins



@@ -2618,7 +2662,7 @@ for document skins: The skin itself is a ruby file which modifies the default appearances set in the program.

-

15.1 Document Skin

+

15.1 Document Skin


Documents take on a document skin, if the header of the document specifies @@ -2627,7 +2671,7 @@ a skin to be used. 

  @skin: skin_united_nations

-

15.2 Directory Skin

+

15.2 Directory Skin


A directory may be mapped on to a particular skin, so all documents within @@ -2639,13 +2683,13 @@ specifies the use of another skin, in the skin/doc directory). A personal habit is to place all skins within the doc directory, and symbolic links as needed from the site, or dir directories as required.

-

15.3 Site +

15.3 Site Skin


A site skin, modifies the program default skin.

-

15.4 Sample Skins

+

15.4 Sample Skins


With SiSU installed sample skins may be found in: @@ -2667,7 +2711,7 @@ list) may be found in: equivalent directory)

-

16. Css - Cascading Style Sheets (for Html, Xhtml and Xml)

+

16. Css - Cascading Style Sheets (for Html, Xhtml and Xml)



@@ -2695,11 +2739,11 @@ Under consideration is to permit the placement of a CSS file with a different name in directory _sisu/css directory or equivalent, and change the default CSS file that is looked for in a skin.[^18]

-

17. Organising Content

+

17. Organising Content


-

17.1 Directory Structure and Mapping

+

17.1 Directory Structure and Mapping


The output directory root can be set in the sisurc.yml file. Under the root, @@ -2726,15 +2770,15 @@ be output to the same output directory. Skins could be associated with each institution on a directory basis and resulting documents will take on the appropriate different appearance.

-

18. Homepages

+

18. Homepages



SiSU is about the ability to auto-generate documents. Home pages are regarded -as custom built items, and are not created by SiSU SiSU has a default -home page, which will not be appropriate for use with other sites, and -the means to provide your own home page instead in one of two ways as part -of a site’s configuration, these being: +as custom built items, and are not created by SiSU. More accurately, SiSU +has a default home page, which will not be appropriate for use with other +sites, and the means to provide your own home page instead in one of two +ways as part of a site’s configuration, these being:


1. through placing your home page and other custom built documents in the subdirectory _sisu/home/ (this probably being the easier and more convenient @@ -2746,7 +2790,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.

-

18.1 Home Page and Other +

18.1 Home Page and Other Custom Built Pages in a Sub-directory


@@ -2759,7 +2803,7 @@ command: sisu -CC

-

18.2 Home Page Within a Skin

+

18.2 Home Page Within a Skin


Skins are described in a separate section, but basically are a file written @@ -2789,11 +2833,11 @@ index.html end

-

19. Markup and Output Examples

+

19. Markup and Output Examples


-

19.1 Markup Examples

+

19.1 Markup Examples


Current markup examples and document output samples are provided at <http://www.jus.uio.no/sisu/SiSU/examples.html @@ -2804,7 +2848,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.

-

20. Sisu Search - Introduction

+

20. Sisu Search - Introduction



@@ -2824,11 +2868,11 @@ degree of granularity. Basically, your match criteria is met by these documents and at these locations within each document, which can be viewed within the database directly or in various output formats.

-

21. Sql

+

21. Sql


-

21.1 Populating Sql Type Databases

+

21.1 Populating Sql Type Databases


SiSU feeds sisu markupd documents into sql type databases PostgreSQL[^19] @@ -2883,18 +2927,18 @@ full contents of the database and have headings in which search content appears, or to search only headings etc. (as the Dublin Core is incorporated it is easy to make use of that as well).

-

22. Postgresql

+

22. Postgresql


-

22.1 Name

+

22.1 Name


SiSU - Structured information, Serialized Units - a document publishing system,

postgresql dependency package

-

22.2 Description

+

22.2 Description


Information related to using postgresql with sisu (and related to the sisu_postgresql @@ -2902,7 +2946,7 @@ dependency package, which is a dummy package to install dependencies needed for SiSU to populate a postgresql database, this being part of SiSU - man sisu).

-

22.3 Synopsis

+

22.3 Synopsis


sisu -D [instruction] [filename/wildcard  if  required]
@@ -2911,7 +2955,7 @@ sisu). sisu -D --pg --[instruction] [filename/wildcard  if  required]

-

22.4 Commands

+

22.4 Commands


Mappings to two databases are provided by default, postgresql and sqlite, @@ -2922,7 +2966,7 @@ however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,


-D or --pgsql may be used interchangeably.

-

22.4.1 Create and Destroy Database

+

22.4.1 Create and Destroy Database

@@ -2959,7 +3003,7 @@ of the same name).

-

22.4.2 Import and Remove Documents

+

22.4.2 Import and Remove Documents

@@ -2982,17 +3026,17 @@ database.

-

23. Sqlite

+

23. Sqlite


-

23.1 Name

+

23.1 Name


SiSU - Structured information, Serialized Units - a document publishing system.

-

23.2 Description

+

23.2 Description


Information related to using sqlite with sisu (and related to the sisu_sqlite @@ -3000,7 +3044,7 @@ dependency package, which is a dummy package to install dependencies needed for SiSU to populate an sqlite database, this being part of SiSU - man sisu).

-

23.3 Synopsis

+

23.3 Synopsis


sisu -d [instruction] [filename/wildcard  if  required]
@@ -3009,7 +3053,7 @@ for SiSU to populate an sqlite database, this being part of SiSU - sisu -d --(sqlite|pg) --[instruction] [filename/wildcard  if  required]

-

23.4 Commands

+

23.4 Commands


Mappings to two databases are provided by default, postgresql and sqlite, @@ -3020,7 +3064,7 @@ however -d (lowercase) denotes sqlite and -D (uppercase) denotes postgresql,


-d or --sqlite may be used interchangeably.

-

23.4.1 Create and Destroy Database

+

23.4.1 Create and Destroy Database

@@ -3057,7 +3101,7 @@ of the same name).

-

23.4.2 Import and Remove Documents

+

23.4.2 Import and Remove Documents

@@ -3080,11 +3124,11 @@ database.

-

24. Introduction

+

24. Introduction


-

24.1 Search - Database Frontend Sample, Utilising Database and Sisu Features,

+

24.1 Search - Database Frontend Sample, Utilising Database and Sisu Features,

INCLUDING OBJECT CITATION NUMBERING (BACKEND CURRENTLY POSTGRESQL)


@@ -3139,7 +3183,7 @@ SiSU_ebook is used. [otherwise  a  manual  mapping  for &nbs

-

24.2 +

24.2 Search Form

@@ -3176,122 +3220,17 @@ search form for use with the webrick server, which must be copied to the

-

25. Hyperestraier

+

25. Sisu_webrick


-


-See the documentation for hyperestraier: -


- <http://hyperestraier.sourceforge.net/ ->
- -


- /usr/share/doc/hyperestraier/index.html
- -


- man estcmd
- -


-NOTE: the examples that follow assume that sisu output is placed in the - -

directory /home/ralph/sisu_www -


-(A) to generate the index within the webserver directory to be indexed: - -


- estcmd gather -sd [index  name] [directory  path  to  index]
- -


-the following are examples that will need to be tailored according to your -needs: -


- cd /home/ralph/sisu_www
- -


- estcmd gather -sd casket /home/ralph/sisu_www
- -


-you may use the ’find’ command together with ’egrep’ to limit indexing to particular -document collection directories within the web server directory: -


- find /home/ralph/sisu_www -type f | egrep
- ’/home/ralph/sisu_www/sisu/.+?.html$’ |estcmd gather -sd casket -
- -


-Check which directories in the webserver/output directory (~/sisu_www or -elsewhere depending on configuration) you wish to include in the search -index. -


-As sisu duplicates output in multiple file formats, it it is probably preferable -to limit the estraier index to html output, and as it may also be desirable -to exclude files ’plain.txt’, ’toc.html’ and ’concordance.html’, as these duplicate -information held in other html output e.g. -


- find /home/ralph/sisu_www -type f | egrep
- ’/sisu_www/(sisu|bookmarks)/.+?.html$’ | egrep -v ’(doc|concordance).html$’
- |estcmd gather -sd casket -
- -


-from your current document preparation/markup directory, you would construct -a rune along the following lines: -


- 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 -
- -


-(B) to set up the search form -


-(i) copy estseek.cgi to your cgi directory and set file permissions to 755: - -


- sudo cp -vi /usr/lib/estraier/estseek.cgi /usr/lib/cgi-bin
- -


- sudo chmod -v 755 /usr/lib/cgi-bin/estseek.cgi
- -


- sudo cp -v /usr/share/hyperestraier/estseek.* /usr/lib/cgi-bin
- -


- [see  estraier  documentation  for  paths]
- -


-(ii) edit estseek.conf, with attention to the lines starting ’indexname:’ -and -


- indexname: /home/ralph/sisu_www/casket
- -


- replace: ^file:///home/ralph/sisu_www{{!}}http://localhost -
- -


- replace: /index.html?${{!}}/
- -


-(C) to test using webrick, start webrick: -


- sisu -W
- -


-and try open the url: <http://localhost:8081/cgi-bin/estseek.cgi ->

-

26. Sisu_webrick

-
- -

-

26.1 Name

+

25.1 Name


SiSU - Structured information, Serialized Units - a document publishing system

-

26.2 Synopsis

+

25.2 Synopsis


sisu_webrick [port] @@ -3301,7 +3240,7 @@ sisu_webrick [port]


sisu -W [port]

-

26.3 Description

+

25.3 Description


sisu_webrick is part of SiSU (man sisu) sisu_webrick starts Ruby SiSU @@ -3312,7 +3251,7 @@ The default port for sisu_webrick is set to 8081, this may be modified in the yaml file: ~/.sisu/sisurc.yml a sample of which is provided as /etc/sisu/sisurc.yml (or in the equivalent directory on your system).

-

26.4 Summary of Man Page

+

25.4 Summary of Man Page


@@ -3323,7 +3262,7 @@ sisu_webrick, may be started on it’s own with the command: sisu_webrick

where no port is given and settings are unchanged the default port is 8081

-

26.5 Document Processing Command Flags

+

25.5 Document Processing Command Flags


sisu -W [port] starts Ruby Webrick web-server, serving SiSU output directories, @@ -3331,7 +3270,7 @@ 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

-

26.6 Further Information

+

25.6 Further Information


@@ -3343,12 +3282,12 @@ For more information on SiSU see: <h

or man sisu

-

26.7 Author

+

25.7 Author


Ralph Amissah <ralph@amissah.com> or <ralph.amissah@gmail.com>

-

26.8 See Also

+

25.8 See Also


sisu(1) @@ -3359,7 +3298,7 @@ Ralph Amissah <ralph@amissah.com> or <ralph.amissah@gmail.com>

-

27. Remote Source Documents

+

26. Remote Source Documents



@@ -3406,11 +3345,11 @@ way, see <http://www. > and use the url for the desired document.

-

Remote Document Output

+

Remote Document Output


-

28. Remote Output

+

27. Remote Output



@@ -3425,7 +3364,7 @@ which may be used in conjunction with other processing flags, e.g. 

  sisu -3R sisu_remote.sst

-

28.1 Commands

+

27.1 Commands

@@ -3448,12 +3387,12 @@ ssh agent in place. Also see -R

-

28.2 Configuration

+

27.2 Configuration


[expand  on  the  setting  up  of  an  ssh-agent  /  keychain]

-

29. Remote Servers

+

28. Remote Servers



@@ -3463,18 +3402,18 @@ 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.

-

30. Quickstart - Getting Started Howto

+

29. Quickstart - Getting Started Howto


-

30.1 Installation

+

29.1 Installation


Installation is currently most straightforward and tested on the Debian platform, as there are packages for the installation of sisu and all requirements for what it does.

-

30.1.1 Debian Installation

+

29.1.1 Debian Installation


SiSU is available directly from the Debian Sid and testing archives (and @@ -3524,7 +3463,7 @@ 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.

-

30.1.2 Rpm Installation

+

29.1.2 Rpm Installation


RPMs are provided though untested, they are prepared by running alien against @@ -3541,7 +3480,7 @@ as root type: rpm -i [rpm  package  name]

-

30.1.3 Installation from Source

+

29.1.3 Installation from Source


To install SiSU from source check information at: @@ -3560,7 +3499,7 @@ case: the first steps are the same, download and unpack the source file:


For basic use SiSU is only dependent on the programming language in which -it is written Ruby , and SiSU will be able to generate html, EPUB, various +it is written Ruby, and SiSU will be able to generate html, EPUB, various XMLs, including ODF (and will also produce LaTeX). Dependencies required for further actions, though it relies on the installation of additional dependencies which the source tarball does not take care of, for things @@ -3632,7 +3571,7 @@ For a list of alternative actions you may type: ruby install -T

-

30.2 Testing Sisu, Generating Output

+

29.2 Testing Sisu, Generating Output


To check which version of sisu is installed: @@ -3655,7 +3594,7 @@ change directory to the appropriate one:

cd /usr/share/doc/sisu/markup-samples/samples

-

30.2.1 Basic Text, Plaintext, +

29.2.1 Basic Text, Plaintext, Html, Xml, Odf, Epub


@@ -3670,7 +3609,7 @@ this will generate html including a concordance file, opendocument text format, plaintext, XHTML and various forms of XML, and OpenDocument text

-

30.2.2 LaTeX / Pdf

+

29.2.2 LaTeX / Pdf


Assuming a LaTeX engine such as tetex or texlive is installed with the @@ -3691,7 +3630,7 @@ file, opendocument text format, plaintext, XHTML and various forms of XML,

and OpenDocument text and pdf

-

30.2.3 Relational Database - Postgresql, Sqlite

+

29.2.3 Relational Database - Postgresql, Sqlite


@@ -3716,10 +3655,10 @@ create the database and write to it when you run sisu.

sisu --pgsql -v --import free_as_in_freedom.rms_and_free_software.sam_williams.sst

-

30.3 Getting Help

+

29.3 Getting Help

-

30.3.1 the Man Pages

+

29.3.1 the Man Pages


Type: @@ -3739,7 +3678,7 @@ date as within the package itself: * man directory <http://www.jus.uio.no/sisu/man > [^27]

-

30.3.2 Built in Help

+

29.3.2 Built in Help


@@ -3754,7 +3693,7 @@ date as within the package itself:

sisu --help --markup

-

30.3.3 the Home Page

+

29.3.3 the Home Page


<http://www.sisudoc.org/ @@ -3766,7 +3705,7 @@ date as within the package itself: <http://www.jus.uio.no/sisu/SiSU >

-

30.4 Markup Samples

+

29.4 Markup Samples


A number of markup samples (along with output) are available off: @@ -3782,7 +3721,7 @@ On Debian they are available in non-free[^28] to include them it is neces to include non-free in your /etc/apt/source.list or obtain them from the sisu home site.

-

31. Editor Files, Syntax Highlighting

+

30. Editor Files, Syntax Highlighting



@@ -3952,10 +3891,9 @@ the
NOTE:


[  .B  SiSU  parses  files  with  long  lines  or  line  breaks,  display  linewrap - (without  line-breaks)  is  a  convenient editor  feature  to  have  for  sisu  markup] - + (without  line-breaks)  is  a  convenient

-

32. How Does Sisu Work?

+

31. How Does Sisu Work?



@@ -3977,7 +3915,7 @@ layout, publishing, content certification, concordance etc.), and makes it possible to take advantage of some of the strengths of established ways of representing documents, (or indeed to create new ones).

-

33. Summary of +

32. Summary of Features


@@ -4122,11 +4060,11 @@ present. For example objects could be saved individually and identified by their hashes, with an index of how the objects relate to each other to form a document.

-

34. Help Sources

+

33. Help Sources


-

34.1 Man Pages

+

33.1 Man Pages


man sisu
@@ -4183,14 +4121,14 @@ to form a document. man sisu_webrick

-

34.2 Sisu Generated Output - Links to HTML

+

33.2 Sisu Generated Output - Links to HTML


Note SiSU documentation is prepared in SiSU and output is available in multiple formats including amongst others html, pdf, odf and epub, which may be also be accessed via the html pages[^29]

-

34.2.1 Www.sisudoc.org

+

33.2.1 Www.sisudoc.org


<http://sisudoc.org/sisu/sisu_manual/index.html @@ -4200,10 +4138,10 @@ may be also be accessed via the html pages[^29] >

-

34.3 Man2html

+

33.3 Man2html

-

34.3.1 Locally Installed

+

33.3.1 Locally Installed


@@ -4224,7 +4162,7 @@ may be also be accessed via the html pages[^29] /usr/share/doc/sisu/html/sisu_webrick.1.html

-

34.3.2 WWW.jus.uio.no/sisu

+

33.3.2 Www.jus.uio.no/Sisu


<http://www.jus.uio.no/sisu/man/sisu.1.html @@ -4364,7 +4302,7 @@ while freely distributable are not freely changeable. 29. named index.html or more extensively through sisu_manifest.html

-

See Also

+

See Also


sisu(1) ,
@@ -4387,14 +4325,14 @@ while freely distributable are not freely changeable. sisu_vim(7)

-

Homepage

+

Homepage


More information about SiSU can be found at <http://www.sisudoc.org/ > or <http://www.jus.uio.no/sisu/ >.

-

Author

+

Author

SiSU is written by Ralph Amissah <ralph@amissah.com>.

@@ -4438,100 +4376,102 @@ More information about SiSU can be found at <9.6.2 Poem

  • 9.6.3 Group
  • 9.6.4 Code
    • -
  • 9.7 Book Index
    • -
  • 10. Composite Documents Markup
    • -
  • Markup Syntax History
    • -
  • 11. Notes Related to Files-types and Markup Syntax
    • -
  • 12. Sisu Filetypes
    • -
  • 12.1 .sst .ssm .ssi Marked Up Plain Text
    • -
  • 12.1.1 Sisu Text - Regular Files (.sst)
    • -
  • 12.1.2 Sisu Master Files (.ssm)
    • -
  • 12.1.3 Sisu Insert Files (.ssi)
    • -
  • 12.2 Sisupod, Zipped Binary Container (sisupod.zip, .ssp)
    • -
  • 13. Experimental Alternative Input Representations
    • -
  • 13.1 Alternative Xml
    • -
  • 13.1.1 Xml Sax Representation
    • -
  • 13.1.2 Xml Dom Representation
    • -
  • 13.1.3 Xml Node Representation
    • -
  • 14. Configuration
    • -
  • 14.1 Determining the Current Configuration
    • -
  • 14.2 Configuration Files (config.yml)
    • -
  • 15. Skins
    • -
  • 15.1 Document Skin
    • -
  • 15.2 Directory Skin
    • -
  • 15.3 Site Skin
    • -
  • 15.4 Sample Skins
    • -
  • 16. Css - Cascading Style Sheets (for Html, Xhtml and Xml)
    • -
  • 17. Organising Content
    • -
  • 17.1 Directory Structure and Mapping
    • -
  • 18. Homepages
    • -
  • 18.1 Home Page and Other Custom Built Pages in a Sub-directory
    • -
  • 18.2 Home Page Within a Skin
    • -
  • 19. Markup and Output Examples
    • -
  • 19.1 Markup Examples
    • -
  • 20. Sisu Search - Introduction
    • -
  • 21. Sql
    • -
  • 21.1 Populating Sql Type Databases
    • -
  • 22. Postgresql
    • -
  • 22.1 Name
    • -
  • 22.2 Description
    • -
  • 22.3 Synopsis
    • -
  • 22.4 Commands
    • -
  • 22.4.1 Create and Destroy Database
    • -
  • 22.4.2 Import and Remove Documents
    • -
  • 23. Sqlite
    • -
  • 23.1 Name
    • -
  • 23.2 Description
    • -
  • 23.3 Synopsis
    • -
  • 23.4 Commands
    • -
  • 23.4.1 Create and Destroy Database
    • -
  • 23.4.2 Import and Remove Documents
    • -
  • 24. Introduction
    • -
  • 24.1 Search - Database Frontend Sample, Utilising Database and Sisu Features,
    • -
  • 24.2 Search Form
    • -
  • 25. Hyperestraier
    • -
  • 26. Sisu_webrick
    • -
  • 26.1 Name
    • -
  • 26.2 Synopsis
    • -
  • 26.3 Description
    • -
  • 26.4 Summary of Man Page
    • -
  • 26.5 Document Processing Command Flags
    • -
  • 26.6 Further Information
    • -
  • 26.7 Author
    • -
  • 26.8 See Also
    • -
  • 27. Remote Source Documents
    • -
  • Remote Document Output
    • -
  • 28. Remote Output
    • -
  • 28.1 Commands
    • -
  • 28.2 Configuration
    • -
  • 29. Remote Servers
    • -
  • 30. Quickstart - Getting Started Howto
    • -
  • 30.1 Installation
    • -
  • 30.1.1 Debian Installation
    • -
  • 30.1.2 Rpm Installation
    • -
  • 30.1.3 Installation from Source
    • -
  • 30.2 Testing Sisu, Generating Output
    • -
  • 30.2.1 Basic Text, Plaintext, Html, Xml, Odf, Epub
    • -
  • 30.2.2 LaTeX / Pdf
    • -
  • 30.2.3 Relational Database - Postgresql, Sqlite
    • -
  • 30.3 Getting Help
    • -
  • 30.3.1 the Man Pages
    • -
  • 30.3.2 Built in Help
    • -
  • 30.3.3 the Home Page
    • -
  • 30.4 Markup Samples
    • -
  • 31. Editor Files, Syntax Highlighting
    • -
  • 32. How Does Sisu Work?
    • -
  • 33. Summary of Features
    • -
  • 34. Help Sources
    • -
  • 34.1 Man Pages
    • -
  • 34.2 Sisu Generated Output - Links to HTML
    • -
  • 34.2.1 Www.sisudoc.org
    • -
  • 34.3 Man2html
    • -
  • 34.3.1 Locally Installed
    • -
  • 34.3.2 WWW.jus.uio.no/sisu
    • -
  • See Also
    • -
  • Homepage
    • -
  • Author
    • +
  • 9.7 Additional Breaks - Linebreaks Within Objects, Column and Page-breaks
    • +
  • 9.7.1 Line-breaks
    • +
  • 9.7.2 Page Breaks
    • +
  • 9.8 Book Index
    • +
  • 10. Composite Documents Markup
    • +
  • Markup Syntax History
    • +
  • 11. Notes Related to Files-types and Markup Syntax
    • +
  • 12. Sisu Filetypes
    • +
  • 12.1 .sst .ssm .ssi Marked Up Plain Text
    • +
  • 12.1.1 Sisu Text - Regular Files (.sst)
    • +
  • 12.1.2 Sisu Master Files (.ssm)
    • +
  • 12.1.3 Sisu Insert Files (.ssi)
    • +
  • 12.2 Sisupod, Zipped Binary Container (sisupod.zip, .ssp)
    • +
  • 13. Experimental Alternative Input Representations
    • +
  • 13.1 Alternative Xml
    • +
  • 13.1.1 Xml Sax Representation
    • +
  • 13.1.2 Xml Dom Representation
    • +
  • 13.1.3 Xml Node Representation
    • +
  • 14. Configuration
    • +
  • 14.1 Determining the Current Configuration
    • +
  • 14.2 Configuration Files (config.yml)
    • +
  • 15. Skins
    • +
  • 15.1 Document Skin
    • +
  • 15.2 Directory Skin
    • +
  • 15.3 Site Skin
    • +
  • 15.4 Sample Skins
    • +
  • 16. Css - Cascading Style Sheets (for Html, Xhtml and Xml)
    • +
  • 17. Organising Content
    • +
  • 17.1 Directory Structure and Mapping
    • +
  • 18. Homepages
    • +
  • 18.1 Home Page and Other Custom Built Pages in a Sub-directory
    • +
  • 18.2 Home Page Within a Skin
    • +
  • 19. Markup and Output Examples
    • +
  • 19.1 Markup Examples
    • +
  • 20. Sisu Search - Introduction
    • +
  • 21. Sql
    • +
  • 21.1 Populating Sql Type Databases
    • +
  • 22. Postgresql
    • +
  • 22.1 Name
    • +
  • 22.2 Description
    • +
  • 22.3 Synopsis
    • +
  • 22.4 Commands
    • +
  • 22.4.1 Create and Destroy Database
    • +
  • 22.4.2 Import and Remove Documents
    • +
  • 23. Sqlite
    • +
  • 23.1 Name
    • +
  • 23.2 Description
    • +
  • 23.3 Synopsis
    • +
  • 23.4 Commands
    • +
  • 23.4.1 Create and Destroy Database
    • +
  • 23.4.2 Import and Remove Documents
    • +
  • 24. Introduction
    • +
  • 24.1 Search - Database Frontend Sample, Utilising Database and Sisu Features,
    • +
  • 24.2 Search Form
    • +
  • 25. Sisu_webrick
    • +
  • 25.1 Name
    • +
  • 25.2 Synopsis
    • +
  • 25.3 Description
    • +
  • 25.4 Summary of Man Page
    • +
  • 25.5 Document Processing Command Flags
    • +
  • 25.6 Further Information
    • +
  • 25.7 Author
    • +
  • 25.8 See Also
    • +
  • 26. Remote Source Documents
    • +
  • Remote Document Output
    • +
  • 27. Remote Output
    • +
  • 27.1 Commands
    • +
  • 27.2 Configuration
    • +
  • 28. Remote Servers
    • +
  • 29. Quickstart - Getting Started Howto
    • +
  • 29.1 Installation
    • +
  • 29.1.1 Debian Installation
    • +
  • 29.1.2 Rpm Installation
    • +
  • 29.1.3 Installation from Source
    • +
  • 29.2 Testing Sisu, Generating Output
    • +
  • 29.2.1 Basic Text, Plaintext, Html, Xml, Odf, Epub
    • +
  • 29.2.2 LaTeX / Pdf
    • +
  • 29.2.3 Relational Database - Postgresql, Sqlite
    • +
  • 29.3 Getting Help
    • +
  • 29.3.1 the Man Pages
    • +
  • 29.3.2 Built in Help
    • +
  • 29.3.3 the Home Page
    • +
  • 29.4 Markup Samples
    • +
  • 30. Editor Files, Syntax Highlighting
    • +
  • 31. How Does Sisu Work?
    • +
  • 32. Summary of Features
    • +
  • 33. Help Sources
    • +
  • 33.1 Man Pages
    • +
  • 33.2 Sisu Generated Output - Links to HTML
    • +
  • 33.2.1 Www.sisudoc.org
    • +
  • 33.3 Man2html
    • +
  • 33.3.1 Locally Installed
    • +
  • 33.3.2 Www.jus.uio.no/Sisu
    • +
  • See Also
    • +
  • Homepage
    • +
  • Author
    • diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm index c26aeabd..89d8556a 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu.ssm @@ -86,8 +86,6 @@ << sisu_search_cgi.ssi -<< sisu_hyperestraier.ssi - << sisu_webrick.sst << sisu_remote.sst diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst index 36e1bb9c..a5f380a9 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_commands.sst @@ -208,7 +208,7 @@ see --rsync see --scp !_ --sample-search-form [--webserv=webrick]
    -generate examples of (naive) cgi search form for sqlite and pgsql depends on your already having used sisu to populate an sqlite and/or pgsql database, (the sqlite version scans the output directories for existing sisu_sqlite databases, so it is first necessary to create them, before generating the search form) see -d -D and the database section below. If the optional parameter --webserv=webrick is passed, the cgi examples created will be set up to use the default port set for use by the webrick server, (otherwise the port is left blank and the system setting used, usually 80). The samples are dumped in the present work directory which must be writable, (with screen instructions given that they be copied to the cgi-bin directory). -Fv (in addition to the above) provides some information on setting up hyperestraier for sisu. Alias -F +generate examples of (naive) cgi search form for sqlite and pgsql depends on your already having used sisu to populate an sqlite and/or pgsql database, (the sqlite version scans the output directories for existing sisu_sqlite databases, so it is first necessary to create them, before generating the search form) see -d -D and the database section below. If the optional parameter --webserv=webrick is passed, the cgi examples created will be set up to use the default port set for use by the webrick server, (otherwise the port is left blank and the system setting used, usually 80). The samples are dumped in the present work directory which must be writable, (with screen instructions given that they be copied to the cgi-bin directory). Alias -F !_ --scp [filename/wildcard]
    copies sisu output files to remote host using scp. This requires that sisurc.yml has been provided with information on hostname and username, and that you have your "keys" and ssh agent in place. Also see --rsync. Alias -r diff --git a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst index 65dc4e91..a246d160 100644 --- a/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst +++ b/data/doc/sisu/markup-samples/sisu_manual/sisu_markup.sst @@ -1108,6 +1108,45 @@ code{# }code +2~ Additional breaks - linebreaks within objects, column and page-breaks + +3~ line-breaks + +To break a line within a "paragraph object", two backslashes \\\\ \\ with a space before and a space or newline after them \\ may be used. + +code{ + +To break a line within a "paragraph object", +two backslashes \\ with a space before +and a space or newline after them \\ +may be used. + +}code + +The html break br enclosed in angle brackets (though undocumented) is available in versions prior to 3.0.13 and 2.9.7 (it remains available for the time being, but is depreciated). + +3~ page breaks + +Page breaks are only relevant and honored in some output formats. A page break or a new page may be inserted manually using the following markup on a line on its own: + +code{ + +<:pb> + +}code + +or + +code{ + +<:pn> + +}code + +page new <:pn> breaks the page, starts a new page. + +page break <:pb> breaks a column, starts a new column, if using columns, else breaks the page, starts a new page. + 2~ Book index To make an index append to paragraph the book index term relates to it, using an equal sign and curly braces. diff --git a/man/man1/sisu.1 b/man/man1/sisu.1 index c152d5eb..2994ef64 100644 --- a/man/man1/sisu.1 +++ b/man/man1/sisu.1 @@ -1,4 +1,4 @@ -.TH "sisu" "1" "2011\-04\-17" "3.0.7\-beta\-rb1.9.2p180" "SiSU" +.TH "sisu" "1" "2011-06-24" "3.0.13-beta-rb1.9.2p180" "SiSU" .br .SH NAME .br @@ -174,8 +174,7 @@ system to reliably reference its documents. works well in a complementary manner with such collaborative technologies as Wikis, which can take advantage of and be used to discuss the substance of content prepared in -.B SiSU -. +.B SiSU. .br @@ -1266,12 +1265,9 @@ normally be marked 1.1.1 or 1.1.2 or 1.2.1 or 2.1.1 etc. in a document .br normal text, -.B emphasis -, -.B bold text -, -.I italics -, +.B emphasis, +.B bold text, +.I italics, .I underscore , "citation", ^superscript^, [subscript], ++inserted text++, \-\-strikethrough\-\-, monospace @@ -2098,7 +2094,53 @@ tag code{# as demonstrated here: 44 | death."' .fi -.SH 9.7 BOOK INDEX +.SH 9.7 ADDITIONAL BREAKS \- LINEBREAKS WITHIN OBJECTS, COLUMN AND PAGE\-BREAKS + +.SH 9.7.1 LINE\-BREAKS + +.br +To break a line within a "paragraph object", two backslashes \e\e +with a space before and a space or newline after them +may be used. + +.nf + To break a line within a "paragraph object", + two backslashes \e\e with a space before + and a space or newline after them \e\e + may be used. +.fi + +.br +The html break br enclosed in angle brackets (though undocumented) is available +in versions prior to 3.0.13 and 2.9.7 (it remains available for the time being, +but is depreciated). + +.SH 9.7.2 PAGE BREAKS + +.br +Page breaks are only relevant and honored in some output formats. A page break +or a new page may be inserted manually using the following markup on a line on +its own: + +.nf + <:pb> +.fi + +.br +or + +.nf + <:pn> +.fi + +.br +page new <:pn> breaks the page, starts a new page. + +.br +page break <:pb> breaks a column, starts a new column, if using columns, else +breaks the page, starts a new page. + +.SH 9.8 BOOK INDEX .br To make an index append to paragraph the book index term relates to it, using @@ -2945,8 +2987,8 @@ appearance. .B SiSU 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, +.B SiSU. +More accurately, .B SiSU has a default home page, which will not be appropriate for use with other sites, and the means to provide your own home page instead in one of two ways @@ -3357,125 +3399,16 @@ installed The generated search form must be copied manually to the webserver directory as instructed -.SH 25. HYPERESTRAIER -.br - -.br -See the documentation for hyperestraier: - -.br - - -.br - /usr/share/doc/hyperestraier/index.html - -.br - man estcmd - -.br -NOTE: the examples that follow assume that sisu output is placed in the -directory /home/ralph/sisu_www - -.br -(A) to generate the index within the webserver directory to be indexed: - -.br - estcmd gather \-sd [index \ name] [directory \ path \ to \ index] - -.br -the following are examples that will need to be tailored according to your -needs: - -.br - cd /home/ralph/sisu_www - -.br - 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 \- - -.br -Check which directories in the webserver/output directory (~/sisu_www or -elsewhere depending on configuration) you wish to include in the search index. - -.br -As sisu duplicates output in multiple file formats, it it is probably -preferable to limit the estraier index to html output, and as it may also be -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 \- - -.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 \ - 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 \- - -.br -(B) to set up the search form - +.SH 25. SISU_WEBRICK .br -(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 - -.br - sudo chmod \-v 755 /usr/lib/cgi\-bin/estseek.cgi - -.br - sudo cp \-v /usr/share/hyperestraier/estseek.* /usr/lib/cgi\-bin - -.br - [see \ estraier \ documentation \ for \ paths] - -.br -(ii) edit estseek.conf, with attention to the lines starting 'indexname:' and -'replace:': - -.br - indexname: /home/ralph/sisu_www/casket - -.br - replace: ^file:///home/ralph/sisu_www{{!}}http://localhost - -.br - replace: /index.html?${{!}}/ - -.br -(C) to test using webrick, start webrick: - -.br - sisu \-W - -.br -and try open the url: - -.SH 26. SISU_WEBRICK -.br - -.SH 26.1 NAME +.SH 25.1 NAME .br .B SiSU \- Structured information, Serialized Units \- a document publishing system -.SH 26.2 SYNOPSIS +.SH 25.2 SYNOPSIS .br sisu_webrick [port] @@ -3486,7 +3419,7 @@ or .br sisu \-W [port] -.SH 26.3 DESCRIPTION +.SH 25.3 DESCRIPTION .br sisu_webrick is part of @@ -3504,7 +3437,7 @@ The default port for sisu_webrick is set to 8081, this may be modified in the yaml file: ~/.sisu/sisurc.yml a sample of which is provided as /etc/sisu/sisurc.yml (or in the equivalent directory on your system). -.SH 26.4 SUMMARY OF MAN PAGE +.SH 25.4 SUMMARY OF MAN PAGE .br sisu_webrick, may be started on it's own with the command: sisu_webrick [port] @@ -3513,7 +3446,7 @@ 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 -.SH 26.5 DOCUMENT PROCESSING COMMAND FLAGS +.SH 25.5 DOCUMENT PROCESSING COMMAND FLAGS .br sisu \-W [port] starts @@ -3523,7 +3456,7 @@ Webrick web\-server, serving 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 -.SH 26.6 FURTHER INFORMATION +.SH 25.6 FURTHER INFORMATION .br For more information on @@ -3533,12 +3466,12 @@ see: or .br or man sisu -.SH 26.7 AUTHOR +.SH 25.7 AUTHOR .br Ralph Amissah or -.SH 26.8 SEE ALSO +.SH 25.8 SEE ALSO .br sisu(1) @@ -3546,7 +3479,7 @@ Ralph Amissah or .br sisu_vim(7) -.SH 27. REMOTE SOURCE DOCUMENTS +.SH 26. REMOTE SOURCE DOCUMENTS .br .br @@ -3607,7 +3540,7 @@ desired document. .SH REMOTE DOCUMENT OUTPUT .br -.SH 28. REMOTE OUTPUT +.SH 27. REMOTE OUTPUT .br .br @@ -3626,7 +3559,7 @@ be used in conjunction with other processing flags, e.g. sisu \-3R sisu_remote.sst .fi -.SH 28.1 COMMANDS +.SH 27.1 COMMANDS .TP .B \-R [filename/wildcard] @@ -3643,12 +3576,12 @@ 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 -.SH 28.2 CONFIGURATION +.SH 27.2 CONFIGURATION .br [expand \ on \ the \ setting \ up \ of \ an \ ssh\-agent \ / \ keychain] -.SH 29. REMOTE SERVERS +.SH 28. REMOTE SERVERS .br .br @@ -3661,10 +3594,10 @@ 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 29. QUICKSTART \- GETTING STARTED HOWTO .br -.SH 30.1 INSTALLATION +.SH 29.1 INSTALLATION .br Installation is currently most straightforward and tested on the @@ -3672,7 +3605,7 @@ Installation is currently most straightforward and tested on the platform, as there are packages for the installation of sisu and all requirements for what it does. -.SH 30.1.1 DEBIAN INSTALLATION +.SH 29.1.1 DEBIAN INSTALLATION .br .B SiSU @@ -3736,7 +3669,7 @@ 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. -.SH 30.1.2 RPM INSTALLATION +.SH 29.1.2 RPM INSTALLATION .br RPMs are provided though untested, they are prepared by running alien against @@ -3754,7 +3687,7 @@ as root type: .br rpm \-i [rpm \ package \ name] -.SH 30.1.3 INSTALLATION FROM SOURCE +.SH 29.1.3 INSTALLATION FROM SOURCE .br To install @@ -3779,8 +3712,8 @@ first steps are the same, download and unpack the source file: For basic use .B SiSU is only dependent on the programming language in which it is written -.B Ruby -, and +.B Ruby, +and .B SiSU will be able to generate html, EPUB, various XMLs, including ODF (and will also produce LaTeX). Dependencies required for further actions, though it @@ -3861,7 +3794,7 @@ For a list of alternative actions you may type: .br ruby install \-T -.SH 30.2 TESTING SISU, GENERATING OUTPUT +.SH 29.2 TESTING SISU, GENERATING OUTPUT .br To check which version of sisu is installed: @@ -3888,7 +3821,7 @@ change directory to the appropriate one: .br cd /usr/share/doc/sisu/markup\-samples/samples -.SH 30.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB +.SH 29.2.1 BASIC TEXT, PLAINTEXT, HTML, XML, ODF, EPUB .br Having moved to the directory that contains the markup samples (see @@ -3901,7 +3834,7 @@ sisu \-NhwoabxXyv free_as_in_freedom.rms_and_free_software.sam_williams.sst this will generate html including a concordance file, opendocument text format, plaintext, XHTML and various forms of XML, and OpenDocument text -.SH 30.2.2 LATEX / PDF +.SH 29.2.2 LATEX / PDF .br Assuming a LaTeX engine such as tetex or texlive is installed with the required @@ -3924,7 +3857,7 @@ 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 29.2.3 RELATIONAL DATABASE \- POSTGRESQL, SQLITE .br Relational databases need some setting up \- you must have permission to create @@ -3947,9 +3880,9 @@ sisu \-\-pgsql \-\-recreate sisu \-\-pgsql \-v \-\-import free_as_in_freedom.rms_and_free_software.sam_williams.sst -.SH 30.3 GETTING HELP +.SH 29.3 GETTING HELP -.SH 30.3.1 THE MAN PAGES +.SH 29.3.1 THE MAN PAGES .br Type: @@ -3970,7 +3903,7 @@ as within the package itself: .br * man directory [^27] -.SH 30.3.2 BUILT IN HELP +.SH 29.3.2 BUILT IN HELP .br sisu \-\-help @@ -3984,7 +3917,7 @@ sisu \-\-help \-\-commands .br sisu \-\-help \-\-markup -.SH 30.3.3 THE HOME PAGE +.SH 29.3.3 THE HOME PAGE .br @@ -3995,7 +3928,7 @@ sisu \-\-help \-\-markup .br -.SH 30.4 MARKUP SAMPLES +.SH 29.4 MARKUP SAMPLES .br A number of markup samples (along with output) are available off: @@ -4016,7 +3949,7 @@ 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 +.SH 30. EDITOR FILES, SYNTAX HIGHLIGHTING .br .br @@ -4198,7 +4131,7 @@ NOTE: but, \ display \ linewrap \ (without \ line\-breaks) \ is \ a \ convenient \ editor \ feature \ to \ have \ for \ sisu \ markup] -.SH 32. HOW DOES SISU WORK? +.SH 31. HOW DOES SISU WORK? .br .br @@ -4222,7 +4155,7 @@ document layout, publishing, content certification, concordance etc.), and makes it possible to take advantage of some of the strengths of established ways of representing documents, (or indeed to create new ones). -.SH 33. SUMMARY OF FEATURES +.SH 32. SUMMARY OF FEATURES .br .br @@ -4382,10 +4315,10 @@ present. For example objects could be saved individually and identified by their hashes, with an index of how the objects relate to each other to form a document. -.SH 34. HELP SOURCES +.SH 33. HELP SOURCES .br -.SH 34.1 MAN PAGES +.SH 33.1 MAN PAGES .br man sisu @@ -4441,7 +4374,7 @@ document. .br man sisu_webrick -.SH 34.2 SISU GENERATED OUTPUT \- LINKS TO HTML +.SH 33.2 SISU GENERATED OUTPUT \- LINKS TO HTML .br Note @@ -4451,7 +4384,7 @@ documentation is prepared in and output is available in multiple formats including amongst others html, pdf, odf and epub, which may be also be accessed via the html pages[^29] -.SH 34.2.1 WWW.SISUDOC.ORG +.SH 33.2.1 WWW.SISUDOC.ORG .br @@ -4459,9 +4392,9 @@ pdf, odf and epub, which may be also be accessed via the html pages[^29] .br -.SH 34.3 MAN2HTML +.SH 33.3 MAN2HTML -.SH 34.3.1 LOCALLY INSTALLED +.SH 33.3.1 LOCALLY INSTALLED .br file:///usr/share/doc/sisu/html/sisu.1.html @@ -4481,7 +4414,7 @@ file:///usr/share/doc/sisu/html/sisu.1.html .br /usr/share/doc/sisu/html/sisu_webrick.1.html -.SH 34.3.2 WWW.jus.uio.no/sisu +.SH 33.3.2 WWW.JUS.UIO.NO/SISU .br -- cgit v1.2.3