From a11485b8aa86780677c7a5ac415551e559e5961c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 23 May 2011 21:23:30 -0400
Subject: v3: param, html, epub, xml, simplify file-naming with language code

* language code occurs in fixed location within file-name (could previously do
  so in 1 of 3 configured locations)
---
 lib/sisu/v3/html.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/sisu/v3/html.rb')

diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb
index 8d10b7da..b569653f 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v3/html.rb
@@ -322,7 +322,7 @@ WOK
         title=if dob.obj !~/Metadata/; linkname
         else
           link='metadata'
-          %{<b><a href="#{@md.fnl[:pre]}#{link}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}">#{linkname}</a></b>}
+          %{<b><a href="#{link}#{@md.lang_code_insert}#{Sfx[:html]}">#{linkname}</a></b>}
         end
         toc={}
         txt_obj={ txt: title }
@@ -409,13 +409,13 @@ WOK
         linkname,ocn=dob.obj.strip,dob.ocn
         p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn) if ocn
         if dob.ln ==4
-          seg_link=%{  <a href="#{@md.fnl[:pre]}#{dob.name}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" target="_top">
+          seg_link=%{  <a href="#{dob.name}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top">
     #{dob.obj}
   </a> }
           @@seg_url=dob.name
         elsif dob.obj =~/\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+/
           seg_link=dob.obj.gsub(/^(\d+.\d+.\d+.\d+|\d+.\d+.\d+|\d+.\d+|\d+)(.*)/,
-            %{<a href="#{@md.fnl[:pre]}\\1#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}" } +
+            %{<a href="\\1#{@md.lang_code_insert}#{Sfx[:html]}" } +
             %{target="_top">\\1 \\2</a> })
         end
         p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn) if ocn
@@ -451,7 +451,7 @@ WOK
         if ocn \
         and ocn !~/#/
           p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn)
-          lnk_n_txt=%{  <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
+          lnk_n_txt=%{  <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}">
     #{linkname}
   </a>}
           txt_obj={ txt: lnk_n_txt }
@@ -472,7 +472,7 @@ WOK
         if ocn \
         and ocn !~/#/
           p_num=SiSU_HTML_Format::Paragraph_number.new(@md,ocn)
-          lnk_n_txt=%{  <a href="#{@md.fnl[:pre]}#{@@seg_url}#{@md.fnl[:mid]}#{Sfx[:html]}#{@md.fnl[:post]}##{ocn}">
+          lnk_n_txt=%{  <a href="#{@@seg_url}#{@md.lang_code_insert}#{Sfx[:html]}##{ocn}">
   #{linkname}
 </a>}
           txt_obj={ txt: lnk_n_txt }
-- 
cgit v1.2.3