From 5c51f930b058b209591ab9d99b11d9cd6c747bba Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Sun, 14 Aug 2011 02:16:15 -0500 Subject: [PATCH] Fix another Maruku bbug Image titles were not being output (a long-standing Maruku bug). Also fix some broken specs. All the HTML specs pass. I hope they're "correct". --- vendor/plugins/maruku/lib/maruku/output/to_html.rb | 4 +++- vendor/plugins/maruku/spec/block_docs/images.md | 8 ++++---- vendor/plugins/maruku/spec/block_docs/inline_html.md | 2 +- vendor/plugins/maruku/spec/block_docs/links2.md | 9 ++++----- .../plugins/maruku/spec/block_docs/math/equations.md | 12 ++++++++---- vendor/plugins/maruku/spec/block_docs/math/inline.md | 4 ++-- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/vendor/plugins/maruku/lib/maruku/output/to_html.rb b/vendor/plugins/maruku/lib/maruku/output/to_html.rb index f773ebce..5e8e2959 100644 --- a/vendor/plugins/maruku/lib/maruku/output/to_html.rb +++ b/vendor/plugins/maruku/lib/maruku/output/to_html.rb @@ -764,7 +764,8 @@ of the form `#ff00ff`. url = ref[:url] title = ref[:title] a['src'] = url.to_s - a['alt'] = children_to_s + a['alt'] = children_to_s + a['title'] = title.to_s if title else maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}" tell_user "Could not create image with ref_id = #{id.inspect};"+ @@ -785,6 +786,7 @@ of the form `#ff00ff`. a = create_html_element 'img' a['src'] = url.to_s a['alt'] = children_to_s + a['title'] = title.to_s if title return a end diff --git a/vendor/plugins/maruku/spec/block_docs/images.md b/vendor/plugins/maruku/spec/block_docs/images.md index 1bcb5a84..21b9dd63 100644 --- a/vendor/plugins/maruku/spec/block_docs/images.md +++ b/vendor/plugins/maruku/spec/block_docs/images.md @@ -54,13 +54,13 @@ md_el(:document,[ *** Output of to_html ***

This page does not uilizes Cascading Style Sheets

-

Please mouseover to see the title: Cascading Style Sheets

+

Please mouseover to see the title: Cascading Style Sheets

-

Please mouseover to see the title: Cascading Style Sheets

+

Please mouseover to see the title: Cascading Style Sheets

-

I’ll say it one more time: this page does not use Cascading Style Sheets

+

I’ll say it one more time: this page does not use Cascading Style Sheets

-

This is double size: Cascading Style Sheets

+

This is double size: Cascading Style Sheets

*** Output of to_latex *** This page does not uilizes diff --git a/vendor/plugins/maruku/spec/block_docs/inline_html.md b/vendor/plugins/maruku/spec/block_docs/inline_html.md index 75d03ef1..39d9dd5d 100644 --- a/vendor/plugins/maruku/spec/block_docs/inline_html.md +++ b/vendor/plugins/maruku/spec/block_docs/inline_html.md @@ -59,7 +59,7 @@ md_el(:document,[ md_html(""), md_par(["Without closing:"]), md_html(""), - md_html("
\n\tThis is *true* markdown text (paragraph)\n\n\t

\n\t\tThis is *true* markdown text (no paragraph)\n\t

\n\t

\n\t\tThis is *true* markdown text (block paragraph)\n\t

\n
"), + md_html("
\n This is *true* markdown text (paragraph)\n\n

\n This is *true* markdown text (no paragraph)\n

\n

\n This is *true* markdown text (block paragraph)\n

\n
"), md_html("\n\n\n\n\n
This is a *true* markdown text. (no par)This is *true* markdown text. (par)
") ],{},[]) *** Output of to_html *** diff --git a/vendor/plugins/maruku/spec/block_docs/links2.md b/vendor/plugins/maruku/spec/block_docs/links2.md index 1697cd58..f9e65b13 100644 --- a/vendor/plugins/maruku/spec/block_docs/links2.md +++ b/vendor/plugins/maruku/spec/block_docs/links2.md @@ -2,18 +2,17 @@ Write a comment here *** Parameters: *** {} # params *** Markdown input: *** -See [foo' bar] +See [foo' bar][foo_bar] -[foo' bar]: http://agorf.gr/ +[foo_bar]: http://agorf.gr/ *** Output of inspect *** -md_el(:document,[ - md_par(["See ", md_link(["foo", md_entity("rsquo"), " bar"],"foo_bar")]), +md_el(:document,[ md_par([ "See ", md_link(["foo", md_entity("rsquo"), " bar"],"foo_bar")]), md_ref_def("foo_bar", "http://agorf.gr/", {:title=>nil}) ],{},[]) *** Output of to_html *** -

See foo’ bar

+

See foo’ bar

*** Output of to_latex *** See \href{http://agorf.gr/}{foo'{} bar} *** Output of to_md *** diff --git a/vendor/plugins/maruku/spec/block_docs/math/equations.md b/vendor/plugins/maruku/spec/block_docs/math/equations.md index f5e82659..32c358f7 100644 --- a/vendor/plugins/maruku/spec/block_docs/math/equations.md +++ b/vendor/plugins/maruku/spec/block_docs/math/equations.md @@ -22,10 +22,14 @@ md_el(:document,[ md_el(:equation,[],{:label=>nil,:math=>" x = y \n",:num=>nil},[]) ],{},[]) *** Output of to_html *** -
x = y x = y
x = y -x = y
x = y -x = y
x = y -x = y
+
x = y x = y
x += y +x += y
+x = y +x = y
x = y + +x = y
*** Output of to_latex *** \begin{displaymath} x = y diff --git a/vendor/plugins/maruku/spec/block_docs/math/inline.md b/vendor/plugins/maruku/spec/block_docs/math/inline.md index ecf724b1..e7103b7b 100644 --- a/vendor/plugins/maruku/spec/block_docs/math/inline.md +++ b/vendor/plugins/maruku/spec/block_docs/math/inline.md @@ -22,9 +22,9 @@ md_el(:document,[

Here are some formulas:

That’s it, nothing else is supported.