html grouped text that is bulleted

2 files changed, 14 insertions, 4 deletions

diff --git a/lib/sisu/v1/html_scroll.rb b/lib/sisu/v1/html_scroll.rb
index 0cd34694..e4a14691 100644
--- a/lib/sisu/v1/html_scroll.rb
+++ b/lib/sisu/v1/html_scroll.rb
@@ -118,7 +118,12 @@ module SiSU_HTML_scroll
             when /^4:\S+?/; @sto.scroll_lev_para_ocn.heading_body4 # work on see Split_text_object4
             when /^5:\S*?/; @sto.scroll_lev_para_ocn.heading_body5
             when /^6:\S*?/; @sto.scroll_lev_para_ocn.heading_body6
-            when /^#{Mx[:gl_bullet]}/; @sto.scroll_lev_para_ocn.bullet
+            when /^#{Mx[:gl_bullet]}/
+              if para =~/#{Mx[:gr_o]}group#{Mx[:gr_c]}/
+                para.gsub!(/#{Mx[:gl_bullet]}/,'●  ') #watch
+              else
+                @sto.scroll_lev_para_ocn.bullet
+              end
             when /^#{Mx[:pa_o]}:i([1-9])#{Mx[:pa_c]}#{Mx[:gl_bullet]}/ #indent with bullet
               format_txt_obj.gsub_body
               @sto.scroll_lev_para_ocn.format('li',"i#{$1}")
@@ -140,7 +145,9 @@ module SiSU_HTML_scroll
                 end
               else para
               end
-            else para
+            else
+              para.gsub!(/#{Mx[:gl_bullet]}/,'●  ') #watch
+              para
             end
           elsif para =~/^#{Mx[:lv_o]}[1-9]:/ \
           and para !~/#{Mx[:id_o]}~\d+;(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_c]}#@dp:#@dp#{Mx[:id_c]}$/
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