aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/texpdf.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v0/texpdf.rb')
-rw-r--r--lib/sisu/v0/texpdf.rb13
1 files changed, 7 insertions, 6 deletions
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