aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG_v218
-rw-r--r--conf/sisu/v2/version.yml6
-rw-r--r--data/doc/sisu/v2/CHANGELOG18
-rw-r--r--data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi20
-rw-r--r--lib/sisu/v2/dal_syntax.rb2
-rw-r--r--lib/sisu/v2/hub.rb5
-rw-r--r--lib/sisu/v2/sysenv.rb8
-rw-r--r--lib/sisu/v2/urls.rb11
8 files changed, 54 insertions, 34 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 28eb16fb..ee4d8ed5 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,23 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.3.4.orig.tar.gz (2010-05-12:19/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
+ sisu_2.3.4.orig.tar.gz
+ sisu_2.3.4-1.dsc
+ sisu_2.3.4-1.diff.gz
+
+ * dal_syntax, italics match fix
+
+ * urls, screen output control
+
+ * sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
+
%% 2.3.3.orig.tar.gz (2010-05-05:18/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
- sisu_2.3.3.orig.tar.gz
- sisu_2.3.3-1.dsc
- sisu_2.3.3-1.diff.gz
+ 89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
+ c64f5d52720c666872bacadf1867b4aa01c04380a257df5dbf95a3f23ca0293b 1145 sisu_2.3.3-1.dsc
+ c43c198f517f4973c936d8fea153bacceb5037bee1fa690b26d5a97b45d20583 276098 sisu_2.3.3-1.diff.gz
* texpdf, special word and number optional break points, (also, reduce text
display size of digests, reduce image size, add some url braces)
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 8736e8da..1e5e0423 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.3.3
-:date_stamp: 2010w18/3
-:date: "2010-05-05"
+:version: 2.3.4
+:date_stamp: 2010w19/3
+:date: "2010-05-12"
:project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 1e6e0843..905e940b 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,23 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.3.4.orig.tar.gz (2010-05-12:19/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
+ sisu_2.3.4.orig.tar.gz
+ sisu_2.3.4-1.dsc
+ sisu_2.3.4-1.diff.gz
+
+ * dal_syntax, italics match fix
+
+ * urls, screen output control
+
+ * sysenv, switch default hash digest fingerprints to sha256 (rather than md5)
+
%% 2.3.3.orig.tar.gz (2010-05-05:18/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
- sisu_2.3.3.orig.tar.gz
- sisu_2.3.3-1.dsc
- sisu_2.3.3-1.diff.gz
+ 89d16ba433085f4cc7a3438dc4c0f2797888394623c7e64f6322633646374191 2753813 sisu_2.3.3.orig.tar.gz
+ c64f5d52720c666872bacadf1867b4aa01c04380a257df5dbf95a3f23ca0293b 1145 sisu_2.3.3-1.dsc
+ c43c198f517f4973c936d8fea153bacceb5037bee1fa690b26d5a97b45d20583 276098 sisu_2.3.3-1.diff.gz
* texpdf, special word and number optional break points, (also, reduce text
display size of digests, reduce image size, add some url braces)
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index c3c4f99a..c02898ec 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -55,7 +55,7 @@
3~source- Source (tarball tar.gz)
-_* {~^ sisu_2.3.3.orig.tar.gz (2010-05-05:18/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
+_* {~^ sisu_2.3.4.orig.tar.gz (2010-05-12:19/3) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
_* {~^ sisu-markup-samples_2.0.3.orig.tar.gz (of 2010-05-01:17/6 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3.orig.tar.gz *~sisu-markup-samples
@@ -102,11 +102,11 @@ group{
*{Source}*
-{~^ sisu_2.3.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3.orig.tar.gz
+{~^ sisu_2.3.4.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4.orig.tar.gz
-{~^ sisu_2.3.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3-1.diff.gz
+{~^ sisu_2.3.4-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4-1.diff.gz
-{~^ sisu_2.3.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.3-1.dsc
+{~^ sisu_2.3.4-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.4-1.dsc
}group
@@ -114,15 +114,15 @@ group{
*{Debs}*
-{~^ sisu_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+{~^ sisu_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.3.4-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
-{~^ sisu-complete_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+{~^ sisu-complete_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.3.4-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
-{~^ sisu-pdf_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+{~^ sisu-pdf_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.3.4-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
-{~^ sisu-postgresql_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+{~^ sisu-postgresql_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.3.4-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
-{~^ sisu-sqlite_2.3.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+{~^ sisu-sqlite_2.3.4-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.3.4-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
}group
@@ -152,7 +152,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
sudo rpm -i [package name]
-_* {~^ sisu-2.3.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.3-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.3.4-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.3.4-2.noarch.rpm ~{ <br>created using alien }~
_* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.3.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb
index 2b1da084..c34104c7 100644
--- a/lib/sisu/v2/dal_syntax.rb
+++ b/lib/sisu/v2/dal_syntax.rb
@@ -358,7 +358,7 @@ module SiSU_Syntax
"\\1#{@emph[:o]}\\2#{@emph[:c]}") #emphasis
dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)!\{(.+?)\}!/,
"\\1#{Mx[:fa_bold_o]}\\2#{Mx[:fa_bold_c]}") #bold
- dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[]|\(|\>)\/\{(.+?)\}\//,
+ dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\(|\>)\/\{(.+?)\}\//,
"\\1#{Mx[:fa_italics_o]}\\2#{Mx[:fa_italics_c]}") #italics
dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s+|['"]|#{Mx[:nbsp]}|#{Mx[:fa_o_c]}|#{Mx[:fa_c]}|#{Mx[:lnk_o]}|#{Mx[:br_line]}|#{Mx[:br_paragraph]}|[\(\[\{]|\>)_\{(.+?)\}_/,
"\\1#{Mx[:fa_underscore_o]}\\2#{Mx[:fa_underscore_c]}") #underscore
diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb
index bab13ed1..b182a31e 100644
--- a/lib/sisu/v2/hub.rb
+++ b/lib/sisu/v2/hub.rb
@@ -484,9 +484,8 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
else
end
- unless @opt.cmd =~/[q]/; op('urls','urls') #% unless -q
- end
- @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil
+ op('urls','urls')
+ @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/
@tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty?
if defined? @@env.path.processing \
and FileTest.directory?(@@env.path.processing) \
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index cc21a6c9..f11cdcbd 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -200,7 +200,7 @@ module SiSU_Env
LANGUAGE_CODE => 'en', #change, unecessary duplication though currently used
MULTILINGUAL => true,
CONCORD_MAX => 260000,
- DIGEST => 'md5',
+ DIGEST => 'sha256',
WEBSERV_HOST_CGI => ' http://localhost',
WEBSERV_PORT_CGI => 8081, #8111,8123,8081
POSTGRESQL_USER => @@user, #'ralph', # change user !!!
@@ -1900,16 +1900,16 @@ WOK
case @rc['default']['digest']
when /^sha(?:2|256)?$/; 'sha256'
when /^md5$/; 'md5'
- else 'md5'
+ else 'sha256'
end
- else 'md5'
+ else 'sha256'
end
end
def length
case digest.type
when /sha256/; 64
when /md5/; 32
- else 32
+ else 64
end
end
def pattern
diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb
index fd88f1ac..56b93a78 100644
--- a/lib/sisu/v2/urls.rb
+++ b/lib/sisu/v2/urls.rb
@@ -123,8 +123,7 @@ module SiSU_urls
end
def songsheet
begin
- urls_all if @opt.cmd=~/U/
- urls_select unless @opt.cmd=~/q/
+ @opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
ensure
end
@@ -248,10 +247,8 @@ module SiSU_urls
end
end
def urls_all
- if @opt.cmd =~/[MVv]/
- SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output}/#{@fnb}").flow
- end
+ i="(output manifest) #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html"
+ SiSU_Screen::Ansi.new(@opt.cmd,'URLs',i).grey_title_hi
@u.each do |x,y|
tell=case x
when /^m/
@@ -268,7 +265,7 @@ module SiSU_urls
when /^i/
SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_generator} #{@env.path.manpage}/#{@fnb}.1 |most")
end
- if @opt.cmd =~/[MVv]/
+ unless @opt.cmd =~/q/
tellx.result if tellx
tell.result if tell
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 12:11:01 +0000