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

11 files changed, 102 insertions, 92 deletions

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
-
-<url:filename.ssi>require
-
-<< <url:filename.ssi>
-
 }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