1 files changed, 15 insertions, 22 deletions
diff --git a/lib/sisu/v3dv/texpdf.rb b/lib/sisu/v3dv/texpdf.rb
index c69f7b9c..f0fb6b99 100644
--- a/lib/sisu/v3dv/texpdf.rb
+++ b/lib/sisu/v3dv/texpdf.rb
@@ -285,16 +285,11 @@ module SiSU_TeX
         @vz=SiSU_Env::GetInit.instance.skin
         @dp=@@dp ||=SiSU_Env::InfoEnv.new.digest.pattern
         @brace_url=SiSU_Viz::Skin.new.url_decoration
-        vz=SiSU_Env::GetInit.instance.skin
         l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
         @language=l[:n]
         @translate=SiSU_Translate::Source.new(@md,@language)
-        @skin_no_ocn=if defined? vz.ocn_display_off \
-        and vz.ocn_display_off==true
-          true
-        else false
-        end
         @codeblock_box='listings' #alternative 'boites'
+        @make ||=SiSU_Env::ProcessingSettings.new(@md)
       end
       def songsheet
         begin
@@ -324,12 +319,6 @@ module SiSU_TeX
           if @md.flag_tables #WORK ON 2009
             data=tables(data) #uncomment to start experimenting with tables
           end
-          ocn=if @md.markup.inspect =~/no_ocn/ \
-          or @md.opt.mod.inspect =~/--no-ocn/ \
-          or @skin_no_ocn
-            false
-          else true
-          end
           data=number_paras(data)
           data=markup(data)
           output(data)
@@ -741,12 +730,20 @@ WOK
           @tex_file << @@prefix_b if defined? @md.creator.prefix_b and @md.creator.prefix_b
         end
         x={}
-        x[:l] =<<WOK
-#{@tex_ml.newpage('landscape')}
-\\pagestyle{fancy}
+        if (@make.build.toc?)
+          toc=<<WOK
 \\renewcommand{\\contentsname}{#{@translate.contents}}
 \\tableofcontents
+WOK
+          toc_pb={ l: @tex_ml.newpage('landscape'), p: @tex_ml.newpage('portrait') }
+        else
+          toc=''
+          toc_pb={ l: '', p: '' }
+        end
+        x[:l] =<<WOK
 #{@tex_ml.newpage('landscape')}
+\\pagestyle{fancy}
+#{toc}#{toc_pb[:l]}
 \\pagenumbering{arabic}
 #{@tex_ml.paraskip_normal}
 #{@tex_ml.newpage('landscape')}
@@ -754,8 +751,7 @@ WOK
         x[:p] =<<WOK
 #{@tex_ml.newpage('portrait')}
 \\pagestyle{fancy}
-\\renewcommand{\\contentsname}{#{@translate.contents}}
-\\tableofcontents
+#{toc}#{toc_pb[:p]}
 #{@tex_ml.newpage('portrait')}
 \\pagenumbering{arabic}
 #{@tex_ml.paraskip_normal}
@@ -814,11 +810,7 @@ WOK
         if dob.of ==:para
           paranum=dob.ocn ? dob.ocn : ''
           paranum = '' if paranum.to_i==0
-          paranumber_display=if @md.markup.inspect =~/no_ocn/ \
-          or @md.opt.mod.inspect =~/--no-ocn/ \
-          or not dob.ocn_
-            ''
-          else
+          paranumber_display=if @make.build.ocn?
             tags=''
             #[keep] code that follows inserts "name tags" as hypertargets, currently using ocn (converting nametags to ocn) for internal linking, related code: |texpdf_format.rb|@|uses nametags directly|
             #if dob.tags.length > 0 # insert tags "hypertargets"
@@ -827,6 +819,7 @@ WOK
             #  end
             #end
             "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{dob.ocn}}#{tags}\\end{tiny}}}" #ocn object citation numbering
+          else ''
           end
           dob.tmp = paranumber_display + dob.tmp
         end