diff options
| -rw-r--r-- | CHANGELOG_v2 | 4 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/texinfo.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/texinfo_format.rb | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index a6f31f79..2a11f2c4 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -20,7 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz [debian freeze, fix] - * texinfo_format, texinfo output broken, fix (Closes #598063) + * texinfo + * texinfo_format, texinfo output broken, fix (Closes #598063) + * texinfo ocn decoration a hash (instead of angle braces %% 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 6efd0114..fd970d9a 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -20,7 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz [debian freeze, fix] - * texinfo_format, texinfo output broken, fix (Closes #598063) + * texinfo + * texinfo_format, texinfo output broken, fix (Closes #598063) + * texinfo ocn decoration a hash (instead of angle braces %% 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.rb b/lib/sisu/v2/texinfo.rb index 871a2b3e..bcff4915 100644 --- a/lib/sisu/v2/texinfo.rb +++ b/lib/sisu/v2/texinfo.rb @@ -315,8 +315,8 @@ module SiSU_TexInfo dob.obj=nil else if dob.is=='para' \ - and dob.obj !~/<#{dob.ocn}>/ - dob.obj="#{dob.obj} <#{dob.ocn}>" + and dob.obj !~/##{dob.ocn}/ + dob.obj="#{dob.obj} ##{dob.ocn}" end end end diff --git a/lib/sisu/v2/texinfo_format.rb b/lib/sisu/v2/texinfo_format.rb index 9e8afb10..a17fdb65 100644 --- a/lib/sisu/v2/texinfo_format.rb +++ b/lib/sisu/v2/texinfo_format.rb @@ -295,8 +295,8 @@ WOK end def clean(dob) if dob.is=='heading' \ - and dob.obj !~/<#{dob.ocn}>/ - dob.obj="#{dob.obj} <#{dob.ocn}>" + and dob.obj !~/##{dob.ocn}/ + dob.obj="#{dob.obj} ##{dob.ocn}" end dob.obj.gsub!(/<:#>/,'') dob.obj.strip! @@ -559,8 +559,8 @@ WOK end def clean(dob,txt) if dob.is=='heading' \ - and txt !~/<#{dob.ocn}>/ - txt="#{dob.obj} <#{dob.ocn}>" + and txt !~/##{dob.ocn}/ + txt="#{dob.obj} ##{dob.ocn}" end txt.gsub!(/<:#>/,'') txt.strip! |