Fenced Code Blocks, Fortran Syntax Colouring

Support Marhdown Extra's fenced code blocks. [From Jason Blevins]
Fortran syntax colouring. [From Jason Blevins]
Turn on Syntax colouring, by default.
Point to Michel Fortin's Markdown Extra page.

vendor/plugins/maruku/lib/maruku.rb

@@ -113,6 +113,8 @@ require 'maruku/toc'
 
 # Support for div Markdown extension
 require 'maruku/ext/div'
+# Support for fenced codeblocks extension
+require 'maruku/ext/fenced_code'
 
 # Version and URL
 require 'maruku/version'

vendor/plugins/maruku/lib/maruku/attributes.rb

@@ -77,58 +77,6 @@ end
 
 module MaRuKu; module In; module Markdown; module SpanLevelParser
 	
-	def unit_tests_for_attribute_lists
-		[
-			[ "",     [], "Empty lists are allowed" ], 
-			[ "=",    :throw, "Bad char to begin a list with." ], 
-			[ "a =b", :throw, "No whitespace before `=`." ], 
-			[ "a= b", :throw, "No whitespace after `=`." ], 
-
-			[ "a b", [[:ref, 'a'],[:ref, 'b']], "More than one ref" ], 
-			[ "a b c", [[:ref, 'a'],[:ref, 'b'],[:ref, 'c']], "More than one ref" ], 
-			[ "hello notfound", [[:ref, 'hello'],[:ref, 'notfound']]], 
-
-			[ "'a'",  [[:ref, 'a']], "Quoted value." ], 
-			[ '"a"'   ], 
-
-			[ "a=b",  [['a','b']], "Simple key/val" ], 
-			[ "'a'=b"   ], 
-			[ "'a'='b'" ], 
-			[ "a='b'"   ], 
-
-			[ 'a="b\'"',  [['a',"b\'"]], "Key/val with quotes" ],
-			[ 'a=b\''],
-			[ 'a="\\\'b\'"',  [['a',"\'b\'"]], "Key/val with quotes" ], 
-			
-			['"', :throw, "Unclosed quotes"],
-			["'"],
-			["'a "],
-			['"a '],
-			
-			[ "#a",  [[:id, 'a']], "Simple ID" ], 
-			[ "#'a'" ], 
-			[ '#"a"' ], 
-
-			[ "#",  :throw, "Unfinished '#'." ], 
-			[ ".",  :throw, "Unfinished '.'." ], 
-			[ "# a",  :throw, "No white-space after '#'." ], 
-			[ ". a",  :throw, "No white-space after '.' ." ], 
-			
-			[ "a=b c=d",  [['a','b'],['c','d']], "Tabbing" ], 
-			[ " \ta=b \tc='d' "],
-			[ "\t a=b\t c='d'\t\t"],
-			
-			[ ".\"a'",  :throw, "Mixing quotes is bad." ], 
-			
-		].map { |s, expected, comment| 
-			@expected = (expected ||= @expected)
-			@comment  = (comment  ||= (last=@comment) )
-			(comment == last && (comment += (@count+=1).to_s)) || @count = 1
-			expected = [md_ial(expected)] if expected.kind_of? Array
-			["{#{MagicChar}#{s}}", expected, "Attributes: #{comment}"]
-		}
-	end
-	
 	def md_al(s=[]); AttributeList.new(s) end
 
 	# returns nil or an AttributeList

vendor/plugins/maruku/lib/maruku/defaults.rb

@@ -43,7 +43,7 @@ Globals = {
 	:html_png_url => 'pngs/',
 	:html_png_resolution => 200,
 	
-	:html_use_syntax => false,
+	:html_use_syntax => true,
 	
 	:latex_use_listings => false,
 	:latex_cjk => false,

vendor/plugins/maruku/lib/maruku/ext/fenced_code.rb

@@ -0,0 +1,65 @@
+# fenced_code.rb -- Maruku extension for fenced code blocks
+#
+# Copyright (C) 2009 Jason R. Blevins
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+# Fenced code blocks begin with three or more tildes and are terminated
+# by a closing line with at least as many tildes as the opening line.
+# Optionally, an attribute list may appear at the end of the opening
+# line.  For example:
+#
+# ~~~~~~~~~~~~~ {: lang=ruby }
+# puts 'Hello world'
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+OpenFence = /^(~~~+?)\s*(\{([^{}]*?|".*?"|'.*?')*\})?\s*$/
+
+MaRuKu::In::Markdown::register_block_extension(
+	:regexp  => OpenFence,
+	:handler => lambda { |doc, src, context|
+
+	first = src.shift_line
+	first =~ OpenFence
+	close_fence = /^#{$1}~*$/
+	ial = $2
+
+	lines = []
+
+	# read until CloseFence
+	while src.cur_line
+		if src.cur_line =~ close_fence
+			src.shift_line
+			break
+		else
+			lines.push src.shift_line
+		end
+	end
+
+	ial = nil unless (ial && ial.size > 0)
+	al = nil
+
+	if ial =~ /^\{(.*?)\}\s*$/
+		inside = $1
+		cs = MaRuKu::In::Markdown::SpanLevelParser::CharSource
+		al = ial &&
+			doc.read_attribute_list(cs.new(inside),
+				its_context=nil, break_on=[nil])
+	end
+
+	source = lines.join("\n")
+	context.push doc.md_codeblock(source, al)
+	true
+})