maruku 0.4.0 → 0.4.1

data/lib/maruku/string_utils.rb

@@ -32,10 +32,21 @@ module MaRuKu; module Strings
 		s.split("\n")
 	end
 	
-	# This parses email headers. Returns an hash. hash['data'] is the message.
+	# This parses email headers. Returns an hash. 
+	#
+	# +hash['data']+ is the message.
+	#
+	# Keys are downcased, space becomes underscore, converted to symbols.
+	#
+	#     My key: true
+	#
+	# becomes:
+	#
+	#     {:my_key => true}
+	#
 	def parse_email_headers(s)
 		keys={}
-		match = (s =~ /((\w+: .*\n)+)\n/)
+		match = (s =~ /((\w[\w\s]+: .*\n)+)\n/)
 		if match != 0
 			keys[:data] = s
 		else
@@ -51,27 +62,18 @@ module MaRuKu; module Strings
 		end
 		keys
 	end
-	
-	# `.xyz` => class: xyz
-	# `#xyz` => id: xyz
+
+	# Keys are downcased, space becomes underscore, converted to symbols.
 	def normalize_key_and_value(k,v)
 		v = v ? v.strip : true # no value defaults to true
 		k = k.strip
 		
-		# `.xyz` => class: xyz
-		if k =~ /^\.([\w\d]+)/
-			return :class, $1
-		# `#xyz` => id: xyz
-		elsif k =~ /^\#([\w\d]+)/
-			return :id, $1
-		else
-			# check synonyms
-			v = true if ['yes','true'].include?(v.to_s.downcase)
-			v = false if ['no','false'].include?(v.to_s.downcase)
-		
-			k = k.downcase.gsub(' ','_')
-			return k, v
-		end
+		# check synonyms
+		v = true if ['yes','true'].include?(v.to_s.downcase)
+		v = false if ['no','false'].include?(v.to_s.downcase)
+	
+		k = k.downcase.gsub(' ','_')
+		return k, v
 	end
 	
 	# Returns the number of leading spaces, considering that

data/lib/maruku/structures.rb

@@ -21,14 +21,15 @@
 
 
 class Module
-	def safe_attr_accessor2(symbol, klass)
+	def safe_attr_accessor1(symbol, klass)
 		attr_reader symbol
 		code = <<-EOF
 		def #{symbol}=(val)  
 			if not val.kind_of? #{klass}
-				s = "Could not assign an object of type \#{val.class} to #{symbol}.\n"
-				s += "Tried to assign\n\#{val.inspect}\nto #{symbol} of object\n"
-				s += "\#{self.inspect}"
+				s = "\nCould not assign an object of type \#{val.class} to #{symbol}.\n\n"
+				s += "Tried to assign object of class \#{val.class}:\n"+
+				     "\#{val.inspect}\n"+
+				     "to \#{self.class}::#{symbol} constrained to be of class #{klass}.\n"
 				raise s
 			end
 			@#{symbol} = val
@@ -38,12 +39,19 @@ EOF
 		module_eval code
   end
 
-	def safe_attr_accessor(symbol, klass)
+	def safe_attr_accessor2(symbol, klass)
 		attr_accessor symbol
 	end
+	
+	alias  safe_attr_accessor  safe_attr_accessor1
 end
 
 module MaRuKu
+	
+Globals = {
+	:unsafe_features => false,
+}
+
 # I did not want to have a class for each possible element. 
 # Instead I opted to have only the class "MDElement"
 # that represents eveything in the document (paragraphs, headers, etc).
@@ -56,8 +64,8 @@ module MaRuKu
 # The @doc variable points to the document to which the MDElement
 # belongs (which is an instance of Maruku, subclass of MDElement).
 #
-# Meta data is specified the hash `meta`. Keys are symbols (downcased, with
-# spaces substituted by underscores)
+# Attributes are contained in the hash `attributes`. 
+# Keys are symbols (downcased, with spaces substituted by underscores)
 #
 # For example, if you write in the source document.
 # 
@@ -68,19 +76,16 @@ module MaRuKu
 #
 # You can access `value` by writing:
 #
-#     @doc.meta[:my_property] # => 'value'
+#     @doc.attributes[:my_property] # => 'value'
 #
 # from whichever MDElement in the hierarchy.
-
+#
 class MDElement 
 	# See helpers.rb for the list of allowed #node_type values
 	safe_attr_accessor :node_type, Symbol
 	
 	# Children are either Strings or MDElement
 	safe_attr_accessor :children, Array
-
-
-#	safe_attr_accessor :meta, Hash
 	
 	# An attribute list, may not be nil
 	safe_attr_accessor :al, Array #Maruku::AttributeList
@@ -129,6 +134,7 @@ end
 # This represents the whole document and holds global data.
 
 class MDDocument
+	
 	safe_attr_accessor :refs, Hash
 	safe_attr_accessor :footnotes, Hash
 	
@@ -141,6 +147,8 @@ class MDDocument
 	# The order in which footnotes are used. Contains the id.
 	safe_attr_accessor :footnotes_order, Array
 	
