From 0a87b8fbd5b013b8da07f6bc30360ff735217367 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 9 Mar 2022 21:05:51 -0500
Subject: org-mode and ruby file headers modified

- org-mode file headers modified to preserve
  org-mode ruby syntax highlighting
---
 org/abstraction.org  |  89 ++++++++++++++++++++++++-----------------
 org/cgi.org          |  24 ++++++------
 org/config.org       |   9 ++---
 org/css.org          |   9 ++---
 org/db.org           |  69 ++++++++++++++++++--------------
 org/digests.org      |   9 ++---
 org/env.org          | 109 ++++++++++++++++++++++++++++++---------------------
 org/harvest.org      |  24 ++++++------
 org/html.org         |  74 +++++++++++++++++++---------------
 org/hub.org          |  24 ++++++------
 org/i18n.org         |  15 +++----
 org/json.org         |  29 ++++++++------
 org/manpage.org      |  14 +++----
 org/misc.org         |  79 +++++++++++++++++++++----------------
 org/object_munge.org |   9 ++---
 org/param.org        |  19 ++++-----
 org/shared.org       |  34 +++++++++-------
 org/sisu-bin.org     |  27 ++++++++++---
 org/sisu.org         |   9 ++---
 org/sisu_build.org   |  58 +++++++++++++++++----------
 org/src.org          |  54 ++++++++++++++-----------
 org/sst.org          |  29 ++++++++------
 org/texinfo.org      |  14 +++----
 org/texpdf.org       |  19 ++++-----
 org/txt.org          |  79 +++++++++++++++++++++----------------
 org/utils.org        |  29 ++++++++------
 org/xhtml.org        |  54 ++++++++++++++-----------
 org/xml.org          |  74 +++++++++++++++++++---------------
 28 files changed, 624 insertions(+), 461 deletions(-)

(limited to 'org')

diff --git a/org/abstraction.org b/org/abstraction.org
index ed96a984..c31f36b6 100644
--- a/org/abstraction.org
+++ b/org/abstraction.org
@@ -19,8 +19,9 @@
 * ao.rb
 ** ao.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -558,8 +559,9 @@ __END__
 
 ** ao_appendices.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_appendices.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_appendices.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Appendices
   class Glossary
     def initialize(md,data)
@@ -1132,8 +1134,9 @@ __END__
 
 ** ao_character_check.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_character_check.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_character_check.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_CharacterCheck
   class Check
     def initialize(data)
@@ -1183,8 +1186,9 @@ end
 
 ** ao_composite.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_composite.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_composite.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Assemble
   require_relative 'se'                                 # se.rb
   require_relative 'utils_composite'                    # utils_composite.rb
@@ -1418,8 +1422,9 @@ __END__
 
 ** ao_doc_objects.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_doc_objects.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_doc_objects.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_DocumentStructure
   class Extract
     def extract(h,o)
@@ -1933,8 +1938,9 @@ __END__
 
 ** ao_doc_str.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_doc_str.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_doc_str.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_DocumentStructureExtract
   require_relative 'ao_persist'                     # ao_persist.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
@@ -4369,8 +4375,9 @@ __END__
 
 ** ao_endnotes.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_endnotes.rb_"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_endnotes.rb_"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Endnotes
   class Endnotes
     def initialize(md,data,endnote_array=nil)
@@ -4455,8 +4462,9 @@ __END__
 
 ** ao_expand_insertions.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_expand_insertions.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_expand_insertions.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Insertions
   class Insertions
     def initialize(md,data)
@@ -4919,8 +4927,9 @@ __END__
 
 ** ao_hash_digest.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_hash_digest.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_hash_digest.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Hash
   require_relative 'shared_markup_alt.rb'               #shared_markup_alt.rb
   class ObjectDigest
@@ -5043,8 +5052,9 @@ __END__
 
 ** ao_idx.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_idx.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_idx.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_BookIndex
   class BookIndex
     def initialize(md,data,env=nil)
@@ -5415,8 +5425,9 @@ __END__
 
 ** ao_images.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_images.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_images.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Images
   class Images
     begin
@@ -5552,8 +5563,9 @@ imgsys=`identify #{image_path}/#{image}`.strip
 
 ** ao_metadata.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_metadata.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_metadata.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Metadata
   class Metadata
     def initialize(md,metad)
@@ -5588,8 +5600,9 @@ __END__
 
 ** ao_misc_arrange.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_misc_arrange.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_misc_arrange.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_MiscArrangeText
   class SI
     def initialize(md,data)
@@ -5745,8 +5758,9 @@ __END__
 
 ** ao_numbering.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_numbering.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_numbering.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Numbering
   class Numbering
     attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
@@ -6415,8 +6429,9 @@ __END__
 
 ** ao_persist.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_persist.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_persist.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Persist
   class Persist
     @@persistance=nil
@@ -6559,8 +6574,9 @@ __END__
 
 ** ao_syntax.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_syntax.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_syntax.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Syntax
   class Words
     def initialize(line,md,mkp)
@@ -7149,8 +7165,9 @@ __END__
 
 ** ao_endnotes.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/ao_endnotes.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/ao_endnotes.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_AO_Endnotes
   class Endnotes
     def initialize(md,data,endnote_array=nil)
@@ -7237,8 +7254,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -7290,5 +7306,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/cgi.org b/org/cgi.org
index 25ecd88a..a1504a02 100644
--- a/org/cgi.org
+++ b/org/cgi.org
@@ -19,8 +19,9 @@
 * cgi
 ** cgi.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/cgi.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/cgi.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_CGI                                        #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_pgsql'                          # cgi_pgsql.rb
@@ -53,8 +54,9 @@ __END__
 
 ** cgi_sqlite.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/cgi_sqlite.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/cgi_sqlite.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_CGI_SQLite                                 #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
@@ -247,8 +249,9 @@ __END__
 
 ** cgi_pgsql.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/cgi_pgsql.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/cgi_pgsql.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_CGI_PgSQL                                  #% database building documents
   require_relative 'se'                                 # se.rb
   require_relative 'cgi_sql_common'                     # cgi_sql_common.rb
