From f7c2288223609b86b7f8add9fca8ca4c802e3ff4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 28 Sep 2007 12:35:42 +0100 Subject: changes related to changing tag of document information header to ~meta --- data/doc/sisu/CHANGELOG | 42 ++++++++++++++++++++++++++++++++++++---- lib/sisu/v0/html.rb | 6 +++--- lib/sisu/v0/html_scroll.rb | 4 ++-- lib/sisu/v0/odf.rb | 2 +- lib/sisu/v0/sst_to_s_xml_dom.rb | 2 +- lib/sisu/v0/sst_to_s_xml_node.rb | 4 ++-- lib/sisu/v0/sst_to_s_xml_sax.rb | 2 +- lib/sisu/v0/xhtml.rb | 2 +- lib/sisu/v0/xml.rb | 2 +- lib/sisu/v0/xml_dom.rb | 2 +- 10 files changed, 51 insertions(+), 17 deletions(-) diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG index e0b8156f..9dc35163 100644 --- a/data/doc/sisu/CHANGELOG +++ b/data/doc/sisu/CHANGELOG @@ -3,11 +3,45 @@ Reverse Chronological: %% STABLE MANIFEST -%% sisu_0.59.1.orig.tar.gz (2007-09-24:39/1) +%% sisu_0.60.0.orig.tar.gz (2007-09-26:39/3) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz + sisu_0.60.0.orig.tar.gz + sisu_0.60.0-1.dsc + sisu_0.60.0-1.diff.gz + + * generated documentation moved out of source tarball entirely, in sisu-0.59 + series sisu documentation as generated by sisu was introduced, (the debian + package made a separate sub-package of this), however: this made the + tarball much larger than it was previously (in the order of 5 times the + size, over 10Mb instead of under 2), and; this has very unattractive + implications for source control management / git, as much of the output is + in binary file format which as they include information on when they were + built and which version of sisu they were built with, have different hash + values from one generation to the next, which means large diffs and + repeated storing of binary files which may contain essentially the same + data, and rapid growth in size of the git repository. Solution sisu-0.60: + * keep the sisu source tarball to as little binary content as is necessary + by separating out the documents produced (this keeps diffs to essentials, + and both the tarball and repository smaller in size) + * keep a separate tarball for documentation as generated sisu-doc; offer + that as a package on its own, (request that debian consider it for + inclusion as such). + + * sysenv, sisurc.yml allow use of relative output paths, expand to absolute + + * html segmented, bugfix: footnotes for headings levels :A,:B and :C + correctly placed in first segment when batch-processing files/output + + * help, (hub), minor reorganisation and a change in info returned, most + significantly the response for typing 'sisu' without options + + * sysenv, syslink issue, additional check + +%% sisu_0.59.1.orig.tar.gz (2007-09-25:39/2) http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz - sisu_0.59.1.orig.tar.gz - sisu_0.59.1-1.dsc - sisu_0.59.1-1.diff.gz + cf512ec871aeb7cdabc0b3b35b7e6d05 10952059 sisu_0.59.1.orig.tar.gz + a260c1dbec59c78cd0e330b5cd790f6a 617 sisu_0.59.1-1.dsc + 55837afd842d274afc2180fca519d260 141832 sisu_0.59.1-1.diff.gz * plaintext, more space between endnotes where chosen (default remains footnotes) diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb index bdfd98ee..d12b6637 100644 --- a/lib/sisu/v0/html.rb +++ b/lib/sisu/v0/html.rb @@ -390,14 +390,14 @@ WOK end toc={} format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title) - toc[:seg]=if para =~/^\d~\s+Document Information/ + toc[:seg]=if para =~/^\d~meta\s+Document Information/ format_toc.lev0 else format_toc.lev1 end title=if para =~/(<~0;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>)$/ m=/#{$1}/ para.gsub!(m,'') - if para=~/^\d~\s+Document Information/ + if para=~/^\d~meta\s+Document Information/ %{#{linkname}} else linkname end @@ -409,7 +409,7 @@ WOK %{#{linkname}} end format_toc=SiSU_HTML_Format_type::Format_toc.new(@md,title) - toc[:scr]=if para =~/^\d~\s+Document Information/ + toc[:scr]=if para =~/^\d~meta\s+Document Information/ format_toc.lev0 else format_toc.lev1 end diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb index 629cfc0c..30640f30 100644 --- a/lib/sisu/v0/html_scroll.rb +++ b/lib/sisu/v0/html_scroll.rb @@ -80,13 +80,13 @@ module SiSU_HTML_scroll @rcdc=false @scr={ :body=>[],:metadata=>[],:owner_details=>[] } data.each do |para| - if para =~/^\d~\s+Document Information/ + if para =~/^\d~meta\s+Document Information/ para.gsub!(/(Document Information(?: \(metadata\))?)/,'\1') end if para =~/^\d~metadata\s+Metadata/ para.gsub!(/(Metadata)/,'\1') end - @rcdc=true if @rcdc==false and (para =~/^\d~metadata/ or para =~/^1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/^\d~metadata/ or para =~/^1~meta\s+Document Information/) if para !~/(^0~||)/ unless para =~/^<:code>/; para.gsub!(/~[{\[].+?[}\]]~\s+/m,' ') end diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb index d4d4fd2f..981bedeb 100644 --- a/lib/sisu/v0/odf.rb +++ b/lib/sisu/v0/odf.rb @@ -516,7 +516,7 @@ module SiSU_ODF if d_meta; odf_metadata(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/) if para !~/(^0~||)/ if para =~@regx #/.+?<~\d+;\w\d+;\w\d+>.*/ #watch change paranum=para[@regx,3] diff --git a/lib/sisu/v0/sst_to_s_xml_dom.rb b/lib/sisu/v0/sst_to_s_xml_dom.rb index 46c2d366..8e3fce27 100644 --- a/lib/sisu/v0/sst_to_s_xml_dom.rb +++ b/lib/sisu/v0/sst_to_s_xml_dom.rb @@ -356,7 +356,7 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) if para !~/(^0~|^@\S+?:||)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc diff --git a/lib/sisu/v0/sst_to_s_xml_node.rb b/lib/sisu/v0/sst_to_s_xml_node.rb index 8ed1b51b..cbaf7672 100644 --- a/lib/sisu/v0/sst_to_s_xml_node.rb +++ b/lib/sisu/v0/sst_to_s_xml_node.rb @@ -418,7 +418,7 @@ WOK obj.each do |o| para=o.txt unless o.txt =~/^%% / #comments are lost, consider if para - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) if para !~/(^0~|^@\S+?:|^\s*$||)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc @@ -457,7 +457,7 @@ WOK obj.each do |o| para=o.txt unless o.txt =~/^%% / #comments are lost, consider if para - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) if para !~/(^0~|^@\S+?:|^\s*$||)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v0/sst_to_s_xml_sax.rb index 5a232455..9ea7d58c 100644 --- a/lib/sisu/v0/sst_to_s_xml_sax.rb +++ b/lib/sisu/v0/sst_to_s_xml_sax.rb @@ -265,7 +265,7 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) if para !~/(^0~|^@\S+?:|^\s*$||)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc diff --git a/lib/sisu/v0/xhtml.rb b/lib/sisu/v0/xhtml.rb index 20fa702a..1d7d63d1 100644 --- a/lib/sisu/v0/xhtml.rb +++ b/lib/sisu/v0/xhtml.rb @@ -289,7 +289,7 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/) if para !~/(^0~||)/ if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ paranum=para[@regx,3] diff --git a/lib/sisu/v0/xml.rb b/lib/sisu/v0/xml.rb index d9070dc1..2dd25491 100644 --- a/lib/sisu/v0/xml.rb +++ b/lib/sisu/v0/xml.rb @@ -313,7 +313,7 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/) if para !~/(^0~||)/ if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ paranum=para[@regx,3] diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb index 82d882e0..83b15dc8 100644 --- a/lib/sisu/v0/xml_dom.rb +++ b/lib/sisu/v0/xml_dom.rb @@ -338,7 +338,7 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~\s+Document Information/) + @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/1~meta\s+Document Information/) if para !~/(^0~||)/ if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/ paranum=para[@regx,3] -- cgit v1.2.3