maruku 0.4.1 → 0.4.2

data/lib/maruku/output/to_latex.rb

@@ -65,11 +65,11 @@ You have to have these fonts installed -- and this can be a pain.
 
 If `latex_cjk` is specified, this is added to the preamble:
 
-<?mrk md_code_block(Maruku::MDDocument::Latex_preamble_enc_cjk) ?>
+<?mrk md_codeblock(Maruku::MDDocument::Latex_preamble_enc_cjk) ?>
 
 while the default is to add this:
 
-<?mrk md_code_block(Maruku::MDDocument::Latex_preamble_enc_utf8) ?>
+<?mrk md_codeblock(Maruku::MDDocument::Latex_preamble_enc_utf8) ?>
 
 =end
 		encoding = @doc.attributes[:latex_cjk] ? 
@@ -107,13 +107,14 @@ will produce:
 % Packages required by code
 #{required}
 
-#{user_preamble}
-
+% Packages always used
 \\usepackage{hyperref}
 \\usepackage{xspace}
 \\usepackage[usenames,dvipsnames]{color}
 \\usepackage[margin=1in]{geometry}
-\\hypersetup{colorlinks=true}
+\\hypersetup{colorlinks=true,urlcolor=blue}
+
+#{user_preamble}
 
 \\begin{document} 
 #{body}
@@ -316,6 +317,21 @@ Otherwise, a standard `verbatim` environment is used.
 		"#{colorspec}{\\tt #{s}}"
 	end
 
+	def to_latex_immediate_link
+		a =  create_html_element 'a'
+		url = self.url
+		text = url.gsub(/^mailto:/,'') # don't show mailto
+#			gsub('~','$\sim$')
+		text = latex_escape(text)
+		if url[0,1] == '#'
+			url = url[1,url.size]
+			return "\\hyperlink{#{url}}{#{text}}"
+		else
+
+			return "\\href{#{url}}{#{text}}"
+		end
+	end
+
 	def to_latex_im_link
 		url = self.url
 

data/lib/maruku/structures.rb

@@ -48,10 +48,6 @@ 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).

data/lib/maruku/tests/new_parser.rb

@@ -210,6 +210,7 @@ module MaRuKu; module Tests
 		["![a][ imref ]"],
 		["![a][\timref\t]"],
 		
+
 		['<http://example.com/?foo=1&bar=2>', 
 			[md_url('http://example.com/?foo=1&bar=2')], 'Immediate link'],
 			['a<http://example.com/?foo=1&bar=2>b', 
@@ -217,7 +218,8 @@ module MaRuKu; module Tests
 		['<andrea@censi.org>', 
 			[md_email('andrea@censi.org')], 'Email address'],
 		['<mailto:andrea@censi.org>'],
-				
+		["Developmen <http://rubyforge.org/projects/maruku/>",
+			 ["Developmen ", md_url("http://rubyforge.org/projects/maruku/")]],
 		["a<!-- -->b", ['a',md_html('<!-- -->'),'b'], 
 			'HTML Comment'],
 
@@ -258,6 +260,7 @@ module MaRuKu; module Tests
 		["#{Maruku8}", [Maruku8], "Reading UTF-8"],
 		["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", 
 			{:encoding => 'iso-8859-1'}],
+						
 	]
 
 		good_cases = unit_tests_for_attribute_lists + good_cases
@@ -276,10 +279,12 @@ module MaRuKu; module Tests
 			end
 		end
 		
+		
 			
 		@verbose = verbose
 		m = Maruku.new
 		m.attributes[:on_error] = :raise
+		Globals[:debug_keep_ials] = true
 		
 		good_cases.each do |input, expected, comment|
 				output = nil

data/lib/maruku/version.rb

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

data/tests/unittest/attributes/att2.md

@@ -0,0 +1,36 @@
+
+*** Parameters: ***
+{}
+*** Markdown input: ***
+{a}: a
+{:b: a}
+
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:ald,[],{:ald=>[[:ref, "a"]],:ald_id=>"a"},[]),
+	md_el(:ald,[],{:ald=>[[:ref, "a"]],:ald_id=>"b"},[])
+],{},[])
+*** Output of to_html ***
+
+*** Output of to_latex ***
+
+*** Output of to_md ***
+
+*** Output of to_s ***
+
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>{a}: a
+{:b: a}</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p>{a}: a
+{:b: a}</p
+ >

