diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 19:27:27 +0100 |
| commit | 7330cf6ae4fa17e3f6d9914ead719655ebbe590b (patch) | |
| tree | 1f7253a22872ca2501d7aefc2a48b9b2df65f7f4 /lib/sisu/v0/sst_to_s_xml_sax.rb | |
| parent | debian/control add depends on rsync (diff) | |
| parent | mostly the arrangement of conditionals (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sst_to_s_xml_sax.rb')
| -rw-r--r-- | lib/sisu/v0/sst_to_s_xml_sax.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v0/sst_to_s_xml_sax.rb index 9ea7d58c..38663f4f 100644 --- a/lib/sisu/v0/sst_to_s_xml_sax.rb +++ b/lib/sisu/v0/sst_to_s_xml_sax.rb @@ -265,7 +265,10 @@ WOK if d_meta; xml_head(d_meta) end end - @rcdc=true if @rcdc==false and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) + if @rcdc==false \ + and (para =~/~metadata/ or para =~/^1~meta\s+Document Information/) + @rcdc=true + end if para !~/(^0~|^@\S+?:|^\s*$|<ENDNOTES>|<EOF>)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc @@ -324,7 +327,10 @@ WOK else xml_structure(para,nil,nil) end end - para='' if para =~/<a name="n\d+">/ and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/ # -endnote + if para =~/<a name="n\d+">/ \ + and para =~/^(-\{{2}~\d+|<!e[:_]\d+!>)/ # -endnote + para='' + end if para =~/.*<:#>.*$/ para=case para when /<:i1>/ |