diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v1/html_scroll.rb | 11 | ||||
| -rw-r--r-- | lib/sisu/v1/html_segments.rb | 7 | ||||
| -rw-r--r-- | lib/sisu/v1/param.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v1/sysenv.rb | 7 |
4 files changed, 24 insertions, 11 deletions
diff --git a/lib/sisu/v1/html_scroll.rb b/lib/sisu/v1/html_scroll.rb index 0cd34694..e4a14691 100644 --- a/lib/sisu/v1/html_scroll.rb +++ b/lib/sisu/v1/html_scroll.rb @@ -118,7 +118,12 @@ module SiSU_HTML_scroll when /^4:\S+?/; @sto.scroll_lev_para_ocn.heading_body4 # work on see Split_text_object4 when /^5:\S*?/; @sto.scroll_lev_para_ocn.heading_body5 when /^6:\S*?/; @sto.scroll_lev_para_ocn.heading_body6 - when /^#{Mx[:gl_bullet]}/; @sto.scroll_lev_para_ocn.bullet + when /^#{Mx[:gl_bullet]}/ + if para =~/#{Mx[:gr_o]}group#{Mx[:gr_c]}/ + para.gsub!(/#{Mx[:gl_bullet]}/,'● ') #watch + else + @sto.scroll_lev_para_ocn.bullet + end when /^#{Mx[:pa_o]}:i([1-9])#{Mx[:pa_c]}#{Mx[:gl_bullet]}/ #indent with bullet format_txt_obj.gsub_body @sto.scroll_lev_para_ocn.format('li',"i#{$1}") @@ -140,7 +145,9 @@ module SiSU_HTML_scroll end else para end - else para + else + para.gsub!(/#{Mx[:gl_bullet]}/,'● ') #watch + para end elsif para =~/^#{Mx[:lv_o]}[1-9]:/ \ and para !~/#{Mx[:id_o]}~\d+;(?:[oh]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_c]}#@dp:#@dp#{Mx[:id_c]}$/ diff --git a/lib/sisu/v1/html_segments.rb b/lib/sisu/v1/html_segments.rb index 66e04800..2b54447a 100644 --- a/lib/sisu/v1/html_segments.rb +++ b/lib/sisu/v1/html_segments.rb @@ -354,7 +354,8 @@ module SiSU_HTML_seg para=format_seg.no_paranum end end - if para[/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/] + m=/#{Mx[:id_o]}~(\d+;(?:[ohmu]|[0-6]:)\d+;\w\d+#{Mx[:id_c]}#{Mx[:id_o]}#@dp:#@dp)#{Mx[:id_c]}$/ + if para =~m @sto=SiSU_HTML::Source::Split_text_object.new(@md,para).html_seg if @sto.format =~/i[1-9]|ordinary/ #watch txt_obj={:txt =>@sto.text} @@ -393,7 +394,9 @@ module SiSU_HTML_seg @sto=nil table=SiSU_HTML_shared::Table.new(para) para=table.table - else @sto=nil + else + para.gsub!(/#{Mx[:gl_bullet]}/,'● ') #watch + @sto=nil end if @md.flag_separate_endnotes para.gsub!(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type diff --git a/lib/sisu/v1/param.rb b/lib/sisu/v1/param.rb index 72593207..889ec351 100644 --- a/lib/sisu/v1/param.rb +++ b/lib/sisu/v1/param.rb @@ -94,8 +94,8 @@ module SiSU_Param if File.exist?(@pstorefile) param_msg='Parameters from pstore' retrieve_store=PStore.new(@pstorefile) - retrieve_store.transaction do |s| - @md=s['md'] + retrieve_store.transaction do + @md=retrieve_store['md'] end @md else @@ -979,10 +979,10 @@ module SiSU_Param tell=SiSU_Screen::Ansi.new(@md.cmd,"PStore -> #@pstorefile") tell.txt_grey if @md.cmd =~/v/ store=PStore.new(@pstorefile) - store.transaction do |s| - s['md']=@md + store.transaction do + store['md']=@md #doc.each{|x,y| puts "#{x}, #{y}; "} - s.commit + store.commit end @@md=@md=nil end diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index 1adb3509..e542e680 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -213,7 +213,7 @@ module SiSU_Env stub_pwd=@@pwd[m,1] @@rc_path=["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] @@yamlrc_path=unless stub_pwd =~/^sisupod$/ - ["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] + ["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#@@home/.sisu/#{SiSU_version_dir}","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] else #security policy: prevent reading of sisurc.yml in sisupod ["#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] end @@ -675,6 +675,9 @@ module SiSU_Env break end end + if @pdfetex_flag==false + @texpdf=prog.join(', ') + end @texpdf end def latex2pdf(md,papersize='a4') #convert from latex to pdf @@ -701,7 +704,7 @@ module SiSU_Env when /pdflatex/; "#{texpdf} -interaction=#{mode} #@input #{tell}\n" end system(texpdf_cmd) - else puts "\tWARN: none of the following programs are installed: #{program[0]}, #{program[1]}, #{program[2]} is installed. #{program_ref}" + else puts "\tWARN: none of the following programs appear to be installed: #{texpdf}. #{program_ref}" end end def makeinfo #texinfo |