data/tests/unittest/attributes/att3.md

@@ -0,0 +1,55 @@
+IALs can refer to element before or after.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+Paragraph1
+{:#par1}
+
+{:#par2}
+Paragraph2
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["Paragraph1"], [[:id, "par1"]]),
+	md_par(["Paragraph2"], [[:id, "par2"]])
+],{},[])
+*** Output of to_html ***
+
+<p id='par1'>Paragraph1</p>
+
+<p id='par2'>Paragraph2</p>
+
+*** Output of to_latex ***
+Paragraph1
+
+Paragraph2
+
+
+*** Output of to_md ***
+Paragraph1
+
+Paragraph2
+
+
+*** Output of to_s ***
+Paragraph1Paragraph2
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>Paragraph1
+{:#par1}</p>
+
+<p>{:#par2}
+Paragraph2</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p>Paragraph1
+{:#par1}</p
+   ><p>{:#par2}
+Paragraph2</p
+ >

data/tests/unittest/attributes/attributes.md

@@ -10,24 +10,21 @@ Header with attributes	{#header1}
 
 ### Header no attributes ###
 
-{warn2}Paragraph with a.
+{:warn2}Paragraph with a.
 {#par1}
 
 Paragraph with *emphasis*{hello notfound}
    {#par2}
 
-{hello}: .chello
+{:hello: .chello}
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:header,["Header with attributes"],{:level=>2},[[:id, "header1"]]),
 	md_el(:header,["Header with attributes"],{:level=>3},[[:id, "header2"]]),
-	md_el(:header,["Header no attributes"],{:level=>3},[[:id, "par1"]]),
-	md_par([
-		"Paragraph with ",
-		md_em(["emphasis"], [[:ref, "hello"], [:ref, "notfound"]]),
-		md_ial([[:ref, "hello"], [:ref, "notfound"]])
-	], [[:id, "par2"]]),
-	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"hello"},[])
+	md_el(:header,["Header no attributes"],{:level=>3},[]),
+	md_par(["Paragraph with a."], [[:id, "par1"]]),
+	md_par(["Paragraph with ", md_em(["emphasis"])], [[:id, "par2"]]),
+	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"o"},[])
 ],{},[])
 *** Output of to_html ***
 