@@ -467,8 +470,9 @@ __END__
 
 ** cgi_sql_common.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/cgi_sql_common.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/cgi_sql_common.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_CGI_SQL
   class CGI_Common
     def initialize(webserv,opt,image_src,dir)
@@ -1405,8 +1409,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -1458,5 +1461,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/config.org b/org/config.org
index 88b45bd9..c14d7510 100644
--- a/org/config.org
+++ b/org/config.org
@@ -18,8 +18,9 @@
 
 * conf.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/conf.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/conf.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Initialize
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -257,8 +258,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -309,5 +309,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/css.org b/org/css.org
index 7551999b..370858c0 100644
--- a/org/css.org
+++ b/org/css.org
@@ -18,8 +18,9 @@
 
 * css.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/css.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/css.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Style
   require_relative 'se'                                 # se.rb
   require_relative 'html_parts'                         # html_parts.rb
@@ -3454,8 +3455,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -3507,5 +3507,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/db.org b/org/db.org
index 696afb48..469416b3 100644
--- a/org/db.org
+++ b/org/db.org
@@ -18,8 +18,9 @@
 
 * dbi.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/dbi.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/dbi.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_DBI                                                                 #% database building
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
@@ -134,8 +135,9 @@ __END__
 
 * dbi_discrete.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/dbi_discrete.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/dbi_discrete.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_DBI_Discrete                               #% database building
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
@@ -290,8 +292,9 @@ __END__
 
 * db_dbi.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_dbi.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_dbi.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module  SiSU_DbDBI
   require_relative 'db_columns'                                             # db_columns.rb
   require_relative 'db_tests'                                               # db_tests.rb
@@ -330,8 +333,9 @@ __END__
 
 * db_sqltxt.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_sqltxt.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_sqltxt.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbText
   class Prepare
     def special_character_escape(str)
@@ -454,8 +458,9 @@ __END__
 * create drop import remove
 ** db_create.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_create.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_create.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbCreate
   require_relative 'db_columns'                         # db_columns.rb
   class Create < SiSU_DbColumns::Columns
@@ -1093,8 +1098,9 @@ __END__
 
 ** db_drop.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_drop.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_drop.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbDrop
   require_relative 'utils_response'                   # utils_response.rb
   class Drop
@@ -1250,8 +1256,9 @@ __END__
 
 ** db_import.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_import.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_import.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbImport
   require_relative 'db_columns'                         # db_columns.rb
   require_relative 'db_load_tuple'                      # db_load_tuple.rb
@@ -2077,8 +2084,9 @@ __END__
 
 ** db_remove.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_remove.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_remove.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbRemove
   class Remove
     include SiSU_DbAction
@@ -2209,8 +2217,9 @@ __END__
 
 * db_load_tuple.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_load_tuple.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_load_tuple.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbTuple
   require_relative 'db_columns'                         # db_columns.rb
   class LoadDocuments
@@ -2463,8 +2472,9 @@ __END__
 
 * db_select.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_select.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_select.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbAction
   def db_action(sdb)
     @sdb=sdb
@@ -2644,8 +2654,9 @@ __END__
 * structure
 ** db_columns.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_columns.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_columns.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbColumns
   require_relative 'se'                                # se.rb
   require_relative 'db_sqltxt'                         # db_sqltxt.rb
@@ -4592,8 +4603,9 @@ __END__
 
 ** db_indexes.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_indexes.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_indexes.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbIndex
   class Index                                           # create documents Indexes def initialize(opt,conn='',sql_type)
     def initialize(opt,conn,file,sql_type)
@@ -4688,8 +4700,9 @@ __END__
 
 * db_tests.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/db_tests.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/db_tests.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DbTests
   class Test
     def initialize(info,opt)
@@ -4754,8 +4767,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -4807,5 +4819,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/digests.org b/org/digests.org
index dcc16efb..20831af8 100644
--- a/org/digests.org
+++ b/org/digests.org
@@ -18,8 +18,9 @@
 
 * digests.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/digests.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/digests.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_DigestView
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   require_relative 'prog_text_translation'              # prog_text_translation.rb
@@ -276,8 +277,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -329,5 +329,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/env.org b/org/env.org
index 2809c484..02c5ed29 100644
--- a/org/env.org
+++ b/org/env.org
@@ -19,8 +19,9 @@
 * sisu environment
 ** se.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Env
   #@@cX=nil
   require_relative 'constants'                         # constants.rb
@@ -127,8 +128,9 @@ __END__
 
 ** se_cleanoutput.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_cleanoutput.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_cleanoutput.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Clean_Output
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -222,8 +224,9 @@ __END__
 
 ** se_clear.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_clear.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_clear.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Clear
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -277,8 +280,9 @@ __END__
 
 ** se_createsite.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_createsite.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_createsite.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Create_Site
   require_relative 'constants'                             # constants.rb
   require_relative 'html_parts'                            # html_parts.rb
@@ -500,8 +504,9 @@ __END__
 
 ** se_css.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_css.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_css.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_CSS
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -671,8 +676,9 @@ __END__
 
 ** se_date.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_date.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_date.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Date
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -713,8 +719,9 @@ __END__
 
 ** se_db.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_db.rb"
-# <<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_db.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Db
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -877,8 +884,9 @@ __END__
 
 ** se_envcall.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_envcall.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_envcall.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Env_Call
   begin
     require 'singleton'
@@ -1153,8 +1161,9 @@ __END__
 
 ** se_filemap.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_filemap.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_filemap.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_File_Map
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -1350,8 +1359,9 @@ __END__
 
 ** se_file_op.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_file_op.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_file_op.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_File
   require_relative 'utils'                                 # utils.rb
   require_relative 'se_info_env'                           # se_info_env.rb
@@ -4117,8 +4127,9 @@ __END__
 
 ** se_get_init.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_get_init.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_get_init.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Get_Init
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -4305,8 +4316,9 @@ __END__
 
 ** se_hub_particulars.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_hub_particulars.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_hub_particulars.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Particulars
   begin
     require 'singleton'
@@ -4489,8 +4501,9 @@ consider running as separate objects
 
 ** se_info_env.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_info_env.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_info_env.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Env
   @@current_document=Dir.pwd #nil #''
   require_relative 'se_envcall'                            # se_envcall.rb
