odf bug (angle brackets) preliminary fix

odf bug reported related to use of angle brackets in markup
affects some odf output, preliminary fix

3 files changed, 25 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index cfc5d345..e967cb61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,15 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.64.1.orig.tar.gz (2008-01-09:01/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
+  sisu_0.64.1.orig.tar.gz
+  sisu_0.64.1-1.dsc
+  sisu_0.64.1-1.diff.gz
+
+  * odf output bug (preliminary) fix, related to angle-brackets in markup
+    (reported by Jason Corfman)
+
 %% sisu_0.64.0.orig.tar.gz (2008-01-02:00/3)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
   f00c9aac4e1a4fab41219bd08a98b9aa 1485082 sisu_0.64.0.orig.tar.gz
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index aaa895b3..479e294b 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2008-01-02
+@date.modified: 2008-01-09
 
-@date: 2008-01-02
+@date: 2008-01-09
 
 @level: new=C; break=1; num_top=1
 
@@ -55,7 +55,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_0.64.0.orig.tar.gz (of 2008-01-02:00/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
+_* {~^ sisu_0.64.1.orig.tar.gz (of 2008-01-09:01/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
 
 _* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
 
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 !_ Source
 
-_* {~^ sisu_0.64.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0.orig.tar.gz
+_* {~^ sisu_0.64.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1.orig.tar.gz
 
-_* {~^ sisu_0.64.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0-1.diff.gz
+_* {~^ sisu_0.64.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1-1.diff.gz
 
-_* {~^ sisu_0.64.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.0-1.dsc
+_* {~^ sisu_0.64.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.64.1-1.dsc
 
 !_ Debs
 
-_* {~^ sisu_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.64.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.64.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.64.1-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-_* {~^ sisu-complete_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.64.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.64.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.64.1-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-_* {~^ sisu-pdf_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-pdf_0.64.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.64.1-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-_* {~^ sisu-postgresql_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+_* {~^ sisu-postgresql_0.64.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.64.1-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-_* {~^ sisu-sqlite_0.64.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.64.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.64.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.64.1-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 For changelogs see:
 
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
 
 The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
 
-_* {~^ sisu-0.64.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.64.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.64.0-1_all.deb }~
+_* {~^ sisu-0.64.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.64.1-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.64.1-1_all.deb }~
 
 _* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
 
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index aa514a90..874f87e1 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -474,6 +474,9 @@ module SiSU_ODF
           word=para.scan(/\S+|\n/)
           if word
             word.each do |w| # _ - / # | : ! ^ ~
+              unless w =~/<~\S+?;\S+?;\S+?><#@dp:#@dp>|<[:!][^<>]+?>|^<\/?(?:del|ins|sub|sup|cite)>$/
+                w.gsub!(/^<([^<>][^<>][^<>][^<>]+?)>$/,'&lt;\1&gt;') #refix
+              end
               unless para =~/^(?:0~|%+ )/m
                 w.gsub!(/&#(?:126|152);/,'~') #126 usual
                 if w !~/&\S{1,7};/ \
@@ -495,7 +498,7 @@ module SiSU_ODF
           #para.gsub!(/^(<:i[1-9]>\s+)?_\*\s+/,'\1● ') # bullet utf8, make smaller if used
           #para.gsub!(/^_\*\s+/,'<text:span text:style-name="T6">●</text:span> ')     #bullet
           para.gsub!(/^(<:i[1-9]>)\s+_\*\s+/,'\1 <text:span text:style-name="T6">·</text:span> ') #bullet
-          para.gsub!(/<br>/,'<br />')
+          para.gsub!(/<:?br>/,'<br />')
           para.gsub!(/<:p[bn]>/,'<text:p text:style-name="P8"> </text:p>')
           para.gsub!(/&#169;/,'©') #too arbitrary
           para.gsub!(/.+?<-#>/,'')                                           # remove dummy headings (used by html) #check