diff options
| -rw-r--r-- | lib/sisu/v0/dal.rb | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index 95208e2f..8e514725 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -359,24 +359,15 @@ module SiSU_DAL tuned_file,tuned_file_tmp=[],[] data.each do |para| if para !~/^%+\s/ and - para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/ - #para =~/^(?:_\*\s+)?\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.(?:sst|ssm)\b)(?:\s+~\{.+?\}~)?(?:\s+\*~\S+)*\s*$/ + para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/ txt,cmd,source,url_dir,note,manifest=nil,nil,nil,nil,nil,nil url_and_stub=SiSU_Env::Info_env.new.url if defined? url_and_stub.remote @output_url="#{url_and_stub.remote}" - if para =~/(.+?)\{(.+?)\s\[(\d[sS]*)\]\}((\S+?)\.ss[tm])(\s+~\{.+?\}~)?/m - #syntax e.g.: { "Sphinx or Robot", Leena Krohn [3sS]}sphinx_or_robot.leena_krohn.1996.sst + if para =~/(.+?)\{(.+?)\s\[(\d[sS]*)\]\}((\S+?)\.ss[tm]\b)(.*)/m pre,txt,cmd,source,url_dir,note="#{$1.strip} ",$2,$3,$4,$5,$6 - elsif para =~/(.+?)\{(.+?)\s\[(\d[sS]*)\]\}\.\.\/(\S+?)\/(\s+~\{.+?\}~)?/m - #syntax e.g.: { "Sphinx or Robot", Leena Krohn [3sS]}../sphinx_or_robot.leena_krohn.1996/ - pre,txt,cmd,url_dir,note="#{$1.strip} ",$2,$3,$4,$5 - elsif para =~/\{(.+?)\s\[(\d[sS]*)\]\}((\S+?)\.ss[tm])(\s+~\{.+?\}~)?/ - #syntax e.g.: { "Sphinx or Robot", Leena Krohn [3sS]}sphinx_or_robot.leena_krohn.1996.sst + elsif para =~/\{(.+?)\s\[(\d[sS]*)\]\}((\S+?)\.ss[tm]\b)(.*)/ pre,txt,cmd,source,url_dir,note='',$1,$2,$3,$4,$5 - elsif para =~/\{(.+?)\s\[(\d[sS]*)\]\}\.\.\/(\S+?)\/(\s+~\{.+?\}~)?/ - #syntax e.g.: { "Sphinx or Robot", Leena Krohn [3sS]}../sphinx_or_robot.leena_krohn.1996/ - pre,txt,cmd,url_dir,note='',$1,$2,$3,$4 end manifest="#{pre}{#{txt} }#@output_url/#{url_dir}/toc.html#{note}\n\n" else @@ -409,9 +400,9 @@ module SiSU_DAL end if describe if @output_url - tuned_file_tmp << "<:br> {#{describe} }#@output_url/#{url_dir}/#{o_f}\n\n" if describe + tuned_file_tmp << " {#{describe} }#@output_url/#{url_dir}/#{o_f}" if describe #to double space <:br> at beginning of entry else - tuned_file_tmp << "<:br> { #{describe} }../#{url_dir}/#{o_f}\n\n" + tuned_file_tmp << " { #{describe} }../#{url_dir}/#{o_f}" #to double space <:br> at beginning of entry end end end @@ -483,8 +474,8 @@ module SiSU_DAL data=number_plaintext_para(data) data=name_endnote_seg(data) #tr issue data=auto_number_heading_ie_title(data) #tr issue - data=ocn(data) unless @md.markup =~/not_to/ - data=minor_numbering(data) #unless @md.markup =~/not_to/ + data=ocn(data) #watch + data=minor_numbering(data) data=name_para_seg_filename(data) data=set_heading_seg(data) unless @md.set_heading_seg data=set_heading_top(data) unless @md.set_heading_top |