aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-02-20 22:01:42 -0500
committerRalph Amissah <ralph@amissah.com>2013-02-20 22:21:06 -0500
commit32a0e39ad09dab218a5bc225e165ad92611b2c38 (patch)
treea78f4bbfa29c2630403d5cf4a0be1b373d1e98af
parentv4 (v3): epub, tinkering with headers & cleaning of angle brackets '<' & '>' (diff)
v4 (v3): html, modification to markup of angle brackets [<>] & ampersand [&]
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--lib/sisu/v3/html_tune.rb9
-rw-r--r--lib/sisu/v4/html_tune.rb9
3 files changed, 14 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 308d66c6..c55fa022 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.8.orig.tar.xz
* tinkering with some headers
* add markup of angle brackets '<' & '>' to early markup of ampersand '&'
+* v4: html, modification to markup of angle brackets '<' & '>' and ampersand '&'
+
* v4: vim, ftplugin & colorschemes housekeeping, scheme "def*" added
* general housekeeping
* :colorscheme def256* defined from 256 colors (primarily 16 of them) terminal
diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v3/html_tune.rb
index 32426076..23fa586e 100644
--- a/lib/sisu/v3/html_tune.rb
+++ b/lib/sisu/v3/html_tune.rb
@@ -144,7 +144,7 @@ module SiSU_HTML_Tune
data_tuned=[]
#@tuned_file=[]
data.each do |dob|
- dob=angle_brackets(dob)
+ dob=amp_angle_brackets(dob)
dob=endnotes_html(dob)
dob=url_markup(dob)
dob=markup(dob)
@@ -241,8 +241,11 @@ module SiSU_HTML_Tune
end
dob
end
- def angle_brackets(dob)
- dob.obj=dob.obj.gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}")
+ def amp_angle_brackets(dob)
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}").
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
dob
end
def endnotes_html(dob)
diff --git a/lib/sisu/v4/html_tune.rb b/lib/sisu/v4/html_tune.rb
index 2661ee52..41845007 100644
--- a/lib/sisu/v4/html_tune.rb
+++ b/lib/sisu/v4/html_tune.rb
@@ -144,7 +144,7 @@ module SiSU_HTML_Tune
data_tuned=[]
#@tuned_file=[]
data.each do |dob|
- dob=angle_brackets(dob)
+ dob=amp_angle_brackets(dob)
dob=endnotes_html(dob)
dob=url_markup(dob)
dob=markup(dob)
@@ -241,8 +241,11 @@ module SiSU_HTML_Tune
end
dob
end
- def angle_brackets(dob)
- dob.obj=dob.obj.gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}")
+ def amp_angle_brackets(dob)
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}").
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
dob
end
def endnotes_html(dob)