aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-15 18:41:30 -0400
committerRalph Amissah <ralph@amissah.com>2014-07-15 18:41:30 -0400
commit84fcc4fb34a41303b4e87aec0e486ec5c3864b64 (patch)
tree1277461e0d1cfa591e28e63351851437bb6c89d0 /lib
parentv5 v6: src, sisupod, bring back in line (diff)
v5 v6: docbook, code & other blocks markup
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v5/xml_docbook5.rb5
-rw-r--r--lib/sisu/v5/xml_shared.rb5
-rw-r--r--lib/sisu/v6/xml_docbook5.rb5
-rw-r--r--lib/sisu/v6/xml_shared.rb5
4 files changed, 16 insertions, 4 deletions
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb
index 3a59f839..7326c332 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/v5/xml_docbook5.rb
@@ -163,7 +163,10 @@ module SiSU_XML_Docbook_Book
end
def markup_text(data)
data.each_with_index do |o,i|
- if o.is ==:heading || o.is ==:para || o.is ==:open_close_tags
+ if o.is ==:heading \
+ || o.is ==:para \
+ || o.of ==:block \
+ || o.is ==:open_close_tags
o=@trans.markup_docbook(o) #unless o.obj==nil
end
end
diff --git a/lib/sisu/v5/xml_shared.rb b/lib/sisu/v5/xml_shared.rb
index f1113495..5670f68d 100644
--- a/lib/sisu/v5/xml_shared.rb
+++ b/lib/sisu/v5/xml_shared.rb
@@ -485,7 +485,10 @@ module SiSU_XML_Munge
gsub(/#{Mx[:nbsp]}/,' '). #&nbsp; not available
gsub(/<(p|br)>/,'<\1 />')
dob.obj=clean(dob.obj)
- else # codeblock
+ elsif dob.is == :code
+ dob.obj=dob.obj.gsub(/&/m,'&amp;'). #sort
+ gsub(/</,'&lt;').gsub(/>/,'&gt;')
+ else # p dob.is ??
end
dob
end
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb
index b3e9e035..a1854cdb 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/v6/xml_docbook5.rb
@@ -163,7 +163,10 @@ module SiSU_XML_Docbook_Book
end
def markup_text(data)
data.each_with_index do |o,i|
- if o.is ==:heading || o.is ==:para || o.is ==:open_close_tags
+ if o.is ==:heading \
+ || o.is ==:para \
+ || o.of ==:block \
+ || o.is ==:open_close_tags
o=@trans.markup_docbook(o) #unless o.obj==nil
end
end
diff --git a/lib/sisu/v6/xml_shared.rb b/lib/sisu/v6/xml_shared.rb
index 3e8ddf50..8f4024eb 100644
--- a/lib/sisu/v6/xml_shared.rb
+++ b/lib/sisu/v6/xml_shared.rb
@@ -485,7 +485,10 @@ module SiSU_XML_Munge
gsub(/#{Mx[:nbsp]}/,' '). #&nbsp; not available
gsub(/<(p|br)>/,'<\1 />')
dob.obj=clean(dob.obj)
- else # codeblock
+ elsif dob.is == :code
+ dob.obj=dob.obj.gsub(/&/m,'&amp;'). #sort
+ gsub(/</,'&lt;').gsub(/>/,'&gt;')
+ else # p dob.is ??
end
dob
end