mostly the arrangement of conditionals

1 files changed, 29 insertions, 12 deletions

diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index a0dfc405..993e64ff 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -72,7 +72,8 @@ module Syntax
       tail_m_ital=%q{(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$)}
       tail_m_bold=%q{(?:(?:<\/i>)?(?:\s|[.,;:?!'")]|~\^|~\\\{\s|$))?}
       bold_line=%q{^!_\s.+?(?:<br>|\n|$)}
-      @line_scan_ital=if defined? @md.make_italic[:str] and defined? @vz.markup_make_italic[:str]
+      @line_scan_ital=if defined? @md.make_italic[:str] \
+      and defined? @vz.markup_make_italic[:str]
         /#@http_m|#{bold_line}|#@manmkp_ital#{tail_m_ital}|(?:#{@md.make_italic[:str]}|#{@vz.markup_make_italic[:str]})#{tail_m_ital}|\S+|\n/
       elsif defined? @md.make_italic[:str]
         /#@http_m|#{bold_line}|#@manmkp_ital#{tail_m_ital}|#{@md.make_italic[:str]}#{tail_m_ital}|\S+|\n/
@@ -80,11 +81,16 @@ module Syntax
         /#@http_m|#{bold_line}|#@manmkp_ital#{tail_m_ital}|#{@vz.markup_make_italic[:str]}#{tail_m_ital}|\S+|\n/
       end
       @manmkp_bold='^!_\s.+?(?:\n|$)|[*!b]\\{.+?\\}[*!b]|[*!][a-zA-Z0-9\-_]+[*!]'
-      @line_scan_bold=if (defined? @md.make_bold[:str] and @md.make_bold[:str]) and (defined? @vz.markup_make_bold[:str] and @vz.markup_make_bold[:str])
+      @line_scan_bold=if (defined? @md.make_bold[:str] \
+      and @md.make_bold[:str]) \
+      and (defined? @vz.markup_make_bold[:str] \
+      and @vz.markup_make_bold[:str])
         /#@http_m|#{bold_line}|(?:#@manmkp_bold|#{@md.make_bold[:str]}|#{@vz.markup_make_bold[:str]})#{tail_m_bold}|\S+|\n/
-      elsif defined? @md.make_bold[:str] and @md.make_bold[:str]
+      elsif defined? @md.make_bold[:str] \
+      and @md.make_bold[:str]
         /#@http_m|#{bold_line}|(?:#@manmkp_bold|#{@md.make_bold[:str]})#{tail_m_bold}|\S+|\n/
-      elsif defined? @vz.markup_make_bold[:str] and @vz.markup_make_bold[:str]
+      elsif defined? @vz.markup_make_bold[:str] \
+      and @vz.markup_make_bold[:str]
         /#@http_m|#{bold_line}|(?:#@manmkp_bold|#{@vz.markup_make_bold[:str]})#{tail_m_bold}|\S+|\n/
       end
     end
@@ -106,8 +112,10 @@ module Syntax
     end
     def wordlist_italics(line)
       line=line.dup
-      if (defined? @md.make_italic[:str] and @md.make_italic[:str]) \
-      or (defined? @vz.markup_make_italic[:str] and @vz.markup_make_italic[:str])
+      if (defined? @md.make_italic[:str] \
+      and @md.make_italic[:str]) \
+      or (defined? @vz.markup_make_italic[:str] \
+      and @vz.markup_make_italic[:str])
         line= if line !~/^(?:0~|%{1,4}\s|<:code)/  #!~/^(?:[0-6]~|!_|%+\s)/
           word=line.scan(@line_scan_ital)
           word.flatten!
@@ -115,9 +123,11 @@ module Syntax
           line_array=[]
           word.each do |w|
             unless /#@manmkp_ital|#@http_m/.match(w)
-              if defined? @md.make_italic[:regx] and @md.make_italic[:regx]
+              if defined? @md.make_italic[:regx] \
+              and @md.make_italic[:regx]
                 w.gsub!(@md.make_italic[:regx],'<i>\1</i>')
-              elsif defined? @vz.markup_make_italic and @vz.markup_make_italic
+              elsif defined? @vz.markup_make_italic \
+              and @vz.markup_make_italic
                 w.gsub!(@vz.markup_make_italic,'<i>\1</i>')
               end
             end
@@ -137,7 +147,10 @@ module Syntax
     end
     def wordlist_bold(line)
       line=line.dup
-      if (defined? @md.make_bold[:str] and @md.make_bold[:str]) or (defined? @vz.markup_make_bold[:str] and @vz.markup_make_bold[:str])
+      if (defined? @md.make_bold[:str] \
+      and @md.make_bold[:str]) \
+      or (defined? @vz.markup_make_bold[:str] \
+      and @vz.markup_make_bold[:str])
         line=if line !~/^(?:[0-9]~|%+\s|<:code)/
           line_array=[]
           word=line.scan(@line_scan_bold)
@@ -145,9 +158,11 @@ module Syntax
           word.compact!
           word.each do |w|
             unless /#@manmkp_bold|#@http_m/.match(w)
-              if defined? @md.make_bold[:regx] and @md.make_bold[:regx]   #document header: 0~bold [bold word list]
+              if defined? @md.make_bold[:regx] \
+              and @md.make_bold[:regx]   #document header: 0~bold [bold word list]
                 w.gsub!(@md.make_bold[:regx],'<b>\1</b>')
-              elsif defined? @vz.markup_make_bold and @vz.markup_make_bold               #defaults and skin adjusted bold word list
+              elsif defined? @vz.markup_make_bold \
+              and @vz.markup_make_bold               #defaults and skin adjusted bold word list
                 w.gsub!(@vz.markup_make_bold,'<b>\1</b>')
               end
             else
@@ -160,7 +175,9 @@ module Syntax
         else line
         end
       else
-        if line !~/^(?:[0-9]~|%+\s)/ and line =~ /(?:^!_|^[7-9]~)\s+/; embolden(line)
+        if line !~/^(?:[0-9]~|%+\s)/ \
+        and line =~ /(?:^!_|^[7-9]~)\s+/
+          embolden(line)
         end
       end
       line