diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-12 20:30:52 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-12 20:30:52 +0100 |
commit | 2e7814c4f9be7867499d4e96b9866714e0710fb2 (patch) | |
tree | cb8bd24495e9357f00e3741d5f83d4767da396ac /lib/sisu/v0/shared_xml.rb | |
parent | Merge branch 'upstream' into debian/sid (diff) | |
parent | special character exceptions, some fixes, primarily underscore (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/shared_xml.rb')
-rw-r--r-- | lib/sisu/v0/shared_xml.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v0/shared_xml.rb index da1891e5..62e8b5ca 100644 --- a/lib/sisu/v0/shared_xml.rb +++ b/lib/sisu/v0/shared_xml.rb @@ -365,7 +365,7 @@ module SiSU_XML_munge para.gsub!(/ /,' ') #para.gsub!(/ /,' ') #clean else - para.gsub!(/_</m,'<'); para.gsub!(/_>/m,'>') #code-block: angle brackets special characters + para.gsub!(/(?=^|[^}])_</m,'<'); para.gsub!(/(?=^|[^}])_>/m,'>') #code-block: angle brackets special characters para.gsub!(/ /,' ') end para @@ -391,7 +391,7 @@ module SiSU_XML_munge def markup_group(para='') para.gsub!(/</,'<'); para.gsub!(/>/,'>') para.gsub!(/<:?br(?:\s+\/)?>/,'<br />') - para.gsub!(/<(link xmlns:xlink=".+?)">/,'<"\1">') + para.gsub!(/<(link xmlns:xlink=".+?")>/,'<\1>') para.gsub!(/<(\/link)>/,'<\1>') para.gsub!(/<(\/?en)>/,'<\1>') para |