maruku 0.2.7 → 0.2.8

data/docs/maruku.md

@@ -484,7 +484,7 @@ So the idea is:
   1. Opening brace `{`.
   2. Any string that does not contain the sequence `}@`.
   3. Closing brace and at-symbol `}@`.
-  4 Attributes specification like the block-level metadata.
+  4. Attributes specification like the block-level metadata.
 
 Other examples:
 

data/lib/maruku/parse_block.rb

@@ -421,14 +421,19 @@ class Maruku
 			lines << strip_indent(shift_line, 4)
 		end
 		
-		while lines.last && (line_node_type(lines.last) == :empty )
+		#while lines.last && (line_node_type(lines.last) == :empty )
+		while lines.last && lines.last.strip.size == 0
 			lines.pop 
 		end
 		
 		return nil if lines.empty?
+
+		source = lines.join("\n")
+		# ignore trailing lines 
+		source = source.gsub(/\n*$/,'')
 		
 #		dbg_describe_ary(lines, 'CODE')
-		e.meta[:raw_code] = lines.join("\n")
+		e.meta[:raw_code] = source
 		e
 	end
 

data/lib/maruku/to_html.rb

@@ -253,37 +253,28 @@ class MDElement
 		
 		element = 
 		if use_syntax && lang
-			convertor = Syntax::Convertors::HTML.for_syntax lang
-			html = convertor.convert( source )
+			begin
+				convertor = Syntax::Convertors::HTML.for_syntax lang
+				html = convertor.convert( source )
 			
-			show_spaces = get_setting(:code_show_spaces) 
-			if show_spaces
-				s.gsub!(/\t/,'»'+' '*3)
-				s.gsub!(/ /,'¬')
-			end
-			
-#			puts "html: #{html}"
-			pre = Document.new(html, {:respect_whitespace =>:all}).root
-			pre.attributes['class'] = lang
-#			puts "After: #{pre}"
-			pre
-		else
-			pre = Element.new 'pre'
-			s = source
+				show_spaces = get_setting(:code_show_spaces) 
+				if show_spaces
+					s.gsub!(/\t/,'»'+' '*3)
+					s.gsub!(/ /,'¬')
+				end
 			
-			s  = s.gsub(/&/,'&')
-			s = Text.normalize(s)
-
-			show_spaces = get_setting(:code_show_spaces) 
-			if show_spaces
-				s.gsub!(/\t/,'»'+' '*3)
-				s.gsub!(/ /,'¬')
+				pre = Document.new(html, {:respect_whitespace =>:all}).root
+				pre.attributes['class'] = lang
+				pre
+			rescue Object => e
+				$stderr.puts "Error while using the syntax library for code:\n#{source.inspect}"
+				$stderr.puts "Lang is #{lang} object is: "
+				$stderr.puts @meta.inspect
+				$stderr.puts "Exception: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+				to_html_code_using_pre(source)
 			end
-
-			text = Text.new(s, true, nil, false )
-			
-			pre << text
-			pre
+		else
+			to_html_code_using_pre(source)
 		end
 		
 		color = get_setting(:code_background_color,DEFAULT_CODE_COLOR)
@@ -292,6 +283,25 @@ class MDElement
 		end
 		element
 	end
+	
+	def to_html_code_using_pre(source)
+		pre = Element.new 'pre'
+		s = source
+		
+		s  = s.gsub(/&/,'&amp;')
+		s = Text.normalize(s)
+
+		show_spaces = get_setting(:code_show_spaces) 
+		if show_spaces
+			s.gsub!(/\t/,'&raquo;'+'&nbsp;'*3)
+			s.gsub!(/ /,'&not;')
+		end
+
+		text = Text.new(s, true, nil, false )
+		
+		pre << text
+		pre
+	end
 
 	def to_html_inline_code; 
 		pre = Element.new 'tt'

data/lib/maruku/version.rb

@@ -1,6 +1,6 @@
 
 class Maruku
-	Version = '0.2.7'
+	Version = '0.2.8'
 	
 	MarukuURL = 'http://maruku.rubyforge.org/'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.9.0
 specification_version: 1
 name: maruku
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
-date: 2006-12-27
+  version: 0.2.8
+date: 2006-12-27 00:00:00 +01:00
 summary: A Markdown interpreter in Ruby
 require_paths: 
-  - lib
+- lib
 email: andrea@rubyforge.org
 homepage: http://maruku.rubyforge.org
 rubyforge_project: 
@@ -18,75 +18,81 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
-  - Andrea Censi
+- Andrea Censi
 files: 
-  - lib/maruku.rb
-  - lib/maruku/parse_block.rb
-  - lib/maruku/parse_span.rb
-  - lib/maruku/string_utils.rb
-  - lib/maruku/structures.rb
-  - lib/maruku/to_html.rb
-  - lib/maruku/to_latex.rb
-  - lib/maruku/to_latex_strings.rb
-  - lib/maruku/to_s.rb
-  - lib/maruku/toc.rb
-  - lib/maruku/version.rb
-  - docs/markdown_syntax.md
-  - docs/maruku.md
-  - docs/todo.md
-  - tests/abbreviations.md
-  - tests/blank.md
-  - tests/code.md
-  - tests/code2.md
-  - tests/code3.md
-  - tests/email.md
-  - tests/entities.md
-  - tests/escaping.md
-  - tests/extra_dl.md
-  - tests/extra_header_id.md
-  - tests/extra_table1.md
-  - tests/footnotes.md
-  - tests/headers.md
-  - tests/hrule.md
-  - tests/images.md
-  - tests/inline_html.md
-  - tests/links.md
-  - tests/list1.md
-  - tests/list2.md
-  - tests/list3.md
-  - tests/lists.md
-  - tests/lists_ol.md
-  - tests/misc_sw.md
-  - tests/one.md
-  - tests/paragraphs.md
-  - tests/sss06.md
-  - tests/test.md
-  - tests/bugs/code_in_links.md
-  - bin/maruku
-  - bin/marutex
+- lib/maruku.rb
+- lib/maruku/parse_block.rb
+- lib/maruku/parse_span.rb
+- lib/maruku/string_utils.rb
+- lib/maruku/structures.rb
+- lib/maruku/to_html.rb
+- lib/maruku/to_latex.rb
+- lib/maruku/to_latex_strings.rb
+- lib/maruku/to_s.rb
+- lib/maruku/toc.rb
+- lib/maruku/version.rb
+- docs/markdown_syntax.md
+- docs/maruku.md
+- docs/todo.md
+- tests/abbreviations.md
+- tests/blank.md
+- tests/code.md
+- tests/code2.md
+- tests/code3.md
+- tests/email.md
+- tests/entities.md
+- tests/escaping.md
+- tests/extra_dl.md
+- tests/extra_header_id.md
+- tests/extra_table1.md
+- tests/footnotes.md
+- tests/headers.md
+- tests/hrule.md
+- tests/images.md
+- tests/inline_html.md
+- tests/links.md
+- tests/list1.md
+- tests/list2.md
+- tests/list3.md
+- tests/lists.md
+- tests/lists_ol.md
+- tests/misc_sw.md
+- tests/one.md
+- tests/paragraphs.md
+- tests/sss06.md
+- tests/test.md
+- tests/bugs/code_in_links.md
+- bin/maruku
+- bin/marutex
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: 
-  - maruku
-  - marutex
+- maruku
+- marutex
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: syntax
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: syntax
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: