diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 17 | ||||
| -rw-r--r-- | data/sisu/v3/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v3/epub_tune.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/html_tune.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/shared_html_lite.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/shared_markup_alt.rb | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/shared_xml.rb | 3 |
7 files changed, 22 insertions, 16 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index be217ffb..d2c6c402 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,13 +13,24 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.1.10.orig.tar.xz (2011-12-31:52/6) +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.10 +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.10-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.10.orig.tar.xz + sisu_3.1.10.orig.tar.xz + sisu_3.1.10-1.dsc + sisu_3.1.10-1.debian.tar.gz + + * html, epub, (& xml) codeblocks, treatment of '<<' & '>>', fix + (codeblock, remove legacy match rule, watch) + %% 3.1.9.orig.tar.xz (2011-12-19:51/1) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.9 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.9-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.9.orig.tar.xz - sisu_3.1.9.orig.tar.xz - sisu_3.1.9-1.dsc - sisu_3.1.9-1.debian.tar.gz + 46c2529883dcf3b9bce820246ae3af77063a699b1e7feb6b1a5d2ef00ac70c9d 1649904 sisu_3.1.9.orig.tar.xz + 49fd018fc2a507446987d8e504923fa3321b49b1f22fa10e59c4f31a38b1e9bc 1382 sisu_3.1.9-1.dsc + e18e8fd21a5cc4fa521b2c357d38abe6dfa999f032c1c8421a90d0289f473960 290782 sisu_3.1.9-1.debian.tar.gz * manually created html files in _sisu/home (*.html) copied as home pages (previous behavior was only to copy _sisu/home/index.html) diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 3702f010..d719f3fb 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.1.9 -:date_stamp: 2011w51/1 -:date: "2011-12-19" +:version: 3.1.10 +:date_stamp: 2011w52/6 +:date: "2011-12-31" :project: SiSU diff --git a/lib/sisu/v3/epub_tune.rb b/lib/sisu/v3/epub_tune.rb index fedef1b3..5f50bb39 100644 --- a/lib/sisu/v3/epub_tune.rb +++ b/lib/sisu/v3/epub_tune.rb @@ -356,8 +356,7 @@ module SiSU_EPUB_Tune end dob.obj.gsub!(/<a href="\.\.\//,%{<a href="#{@vz.url_site}/}) else - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') #code-block: angle brackets special characters - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') + dob.obj.gsub!(/</m,'<'); dob.obj.gsub!(/>/m,'>') end @tuned_file << dob end diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v3/html_tune.rb index afedec54..bc833eaa 100644 --- a/lib/sisu/v3/html_tune.rb +++ b/lib/sisu/v3/html_tune.rb @@ -317,8 +317,7 @@ module SiSU_HTML_Tune dob.obj.gsub!(/<a href="\.\.\//,%{<a href="#{@vz.url_site}/}) dob.obj.gsub!(/<a href="#{Xx[:html_relative2]}\//,%{<a href="#{@vz.url_site}/}) else - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') #code-block: angle brackets special characters - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') + dob.obj.gsub!(/</m,'<'); dob.obj.gsub!(/>/m,'>') end dob end diff --git a/lib/sisu/v3/shared_html_lite.rb b/lib/sisu/v3/shared_html_lite.rb index 0dd13a34..33052cd2 100644 --- a/lib/sisu/v3/shared_html_lite.rb +++ b/lib/sisu/v3/shared_html_lite.rb @@ -165,8 +165,7 @@ module SiSU_Format_Shared s.gsub!(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1<a href="\2" target="_top">\2</a>') #special case \{ e.g. \}http://url s.gsub!(/(^|#{Mx[:gl_c]}|\s)#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{\\1#{@brace_url.xml_open}<a href="\\2" target="_top">\\2</a>#{@brace_url.xml_close}\\3}) #http ftp matches with decoration else - s.gsub!(/(^|[^}])_</m,'\1<'); s.gsub!(/(^|[^}])_>/m,'\1>') #code-block: angle brackets special characters - s.gsub!(/(^|[^}])_</m,'\1<'); s.gsub!(/(^|[^}])_>/m,'\1>') + s.gsub!(/</m,'<'); s.gsub!(/>/m,'>') end s end diff --git a/lib/sisu/v3/shared_markup_alt.rb b/lib/sisu/v3/shared_markup_alt.rb index a7d08cae..5bd49342 100644 --- a/lib/sisu/v3/shared_markup_alt.rb +++ b/lib/sisu/v3/shared_markup_alt.rb @@ -174,8 +174,7 @@ module SiSU_text_representation @s=@s.gsub(/(#{Mx[:lnk_c]})#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1<a href="\2" target="_top">\2</a>\3') #special case \{ e.g. \}http://url @s=@s.gsub(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,%{#{@url_brace.xml_open}<a href="\\1" target="_top">\\1</a>#{@url_brace.xml_close}}) #http ftp matches with decoration else - @s=@s.gsub(/(^|[^}])_</m,'\1<'); @s.gsub(/(^|[^}])_>/m,'\1>') #code-block: angle brackets special characters - @s=@s.gsub(/(^|[^}])_</m,'\1<'); @s.gsub(/(^|[^}])_>/m,'\1>') + @s=@s.gsub(/</m,'<'); @s.gsub(/>/m,'>') end if @t_o.is=='paragraph' if @t_o.bullet_ diff --git a/lib/sisu/v3/shared_xml.rb b/lib/sisu/v3/shared_xml.rb index f6cd6598..f4fa395c 100644 --- a/lib/sisu/v3/shared_xml.rb +++ b/lib/sisu/v3/shared_xml.rb @@ -392,8 +392,7 @@ module SiSU_XML_munge dob.obj.gsub!(/#{Mx[:url_o]}_(\S+?)#{Mx[:url_c]}/, '<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="\1">\1</link>') #escaped urls not linked, deal with later else - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') #code-block: angle brackets special characters - dob.obj.gsub!(/(^|[^}])_</m,'\1<'); dob.obj.gsub!(/(^|[^}])_>/m,'\1>') + dob.obj.gsub!(/</m,'<'); dob.obj.gsub!(/>/m,'>') end if dob.of=='block' dob.obj.gsub!(/#{Mx[:gl_bullet]}/,'● ') |