v5: asciidoc, rename AsciiDoc module, & recalibrate headings

5 files changed, 20 insertions, 18 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 83b6c505..b8e6a3cb 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -41,6 +41,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.4.orig.tar.xz
   * sysenv, qrcode report absent program, minor
   * html scroll toc, clean links where none, exclude metadata
 
+* asciidoc, rename AsciiDoc module, & recalibrate headings
+
 * year updated, code headers
 
 %% 5.1.3.orig.tar.xz (2013-12-15:49/7)
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index bb453a02..d0393a3b 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -309,7 +309,7 @@ module SiSU
         end
         if @opt.act[:txt_asciidoc][:set]==:on          #% --asciidoc
           require_relative 'txt_asciidoc'              #  txt_asciidoc.rb
-          SiSU_Txt_asciiDoc::Source.new(@opt).read
+          SiSU_Txt_AsciiDoc::Source.new(@opt).read
         end
         if @opt.act[:txt_markdown][:set]==:on          #% --markdown
           require_relative 'txt_markdown'              #  txt_markdown.rb
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index d70ad4ba..f6e76ec0 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -470,7 +470,7 @@ module SiSU_Manifest
           summarize(id,file,pth,rel,url)
         end
         if FileTest.file?(@f.place_file.asciidoc.dir)==true
-          id='asciiDoc text (UTF-8)'
+          id='AsciiDoc text (UTF-8)'
           pth=@f.output_path.asciidoc.dir
           rel=@f.output_path.asciidoc.rel_sm
           url=@f.output_path.asciidoc.url
diff --git a/lib/sisu/v5/txt_asciidoc.rb b/lib/sisu/v5/txt_asciidoc.rb
index 6497e6dd..8c2f3c97 100644
--- a/lib/sisu/v5/txt_asciidoc.rb
+++ b/lib/sisu/v5/txt_asciidoc.rb
@@ -60,7 +60,7 @@
  ** Description: plaintext (smarttext) generation, asciidoc
 
 =end
-module SiSU_Txt_asciiDoc
+module SiSU_Txt_AsciiDoc
   require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
@@ -90,8 +90,8 @@ module SiSU_Txt_asciiDoc
           (@opt.act[:verbose][:set]==:on \
           || @opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on) \
-          ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'asciiDoc (plaintext utf-8)',tool).green_hi_blue
-          : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'asciiDoc (plaintext utf-8)',tool).green_title_hi
+          ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'AsciiDoc (plaintext utf-8)',tool).green_hi_blue
+          : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'AsciiDoc (plaintext utf-8)',tool).green_title_hi
           if (@opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on)
             SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{md.file.output_path.asciidoc.dir}/#{md.file.base_filename.asciidoc}").flow
@@ -107,7 +107,7 @@ module SiSU_Txt_asciiDoc
         else 78
         end
         #wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
-        SiSU_Txt_asciiDoc::Source::Scroll.new(md,ao_array,wrap_width).songsheet
+        SiSU_Txt_AsciiDoc::Source::Scroll.new(md,ao_array,wrap_width).songsheet
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -222,40 +222,40 @@ WOK
         def heading
           def inline
             def l1
-              '=='
+              '='
             end
             def l2
-              '==='
+              '=='
             end
             def l3
-              '===='
+              '==='
             end
             def l4
-              '====='
+              '===='
             end
             def l5
-              '' #'======' #logical
+              '====='
             end
             def l6
-              '' #'=======' #logical
+              '' #'======' #logical
             end
             self
           end
           def underscore
             def l1
-              '-'
+              '='
             end
             def l2
-              '~'
+              '-'
             end
             def l3
-              '^'
+              '~'
             end
             def l4
-              '+'
+              '^'
             end
             def l5
-              '' #'.' #proposed
+              '+'
             end
             def l6
               '' #'.' #proposed
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/v5/urls.rb
index add3f762..d814965f 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -116,7 +116,7 @@ module SiSU_Urls
         'S --sisupod (sisupod)'=>@fn[:sisupod],
         't --txt (Plain-text (endnotes))'=>@fn[:plain],
         '  --textile (textile txt)'=>@fn[:txt_textile],
-        '  --asciidoc (asciidoc txt)'=>@fn[:txt_asciidoc],
+        '  --asciidoc (AsciiDoc txt)'=>@fn[:txt_asciidoc],
         '  --markdown (markdown txt)'=>@fn[:txt_markdown],
         '  --rst (rST restructured-text)'=>@fn[:txt_rst],
         '  --docbook-book (DocBook Book)'=>@fn[:xml_docbook_book],