diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:07:44 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:07:44 -0400 |
commit | c25fc2751886278a4e7f30f127e80449160a47f1 (patch) | |
tree | d19cab06d629a995848a296409693b5890d59f60 /lib/sisu/v4/dal_expand_insertions.rb | |
parent | v5: "general code cleaning" fix (diff) |
v4: general code cleaning, sync with v5sisu_4.1.6
Diffstat (limited to 'lib/sisu/v4/dal_expand_insertions.rb')
-rw-r--r-- | lib/sisu/v4/dal_expand_insertions.rb | 109 |
1 files changed, 54 insertions, 55 deletions
diff --git a/lib/sisu/v4/dal_expand_insertions.rb b/lib/sisu/v4/dal_expand_insertions.rb index cfa6cbeb..b8972489 100644 --- a/lib/sisu/v4/dal_expand_insertions.rb +++ b/lib/sisu/v4/dal_expand_insertions.rb @@ -272,82 +272,81 @@ module SiSU_DAL_Insertions if para !~/^%+\s/ \ and not codeblock_ \ and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/ - txt,cmd,source,linked_doc,note,manifest=nil,nil,nil,nil,nil,nil + manifest=nil @u=SiSU_Env::InfoEnv.new.url - pre=txt=cmd=source=linked_doc=note='' if defined? @u.remote - if /(?<pre>.+?)\{(?<txt>.+?)\s\[(?<cmd>\d[sS]*)\]\}(?<source>(?<linked_doc>\S+?)\.ss[tm]\b)(?<note>.*)/m =~ para - pre=pre.strip - elsif /\{(?<txt>.+?)\s\[(?<cmd>\d[sS]*)\]\}(?<source>(?<linked_doc>\S+?)\.ss[tm]\b)(?<note>.*)/m =~ para + if /(?<m_pre>.+?)\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para + m_pre=m_pre.strip + elsif /\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para end - if linked_doc =~ /(\S+?)\/(\S+)/ - linked_doc,linked_doc_lang=$1,$2 + if m_linked_doc =~ /(\S+?)\/(\S+)/ + m_linked_doc,m_linked_doc_lang=$1,$2 else - linked_doc,linked_doc_lang=linked_doc,@md.opt.lng_base + m_linked_doc,m_linked_doc_lang=m_linked_doc,@md.opt.lng_base end else puts "error, does currently support relative paths (reltive paths were removed, as had problems for citation, and was not suited to all output types should possibly reconsider) #{__FILE__} #{__LINE__}" - if /\{(?:~\^\s+)?(?<txt>.+?)\s\[(?<cmd>\d[sS]*)\]\}\.\.\/(?<linked_doc>\S+?)\/(?<note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para + if /\{(?:~\^\s+)?(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}\.\.\/(?<m_linked_doc>\S+?)\/(?<m_note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para end end lnk={} case @md.opt.dir_structure_by when :language lnk={ - manifest: by_language(linked_doc,linked_doc_lang).manifest, - html_toc: by_language(linked_doc,linked_doc_lang).html_toc, - html_doc: by_language(linked_doc,linked_doc_lang).html_doc, - epub: by_language(linked_doc,linked_doc_lang).epub, - pdf_landscape: by_language(linked_doc,linked_doc_lang).pdf_landscape, - pdf_portrait: by_language(linked_doc,linked_doc_lang).pdf_landscape, - odt: by_language(linked_doc,linked_doc_lang).odt, - xhtml: by_language(linked_doc,linked_doc_lang).xhtml, - xml_sax: by_language(linked_doc,linked_doc_lang).xml_sax, - xml_dom: by_language(linked_doc,linked_doc_lang).xml_dom, - txt: by_language(linked_doc,linked_doc_lang).txt, - html_concordance: by_language(linked_doc,linked_doc_lang).html_concordance, - digest: by_language(linked_doc,linked_doc_lang).digest, - sisupod: by_language(linked_doc,linked_doc_lang,source).sisupod, - source: by_language(linked_doc,linked_doc_lang,source).source, + manifest: by_language(m_linked_doc,m_linked_doc_lang).manifest, + html_toc: by_language(m_linked_doc,m_linked_doc_lang).html_toc, + html_doc: by_language(m_linked_doc,m_linked_doc_lang).html_doc, + epub: by_language(m_linked_doc,m_linked_doc_lang).epub, + pdf_landscape: by_language(m_linked_doc,m_linked_doc_lang).pdf_landscape, + pdf_portrait: by_language(m_linked_doc,m_linked_doc_lang).pdf_landscape, + odt: by_language(m_linked_doc,m_linked_doc_lang).odt, + xhtml: by_language(m_linked_doc,m_linked_doc_lang).xhtml, + xml_sax: by_language(m_linked_doc,m_linked_doc_lang).xml_sax, + xml_dom: by_language(m_linked_doc,m_linked_doc_lang).xml_dom, + txt: by_language(m_linked_doc,m_linked_doc_lang).txt, + html_concordance: by_language(m_linked_doc,m_linked_doc_lang).html_concordance, + digest: by_language(m_linked_doc,m_linked_doc_lang).digest, + sisupod: by_language(m_linked_doc,m_linked_doc_lang,source).sisupod, + source: by_language(m_linked_doc,m_linked_doc_lang,source).source, } when :filetype lnk={ - manifest: by_filetype(linked_doc,linked_doc_lang).manifest, - html_toc: by_filetype(linked_doc,linked_doc_lang).html_toc, - html_doc: by_filetype(linked_doc,linked_doc_lang).html_doc, - epub: by_filetype(linked_doc,linked_doc_lang).epub, - pdf_landscape: by_filetype(linked_doc,linked_doc_lang).pdf_landscape, - pdf_portrait: by_filetype(linked_doc,linked_doc_lang).pdf_landscape, - odt: by_filetype(linked_doc,linked_doc_lang).odt, - xhtml: by_filetype(linked_doc,linked_doc_lang).xhtml, - xml_sax: by_filetype(linked_doc,linked_doc_lang).xml_sax, - xml_dom: by_filetype(linked_doc,linked_doc_lang).xml_dom, - txt: by_filetype(linked_doc,linked_doc_lang).txt, - html_concordance: by_filetype(linked_doc,linked_doc_lang).html_concordance, - digest: by_filetype(linked_doc,linked_doc_lang).digest, - sisupod: by_filetype(linked_doc,linked_doc_lang,source).sisupod, - source: by_filetype(linked_doc,linked_doc_lang,source).source, + manifest: by_filetype(m_linked_doc,m_linked_doc_lang).manifest, + html_toc: by_filetype(m_linked_doc,m_linked_doc_lang).html_toc, + html_doc: by_filetype(m_linked_doc,m_linked_doc_lang).html_doc, + epub: by_filetype(m_linked_doc,m_linked_doc_lang).epub, + pdf_landscape: by_filetype(m_linked_doc,m_linked_doc_lang).pdf_landscape, + pdf_portrait: by_filetype(m_linked_doc,m_linked_doc_lang).pdf_landscape, + odt: by_filetype(m_linked_doc,m_linked_doc_lang).odt, + xhtml: by_filetype(m_linked_doc,m_linked_doc_lang).xhtml, + xml_sax: by_filetype(m_linked_doc,m_linked_doc_lang).xml_sax, + xml_dom: by_filetype(m_linked_doc,m_linked_doc_lang).xml_dom, + txt: by_filetype(m_linked_doc,m_linked_doc_lang).txt, + html_concordance: by_filetype(m_linked_doc,m_linked_doc_lang).html_concordance, + digest: by_filetype(m_linked_doc,m_linked_doc_lang).digest, + sisupod: by_filetype(m_linked_doc,m_linked_doc_lang,source).sisupod, + source: by_filetype(m_linked_doc,m_linked_doc_lang,source).source, } else lnk={ - manifest: by_filename(linked_doc,linked_doc_lang).manifest, - html_toc: by_filename(linked_doc,linked_doc_lang).html_toc, - html_doc: by_filename(linked_doc,linked_doc_lang).html_doc, - epub: by_filename(linked_doc,linked_doc_lang).epub, - pdf_landscape: by_filename(linked_doc,linked_doc_lang).pdf_landscape, - pdf_portrait: by_filename(linked_doc,linked_doc_lang).pdf_landscape, - odt: by_filename(linked_doc,linked_doc_lang).odt, - xhtml: by_filename(linked_doc,linked_doc_lang).xhtml, - xml_sax: by_filename(linked_doc,linked_doc_lang).xml_sax, - xml_dom: by_filename(linked_doc,linked_doc_lang).xml_dom, - txt: by_filename(linked_doc,linked_doc_lang).txt, - html_concordance: by_filename(linked_doc,linked_doc_lang).html_concordance, - digest: by_filename(linked_doc,linked_doc_lang).digest, - sisupod: by_filename(linked_doc,linked_doc_lang,source).sisupod, - source: by_filename(linked_doc,linked_doc_lang,source).source, + manifest: by_filename(m_linked_doc,m_linked_doc_lang).manifest, + html_toc: by_filename(m_linked_doc,m_linked_doc_lang).html_toc, + html_doc: by_filename(m_linked_doc,m_linked_doc_lang).html_doc, + epub: by_filename(m_linked_doc,m_linked_doc_lang).epub, + pdf_landscape: by_filename(m_linked_doc,m_linked_doc_lang).pdf_landscape, + pdf_portrait: by_filename(m_linked_doc,m_linked_doc_lang).pdf_landscape, + odt: by_filename(m_linked_doc,m_linked_doc_lang).odt, + xhtml: by_filename(m_linked_doc,m_linked_doc_lang).xhtml, + xml_sax: by_filename(m_linked_doc,m_linked_doc_lang).xml_sax, + xml_dom: by_filename(m_linked_doc,m_linked_doc_lang).xml_dom, + txt: by_filename(m_linked_doc,m_linked_doc_lang).txt, + html_concordance: by_filename(m_linked_doc,m_linked_doc_lang).html_concordance, + digest: by_filename(m_linked_doc,m_linked_doc_lang).digest, + sisupod: by_filename(m_linked_doc,m_linked_doc_lang,source).sisupod, + source: by_filename(m_linked_doc,m_linked_doc_lang,source).source, } end - linked_title="#{pre}{#{txt} }#{lnk[:manifest]}#{note}\n\n" + linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n" tuned_file_tmp << linked_title output_filetypes=output_filetypes_in_cmd(cmd,lnk) output_filetypes[:gen].each do |o_f| |