From 14d7b8a58f10884d6941181604195243ab27e6c6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 12 Jul 2008 00:59:37 -0400
Subject: minor fixes: remote sourcefile; processing directory; manifest info
---
CHANGELOG | 13 +++++++++++++
lib/sisu/v0/composite.rb | 2 ++
lib/sisu/v0/manifest.rb | 26 +++++++++++++-------------
lib/sisu/v0/sysenv.rb | 6 +++---
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c70b8c2f..4cdba0bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,19 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.67.4.orig.tar.gz (2008-07-12:27/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz
+ sisu_0.67.4.orig.tar.gz
+ sisu_0.67.4-1.dsc
+ sisu_0.67.4-1.diff.gz
+
+ * remote sisu sourcefile and sisupod, fixes, download and generate locally
+
+ * /tmp processing directory renamed to fix issues with default directory tab
+ expansion of filenames and e.g. texpdf images
+
+ * manifest minor changes to document information displayed
+
%% sisu_0.67.3.orig.tar.gz (2008-07-02:27/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz
f8c57f0e1992a5a829c321b5648dd53d31e65067d1b9464969a4e33afa9be2be 1500468 sisu_0.67.3.orig.tar.gz
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb
index 9b3689c3..12facd1b 100644
--- a/lib/sisu/v0/composite.rb
+++ b/lib/sisu/v0/composite.rb
@@ -60,8 +60,10 @@
=end
module SiSU_Assemble
+ require 'fileutils'
require "#{SiSU_lib}/sysenv"
class Remote_image
+ include FileUtils
def initialize
@env=SiSU_Env::Info_env.new
end
diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb
index 5ea0baab..4861097e 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v0/manifest.rb
@@ -174,47 +174,47 @@ module SiSU_Manifest
def output_tests
if FileTest.file?("#@base_path/#{@md.fn[:toc]}")==true
img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_toc.png" alt="TOC linked" /> '
- id,file='table of contents (for segmented HTML text)',@md.fn[:toc]
+ id,file='HTML, table of contents (for segmented text)',@md.fn[:toc]
summarize(id,file,img)
end
if FileTest.file?("#@base_path/#{@md.fn[:doc]}")==true
img='<img border="0" height="15" width="15" src="../_sisu/image_sys/b_doc.png" alt="Full Text" /> '
- id,file='full length document (HTML)',@md.fn[:doc]
+ 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)',@md.fn[:pdf_p]
+ id,file='PDF document portrait/vertical (recommended for printing)',@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)',@md.fn[:pdf_l]
+ id,file='PDF document landscape/horizontal (recommended for screen viewing)',@md.fn[:pdf_l]
summarize(id,file,img)
end
if FileTest.file?("#@base_path/#{@md.fn[:odf]}")==true
img='<img border="0" height="18" width="18" src="../_sisu/image_sys/b_odf.png" alt="ODF/ODT" /> '
- id,file='full length document (ODF:ODT - Open Document Format)',@md.fn[:odf]
+ id,file='ODF:ODT (Open Document Format)',@md.fn[:odf]
summarize(id,file,img)
end
if FileTest.file?("#@base_path/#{@md.fn[:xhtml]}")==true
- id,file='full length document (XHTML)',@md.fn[:xhtml]
+ id,file='XHTML',@md.fn[:xhtml]
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fn[:sax]}")==true
- id,file='full length document (XML SAX)',@md.fn[:sax]
+ id,file='XML SAX',@md.fn[:sax]
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fn[:dom]}")==true
- id,file='full length document (XML DOM)',@md.fn[:dom]
+ id,file='XML DOM',@md.fn[:dom]
summarize(id,file)
end
if FileTest.file?("#@base_path/#{@md.fn[:plain]}")==true
- if @md.cmd =~/a/; id,file='full length document (plaintext Unix (UTF-8) with footnotes)',@md.fn[:plain]
- elsif @md.cmd =~/e/; id,file='full length document (plaintext Unix (UTF-8) with endnotes)',@md.fn[:plain]
- elsif @md.cmd =~/A/; id,file='full length document (plaintext dos (UTF-8) with footnotes)',@md.fn[:plain]
- elsif @md.cmd =~/E/; id,file='full length document (plaintext dos (UTF-8) with endnotes)',@md.fn[:plain]
- else id,file='full length document (plaintext (UTF-8))',@md.fn[:plain]
+ if @md.cmd =~/a/; id,file='Plaintext (Unix (UTF-8) with footnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/e/; id,file='Plaintext (Unix (UTF-8) with endnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/A/; id,file='Plaintext (dos (UTF-8) with footnotes)',@md.fn[:plain]
+ elsif @md.cmd =~/E/; id,file='Plaintext (dos (UTF-8) with endnotes)',@md.fn[:plain]
+ else id,file='Plaintext (UTF-8)',@md.fn[:plain]
end
summarize(id,file)
end
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 31f4f19f..bde769e2 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -102,7 +102,7 @@ module SiSU_Env
data=Config::CONFIG['datadir'] + '/doc/sisu'
m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m
@stub_pwd ||=@@pwd[m,1]
- prcss_dir='_sisu_processing~'
+ prcss_dir='_sisu_processing_'
prcss_dir_tmp_root="/tmp/#{prcss_dir}"
prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}"
if @@user
@@ -2001,9 +2001,9 @@ WOK
conf=if defined? @rc['default']['language']; @rc['default']['language']
else nil
end
- l=if pwd=~m ; pwd[m1,1] #2 directory: by visible directory name
+ l=if pwd=~ m; pwd[m,1] #2 directory: by visible directory name
elsif conf; @rc['default']['language'] #3 config: from sisurc.yaml
- else defaults[:language] #4 sisu: program default
+ else defaults[:language] #4 sisu: program default
end #1 document: param gets
SiSU_Env::Standardise_language.new(l)
end
--
cgit v1.2.3