AoBane 0.1.14 → 0.1.15

data/lib/AoBane.rb

@@ -52,9 +52,9 @@ require 'math_ml/string'
 
 
 module AoBane
-	VERSION = '0.1.14'
-	VERSION_NUMBER = 0.0114
-	RELEASE_DATE = '2013-04-24'
+	VERSION = '0.1.15'
+	VERSION_NUMBER = 0.0115
+	RELEASE_DATE = '2013-05-07'
 	VERSION_LABEL = "#{VERSION} (#{RELEASE_DATE})"
 
 	UTF8_BOM = "\xef\xbb\xbf"
@@ -523,44 +523,23 @@ module AoBane
                   text += "\n\n"
                   @log.debug "Normalized line-endings: %p" % text
                   
-                  #Insert by set.minami 2013-03-30
-                  text.gsub!(/\*\[(.*?)\]\((.*?)(\|.*?)*(\/.*?)*\)/){|match|
-                    '<font color="' +
-                    if $2.nil? then '' else $2 end	+'" ' +
-                    'face="' +
-                    if $3.nil? then '' else $3.delete('|') end + '" ' +
-                    'size="' +
-                    if $4.nil? then '' else $4.delete('/') end + '">' +
-                    $1 + '</font>'
-                  }
-                  #Insert by set.minami 2013-04-13
-                  text = Utilities::prePaling(text)
-                  #Insert by set.minami 2013-04-21
-                  text = Utilities::abbrPreProcess(text)
-                  #Insert by set.minami 2013-04-01
-                  text.gsub!(/\\TeX\{(.+?)\\TeX\}/){
-                    begin
-                      $1.to_mathml
-                    rescue => e
-                      puts 'math_ml Error: ' + $1
-                      puts e
-                    end
-                  }
-
+                  #text = Utilities::prePaling(text) #Insert by set.minami 2013-04-27
                   #Insert by set.minami 2013-04-03
                   nrange = []
                   departure = 1
                   preproc = Marshal.load(Marshal.dump(text))
                   text.clear
+                  stack = []
                   html_text_number = 0
