From bf2a99e821f9d4ac64c2d558a6b6ca940a8aade4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 10 Oct 2008 22:26:18 -0400
Subject: book code, minor adjustment; and fix to manifest reporting of the
creation of sisupod (zip)
---
CHANGELOG | 10 ++++++++++
lib/sisu/v0/dal_idx.rb | 11 ++++++++---
lib/sisu/v0/manifest.rb | 10 ----------
lib/sisu/v0/sysenv.rb | 2 +-
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 69b3247a..4ad71acc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,16 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.69.3.orig.tar.gz (2008-10-09:40/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.3.orig.tar.gz
+ sisu_0.69.3.orig.tar.gz
+ sisu_0.69.3-1.dsc
+ sisu_0.69.3-1.diff.gz
+
+ * minor adjustment to book index code
+
+ * manifest, reporting of sisupod, [path fix in sysenv]
+
%% sisu_0.69.2.orig.tar.gz (2008-09-19:37/5)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.2.orig.tar.gz
dde55e10c47a2fc556113bd051a76877d53fdfe9133562cd9c4a41c4c817a4cb 1526475 sisu_0.69.2.orig.tar.gz
diff --git a/lib/sisu/v0/dal_idx.rb b/lib/sisu/v0/dal_idx.rb
index d7d5223e..36489e74 100644
--- a/lib/sisu/v0/dal_idx.rb
+++ b/lib/sisu/v0/dal_idx.rb
@@ -169,12 +169,17 @@ module SiSU_book_index
@idx[:sst] << "\n\n#{Mx[:br_page_new]}"
@idx[:sst] << "\n\n#{Mx[:lv_o]}2:#{Mx[:lv_c]}Index #{Mx[:id_o]}~0;0:0;x0#{Mx[:id_c]}"
@idx[:sst] << "\n\n#{Mx[:lv_o]}4:idx#{Mx[:lv_c]} [Index] #{Mx[:pa_non_object_dummy_heading]} #{Mx[:id_o]}~0;0:0;x0#{Mx[:id_c]}"
- alph=%W[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
+ alph=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
@idx[:html] << '<p>'
- alph.each {|x| @idx[:html] << %{<a href="##{x}">#{x}</a>, }}
+ alph.each do |x|
+ @idx[:html] << if x =~/[0-9]/; ''
+ else
+ %{<a href="##{x}">#{x}</a>, }
+ end
+ end
@idx[:html] << '</p>'
letter=alph.shift
- @idx[:html] << %{\n<hr />\n<p class="book_index_lev1"><a name="A">A</a></p>}
+ @idx[:html] << %{\n<p class="book_index_lev1"><a name="numeral"></a></p>}
the_idx.each do |i|
i.each do |x|
if x.class == String
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb
index 78045e80..22330734 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v0/manifest.rb
@@ -191,16 +191,6 @@ module SiSU_Manifest
id,file='HTML, full length document',@md.fn[:doc]
summarize(id,file,img)
end
- #if FileTest.file?("#@base_path/#{@md.fn[:pdf_p]}")==true
- # img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
- # id,file="full length document (PDF portrait / vertical - recommended for printing), size #{@md.papersize_array[0]}",@md.fn[:pdf_p]
- # summarize(id,file,img)
- #end
- #if FileTest.file?("#@base_path/#{@md.fn[:pdf_l]}")==true
- # img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
- # id,file="full length document (PDF landscape / horizontal - recommended for screen viewing), size #{@md.papersize_array[0]}",@md.fn[:pdf_l]
- # summarize(id,file,img)
- #end
if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_letter]}")==true
img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_letter]
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 25cf90ec..677c6d09 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -380,7 +380,7 @@ module SiSU_Env
@@flv ||=document_language_versions_found[:f]
unless @@fns =~/\S+?\.zip/
@@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
- elsif @fnb; @@fnb + '.sst.zip'
+ elsif @@fnb; @@fnb + '.sst.zip'
else '' # e.g. termsheet
end
end
--
cgit v1.2.3