diff options
-rw-r--r-- | data/doc/sisu/html/sisu.1.html | 37 | ||||
-rw-r--r-- | data/doc/sisu/html/sisu_pdf.7.html | 20 | ||||
-rw-r--r-- | data/doc/sisu/html/sisu_postgresql.7.html | 20 | ||||
-rw-r--r-- | data/doc/sisu/html/sisu_sqlite.7.html | 20 | ||||
-rw-r--r-- | lib/sisu/v0/sysenv.rb | 9 | ||||
-rw-r--r-- | man/man1/sisu.1 | 9 | ||||
-rw-r--r-- | man/man7/sisu_vim.7 | 9 |
7 files changed, 63 insertions, 61 deletions
diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html index 54d04145..b34bac56 100644 --- a/data/doc/sisu/html/sisu.1.html +++ b/data/doc/sisu/html/sisu.1.html @@ -3428,29 +3428,28 @@ Type: <i>information</i> <p> Filetype: <i>SiSU</i> text insert <p>0.58 -<p> Sourcefile Digest, MD5(sisu._sst)= <i>5f973d9b8e96b9f3fabc280e9d0a18e0</i> +<p> Sourcefile Digest, MD5(sisu._sst)= <i>7d1c79519108da1773a33367e1eba6b5</i> -<p> Skin_Digest: MD5(/home/ralph/grotto/theatre/dbld/sisu-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> -<p><i>20fc43cf3eb6590bc3399a1aef65c5a9</i> <p> <b>Generated</b> -<p> Document (metaverse) last -generated: <i>Sat</i> Sep 29 15:46:29 +0100 2007 -<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of -2007w39/2 (2007-09-25) -<p> Ruby version: <i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) - [i486-linux] +<p> Document (metaverse) last generated: <i>Sat</i> Sep 29 17:05:37 + +<p>+0100 2007 +<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) +<p> Ruby version: +<i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] <p> <ol> -<b>.</b><li>objects include: headings, paragraphs, verse, tables, images, -but not footnotes/endnotes which are numbered separately and tied to the -object from which they are referenced. </li><b>.</b><li>i.e. the html, pdf, odf outputs are -each built individually and optimised for that form of presentation, rather -than for example the html being a saved version of the odf, or the pdf -being a saved version of the html. </li><b>.</b><li>the different heading levels </li><b>.</b><li>units of -text, primarily paragraphs and headings, also any tables, poems, code-blocks -</li><b>.</b><li>Specification submitted by Adobe to ISO to become a full open ISO specification - <<a href='http://www.linux-watch.com/news/NS7542722606.html'>http://www.linux-watch.com/news/NS7542722606.html</a> +<b>.</b><li>objects include: headings, +paragraphs, verse, tables, images, but not footnotes/endnotes which are +numbered separately and tied to the object from which they are referenced. +</li><b>.</b><li>i.e. the html, pdf, odf outputs are each built individually and optimised +for that form of presentation, rather than for example the html being a +saved version of the odf, or the pdf being a saved version of the html. +</li><b>.</b><li>the different heading levels </li><b>.</b><li>units of text, primarily paragraphs and headings, +also any tables, poems, code-blocks </li><b>.</b><li>Specification submitted by Adobe to +ISO to become a full open ISO specification <<a href='http://www.linux-watch.com/news/NS7542722606.html'>http://www.linux-watch.com/news/NS7542722606.html</a> ><br> </li><b>.</b><li>ISO/IEC 26300:2006 </dd> @@ -3563,7 +3562,7 @@ distributable are not freely changeable. </li><b>.</b><li>named index.html or mo <dd></dd> <dt>* Last Generated on: Sat Sep 29 -15:46:29 +0100 2007 </dt> +17:05:38 +0100 2007 </dt> <dd></dd> <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a> diff --git a/data/doc/sisu/html/sisu_pdf.7.html b/data/doc/sisu/html/sisu_pdf.7.html index 7c977c9e..4c2f884e 100644 --- a/data/doc/sisu/html/sisu_pdf.7.html +++ b/data/doc/sisu/html/sisu_pdf.7.html @@ -99,21 +99,21 @@ Type: <i>information</i> <p> Sourcefile Digest, MD5(sisu_pdf.sst)= <i>bed13854370b5daf1b1541527e8946b7</i> -<p> Skin_Digest: MD5(/home/ralph/grotto/theatre/dbld/sisu-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> -<p><i>20fc43cf3eb6590bc3399a1aef65c5a9</i> <p> <b>Generated</b> -<p> Document (metaverse) last -generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 -<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of -2007w39/2 (2007-09-25) -<p> Ruby version: <i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) - [i486-linux] +<p> Document (metaverse) last generated: <i>Sat</i> Sep 29 17:05:37 + +<p>+0100 2007 +<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) +<p> Ruby version: +<i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] <p> <p> <dl> -<dt>Other versions of this document: </dt> +<dt>Other versions of this +document: </dt> <dd></dd> <dt>manifest: <<a href='http://www.jus.uio.no/sisu/sisu_pdf/sisu_manifest.html'><a href='http://www.jus.uio.no/sisu/sisu_pdf/sisu_manifest.html'>http://www.jus.uio.no/sisu/sisu_pdf/sisu_manifest.html</a> @@ -152,7 +152,7 @@ generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 <dd></dd> <dt>* Last Generated on: Sat Sep 29 -16:06:44 +0100 2007 </dt> +17:05:39 +0100 2007 </dt> <dd></dd> <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a> diff --git a/data/doc/sisu/html/sisu_postgresql.7.html b/data/doc/sisu/html/sisu_postgresql.7.html index 35cb1fe8..73cbabf3 100644 --- a/data/doc/sisu/html/sisu_postgresql.7.html +++ b/data/doc/sisu/html/sisu_postgresql.7.html @@ -126,21 +126,21 @@ Type: <i>information</i> <p>text 0.58 <p> Sourcefile Digest, MD5(sisu_postgresql.sst)= <i>9010e85001c50e30ba2ab69f9097825a</i> -<p> Skin_Digest: MD5(/home/ralph/grotto/theatre/dbld/sisu-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> -<p><i>20fc43cf3eb6590bc3399a1aef65c5a9</i> <p> <b>Generated</b> -<p> Document (metaverse) last -generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 -<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of -2007w39/2 (2007-09-25) -<p> Ruby version: <i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) - [i486-linux] +<p> Document (metaverse) last generated: <i>Sat</i> Sep 29 17:05:38 + +<p>+0100 2007 +<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) +<p> Ruby version: +<i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] <p> <p> <dl> -<dt>Other versions of this document: </dt> +<dt>Other versions of this +document: </dt> <dd></dd> <dt>manifest: <<a href='http://www.jus.uio.no/sisu/sisu_postgresql/sisu_manifest.html'><a href='http://www.jus.uio.no/sisu/sisu_postgresql/sisu_manifest.html'>http://www.jus.uio.no/sisu/sisu_postgresql/sisu_manifest.html</a> @@ -179,7 +179,7 @@ generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 <dd></dd> <dt>* Last Generated on: Sat Sep 29 -16:06:44 +0100 2007 </dt> +17:05:39 +0100 2007 </dt> <dd></dd> <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a> diff --git a/data/doc/sisu/html/sisu_sqlite.7.html b/data/doc/sisu/html/sisu_sqlite.7.html index 9b710a0f..7559ff17 100644 --- a/data/doc/sisu/html/sisu_sqlite.7.html +++ b/data/doc/sisu/html/sisu_sqlite.7.html @@ -124,21 +124,21 @@ Type: <i>information</i> <p>0.58 <p> Sourcefile Digest, MD5(sisu_sqlite.sst)= <i>c4717fcab8a43de498d41a916bb99551</i> -<p> Skin_Digest: MD5(/home/ralph/grotto/theatre/dbld/sisu-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +<p> Skin_Digest: MD5(skin_sisu_manual.rb)= <i>20fc43cf3eb6590bc3399a1aef65c5a9</i> -<p><i>20fc43cf3eb6590bc3399a1aef65c5a9</i> <p> <b>Generated</b> -<p> Document (metaverse) last -generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 -<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of -2007w39/2 (2007-09-25) -<p> Ruby version: <i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) - [i486-linux] +<p> Document (metaverse) last generated: <i>Sat</i> Sep 29 17:05:38 + +<p>+0100 2007 +<p> Generated by: <i>SiSU</i> <i>0.59.1</i> of 2007w39/2 (2007-09-25) +<p> Ruby version: +<i>ruby</i> 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] <p> <p> <dl> -<dt>Other versions of this document: </dt> +<dt>Other versions of this +document: </dt> <dd></dd> <dt>manifest: <<a href='http://www.jus.uio.no/sisu/sisu_sqlite/sisu_manifest.html'><a href='http://www.jus.uio.no/sisu/sisu_sqlite/sisu_manifest.html'>http://www.jus.uio.no/sisu/sisu_sqlite/sisu_manifest.html</a> @@ -177,7 +177,7 @@ generated: <i>Sat</i> Sep 29 16:06:43 +0100 2007 <dd></dd> <dt>* Last Generated on: Sat Sep 29 -16:06:44 +0100 2007 </dt> +17:05:39 +0100 2007 </dt> <dd></dd> <dt>* SiSU <a href='http://www.jus.uio.no/sisu'>http://www.jus.uio.no/sisu</a> diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 8bf805be..329c9111 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -536,7 +536,10 @@ module SiSU_Env program='openssl' program_ref="\n\t\tmd5 digest requested" if program_found?(program) - dgst=%x{openssl dgst -md5 #{filename}}.strip + pwd=Dir.pwd + Dir.chdir(File.dirname(filename)) + dgst=%x{openssl dgst -md5 #{File.basename(filename)}}.strip #use file name without file path + Dir.chdir(pwd) dgst.scan(/\S+/) else puts "\tWARN: #{program} is not installed #{program_ref}" #if @cmd =~/v/ false @@ -546,7 +549,9 @@ module SiSU_Env program='openssl' program_ref="\n\t\tsha digest requested" if program_found?(program) - dgst=%x{openssl dgst -sha256 #{filename}}.strip + Dir.chdir(File.dirname(filename)) + dgst=%x{openssl dgst -sha256 #{File.basename(filename)}}.strip #use file name without file path + Dir.chdir(pwd) dgst.scan(/\S+/) else puts "\tWARN: #{program} is not installed #{program_ref}" #if @cmd =~/v/ false diff --git a/man/man1/sisu.1 b/man/man1/sisu.1 index 8cbb0056..e07eb22a 100644 --- a/man/man1/sisu.1 +++ b/man/man1/sisu.1 @@ -4746,11 +4746,10 @@ Filetype: .BR Sourcefile Digest, MD5(sisu._sst)= -.I 5f973d9b8e96b9f3fabc280e9d0a18e0 +.I 7d1c79519108da1773a33367e1eba6b5 .BR -Skin_Digest: -MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +Skin_Digest: MD5(skin_sisu_manual.rb)= .I 20fc43cf3eb6590bc3399a1aef65c5a9 .BR @@ -4758,7 +4757,7 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam .BR Document (metaverse) last generated: -.I Sat Sep 29 15:46:29 +0100 2007 +.I Sat Sep 29 17:05:37 +0100 2007 .BR Generated by: @@ -4925,6 +4924,6 @@ at: <http://www.jus.uio.no/sisu> .TP * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] .TP -* Last Generated on: Sat Sep 29 15:46:29 +0100 2007 +* Last Generated on: Sat Sep 29 17:05:38 +0100 2007 .TP * SiSU http://www.jus.uio.no/sisu diff --git a/man/man7/sisu_vim.7 b/man/man7/sisu_vim.7 index 553e8fd6..07af608a 100644 --- a/man/man7/sisu_vim.7 +++ b/man/man7/sisu_vim.7 @@ -52,7 +52,7 @@ Vim). .BR sisu\-vim actions are activated on files with the suffix \.sst \.ssm \.ssi -\.\-sst \._sst (and the same with a further \.meta extension) + \.\-sst \._sst (and the same with a further \.meta extension) .nf @@ -151,8 +151,7 @@ Sourcefile Digest, MD5(sisu_vim.sst)= .I a3db74eebef04815aa234d3c3b17f375 .BR -Skin_Digest: -MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_samples/sisu_manual/_sisu/skin/doc/skin_sisu_manual.rb)= +Skin_Digest: MD5(skin_sisu_manual.rb)= .I 20fc43cf3eb6590bc3399a1aef65c5a9 .BR @@ -160,7 +159,7 @@ MD5(/home/ralph/grotto/theatre/dbld/sisu\-dev/sisu/data/doc/sisu/sisu_markup_sam .BR Document (metaverse) last generated: -.I Sat Sep 29 13:20:58 +0100 2007 +.I Sat Sep 29 17:14:44 +0100 2007 .BR Generated by: @@ -193,6 +192,6 @@ at: <http://www.jus.uio.no/sisu> .TP * Ruby version: ruby 1.8.6 (2007-06-07 patchlevel 36) [i486-linux] .TP -* Last Generated on: Sat Sep 29 13:21:02 +0100 2007 +* Last Generated on: Sat Sep 29 17:14:44 +0100 2007 .TP * SiSU http://www.jus.uio.no/sisu |