diff options
| -rw-r--r-- | lib/sisu/v0/texpdf.rb | 49 | ||||
| -rw-r--r-- | lib/sisu/v0/texpdf_format.rb | 2 |
2 files changed, 22 insertions, 29 deletions
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb index 989899cf..be8c973e 100644 --- a/lib/sisu/v0/texpdf.rb +++ b/lib/sisu/v0/texpdf.rb @@ -114,25 +114,20 @@ module SiSU_TeX tell.flow if @opt.cmd =~/[MVv]/ @md=SiSU_Param::Parameters.new(@opt).get my_make=SiSU_Env::Create_file.new(@opt.cmd,@opt.fns) - if @md.flag_pdf - $flag=@md.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format - @dir_o="#{@env.path.output}/#{@opt.fnb}" - directories - filename_index="#{@md.txt_path}/pdf" - newfilename=filename_index - #% needed needs to be reprogrammed !!! - SiSU_Env::Info_skin.new(@md).select - dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here - SiSU_TeX::Source::LaTeX_create.new(dal_array,@md,'landscape').songsheet - SiSU_TeX::Source::LaTeX_create.new(dal_array,@md,'portrait').songsheet - dal_array='' - pwd=Dir.pwd - SiSU_TeX::Source::LaTeX_to_pdf.new(@md).latexrun_selective - Dir.chdir(pwd) - else - tell=SiSU_Screen::Ansi.new(@opt.cmd,'instructed NOT to produce LaTeX/PDF') - tell.warn unless @opt.cmd =~/q/ - end + $flag=@md.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format + @dir_o="#{@env.path.output}/#{@opt.fnb}" + directories + filename_index="#{@md.txt_path}/pdf" + newfilename=filename_index + #% needed needs to be reprogrammed !!! + SiSU_Env::Info_skin.new(@md).select + dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here + SiSU_TeX::Source::LaTeX_create.new(dal_array,@md,'landscape').songsheet + SiSU_TeX::Source::LaTeX_create.new(dal_array,@md,'portrait').songsheet + dal_array='' + pwd=Dir.pwd + SiSU_TeX::Source::LaTeX_to_pdf.new(@md).latexrun_selective + Dir.chdir(pwd) rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure unless @opt.cmd =~/[MV]/ #check maintenance flag @@ -268,16 +263,14 @@ module SiSU_TeX prefix_b=do_mono.special_characters_safe @@prefix_b="\n #{@@tex_backslash*2}[3]\\ \\linebreak \\ #{prefix_b}\n" unless @@prefix_b end - if @md.markup.to_s !~/url_png/ - data=pre(data) - data=footnote(data) - if @md.flag_tables - data=tables(data) - end - data=number_paras(data) if @md.markup !~/not_to/ #check - data=markup(data) - output(data) + data=pre(data) + data=footnote(data) + if @md.flag_tables + data=tables(data) end + data=number_paras(data) if @md.markup.inspect !~/no_ocn/ and @md.mod.inspect !~/--no-ocn/ #check + data=markup(data) + output(data) rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error ensure end diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb index 51681ce7..bf93ce9c 100644 --- a/lib/sisu/v0/texpdf_format.rb +++ b/lib/sisu/v0/texpdf_format.rb @@ -1196,7 +1196,7 @@ WOK def a4generic end def para_num - paranumber_display=if @md.mod.inspect =~/--no-ocn/; '' #!ocn no object citation numbering + paranumber_display=if @md.markup.inspect =~/no_ocn/ or @md.mod.inspect =~/--no-ocn/; '' else "\\begin{tiny}~\\end{tiny}{\\marginpar{\\begin{tiny}#@string1\\end{tiny}}}" #ocn object citation numbering end if @string !~/^([1-6a-z-]#{@@tilde}\S*|<:.+?>|#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6})/ |