From 6132f2f25a43d19c142360ecf8999a6fe43a360c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 25 Sep 2010 23:03:51 -0400 Subject: texinfo, urls cleaned & with angle bracket decoration (+changelog) --- CHANGELOG_v2 | 1 + data/doc/sisu/v2/CHANGELOG | 1 + lib/sisu/v2/texinfo_format.rb | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 2a11f2c4..a07eb06b 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -23,6 +23,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * texinfo * texinfo_format, texinfo output broken, fix (Closes #598063) * texinfo ocn decoration a hash (instead of angle braces + * texinfo, urls cleaned and with angle bracket decoration %% 2.7.0.orig.tar.gz (2010-09-21:38/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index fd970d9a..8380cc57 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -23,6 +23,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * texinfo * texinfo_format, texinfo output broken, fix (Closes #598063) * texinfo ocn decoration a hash (instead of angle braces + * texinfo, urls cleaned and with angle bracket decoration %% 2.7.0.orig.tar.gz (2010-09-21:38/2) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.0.orig.tar.gz diff --git a/lib/sisu/v2/texinfo_format.rb b/lib/sisu/v2/texinfo_format.rb index a17fdb65..5e1d8af4 100644 --- a/lib/sisu/v2/texinfo_format.rb +++ b/lib/sisu/v2/texinfo_format.rb @@ -384,6 +384,7 @@ WOK txt.gsub!(/\^/,'\\wedge ') txt.gsub!(/(\$)/,"\\$") txt.gsub!(/\~/,'\\~') + txt.gsub!(/#{Mx[:url_o]}(https?:\S+?)#{Mx[:url_c]}/,'<\1>') txt.gsub!(/#{Mx[:url_o]}_(https?:\S+?)#{Mx[:url_c]}/,'\1') txt.gsub!(/§/i,'\S') txt.gsub!(/£/i,'\pounds') -- cgit v1.2.3