From f8e79d11d785d7f3c0e37d17ef9810a736046da8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 11 May 2008 14:34:17 -0400 Subject: sisu-0.66.3 + md5s --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9a667b42..2d0f80c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,9 +11,9 @@ Reverse Chronological: %% sisu_0.66.3.orig.tar.gz (2008-05-11:18/7) http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz - sisu_0.66.3.orig.tar.gz - sisu_0.66.3-1.dsc - sisu_0.66.3-1.diff.gz + 6d5b61e6a37d9564d8d83d7eb9eb665a65da4c79 1497613 sisu_0.66.3.orig.tar.gz + 02d116186c960051d0f37af42d86539293391d8b 1151 sisu_0.66.3-1.dsc + f7d51e83761b3ffb66cf30a6662d1bef471b2a1b 146244 sisu_0.66.3-1.diff.gz * sqlite3, problem with transaction commits and disconnecting from db (including query and close), frustrating as sqlite is invaluable, bug has -- cgit v1.2.3 From 4cd184d2b50134a462940f7de3428f507aff8b60 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 22 May 2008 19:37:54 -0400 Subject: simplify syntax for import of external files, e.g.: << filename.sst minor related syntax changes, automatic version bump make appropriate additions to vim-syntax consider use of vim-addon manager --- CHANGELOG | 13 +++++ .../sisu/sisu_markup_samples/sisu_manual/sisu.ssm | 48 ++++++++--------- .../sisu_manual/sisu_configuration.ssm | 6 +-- .../sisu_manual/sisu_introduction.ssm | 12 ++--- .../sisu_manual/sisu_manual.ssm | 62 +++++++++++----------- .../sisu_manual/sisu_markup.sst | 18 ++----- .../sisu_manual/sisu_search.ssm | 12 ++--- .../conf/editor-syntax-etc/vim/syntax/sisu.vim | 3 ++ data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml | 7 +++ lib/sisu/v0/composite.rb | 9 ++-- lib/sisu/v0/dal.rb | 4 +- 11 files changed, 102 insertions(+), 92 deletions(-) create mode 100644 data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml diff --git a/CHANGELOG b/CHANGELOG index 2d0f80c5..912699c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,19 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.67.0.orig.tar.gz (2008-05-22:20/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.0.orig.tar.gz + sisu_0.67.0.orig.tar.gz + sisu_0.67.0-1.dsc + sisu_0.67.0-1.diff.gz + + * composite document, simplify syntax for importation of external files, + syntax change (minor), automatic version bump, document samples modified + accordingly + [when editing vim has get-file gf] + + * debian, vim-addon-manager + %% sisu_0.66.3.orig.tar.gz (2008-05-11:18/7) http://www.jus.uio.no/sisu/pkg/src/sisu_0.66.3.orig.tar.gz 6d5b61e6a37d9564d8d83d7eb9eb665a65da4c79 1497613 sisu_0.66.3.orig.tar.gz diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm index f06f157e..4ddc7e17 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm @@ -48,58 +48,58 @@ sisu [-CcFLSVvW] :B~ What is SiSU? -<< |sisu_introduction.ssi|@|^| +<< sisu_introduction.ssi % :B~? SiSU Commands -<< |sisu_commands.sst|@|^| +<< sisu_commands.sst -<< |sisu_help.sst|@|^| +<< sisu_help.sst % :B~? SiSU Markup -<< |sisu_markup.sst|@|^| +<< sisu_markup.sst -<< |sisu_filetypes.sst|@|^| +<< sisu_filetypes.sst % :B~? SiSU Configuration and Skins -<< |sisu_config.ssi|@|^| +<< sisu_config.ssi -<< |sisu_skin.sst|@|^| +<< sisu_skin.sst -<< |sisu_css.ssi|@|^| +<< sisu_css.ssi -<< |sisu_content_directories.ssi|@|^| +<< sisu_content_directories.ssi -<< |sisu_homepages.ssi|@|^| +<< sisu_homepages.ssi % :B~? SiSU Output and Markup Examples -<< |sisu_examples.ssi|@|^| +<< sisu_examples.ssi -<< |sisu_search_intro.ssi|@|^| +<< sisu_search_intro.ssi -<< |sisu_sql.ssi|@|^| +<< sisu_sql.ssi -<< |sisu_postgresql.sst|@|^| +<< sisu_postgresql.sst -<< |sisu_sqlite.sst|@|^| +<< sisu_sqlite.sst -<< |sisu_search_cgi.ssi|@|^| +<< sisu_search_cgi.ssi -<< |sisu_hyperestraier.ssi|@|^| +<< sisu_hyperestraier.ssi -<< |sisu_webrick.sst|@|^| +<< sisu_webrick.sst -<< |sisu_remote.sst|@|^| +<< sisu_remote.sst -<< |sisu_quickstart.sst|@|^| +<< sisu_quickstart.sst -<< |sisu_syntax_highlighting.sst|@|^| +<< sisu_syntax_highlighting.sst -<< |sisu_how.ssi|@|^| +<< sisu_how.ssi -<< |sisu_short_feature_summary.ssi|@|^| +<< sisu_short_feature_summary.ssi -<< |sisu_help_sources.sst|@|^| +<< sisu_help_sources.sst diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm index e9f53be1..90b149f8 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm @@ -47,10 +47,10 @@ % :C~ Environment -<< |sisu_config.ssi|@|^| +<< sisu_config.ssi :B~? Configuration of Documents -<< |sisu_skin.sst|@|^| +<< sisu_skin.sst -<< |sisu_homepages.ssi|@|^| +<< sisu_homepages.ssi diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm index 72ec0e97..853ec19a 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm @@ -45,14 +45,14 @@ :C~? Description -<< |sisu_introduction.ssi|@|^| +<< sisu_introduction.ssi -<< |sisu_how.ssi|@|^| +<< sisu_how.ssi -<< |sisu_short_feature_summary.ssi|@|^| +<< sisu_short_feature_summary.ssi -<< |sisu_help.sst|@|^| +<< sisu_help.sst -<< |sisu_help_sources.sst|@|^| +<< sisu_help_sources.sst -<< |sisu_help_sources.sst|@|^| +<< sisu_help_sources.sst diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm index 32b491d0..e384555c 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm @@ -43,76 +43,76 @@ :B~ What is SiSU? -<< |sisu_introduction.ssi|@|^| +<< sisu_introduction.ssi -<< |sisu_how.ssi|@|^| +<< sisu_how.ssi -<< |sisu_short_feature_summary.ssi|@|^| +<< sisu_short_feature_summary.ssi -<< |sisu_help.sst|@|^| +<< sisu_help.sst % :B~? SiSU Commands -<< |sisu_commands.sst|@|^| +<< sisu_commands.sst % :B~? SiSU Markup -<< |sisu_markup.sst|@|^| +<< sisu_markup.sst -<< |sisu_filetypes.sst|@|^| +<< sisu_filetypes.sst % :B~? SiSU Configuration and Skins -<< |sisu_config.ssi|@|^| +<< sisu_config.ssi -<< |sisu_skin.sst|@|^| +<< sisu_skin.sst -<< |sisu_css.ssi|@|^| +<< sisu_css.ssi -<< |sisu_content_directories.ssi|@|^| +<< sisu_content_directories.ssi -<< |sisu_homepages.ssi|@|^| +<< sisu_homepages.ssi % :B~? SiSU Output and Markup Examples -<< |sisu_examples.sst|@|^| +<< sisu_examples.sst -<< |sisu_output_overview.sst|@|^| +<< sisu_output_overview.sst -<< |sisu_search_intro.ssi|@|^| +<< sisu_search_intro.ssi -<< |sisu_sql.ssi|@|^| +<< sisu_sql.ssi -<< |sisu_postgresql.sst|@|^| +<< sisu_postgresql.sst -<< |sisu_sqlite.sst|@|^| +<< sisu_sqlite.sst -<< |sisu_search_cgi.ssi|@|^| +<< sisu_search_cgi.ssi -<< |sisu_hyperestraier.ssi|@|^| +<< sisu_hyperestraier.ssi -<< |sisu_webrick.sst|@|^| +<< sisu_webrick.sst -<< |sisu_remote.sst|@|^| +<< sisu_remote.sst % :B~? SiSU Download and Installation -<< |sisu_download.ssi|@|^| +<< sisu_download.ssi -<< |sisu_installation.ssi|@|^| +<< sisu_installation.ssi -<< |sisu_quickstart.sst|@|^| +<< sisu_quickstart.sst % :B~? SiSU Howto and FAQ -<< |sisu_howto.sst|@|^| +<< sisu_howto.sst -<< |sisu_faq.sst|@|^| +<< sisu_faq.sst -<< |sisu_interesting_to_whom.ssi|@|^| +<< sisu_interesting_to_whom.ssi -<< |sisu_work_needed_and_wishlist.ssi|@|^| +<< sisu_work_needed_and_wishlist.ssi -<< |sisu_syntax_highlighting.sst|@|^| +<< sisu_syntax_highlighting.sst -<< |sisu_help_sources.sst|@|^| +<< sisu_help_sources.sst diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst index 741c26a8..27212b9c 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst @@ -1067,9 +1067,9 @@ basic markup for importing a document into a master document code{ -<< |filename1.sst|@|^| +<< filename1.sst -<< |filename2.ssi|@|^| +<< filename2.ssi }code @@ -1077,24 +1077,14 @@ The form described above should be relied on. Within the Vim editor it results i code{ -r{filename} +<< filename.ssi -{filename.ssi}require - -<< {filename.ssi} +<<{filename.ssi} % using textlink alternatives -|filename.ssi|@|^|require - << |filename.ssi|@|^| -% using thlnk alternatives - -require - -<< - }code :C~ Markup Syntax History diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm index d1abbca3..45b9148d 100644 --- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm +++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm @@ -43,14 +43,14 @@ :B~? SiSU Search -<< |sisu_search_intro.ssi|@|^| +<< sisu_search_intro.ssi -<< |sisu_sql.ssi|@|^| +<< sisu_sql.ssi -<< |sisu_postgresql.sst|@|^| +<< sisu_postgresql.sst -<< |sisu_sqlite.sst|@|^| +<< sisu_sqlite.sst -<< |sisu_search_cgi.ssi|@|^| +<< sisu_search_cgi.ssi -<< |sisu_hyperestraier.ssi|@|^| +<< sisu_hyperestraier.ssi diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index 3ce6637b..f29bc268 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -32,6 +32,8 @@ if !exists("sisu_no_identifiers") syn match sisu_markpara contains=@NoSpell "<:i[1-9]>" syn match sisu_link " \*\~\S\+" syn match sisu_action "^<:insert\d\+>" + syn match sisu_require contains=@NoSpell "^<<\s*[a-zA-Z0-9^._-]\+\.ss[it]$" + syn match sisu_require contains=@NoSpell "^<<{[a-zA-Z0-9^._-]\+\.ss[it]}$" syn match sisu_contain "<:e>" syn match sisu_sem_marker ";{\|};[a-z._]*[a-z]" syn match sisu_sem_marker_block "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]" @@ -154,6 +156,7 @@ hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include hi def link sisu_mark_endnote Include +hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String hi def link sisu_fontface Include diff --git a/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml new file mode 100644 index 00000000..21e85636 --- /dev/null +++ b/data/sisu/conf/editor-syntax-etc/vim/vim-sisu.yaml @@ -0,0 +1,7 @@ + #debian vim-addon-manager + addon: sisu + description: "SiSU documents - structuring, publishing in multiple formats and search + basedir: /usr/share/vim-scripts/ + files: + - ftplugin/sisu.vim + - syntax/sisu.vim diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index 21b6781b..9b3689c3 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -190,13 +190,10 @@ module SiSU_Assemble tell=SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fns) tell.grey_title_hi unless @opt.cmd =~/q/ para=data.each do |para| - if para =~/^r\{(.+?)\}/ \ - or para =~/^(?:<<\s*)\{(.+?)\}(?:req(?:quire)?\b|\s*\})?/ \ + if para =~/^<<\s+(\S+?\.ss[it])$/ \ + or para =~/^<<\{(\S+?\.ss[it])\}$/ \ or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \ - or para =~/^(?:<<\s*)<(?:URL|url):(\S+?)>(?:req(?:require)\b|\s*\})?/ \ - or para =~/^\{(.+?)\}(?:req(?:require)?)\b/ \ - or para =~/^\|(\S+?)\|@\|.+?\|(?:req(?:require)?)\b/ \ - or para =~/^<(?:URL|url):(\S+?)>(?:req(?:require))\b/ + or para =~/^r\{(.+?)\}/ #depreciated loadfile=$1.strip tell=SiSU_Screen::Ansi.new(@opt.cmd,'loading:',loadfile) tell.txt_grey if @opt.cmd =~/[MVv]/ diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index c5a07f9c..3e5e11ac 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -370,8 +370,8 @@ module SiSU_DAL def expand_insertions?(data) tuned_file,tuned_file_tmp=[],[] data.each do |para| - if para !~/^%+\s/ and - para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/ + if para !~/^%+\s/ \ + and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/ txt,cmd,source,url_dir,note,manifest=nil,nil,nil,nil,nil,nil @u=SiSU_Env::Info_env.new.url if defined? @u.remote -- cgit v1.2.3 From 5a62d708ebc2f632ed80c5e877099d7934aeed16 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 22 May 2008 20:06:35 -0400 Subject: update man pages and version --- conf/sisu/version.yml | 6 ++-- data/doc/sisu/html/sisu.1.html | 38 ++++++++++------------ .../sisu/sisu_markup_samples/sisu_manual/sisu.ssm | 6 ++-- .../sisu_manual/sisu_configuration.ssm | 6 ++-- .../sisu_manual/sisu_introduction.ssm | 6 ++-- .../sisu_manual/sisu_manual.ssm | 6 ++-- .../sisu_manual/sisu_markup.sst | 6 ++-- .../sisu_manual/sisu_search.ssm | 6 ++-- man/man1/sisu.1 | 38 ++++++++++------------ 9 files changed, 55 insertions(+), 63 deletions(-) diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml index ded9517e..7d823233 100644 --- a/conf/sisu/version.yml +++ b/conf/sisu/version.yml @@ -1,5 +1,5 @@ --- -:version: 0.66.3 -:date_stamp: 2008w18/0 -:date: "2008-05-11" +:version: 0.67.0 +:date_stamp: 2008w20/4 +:date: "2008-05-22" :project: SiSU diff --git a/data/doc/sisu/html/sisu.1.html b/data/doc/sisu/html/sisu.1.html index e47a7e69..e7682a89 100644 --- a/data/doc/sisu/html/sisu.1.html +++ b/data/doc/sisu/html/sisu.1.html @@ -1594,8 +1594,8 @@ within a master document .sst regular markup file, or .ssi (insert

document into a master document


-

  << |filename1.sst|@|^|
-  << |filename2.ssi|@|^|
+
  << filename1.sst
+  << filename2.ssi
 

 
  The form described above should be relied on. Within the Vim editor it
 results in the text thus linked becoming hyperlinked to the document it
@@ -1604,15 +1604,10 @@ of documents under consideration, and occasionally supported have been.
 
 
 
 
 

-
  r{filename}
-  {filename.ssi}require
-  << {filename.ssi}
+
  << filename.ssi
+  <<{filename.ssi}
   % using textlink alternatives
-  |filename.ssi|@|^|require
   << |filename.ssi|@|^|
-  % using thlnk alternatives
-  <url:filename.ssi>require
-  << <url:filename.ssi>
 

 
 MARKUP SYNTAX HISTORY  
 
 11. NOTES RELATED TO FILES-TYPES AND MARKUP SYNTAX
@@ -3278,25 +3273,26 @@ Type: information
 
  DC Date issued: 2002-08-28
 
 
  DC Date available: 2002-08-28 
-
  DC Date modified: 2008-02-24 
-
  DC Date: 2008-02-24
+
  DC Date modified: 2008-05-22 
+
  DC Date: 2008-05-22
 
 
  Version Information 
 
  Sourcefile: sisu.ssm.sst 
 
  Filetype: SiSU text insert
 
-
0.58 
-
  Sourcefile Digest, MD5(sisu.ssm.sst)= db21f6e88c100f35f19cab84d69e2987
+
0.67 
+
  Sourcefile Digest, MD5(sisu.ssm.sst)= 7568e6bc171256672e0820a333b37459
 
 
  Skin_Digest: MD5(skin_sisu_manual.rb)= 072b2584bedea82ea8a416587b9fa244
 
 
  Generated 
-
  Document (metaverse) last generated: Sun Feb 24 20:02:36
+
  Document (metaverse) last generated: Thu May 22 20:03:01
 
-
+0000 2008 
-
  Generated by: SiSU 0.66.0 of 2008w07/0 (2008-02-24) 
+
-
+
0400 2008 
+
  Generated by: SiSU 0.66.3 of 2008w18/0 (2008-05-11) 
 
  Ruby version:
-ruby 1.8.6 (2007-09-24 patchlevel 111)  [i486-linux] 
+ruby 1.8.6 (2008-03-03 patchlevel 114)  [i486-linux] 
 
 
 
    
 .
  1. objects include: headings,
@@ -3412,15 +3408,15 @@ distributable are not freely changeable. 
    2. .
  2. named index.html or mo
 
 
    
 
-
    * Generated by: SiSU 0.66.0 of 2008w07/0 (2008-02-24) 
    
+
    * Generated by: SiSU 0.66.3 of 2008w18/0 (2008-05-11) 
    
 
    
 
 
    * Ruby version: ruby
-1.8.6 (2007-09-24 patchlevel 111) [i486-linux] 
    
+1.8.6 (2008-03-03 patchlevel 114) [i486-linux] 
 
    
 
-
    * Last Generated on: Sun Feb
-24 20:02:36 +0000 2008 
    
+
    * Last Generated on: Thu May
+22 20:03:01 -0400 2008 
    
 
    
 
 
    * SiSU http://www.jus.uio.no/sisu
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
index 4ddc7e17..2fe9ed3a 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu.ssm
@@ -1,4 +1,4 @@
-% SiSU master 0.58
+% SiSU master 0.67
 
 @title: SiSU
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2008-02-24
+@date.modified: 2008-05-22
 
-@date: 2008-02-24
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
index 90b149f8..c1661002 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_configuration.ssm
@@ -1,4 +1,4 @@
-% SiSU master 0.58
+% SiSU master 0.67
 
 @title: SiSU
 
@@ -20,9 +20,9 @@
 
 @date.available: 2007-08-28
 
-@date.modified: 2007-08-30
+@date.modified: 2008-05-22
 
-@date: 2007-08-30
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
index 853ec19a..f199fc78 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_introduction.ssm
@@ -1,4 +1,4 @@
-% SiSU 0.58
+% SiSU 0.67
 
 @title: SiSU
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2007-09-16
+@date.modified: 2008-05-22
 
-@date: 2007-09-16
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
index e384555c..19324618 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
@@ -1,4 +1,4 @@
-% SiSU master 0.58
+% SiSU master 0.67
 
 @title: SiSU
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2008-03-30
+@date.modified: 2008-05-22
 
-@date: 2008-03-30
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
index 27212b9c..3b83eee7 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_markup.sst
@@ -1,4 +1,4 @@
-% SiSU 0.58
+% SiSU 0.67
 
 @title: SiSU
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2008-02-12
+@date.modified: 2008-05-22
 
-@date: 2008-02-12
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
index 45b9148d..93549b7f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_search.ssm
@@ -1,4 +1,4 @@
-% SiSU master 0.58
+% SiSU master 0.67
 
 @title: SiSU
 
@@ -18,9 +18,9 @@
 
 @date.available: 2002-08-28
 
-@date.modified: 2007-09-16
+@date.modified: 2008-05-22
 
-@date: 2007-09-16
+@date: 2008-05-22
 
 @level: new=C; break=1; num_top=1
 
diff --git a/man/man1/sisu.1 b/man/man1/sisu.1
index fd37ee7b..19ad1649 100644
--- a/man/man1/sisu.1
+++ b/man/man1/sisu.1
@@ -1,4 +1,4 @@
-.TH "sisu" "1" "2008-02-24" "0.66.0" "SiSU"
+.TH "sisu" "1" "2008-05-22" "0.66.3" "SiSU"
 .SH NAME
 sisu \- documents: markup, structuring, publishing in multiple standard formats, and search
 .SH SYNOPSIS
@@ -2060,8 +2060,8 @@ basic markup for importing a document into a master document
 
 
 .nf
-  << |filename1.sst|@|^|
-  << |filename2.ssi|@|^|
+  << filename1.sst
+  << filename2.ssi
 .fi
 
 .BR
@@ -2072,15 +2072,10 @@ documents under consideration, and occasionally supported have been.
 
 
 .nf
-  r{filename}
-  {filename.ssi}require
-  << {filename.ssi}
+  << filename.ssi
+  <<{filename.ssi}
   % using textlink alternatives
-  |filename.ssi|@|^|require
   << |filename.ssi|@|^|
-  % using thlnk alternatives
-  require
-  << 
 .fi
 
 .SH
@@ -4572,11 +4567,11 @@ DC Date available:
 
 .BR
 DC Date modified:
-.I 2008\-02\-24
+.I 2008\-05\-22
 
 .BR
 DC Date:
-.I 2008\-02\-24
+.I 2008\-05\-22
 
 .BR
 .B Version Information
@@ -4587,11 +4582,11 @@ Sourcefile:
 
 .BR
 Filetype:
-.I SiSU text insert 0.58
+.I SiSU text insert 0.67
 
 .BR
 Sourcefile Digest, MD5(sisu.ssm.sst)=
-.I db21f6e88c100f35f19cab84d69e2987
+.I 7568e6bc171256672e0820a333b37459
 
 .BR
 Skin_Digest: MD5(skin_sisu_manual.rb)=
@@ -4602,17 +4597,17 @@ Skin_Digest: MD5(skin_sisu_manual.rb)=
 
 .BR
 Document (metaverse) last generated:
-.I Sun Feb 24 20:02:36 +0000 2008
+.I Thu May 22 20:03:01 \-0400 2008
 
 .BR
 Generated by:
 .I SiSU
-.I 0.66.0
-of 2008w07/0 (2008\-02\-24)
+.I 0.66.3
+of 2008w18/0 (2008\-05\-11)
 
 .BR
 Ruby version:
-.I ruby 1.8.6 (2007\-09\-24 patchlevel 111) \ [i486\-linux]
+.I ruby 1.8.6 (2008\-03\-03 patchlevel 114) \ [i486\-linux]
 
 .TP
 .BI 1.
@@ -4762,10 +4757,11 @@ pdf: 
 .TP
 at: 
 .TP
-* Generated by: SiSU 0.66.0 of 2008w07/0 (2008-02-24)
 .TP
-* Ruby version: ruby 1.8.6 (2007-09-24 patchlevel 111) [i486-linux]
+* Generated by: SiSU 0.66.3 of 2008w18/0 (2008-05-11)
 .TP
-* Last Generated on: Sun Feb 24 20:02:36 +0000 2008
+* Ruby version: ruby 1.8.6 (2008-03-03 patchlevel 114) [i486-linux]
+.TP
+* Last Generated on: Thu May 22 20:03:01 -0400 2008
 .TP
 * SiSU http://www.jus.uio.no/sisu
-- 
cgit v1.2.3