diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v0/dal.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v0/html_format.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v0/texpdf.rb | 13 | ||||
| -rw-r--r-- | lib/sisu/v0/urls.rb | 2 |
5 files changed, 14 insertions, 13 deletions
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index a9b319f1..2404577b 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -316,7 +316,7 @@ module SiSU_DAL def output_filetypes_in_cmd(cmd_shortcut,source=nil) #make list of file types in shortcut command (as configured), e.g. when sisu -3 is used cf_defaults=SiSU_Env::Info_processing_flag.new - cmd_list=case cmd_shortcut.to_s + cmd_list=case cmd_shortcut.inspect when /0/; cf_defaults.cf_0 when /1/; cf_defaults.cf_1 when /2/; cf_defaults.cf_2 @@ -752,9 +752,9 @@ module SiSU_DAL or @md.pagebreak) m=$1 #watch ref~ para_tmp=[] - if @md.pagenew.to_s =~/#{m}/; para_tmp << "<:pn>\n" << para + if @md.pagenew.inspect =~/#{m}/; para_tmp << "<:pn>\n" << para end - if @md.pagebreak.to_s =~/#{m}/; para_tmp << "<:pb>\n" << para + if @md.pagebreak.inspect =~/#{m}/; para_tmp << "<:pb>\n" << para end para_result=unless para_tmp.length > 0; para else para_tmp diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb index 27e6b817..22d434c1 100644 --- a/lib/sisu/v0/html_format.rb +++ b/lib/sisu/v0/html_format.rb @@ -959,7 +959,7 @@ WOK end def endnote_mark %{<p class="center" id="endnotes"> -<a href="#top">^</a></p>} +<a href="#top"><hr></a></p>} #revisit end end class Format_text_object diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index b2215b64..930068f1 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -2339,7 +2339,7 @@ p @zap local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external" remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image/." - remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/." + remote_images_external="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/." local_src=@source_path_src local_pod=@source_path_pod remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/." @@ -2355,7 +2355,7 @@ p @zap System_call.new(local_gen,remote_gen,@opt.cmd).rsync('--delete-after') if FileTest.file?("#{local_src}/#{src_txt}") System_call.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync - if defined? @md.ec[:image] + if not @md.ec[:image].empty? images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/") System_call.new(images,remote_images,@opt.cmd).rsync images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/") diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb index c080c554..805dc2e6 100644 --- a/lib/sisu/v0/texpdf.rb +++ b/lib/sisu/v0/texpdf.rb @@ -223,7 +223,7 @@ module SiSU_TeX lst=Dir["*.{aux,log,out}"] lst.each {|file| File.unlink(file)} if lst #touch("#{@dir_pdf}index.html") #correct @dir_pdf appears to contain slash / and should not - rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error + rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error end end end @@ -283,8 +283,9 @@ module SiSU_TeX end data=number_paras(data,ocn) data=markup(data) + #data=markup(data).flatten #watch output(data) - rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error + rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error ensure end end @@ -343,7 +344,7 @@ module SiSU_TeX end def enclose(para,type='') para.strip! - if type =~/code/; para + para=if type =~/code/; para elsif para !~/(\\begin\{tabular\}.*|\\end\{tabular\}|&|#{@@tex_backslash*2})\s*$/ #check para.gsub!(/(.+)/m,"\n#{@tex.skip_small} \\1 #{@tex.skip_small}\n") else para @@ -434,11 +435,11 @@ WOK @group_collect=[] data.each do |para| #% case follows with levels 1-6 indents & graphics mono=SiSU_TeX_Pdf::Format_text_object.new(@md,para) - if para =~/<:(code|alt|verse|group)>/ \ + if para =~/<:(?:code|alt|verse|group)>/ \ or @@flag_alt - if para =~/<:(code|alt|verse|group)>/ + if para =~/<:(?:code|alt|verse|group)>/ @lineone=case para - when /<:(alt|verse|group)>/; para + when /<:(?:alt|verse|group)>/; para when /<:code>/; "#{@tex.paraskip_small} \\begin{scriptsize} " + para else 'error' #should never occur end diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index ca1b6928..5038971a 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -68,7 +68,7 @@ module SiSU_urls def read begin SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb #fnb[/.+?\.(?:[_-]?sst|ssm)$/] - rescue; SiSU_Errors::Info_error.new($!,$@,nil,@opt.cmd).error + rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error ensure end end |