diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-02-08 21:42:01 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-02-08 21:42:01 -0500 |
| commit | ef3f1f5f7f0644b50e01af834761ebd06bb8c9e8 (patch) | |
| tree | cf5d9b6d0b83651c8d7826b63b27c0c47cf84068 /lib/sisu/v1/html_segments.rb | |
| parent | debian/data/doc/sisu/v1/sisu_markup_samples/samples, renaming of dfsg sub-dir (diff) | |
| parent | version, changelog, readme, touches (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v1/html_segments.rb')
| -rw-r--r-- | lib/sisu/v1/html_segments.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sisu/v1/html_segments.rb b/lib/sisu/v1/html_segments.rb index 66e04800..2b54447a 100644 --- a/lib/sisu/v1/html_segments.rb +++ b/lib/sisu/v1/html_segments.rb @@ -354,7 +354,8 @@ module SiSU_HTML_seg para=format_seg.no_paranum end end - if para[/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/] + m=/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/ + if para =~m @sto=SiSU_HTML::Source::Split_text_object.new(@md,para).html_seg if @sto.format =~/i[1-9]|ordinary/ #watch txt_obj={:txt =>@sto.text} @@ -393,7 +394,9 @@ module SiSU_HTML_seg @sto=nil table=SiSU_HTML_shared::Table.new(para) para=table.table - else @sto=nil + else + para.gsub!(/#{Mx[:gl_bullet]}/,'● ') #watch + @sto=nil end if @md.flag_separate_endnotes para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type |