From f408992e0acf1a962478886fd968dd71f47b115e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 12 May 2014 23:03:31 -0400
Subject: v6: ao, document markup structure check, skip processing file on
 major error

* with error message & text at location of failure
---
 lib/sisu/v6/param.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v6/param.rb')

diff --git a/lib/sisu/v6/param.rb b/lib/sisu/v6/param.rb
index 60c9bb54..19769027 100644
--- a/lib/sisu/v6/param.rb
+++ b/lib/sisu/v6/param.rb
@@ -1115,7 +1115,8 @@ module SiSU_Param
               && @creator.author.is_a?(String)) \
               ? " #{@creator.author}"
               : ''
-              title=%{"#{@title.full.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')}",}
+              title=@title.full.gsub(/\s*(?:<p>|<p \/>|<br>|<br \/>)\s*/,' ').
+                gsub(/~\{.+?\}~/,'')
               SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Parameters',%{#{title}#{creator}}).txt_grey if @opt.act[:verbose][:set]==:on
             end
             if not @book_idx \
@@ -1317,7 +1318,7 @@ module SiSU_Param
         if @en[:note] > 0 \
         and @en[:sum] > 0
           if @en[:sum] > 0
-          else SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'*WARN* both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn unless @opt.act[:unless][:set]==:on
+          else SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'*WARN* both endnote styles used',"~{ #{@en[:sum]} }~ and ^~ #{@en[:mark]}").warn unless @opt.act[:quiet][:set]==:on
           end
         end
         if @en[:mark] != @en[:note] \
@@ -1334,7 +1335,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@title=Md.new('Text Insert',@opt,@env).title
           else
-            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Title missing','please provide @title:').warn unless @opt.act[:unless][:set]==:on
+            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Title missing','please provide @title:').warn unless @opt.act[:quiet][:set]==:on
           end
         end
         if @author !~/[\S]/
@@ -1342,7 +1343,7 @@ module SiSU_Param
           and  @opt.inspect =~/P/
             #@creator=SiSU_Param::Md.new('Text Insert',@opt,@env).creator
           else
-            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Author missing','please provide @creator: :author:').warn unless @opt.act[:unless][:set]==:on
+            SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'WARNING: Document Author missing','please provide @creator: :author:').warn unless @opt.act[:quiet][:set]==:on
           end
         end
         @struct={}
-- 
cgit v1.2.3