From 0f1666f82e876509478675f10ac2b0d237597779 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 20 Aug 2014 18:56:42 -0400
Subject: v5 v6: hub options, introduce "error override" --no-stop or
 --errors-as-warnings

---
 data/doc/sisu/CHANGELOG_v5 |  2 ++
 data/doc/sisu/CHANGELOG_v6 |  2 ++
 lib/sisu/v5/hub_options.rb |  6 ++++++
 lib/sisu/v5/utils.rb       | 13 ++++++++-----
 lib/sisu/v6/hub_options.rb |  6 ++++++
 lib/sisu/v6/utils.rb       | 13 ++++++++-----
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 9c795654..714c6cc3 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.2.orig.tar.xz
   sisu_5.6.2.orig.tar.xz
   sisu_5.6.2-1.dsc
 
+* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
+
 * ao
   * book index related
   * ao_expand_insertions, blocked text match, adjust
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index a1b20529..8661c834 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.3.orig.tar.xz
   sisu_6.2.3.orig.tar.xz
   sisu_6.2.3-1.dsc
 
+* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
+
 * ao
   * book index related
   * ao_expand_insertions, blocked text match, adjust
diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/v5/hub_options.rb
index 77bb294e..bc96b878 100644
--- a/lib/sisu/v5/hub_options.rb
+++ b/lib/sisu/v5/hub_options.rb
@@ -781,6 +781,12 @@ module SiSU_Commandline
         @act=@@act
       else
         act={}
+        act[:no_stop]=if select_arr.inspect \
+        =~/"--no-stop"|"--errors-as-warnings"/
+          { bool: true, set: :on }
+        else
+          { bool: false, set: :na }
+        end
         act[:license]=(select_arr.inspect \
         =~/"--license/) \
         ? { bool: true, set: :on }
diff --git a/lib/sisu/v5/utils.rb b/lib/sisu/v5/utils.rb
index c5a312d2..1f4e6f05 100644
--- a/lib/sisu/v5/utils.rb
+++ b/lib/sisu/v5/utils.rb
@@ -130,7 +130,10 @@ module SiSU_Utils
     def set(v=nil,x=nil)
       v=var(v,x)
       file,path=File.basename(@file),File.dirname(@file)
-      v[:c][:on] + @line + v[:c][:off] + ' ' + path + '/' "#{v[:c][:on]}#{file}#{v[:c][:off]}" + v[:m]
+      v[:c][:on] + @line + v[:c][:off] + ' ' \
+      + path + '/' \
+      + "#{v[:c][:on]}#{file}#{v[:c][:off]}" \
+      + v[:m]
     end
     def mark(v=nil,x=nil)
       puts set(v,x)
@@ -150,9 +153,9 @@ module SiSU_Utils
     def warn(v=nil,x=nil)
       if (v.is_a?(Symbol) \
       and x.is_a?(String))
-        x= '*WARN* ' + x
+        x="\n  " + '*WARN* ' + x
       elsif v.is_a?(String)
-        v='*WARN* ' + v
+        v="\n  " + '*WARN* ' + v
         x=nil
       else
         v,x='*WARN*',nil
@@ -162,9 +165,9 @@ module SiSU_Utils
     def error(v=nil,x=nil)
       if (v.is_a?(Symbol) \
       and x.is_a?(String))
-        x= '*ERROR* ' + x
+        x="\n  " + '*ERROR* ' + x
       elsif v.is_a?(String)
-        v='*ERROR* ' + v
+        v="\n  " + '*ERROR* ' + v
         x=nil
       else
         v,x='*ERROR*',nil
diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/v6/hub_options.rb
index 81302412..5625963b 100644
--- a/lib/sisu/v6/hub_options.rb
+++ b/lib/sisu/v6/hub_options.rb
@@ -781,6 +781,12 @@ module SiSU_Commandline
         @act=@@act
       else
         act={}
+        act[:no_stop]=if select_arr.inspect \
+        =~/"--no-stop"|"--errors-as-warnings"/
+          { bool: true, set: :on }
+        else
+          { bool: false, set: :na }
+        end
         act[:license]=(select_arr.inspect \
         =~/"--license/) \
         ? { bool: true, set: :on }
diff --git a/lib/sisu/v6/utils.rb b/lib/sisu/v6/utils.rb
index 7e915429..af464572 100644
--- a/lib/sisu/v6/utils.rb
+++ b/lib/sisu/v6/utils.rb
@@ -130,7 +130,10 @@ module SiSU_Utils
     def set(v=nil,x=nil)
       v=var(v,x)
       file,path=File.basename(@file),File.dirname(@file)
-      v[:c][:on] + @line + v[:c][:off] + ' ' + path + '/' "#{v[:c][:on]}#{file}#{v[:c][:off]}" + v[:m]
+      v[:c][:on] + @line + v[:c][:off] + ' ' \
+      + path + '/' \
+      + "#{v[:c][:on]}#{file}#{v[:c][:off]}" \
+      + v[:m]
     end
     def mark(v=nil,x=nil)
       puts set(v,x)
@@ -150,9 +153,9 @@ module SiSU_Utils
     def warn(v=nil,x=nil)
       if (v.is_a?(Symbol) \
       and x.is_a?(String))
-        x= '*WARN* ' + x
+        x="\n  " + '*WARN* ' + x
       elsif v.is_a?(String)
-        v='*WARN* ' + v
+        v="\n  " + '*WARN* ' + v
         x=nil
       else
         v,x='*WARN*',nil
@@ -162,9 +165,9 @@ module SiSU_Utils
     def error(v=nil,x=nil)
       if (v.is_a?(Symbol) \
       and x.is_a?(String))
-        x= '*ERROR* ' + x
+        x="\n  " + '*ERROR* ' + x
       elsif v.is_a?(String)
-        v='*ERROR* ' + v
+        v="\n  " + '*ERROR* ' + v
         x=nil
       else
         v,x='*ERROR*',nil
-- 
cgit v1.2.3