Merge commit 'sisu_3.1.9' into debian/sid

5 files changed, 42 insertions, 22 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 3dec3c02..be217ffb 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,34 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.1.9.orig.tar.xz (2011-12-19:51/1)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.9
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.9-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.9.orig.tar.xz
+  sisu_3.1.9.orig.tar.xz
+  sisu_3.1.9-1.dsc
+  sisu_3.1.9-1.debian.tar.gz
+
+  * manually created html files in _sisu/home (*.html) copied as home pages
+    (previous behavior was only to copy _sisu/home/index.html)
+
+  * html, seg output, index.html fixes
+    * place in correct directory and use language code as appropriate
+    * remove broken index.html from output [note the existing erroneous file
+      is not removed by a program run, it has to be removed manually]
+
+  * options, behavior of --find & --glob, can only be used on base directory
+    level, (it is not possible to limit the glob to say en/... or fr/...), for
+    now prints a message that sub-directories may not be provided for --find or
+    --glob at this time
+
 %% 3.1.8.orig.tar.xz (2011-12-13:50/2)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.8
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.8.orig.tar.xz
-  sisu_3.1.8.orig.tar.xz
-  sisu_3.1.8-1.dsc
-  sisu_3.1.8-1.debian.tar.gz
+  24ed23c9b2f742503ca9137cad722ce6727fd92257b1cafe3069a3cad1d1be29 1649512 sisu_3.1.8.orig.tar.xz
+  4939bd204b85a540db13df4c8811af1f9045b2da8cb343c6ff240fcdcb7b9879 1382 sisu_3.1.8-1.dsc
+  6ad25fabc4c438105ec50579c1a58415eb66ebd32eb8dd32033fb1e59f9ff52b 290701 sisu_3.1.8-1.debian.tar.gz
 
   * texpdf, output by filetype, fix, produce pdf files with language code as
     part of filename (previously written over)
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index e2186fc9..3702f010 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.1.8
-:date_stamp: 2011w50/2
-:date: "2011-12-13"
+:version: 3.1.9
+:date_stamp: 2011w51/1
+:date: "2011-12-19"
 :project: SiSU
diff --git a/lib/sisu/v3/html.rb b/lib/sisu/v3/html.rb
index 3f867215..145ceb40 100644
--- a/lib/sisu/v3/html.rb
+++ b/lib/sisu/v3/html.rb
@@ -634,7 +634,6 @@ WOK
       def segtoc
         begin
           @filename_html_segtoc=@file.write_file.html_segtoc
-          @filename_html_index=@file.write_file.html_seg_index
           @data.each do |para|
             para.strip!
             para.gsub!(/<!.+?!>/,'')
@@ -642,19 +641,16 @@ WOK
             para.gsub!(Xx[:html_relative1],@file.path_rel_links.html_seg_1)
             unless para =~/\A\s*\Z/
               @filename_html_segtoc.puts para,"\n"
-              @filename_html_index.puts para,"\n"
             end
           end
         rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error
         ensure
           @filename_html_segtoc.close
-          @filename_html_index.close
-          ## only works properly for directory_structure_by language, fix
-          unless FileTest.file?("#{@file.output_path.html.dir}/index.html")
+          unless FileTest.file?("#{@file.output_path.html_seg.dir}/#{@md.file.base_filename.html_seg_index}")
             pwd_set=Dir.pwd
             idx_lnk=@file.base_filename.html_segtoc
-            mlnk='index.html'
-            Dir.chdir(@file.output_path.html.dir)
+            mlnk=@file.base_filename.html_seg_index
+            Dir.chdir(@file.output_path.html_seg.dir)
             FileUtils::rm_f(mlnk)
             FileUtils::ln_s(idx_lnk, mlnk)
             Dir.chdir(pwd_set)
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index ffd0da0f..b9d54123 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -131,7 +131,12 @@ module SiSU_commandline
           if find_flag \
           && y !~ /^-/ \
           && y =~ /\S+/
-            f << y
+            if y !~/\//
+              f << y
+            else
+              find_flag=false
+              puts %{sub-directories "#{y}" cannot be provided for --find or --glob at this time}
+            end
           end
         end
         r=Px[:lng_lst].join('|')
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 98a58f72..436e1d7f 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3740,7 +3740,7 @@ WOK
       def html_seg_index
         ft='.html'
         if @env.output_dir_structure.by_language_code?
-          'toc' + ft
+          'index' + ft
         else
           'index' + @md.lang_code_insert + ft
         end
@@ -5155,18 +5155,16 @@ WOK
       @vz_home=SiSU_Viz::Home.new
     end
     def homepage
-      homepage_path=nil
+      home_pages_manually_created=nil
       @env.sys.rc_path.each do |v|
-        if FileTest.file?("#{v}/home/index.html")
-          homepage_path="#{v}/home/index.html"
+        home_pages_manually_created=Dir.glob("#{v}/home/*.html")
+        if home_pages_manually_created.length > 0
           break
         end
       end
       FileUtils::mkdir_p("#{@env.path.webserv}/#{@env.path.stub_pwd}") unless FileTest.directory?("#{@env.path.webserv}/#{@env.path.stub_pwd}")
-      if homepage_path \
-      and FileTest.file?(homepage_path)
-        FileUtils::cp(homepage_path,"#{@env.path.webserv}/#{@env.path.stub_pwd}/index.html")
-        FileUtils::cp(homepage_path,"#{@env.path.webserv}/#{@env.path.stub_pwd}/toc.html")
+      if home_pages_manually_created
+        FileUtils.cp(home_pages_manually_created,"#{@env.path.webserv}/#{@env.path.stub_pwd}")
       else
         doc_skin=nil
         sk_doc='doc/skin_sisu.rb'