@@ -6618,8 +6631,9 @@ __END__
 
 ** se_info_port.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_info_port.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_info_port.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Port
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -6638,8 +6652,9 @@ __END__
 
 ** se_info_system.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_info_system.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_info_system.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Sys_Gen
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -6790,8 +6805,9 @@ __END__
 
 ** se_load.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_load.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_load.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Load
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -6848,8 +6864,9 @@ __END__
 
 ** se_processing.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_processing.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_processing.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Processing_Settings
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -7457,8 +7474,9 @@ __END__
 
 ** se_programs.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_programs.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_programs.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Sys_Call
   begin
     require 'singleton'
@@ -7801,8 +7819,9 @@ __END__
 
 ** se_remotes.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_remotes.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_remotes.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Remote_Host
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -8304,8 +8323,9 @@ __END__
 
 ** se_standardise_lang.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_standardise_lang.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_standardise_lang.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Standardise_Lang
   @@lang_info=nil
   class StandardiseLanguage
@@ -8430,8 +8450,9 @@ __END__
 
 ** se_version.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/se_version.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/se_version.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Info_Version
   require_relative 'constants'                             # constants.rb
   require_relative 'utils'                                 # utils.rb
@@ -8559,8 +8580,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -8612,5 +8632,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/harvest.org b/org/harvest.org
index 09d0fb6c..4d37bd31 100644
--- a/org/harvest.org
+++ b/org/harvest.org
@@ -19,8 +19,9 @@
 * harvest
 ** html_harvest.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_harvest.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_harvest.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Harvest
   @@the_idx_topics,@@the_idx_authors={},{}
   class Source
@@ -78,8 +79,9 @@ end
 ** topics
 *** html_harvest_topics.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_harvest_topics.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_harvest_topics.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HarvestTopics
   require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   require_relative 'html_parts'                          # html_parts.rb
@@ -921,8 +923,9 @@ terms -|_  t{tl1} -|_ {fa}[fa]{filenames and other details}
 ** authors
 *** html_harvest_authors.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_harvest_authors.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_harvest_authors.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HarvestAuthors
   require_relative 'html_harvest_author_format'          # html_harvest_author_format.rb
   require_relative 'html_parts'                          # html_parts.rb
@@ -1337,8 +1340,9 @@ __END__
 
 *** html_harvest_author_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_harvest_author_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_harvest_author_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_FormatAuthor
   class Author
     def initialize(author_param)
@@ -1400,8 +1404,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -1453,5 +1456,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/html.org b/org/html.org
index 22e6d6f6..15f3a87a 100644
--- a/org/html.org
+++ b/org/html.org
@@ -20,8 +20,9 @@
 ** part
 *** html.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML
   begin
     require 'pstore'
@@ -745,8 +746,9 @@ __END__
 
 *** html_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_HTML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -1132,8 +1134,9 @@ __END__
 
 *** html_tune.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_tune.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_tune.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 require_relative 'dp'                                   # dp.rb
 module SiSU_HTML_Tune
   require_relative 'se'                                 # se.rb
@@ -1383,8 +1386,9 @@ __END__
 
 *** html_scroll.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_scroll.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_scroll.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Scroll
   require_relative 'html_shared'                        # html_shared.rb
   require_relative 'html'                               # html.rb
@@ -1568,8 +1572,9 @@ __END__
 
 *** html_segments.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_segments.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_segments.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Seg
   require_relative 'html_shared'                        # html_shared.rb
   require_relative 'html'                               # html.rb
@@ -2234,8 +2239,9 @@ __END__
 
 *** html_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Format
   require_relative 'html_parts'                         # html_parts.rb
   class ParagraphNumber
@@ -3533,8 +3539,9 @@ __END__
 ** shared
 *** html_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Shared
   require_relative 'html_table'                         # html_table.rb
   class TableHTML < SiSU_HTML_Table::TableHTML
@@ -3545,8 +3552,9 @@ __END__
 
 *** html_lite_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_lite_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_lite_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_FormatShared
   require_relative 'html_parts'                         # html_parts.rb
   class CSS_Format
@@ -3818,8 +3826,9 @@ __END__
 
 *** html_table.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_table.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_table.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Table
   require_relative 'xhtml_table'                         # xhtml_table.rb
   require_relative 'html_parts'                          # html_parts.rb
@@ -3835,8 +3844,9 @@ __END__
 ** misc
 *** html_minitoc.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_minitoc.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_minitoc.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_MiniToc
   require_relative 'html_tune'                        # html_tune.rb
     include SiSU_HTML_Tune
@@ -4015,8 +4025,9 @@ __END__
 
 *** html_concordance.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_concordance.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_concordance.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Concordance
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -4356,8 +4367,9 @@ __END__
 
 *** html_manifest.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_manifest.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_manifest.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Manifest
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -5338,8 +5350,9 @@ __END__
 
 *** html_persist.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_persist.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_persist.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Persist
   class Persist
     @@persist=nil
@@ -5525,8 +5538,9 @@ __END__
 
 *** html_promo.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/html_promo.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/html_promo.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_HTML_Promo
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -5917,8 +5931,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -5970,5 +5983,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/hub.org b/org/hub.org
index 2852840f..705bbf21 100644
--- a/org/hub.org
+++ b/org/hub.org
@@ -19,8 +19,9 @@
 * hub
 ** hub.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/hub.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/hub.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU
   require_relative 'constants'                         # constants.rb
   require_relative 'se'                                # se.rb
@@ -247,8 +248,9 @@ __END__
 
 ** hub_options.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/hub_options.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/hub_options.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Commandline
   begin
     require 'pathname'
@@ -1899,8 +1901,9 @@ passing @opt as well is duplication check for fns & fnb
 
 ** hub_actions.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/hub_actions.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/hub_actions.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Hub_Actions
   class HubActions
     require_relative 'utils_composite'                    # utils_composite.rb
