From 8bac1a749de5fc43b8be049532798d67ad2f97f0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 31 Oct 2010 00:05:13 -0400 Subject: sha256 (2.7.8) --- CHANGELOG_v2 | 6 +++--- data/doc/sisu/v2/CHANGELOG | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index e55187cd..30c1b5b7 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz - sisu_2.7.8.orig.tar.gz - sisu_2.7.8-1.dsc - sisu_2.7.8-1.diff.gz + af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz + fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc + e0fac804d4309740916666120acef61c1a82b4b7cabca04e979d4fc8b57db8c2 289790 sisu_2.7.8-1.diff.gz [debian freeze, fix] diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 743786b4..1f3b2e98 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -14,9 +14,9 @@ Reverse Chronological: %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz - sisu_2.7.8.orig.tar.gz - sisu_2.7.8-1.dsc - sisu_2.7.8-1.diff.gz + af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz + fcaada42eb8e449b620c2f529c642fdb44e0c0466b9d8ecd6e769cf07f986a3d 1196 sisu_2.7.8-1.dsc + e0fac804d4309740916666120acef61c1a82b4b7cabca04e979d4fc8b57db8c2 289790 sisu_2.7.8-1.diff.gz [debian freeze, fix] -- cgit v1.2.3 From d6d33ae4e4600fae9016a30d4e95f122b745ec9b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 11 Nov 2010 19:48:32 -0500 Subject: open v2.7.9 --- data/sisu/v2/v/version.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 58135bb9..5b067620 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.7.8 -:date_stamp: 2010w43/1 -:date: "2010-10-25" +:version: 2.7.9 +:date_stamp: 2010w45/4 +:date: "2010-11-11" :project: SiSU -- cgit v1.2.3 From a64f0c80e52bd9434ce708d68aa0db95556bb848 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 11 Nov 2010 19:49:05 -0500 Subject: texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong) --- CHANGELOG_v2 | 11 +++++++++++ data/doc/sisu/v2/CHANGELOG | 11 +++++++++++ lib/sisu/v2/texpdf_format.rb | 12 ++++++++---- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 30c1b5b7..f18f250c 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,6 +12,17 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.9.orig.tar.gz (2010-11-11:45/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz + sisu_2.7.9.orig.tar.gz + sisu_2.7.9-1.dsc + sisu_2.7.9-1.diff.gz + + [debian freeze, fix] + + * texpdf, use of monospace in headings causes table of contents breakage, fix + (requested fix, Ben Armstrong) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 1f3b2e98..07deff41 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,6 +12,17 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 2.7.9.orig.tar.gz (2010-11-11:45/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz + sisu_2.7.9.orig.tar.gz + sisu_2.7.9-1.dsc + sisu_2.7.9-1.diff.gz + + [debian freeze, fix] + + * texpdf, use of monospace in headings causes table of contents breakage, fix + (requested fix, Ben Armstrong) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index 465d4d90..aae545cb 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -210,8 +210,9 @@ module SiSU_TeX_Pdf dob=@dob title=@md.title.full dob.tmp.strip! if dob.tmp - dob.tmp.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') + dob.tmp.gsub!(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2') cont_ln=dob.tmp.dup + cont_ln.gsub!(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2') cont_ln.gsub!(@@tex_pattern_margin_number,'') clearp=(dob.lv =~/B/ && dob.obj =='Metadata') ? "\\clearpage\n" : '' if dob.tmp =~/\\[Ff]ootnote/ #and dob =~/^[1-6]#{Tex[:tilde]}/ # removing footnotes from headings! @@ -227,8 +228,9 @@ module SiSU_TeX_Pdf def level4 dob=@dob dob.tmp.strip! if dob.tmp - dob.tmp.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') + dob.tmp.gsub!(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2') cont_ln=dob.tmp.dup + cont_ln.gsub!(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2') cont_ln.gsub!(@@tex_pattern_margin_number,'') cont_ln.gsub!(/#{Tex[:backslash]*2}/,"#{Tex[:backslash]*4}") # added w42 cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 @@ -250,8 +252,9 @@ module SiSU_TeX_Pdf dob=@dob # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\@txt*, same for next section 2002w46 dob.tmp.strip! if dob.tmp - dob.tmp.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') + dob.tmp.gsub!(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2') cont_ln=dob.tmp.dup + cont_ln.gsub!(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2') cont_ln.gsub!(@@tex_pattern_margin_number,'') cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 cont_ln.gsub!(/\\Footnote[A]\{[*+]+\d*\}\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 @@ -270,8 +273,9 @@ module SiSU_TeX_Pdf dob=@dob # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\sub@txt*, same for previous section 2002w46 dob.tmp.strip! if dob.tmp - dob.tmp.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') + dob.tmp.gsub!(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2') cont_ln=dob.tmp.dup + cont_ln.gsub!(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2') cont_ln.gsub!(@@tex_pattern_margin_number,'') cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 cont_ln.gsub!(/\\Footnote[A]\{[*+]+\d*\}\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 -- cgit v1.2.3 From e54d00b5d0e4c974619dd919697894825e6ecdc4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 29 Nov 2010 13:37:21 -0500 Subject: html & css: ocn (object numbers) now link to themselves * jumps to top of browser * provides link url (requested, Ben Armstrong (live-manual)) --- CHANGELOG_v2 | 38 +++++++++++++++++++++----------------- data/doc/sisu/v2/CHANGELOG | 38 +++++++++++++++++++++----------------- data/sisu/v2/v/version.yml | 4 ++-- lib/sisu/v2/css.rb | 4 ++++ lib/sisu/v2/html_format.rb | 2 +- 5 files changed, 49 insertions(+), 37 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index f18f250c..ef79bea5 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-11:45/4) +%% 2.7.9.orig.tar.gz (2010-11-29:48/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -21,7 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] * texpdf, use of monospace in headings causes table of contents breakage, fix - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) + + * html & css, ocn (object numbers) now link to themselves, clicking on one + places that object at the top of the browser and provides its url + (requested, Ben Armstrong (live-manual)) %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz @@ -46,21 +50,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz * internal links * dal, exclude parentheses and square brackets from matching - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * html, remove space between link & following punctuation, parentheses &/or square brackets - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * epub, remove space between link & following punctuation, parentheses &/or square brackets * html * remove "copy @" mark - (requested, Daniel Baumann) + (requested, Daniel Baumann (live-manual)) * segments, title banner (including "copy @" mark) configurable, boolean, true/false (default false) - (requested off option, Daniel Baumann) + (requested off option, Daniel Baumann (live-manual)) * quick ref links_guide configurable, boolean, true/false (default false) - (requested off option, Daniel Baumann) + (requested off option, Daniel Baumann (live-manual)) * config.yml * html, seg title banner, boolean true/false setting (commented out, @@ -78,7 +82,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz * numbered codeblocks, fix, where codeblock opens with code{# (requested fix needed by debian-live:live-manual, Ben Armstrong, Mark - Schneider & Daniel Baumann) + Schneider & Daniel Baumann (live-manual)) * dal changes as required, flag markup request and number * constants, provide vertical line symbol, use to separate numbered codeblock from code @@ -86,11 +90,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz * texpdf, first space following a bullet should be fixed width, fix (used \enspace (0.5em)) - (requested fix and suggested latex solution, Ben Armstrong) + (requested fix and suggested latex solution, Ben Armstrong (live-manual)) * texpdf, bullet text, hanging indent, fix works for regular text (not grouped text) - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * texpdf, codeblocks do not permit empty lines, fix @@ -105,7 +109,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz [debian freeze, fix] * texpdf, codeblocks, code-line continuation backslash dropped, fix - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * shared_metadata, odf, url characters to not match @@ -140,7 +144,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz [debian freeze, fix] * image scaling, requested fixes - (behaviour testing & request by Mark Schneider) + (behaviour testing & request by Mark Schneider (live-manual)) * texpdf, scaling of images (below the set maximum size), fix * odf:odt, incorporation and scaling of images, fix * html (html_tune) scaling of images, fix @@ -178,7 +182,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz [debian freeze, fix] * hub, test whether user name set, fix - (requested fix, provided by Ben Armstrong) + (requested fix, provided by Ben Armstrong (live-manual)) * epub, fix breakage where angle brackets used in used metadata header @@ -199,12 +203,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * texpdf * provide line-break-points for long directory names - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * a5, increase headheight (11pt from 8pt) * shared_metadata * odt, fix breakage where angle brackets used in metadata headers - (requested fix, Daniel Baumann) + (requested fix, Daniel Baumann (live-manual)) * a typo fix * param, a few fixes (checks, aliases, typo) @@ -290,7 +294,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz * html_format, epub_format: subtoc, footnote content bug (fix) * odf: lt (<), gt (>) fix for codeblocks; & fix, messy - (requested fix, Daniel Baumann) + (requested fix, Daniel Baumann (live-manual)) * epub_format, removed some title & author info, check @@ -440,7 +444,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz sisu-pdf, sisu-html, sisu-odf, sisu-epub, sisu-txt, sisu-pg, sisu-sqlite * monospace - (requested feature Daniel Baumann) + (requested feature Daniel Baumann (live-manual)) * dal_syntax, constants, introduce #{ monospace }# tag * monospace font for codeblocks and #{ monospace }# tag * vim syntax, recognize #{ monospace }# tag diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 07deff41..6a96149c 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-11:45/4) +%% 2.7.9.orig.tar.gz (2010-11-29:48/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -21,7 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] * texpdf, use of monospace in headings causes table of contents breakage, fix - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) + + * html & css, ocn (object numbers) now link to themselves, clicking on one + places that object at the top of the browser and provides its url + (requested, Ben Armstrong (live-manual)) %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz @@ -46,21 +50,21 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz * internal links * dal, exclude parentheses and square brackets from matching - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * html, remove space between link & following punctuation, parentheses &/or square brackets - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * epub, remove space between link & following punctuation, parentheses &/or square brackets * html * remove "copy @" mark - (requested, Daniel Baumann) + (requested, Daniel Baumann (live-manual)) * segments, title banner (including "copy @" mark) configurable, boolean, true/false (default false) - (requested off option, Daniel Baumann) + (requested off option, Daniel Baumann (live-manual)) * quick ref links_guide configurable, boolean, true/false (default false) - (requested off option, Daniel Baumann) + (requested off option, Daniel Baumann (live-manual)) * config.yml * html, seg title banner, boolean true/false setting (commented out, @@ -78,7 +82,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz * numbered codeblocks, fix, where codeblock opens with code{# (requested fix needed by debian-live:live-manual, Ben Armstrong, Mark - Schneider & Daniel Baumann) + Schneider & Daniel Baumann (live-manual)) * dal changes as required, flag markup request and number * constants, provide vertical line symbol, use to separate numbered codeblock from code @@ -86,11 +90,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz * texpdf, first space following a bullet should be fixed width, fix (used \enspace (0.5em)) - (requested fix and suggested latex solution, Ben Armstrong) + (requested fix and suggested latex solution, Ben Armstrong (live-manual)) * texpdf, bullet text, hanging indent, fix works for regular text (not grouped text) - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * texpdf, codeblocks do not permit empty lines, fix @@ -105,7 +109,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz [debian freeze, fix] * texpdf, codeblocks, code-line continuation backslash dropped, fix - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * shared_metadata, odf, url characters to not match @@ -140,7 +144,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz [debian freeze, fix] * image scaling, requested fixes - (behaviour testing & request by Mark Schneider) + (behaviour testing & request by Mark Schneider (live-manual)) * texpdf, scaling of images (below the set maximum size), fix * odf:odt, incorporation and scaling of images, fix * html (html_tune) scaling of images, fix @@ -178,7 +182,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz [debian freeze, fix] * hub, test whether user name set, fix - (requested fix, provided by Ben Armstrong) + (requested fix, provided by Ben Armstrong (live-manual)) * epub, fix breakage where angle brackets used in used metadata header @@ -199,12 +203,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * texpdf * provide line-break-points for long directory names - (requested fix, Ben Armstrong) + (requested fix, Ben Armstrong (live-manual)) * a5, increase headheight (11pt from 8pt) * shared_metadata * odt, fix breakage where angle brackets used in metadata headers - (requested fix, Daniel Baumann) + (requested fix, Daniel Baumann (live-manual)) * a typo fix * param, a few fixes (checks, aliases, typo) @@ -290,7 +294,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz * html_format, epub_format: subtoc, footnote content bug (fix) * odf: lt (<), gt (>) fix for codeblocks; & fix, messy - (requested fix, Daniel Baumann) + (requested fix, Daniel Baumann (live-manual)) * epub_format, removed some title & author info, check @@ -440,7 +444,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.0.orig.tar.gz sisu-pdf, sisu-html, sisu-odf, sisu-epub, sisu-txt, sisu-pg, sisu-sqlite * monospace - (requested feature Daniel Baumann) + (requested feature Daniel Baumann (live-manual)) * dal_syntax, constants, introduce #{ monospace }# tag * monospace font for codeblocks and #{ monospace }# tag * vim syntax, recognize #{ monospace }# tag diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 5b067620..601713a3 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w45/4 -:date: "2010-11-11" +:date_stamp: 2010w48/1 +:date: "2010-11-29" :project: SiSU diff --git a/lib/sisu/v2/css.rb b/lib/sisu/v2/css.rb index 38913431..9856c0d0 100644 --- a/lib/sisu/v2/css.rb +++ b/lib/sisu/v2/css.rb @@ -261,6 +261,10 @@ WOK color: #000000; background-color: #f9f9aa; } + a.lnkocn:link { + color: #777777; + text-decoration: none; + } /* a:hover { border-bottom: 2px solid #777777; diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index c4758c5f..89ee812f 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -82,7 +82,7 @@ module SiSU_HTML_Format else ocn_class='ocn' @ocn.gsub(/^(\d+|)$/, - %{}) + %{}) end end def name -- cgit v1.2.3 From 371dfc5c468e44a329543322a968285b40f62253 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 29 Nov 2010 13:43:36 -0500 Subject: epub: ocn (object numbers) now link to themselves * jumps to top of viewer --- CHANGELOG_v2 | 3 +++ data/doc/sisu/v2/CHANGELOG | 3 +++ lib/sisu/v2/epub_format.rb | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index ef79bea5..0647cd47 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -27,6 +27,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz places that object at the top of the browser and provides its url (requested, Ben Armstrong (live-manual)) + * epub, ocn (object numbers) now link to themselves, clicking on one + places that object at the top of the viewer + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 6a96149c..11b6e850 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -27,6 +27,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz places that object at the top of the browser and provides its url (requested, Ben Armstrong (live-manual)) + * epub, ocn (object numbers) now link to themselves, clicking on one + places that object at the top of the viewer + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb index 761d771e..e016b011 100644 --- a/lib/sisu/v2/epub_format.rb +++ b/lib/sisu/v2/epub_format.rb @@ -82,7 +82,7 @@ module SiSU_EPUB_Format else ocn_class='ocn' @ocn.gsub(/^(\d+|)$/, - %{}) + %{}) end end def name @@ -142,6 +142,10 @@ module SiSU_EPUB_Format color: #003399; text-decoration: underline; } + a.lnkocn:link { + color: #777777; + text-decoration: none; + } div { margin-left: 0; margin-right: 0; -- cgit v1.2.3 From b4566320aa08e7311abd3659637921b3302f16bf Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 29 Nov 2010 13:53:17 -0500 Subject: texpdf: toc now contains level 3~ consistent with other output formats (requested fix, Ben Armstrong (live-manual)) --- CHANGELOG_v2 | 8 ++++++++ data/doc/sisu/v2/CHANGELOG | 8 ++++++++ lib/sisu/v2/texpdf_format.rb | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 0647cd47..6beafd0c 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -23,6 +23,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) + * texpdf, toc now contains level 3~ to be consistent with other output + formats + (requested fix, Ben Armstrong (live-manual) "all TOC for different formats + include headings for 1~ 2~ and 3~ *except* PDF which only has 1~ and 2~. i + consider this a bug. how do i fix it?") + (the fix is a workaround manually indenting level 3 further than + level 2 as both levels make use of LaTeX "subsubsection") + * html & css, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the browser and provides its url (requested, Ben Armstrong (live-manual)) diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 11b6e850..984fe865 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -23,6 +23,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) + * texpdf, toc now contains level 3~ to be consistent with other output + formats + (requested fix, Ben Armstrong (live-manual) "all TOC for different formats + include headings for 1~ 2~ and 3~ *except* PDF which only has 1~ and 2~. i + consider this a bug. how do i fix it?") + (the fix is a workaround manually indenting level 3 further than + level 2 as both levels make use of LaTeX "subsubsection") + * html & css, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the browser and provides its url (requested, Ben Armstrong (live-manual)) diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index aae545cb..732a903e 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -284,7 +284,9 @@ module SiSU_TeX_Pdf cont_ln.gsub!(/\s*\\Footnote[A]\{[*+]+\d*\}\{%\n .+? \}\s*/,' ') end dob.tmp.gsub!(/^(.*)?\n?$/m, - '\subsubsection*{\1}') + "\\subsubsection*{\\1} +\\addcontentsline{toc}{subsubsection}{~~~~#{cont_ln} \\\\ +}") dob end def indent -- cgit v1.2.3 From f0f647e331cf162d86bfe064e8710f3e29b8408e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 3 Dec 2010 23:47:08 -0500 Subject: html, link to "document manifest" remains (individual output links removed) --- CHANGELOG_v2 | 5 +- data/doc/sisu/v2/CHANGELOG | 5 +- data/sisu/v2/v/version.yml | 4 +- lib/sisu/v2/defaults.rb | 2 +- lib/sisu/v2/html_format.rb | 117 ++++----------------------------------------- 5 files changed, 21 insertions(+), 112 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 6beafd0c..ad6734a7 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-29:48/1) +%% 2.7.9.orig.tar.gz (2010-12-03:48/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer + * html, link to "document manifest" remains (links to other individual + outputs removed) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 984fe865..87c6cfb8 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-11-29:48/1) +%% 2.7.9.orig.tar.gz (2010-12-03:48/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer + * html, link to "document manifest" remains (links to other individual + outputs removed) + %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz af9dac02064ea03c61d6eecd0882a9f1be6f83d37fdddcf8e45832b9def52140 2750397 sisu_2.7.8.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 601713a3..339fa8ec 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w48/1 -:date: "2010-11-29" +:date_stamp: 2010w48/5 +:date: "2010-12-03" :project: SiSU diff --git a/lib/sisu/v2/defaults.rb b/lib/sisu/v2/defaults.rb index 362b67e5..a5305e4d 100644 --- a/lib/sisu/v2/defaults.rb +++ b/lib/sisu/v2/defaults.rb @@ -1134,7 +1134,7 @@ module SiSU_Viz end def nav_txt_manifest %{ - #{png_manifest}  + [ document manifest ] } end def nav_txt_concordance diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 89ee812f..66f9bc05 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -145,29 +145,13 @@ module SiSU_HTML_Format @cf_defaults=SiSU_Env::Info_processing_flag.new end def home - %{ - - #{@vz.nav_txt_homepage} - -} + '' end def scroll(text) - if @md.fns =~ /\.(?:-|ssm\.)?sst$/ - scroll=%{ - - #{text} - - -} - end + '' end def seg(text) - %{ - - #{text} - - -} + '' end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -181,66 +165,19 @@ module SiSU_HTML_Format } end def pdf - pdf=if @md.programs[:pdf] \ - and @cf_defaults.cf_0 =~/p/ - %{ - - - #{@vz.nav_txt_pdf_portrait} - - - - - #{@vz.nav_txt_pdf_landscape} - - -} - else '' - end + '' end def txt - txt=if @cf_defaults.cf_0 =~/[at]/ - %{ - - - #{@vz.nav_txt_plaintext} - -} - else '' - end + '' end def epub - epub=if @cf_defaults.cf_0 =~/e/ - %{ - - - #{@vz.nav_txt_epub} - -} - else '' - end + '' end def odf - odf=if @cf_defaults.cf_0 =~/o/ - %{ - - - #{@vz.nav_txt_odf} - -} - else '' - end + '' end def concordance(text) - if @md.concord_make \ - and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file - %{ - - #{text} - - } - else '' - end + '' end end class XML @@ -307,23 +244,7 @@ WOK

} end def seg_head_navigation_band_bottom(type='') - if type=~/pdf/ - @tocband_segtoc=make_scroll_seg_pdf - end - firstseg=%{ - #{@vz.png_nav_nxt} - } if @md.firstseg =~/\S+/ - %{ - - - +} end def scroll(text) - '' + if @md.fns =~ /\.(?:-|ssm\.)?sst$/ + scroll=%{ +} + end end def seg(text) - '' + %{ +} end def search env=SiSU_Env::Info_env.new(@md.fns,@md) @@ -164,20 +190,67 @@ module SiSU_HTML_Format } end - def pdf - '' + def pdf #retired 2.7.9 + pdf=if @md.programs[:pdf] \ + and @cf_defaults.cf_0 =~/p/ + %{ + + +} + else '' + end end - def txt - '' + def txt #retired 2.7.9 + txt=if @cf_defaults.cf_0 =~/[at]/ + %{ +} + else '' + end end - def epub - '' + def epub #retired 2.7.9 + epub=if @cf_defaults.cf_0 =~/e/ + %{ +} + else '' + end end - def odf - '' + def odf #retired 2.7.9 + odf=if @cf_defaults.cf_0 =~/o/ + %{ +} + else '' + end end - def concordance(text) - '' + def concordance(text) #retired 2.7.9 + if @md.concord_make \ + and @md.wc_words < 300000 #max word count for display of concordance here as would now be a large file + %{} + else '' + end end end class XML @@ -186,7 +259,6 @@ module SiSU_HTML_Format def initialize(md) super(md) @md=md - @tocband_scroll,@tocband_segtoc=make_scroll,make_seg end def scroll_head_navigation_band pdf=if @md.programs[:pdf] @@ -207,16 +279,10 @@ WOK

} end def concordance_navigation_band(type='') - if type=~/pdf/ - @tocband_concordance=make_concordance - end %{

-   - - #{@tocband_segtoc} - -  #{firstseg}  -#{@vz.table_close} -

} + '' end def manifest_link(text) %{ @@ -331,14 +252,7 @@ WOK } end def concordance_link(text) - if @md.concord_make - %{ - - #{text} - - } - else '' - end + '' end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -348,12 +262,8 @@ WOK } %{ - #{scroll} - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} - #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def make_scroll_seg_pdf @@ -365,13 +275,9 @@ WOK } %{ - #{seg} - #{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def make_concordance @@ -379,12 +285,9 @@ WOK wgt=Widget.new(@md) %{ - #{wgt.seg(@vz.nav_txt_toc_link)}#{wgt.scroll(@vz.nav_txt_doc_link)}#{wgt.pdf}#{wgt.odf}
- #{wgt.concordance(@vz.nav_txt_concordance)} #{wgt.manifest} #{wgt.search} - #{wgt.home}
} end def head -- cgit v1.2.3 From 74f7e0adab199936fd943b535f40359b08d40324 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 4 Dec 2010 12:43:58 -0500 Subject: html, link to "document manifest" & search form reviewed (testing required) --- CHANGELOG_v2 | 2 +- data/doc/sisu/v2/CHANGELOG | 2 +- data/sisu/v2/v/version.yml | 4 +- lib/sisu/v2/html.rb | 4 +- lib/sisu/v2/html_format.rb | 175 +++++++++++++++++++++++++++++---------------- lib/sisu/v2/sysenv.rb | 30 ++------ 6 files changed, 123 insertions(+), 94 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index ad6734a7..38a8978e 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-03:48/5) +%% 2.7.9.orig.tar.gz (2010-12-04:48/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 87c6cfb8..b87917d2 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-03:48/5) +%% 2.7.9.orig.tar.gz (2010-12-04:48/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 339fa8ec..ae204687 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w48/5 -:date: "2010-12-03" +:date_stamp: 2010w48/6 +:date: "2010-12-04" :project: SiSU diff --git a/lib/sisu/v2/html.rb b/lib/sisu/v2/html.rb index c984a858..ba2afabc 100644 --- a/lib/sisu/v2/html.rb +++ b/lib/sisu/v2/html.rb @@ -529,9 +529,7 @@ WOK prefix_b=format_head_toc.notes.prefix_b prefix_b=SiSU_HTML_Tune::Clean_html.new(prefix_b).clean end - @seg_toc_band=format_head_toc.seg_head_navigation_band('pdf') #bug, vary depending on type of doc !! examine - @seg_toc_band_bottom=format_head_toc.seg_head_navigation_band_bottom('pdf') #bug, vary depending on type of doc !! examine - @segtoc << @seg_toc_band + @segtoc << format_head_toc.seg_head_navigation_band toc_shared << format_head_toc.scroll_head_title_banner_open @segtoc << format_head_toc.seg_head_title_banner_open tmp_head=nil diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 66f9bc05..06d6d352 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -108,7 +108,17 @@ module SiSU_HTML_Format @seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || []) @index='index' @metalink='#metadata' - @tocband_scroll,@tocband_segtoc=nil,nil + end + def doc_types #used in toc & seg_nav_band + scroll=seg='' + wgt=Widget.new(@md) + %{ + + +
+ #{wgt.manifest} + #{wgt.search} +
} end def rdf SiSU_XML_tags::RDF.new(md) @@ -145,13 +155,29 @@ module SiSU_HTML_Format @cf_defaults=SiSU_Env::Info_processing_flag.new end def home - '' + %{

 + + #{@vz.nav_txt_homepage} + + + #{text} + + + + #{text} + + + + #{@vz.nav_txt_pdf_portrait} + + + + #{@vz.nav_txt_pdf_landscape} + + + + #{@vz.nav_txt_plaintext} + + + + #{@vz.nav_txt_epub} + + + + #{@vz.nav_txt_odf} + + + + #{text} + +
-
#{@vz.banner_band} - #{@tocband_concordance} -   #{@vz.png_nav_toc} @@ -225,6 +291,22 @@ WOK

} end def seg_head_navigation_band(type='') + firstseg=%{ + #{@vz.png_nav_nxt} + } if @md.firstseg =~/\S+/ + %{ + + +
+ #{@vz.banner_band} + + #{doc_types} + +  #{firstseg}  +#{@vz.table_close} +

} + end + def seg_head_navigation_band_bottom(type='') #retired 2.7.9 if type=~/pdf/ @tocband_segtoc=make_scroll_seg_pdf end @@ -233,7 +315,7 @@ WOK } if @md.firstseg =~/\S+/ %{
- #{@vz.banner_band} +   #{@tocband_segtoc} @@ -243,16 +325,20 @@ WOK #{@vz.table_close}

} end - def seg_head_navigation_band_bottom(type='') - '' - end def manifest_link(text) %{ #{text} } end - def concordance_link(text) - '' + def concordance_link(text) #retired 2.7.9 + if @md.concord_make + %{ + + #{text} + + } + else '' + end end def make_seg_scroll_pdf wgt=Widget.new(@md) @@ -467,11 +553,6 @@ WOK -
#{@vz.banner_band} - -
- #{@tocband_segtoc} -

 

@@ -636,36 +717,6 @@ WOK else '' end end - def doc_types #used in seg_nav_band ### - scroll=seg='' - wgt=Widget.new(@md) - x=if @md.concord_make - %{ - - - #{wgt.seg(@vz.nav_txt_toc_link)} - #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} -
- #{wgt.concordance(@vz.nav_txt_concordance)} - #{wgt.manifest} - #{wgt.search} - #{wgt.home} -
} - else - %{ - - - #{wgt.seg(@vz.nav_txt_toc_link)} - #{wgt.scroll(@vz.nav_txt_doc_link)} - #{wgt.txt}#{wgt.epub}#{wgt.pdf}#{wgt.odf} -
- #{wgt.manifest} - #{wgt.search} - #{wgt.home} -
} - end - end def navigation_table %{ -
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index ed955006..ef6d86c7 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1019,13 +1019,6 @@ module SiSU_Env end def search_form(type='sisusearch',action=nil,db=nil,table=false) rc=SiSU_Env::Get_init.instance.yamlrc - create_form_hyperestraier=if defined? rc['search']['sisu']['flag'] \ - and rc['search']['sisu']['flag']==true \ - and action \ - and action =~/https?:\/\// - true - else false - end create_form_sisu=if action \ and db \ and action =~/https?:\/\// \ @@ -1041,6 +1034,11 @@ module SiSU_Env end action=rc['search']['sisu']['action'] true + elsif defined? rc['search']['sisu']['flag'] \ + and defined? rc['search']['sisu']['action'] \ + and rc['search']['sisu']['flag']==true \ + and rc['search']['sisu']['action'] =~/https?:\/\// + true else false end if table @@ -1070,24 +1068,6 @@ module SiSU_Env #{table_close} -WOK - elsif create_form_hyperestraier \ - and type=~/hyperestraier/ \ - and defined? rc['search']['hyperestraier'] - < -#{table_open} - -
- - - - - -hyperestraier search - -#{table_close} - WOK else '' end -- cgit v1.2.3 From 67b6edcf9cde716d8370a5e7f88c11fc01d30f84 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 7 Dec 2010 09:36:10 -0500 Subject: document manifest link (plaintext, odf) * plaintext, link to "document manifest" fix(links to individual output types removed) * odf, manifest link fix * html, cosmetic touch --- CHANGELOG_v2 | 12 +++++++++--- data/doc/sisu/v2/CHANGELOG | 12 +++++++++--- data/sisu/v2/v/version.yml | 4 ++-- lib/sisu/v2/html_format.rb | 2 +- lib/sisu/v2/odf.rb | 2 +- lib/sisu/v2/plaintext.rb | 16 ++++++---------- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 38a8978e..b7a1f9d3 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-04:48/6) +%% 2.7.9.orig.tar.gz (2010-12-07:49/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,8 +38,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer - * html, link to "document manifest" remains (links to other individual - outputs removed) + * document manfest links + * html, link to "document manifest" remains (links to individual output + types removed) + * plaintext, link to "document manifest" fix(links to individual output + types removed) + * odf, manifest link fix + + * html search form, configuration check %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index b87917d2..2b21fb1b 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-04:48/6) +%% 2.7.9.orig.tar.gz (2010-12-07:49/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -38,8 +38,14 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz * epub, ocn (object numbers) now link to themselves, clicking on one places that object at the top of the viewer - * html, link to "document manifest" remains (links to other individual - outputs removed) + * document manfest links + * html, link to "document manifest" remains (links to individual output + types removed) + * plaintext, link to "document manifest" fix(links to individual output + types removed) + * odf, manifest link fix + + * html search form, configuration check %% 2.7.8.orig.tar.gz (2010-10-25:43/1) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index ae204687..ff542dd2 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w48/6 -:date: "2010-12-04" +:date_stamp: 2010w49/2 +:date: "2010-12-07" :project: SiSU diff --git a/lib/sisu/v2/html_format.rb b/lib/sisu/v2/html_format.rb index 06d6d352..8074a7ee 100644 --- a/lib/sisu/v2/html_format.rb +++ b/lib/sisu/v2/html_format.rb @@ -298,7 +298,7 @@ WOK
#{@vz.banner_band} + #{doc_types} diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb index ad1f45d1..769870eb 100644 --- a/lib/sisu/v2/odf.rb +++ b/lib/sisu/v2/odf.rb @@ -151,7 +151,7 @@ module SiSU_ODF end url=@md.fnb fn=@md.fn[:manifest] - manifest="#{@vz.url_root_http}/#{url}/#{fn}" + manifest="#{@env.url.root}/#{@md.fnb}/#{@md.fn[:manifest]}" @@odf[:tail] << %{Available document outputs:
<#{manifest}>} @@odf[:tail] << %{\nSiSU: <www.jus.uio.no/sisu> and <www.sisudoc.org>} @@odf[:tail] << "\n" diff --git a/lib/sisu/v2/plaintext.rb b/lib/sisu/v2/plaintext.rb index bc83702b..e919af78 100644 --- a/lib/sisu/v2/plaintext.rb +++ b/lib/sisu/v2/plaintext.rb @@ -117,7 +117,6 @@ module SiSU_Plaintext def initialize(data,md,wrap_width) @data,@md,@wrap_width=data,md,wrap_width @brace_url=SiSU_Viz::Skin.new.url_decoration - @vz=SiSU_Env::Get_init.instance.skin @tab="\t" @@endnotes_=case md.mod.inspect when /--footnote/; false @@ -188,7 +187,9 @@ WOK end def plaintext_tail SiSU_Env::Info_skin.new(@md).select + env=SiSU_Env::Info_env.new(@md.fns) vz=SiSU_Env::Get_init.instance.skin + base_url="#{env.url.root}/#{@md.fnb}" generator="Generated by: #{@md.sisu_version[:project]} #{@md.sisu_version[:version]} of #{@md.sisu_version[:date_stamp]} (#{@md.sisu_version[:date]})" if @md.sisu_version[:version] lastdone="Last Generated on: #{Time.now}" rubyv="Ruby version: #{@md.ruby_version}" @@ -198,18 +199,13 @@ WOK end @plaintext[:tail] <<< Date: Wed, 8 Dec 2010 13:18:02 -0500 Subject: dal, multiline-match to permit line-wrap on bullet text (and headings) (requested fix, Ben Armstrong (live-manual)) --- CHANGELOG_v2 | 6 +++++- data/doc/sisu/v2/CHANGELOG | 6 +++++- data/sisu/v2/v/version.yml | 4 ++-- lib/sisu/v2/dal_doc_str.rb | 10 +++++----- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index b7a1f9d3..37ef801f 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-07:49/2) +%% 2.7.9.orig.tar.gz (2010-12-08:49/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -20,6 +20,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] + * dal, bulleted text (and headings), multiline match, to permit line-wrapped + paragraphs + (requested fix, Ben Armstrong (live-manual)) + * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 2b21fb1b..6a687fca 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-07:49/2) +%% 2.7.9.orig.tar.gz (2010-12-08:49/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -20,6 +20,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] + * dal, bulleted text (and headings), multiline match, to permit line-wrapped + paragraphs + (requested fix, Ben Armstrong (live-manual)) + * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index ff542dd2..85592ab2 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w49/2 -:date: "2010-12-07" +:date_stamp: 2010w49/3 +:date: "2010-12-08" :project: SiSU diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb index 6eb2ee69..f1282df2 100644 --- a/lib/sisu/v2/dal_doc_str.rb +++ b/lib/sisu/v2/dal_doc_str.rb @@ -150,19 +150,19 @@ module SiSU_document_structure_extract when /^:?([A-C1-6])\~/ #heading / lv lv=$1 ln=ln_get(lv) - t_o=if t_o=~/^:?[A-C1-6]\~\s+(.+)/ + t_o=if t_o=~/^:?[A-C1-6]\~\s+(.+)/m obj=$1 note=endnote_test?(obj) obj,tags=extract_tags(obj) h={:lv=>lv,:ln=>ln,:obj=>obj,:idx=>idx,:tags=>tags} SiSU_document_structure::Object_heading.new.heading(h) - elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/ + elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/m name,obj=$1,$2 note=endnote_test?(obj) obj,tags=extract_tags(obj) h={:lv=>lv,:name=>name,:obj=>obj,:idx=>idx,:autonum_=>false,:tags=>tags} SiSU_document_structure::Object_heading.new.heading(h) - elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/ + elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/m name,obj=$1,$2 note=endnote_test?(obj) obj,tags=extract_tags(obj,name) @@ -171,7 +171,7 @@ module SiSU_document_structure_extract else nil end when /^(?:_[1-9]|_[1-9]?\*)\s+/ #indented and/or bullet paragraph - t_o=if t_o=~/^(_(?:[1-9]?\*|[1-9])\s+)(.+)/ + t_o=if t_o=~/^(_(?:[1-9]?\*|[1-9])\s+)(.+)/m tst,obj=$1,$2 indent=indent_test(tst) bullet=bullet_test(tst) @@ -182,7 +182,7 @@ module SiSU_document_structure_extract SiSU_document_structure::Object_para.new.paragraph(h) else nil end - when /^(?:?)\s*$/ #indented and/or bullet paragraph + when /^(?:?)\s*$/ if t_o =~/^(?:?)\s*$/ SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new]) else SiSU_document_structure::Object_layout.new.break(Hx[:br_page]) -- cgit v1.2.3 From 5f1bdade38a03dc9333d962dd2f2cb705da3d3f1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 9 Dec 2010 11:03:50 -0500 Subject: dal, markup syntax (fontface) multi-line match, for line-wrap text --- CHANGELOG_v2 | 12 ++++++++---- data/doc/sisu/v2/CHANGELOG | 12 ++++++++---- data/sisu/v2/v/version.yml | 4 ++-- lib/sisu/v2/dal_syntax.rb | 28 ++++++++++++++-------------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 37ef801f..37c7fb3f 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-08:49/3) +%% 2.7.9.orig.tar.gz (2010-12-09:49/4) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -20,9 +20,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] - * dal, bulleted text (and headings), multiline match, to permit line-wrapped - paragraphs - (requested fix, Ben Armstrong (live-manual)) + * dal, fix missing multiline regex matches for line-wrap text + (live-manual, to work better with po4a) + * dal_doc_str, bulleted text (and headings), multiline match, to permit + line-wrapped paragraphs + (requested fix, Ben Armstrong (live-manual)) + * dal_syntax, multiline match for fontface markup (emphasis, bold, italics, + underscore etc.) * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 6a687fca..b95b090a 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,7 +12,7 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.9.orig.tar.gz (2010-12-08:49/3) +%% 2.7.9.orig.tar.gz (2010-12-09:49/4) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz sisu_2.7.9.orig.tar.gz sisu_2.7.9-1.dsc @@ -20,9 +20,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] - * dal, bulleted text (and headings), multiline match, to permit line-wrapped - paragraphs - (requested fix, Ben Armstrong (live-manual)) + * dal, fix missing multiline regex matches for line-wrap text + (live-manual, to work better with po4a) + * dal_doc_str, bulleted text (and headings), multiline match, to permit + line-wrapped paragraphs + (requested fix, Ben Armstrong (live-manual)) + * dal_syntax, multiline match for fontface markup (emphasis, bold, italics, + underscore etc.) * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 85592ab2..fe09b004 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.7.9 -:date_stamp: 2010w49/3 -:date: "2010-12-08" +:date_stamp: 2010w49/4 +:date: "2010-12-09" :project: SiSU diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb index 01604b65..0422d7b3 100644 --- a/lib/sisu/v2/dal_syntax.rb +++ b/lib/sisu/v2/dal_syntax.rb @@ -235,33 +235,33 @@ module SiSU_Syntax dob end def fontface(dob) - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)\*\{(.+?)\}\*/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)\*\{(.+?)\}\*/m, "\\1#{@emph[:o]}\\2#{@emph[:c]}") #emphasis - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)!\{(.+?)\}!/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)!\{(.+?)\}!/m, "\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}") #bold - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\(|\>)\/\{(.+?)\}\//, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\(|\>)\/\{(.+?)\}\//m, "\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}") #italics - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)_\{(.+?)\}_/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)_\{(.+?)\}_/m, "\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}") #underscore - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)#\{(.+?)\}#/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)#\{(.+?)\}#/m, "\\1#{Mx[:fa_monospace_o]}\\2#{Mx[:fa_monospace_c]}") #monospace - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\"\{(.+?)\}\"/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\"\{(.+?)\}\"/m, "\\1#{Mx[:fa_cite_o]}\\2#{Mx[:fa_c_o]}cite#{Mx[:fa_c]}") #cite /blockquote? - dob.obj.gsub!(/(^|[^\\])\^\{(.+?)\}\^/, + dob.obj.gsub!(/(^|[^\\])\^\{(.+?)\}\^/m, "\\1#{Mx[:fa_superscript_o]}\\2#{Mx[:fa_superscript_c]}") #superscript - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|\(|\>|\S)9\{(.+?)\}9/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|\(|\>|\S)9\{(.+?)\}9/m, "\\1#{Mx[:fa_superscript_o]}\\2#{Mx[:fa_superscript_c]}") #superscript - dob.obj.gsub!(/(^|[^\\]),\{(.+?)\},/, + dob.obj.gsub!(/(^|[^\\]),\{(.+?)\},/m, "\\1#{Mx[:fa_subscript_o]}\\2#{Mx[:fa_subscript_c]}") #subscript - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)6\{(.+?)\}6/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)6\{(.+?)\}6/m, "\\1#{Mx[:fa_subscript_o]}\\2#{Mx[:fa_subscript_c]}") #subscript - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\+\{(.+?)\}\+/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\+\{(.+?)\}\+/m, "\\1#{Mx[:fa_insert_o]}\\2#{Mx[:fa_insert_c]}") #inserted text - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)v\{(.+?)\}v/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)v\{(.+?)\}v/m, "\\1#{Mx[:fa_insert_o]}\\2#{Mx[:fa_insert_c]}") #inserted text - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)-\{(.+?)\}-/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)-\{(.+?)\}-/m, "\\1#{Mx[:fa_strike_o]}\\2#{Mx[:fa_strike_c]}") #strikethrough - deleted text - dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)x\{(.+?)\}x/, + dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)x\{(.+?)\}x/m, "\\1#{Mx[:fa_strike_o]}\\2#{Mx[:fa_strike_c]}") #deleted text dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|\(|\>)\*(\S+?)\*/, "\\1#{@emph[:o]}\\2#{@emph[:c]}") #emphasise single word, watch -- cgit v1.2.3 From 74911938539cf6ab959564b21d533a1f96ca78f2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 9 Dec 2010 12:57:23 -0500 Subject: changelog, cosmetic --- CHANGELOG_v2 | 8 ++++---- data/doc/sisu/v2/CHANGELOG | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 37c7fb3f..d0ea34a0 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -20,13 +20,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] - * dal, fix missing multiline regex matches for line-wrap text + * dal, fix missing multi-line regex matches for line-wrap text (live-manual, to work better with po4a) - * dal_doc_str, bulleted text (and headings), multiline match, to permit + * dal_doc_str, bulleted text (and headings), multi-line match, to permit line-wrapped paragraphs (requested fix, Ben Armstrong (live-manual)) - * dal_syntax, multiline match for fontface markup (emphasis, bold, italics, - underscore etc.) + * dal_syntax, multi-line match for fontface markup (emphasis, bold, + italics, underscore etc.) * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index b95b090a..1f522bbb 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -20,13 +20,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.9.orig.tar.gz [debian freeze, fix] - * dal, fix missing multiline regex matches for line-wrap text + * dal, fix missing multi-line regex matches for line-wrap text (live-manual, to work better with po4a) - * dal_doc_str, bulleted text (and headings), multiline match, to permit + * dal_doc_str, bulleted text (and headings), multi-line match, to permit line-wrapped paragraphs (requested fix, Ben Armstrong (live-manual)) - * dal_syntax, multiline match for fontface markup (emphasis, bold, italics, - underscore etc.) + * dal_syntax, multi-line match for fontface markup (emphasis, bold, + italics, underscore etc.) * texpdf, use of monospace in headings causes table of contents breakage, fix (requested fix, Ben Armstrong (live-manual)) -- cgit v1.2.3