From 3d4ec6deee066dec01b9445f9b54f844d9443aae Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 2 Dec 2013 23:59:06 -0500
Subject: v5: some renaming to ao from dal continued

---
 lib/sisu/v5/options.rb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'lib/sisu/v5/options.rb')

diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb
index 7203f8b2..650105fa 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v5/options.rb
@@ -496,7 +496,7 @@ module SiSU_Commandline
           when /^--(?:color-toggle)$/;                               c=c+'c'
           when /^--(?:color-off)$/;                                  c=c+'k'
           when /^--(?:conf|config|configure|init|initialize|init-site)$/;                        c=c+'CC'
-          when /^--(?:dal?|machine|abstraction|abs)$/;               c=c+'m'
+          when /^--(?:ao|dal?|machine|abstraction|abs)$/;               c=c+'m'
           when /^--(?:txt|text|plaintext)$/;                         c=c+'t'
           when /^--(?:html)$/;                                       c=c+'h'
           when /^--(?:html-scroll|html-seg)$/;                       c=c+'H'
@@ -552,12 +552,12 @@ module SiSU_Commandline
       if cmd !~/[mn]/
         extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
         and cmd !~/[mn]/
-          'm'                        #% add dal
+          'm'                        #% add ao
         elsif ((cmd =~/[Dd]/ \
         or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \
         and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \
         and cmd !~/[mn]/
-          'm'                        #% add dal
+          'm'                        #% add ao
         else ''
         end
       end
@@ -883,10 +883,6 @@ module SiSU_Commandline
         || mod.inspect =~/"--texinfo"/) \
         ? { bool: true, set: :on }
         : { bool: false, set: :na }
-        act[:fictionbook]=(cmd =~/f/ \
-        || mod.inspect =~/"--fictionbook"/) \
-        ? { bool: true, set: :on }
-        : { bool: false, set: :na }
         act[:psql]=(cmd =~/D/ \
         || mod.inspect =~/"--pg"|"--pgsql"/) \
         ? { bool: true, set: :on }
@@ -964,8 +960,8 @@ module SiSU_Commandline
         act[:help]=(mod.inspect =~/"--help/) \
         ? { bool: true, set: :on }
         : { bool: false, set: :na }
-        act[:dal]=if (cmd =~/m/ \
-        || mod.inspect =~/"--dal"/)
+        act[:ao]=if (cmd =~/m/ \
+        || mod.inspect =~/"--ao"|"--dal"/)
           { bool: true, set: :on }
         elsif (act[:txt][:set]==:on \
         || act[:xhtml][:set]==:on \
@@ -992,14 +988,14 @@ module SiSU_Commandline
           #if cmd !~/[mn]/
           #  extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
           #  and cmd !~/[mn]/
-          #    'm'                        #% add dal
+          #    'm'                        #% add ao
         #elsif (act[:txt][:set]==:on \
         #  { bool: true, set: :on }
           #  elsif ((cmd =~/[Dd]/ \
           #  or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \
           #  and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \
           #  and cmd !~/[mn]/
-          #    'm'                        #% add dal
+          #    'm'                        #% add ao
         else
           { bool: false, set: :na }
         end
-- 
cgit v1.2.3