@@ -2987,8 +2990,9 @@ __END__
 
 ** hub_loop_markup_files.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/hub_loop_markup_files.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/hub_loop_markup_files.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Hub_Loops
   require_relative 'constants'                         # constants.rb
   require_relative 'se'                                # se.rb
@@ -3109,8 +3113,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -3162,5 +3165,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/i18n.org b/org/i18n.org
index 3c9d76e6..a4c43266 100644
--- a/org/i18n.org
+++ b/org/i18n.org
@@ -19,8 +19,9 @@
 * i18n
 ** i18n.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/i18n.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/i18n.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_i18n
   @@language_table,@@language_list=nil,nil
   class Languages
@@ -302,8 +303,9 @@ __END__
 
 * prog_text_translation.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/prog_text_translation.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/prog_text_translation.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Translate
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Param
@@ -1949,8 +1951,7 @@ end
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -2002,8 +2003,8 @@ end
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
+
 * NOTES
 ** language list po4a
 
diff --git a/org/json.org b/org/json.org
index 91b54271..3ea186d4 100644
--- a/org/json.org
+++ b/org/json.org
@@ -18,8 +18,9 @@
 
 * json.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/json.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/json.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_JSON
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -385,8 +386,9 @@ __END__
 
 * json_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/json_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/json_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_JSON
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -425,8 +427,9 @@ __END__
 
 * json_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/json_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/json_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_JSONutils
   require_relative 'generic_parts'                      # generic_parts.rb
   class Clean
@@ -1058,8 +1061,9 @@ __END__
 
 * json_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/json_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/json_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_JSON_Format
   require_relative 'dp'                                 # dp.rb
   require_relative 'json_parts'                         # json_parts.rb
@@ -1488,8 +1492,9 @@ __END__
 
 * json_persist.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/json_persist.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/json_persist.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_JSON_Persist
   class Persist
     @@persist=nil
@@ -1566,8 +1571,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -1619,5 +1623,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/manpage.org b/org/manpage.org
index 4266eb77..2b9f1142 100644
--- a/org/manpage.org
+++ b/org/manpage.org
@@ -18,8 +18,9 @@
 
 * manpage.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/manpage.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/manpage.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Manpage
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -345,8 +346,9 @@ __END__
 
 * manpage_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/manpage_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/manpage_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_ManpageFormat
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
@@ -382,8 +384,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -435,5 +436,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/misc.org b/org/misc.org
index 7f10e1c3..abb23cc1 100644
--- a/org/misc.org
+++ b/org/misc.org
@@ -19,8 +19,9 @@
 * misc sort
 ** air.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/air.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/air.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Air
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
@@ -49,8 +50,9 @@ __END__
 
 ** embedded.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/embedded.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/embedded.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Embedded
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
@@ -148,8 +150,9 @@ __END__
 
 ** errors.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/errors.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/errors.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Errors
   require_relative 'se'                                 # se.rb
     include SiSU_Env; include SiSU_Screen
@@ -182,8 +185,9 @@ __END__
 
 ** git.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/git.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/git.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Git
   require_relative 'dp'                                 # dp.rb
   require_relative 'se'                                 # se.rb
@@ -409,8 +413,9 @@ __END__
 
 ** qrcode.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/qrcode.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/qrcode.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_QRcode
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -1113,8 +1118,9 @@ __END__
 
 ** relaxng.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/relaxng.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/relaxng.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Relaxng
   require_relative 'se'                                 # se.rb
   class RelaxNG
@@ -2216,8 +2222,9 @@ needs updating
 
 ** remote.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/remote.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/remote.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Remote
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -2412,8 +2419,9 @@ __END__
 
 ** rexml.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/rexml.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/rexml.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Rexml
   # load XML file for REXML parsing
   begin
@@ -2510,8 +2518,9 @@ end
 
 ** sitemaps.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sitemaps.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sitemaps.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Sitemaps
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
@@ -2684,8 +2693,9 @@ __END__
 
 ** termsheet.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/termsheet.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/termsheet.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 require_relative 'se'                                   # se.rb
 require_relative 'dp'                                   # dp.rb
   include SiSU_Param
@@ -2797,8 +2807,9 @@ the term sheet calls the standard form or template that is to be run against it.
 
 ** update.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/update.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/update.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_UpdateControlFlag
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -2888,8 +2899,9 @@ __END__
 
 ** urls.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/urls.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/urls.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Urls
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -3547,8 +3559,9 @@ __END__
 
 ** webrick.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/webrick.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/webrick.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Webserv
   class WebrickStart
     begin
@@ -3687,8 +3700,9 @@ __END__
 
 ** wikispeak.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/wikispeak.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/wikispeak.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Wikispeak
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -4011,8 +4025,9 @@ __END__
 
 ** zap.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/zap.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/zap.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Zap
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -4053,8 +4068,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -4106,5 +4120,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/object_munge.org b/org/object_munge.org
index de4ee999..b950545c 100644
--- a/org/object_munge.org
+++ b/org/object_munge.org
@@ -18,8 +18,9 @@
 
 * object_munge.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/object_munge.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/object_munge.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Object_Munge
   def i_src_o_strip_markup(txtobj)
     txtobj=txtobj.
@@ -277,8 +278,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -330,5 +330,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/param.org b/org/param.org
index 147fc8e6..27a9520e 100644
--- a/org/param.org
+++ b/org/param.org
@@ -18,8 +18,9 @@
 
 * dp.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/dp.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/dp.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Param
   begin
     require 'uri'
@@ -1581,8 +1582,9 @@ __END__
 
 * dp_make.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/dp_make.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/dp_make.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Param_Make
   class MdMake
     def initialize(str,opt,env)
@@ -2198,8 +2200,9 @@ __END__
 
 * dp_identify_markup.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/dp_identify_markup.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/dp_identify_markup.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_MarkupType
   class MarkupIdentify
     @@version={}
@@ -2309,8 +2312,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -2362,5 +2364,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/shared.org b/org/shared.org
index ff88f99c..b6e98f08 100644
--- a/org/shared.org
+++ b/org/shared.org
@@ -19,8 +19,9 @@
 * shared
 ** shared_sem.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/shared_sem.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/shared_sem.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Sem
   require_relative 'dp'                                 # dp.rb
   class Tags
