AoBane 0.1.10 → 0.1.11

data/README.md

@@ -2,7 +2,7 @@ AoBane The MarkDown Core Engine
 ======
 
 Powered By BlueFeather<br> 
-See also [AoBane development memo](https://github.com/setminami/AoBane/wiki/development-memo).
+See also [AoBane Syntax](https://github.com/setminami/AoBane/wiki/Details-of-AoBane-Syntax).
 
 ##What's This and What You Can...
 This codes are extended from BlueFeather.<br>
@@ -106,6 +106,38 @@ like this
 
 > !in &notin;
 
+<h2> 2.6 Table Caption</h2>
+Do you want to insert a caption to &lt;table&gt;? You can insert in AoBane. <br>
+Like this:<br>
+<pre><code>
+[foo]{#bar}
+|fruits|price
+|------|-----
+|Apple|$0.5
+|Orange|$0.3
+</code></pre>
+the first line [foo]{#bar} and this table, expands HTML as below:<br>
+<pre><code>
+&lt;table id="#bar"&gt;
+&lt;caption&gt;foo&lt;/caption&gt;
+	&lt;thead&gt;&lt;tr&gt;
+		&lt;th&gt;fruits&lt;/th&gt;
+		&lt;th&gt;price&lt;/th&gt;
+	&lt;/tr&gt;&lt;/thead&gt;
+	&lt;tbody&gt;
+		&lt;tr&gt;
+			&lt;td&gt;Apple&lt;/td&gt;
+			&lt;td&gt;$0.5&lt;/td&gt;
+		&lt;/tr&gt;
+		&lt;tr&gt;
+			&lt;td&gt;Orange&lt;/td&gt;
+			&lt;td&gt;$0.3&lt;/td&gt;
+		&lt;/tr&gt;
+	&lt;/tbody&gt;
+&lt;/table&gt;
+</code></pre>
+The "#bar" is adapted to table id, and "foo" is surrounded by &lt;captin&gt; and &lt;/caption&gt; as elements in following table. When you put caption to a table, you should write `[Table 1](#Table1)` somewhere in your Markdown. So, you can jump to a table from the link. <br>
+Of course, you can omit this.
 
 ##How to Install
 Just try 

data/lib/AoBane/utilities.rb

@@ -16,27 +16,30 @@ $MAX_H = 6
 @@log.level = Logger::WARN
 
 ###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}' + 
+  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 =  '\|\-+\|'
+  EndDivMark =  '\|\-+\|'
 
 def prePaling(text)
   output = text.split("\n")
   output.each_with_index{|line,index|
-    if /#{$startDivMark}/ =~ line then
+    if /#{StartDivMark}/ =~ line then
     loop do
         index += 1
-        if /#{$endDivMark}/ =~ output[index] then
+        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.+?)/ =~ output[index] then
+        elsif /^\|(\s*)\*(\s.+?)\s*\|/ =~ output[index] then
           output[index] = $1 + '*' + $2              #pass through to BlueFeather
-        elsif /^(\s*)\-(\s.+?)/ =~ output[index] then
-          output[index] = $1 + '*' + $2              #pass through to BlueFeather
-        elsif /^\|(.*)\s*\|/ =~ output[index] then
+        elsif /^\|(\s*)\-(\s.+?)\s*\|/ =~ output[index] then
+          output[index] = $1 + '-' + $2              #pass through to BlueFeather
+        elsif /^\|(.*\s*)\|/ =~ output[index] then
           output[index] =  $1
         end
     end
@@ -56,17 +59,17 @@ end
 def postPaling(text)
   output = text.split("\n")
   output.each_with_index{|line,index|
-    if /#{$startDivMark}/ =~ line then
+    if /#{StartDivMark}/ =~ line then
       output[index] = '<div style="border:' + $1 + 'px ' + $2 + ';' +
         if $4.nil? then '' else 'width:' + if Utilities::isDigit($4) then $4 + 'px;' else $4 + ';'  end end  + 
         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:50%;' else 'line-height:' + $11 + ';' end +
+        if $11.nil? then 'line-height:100%;' else 'line-height:' + $11 + ';' end +
         'border-radius:' + 
         if $12.nil? then '' else $12 end + 'px;">'
       loop do
         index += 1
-        if /#{$endDivMark}/ =~ output[index] then
+        if /#{EndDivMark}/ =~ output[index] then
           output[index] = '</div>'
           break
         end

data/lib/AoBane/version.rb

@@ -1,3 +1,3 @@
 module AoBane
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/AoBane.rb

@@ -51,8 +51,8 @@ require 'AoBane/utilities'
 require 'math_ml/string'
 
 module AoBane
-	VERSION = '0.1.10'
-	VERSION_NUMBER = 0.0110
+	VERSION = '0.1.11'
+	VERSION_NUMBER = 0.0111
 	RELEASE_DATE = '2013-04-20'
 	VERSION_LABEL = "#{VERSION} (#{RELEASE_DATE})"
 
@@ -2026,28 +2026,28 @@ module AoBane
 
 			# Set up the string scanner and just return the string unless there's at
 			# least one backtick.
+
 			@scanner.string = str.dup
 			unless @scanner.exist?( /`/ )
 				@scanner.terminate
-				@log.debug "No backticks found for code span in %p" % str
+				@log.warn "No backticks found for code span in %p" % str
 				return str
 			end
 
 			@log.debug "Transforming code spans in %p" % str
-
 			# Build the transformed text anew
 			text = ''
-
+                        
 			# Scan to the end of the string
 			until @scanner.empty?
 
 				# Scan up to an opening backtick
 				if pre = @scanner.scan_until( /.??(?=`)/m )
 					text += pre
-					@log.debug "Found backtick at %d after '...%s'" % [ @scanner.pos, text[-10, 10] ]
+					@log.debug "Found backtick at %d after '...%s'" % [ @scanner.pos, text[-20, 20] ]
 
 					# Make a pattern to find the end of the span
-					opener = @scanner.scan( /`+/ )
+                                        opener = @scanner.scan( /`+/ )
 					len = opener.length
 					closer = Regexp::new( opener )
 					@log.debug "Scanning for end of code span with %p" % closer
@@ -2060,10 +2060,11 @@ module AoBane
 							"No %p found before end" % opener )
 
 					@log.debug "Found close of code span at %d: %p" % [ @scanner.pos - len, codespan ]
+                                        #p codespan.strip
 					codespan.slice!( -len, len )
 					text += "<code>%s</code>" %
 						encode_code( codespan.strip, rs )
-
+                                       
 				# If there's no more backticks, just append the rest of the string
 				# and move the scan pointer to the end
 				else
@@ -2170,6 +2171,7 @@ module AoBane
 				#gsub( %r{<}, '&lt;' ).
 				#gsub( %r{>}, '&gt;' ).
 				#gsub( CodeEscapeRegexp ) {|match| EscapeTable[match][:md5]}
+                  return str
 		end
 
 		def escape_to_header_id(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: AoBane
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: math_ml