c&d: misc, largely but not entirely cosmetic
authorRalph Amissah <ralph@amissah.com>
Thu, 19 Mar 2015 21:51:40 +0000 (17:51 -0400)
committerRalph Amissah <ralph@amissah.com>
Tue, 24 Mar 2015 01:43:22 +0000 (21:43 -0400)
bin/sisu-misc-utils
lib/sisu/current/ao.rb
lib/sisu/current/ao_syntax.rb
lib/sisu/current/db_columns.rb
lib/sisu/current/po4a.rb
lib/sisu/develop/ao.rb
lib/sisu/develop/ao_expand_insertions.rb
lib/sisu/develop/ao_syntax.rb
lib/sisu/develop/db_columns.rb
lib/sisu/develop/txt_output.rb
lib/sisu/develop/txt_read.rb

index 621d1442bf19dc0859377277e2f8293add6c6769..47d8f32b525585590a40696d113d075b3531601a 100644 (file)
@@ -220,7 +220,7 @@ __END__
 
 **  Copyright: (C) 2007 - 2015 Ralph Amissah
 
-**  License: 
+**  License: GPL3+
 
 **  Ralph Amissah <ralph@amissah.com>
   Ralph Amissah <ralph.amissah@gmail.com>
index e24fd4e95ca3a7365b4d55f526cb19babe623395..3467c4c656d0afefc243d448b422f4ea5d183461 100644 (file)
@@ -60,7 +60,7 @@ module SiSU_AO
     include SiSU_Env
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'ao_doc_objects'                     # ao.rb
+  require_relative 'ao_doc_objects'                     # ao_doc_objects.rb
   require_relative 'ao_syntax'                          # ao_syntax.rb
     include SiSU_AO_Syntax
   require_relative 'ao_doc_str'                         # ao_doc_str.rb
@@ -558,7 +558,8 @@ module SiSU_AO
       data_obj,
         book_index_rel,
         book_index_rel_html_seg,
-        html_idx,xhtml_idx=
+        html_idx,
+        xhtml_idx=
           SiSU_AO_BookIndex::BookIndex.new(@md,data_obj,@env).       # ao_idx.rb
             indexing_song if @md.book_idx
       data_obj=
index cfcc90451927027bdfe91919f80a800002c62a8e..957a2c3508f24e8fa0578f77cf690bc5bd2b88b6 100644 (file)
@@ -357,7 +357,7 @@ module SiSU_AO_Syntax
       # {url address}:url
       # {image.png}imageurl
       # {image.png}png
-      # ~{endnote}~         <!e endnote !>
+      # ~{endnote}~
       # !_                                    #bold/emphasise paragraph
       # _"                                    #blockquote paragraph
       # _1                  <:i1>            #indent paragraph 1 step
@@ -389,7 +389,7 @@ module SiSU_AO_Syntax
           dob.obj=dob.obj.strip
         end
         dob.obj=dob.obj.
