From 2547d72cf256de3f02893def49c84859763a54b3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 3 Oct 2011 21:13:43 -0400
Subject: v3: sysenv, output_structure_by: filename, fix to output directories
 created

---
 data/doc/sisu/CHANGELOG_v3 |  2 ++
 lib/sisu/v3/sysenv.rb      | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 02903c43..04626745 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -29,6 +29,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.0.orig.tar.xz
     * link to git repo
     * minor fixes
 
+  * sysenv, output_structure_by: filename, fix to output directories created
+
   * texpdf, fonts, Liberation series default (Sans for main)
     * (mono) improved with selection of Liberation Mono as default
     * font (main font, mono) configurable in sisurc.yml under
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index aaf210e0..3ef176ec 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3397,13 +3397,19 @@ WOK
         @@filename_html_scroll=File.new(p_fn,'w+')
       end
       def html_seg_index
-        pth,fn="#{output_path.html.dir}/#{@md.fnb}",base_filename.html_seg_index
+        pth=(by_filename?) \
+        ? "#{output_path.html.dir}"
+        : "#{output_path.html.dir}/#{@md.fnb}"
+        fn=base_filename.html_seg_index
         make_path(pth)
         p_fn=place_file.html_seg_index.dir
         @@filename_html_index=File.new(p_fn,'w+')
       end
       def html_segtoc
-        pth,fn="#{output_path.html.dir}/#{@md.fnb}",base_filename.html_segtoc
+        pth=(by_filename?) \
+        ? "#{output_path.html.dir}"
+        : "#{output_path.html.dir}/#{@md.fnb}"
+        fn=base_filename.html_segtoc
         make_path(pth)
         p_fn=place_file.html_segtoc.dir
         @@filename_html_index=File.new(p_fn,'w+')
-- 
cgit v1.2.3