+#                  Utilities::initNumberStack
+
                   preproc.lines { |line|
                     html_text_number += 1
                     begin
-                      line.gsub!(/^\{nrange:(.*?)(;\d+){0,1}\}/){ |match|
-                        depNum = $2.delete(';').to_i
-                        departure =  
-                        if depNum > 0 then depNum else 1 end
-                        if /[hH]([1-6])\-[hH]([1-6])/ =~ $1
+                      line.gsub!(/^\{nrange:(.*?)(;\d+)??\}/){ |match|
+                        #depNum = $2.delete(';').to_i
+                        #departure = if depNum > 0 then depNum else 1 end
+                        if /h(\d)\-h(\d)/i =~ $1
                           nrange.push($1)
                           nrange.push($2)
                           if nrange.size > 2 then
@@ -580,18 +559,43 @@ module AoBane
                           "@ l.#{html_text_number}";exit(-1)
                         raise FatalError,"AoBane Syntax Error:Header range is WRONG!"
                       end
-                      line.gsub!(/^(%{1,#{range}})(.*?)\n$/){ |match|
-                        line = Utilities.
-                        calcSectionNo(nrange.min,range,$1.size,departure,$2)
-                      }
-                      text << line
+                      if line =~ /^(%{1,#{range}})(.*?)\n/ then
+                        text << Utilities.
+                          calcSectionNo(nrange.min,range,$1.size,departure,$2,stack) +
+                          "\n"
+                      else
+                        text << line
+                      end
                       @log.debug nrange.minmax
                        rescue => e
                       @log.warn "AoBane Syntax WARNING l.#{html_text_number}:#{line.chomp} haven't adopted" 
                       @log.warn e                          
                     end
                   }
-                  
+
+                  text.gsub!(/\*\[(.*?)\]\((.*?)(\|.*?)*(\/.*?)*\)/){|match|
+                    '<font color="' +
+                    if $2.nil? then '' else $2 end	+'" ' +
+                    'face="' +
+                    if $3.nil? then '' else $3.delete('|') end + '" ' +
+                    'size="' +
+                    if $4.nil? then '' else $4.delete('/') end + '">' +
+                    $1 + '</font>'
+                  }
+                  #Insert by set.minami 2013-04-21
+                  text = Utilities::abbrPreProcess(text)
+                  #Insert by set.minami 2013-04-01
+                  text.gsub!(/\\TeX\{(.+?)\\TeX\}/){
+                    begin
+                      $1.to_mathml
+                    rescue => e
+                      puts 'math_ml Error: ' + $1
+                      puts e
+                    end
+                  }
+
+                  text = Utilities::preProcFence(text,0).join("\n") #Insert by set.minami 2013-04-27
+                  #Insert by set.minami 2013-03-30                  
                   #Insert by set.minami
 
 			# Filter HTML if we're asked to do so
@@ -657,75 +661,15 @@ module AoBane
 				end
 			end
 
-                  #Insert by Set.Minami 2013-04-13
-                  text = Utilities::postPaling(text)
                   #Insert by set.minami 2013-04-21
                   text = Utilities::abbrPostProcess(text)
                   #Insert by set.minami 2013-03-30
                   text = Utilities::insertTimeStamp(text)
-
-                  #output = text.split("\n")
-                  specialChar =  {
-                    "\-\-" => "&mdash;",
-                    "<=" => "&hArr;",
-                    "<\->" => "&harr;",
-                    "\->" =>"&rarr;",
-                    "<\-" =>"&larr;",
-                    "=>" => "&rArr;",
-                    "<=" => "&lArr;",
-                    "\|\|\^" => "&uArr;",
-                    "\|\|\/" => "&dArr;",
-                    "\|\/" => "&darr;",
-                    "\|\^" => "&uarr;",
-                    ">>" => "&raquo;",
-                    "\<\<" => "&laquo;",
-                    "+_" => "&plusmn;",
-                    "!=" => "&ne;",
-                    "~~" => "&asymp;",
-                    "~=" => "&cong;",
-                    "<_" => "&le;",
-                    ">_" => "&ge",
-                    "\|FA" => "&forall;",
-                    "\|EX" => "&exist;",
-                    "\|=" => "&equiv;",
-                    "\(+\)" => "&oplus",
-                    "\(x\)" => "&otimes;",
-                    "\(c\)" => "&copy;",
-                    "\(R\)" =>"&reg;",
-                    "\(SS\)" => "&sect;",
-                    "\(TM\)" => "&trade;",
-                    "!in" => "&notin;"}
+                  text = Utilities::postProcFence(text) #Insert by set.minami 2013-04-27
                   
-                  entry = '\-\-|<=>|<\->|\->|<\-|=>|<=|\|\^|\|\|\/|\|\/|\^|\>\>|\<\<|\+_|!=|~~|~=|>_|<_|\|FA|\|EX|\|=|\(+\)|\(x\)|\(c\)|\(R\)|\(SS\)|\(TM\)|!in'
+                  text = Utilities::transformSpecialChar(text) #Insert by set.minami 2013-04-27
 
-                  if text =~ /<pre>/i then
-                    text.gsub!(/<\/pre>(.*?)<pre>/i){|m|
-                      if m.nil? then '<\/pre><pre>'
-                      else
-                        '<\/pre>' + m.gsub!(/#{entry}/,specialChar).to_s + '<pre>'
-                      end
-                    }
-                    text.gsub!(/<\/pre>(.*?)/i){|m|
-                      if m.nil? then '<\/pre>'
-                      else
-                        '</pre>' + m.gsub!(/#{entry}/,specialChar).to_s
-                      end
-                    }
-                    text.gsub!(/(.*?)<pre>/i){|m|
-                      if m.nil? then '<pre>'
-                      else
-                        m.gsub!(/#{entry}/,specialChar).to_s + '<pre>'
-                      end
-                    }
-                  else
-                    if text.nil? then ''
-                    else text.gsub!(/#{entry}/,specialChar)
-                    end
-                  end
-                #return output.join("\n")
-                #Insert by set.minami
-                return text
-                
+                  return text
               end
               
               alias parse parse_text
@@ -879,6 +823,7 @@ module AoBane
 
 			@log.debug "Applying block transforms to:\n  %p" % str
 			text = str
+                        
 			text = pretransform_fenced_code_blocks( text, rs )
 			text = pretransform_block_separators(text, rs)
 
@@ -1231,12 +1176,11 @@ module AoBane
 			}
 		end
 
-                CaptionRegexp = "\\[(.+?)\\](\\{\\#(.+?)\\}){0,1}"
+                CaptionRegexp = '\[(.+?)\](\{(.+?)\})??'
 		TableRegexp = %r{
 			(?:
-                                (#{CaptionRegexp}\s*\n){0,1} 
-                                             # modified by set.minami 2013-04-20
-				^([ ]{0,#{TabWidth - 1}}) # not indented
+                                (#{CaptionRegexp}\s*\n)??# modified by set.minami 2013-04-20
+				([ ]{0,#{TabWidth - 1}}) # not indented
 				(?:[|][ ]*)   # NOT optional border
 
 				\S.*?  # 1st cell content
@@ -1253,9 +1197,9 @@ module AoBane
 
 		# Transform tables.
 		def transform_tables(str, rs)
-			str.gsub(TableRegexp){
-				transform_table_rows($~[0], rs)
-			}
+                  str.gsub(TableRegexp){
+                    transform_table_rows($~[0], rs)
+                  }
 		end
 
 		TableSeparatorCellRegexp = %r{
@@ -1271,79 +1215,86 @@ module AoBane
 		}x
 
 		def transform_table_rows(str, rs)
-                        
-			# split cells to 2-d array
-			data = str.split("\n").map{|x| x.split('|')}
-                        caption = ''  #Inserted by set.minami 2013-04-20
-                        captionName = ''
-                        if /#{CaptionRegexp}/ =~ data[0][0] then
-                          caption = if $1.nil? then '' else $1 end
-                          captionName = if $3.nil? then '' else $3 end
-                          data.slice!(0)
-                        end   #Inserted by set.minami 2013-04-20
-			data.each do |row|
-				# cut left space
-				row.first.lstrip!
-
-				# cut when optional side-borders is included
-				row.shift if row.first.empty?
-			end
-
-			column_attrs = []
-
-			re = ''                        
-                        re << if captionName == '' then 
-                                "<table>\n" 
-                              else 
-                                "<table id=\"#{captionName}\">\n"
-                              end
-                        re << "<caption>#{caption}</caption>\n" 
-                        #Insert by set.minami 2013-04-20
-
-			# head is exist?
-			if data.size >= 3 and data[1].all?{|x| x =~ TableSeparatorCellRegexp} then
-				head_row = data.shift
-				separator_row = data.shift
-
-				separator_row.each do |cell|
-					cell.match TableSeparatorCellRegexp
-					left = $1; right = $2
-
-					if left and right then
-						column_attrs << ' style="text-align: center"'
-					elsif right then
-						column_attrs << ' style="text-align: right"'
-					elsif left then
-						column_attrs << ' style="text-align: left"'
-					else
-						column_attrs << ''
-					end
-				end
-
-				re << "\t<thead><tr>\n"
-				head_row.each_with_index do |cell, i|
-					re << "\t\t<th#{column_attrs[i]}>#{apply_span_transforms(cell.strip, rs)}</th>\n"
-				end
-				re << "\t</tr></thead>\n"
-			end
-
-			# data row
-			re << "\t<tbody>\n"
-			data.each do |row|
-				re << "\t\t<tr>\n"
-				row.each_with_index do |cell, i|
-					re << "\t\t\t<td#{column_attrs[i]}>#{apply_span_transforms(cell.strip, rs)}</td>\n"
-				end
-				re << "\t\t</tr>\n"
-			end
-			re << "\t</tbody>\n"
-
-			re << "</table>\n"
-
-			re
+                  # split cells to 2-d array
+                  data = str.split("\n").map{|x| x.split('|')}
+                  caption = ''  #Inserted by set.minami 2013-04-20
+                  captionName = ''
+                  if /#{CaptionRegexp}/ =~ data[0].first then
+                    caption = if $1.nil? then '' else $1 end
+                    captionName = if $3.nil? then '' else $3 end
+                    data.shift
+                  end   #Inserted by set.minami 2013-04-20
+                  data.each do |row|
+                    if row.first.nil? then next end
+                    # cut left space
+                    row.first.lstrip! 
+                    
+                    # cut when optional side-borders is included
+                    row.shift if row.first.empty?
+                  end
+                  
+                  column_attrs = []
+                  
+                  re = ''                        
+                  re << if captionName == '' then 
+                          "<table>\n" 
+                        else 
+                          "<table id=\"#{captionName}\">\n"
+                        end
+                  re << "<caption>#{caption}</caption>\n" 
+                  #Insert by set.minami 2013-04-20
+                  
+                  # head is exist?
+                  
+                  #if !data[1].nil? && data[1].last =~ /\s+/ then
+                  ###  p data
+                  #  data.each{|d|
+                  #    d.pop
+                  #  }
+                  #end #Insert by set.minami @ 2013-04-29
+                  if data.size >= 3 and data[1].all?{|x| x =~ TableSeparatorCellRegexp} then
+                    head_row = data.shift
+                    separator_row = data.shift
+                    
+                    separator_row.each do |cell|
+                      cell.match TableSeparatorCellRegexp
+                      left = $1; right = $2
+                      
+                      if left and right then
+                        column_attrs << ' style="text-align: center"'
+                      elsif right then
+                        column_attrs << ' style="text-align: right"'
+                      elsif left then
+                        column_attrs << ' style="text-align: left"'
+                      else
+                        column_attrs << ''
+                      end
+                    end
+                    
+                    re << "\t<thead><tr>\n"
+                    head_row.each_with_index do |cell, i|
+                      re << "\t\t<th#{column_attrs[i]}>#{apply_span_transforms(cell.strip, rs)}</th>\n"
+                    end
+                    re << "\t</tr></thead>\n"
+                  end
+                  
+                  # data row
+                  re << "\t<tbody>\n"
+                  data.each do |row|
+                    re << "\t\t<tr>\n"
+                    row.each_with_index do |cell, i|
+                      re << "\t\t\t<td#{column_attrs[i]}>#{apply_span_transforms(cell.strip, rs)}</td>\n"
+                    end
+                    re << "\t\t</tr>\n"
+                  end
+                  re << "\t</tbody>\n"
+                  
+                  re << "</table>\n"
+                  
+                  re
 		end
 
-
+                
 		### Transform any Markdown-style horizontal rules in a copy of the specified
 		### +str+ and return it.
 		def transform_hrules( str, rs )

data/lib/AoBane/utilities.rb

@@ -15,6 +15,66 @@ module Utilities
 $MAX_H = 6
 @@log = Logger.new(STDOUT)
 @@log.level = Logger::WARN
+
+def transformSpecialChar(text)
+  #output = text.split("\n")
+  specialChar =  {
+    "\-\-" => "—",
+    "<=" => "&hArr;",
+    "<\->" => "&harr;",
+    "\->" =>"&rarr;",
+    "<\-" =>"&larr;",
+    "=>" => "&rArr;",
+    "<=" => "&lArr;",
+    "\|\|\^" => "&uArr;",
+    "\|\|\/" => "&dArr;",
+    "\|\/" => "&darr;",
+    "\|\^" => "&uarr;",
+    ">>" => "&raquo;",
+    "\<\<" => "&laquo;",
+    "+_" => "&plusmn;",
+    "!=" => "&ne;",
+    "~~" => "&asymp;",
+    "~=" => "&cong;",
+    "<_" => "&le;",
+    ">_" => "&ge",
+    "\|FA" => "&forall;",
+    "\|EX" => "&exist;",
+    "\|=" => "&equiv;",
+    "\(\+\)" => "&oplus;",
+    "\(\-\)" => "&ominus;",
+    "\(X\)" => "&otimes;",
+    "\(c\)" => "&copy;",
+    "\(R\)" =>"&reg;",
+    "\(SS\)" => "&sect;",
+    "\(TM\)" => "&trade;",
+    "!in" => "&notin;"}
+  
+  entry = '(?!\-+\|)\-\-|<=>|<\->|\->|<\-|=>|<=|\|\^|\|\|\/|\|\/|\^|\>\>|\<\<|' +
+    '\+_|!=|~~|~=|>_|<_|\|FA|\|EX|\|=|\(\+\)|\(\-\)|\(X\)|\(c\)|\(R\)|\(SS\)|\(TM\)|!in'
+  
+  
+  
+  zoneofPre = ["<pre>","<\/pre>"] 
+  dup = []
+  doc = text.split("\n")
+  index = 0
+  doc.each{
+    if doc[index] =~ /#{zoneofPre[0]}/i
+      until doc[index] =~ /#{zoneofPre[1]}/i
+        dup[index] = doc[index]
+        index += 1
+      end
+      dup[index] = doc[index]
+    else
+      dup[index] = if !doc[index].nil? then doc[index].gsub(/#{entry}/,specialChar) end
+      index += 1
+    end
+  }
+  
+  #Insert by set.minami
+  return dup.join("\n")
+end
 ###Insert Timestamp#################################################################
 def insertTimeStamp(text)
   if /\$date/i =~ text then
@@ -78,37 +138,81 @@ def abbrPostProcess(text)
   end
 end
 ###paling proccessing##########################################################
-  StartDivMark = 
-    '\|\-:b=(\d+?)\s(\w+?\s\w+?\s)' + 
-    '(w=(\w+?)\s){0,1}' + 
-    '(h=(\w+?)\s){0,1}' + 
-    '(bg=((#){0,1}\w+?)\s){0,1}' + 
-    '(lh=([\w%]+?)\s){0,1}' + 
-    'rad=(\d+?)\-+\|'
-  EndDivMark =  '\|\-+\|'
-
-def prePaling(text)
-  output = text.split("\n")
+StartDivMark = 
+  '[\/\|]\-:b=(\d+?)\s(\w+?\s\w+?\s)' + # $1 $2
+  '(w=(\w+?)\s)??' +  # $3 $4
+  '(h=(\w+?)\s)??' +  # $5 $6
+  '(bg=((#)??\w+?)\s)??' + # $7 $8 $9
+  '(lh=([\w%]+?)\s)??' + # $10 $11
+  '(mg=(\d+?)\s)??' + # $12 $13
+  '(al=(\w+?)\s)??' + # $14 $15
+  '(rad=(\d+?))\-+[\|\/]' + # $16 $17
+  '({(.+?)})??' # $18 $19 
+EndDivMark =  '\|\_+\|'
+AllChar = '\w\s\!@\#\$%\^&\*\(\)\-\+=\[\{\}\];:\'"<>\,\.\/\?\\|'
+InnerRepresent = ["@","/"]
+
+def preProcFence(text,startPoint)
+  output = []
+  dup = []
+  isInFence = [false]
+  linePointer = 0
+  exclude = '(?!^\|_+|\|\-:)^\||^[#]{1,6}\s|^\s+\*|^\s+\-'
+  if !text.instance_of?(Array) then output = text.split("\n") else output = text end
+
   output.each_with_index{|line,index|
-    if /#{StartDivMark}/ =~ line then
-    loop do
-        index += 1
-        if /#{EndDivMark}/ =~ output[index] then
-          break
-        elsif /^\|(\#{1,6})\s*(.*)\|/ =~ output[index] then
-          output[index] = '#'*$1.size + $2           #pass through to BlueFeather
-        elsif /^\|(\s*)\*(\s.+?)\s*\|/ =~ output[index] then
-          output[index] = $1 + '*' + $2              #pass through to BlueFeather
-        elsif /^\|(\s*)\-(\s.+?)\s*\|/ =~ output[index] then
-          output[index] = $1 + '-' + $2              #pass through to BlueFeather
-        elsif /^\|(.*\s*)\|/ =~ output[index] then
-          output[index] =  $1
+    if index < startPoint then next
+    elsif /#{StartDivMark}/ =~ line then
+      start = line.split("|")
+      dup <<  "/" + start[1] + "/" 
+      if start.size >= 2 then dup << start[2..-1] end 
+      isInFence.push(true)
+      next
+    elsif /#{EndDivMark}/ =~ line then
+      dup << '/@/'
+      next
+    else 
+      if isInFence.last then
+        if dup.last.nil? then 
+          dup << compressWSpaces(line)
+        else 
+          if dup.last =~ /#{exclude}/i || line =~ /#{exclude}/i then
+            if line =~ /#{exclude}/i then dup << line
+            else dup << compressWSpaces(line) end
+           else
+            if line == "" then 
+              dup << '<br />'
+            else 
+              dup.last << compressWSpaces(line)
+              next
+            end
+          end
         end
+      else
+        dup << if !line.nil? then line else "" end
+      end     
     end
-  end #if
   }
-  return output.join("\n")
-end #def prePaling
+  return dup
+end
+
+def compressWSpaces(line)
+  dup = if line =~ /\s+$/ then line.strip + " " else line end
+  return dup
+end
+
+
+# Pattern to match strong emphasis in Markdown text
+BoldRegexp = %r{ (\*\*) (\S|\S.*?\S) \1 }x
+
+# Pattern to match normal emphasis in Markdown text
+ItalicRegexp = %r{ (\*) (\S|\S.*?\S) \1 }x
+
+def italic_and_bold(str)
+  str.
+    gsub( BoldRegexp, %{<strong>\\2</strong>} ).
+    gsub( ItalicRegexp, %{<em>\\2</em>} )
+end
 
 def isDigit(str)
   if /\d+/ =~ str then 
@@ -118,7 +222,7 @@ def isDigit(str)
   end
 end
 
-def postPaling(text)
+def postProcFence(text)
   output = text.split("\n")
   output.each_with_index{|line,index|
     if /#{StartDivMark}/ =~ line then
@@ -127,22 +231,33 @@ def postPaling(text)
         if $6.nil? then '' else 'height:' + if Utilities::isDigit($6) then $6 + 'px;' else $6 + ';' end end + 
         if $8.nil? then '' else 'background-color:' + $8 + ';' end + 
         if $11.nil? then 'line-height:100%;' else 'line-height:' + $11 + ';' end +
+        if $13.nil? then '' else 'margin:' + $13 + 'px;' end +
+        if $15.nil? then '' else 'text-align:' + $15 + ';' end +
         'border-radius:' + 
-        if $12.nil? then '' else $12 end + 'px;">'
-      loop do
-        index += 1
-        if /#{EndDivMark}/ =~ output[index] then
-          output[index] = '</div>'
+        if $16.nil? then '' else $16 end + 'px;"' + 
+        if $19.nil? then '' else 'class="#{$19}"' end + 
+        '>'
+      output.each_with_index{|l,i = index|
+        if /\/@\// =~ l then
+          output[i] = '</div>'
+          index = i
           break
         end
-      end
+        i += 1
+      }
     end
   }
   return output.join("\n")
-end #def postPailing
+end #def postProcFence
+
+### Initialize a Stack class ############################
+  def initNumberStack
+    Stack.destroy
+  end
+
 ### Return a caluculated section number and string.############################
-  def calcSectionNo(startNo=1, range=0, size=0, dep=1, str='')
-    stack = Stack.instance
+  def calcSectionNo(startNo=1, range=0, size=0, dep=1, str='', outerStack)
+    stack = outerStack #Stack.instance
     i = dep.to_i
     counter = 0
     numberStr = [["%",i,counter],["%%",i,counter],["%%%",i,counter],
@@ -154,25 +269,30 @@ end #def postPailing
       @@log.error("AoBane Syntax Error: Header shortage!") 
       raise SyntaxError,"Headder shortage!"
     else
-      (1..size).each_with_index{|k| #h1 to h6
-        @@log.debug "k #{k},hn #{headNo},s #{size},sN #{startNo},sos #{stack.sizeofStack}"
+      (1..headNo).each_with_index{|k| #h1 to h6
+        p k
        if (k < headNo) then
-         @@log.debug "+++ #{k},#{stack.sizeofStack}"
-         if k >= stack.sizeofStack  then
+         p "+++" # #{k},#{stack.sizeofStack}"
+         if k >= stack.size  then
            stack.push(numberStr[k])
          end
-       elsif (k == headNo) then 
-         if stack.sizeofStack == 0 then
+       elsif k == headNo then
+         p "---"
+         if stack.size == 0 then
            stack.push(numberStr[k-1])
          end
-         if (stack.evalStackTop[$S_SLOT].size > numberStr[k-1][$S_SLOT].size) then
-            stack.pop
+         if stack.last[$S_SLOT].size > numberStr[k-1][$S_SLOT].size then
+           loop do
+             stack.pop
+             if stack.last[$S_SLOT].size == numberStr[k-1][$S_SLOT].size then
+               break
+             end
+           end
          end
        else
-         @@log.debug "~~~~"
+         p "~~~~"
          stack.push(numberStr[k])
        end #if...elsif 
-      stack.dump
      }
 =begin
     else
@@ -181,22 +301,35 @@ end #def postPailing
     end #case
 =end
   end #if...else
-    @@log.debug "$$$$"
-    number = stack.insertNumber
+    p "$$$$" 
+    number = ""
+    stack.each { |item|
+      if item == stack.last then
+        item[$N_SLOT] += item[$C_SLOT]
+        item[$C_SLOT] = 1
+      end
+      number << (item[$N_SLOT]).to_s + '.'
+      @@log.debug number
+    }
+ 
     h = "#"
     times = startNo.to_i + size.to_i - 1
   return  h*times + number + str
 end #def
 
+module_function:compressWSpaces
+module_function:italic_and_bold
+module_function:transformSpecialChar
 module_function:getNowTime
 module_function:insertTimeStamp
 module_function:abbrPreProcess
 module_function:abbrPostProcess
 module_function:storeAbbr
+module_function:initNumberStack
 module_function:calcSectionNo
-module_function:prePaling
+module_function:preProcFence
 module_function:isDigit
-module_function:postPaling
+module_function:postProcFence
 #############################################################################
 end
 
@@ -234,16 +367,7 @@ class Stack
   end
 
   def insertNumber
-    str = ""
-    @stack.each { |item|
-      if isTopofStack(item) then
-        item[$N_SLOT] += item[$C_SLOT]
-        item[$C_SLOT] = 1
-      end
-      str << (item[$N_SLOT]).to_s + '.'
-      @@log.debug str
-    }
-    return str
+ #   return str
   end
   
   def evalStackTop
@@ -268,9 +392,15 @@ class Stack
     end
   end
 
-  def dump
+  def self.dump
     @@log.debug("Stack DUMP:#{@stack}")
   end
 
+  def self.destroy
+    if @stack.nil? then @stack = [] else @stack.clear end
+    p @stack
+    @sp = 0
+  end
+
 end
 

data/lib/AoBane/version.rb

@@ -1,3 +1,3 @@
 module AoBane
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/test/Test.html

@@ -8,7 +8,22 @@
 
 <ul>
 <li><a href="#bfheader-0cbc6611f5540bd0809a388dc95a615b" rel="toc">Test</a>
-    * <a href="#bfheader-acbd18db4cc2f85cedef654fccc4a4d8" rel="toc">foo</a></li>
+<ul>
+<li><a href="#bfheader-f2b20ed74117a2bda0525514a898e0e0" rel="toc">1. &rarr;1.</a>
+<ul>
+<li><a href="#bfheader-4e7b97bf9819709771ba6c716991e3ef" rel="toc">1.1. &rarr;1.1.</a></li>
+<li><a href="#bfheader-a4940c538c7be252daf50cc4237617ce" rel="toc">1.2. &rarr;1.2.</a>
+<ul>
+<li><a href="#bfheader-b162ec5d01c9e20e3551a5b96fa9f650" rel="toc">1.2.1. &rarr;1.2.1.</a></li>
+<li><a href="#bfheader-584eba1c1d454adaca0318b151a2dcb2" rel="toc">1.2.2. &rarr;1.2.2.</a></li>
+</ul></li>
+<li><a href="#bfheader-9868f67e1aa2e9e7d90a9a4846b8558f" rel="toc">1.3. &rarr;1.3.</a></li>
+</ul></li>
+<li><a href="#bfheader-bd5a30e45e46b39eca67398f88312a1b" rel="toc">2. &rarr;2.</a>
+<ul>
+<li><a href="#bfheader-acbd18db4cc2f85cedef654fccc4a4d8" rel="toc">foo</a></li>
+</ul></li>
+</ul></li>
 </ul>
 
 <h1 id="bfheader-0cbc6611f5540bd0809a388dc95a615b">Test</h1>
@@ -19,26 +34,43 @@
 
 <p>aa &raquo; &laquo;</p>
 
-<ol>
-<li><p>&rarr;1.
-2.% &rarr;1.1.
-3.% &rarr;1.2.
-4.%% &rarr;1.2.1.
-5.%% &rarr;1.2.2.
-6.% &rarr;1.3.
-abcdefg</p></li>
-<li><p>&rarr;2. 
-abccccc</p></li>
-</ol>
+<h2 id="bfheader-f2b20ed74117a2bda0525514a898e0e0">1. &rarr;1.</h2>
+
+<h3 id="bfheader-4e7b97bf9819709771ba6c716991e3ef">1.1. &rarr;1.1.</h3>
+
+<h3 id="bfheader-a4940c538c7be252daf50cc4237617ce">1.2. &rarr;1.2.</h3>
+
+<h4 id="bfheader-b162ec5d01c9e20e3551a5b96fa9f650">1.2.1. &rarr;1.2.1.</h4>
+
+<h4 id="bfheader-584eba1c1d454adaca0318b151a2dcb2">1.2.2. &rarr;1.2.2.</h4>
 
-<div style="border:2px solid gray ;width:300px;line-height:100%;border-radius:10px;">
+<h3 id="bfheader-9868f67e1aa2e9e7d90a9a4846b8558f">1.3. &rarr;1.3.</h3>
+
+<p>abcdefg</p>
+
+<h2 id="bfheader-bd5a30e45e46b39eca67398f88312a1b">2. &rarr;2.</h2>
+
+<p>abccccc</p>
+
+<div style="border:2px solid gray ;width:300px;line-height:100%;border-radius:rad=10px;">
 
 <h3 id="bfheader-acbd18db4cc2f85cedef654fccc4a4d8">foo</h3>
 
-<p>bar<br />
+<p>barasdf
+<br />
+<div style="border:2px solid gray ;width:200px;line-height:100%;border-radius:rad=10px;">
+aaaaaa
+cccc
+<div style="border:2px solid gray ;width:100px;line-height:100%;border-radius:rad=10px;">
+bbbbbb
+</div>
+</div>
+<div style="border:2px solid gray ;width:200px;line-height:100%;border-radius:rad=10px;">
+aaaaaa
+</div>
+<br />
+<br />
 </div>
-
-<p><font color="#ff0000" face="" size="5">foo</font></p>
 
 </body>
 </html>

data/test/Test.md

@@ -1,4 +1,4 @@
-
+{nrange:h2-h5}
 {toc:h1-h6}
 
 Test
@@ -28,10 +28,24 @@ abcdefg
 abccccc
 
 |-:b=2 solid gray w=300 rad=10-----------------|
-|### foo                                       |
-|bar                                           |
-|----------------------------------------------|
+### foo
+bar
+asdf
+
+|-:b=2 solid gray w=200 rad=10-----------------|
+aaaaaa
+cccc
+|-:b=2 solid gray w=100 rad=10-----------------|
+bbbbbb
+|____________________________________|
+|__________________________________________|
+kkkkkk
+|-:b=2 solid gray w=200 rad=10-----------------|
+aaaaaa
+|__________________________________________|
+
 
+|__________________________________________|
 *[foo](#ff0000/5)
 
 

data/test/test2.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Test</title>
+</head>
+<body>
+
+<h1 id="bfheader-0cbc6611f5540bd0809a388dc95a615b">Test</h1>
+
+<h1 id="bfheader-afbc53b5508660ebc55ef0e9f6b92fc4">1. aaa</h1>
+
+<h2 id="bfheader-5de9e1fcd9cd2972a7eb946c7bf542c6">1.1. abc</h2>
+
+<h3 id="bfheader-27b4fea764f25be818fbddc9644dacda">1.1.1. kkkk</h3>
+
+<h4 id="bfheader-9a36ccc535c67e888612b6c40b377ac0">1.1.1.1. www</h4>
+
+<h1 id="bfheader-7ce41b8fd4205ac8204851ebda7996cc">2. qqq</h1>
+
+<h2 id="bfheader-76627366ec5ded7ed3f5dd8bffbab2a0">2.1. rrr</h2>
+
+<p>cccc</p>
+
+<h3 id="bfheader-a87f63d7e810f249c861814cea02f2af">2.1.1. rtttt</h3>
+
+<p>aaaa</p>
+
+</body>
+</html>

data/test/test2.md

@@ -1,3 +1,27 @@
+{nrange:H1-h5}
 
 Test
 ===
+
+% aaa
+
+%% abc
+
+%%% kkkk
+
+%%%% www
+
+% qqq
+
+%% rrr
+cccc
+
+%%% rtttt
+aaaa
+
+
+
+
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: AoBane
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: math_ml
@@ -69,6 +69,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - AoBane.gemspec
+- AoBane.icns
+- AoBane.jpg
+- AoBane.tiff
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,6 +84,7 @@ files:
 - lib/AoBane/version.rb
 - test/Test.html
 - test/Test.md
+- test/test2.html
 - test/test2.md
 homepage: https://github.com/setminami/AoBane
 licenses:
@@ -110,4 +114,5 @@ summary: You can generate complex HTML with simple way.
 test_files:
 - test/Test.html
 - test/Test.md
+- test/test2.html
 - test/test2.md