-          gsub(/^([*#-.]{1,12})$/,'\1 ~#').                                                        #ocn off for these paragraph separators
+          gsub(/^([*#.-]{1,12})$/,'\1 ~#').                                                        #ocn off for these paragraph separators
           gsub(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c]).
           gsub(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]).                            #default if markup does not specify
           gsub(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
@@ -552,7 +552,7 @@ module SiSU_AO_Syntax
       # {url address}:url
       # {image.png}imageurl
       # {image.png}png
-      # ~{endnote}~         <!e endnote !>
+      # ~{endnote}~
       # +1                  <!i1!>
       # +2                  <!i2!>
       puts 'tech'
index adeced8f616512666d9f19dfef2ccbc18bb2c2e2..35491e94392ebdca85e01888ae4d864c93f31fc8 100644 (file)
@@ -369,7 +369,6 @@ module SiSU_DbColumns
           if defined? @md.creator.editor_detail \
           and @md.creator.editor_detail.is_a?(Array) \
           and @md.creator.editor_detail.length > 0
-            txt=@md.creator.editor_detail #dc
             txt=''
             @md.creator.editor_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -397,7 +396,6 @@ module SiSU_DbColumns
           if defined? @md.creator.contributor_detail \
           and @md.creator.contributor_detail.is_a?(Array) \
           and @md.creator.contributor_detail.length > 0
-            txt=@md.creator.contributor_detail #dc
             txt=''
             @md.creator.contributor_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -425,7 +423,6 @@ module SiSU_DbColumns
           if defined? @md.creator.illustrator_detail \
           and @md.creator.illustrator_detail.is_a?(Array) \
           and @md.creator.illustrator_detail.length > 0
-            txt=@md.creator.illustrator_detail
             txt=''
             @md.creator.illustrator_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -453,7 +450,6 @@ module SiSU_DbColumns
           if defined? @md.creator.photographer_detail \
           and @md.creator.photographer_detail.is_a?(Array) \
           and @md.creator.photographer_detail.length > 0
-            txt=@md.creator.photographer_detail
             txt=''
             @md.creator.photographer_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -508,7 +504,6 @@ module SiSU_DbColumns
           if defined? @md.creator.prepared_by_detail \
           and @md.creator.prepared_by_detail.is_a?(Array) \
           and @md.creator.prepared_by_detail.length > 0
-            txt=@md.creator.prepared_by_detail
             txt=''
             @md.creator.prepared_by_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -536,7 +531,6 @@ module SiSU_DbColumns
           if defined? @md.creator.digitized_by_detail \
           and @md.creator.digitized_by_detail.is_a?(Array) \
           and @md.creator.digitized_by_detail.length > 0
-            txt=@md.creator.digitized_by_detail
             txt=''
             @md.creator.digitized_by_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -564,7 +558,6 @@ module SiSU_DbColumns
           if defined? @md.creator.audio_detail \
           and @md.creator.audio_detail.is_a?(Array) \
           and @md.creator.audio_detail.length > 0
-            txt=@md.creator.audio_detail
             txt=''
             @md.creator.audio_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
index f7d89c2d618da7d42f411400579174472cb223b5..3de3ff7d78858adf700917287498f16b1be385a4 100644 (file)
@@ -64,7 +64,7 @@ module SiSU_Po4a
   include SiSU_Param
   class Source
     @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn=
-      nil,nil,nil,nil,nil,nil
+          nil,      nil,       nil,       nil,     nil,     nil
     def initialize(opt,fn=nil)
       @opt,@fn=opt,fn
       #unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/
index 1ca493383f14703b75eda147829ab50970b6a171..ed3aa98bfc87091e196acc257cbf3f42f1c5ce7e 100644 (file)
@@ -60,7 +60,7 @@ module SiSU_AO
     include SiSU_Env
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
-  require_relative 'ao_doc_objects'                     # ao.rb
+  require_relative 'ao_doc_objects'                     # ao_doc_objects.rb
   require_relative 'ao_syntax'                          # ao_syntax.rb
     include SiSU_AO_Syntax
   require_relative 'ao_doc_str'                         # ao_doc_str.rb
@@ -558,7 +558,8 @@ module SiSU_AO
       data_obj,
         book_index_rel,
         book_index_rel_html_seg,
-        html_idx,xhtml_idx=
+        html_idx,
+        xhtml_idx=
           SiSU_AO_BookIndex::BookIndex.new(@md,data_obj,@env).       # ao_idx.rb
             indexing_song if @md.book_idx
       data_obj=
index 0d4163140cb88a409b1dc807843e222c5e4af7a5..897cb7e2746462358bf6808843357a21303a36c8 100644 (file)
@@ -484,21 +484,19 @@ module SiSU_AO_Insertions
           linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
           tuned_file_tmp << linked_title
           output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
-          output_filetypes[:gen].each do |o_f|
-            describe = o_f
-            if describe
-              tuned_file_tmp << if @u.remote #to double space <:br> at beginning of entry
-                "#{Mx[:nbsp]*4} #{describe} "
+          output_filetypes[:gen].each do |desc|
+            if desc
+              tuned_file_tmp << if @u.remote
+                "#{Mx[:nbsp]*4} #{desc} "
               else # remove ...
                 "[provide document placement host location]"
               end
             end
           end
-          output_filetypes[:src].each do |o_f|
-            describe = o_f
-            if describe
+          output_filetypes[:src].each do |desc|
+            if desc
               tuned_file_tmp << if @u.remote
-                "#{Mx[:nbsp]*4} #{describe} "
+                "#{Mx[:nbsp]*4} #{desc} "
               else
                 "[provide document placement host location]"
               end
index 16f54b61f180ea81f7f092aaf29da44a7b3587f1..1ffb7e678853669d18eb723426a5ed500f612771 100644 (file)
@@ -357,7 +357,7 @@ module SiSU_AO_Syntax
       # {url address}:url
       # {image.png}imageurl
       # {image.png}png
-      # ~{endnote}~         <!e endnote !>
+      # ~{endnote}~
       # !_                                    #bold/emphasise paragraph
       # _"                                    #blockquote paragraph
       # _1                  <:i1>            #indent paragraph 1 step
@@ -389,7 +389,7 @@ module SiSU_AO_Syntax
           dob.obj=dob.obj.strip
         end
         dob.obj=dob.obj.
-          gsub(/^([*#-.]{1,12})$/,'\1 ~#').                                                        #ocn off for these paragraph separators
+          gsub(/^([*#.-]{1,12})$/,'\1 ~#').                                                        #ocn off for these paragraph separators
           gsub(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c]).
           gsub(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]).                            #default if markup does not specify
           gsub(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c])
@@ -552,7 +552,7 @@ module SiSU_AO_Syntax
       # {url address}:url
       # {image.png}imageurl
       # {image.png}png
-      # ~{endnote}~         <!e endnote !>
+      # ~{endnote}~
       # +1                  <!i1!>
       # +2                  <!i2!>
       puts 'tech'
index e79c02639f235b48676d9bfd45eda958d20f4cc6..478a112711d568ffa65d8c0b8e745ecc2cdece5c 100644 (file)
@@ -369,7 +369,6 @@ module SiSU_DbColumns
           if defined? @md.creator.editor_detail \
           and @md.creator.editor_detail.is_a?(Array) \
           and @md.creator.editor_detail.length > 0
-            txt=@md.creator.editor_detail #dc
             txt=''
             @md.creator.editor_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -397,7 +396,6 @@ module SiSU_DbColumns
           if defined? @md.creator.contributor_detail \
           and @md.creator.contributor_detail.is_a?(Array) \
           and @md.creator.contributor_detail.length > 0
-            txt=@md.creator.contributor_detail #dc
             txt=''
             @md.creator.contributor_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -425,7 +423,6 @@ module SiSU_DbColumns
           if defined? @md.creator.illustrator_detail \
           and @md.creator.illustrator_detail.is_a?(Array) \
           and @md.creator.illustrator_detail.length > 0
-            txt=@md.creator.illustrator_detail
             txt=''
             @md.creator.illustrator_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -453,7 +450,6 @@ module SiSU_DbColumns
           if defined? @md.creator.photographer_detail \
           and @md.creator.photographer_detail.is_a?(Array) \
           and @md.creator.photographer_detail.length > 0
-            txt=@md.creator.photographer_detail
             txt=''
             @md.creator.photographer_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -508,7 +504,6 @@ module SiSU_DbColumns
           if defined? @md.creator.prepared_by_detail \
           and @md.creator.prepared_by_detail.is_a?(Array) \
           and @md.creator.prepared_by_detail.length > 0
-            txt=@md.creator.prepared_by_detail
             txt=''
             @md.creator.prepared_by_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -536,7 +531,6 @@ module SiSU_DbColumns
           if defined? @md.creator.digitized_by_detail \
           and @md.creator.digitized_by_detail.is_a?(Array) \
           and @md.creator.digitized_by_detail.length > 0
-            txt=@md.creator.digitized_by_detail
             txt=''
             @md.creator.digitized_by_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
@@ -564,7 +558,6 @@ module SiSU_DbColumns
           if defined? @md.creator.audio_detail \
           and @md.creator.audio_detail.is_a?(Array) \
           and @md.creator.audio_detail.length > 0
-            txt=@md.creator.audio_detail
             txt=''
             @md.creator.audio_detail.each do |h|
               txt=txt + %{#{h[:the]}, #{h[:others]}; }
index 98a295ef02a02b1011cea5bbb8c3201c7124a588..a70776ec5058299aae69072466c358331f340ad8 100644 (file)
@@ -1,3 +1,59 @@
+# encoding: utf-8
+=begin
+
+* Name: SiSU
+
+** Description: documents, structuring, processing, publishing, search
+*** plaintext
+
+** Author: Ralph Amissah
+  <ralph@amissah.com>
+  <ralph.amissah@gmail.com>
+
+** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah,
+  All Rights Reserved.
+
+** License: GPL 3 or later:
+
+  SiSU, a framework for document structuring, publishing and search
+
+  Copyright (C) Ralph Amissah
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or (at your option)
+  any later version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program. If not, see <http://www.gnu.org/licenses/>.
+
+  If you have Internet connection, the latest version of the GPL should be
+  available at these locations:
+  <http://www.fsf.org/licensing/licenses/gpl.html>
+  <http://www.gnu.org/licenses/gpl.html>
+
+  <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html>
+
+** SiSU uses:
+  * Standard SiSU markup syntax,
+  * Standard SiSU meta-markup syntax, and the
+  * Standard SiSU object citation numbering and system
+
+** Hompages:
+  <http://www.jus.uio.no/sisu>
+  <http://www.sisudoc.org>
+
+** Git
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+  <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=lib/sisu/develop/txt_output.rb;hb=HEAD>
+
+=end
 module Txt_Output
   class Output
     include SiSU_Param
index 204b94c59e994b2b699003a0927327de523437c7..eddeaa9ca8fdcb8c5145015ddf44dc465ec14841 100644 (file)
@@ -4,7 +4,7 @@
 * Name: SiSU
 
 ** Description: documents, structuring, processing, publishing, search
-*** plaintext (smarttext) generation, asciidoc
+*** plaintext
 
 ** Author: Ralph Amissah
   <ralph@amissah.com>