sisu-0.68.0 proposed

* middle layer document representation changed, (accounting for substantial patch)
* texpdf multiple document sizes as specified in config
* numerous small fixes
[should on the whole be easier to maintain]

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/sisu/v0/html_format_css.rb b/lib/sisu/v0/html_format_css.rb
index db381e63..ace6983b 100644
--- a/lib/sisu/v0/html_format_css.rb
+++ b/lib/sisu/v0/html_format_css.rb
@@ -352,10 +352,10 @@ module SiSU_HTML_Format_type
       else @one
       end
       note=''
-      if one =~/(~[{\[].+?[}\]]~\s*)/m #this is a clumsy fix, revisit and address upstream
+      if one =~/((?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]}).+?(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})\s*)/m #this is a clumsy fix, revisit and address upstream
         note=$1
         note.gsub!(/[\n\s]+/m,' ')
-        one.gsub!(/~[{\[].+?[}\]]~\s*/m,' ')
+        one.gsub!(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]}).+?(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})\s*/m,' ')
         one.gsub!(/<a[\n\s]+name="-\d+"[\n\s]+href="#_\d+">&nbsp;<sup>\d+<\/sup>&nbsp;/m,'')
       end
       %{<#@tag class="#@class">
@@ -384,7 +384,7 @@ module SiSU_HTML_Format_type
 #{@vz.table_close}}
     end
     def header_sub
-      @parablock.gsub!(/~[{\[].+?[}\]]~\s*/m,' ')
+      @parablock.gsub!(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]}).+?(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})\s*/m,' ')
       %{#{@vz.margin_css}
 #{@headname}
   <#@tag class="#@class" #{@p_num.id}>#{@p_num.name}