@@ -125,8 +126,9 @@ __END__
 
 ** shared_images.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/shared_images.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/shared_images.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Images
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
   class Source
@@ -212,8 +214,9 @@ __END__
 
 ** shared_markup_alt.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/shared_markup_alt.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/shared_markup_alt.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TextRepresentation
   class Alter
     def initialize(x)
@@ -498,8 +501,9 @@ __END__
 
 ** shared_metadata.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/shared_metadata.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/shared_metadata.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Metadata
   require_relative 'xml_parts'                          # xml_parts.rb
   require_relative 'xml_shared'                         # xml_shared.rb
@@ -1821,8 +1825,9 @@ __END__
 * constants
 ** constants.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/constants.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/constants.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 YEAR='2021'
 Sfx={
   txt:                       '.txt',
@@ -2160,8 +2165,9 @@ Iu ⌠  8992   Il ⌡ <7 ⌈  8968   >7 ⌉  8969   7< ⌊  8970   7> ⌋  8971
 * generic
 ** generic_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/generic_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/generic_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_Generic
   def the_url
     def urify(uri)
@@ -2243,8 +2249,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -2296,5 +2301,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/sisu-bin.org b/org/sisu-bin.org
index c48cd626..a92e7b5e 100644
--- a/org/sisu-bin.org
+++ b/org/sisu-bin.org
@@ -16,6 +16,25 @@
 #+PROPERTY:    header-args+ :padline no
 #+PROPERTY:    header-args+ :mkdirp yes
 
+[[./sisu_info.org][sisu_info.org]]  [[./][org/]]
+[[./sisu_build.org][make/build]] VERSION
+
+* version.txt (set version) :version:
+** set program tangle
+
+#+BEGIN_SRC txt  :NO-tangle "../data/sisu/version.yml"
+<<sisu_project_version_current_set>>
+#+END_SRC
+
+#+NAME: sisu_version_current_set
+#+BEGIN_SRC yaml
+---
+:project: SiSU
+:version: 7.2.1_pre_rel
+:date_stamp: 2019w35/4
+:date: "2019-09-05"
+#+END_SRC
+
 * bin
 ** bin/sisu
 
@@ -23,7 +42,7 @@
 #+HEADER: :shebang "#!/usr/bin/env ruby"
 #+HEADER: :tangle-mode (identity #o755)
 #+BEGIN_SRC ruby
-<<sisu_document_header>>
+#<<sisu_document_header>>
 class Orient
   require 'singleton'
   include Singleton
@@ -470,7 +489,7 @@ sisu -W ${@}
 #+HEADER: :shebang "#!/usr/bin/env ruby"
 #+HEADER: :tangle-mode (identity #o755)
 #+BEGIN_SRC ruby
-<<sisu_document_header>>
+#<<sisu_document_header>>
 begin
   require 'thor'
 rescue LoadError
@@ -691,8 +710,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -744,5 +762,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/sisu.org b/org/sisu.org
index 01678612..18fb96b1 100644
--- a/org/sisu.org
+++ b/org/sisu.org
@@ -28,8 +28,9 @@
 
 * sisu.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_libs
   require_relative 'sisu/hub'                               # sisu/hub.rb
   require_relative 'sisu/se'                                # sisu/se.rb
@@ -74,8 +75,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -127,5 +127,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/sisu_build.org b/org/sisu_build.org
index da7ce0b1..c9d05937 100644
--- a/org/sisu_build.org
+++ b/org/sisu_build.org
@@ -55,7 +55,8 @@ git log --pretty=format:"%h %ad - %s%d [%an]" --graph --date=short --no-merges >
 
 * sisu version TODO
 
-#+BEGIN_SRC ruby :tangle ../setup/sisu_version.rb
+#+HEADER: :tangle ../setup/sisu_version.rb
+#+BEGIN_SRC ruby
 #% constants
 module SiSUversion
   SiSU_version                       = '7.2.1'
@@ -67,7 +68,8 @@ end
 
 * +makefile+                                                         :makefile:
 
-#+BEGIN_SRC makefile :NO-tangle ../makefile
+#+HEADER: :NO-tangle ../makefile
+#+BEGIN_SRC makefile
 #+END_SRC
 
 * qi (quick install)
@@ -340,7 +342,8 @@ __END__
 
 ** qi_lib
 
-#+BEGIN_SRC ruby :tangle ../setup/qi_libs.rb
+#+HEADER: :tangle ../setup/qi_libs.rb
+#+BEGIN_SRC ruby
 require_relative 'sisu_version'
 module Project_details
   include SiSUversion
@@ -1026,8 +1029,9 @@ __END__
 
 * sisu thor lib
 
-#+BEGIN_SRC ruby :tangle ../lib/sisu/sisu_thor_lib.rb
-<<sisu_document_header>>
+#+HEADER: :tangle ../lib/sisu/sisu_thor_lib.rb
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Po4a_Actions
   require_relative 'utils_response'                   # utils_response.rb
   include SiSU_Response
@@ -1440,7 +1444,10 @@ __END__
 * Rake & Rant
 ** Rake & Rant
 
-#+BEGIN_SRC ruby :tangle ../setup/rbuild :tangle-mode (identity #o755) :shebang #!/usr/bin/env ruby
+#+HEADER: :tangle ../setup/rbuild
+#+HEADER: :shebang #!/usr/bin/env ruby
+#+HEADER: :tangle-mode (identity #o755)
+#+BEGIN_SRC ruby
 =begin
  Common Rakefile, Rantfile installer for SiSU
    softlink Rakefile and Rantfile to this file
@@ -2014,7 +2021,8 @@ end
 
 ** Rake & Rant libs
 
-#+BEGIN_SRC ruby :tangle ../setup/rbuild_libs.rb
+#+HEADER: :tangle ../setup/rbuild_libs.rb
+#+BEGIN_SRC ruby
 module Project_details
   require_relative 'sisu_version'
   include SiSUversion
@@ -2477,7 +2485,8 @@ end
 
 ** Rake & Rant help
 
-#+BEGIN_SRC ruby :tangle ../setup/rbuild_help.rb
+#+HEADER: :tangle ../setup/rbuild_help.rb
+#+BEGIN_SRC ruby
 module Help
   def self.project_help
     puts <<WOK
@@ -2519,14 +2528,16 @@ end
 
 ** envrc
 
-#+BEGIN_SRC sh :tangle ../.envrc
+#+HEADER: :tangle ../.envrc
+#+BEGIN_SRC sh
 NIX_ENFORCE_PURITY=0
 if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local
   source .envrc-local
 fi
 #+END_SRC
 
-#+BEGIN_SRC sh :tangle ../.envrc-local_
+#+HEADER: :tangle ../.envrc-local_
+#+BEGIN_SRC sh
 export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
 #export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
 ## reload when these files change
@@ -2546,7 +2557,10 @@ export RUBYLIB+=`pwd`/lib
 
 *** shell.nix TODO
 
-#+BEGIN_SRC nix :tangle ../shell.nix :tangle-mode (identity #o755) :shebang #!/usr/bin/env -S nix-shell --pure
+#+HEADER: :tangle ../shell.nix
+#+HEADER: :shebang #!/usr/bin/env -S nix-shell --pure
+#+HEADER: :tangle-mode (identity #o755)
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
   buildInputs = [(
@@ -2564,7 +2578,8 @@ pkgs.mkShell {
 }
 #+END_SRC
 
-#+BEGIN_SRC nix :NO-tangle ../shell.nix
+#+HEADER: :NO-tangle ../shell.nix
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
   buildInputs = [
@@ -2576,7 +2591,8 @@ pkgs.mkShell {
 *** packages.nix
 **** default
 
-#+BEGIN_SRC nix :NO-tangle ../packages.nix
+#+HEADER: :NO-tangle ../packages.nix
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 with pkgs; [
   <<ruby_current>>
@@ -2587,7 +2603,8 @@ with pkgs; [
 
 **** ruby 3.1
 
-#+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_3_1.nix
+#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_1.nix
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 with pkgs; [
   <<ruby_version_3_1>>
@@ -2598,7 +2615,8 @@ with pkgs; [
 
 **** ruby 3.0
 
-#+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_3_0.nix
+#+HEADER: :tangle ../nix/pkglst/packages_ruby_3_0.nix
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 with pkgs; [
   <<ruby_version_3_0>>
@@ -2609,7 +2627,8 @@ with pkgs; [
 
 **** ruby 2.6
 
-#+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_2_6.nix
+#+HEADER: :tangle ../nix/pkglst/packages_ruby_2_6.nix
+#+BEGIN_SRC nix
 { pkgs ? import <nixpkgs> {} }:
 with pkgs; [
   <<ruby_version_2_6>>
@@ -2702,7 +2721,8 @@ git
 * descriptions
 ** README
 
-#+BEGIN_SRC md :tangle ../README
+#+HEADER: :tangle ../README
+#+BEGIN_SRC md
 SISU - README
 =============
 
@@ -5974,8 +5994,7 @@ Configure substitution in _sisu/sisu_document_make
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -6027,5 +6046,4 @@ Configure substitution in _sisu/sisu_document_make
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/src.org b/org/src.org
index b88f8285..c8d06d79 100644
--- a/org/src.org
+++ b/org/src.org
@@ -18,8 +18,9 @@
 
 * src_sisupod_make.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_sisupod_make.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_sisupod_make.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Doc
   require_relative 'src_shared'                         # scr_shared.rb
     include SiSU_Source
@@ -139,8 +140,9 @@ SiSU.ssm
 
 * src_sisupod_sstm.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_sisupod_sstm.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_sisupod_sstm.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Markup
   require_relative 'src_shared'                         # src_shared.rb
     include SiSU_Source
@@ -198,8 +200,9 @@ __END__
 
 * src_kdissert_share.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_kdissert_share.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_kdissert_share.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_KdiSource
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -250,8 +253,9 @@ __END__
 
 * src_po4a_share.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_share.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_share.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Languages_Selected
   require_relative 'utils_response'                   # utils_response.rb
   def language
@@ -508,8 +512,9 @@ translate.google.com
 
 * src_po4a_shelf.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_shelf.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_shelf.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Po4a
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -1675,8 +1680,9 @@ translate.google.com
 
 * src_po4a_shelf_set.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_shelf_set.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_shelf_set.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Po4aUtils
   class Wrap
     def initialize(md,orig='',trans='',is_desc='',n_char_max=76,n_indent=0,n_hang=nil)
@@ -1922,8 +1928,9 @@ __END__
 
 * src_po4a_sst_ao_sst.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_sst_ao_sst.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_sst_ao_sst.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_SStm_AO_SStm
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -2765,8 +2772,9 @@ translate.google.com
 
 * src_po4a_sst_ao_sst_set.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_sst_ao_sst_set.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_sst_ao_sst_set.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Po4aUtils
   class Wrap
     def initialize(md,orig='',trans='',n_char_max=76,n_indent=0,n_hang=nil)
@@ -2999,8 +3007,9 @@ __END__
 
 * src_po4a_sstm.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_po4a_sstm.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_po4a_sstm.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Markup
   require_relative 'src_shared'                         # src_shared.rb
     include SiSU_Source
@@ -3084,8 +3093,9 @@ __END__
 
 * src_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/src_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/src_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Source
   include SiSU_Env
   class SiSUpodSource
@@ -3383,8 +3393,7 @@ SiSU.ssm
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -3436,5 +3445,4 @@ SiSU.ssm
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/sst.org b/org/sst.org
index 4ac5cbf6..93945585 100644
--- a/org/sst.org
+++ b/org/sst.org
@@ -18,8 +18,9 @@
 
 * sst_from_xml.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sst_from_xml.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sst_from_xml.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_sstFromXML
   require_relative 'se'                                 # se.rb
   class Convert
@@ -146,8 +147,9 @@ __END__
 
 * sst_to_s_xml_sax.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sst_to_s_xml_sax.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sst_to_s_xml_sax.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_SimpleXML_ModelSax
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -567,8 +569,9 @@ __END__
 
 * sst_identify_markup.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sst_identify_markup.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sst_identify_markup.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Markup
   class MarkupInform
     attr_accessor :version
@@ -997,8 +1000,9 @@ end
 
 * sst_do_inline_footnotes.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sst_do_inline_footnotes.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sst_do_inline_footnotes.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_ConvertFootnotes
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -1386,8 +1390,9 @@ ao_array=@particulars.ao_array # ao file drawn here
 
 * sst_convert_markup.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/sst_convert_markup.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/sst_convert_markup.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Modify
   require_relative 'sst_identify_markup'                # sst_identify_markup.rb
   require_relative 'sst_from_xml'                       # sst_from_xml.rb
@@ -1659,8 +1664,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -1712,5 +1716,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/texinfo.org b/org/texinfo.org
index 93a63f68..37756c51 100644
--- a/org/texinfo.org
+++ b/org/texinfo.org
@@ -19,8 +19,9 @@
 
 * texinfo.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/texinfo.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/texinfo.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TexInfo
   require_relative 'html'                               # html.rb
   require_relative 'dp'                                 # dp.rb
@@ -399,8 +400,9 @@ __END__
 
 * texinfo_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/texinfo_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/texinfo_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TexInfoFormat
   @@table_pg_break_counter=1
   require_relative 'dp'                                 # dp.rb
@@ -892,8 +894,7 @@ watch title, might need full_title
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -945,5 +946,4 @@ watch title, might need full_title
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/texpdf.org b/org/texpdf.org
index 4b412e7d..dd1d2486 100644
--- a/org/texpdf.org
+++ b/org/texpdf.org
@@ -19,8 +19,9 @@
 * texpdf
 ** texpdf.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/texpdf.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/texpdf.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TeX
   begin
     require 'pstore'
@@ -1131,8 +1132,9 @@ __END__
 
 ** texpdf_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/texpdf_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/texpdf_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_TeXpdf
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -1316,8 +1318,9 @@ __END__
 
 ** texpdf_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/texpdf_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/texpdf_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TeX_Pdf
   require_relative 'texpdf_parts'                        # texpdf_parts.rb
   @@table_pg_break_counter=1
@@ -2915,8 +2918,7 @@ texlive-xetex
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -2968,5 +2970,4 @@ texlive-xetex
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/txt.org b/org/txt.org
index f6c6cc62..f4ce5391 100644
--- a/org/txt.org
+++ b/org/txt.org
@@ -20,8 +20,9 @@
 ** asciidoc
 *** txt_asciidoc.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_asciidoc.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_asciidoc.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_AsciiDoc
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -324,8 +325,9 @@ __END__
 
 *** txt_asciidoc_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_asciidoc_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_asciidoc_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_AsciiDoc
   def decorate
     def heading
@@ -481,8 +483,9 @@ __END__
 ** markdown
 *** txt_markdown.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_markdown.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_markdown.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_Markdown
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -820,8 +823,9 @@ __END__
 
 *** txt_markdown_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_markdown_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_markdown_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_Markdown
   def decorate
     def heading
@@ -977,8 +981,9 @@ __END__
 ** orgmode
 *** txt_orgmode.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_orgmode.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_orgmode.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_OrgMode
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -1319,8 +1324,9 @@ __END__
 
 *** txt_orgmode_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_orgmode_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_orgmode_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_OrgMode
   def decorate
     def heading
@@ -1455,8 +1461,9 @@ __END__
 ** plain
 *** txt_plain.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_plain.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_plain.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_Plain
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -1815,8 +1822,9 @@ __END__
 
 *** txt_plain_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_plain_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_plain_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_Plain
   def decorate
     def heading_underscore
@@ -1954,8 +1962,9 @@ __END__
 ** rst
 *** txt_rst.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_rst.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_rst.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_rST
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -2275,8 +2284,9 @@ __END__
 
 *** txt_rst_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_rst_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_rst_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_rST
   def decorate
     def heading
@@ -2411,8 +2421,9 @@ __END__
 ** textile
 *** txt_textile.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_textile.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_textile.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_Textile
   require_relative 'ao'                                 # ao.rb
   require_relative 'se'                                 # se.rb
@@ -2728,8 +2739,9 @@ __END__
 
 *** txt_textile_decorate.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_textile_decorate.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_textile_decorate.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Decorate_Txt_Textile
   def decorate
     def heading
@@ -2863,8 +2875,9 @@ __END__
 
 * txt_output.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_output.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_output.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module Txt_Output
   class Output
     include SiSU_Param
@@ -2899,8 +2912,9 @@ __END__
 
 * txt_read.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_read.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_read.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Txt_Read
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -2958,8 +2972,9 @@ __END__
 
 * txt_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/txt_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/txt_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_TextUtils
   require_relative 'generic_parts'                      # generic_parts.rb
   class Wrap
@@ -3151,8 +3166,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -3204,5 +3218,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/utils.org b/org/utils.org
index 7f7d531a..ffbdfeeb 100644
--- a/org/utils.org
+++ b/org/utils.org
@@ -19,8 +19,9 @@
 * utils
 ** utils.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/utils.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/utils.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Utils
   class CodeMarker
     def initialize(line,file,color=:red)
@@ -201,8 +202,9 @@ puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$
 
 ** utils_spell.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/utils_spell.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/utils_spell.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_SpellUtility
   class Spell
     def initialize(input,filesrc,flg)
@@ -250,8 +252,9 @@ __END__
 
 ** utils_response.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/utils_response.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/utils_response.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Response
   def available_selections_
     %{'yes', 'no', 'quit' or 'exit'; [ynqx]}
@@ -314,8 +317,9 @@ __END__
 
 ** utils_composite.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/utils_composite.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/utils_composite.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Composite_Doc_Utils
   def inserts_array(loadfilename)
     IO.readlines(loadfilename,'')
@@ -379,8 +383,9 @@ __END__
 
 ** utils_screen_text_color.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/utils_screen_text_color.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/utils_screen_text_color.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Screen
   class Color
     attr_accessor :off,:marker,:bold,:underline,:invert,:darkgrey_hi,:grey_hi,:pink_hi,:fuchsia_hi,:red_hi,:orange_hi,:yellow_hi,:brown_hi,:lightgreen_hi,:green_hi,:cyan_hi,:blue_hi,:navy_hi,:white,:white_bold,:grey,:pink,:fuchsia,:ruby,:red,:orange,:yellow,:brown,:green,:darkgreen,:cyan,:blue,:navy,:black
@@ -803,8 +808,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -856,5 +860,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/xhtml.org b/org/xhtml.org
index 8b338ba4..c24a5411 100644
--- a/org/xhtml.org
+++ b/org/xhtml.org
@@ -18,8 +18,9 @@
 
 * xhtml.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -440,8 +441,9 @@ tidy -xml scroll.xhtml >> index.tidy
 * epub2.rb
 ** xhtml_epub2.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_EPUB2
   begin
     require 'pstore'
@@ -1280,8 +1282,9 @@ __END__
 
 ** xhtml_epub2_concordance.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2_concordance.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2_concordance.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_EPUB2_Concordance
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -1552,8 +1555,9 @@ __END__
 
 ** xhtml_epub2_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_EPUB2_Format
   class ParagraphNumber
     def initialize(md,ocn)
@@ -3774,8 +3778,9 @@ __END__
 
 ** xhtml_epub2_persist.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2_persist.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2_persist.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_EPUB2_Persist
   class Persist
     @@persist=nil
@@ -4002,8 +4007,9 @@ __END__
 
 ** xhtml_epub2_segments.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2_segments.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2_segments.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_EPUB2_Seg
   require_relative 'xhtml_shared'                       # xhtml_shared.rb
   require_relative 'xhtml_epub2'                        # xhtml_epub2.rb
@@ -4551,8 +4557,9 @@ __END__
 
 ** xhtml_epub2_tune.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_epub2_tune.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_epub2_tune.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 require_relative 'dp'                                   # dp.rb
 module SiSU_XHTML_EPUB2_Tune
   require_relative 'se'                                 # se.rb
@@ -4832,8 +4839,9 @@ __END__
 * xhtml shared
 ** xhtml_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_XHTML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -4965,8 +4973,9 @@ __END__
 
 ** xhtml_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_Shared
   require_relative 'xhtml_table'                        # xhtml_table.rb
   class TableXHTML < SiSU_XHTML_Table::TableXHTML
@@ -4977,8 +4986,9 @@ __END__
 
 ** xhtml_table.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xhtml_table.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xhtml_table.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XHTML_Table
   require_relative 'xhtml_parts'                         # xhtml_parts.rb
   class TableXHTML
@@ -5026,8 +5036,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -5079,5 +5088,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
diff --git a/org/xml.org b/org/xml.org
index 7253fbbd..3b6e4085 100644
--- a/org/xml.org
+++ b/org/xml.org
@@ -19,8 +19,9 @@
 * xml native
 ** xml_sax.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_sax.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_sax.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_SAX
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -490,8 +491,9 @@ __END__
 
 ** xml_dom.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_dom.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_dom.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_DOM
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -1067,8 +1069,9 @@ __END__
 * xml shared
 ** xml_shared.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_shared.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_shared.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Munge
   require_relative 'xml_parts'                          # xml_parts.rb
   class Trans
@@ -1678,8 +1681,9 @@ __END__
 
 ** xml_tables.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_tables.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_tables.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Tables
   class Table #_xml
     @@tablehead=0
@@ -1889,8 +1893,9 @@ __END__
 
 ** xml_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Format
   require_relative 'dp'                                 # dp.rb
   require_relative 'xml_parts'                          # xml_parts.rb
@@ -2704,8 +2709,9 @@ __END__
 
 ** xml_md_oai_pmh_dc.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_md_oai_pmh_dc.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_md_oai_pmh_dc.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Metadata
   require_relative 'se'                                 # se.rb
     include SiSU_Env
@@ -2883,8 +2889,9 @@ see also http://dublincore.org/documents/dcmes-xml/
 
 ** xml_parts.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_parts.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_parts.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_Parts_XML
   require_relative 'generic_parts'                       # generic_parts.rb
   include SiSU_Parts_Generic
@@ -3024,8 +3031,9 @@ __END__
 
 ** xml_persist.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_persist.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_persist.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Persist
   class Persist
     @@persist=nil
@@ -3100,8 +3108,9 @@ __END__
 
 ** xml_scaffold_structure_collapsed.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_scaffold_structure_collapsed.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_scaffold_structure_collapsed.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Scaffold_Structure_Collapse
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -3248,8 +3257,9 @@ __END__
 
 ** xml_scaffold_structure_sisu.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_scaffold_structure_sisu.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_scaffold_structure_sisu.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Scaffold_Structure_Sisu
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -3400,8 +3410,9 @@ __END__
 * odf
 ** xml_odf_odt.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_odf_odt.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_odf_odt.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_ODF_ODT
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -4238,8 +4249,9 @@ __END__
 
 ** xml_odf_odt_format.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_odf_odt_format.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_odf_odt_format.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_ODF_ODT_Format
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
@@ -4862,8 +4874,9 @@ __END__
 
 * docbook5rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_docbook5.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_docbook5.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Docbook_Book
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -5188,8 +5201,9 @@ __END__
 
 * fictionbook2.rb
 
-#+BEGIN_SRC ruby  :tangle "../lib/sisu/xml_fictionbook2.rb"
-<<sisu_document_header>>
+#+HEADER: :tangle "../lib/sisu/xml_fictionbook2.rb"
+#+BEGIN_SRC ruby
+#<<sisu_document_header>>
 module SiSU_XML_Fictionbook
   require_relative 'se_hub_particulars'                 # se_hub_particulars.rb
     include SiSU_Particulars
@@ -5529,8 +5543,7 @@ __END__
 
 #+NAME: sisu_document_header
 #+BEGIN_SRC text
-#encoding: utf-8
-=begin
+encoding: utf-8
 - Name: SiSU
 
   - Description: documents, structuring, processing, publishing, search
@@ -5582,5 +5595,4 @@ __END__
     <https://git.sisudoc.org/projects/>
     <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary>
     <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary>
-=end
 #+END_SRC
-- 
cgit v1.2.3