diff options
Diffstat (limited to 'lib/sisu/v5/dal_expand_insertions.rb')
| -rw-r--r-- | lib/sisu/v5/dal_expand_insertions.rb | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/lib/sisu/v5/dal_expand_insertions.rb b/lib/sisu/v5/dal_expand_insertions.rb index d0595482..d85910aa 100644 --- a/lib/sisu/v5/dal_expand_insertions.rb +++ b/lib/sisu/v5/dal_expand_insertions.rb @@ -111,7 +111,7 @@ module SiSU_DAL_Insertions def by_language(linked_doc,lng,src=nil) @linked_doc,@lng,@src=linked_doc,lng,src @base_path="#{@md.file.output_path.base.url}/#{@lng}" - def fnh(ft) + def fnh { fn: @linked_doc, ft: ft, @@ -121,15 +121,15 @@ module SiSU_DAL_Insertions "#{@base_path}/#{pth}/#{fn}" end def manifest - fn=@md.file.base_filename.manifest(fnh(Sfx[:html])) + fn=@md.file.base_filename.manifest(fnh) path_and_file(fn,'manifest') end def html_toc - fn=@md.file.base_filename.html_segtoc(fnh(Sfx[:html])) + fn=@md.file.base_filename.html_segtoc(fnh) "#{@base_path}/html/#{@linked_doc}/#{fn}" end def html_doc - fn=@md.file.base_filename.html_scroll(fnh(Sfx[:html])) + fn=@md.file.base_filename.html_scroll(fnh) path_and_file(fn,'html') end def html_concordance @@ -137,39 +137,39 @@ module SiSU_DAL_Insertions "#{@base_path}/html/#{@linked_doc}/#{fn}" end def epub - fn=@md.file.base_filename.epub(fnh(Sfx[:epub])) + fn=@md.file.base_filename.epub(fnh) path_and_file(fn,'epub') end def pdf_landscape - fn=@md.file.base_filename.pdf_l_a4(fnh(Sfx[:pdf])) + fn=@md.file.base_filename.pdf_l_a4(fnh) path_and_file(fn,'pdf') end def pdf_portrait - fn=@md.file.base_filename.pdf_p_a4(fnh(Sfx[:pdf])) + fn=@md.file.base_filename.pdf_p_a4(fnh) path_and_file(fn,'pdf') end def odt - fn=@md.file.base_filename.odt(fnh(Sfx[:odt])) + fn=@md.file.base_filename.odt(fnh) path_and_file(fn,'odt') end def xhtml - fn=@md.file.base_filename.xhtml(fnh(Sfx[:xhtml])) + fn=@md.file.base_filename.xhtml(fnh) path_and_file(fn,'xhtml') end def xml_sax - fn=@md.file.base_filename.xml_sax(fnh(Sfx[:xml_sax])) + fn=@md.file.base_filename.xml_sax(fnh) path_and_file(fn,'xml_sax') end def xml_dom - fn=@md.file.base_filename.xml_dom(fnh(Sfx[:xml_dom])) + fn=@md.file.base_filename.xml_dom(fnh) path_and_file(fn,'xml_dom') end def txt - fn=@md.file.base_filename.txt(fnh(Sfx[:txt])) + fn=@md.file.base_filename.txt(fnh) path_and_file(fn,'txt') end def digest - fn=@md.file.base_filename.hash_digest(fnh(Sfx[:txt])) + fn=@md.file.base_filename.hash_digest(fnh) path_and_file(fn,'digest') end def source @@ -186,7 +186,6 @@ module SiSU_DAL_Insertions def fnh { fn: @linked_doc, - lng: ".#{@lng}" } end def path_and_file(fn,pth) @@ -258,7 +257,6 @@ module SiSU_DAL_Insertions def fnh { fn: @linked_doc, - lng: ".#{@lng}" } end def path_and_file(fn) |