From 7d9281ca1cda283b24257e5fde7e269e592662a1 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 9 Dec 2014 19:09:11 -0500
Subject: c&d: html, output by filename, filenames, fix

---
 data/doc/sisu/CHANGELOG_v5     |  2 ++
 data/doc/sisu/CHANGELOG_v6     |  2 ++
 lib/sisu/current/se_file_op.rb | 18 +++++-------------
 lib/sisu/develop/se_file_op.rb | 18 +++++-------------
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index e9cfda25..23f76420 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -73,6 +73,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz
     reflected in generated cgi, sample search form, so, does not
     jump to the (otherwise correctly) identified location
 
+  * html, output by filename, filenames, fix
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 5.7.2 intended for Jessie (packaged for Debian as 5.7.1-2)
   was not accepted)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index a12fa89e..9e1a1afa 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -82,6 +82,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz
     reflected in generated cgi, sample search form, so, does not
     jump to the (otherwise correctly) identified location
 
+  * html, output by filename, filenames, fix
+
 ** SiSU "UnFrozen" - prior to end of Debian Freeze
   (upstream bugfix 6.3.2 (5.7.2) intended for Jessie (packaged for Debian as
   5.7.1-2) was not accepted)
diff --git a/lib/sisu/current/se_file_op.rb b/lib/sisu/current/se_file_op.rb
index b64aef94..bccb7605 100644
--- a/lib/sisu/current/se_file_op.rb
+++ b/lib/sisu/current/se_file_op.rb
@@ -1008,19 +1008,11 @@ module SiSU_File_Op
       def html_seg(fh)
         fh=default_hash_build(fh,Sfx[:html])
         fh[:lng]=lang_code?(fh[:lng])
-        fnh=if output_dir_structure.by_filename?
-          {
-            fn: 'scroll',
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        else
-          {
-            fn: fh[:fn],
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        end
+        fnh={
+          fn: fh[:fn],
+          ft: fh[:ft],
+          lng: fh[:lng],
+        }
         i18n(fnh)
       end
       def html_book_index(fh=nil)
diff --git a/lib/sisu/develop/se_file_op.rb b/lib/sisu/develop/se_file_op.rb
index 38b52f98..1555d119 100644
--- a/lib/sisu/develop/se_file_op.rb
+++ b/lib/sisu/develop/se_file_op.rb
@@ -1043,19 +1043,11 @@ module SiSU_File_Op
       def html_seg(fh)
         fh=default_hash_build(fh,Sfx[:html])
         fh[:lng]=lang_code?(fh[:lng])
-        fnh=if output_dir_structure.by_filename?
-          {
-            fn: 'scroll',
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        else
-          {
-            fn: fh[:fn],
-            ft: fh[:ft],
-            lng: fh[:lng],
-          }
-        end
+        fnh={
+          fn: fh[:fn],
+          ft: fh[:ft],
+          lng: fh[:lng],
+        }
         i18n(fnh)
       end
       def html_book_index(fh=nil)
-- 
cgit v1.2.3