From a151893efedaebc26d26a8f8611fb688a6de6d4f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 5 Feb 2014 00:56:10 -0500
Subject: v5 v6: ocn: strict html; turn on/off rules for txt & odf

---
 lib/sisu/v5/xml_odf_odt.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/sisu/v5/xml_odf_odt.rb')

diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index 8c3d4a98..d2ab0477 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT
       @@fns=nil
       def initialize(particulars)
         @md,@env,@ao_array=particulars.md,particulars.env,particulars.ao_array
+        @make=SiSU_Env::ProcessingSettings.new(@md)
         @vz=SiSU_Viz::Defaults.new
         @tab="\t"
         @brace_url=SiSU_Viz::Defaults.new.url_decoration
@@ -556,10 +557,10 @@ module SiSU_XML_ODF_ODT
         end
         p_num={ display: '', set_ref: '' }
         if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/
-          if @env.odt_ocn?
+          if @make.build.odt_ocn?
             if defined? dob.ocn \
             and dob.ocn.is_a?(Fixnum)
-              p_num=SiSU_XML_ODF_ODT_Format::ParagraphNumber.new(dob.ocn).set_bookmark_and_display
+              p_num=SiSU_XML_ODF_ODT_Format::ParagraphNumber.new(@make,dob.ocn).set_bookmark_and_display
             end
           end
         end
@@ -682,7 +683,7 @@ module SiSU_XML_ODF_ODT
           and (dob.obj =~/~metadata/ or dob =~/#{Mx[:lv_o]}1:meta#{Mx[:lv_x]}\s*Document Information/) #fix Mx[:lv_o]
           if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ #check
             if defined? dob.ocn and dob.ocn =~/\d+/
-              @p_num=SiSU_XML_ODF_ODT_Format::ParagraphNumber.new(dob.ocn)
+              @p_num=SiSU_XML_ODF_ODT_Format::ParagraphNumber.new(@make,dob.ocn)
             end
             if dob.is ==:heading \
             || dob.is ==:para \
-- 
cgit v1.2.3