diff options
Diffstat (limited to 'lib/sisu/v3/sst_do_inline_footnotes.rb')
| -rw-r--r-- | lib/sisu/v3/sst_do_inline_footnotes.rb | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/sisu/v3/sst_do_inline_footnotes.rb b/lib/sisu/v3/sst_do_inline_footnotes.rb index c5af68de..d1e1bef6 100644 --- a/lib/sisu/v3/sst_do_inline_footnotes.rb +++ b/lib/sisu/v3/sst_do_inline_footnotes.rb @@ -57,7 +57,7 @@ footnotes, invoked using: sisu --to-footnotes filename.sst =end -module SiSU_Convert_footnotes +module SiSU_ConvertFootnotes require_relative 'defaults' # defaults.rb include SiSU_Viz require_relative 'sysenv' # sysenv.rb @@ -65,7 +65,7 @@ module SiSU_Convert_footnotes require_relative 'param' # param.rb include SiSU_Param require_relative 'dal_syntax' # dal_syntax.rb - include SiSU_Syntax + include SiSU_DAL_Syntax require_relative 'i18n' # i18n.rb class Instantiate < SiSU_Param::Parameters::Instructions @@flag={} #Beware!! @@ -84,9 +84,9 @@ module SiSU_Convert_footnotes def initialize(opt) @opt=opt @@fns||@opt.fns - @my_make=SiSU_Env::Create_file.new(@opt.fns) - @fnm=SiSU_Env::Info_file.new(@opt.fns).marshal.dal_content - SiSU_Env::Create_system_link.new.images + @my_make=SiSU_Env::CreateFile.new(@opt.fns) + @fnm=SiSU_Env::InfoFile.new(@opt.fns).marshal.dal_content + SiSU_Env::CreateSystemLink.new.images end def read #creates dal begin @@ -94,7 +94,7 @@ module SiSU_Convert_footnotes @@dal_array=[] @@fns=@opt.fns create_dal - rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error + rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error ensure Instantiate.new end @@ -109,7 +109,7 @@ module SiSU_Convert_footnotes dal=if @@dal_array.empty?; read_fnm else @@dal_array.dup #check end - rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error + rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error ensure Instantiate.new end @@ -129,7 +129,7 @@ module SiSU_Convert_footnotes if @md.en[:mismatch]==0 \ or @md.opt.mod.inspect =~/=footnotes-force/ meta=nil - dal=SiSU_Convert_footnotes::Make.new(@md,file_array).song + dal=SiSU_ConvertFootnotes::Make.new(@md,file_array).song SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.fns}.fn").output if @md.opt.cmd =~/v/ SiSU_Screen::Ansi.new(@opt.cmd,"#{@md.fns}.fn -> #{@md.fns}.fn").txt_red unless @md.opt.cmd =~/q/ dal.each {|s| dal_array << "#{s.strip}\n\n" unless s.strip.empty?} @@ -142,15 +142,15 @@ module SiSU_Convert_footnotes def read_fnm dal=[] dal=if FileTest.file?(@fnm); File.open(@fnm){ |f| dal=Marshal.load(f)} - else SiSU_Convert_footnotes::Source.new(@opt).create_dal #watch + else SiSU_ConvertFootnotes::Source.new(@opt).create_dal #watch end end end class Output def initialize(md,data) @md,@data=md,data - @my_make=SiSU_Env::Create_file.new(@md.fns) - dir=SiSU_Env::Info_env.new(@md.fns) + @my_make=SiSU_Env::CreateFile.new(@md.fns) + dir=SiSU_Env::InfoEnv.new(@md.fns) @hard="#{Dir.pwd}/#{@md.fns}.fn" end def hard_output @@ -167,9 +167,9 @@ module SiSU_Convert_footnotes def initialize(md,data) @md,@data=md,data @@word_mode=[] - @env=SiSU_Env::Info_env.new(@md.fns) - @skin=SiSU_Env::Info_skin.new(@md) - l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + @env=SiSU_Env::InfoEnv.new(@md.fns) + @skin=SiSU_Env::InfoSkin.new(@md) + l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language @language=l[:n] @translate=SiSU_Translate::Source.new(@md,@language) end @@ -184,7 +184,7 @@ module SiSU_Convert_footnotes reset data=@data @metafile="#{@env.processing_path.dal}/#{@md.fns}.meta" - my_make_source_file=SiSU_Env::Create_file.new(@md.fns) + my_make_source_file=SiSU_Env::CreateFile.new(@md.fns) data=data.join.split("\n\n") data_new=[] data.each do |x| @@ -193,10 +193,10 @@ module SiSU_Convert_footnotes end end data=data_new.flatten - data=SiSU_Convert_footnotes::Make.new(@md,data).substitutions_and_insertions? - data=SiSU_Convert_footnotes::Make.new(@md,data).character_check - data=SiSU_Convert_footnotes::Make.new(@md,data).endnotes - SiSU_Convert_footnotes::Output.new(@md,data).hard_output + data=SiSU_ConvertFootnotes::Make.new(@md,data).substitutions_and_insertions? + data=SiSU_ConvertFootnotes::Make.new(@md,data).character_check + data=SiSU_ConvertFootnotes::Make.new(@md,data).endnotes + SiSU_ConvertFootnotes::Output.new(@md,data).hard_output reset data end @@ -418,12 +418,12 @@ module SiSU_Convert_footnotes when /~\{\s+.+?\}~/ # auto-numbered endnotes <!e!> <!e_!> --> para.gsub!(/\s*\}~/,' }~') # required 2003w31 @word_mode=para.scan(/\S+/) - word_mode=SiSU_Convert_footnotes::Make.new(@md,@word_mode).endnote_call_number + word_mode=SiSU_ConvertFootnotes::Make.new(@md,@word_mode).endnote_call_number para=word_mode.join(' ') endnote_ref+=1 when /~\^(?:\s|$)|<:e>/ #%Note inserts endnotes previously gathered from /^(<!e[:_]!>|[-~]\{{3})/ (in earlier loop) word_mode=para.scan(/\S+/) - word_mode=SiSU_Convert_footnotes::Make.new(@md,word_mode).endnote_call_number + word_mode=SiSU_ConvertFootnotes::Make.new(@md,word_mode).endnote_call_number para=word_mode.join(' ') endnote_ref+=1 end @@ -468,5 +468,5 @@ module SiSU_Convert_footnotes end end __END__ -@particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) +@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt) dal_array=@particulars.dal_array # dal file drawn here |