aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-09-26 23:43:31 +0100
committerRalph Amissah <ralph@amissah.com>2007-09-26 23:43:31 +0100
commit3f282d767483807e33d4d1611056a005cdd68ff5 (patch)
tree16c3b660f24a6317fa49f28a1dc2a7e5468e262e
parentsisu-0.60 intruduces separate sisu-doc package, rationale in CHANGELOG (diff)
matches to take account of internal new naming/tagging of "document information" heading 1~meta
-rw-r--r--lib/sisu/v0/html.rb6
-rw-r--r--lib/sisu/v0/html_scroll.rb4
-rw-r--r--lib/sisu/v0/odf.rb2
-rw-r--r--lib/sisu/v0/sst_to_s_xml_dom.rb2
-rw-r--r--lib/sisu/v0/sst_to_s_xml_node.rb4
-rw-r--r--lib/sisu/v0/sst_to_s_xml_sax.rb2
-rw-r--r--lib/sisu/v0/xhtml.rb2
-rw-r--r--lib/sisu/v0/xml.rb2
-rw-r--r--lib/sisu/v0/xml_dom.rb2
9 files changed, 13 insertions, 13 deletions
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/
%{<a href="#docinfo">#{linkname}</a>}
else linkname
end
@@ -409,7 +409,7 @@ WOK
%{<b><a href="##{link}">#{linkname}</a></b>}
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<a name="docinfo"></a>')
end
if para =~/^\d~metadata\s+Metadata/
para.gsub!(/(Metadata)/,'\1<a name="metadata"></a>')
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~|<ENDNOTES>|<EOF>)/
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~|<ENDNOTES>|<EOF>)/
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+?:|<ENDNOTES>|<EOF>)/
@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*$|<ENDNOTES>|<EOF>)/
@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*$|<ENDNOTES>|<EOF>)/
@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*$|<ENDNOTES>|<EOF>)/
@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~|<ENDNOTES>|<EOF>)/
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~|<ENDNOTES>|<EOF>)/
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~|<ENDNOTES>|<EOF>)/
if para =~/.+?<~\d+;(?:\w|[0-6]:)\d+;\w\d+><#@dp:#@dp>$/
paranum=para[@regx,3]