@@ -35,24 +32,32 @@ md_el(:document,[
 
 <h3 id='header2'>Header with attributes</h3>
 
-<h3 id='par1'>Header no attributes</h3>
+<h3 id='header_no_attributes'>Header no attributes</h3>
 
-<p id='par2'>Paragraph with <em class='chello'>emphasis</em></p>
+<p id='par1'>Paragraph with a.</p>
+
+<p id='par2'>Paragraph with <em>emphasis</em></p>
 
 *** Output of to_latex ***
 \hypertarget{header1}{}\subsection*{{Header with attributes}}\label{header1}
 
 \hypertarget{header2}{}\subsubsection*{{Header with attributes}}\label{header2}
 
-\hypertarget{par1}{}\subsubsection*{{Header no attributes}}\label{par1}
+\hypertarget{header_no_attributes}{}\subsubsection*{{Header no attributes}}\label{header_no_attributes}
+
+Paragraph with a.
 
 Paragraph with {\em emphasis}
 
 
 *** Output of to_md ***
-Header with attributesHeader with attributesHeader no attributesParagraph with emphasis
+Header with attributesHeader with attributesHeader no attributesParagraph with a.
+
+Paragraph with emphasis
+
+
 *** Output of to_s ***
-Header with attributesHeader with attributesHeader no attributesParagraph with emphasis
+Header with attributesHeader with attributesHeader no attributesParagraph with a.Paragraph with emphasis
 *** EOF ***
 
 
@@ -68,22 +73,22 @@ Header with attributesHeader with attributesHeader no attributesParagraph with e
 
 <h3>Header no attributes</h3>
 
-<p>{warn2}Paragraph with a.
+<p>{:warn2}Paragraph with a.
 {#par1}</p>
 
 <p>Paragraph with <em>emphasis</em>{hello notfound}
    {#par2}</p>
 
-<p>{hello}: .chello</p>
+<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.
+   ><p>{:warn2}Paragraph with a.
 {#par1}</p
    ><p>Paragraph with <em>emphasis</em
      >{hello notfound}
    {#par2}</p
-   ><p>{hello}: .chello</p
+   ><p>{:hello: .chello}</p
  >

data/tests/unittest/attributes/circular.md

@@ -4,11 +4,11 @@
 *** Markdown input: ***
 
 Paragraph
-{a}
+{:a}
 
 
-{a}: b
-{b}: a
+{:a: b}
+{:b: a}
 
 *** Output of inspect ***
 md_el(:document,[
@@ -38,14 +38,14 @@ Paragraph
 
 *** Output of Markdown.pl ***
 <p>Paragraph
-{a}</p>
+{:a}</p>
 
-<p>{a}: b
-{b}: a</p>
+<p>{:a: b}
+{:b: a}</p>
 
 *** Output of Markdown.pl (parsed) ***
 <p>Paragraph
-{a}</p
-   ><p>{a}: b
-{b}: a</p
+{:a}</p
+   ><p>{:a: b}
+{:b: a}</p
  >

data/tests/unittest/email.md

@@ -33,9 +33,9 @@ This is an email address:
 
 
 *** Output of Markdown.pl ***
-<p>This is an email address: <a href="&#109;&#x61;&#x69;&#x6C;&#116;&#x6F;:a&#x6E;&#100;&#114;&#x65;a&#64;&#105;&#x6E;&#x76;&#x61;&#108;&#x69;&#100;&#46;&#105;&#116;">a&#x6E;&#100;&#114;&#x65;a&#64;&#105;&#x6E;&#x76;&#x61;&#108;&#x69;&#100;&#46;&#105;&#116;</a></p>
+<p>This is an email address: <a href="m&#x61;&#105;&#x6C;&#x74;o:&#97;&#x6E;&#x64;&#114;&#x65;&#97;&#64;&#x69;&#x6E;&#118;&#97;l&#x69;&#x64;.&#x69;&#x74;">&#97;&#x6E;&#x64;&#114;&#x65;&#97;&#64;&#x69;&#x6E;&#118;&#97;l&#x69;&#x64;.&#x69;&#x74;</a></p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>This is an email address: <a href='&amp;#109;&amp;#x61;&amp;#x69;&amp;#x6C;&amp;#116;&amp;#x6F;:a&amp;#x6E;&amp;#100;&amp;#114;&amp;#x65;a&amp;#64;&amp;#105;&amp;#x6E;&amp;#x76;&amp;#x61;&amp;#108;&amp;#x69;&amp;#100;&amp;#46;&amp;#105;&amp;#116;'>a&#x6E;&#100;&#114;&#x65;a&#64;&#105;&#x6E;&#x76;&#x61;&#108;&#x69;&#100;&#46;&#105;&#116;</a
+<p>This is an email address: <a href='m&amp;#x61;&amp;#105;&amp;#x6C;&amp;#x74;o:&amp;#97;&amp;#x6E;&amp;#x64;&amp;#114;&amp;#x65;&amp;#97;&amp;#64;&amp;#x69;&amp;#x6E;&amp;#118;&amp;#97;l&amp;#x69;&amp;#x64;.&amp;#x69;&amp;#x74;'>&#97;&#x6E;&#x64;&#114;&#x65;&#97;&#64;&#x69;&#x6E;&#118;&#97;l&#x69;&#x64;.&#x69;&#x74;</a
    ></p
  >

data/tests/unittest/links.md

@@ -113,7 +113,7 @@ Inline with title: \href{http://google.com}{Google images}
 
 Inline with title: \href{http://google.com}{Google images}
 
-Search on  or  or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com.
+Search on \href{http://www.gogole.com}{\char104\char116\char116\char112\char58\char47\char47\char119\char119\char119\char46\char103\char111\char103\char111\char108\char101\char46\char99\char111\char109} or \href{http://Here.com}{\char104\char116\char116\char112\char58\char47\char47\char72\char101\char114\char101\char46\char99\char111\char109} or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com.
 
 If all else fails, ask \href{http://www.google.com}{Google}
 
@@ -168,7 +168,7 @@ Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google
 
 <p>Inline with title: <a href="http://google.com  "Title"">Google images</a></p>
 
-<p>Search on <a href="http://www.gogole.com">http://www.gogole.com</a> or <a href="http://Here.com">http://Here.com</a> or ask <a href="&#109;&#97;&#105;&#x6C;&#x74;&#x6F;:&#x62;&#105;&#108;&#108;&#64;&#x67;&#111;&#111;&#103;&#x6C;&#x65;&#x2E;&#99;&#111;&#109;">&#x62;&#105;&#108;&#108;&#64;&#x67;&#111;&#111;&#103;&#x6C;&#x65;&#x2E;&#99;&#111;&#109;</a>
+<p>Search on <a href="http://www.gogole.com">http://www.gogole.com</a> or <a href="http://Here.com">http://Here.com</a> or ask <a href="&#109;&#x61;&#105;&#x6C;t&#111;:&#98;&#x69;&#108;&#108;&#64;&#103;&#x6F;&#x6F;g&#108;&#101;&#46;&#99;&#x6F;&#x6D;">&#98;&#x69;&#108;&#108;&#64;&#103;&#x6F;&#x6F;g&#108;&#101;&#46;&#99;&#x6F;&#x6D;</a>
 or you might ask bill@google.com.</p>
 
 <p>If all else fails, ask <a href="http://www.google.com">Google</a></p>

data/tests/unittest/misc_sw.md

@@ -1,6 +1,6 @@
 Write a comment abouth the test here.
 *** Parameters: ***
-{:subject_short=>"painless software", :order=>"-9.5", :date=>"Nov 20 2006", :subject=>"Software not painful to use", :topic=>"/misc/coolsw", :archive=>false, :inmenu=>true}
+{:date=>"Nov 20 2006", :subject=>"Software not painful to use", :archive=>false, :inmenu=>true, :subject_short=>"painless software", :topic=>"/misc/coolsw", :order=>"-9.5"}
 *** Markdown input: ***
 Subject: Software not painful to use
 Subject_short: painless software

data/tests/unittest/syntax_hl.md

@@ -10,10 +10,8 @@ This is ruby code:
 
 This is ruby code:
 
-
-
 	require 'maruku'
-{lang=ruby html_use_syntax}
+{: lang=ruby html_use_syntax}
 	
 	puts Maruku.new($stdin).to_html
 *** Output of inspect ***
@@ -74,7 +72,7 @@ puts Maruku.new($stdin).to_html
 <pre><code>require 'maruku'
 </code></pre>
 
-<p>{lang=ruby html<em>use</em>syntax}</p>
+<p>{: lang=ruby html<em>use</em>syntax}</p>
 
 <pre><code>puts Maruku.new($stdin).to_html
 </code></pre>
@@ -92,7 +90,7 @@ puts Maruku.new($stdin).to_html
      ><code>require 'maruku'
 </code
    ></pre
-   ><p>{lang=ruby html<em>use</em
+   ><p>{: lang=ruby html<em>use</em
      >syntax}</p
    ><pre
      ><code>puts Maruku.new($stdin).to_html

data/tests/unittest/xml_instruction.md

@@ -31,8 +31,7 @@ md_el(:document,[
 	]),
 	md_par([
 		"Inside: ",
-		md_el(:xml_instr,[],{:code=>"puts \"Inside: Hello\"",:target=>""},[[:ref, "exec"]]),
-		md_ial([[:ref, "exec"]]),
+		md_el(:xml_instr,[],{:code=>"puts \"Inside: Hello\"",:target=>""},[]),
 		" last"
 	])
 ],{},[])

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: maruku
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2007-01-08
+  version: 0.4.2
+date: 2007-01-11
 summary: A Markdown interpreter in Ruby
 require_paths: 
   - lib
@@ -62,7 +62,9 @@ files:
   - docs/markdown_syntax.md
   - docs/maruku.md
   - docs/proposal.md
+  - docs/char.html
   - docs/entity_test.html
+  - docs/exd.html
   - docs/index.html
   - docs/markdown_syntax.html
   - docs/maruku.html
@@ -136,6 +138,8 @@ files:
   - tests/unittest/test.md
   - tests/unittest/wrapping.md
   - tests/unittest/xml_instruction.md
+  - tests/unittest/attributes/att2.md
+  - tests/unittest/attributes/att3.md
   - tests/unittest/attributes/attributes.md
   - tests/unittest/attributes/circular.md
   - tests/unittest/attributes/default.md