+	safe_attr_accessor :latex_required_packages, Array
+	
 	def initialize(s=nil)
 		super(:document)
 		@doc       = self
@@ -150,6 +158,7 @@ class MDDocument
 		self.footnotes_order = []
 		self.abbreviations = {}
 		self.ald = {}
+		self.latex_required_packages = []
 		
 		parse_doc(s) if s 
 	end

data/lib/maruku/structures_inspect.rb

@@ -21,7 +21,15 @@
 
 
 class String
-	alias inspect_more inspect
+	def inspect_more(a=nil,b=nil)
+		inspect
+	end
+end
+
+class Object
+	def inspect_more(a=nil,b=nil)
+		inspect
+	end
 end
 
 class Array
@@ -37,8 +45,9 @@ class Array
 end
 
 class Hash
-	def inspect_ordered
-		"{"+map{|k,v| k.inspect + "=>"+v.inspect}.join(',')+"}"
+	def inspect_ordered(a=nil,b=nil)
+		"{"+keys.map{|x|x.to_s}.sort.map{|x|x.to_sym}.
+		map{|k| k.inspect + "=>"+self[k].inspect}.join(',')+"}"
 	end
 end
 

data/lib/maruku/tests/new_parser.rb

@@ -224,7 +224,8 @@ module MaRuKu; module Tests
 		["a<!--", :throw, 'Bad HTML Comment'],
 		["a<!-- ", :throw, 'Bad HTML Comment'],
 
-		["<? <?!--!`3  ?>", [md_server('<?!--!`3')], 'Server directive'],
+		["<?xml <?!--!`3  ?>", [md_xml_instr('xml','<?!--!`3')], 'XML processing instruction'],
+		["<? <?!--!`3  ?>", [md_xml_instr('','<?!--!`3')] ],
 
 		["<? ", :throw, 'Bad Server directive'],
 

data/lib/maruku/version.rb

@@ -19,7 +19,7 @@
 #++
 
 module MaRuKu
-	Version = '0.4.0'
+	Version = '0.4.1'
 	
 	MarukuURL = 'http://maruku.rubyforge.org/'
 	

data/tests/unittest/abbreviations.md

@@ -22,14 +22,14 @@ md_el(:document,[
 		md_el(:abbr,["W3C"],{:title=>"World Wide Web Consortium"},[]),
 		"."
 	]),
-	md_el(:abbr_def,[],{:text=>"Hyper Text Markup Language",:abbr=>"HTML"},[]),
-	md_el(:abbr_def,[],{:text=>"World Wide Web Consortium",:abbr=>"W3C"},[]),
+	md_el(:abbr_def,[],{:abbr=>"HTML",:text=>"Hyper Text Markup Language"},[]),
+	md_el(:abbr_def,[],{:abbr=>"W3C",:text=>"World Wide Web Consortium"},[]),
 	md_par([
 		"Operation ",
 		md_el(:abbr,["Tigra Genesis"],{:title=>nil},[]),
 		" is going well."
 	]),
-	md_el(:abbr_def,[],{:text=>nil,:abbr=>"Tigra Genesis"},[])
+	md_el(:abbr_def,[],{:abbr=>"Tigra Genesis",:text=>nil},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -75,8 +75,8 @@ The HTML specification is maintained by the W3C.Operation Tigra Genesis is going
 
 *** Output of Markdown.pl (parsed) ***
 <p>The HTML specification is maintained by the W3C.</p
-    ><p>*[HTML]: Hyper Text Markup Language
-*[W3C]: World Wide Web Consortium</p
-    ><p>Operation Tigra Genesis is going well.</p
-    ><p>*[Tigra Genesis]:</p
-  >
+   ><p>*[HTML]: Hyper Text Markup Language
+*[W3C]:  World Wide Web Consortium</p
+   ><p>Operation Tigra Genesis is going well.</p
+   ><p>*[Tigra Genesis]:</p
+ >

data/tests/unittest/attributes/attributes.md

@@ -27,7 +27,7 @@ md_el(:document,[
 		md_em(["emphasis"], [[:ref, "hello"], [:ref, "notfound"]]),
 		md_ial([[:ref, "hello"], [:ref, "notfound"]])
 	], [[:id, "par2"]]),
-	md_el(:ald,[],{:ald_id=>"hello",:ald=>[[:class, "chello"]]},[])
+	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"hello"},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -77,13 +77,13 @@ Header with attributesHeader with attributesHeader no attributesParagraph with e
 <p>{hello}: .chello</p>
 
 *** Output of Markdown.pl (parsed) ***
-<h2>Header with attributes {#header1} </h2
-    ><h3>Header with attributes ### {#header2}</h3
-    ><h3>Header no attributes</h3
-    ><p>{warn2}Paragraph with a.
+<h2>Header with attributes  {#header1}  </h2
+   ><h3>Header with attributes ###  {#header2}</h3
+   ><h3>Header no attributes</h3
+   ><p>{warn2}Paragraph with a.
 {#par1}</p
-    ><p>Paragraph with <em>emphasis</em
-      >{hello notfound}
- {#par2}</p
-    ><p>{hello}: .chello</p
-  >
+   ><p>Paragraph with <em>emphasis</em
+     >{hello notfound}
+   {#par2}</p
+   ><p>{hello}: .chello</p
+ >

data/tests/unittest/attributes/circular.md

@@ -13,8 +13,8 @@ Paragraph
 *** Output of inspect ***
 md_el(:document,[
 	md_par(["Paragraph"], [[:ref, "a"]]),
-	md_el(:ald,[],{:ald_id=>"a",:ald=>[[:ref, "b"]]},[]),
-	md_el(:ald,[],{:ald_id=>"b",:ald=>[[:ref, "a"]]},[])
+	md_el(:ald,[],{:ald=>[[:ref, "b"]],:ald_id=>"a"},[]),
+	md_el(:ald,[],{:ald=>[[:ref, "a"]],:ald_id=>"b"},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -46,6 +46,6 @@ Paragraph
 *** Output of Markdown.pl (parsed) ***
 <p>Paragraph
 {a}</p
-    ><p>{a}: b
+   ><p>{a}: b
 {b}: a</p
-  >
+ >

data/tests/unittest/attributes/default.md

@@ -10,7 +10,7 @@ Paragraph2
 *** Output of inspect ***
 md_el(:document,[
 	md_par(["Paragraph2"], [[:id, "2"]]),
-	md_el(:ald,[],{:ald_id=>"paragraph",:ald=>[[:class, "maruku-par"]]},[])
+	md_el(:ald,[],{:ald=>[[:class, "maruku-par"]],:ald_id=>"paragraph"},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -43,5 +43,5 @@ Paragraph2
 *** Output of Markdown.pl (parsed) ***
 <p>Paragraph2 
 {#2}</p
-    ><p>{paragraph}: .maruku-par</p
-  >
+   ><p>{paragraph}: .maruku-par</p
+ >

data/tests/unittest/blank.md

@@ -43,5 +43,5 @@ Linea 1Linea 2
 
 *** Output of Markdown.pl (parsed) ***
 <p>Linea 1</p
-    ><p>Linea 2</p
-  >
+   ><p>Linea 2</p
+ >

data/tests/unittest/blanks_in_code.md

@@ -109,23 +109,23 @@ four
 
 *** Output of Markdown.pl (parsed) ***
 <p>This block is composed of three lines:</p
-    ><pre
-      ><code>one
+   ><pre
+     ><code>one
 
 three
 </code
-    ></pre
-    ><p>This block is composed of 5</p
-    ><pre
-      ><code>one
+   ></pre
+   ><p>This block is composed of 5</p
+   ><pre
+     ><code>one
 
 
 four
 </code
-    ></pre
-    ><p>This block is composed of 2</p
-    ><pre
-      ><code>two
+   ></pre
+   ><p>This block is composed of 2</p
+   ><pre
+     ><code>two
 </code
-    ></pre
-  >
+   ></pre
+ >

data/tests/unittest/code.md

@@ -54,11 +54,11 @@ end tell
 
 *** Output of Markdown.pl (parsed) ***
 <p>Here is an example of AppleScript:</p
-    ><pre
-      ><code>tell application "Foo"
+   ><pre
+     ><code>tell application "Foo"
     beep
 end tell
     tab
 </code
-    ></pre
-  >
+   ></pre
+ >

data/tests/unittest/code2.md

@@ -47,12 +47,13 @@ Code
 
 *** Output of Markdown.pl (parsed) ***
 <blockquote>
- <p>Code</p
-      >
+  <p>Code</p
+     >
+
 <pre
-        ><code>Ciao
+       ><code>Ciao
 </code
-      ></pre
-      >
+     ></pre
+     >
 </blockquote
-  >
+ >

data/tests/unittest/code3.md

@@ -99,23 +99,23 @@ This is code (4 spaces):This is not codeThis is code (1 tab):This is not code
 
 *** Output of Markdown.pl (parsed) ***
 <p>This is code (4 spaces):</p
-    ><pre
-      ><code>Code
+   ><pre
+     ><code>Code
 </code
-    ></pre
-    ><p>This is not code</p
-    ><pre
-      ><code>Code
+   ></pre
+   ><p>This is not code</p
+   ><pre
+     ><code>Code
 </code
-    ></pre
-    ><p>This is code (1 tab):</p
-    ><pre
-      ><code>Code
+   ></pre
+   ><p>This is code (1 tab):</p
+   ><pre
+     ><code>Code
 </code
-    ></pre
-    ><p>This is not code</p
-    ><pre
-      ><code>Code
+   ></pre
+   ><p>This is not code</p
+   ><pre
+     ><code>Code
 </code
-    ></pre
-  >
+   ></pre
+ >

data/tests/unittest/easy.md

@@ -32,7 +32,7 @@ Hello! how are you?
 
 *** Output of Markdown.pl (parsed) ***
 <p
-      ><em>Hello!</em
-      > how are <strong>you</strong
-      >?</p
-  >
+     ><em>Hello!</em
+     > how are <strong>you</strong
+     >?</p
+ >