aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG_v221
-rw-r--r--conf/sisu/v2/version.yml6
-rw-r--r--data/doc/sisu/v1/CHANGELOG2
-rw-r--r--data/doc/sisu/v2/CHANGELOG23
-rw-r--r--data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi20
-rw-r--r--lib/sisu/v2/odf.rb5
-rw-r--r--lib/sisu/v2/shared_metadata.rb3
-rw-r--r--lib/sisu/v2/shared_xml.rb3
-rw-r--r--lib/sisu/v2/texpdf.rb1
-rw-r--r--lib/sisu/v2/xml_dom.rb95
10 files changed, 108 insertions, 71 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 42052e3d..5d5c0556 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,15 +12,28 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.0.3.orig.tar.gz (2010-03-22:12/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
+ sisu_2.0.3.orig.tar.gz
+ sisu_2.0.3-1.dsc
+ sisu_2.0.3-1.diff.gz
+
+ * bug fixes
+ odf, xml, texpdf, bulleted group, clean
+ odf, metadata line break - prevent from breaking document [potential odf
+ breakage]
+ xml_dom, behaviours fixes
+
%% 2.0.2.orig.tar.gz (2010-03-21:11/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
- sisu_2.0.2.orig.tar.gz
- sisu_2.0.2-1.dsc
- sisu_2.0.2-1.diff.gz
+ c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
+ 721ff54e991ede11da9c584530e4ec4b37f2e6f60e50d04a6c87a974c3e10a62 1145 sisu_2.0.2-1.dsc
+ 50c945b87ceda35105737150c000a97563dcd5e51d6c7543d6d44b0941d50d42 275350 sisu_2.0.2-1.diff.gz
* bug fixes
param, recommended links (reinstated)
- db_import, special character escape special endnote content
+ db_import, special character escape special endnote content [doc import
+ fails on occurrence]
* vim syntax highlighter, sisu v2 & v1 version and date headers
updated/corrected
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index b0312a0b..8afd183e 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.0.2
-:date_stamp: 2010w11/7
-:date: "2010-03-21"
+:version: 2.0.3
+:date_stamp: 2010w12/1
+:date: "2010-03-22"
:project: SiSU
diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index f53c5095..c1e6b040 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -6,7 +6,7 @@
* <http://sisudoc.org/sisu/sisu_manual>
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* CHANGELOG CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
+* ../CHANGELOG ../v1/CHANGELOG ../v2/CHANGELOG ../README ../
Reverse Chronological:
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 42052e3d..fdc6ce80 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -6,21 +6,34 @@
* <http://sisudoc.org/sisu/sisu_manual>
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
-* CHANGELOG CHANGELOG_v1 CHANGELOG_v2 README data/doc/sisu/
+* ../CHANGELOG ../v1/CHANGELOG ../v2/CHANGELOG ../README ../
Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.0.3.orig.tar.gz (2010-03-22:12/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
+ sisu_2.0.3.orig.tar.gz
+ sisu_2.0.3-1.dsc
+ sisu_2.0.3-1.diff.gz
+
+ * bug fixes
+ odf, xml, texpdf, bulleted group, clean
+ odf, metadata line break - prevent from breaking document [potential odf
+ breakage]
+ xml_dom, behaviours fixes
+
%% 2.0.2.orig.tar.gz (2010-03-21:11/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
- sisu_2.0.2.orig.tar.gz
- sisu_2.0.2-1.dsc
- sisu_2.0.2-1.diff.gz
+ c80b503f0226cf578e0196321f26a1dce05ba7fd6aa33690c5ca756c08d30ba3 2736496 sisu_2.0.2.orig.tar.gz
+ 721ff54e991ede11da9c584530e4ec4b37f2e6f60e50d04a6c87a974c3e10a62 1145 sisu_2.0.2-1.dsc
+ 50c945b87ceda35105737150c000a97563dcd5e51d6c7543d6d44b0941d50d42 275350 sisu_2.0.2-1.diff.gz
* bug fixes
param, recommended links (reinstated)
- db_import, special character escape special endnote content
+ db_import, special character escape special endnote content [doc import
+ fails on occurrence]
* vim syntax highlighter, sisu v2 & v1 version and date headers
updated/corrected
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 15517daa..369ade1a 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -57,7 +57,7 @@
Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
-_* {~^ sisu_2.0.2.orig.tar.gz (of 2010-03-21:11/7) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
+_* {~^ sisu_2.0.3.orig.tar.gz (of 2010-03-22:12/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
_* {~^ sisu-markup-samples_1.0.10.orig.tar.gz (of 2008-10-09:40/4 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.10.orig.tar.gz ~{ <br>1e769b5c2c2d6135c3f5a14ede1d019f77588c7024168c756c7093510145c7dc 3442966 }~ *~sisu-markup-samples
@@ -104,11 +104,11 @@ group{
*{Source}*
-{~^ sisu_2.0.2.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2.orig.tar.gz
+{~^ sisu_2.0.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3.orig.tar.gz
-{~^ sisu_2.0.2-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2-1.diff.gz
+{~^ sisu_2.0.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.diff.gz
-{~^ sisu_2.0.2-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.2-1.dsc
+{~^ sisu_2.0.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.0.3-1.dsc
}group
@@ -116,15 +116,15 @@ group{
*{Debs}*
-{~^ sisu_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.2-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+{~^ sisu_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.0.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
-{~^ sisu-complete_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.2-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+{~^ sisu-complete_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.0.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
-{~^ sisu-pdf_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+{~^ sisu-pdf_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
-{~^ sisu-postgresql_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+{~^ sisu-postgresql_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
-{~^ sisu-sqlite_2.0.2-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.2-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+{~^ sisu-sqlite_2.0.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.0.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
}group
@@ -154,7 +154,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
sudo rpm -i [package name]
-_* {~^ sisu-2.0.2-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.2-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.0.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.0.3-2.noarch.rpm ~{ <br>created using alien }~
_* {~^ sisu-markup-samples_1.0.10.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.10-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
diff --git a/lib/sisu/v2/odf.rb b/lib/sisu/v2/odf.rb
index c51eab90..d4aeb616 100644
--- a/lib/sisu/v2/odf.rb
+++ b/lib/sisu/v2/odf.rb
@@ -418,10 +418,13 @@ module SiSU_ODF
dob.obj=para_array.join(' ')
dob.obj=dob.obj.strip
end
- if dob.obj =~/#{Mx[:gr_o]}code#{Mx[:gr_c]}/ #fix #code-block: angle brackets special characters #fix
+ if dob.is=='code' #{Mx[:gr_o]}code#{Mx[:gr_c]}/ #fix #code-block: angle brackets special characters #fix
dob.obj.gsub!(/(^|[^}])_</m,'\1&lt;'); dob.obj.gsub!(/(^|[^}])_>/m,'\1&gt;')
dob.obj.gsub!(/(^|[^}])_</m,'\1&lt;'); dob.obj.gsub!(/(^|[^}])_>/m,'\1&gt;')
end
+ if dob.of=='group'
+ dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ')
+ end
dob.obj.gsub!(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'<del>\1</del>')
dob.obj.gsub!(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'<ins>\1</ins>')
dob.obj.gsub!(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'<cite>\1</cite>')
diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb
index 7c8cc971..f39b2f79 100644
--- a/lib/sisu/v2/shared_metadata.rb
+++ b/lib/sisu/v2/shared_metadata.rb
@@ -474,6 +474,7 @@ WOK
def meta_para
url_brace=SiSU_Viz::Skin.new.url_decoration
if @inf.class==String
+ @inf.gsub!(/<br>/,'<br />')
@inf.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/,
'<text:a xlink:type="simple" xlink:href="\1">\1</text:a>') #http ftp matches escaped, no decoration
@inf.gsub!(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,
@@ -484,7 +485,7 @@ WOK
%{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="mailto:\\1">\\1</text:a>#{url_brace.xml_close}}) if @inf !~/http:\/\// # improve upon, document crash where url contains '@' symbol
end
<<WOK
-<text:p text:style-name="P1">#{@tag.capitalize}: #{@inf}</text:p>}
+<text:p text:style-name="P1">#{@tag.capitalize}: #{@inf}</text:p>
WOK
end
def metadata
diff --git a/lib/sisu/v2/shared_xml.rb b/lib/sisu/v2/shared_xml.rb
index d70e0808..8a58909b 100644
--- a/lib/sisu/v2/shared_xml.rb
+++ b/lib/sisu/v2/shared_xml.rb
@@ -392,6 +392,9 @@ module SiSU_XML_munge
dob.obj.gsub!(/(^|[^}])_</m,'\1&lt;'); dob.obj.gsub!(/(^|[^}])_>/m,'\1&gt;') #code-block: angle brackets special characters
dob.obj.gsub!(/(^|[^}])_</m,'\1&lt;'); dob.obj.gsub!(/(^|[^}])_>/m,'\1&gt;')
end
+ if dob.of=='group'
+ dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ')
+ end
dob.obj.gsub!(/#{Dx[:url_o]}/,"#{Dx[:url_o_xml]}")
dob.obj.gsub!(/#{Dx[:url_c]}/,"#{Dx[:url_c_xml]}")
dob.obj.gsub!(/&nbsp;|#{Mx[:nbsp]}/m,'&#160;')
diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb
index 00a4d16d..f0e04b33 100644
--- a/lib/sisu/v2/texpdf.rb
+++ b/lib/sisu/v2/texpdf.rb
@@ -413,6 +413,7 @@ module SiSU_TeX
@lineone=case dob.is
when /alt|group|verse/
dob.tmp.gsub!(/#{Mx[:nbsp]}/m,'{~}')
+ dob.tmp.gsub!(/#{Mx[:gl_bullet]}/m,'$\txtbullet$~~')
dob.tmp.gsub!(/#{Mx[:br_nl]}+/m,"\n\n") #match not ideal, but currently not inserting extra newlines anyway
ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob)
dob.tmp=if dob.is=='group' \
diff --git a/lib/sisu/v2/xml_dom.rb b/lib/sisu/v2/xml_dom.rb
index 8a4589ba..ff38ff86 100644
--- a/lib/sisu/v2/xml_dom.rb
+++ b/lib/sisu/v2/xml_dom.rb
@@ -158,7 +158,7 @@ WOK
end
@@xml[:sc]=sc
end
- def xml_element(dob,xml_el='',xml_content='')
+ def xml_element(dob,xml_el='',xml_content='',type='norm')
n=n1=n2=n3=0
if dob.is=='heading'
lv=dob.ln
@@ -179,7 +179,7 @@ WOK
#{Ax[:tab]*n1}<heading>
#{Ax[:tab]*n2}<object id="#{dob.ocn}">
#{Ax[:tab]*n3}<ocn>#{dob.ocn}</ocn>#{tag}
-#{Ax[:tab]*n3}<text>#{dob.obj}</text>
+#{Ax[:tab]*n3}<text class="#{type}">#{dob.obj}</text>
#{Ax[:tab]*n2}</object>
#{Ax[:tab]*n1}</heading>#{xml_content}
WOK
@@ -281,53 +281,47 @@ WOK
end
end
xml_el ||=''
- xml_element(dob,xml_el,xml_content)
+ xml_element(dob,xml_el,xml_content,type)
if lv
@level[lv]=true
((lv+1)..6).each { |x| @level[x]=false }
end
end
+ def add_to_body(dob,type='norm')
+ if defined? dob.obj # main text, contents, body KEEP
+ if defined? dob.ocn \
+ and dob.ocn
+ @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
+ @@xml[:body] << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>} if defined? dob.ocn
+ end
+ #@@xml[:body] << %{#{Ax[:tab]*7}<text class="#{type}">#{dob.obj}</text>}
+ #@@xml[:body] << %{#{Ax[:tab]*7}<text class="#{dob.is}">#{Ax[:tab]*1}}
+ @@xml[:body] << %{#{Ax[:tab]*7}<text class="#{type}">#{Ax[:tab]*1}}
+ @@xml[:body] << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
+ @@xml[:body] << %{#{Ax[:tab]*7}</text>}
+ @@xml[:body] << %{#{Ax[:tab]*6}</object>}
+ end
+ end
def group_structure(dob)
dob=@trans.markup_group(dob) #decide check & FIX
dob.obj.gsub!(/#{Mx[:en_a_o]}(\d+)\s+(.+?)#{Mx[:en_a_c]}/m,
'<endnote><number>\1</number><note>\2</note></endnote> ')
dob.obj.strip!
- @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*7}<text class="group">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*7}</text>}
- @@xml[:body] << "#{Ax[:tab]*6}</object>"
+ dob
end
def poem_structure(dob)
dob=@trans.markup_group(dob) #decide check & FIX
dob.obj.strip!
- @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*7}<text class="verse">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*7}</text>}
- @@xml[:body] << "#{Ax[:tab]*6}</object>"
+ dob
end
def code_structure(dob)
dob=@trans.markup_group(dob) #decide check & FIX
dob.obj.gsub!(/\s\s/,'&#160;&#160;')
dob.obj.strip!
- @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*7}<text class="code">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*8}#{dob.obj}#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*7}</text>}
- @@xml[:body] << "#{Ax[:tab]*6}</object>"
+ dob
end
def table_structure(dob) #tables
table=SiSU_XHTML_shared::Table_xhtml.new(dob)
- @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">}
- @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>}
- @@xml[:body] << %{#{Ax[:tab]*1}<text class="table">#{Ax[:tab]*1}}
- @@xml[:body] << %{#{Ax[:tab]*2}#{table.table.obj}}
- @@xml[:body] << %{#{Ax[:tab]*1}</text>}
- @@xml[:body] << "#{Ax[:tab]*0}</object>"
end
def markup(data)
xml_sc(@md)
@@ -348,60 +342,69 @@ WOK
if dob !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
@p_num=SiSU_XML_format::Paragraph_number.new(@md,dob.ocn) if defined? dob.ocn
if not @rcdc
- if defined? dob.ocn and dob.ocn.to_s =~/\d+/
+ if defined? dob.ocn \
+ and dob.ocn.to_s =~/\d+/
format_scroll=SiSU_XML_format::Format_scroll.new(@md,dob) if dob.is=='para' and dob.indent ##FIX
x=SiSU_XML_format::Format_seg.new(@md,dob)
if dob.is=='heading'
if dob.ln==1
+ type="heading_section_#{dob.ln.to_s}"
xml_markup(dob)
- xml_structure(dob)
+ xml_structure(dob,type)
dob.obj=x.heading_body1
elsif dob.ln==2
+ type="heading_section_#{dob.ln.to_s}"
xml_markup(dob)
- xml_structure(dob)
+ xml_structure(dob,type)
dob.obj=x.heading_body2
elsif dob.ln==3
+ type="heading_section_#{dob.ln.to_s}"
xml_markup(dob)
- xml_structure(dob)
+ xml_structure(dob,type)
dob.obj=x.heading_body3
elsif dob.ln==4
+ type="heading_content_#{dob.lv}"
xml_markup(dob)
- xml_structure(dob)
+ xml_structure(dob,type)
dob.obj=x.heading_body4
elsif dob.ln==5
+ type="heading_content_#{dob.lv}"
xml_markup(dob)
- xml_structure(dob)
+ xml_structure(dob,type)
dob.obj=x.heading_body5
elsif dob.ln==6
- xml_markup(dob)
- xml_structure(dob)
+ type="heading_content_#{dob.lv}"
+ xml_structure(dob,type)
dob.obj=x.heading_body6
end
else
ocn=dob.ocn
if dob.is=='verse'
+ type='verse'
poem_structure(dob) #redo
elsif dob.is=='group'
+ type='group'
group_structure(dob) #redo
elsif dob.is=='code'
+ type='code'
code_structure(dob) #redo
elsif dob.is=='table' # tables come as single block #work area 2005w13
+ type='table'
table_structure(dob)
elsif dob.is=='para' \
- and dob.indent.to_s =~/[0-9]/ \
+ and dob.indent.to_s =~/[1-9]/ \
and dob.bullet_
+ type="indent_bullet#{dob.indent.to_s}"
+ xml_markup(dob)
elsif dob.is=='para' \
- and dob.indent.to_s =~/[0-9]/
- else xml_structure(dob)
- end
- xml_markup(dob)
- if defined? dob.ocn \
- and dob.ocn
- @@xml[:body] << %{#{Ax[:tab]*6}<object id="#{dob.ocn}">}
+ and dob.indent.to_s =~/[1-9]/
+ type="indent#{dob.indent.to_s}"
+ xml_markup(dob)
+ else
+ type='norm'
+ xml_markup(dob)
end
- @@xml[:body] << "#{Ax[:tab]*7}<ocn>#{dob.ocn}</ocn>" if defined? dob.ocn
- @@xml[:body] << %{#{Ax[:tab]*7}<text class="#{type}">#{dob.obj}</text>} if defined? dob.obj # main text, contents, body KEEP
- @@xml[:body] << "#{Ax[:tab]*6}</object>"
+ add_to_body(dob,type)
end
elsif dob.obj =~/(#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
elsif dob.obj =~/(MetaData)/