RedCloth 4.1.1-x86-mswin32-60 → 4.1.9-x86-mswin32-60

data/lib/redcloth/formatters/latex.rb

@@ -14,14 +14,6 @@ module RedCloth::Formatters::LATEX
 
   RedCloth::TextileDoc.send(:include, Settings)
   
-  def escape(text)
-    latex_esc(text)
-  end
-
-  def escape_pre(text)
-    text
-  end
-  
   # headers
   { :h1 => 'section*',
     :h2 => 'subsection*',
@@ -38,7 +30,7 @@ module RedCloth::Formatters::LATEX
   # commands 
   { :strong => 'textbf',
     :em => 'emph',
-    :i  => 'emph',
+    :i  => 'textit',
     :b  => 'textbf',
     :ins => 'underline',
     :del => 'sout',
@@ -102,24 +94,50 @@ module RedCloth::Formatters::LATEX
   end
   
   def td(opts)
-    "\t\t\t#{opts[:text]} &\n"
+    column = @table_row.size
+    if opts[:colspan]
+      opts[:text] = "\\multicolumn{#{opts[:colspan]}}{ #{"l " * opts[:colspan].to_i}}{#{opts[:text]}}"
+    end
+    if opts[:rowspan]
+      @table_multirow_next[column] = opts[:rowspan].to_i - 1
+      opts[:text] = "\\multirow{#{opts[:rowspan]}}{*}{#{opts[:text]}}"
+    end
+    @table_row.push(opts[:text])
+    return ""
   end
   
   def tr_open(opts)
-    "\t\t"
+    @table_row = []
+    return ""
   end
   
   def tr_close(opts)
-    "\t\t\\\\\n"
+    multirow_columns = @table_multirow.find_all {|c,n| n > 0}
+    multirow_columns.each do |c,n|
+      @table_row.insert(c,"")
+      @table_multirow[c] -= 1
+    end
+    @table_multirow.merge!(@table_multirow_next)
+    @table_multirow_next = {}
+    @table.push(@table_row)
+    return ""
   end
   
-  # FIXME: we need to know the column count before opening tabular context.
+  # We need to know the column count before opening tabular context.
   def table_open(opts)
-    "\\begin{align*}\n"
+    @table = []
+    @table_multirow = {}
+    @table_multirow_next = {}
+    return ""
   end
   
   def table_close(opts)
-    "\t\\end{align*}\n"
+    output = "\\begin{tabular}{ #{"l " * @table[0].size }}\n"
+    @table.each do |row|
+      output << "  #{row.join(" & ")} \\\\\n"
+    end
+    output << "\\end{tabular}\n"
+    output
   end
 
   def bc_open(opts)
@@ -222,12 +240,22 @@ module RedCloth::Formatters::LATEX
   end
   
   def dim(opts)
-    space = opts[:space] ? " " : ''
-    "#{opts[:text]}#{space}\\texttimes{}#{space}"
+    opts[:text].gsub!('x', '\times')
+    opts[:text].gsub!('"', "''")
+    period = opts[:text].slice!(/\.$/)
+    "$#{opts[:text]}$#{period}"
   end
   
   private
   
+  def escape(text)
+    latex_esc(text)
+  end
+
+  def escape_pre(text)
+    text
+  end
+  
   # Use this for block level commands that use \begin
   def begin_chunk(type)
     chunk_counter[type] += 1

data/lib/redcloth/textile_doc.rb

@@ -30,9 +30,7 @@ module RedCloth
     # Traditional RedCloth converted single newlines
     # to HTML break tags, but later versions required
     # +:hard_breaks+ be set to enable this behavior.
-    # +:hard_breaks+ is once again the default. The
-    # accessor is deprecated and will be removed in a
-    # future version.
+    # +:hard_breaks+ is once again the default.
     #
     attr_accessor :hard_breaks
 

data/lib/redcloth/version.rb

@@ -2,7 +2,7 @@ module RedCloth
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 1
+    TINY  = 9
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/basic.yml

@@ -164,27 +164,33 @@ name: dimension sign
 desc: The letter 'x' becomes a dimension sign when used between digits.
 in: "Observe: 2x3."
 html: "<p>Observe: 2&#215;3.</p>"
+latex: "Observe: $2\\times3$.\n\n"
 --- 
 name: dimension sign with space after
 in: "The room is 2x3 inches big."
 html: "<p>The room is 2&#215;3 inches big.</p>"
+latex: "The room is $2\\times3$ inches big.\n\n"
 --- 
 name: dimension sign with spaces
 in: "Observe: 2 x 4."
 html: "<p>Observe: 2 &#215; 4.</p>"
+latex: "Observe: $2 \\times 4$.\n\n"
 --- 
 name: dimension signs chained
 in: "Observe: 2x3x4."
 html: "<p>Observe: 2&#215;3&#215;4.</p>"
 lite_mode_html: "Observe: 2&#215;3&#215;4."
+latex: "Observe: $2\\times3\\times4$.\n\n"
 --- 
 name: dimension signs with double primes
 in: 'My mouse: 2.5" x 4".'
 html: '<p>My mouse: 2.5&#8243; &#215; 4&#8243;.</p>'
+latex: "My mouse: $2.5'' \\times 4''$.\n\n"
 --- 
 name: dimension signs with single primes
 in: "My office: 5' x 4.5'."
 html: "<p>My office: 5&#8242; &#215; 4.5&#8242;.</p>"
+latex: "My office: $5' \\times 4.5'$.\n\n"
 --- 
 name: trademark and copyright
 desc: Conversion of trademark and copyright symbols.
@@ -266,7 +272,11 @@ html: <p>Please email why@domain.com or jason@domain.com.</p>
 name: del
 desc: To indicate a passage which has been deleted, surround the passage with hypens.
 in: I'm -sure- not sure.
-html: <p>I&#8217;m <del>sure</del> not sure.</p>
+html: "<p>I&#8217;m <del>sure</del> not sure.</p>"
+--- 
+name: del beginning a phrase
+in: -delete-
+html: "<p><del>delete</del></p>"
 --- 
 name: ins
 desc: Pluses around a passage indicate its insertion.
@@ -915,4 +925,8 @@ in: |-
 html: |-
   <p>Just some <em>_</em> text</p>
   <hr />
-  <p>Some more text.</p>
+  <p>Some more text.</p>
+---
+name: lang attribute cannot contain square brackets
+in: "some @[[code]]@"
+html: "<p>some <code>[[code]]</code></p>"

data/test/code.yml

@@ -96,7 +96,10 @@ in: |-
   <notextile>
   # *test*
 html: |-
-  # *test*
+  <p><notextile></p>
+  <ol>
+  	<li><strong>test</strong></li>
+  </ol>
 valid_html: false
 ---
 name: unfinished script tag
@@ -140,9 +143,7 @@ html: |-
   <pre><code>./foo.pl%
   &lt;p&gt;foo outputs an HTML paragraph&lt;/p&gt;</code>
 
-  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code>
-
-  </pre>
+  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code></pre>
   <p>And then go back with a normal paragraph.</p>
 ---
 name: extended block code preserves leading whitespace after blank line
@@ -167,9 +168,7 @@ html: |-
   <code>    def baz
           'baz'
       end
-  end</code>
-  
-  </pre>
+  end</code></pre>
   <p>That&#8217;s it!</p>
 ---
 name: block code containing code avoids nesting code tags

data/test/html.yml

@@ -308,4 +308,18 @@ name: objects in paragraphs are not modified
 in: |-
   <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
 html: |-
-  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+---
+name: in code escaped properly
+in: "<pre><code>some <b>bold</b> text</code></pre>"
+html: "<pre><code>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: in code with class attribute escaped properly
+in: "<pre><code class='myclass'>some <b>bold</b> text</code></pre>"
+html: "<pre><code class='myclass'>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: notextile beginning the line
+in: |-
+  <notextile><a href="http://a.com">Sir Bobby Robson</a></notextile>, is a famous footballer
+html: |-
+  <p><a href="http://a.com">Sir Bobby Robson</a>, is a famous footballer</p>

data/test/images.yml

@@ -244,3 +244,26 @@ latex: |+
 name: image attributes has single quote html entity in alt and title
 in: "!/pictures/bacon.jpg(The fox said: 'Have some chunky bacon')!"
 html: '<p><img src="/pictures/bacon.jpg" title="The fox said: &#39;Have some chunky bacon&#39;" alt="The fox said: &#39;Have some chunky bacon&#39;" /></p>'
+---
+name: in square brackets
+in:  This is an [!image.jpg!] you see.
+html: <p>This is an <img src="image.jpg" alt="" /> you see.</p>
+---
+name: with link in square brackets
+in:  This is an [!image.jpg!:http://example.com/] you see.
+html: <p>This is an <a href="http://example.com/"><img src="image.jpg" alt="" /></a> you see.</p>
+---
+name: url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" alt="" /></p>
+---
+name: with alt and url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg(a big rock)!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" title="a big rock" alt="a big rock" /></p>
+---
+name: with link that contains parentheses
+in: "!image.jpg(Alt text with (parentheses).)!"
+html: |-
+  <p><img src="image.jpg" title="Alt text with (parentheses)." alt="Alt text with (parentheses)." /></p>

data/test/links.yml

@@ -185,10 +185,14 @@ name: trailing period stays outside link
 in: '"Link":/foo.html.'
 html: "<p><a href=\"/foo.html\">Link</a>.</p>"
 ---
-name: parenthetical statement as a link
+name: whose text is a parenthetical statement
 in: '"(just in case you were wondering)":http://slashdot.org/'
 html: '<p><a href="http://slashdot.org/">(just in case you were wondering)</a></p>'
 ---
+name: that has a class and whose text is a parenthetical statement
+in: '"(myclass) (just in case you were wondering)":http://slashdot.org/'
+html: '<p><a href="http://slashdot.org/" class="myclass">(just in case you were wondering)</a></p>'
+---
 name: link containing parentheses
 in: '"It is (very) fortunate that this works":http://slashdot.org/'
 html: '<p><a href="http://slashdot.org/">It is (very) fortunate that this works</a></p>'
@@ -221,6 +225,22 @@ name: links contained in parentheses
 in: 'This is a regular link (but in parentheses: "Google":http://www.google.com)'
 html: '<p>This is a regular link (but in parentheses: <a href="http://www.google.com">Google</a>)</p>'
 ---
+name: links containing parentheses without brackets
+in: 'This is a link to a "Wikipedia article about Textile":http://en.wikipedia.org/wiki/Textile_(markup_language)'
+html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Textile_(markup_language)">Wikipedia article about Textile</a></p>'
+---
+name: links containing parentheses period at end without brackets
+in: 'This is a link to a "Wikipedia article about Textile":http://en.wikipedia.org/wiki/Textile_(markup_language).'
+html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Textile_(markup_language)">Wikipedia article about Textile</a>.</p>'
+---
+name: broken links containing parentheses without brackets
+in: 'This is a link to a "Wikipedia article about Textile":http://en.wikipedia.org/wiki/Textile_(markup_language'
+html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Textile_(markup_language">Wikipedia article about Textile</a></p>'
+---
+name: links containing parentheses without brackets inside a parenthesis
+in: 'Textile is awesome! (Check out the "Wikipedia article about Textile":http://en.wikipedia.org/wiki/Textile_(markup_language))'
+html: '<p>Textile is awesome! (Check out the <a href="http://en.wikipedia.org/wiki/Textile_(markup_language)">Wikipedia article about Textile</a>)</p>'
+---
 name: quotes and follow link
 in: 'Some "text" followed by a "link":http://redcloth.org.'
 html: '<p>Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.</p>'
@@ -257,3 +277,9 @@ in: |-
   "My wife, Tipper, and I will donate 100% of the proceeds of the award to the "Alliance For Climate Protection":http://www.looktothestars.org/charity/638-alliance-for-climate-protection," said Gore in an email. "I am deeply honored to receive the Nobel Peace Prize."
 html: |-
   <p>&#8220;My wife, Tipper, and I will donate 100% of the proceeds of the award to the <a href="http://www.looktothestars.org/charity/638-alliance-for-climate-protection">Alliance For Climate Protection</a>,&#8221; said Gore in an email. &#8220;I am deeply honored to receive the Nobel Peace Prize.&#8221;</p>
+---
+name: with caps in the title
+in: |-
+  "British Skin Foundation (BSF)":http://www.britishskinfoundation.org.uk
+html: |-
+  <p><a href="http://www.britishskinfoundation.org.uk" title="BSF">British Skin Foundation</a></p>

data/test/lists.yml

@@ -280,4 +280,22 @@ html: |-
   <ul>
   	<li>One</li>
   	<li>Two</li>
-  </ul>
+  </ul>
+---
+name: unordered list with leading spaces
+in: " * notice the leading space\n * RedCloth 3.0.4 used to accept it\n * Now we do too"
+html: |-
+  <ul>
+  	<li>notice the leading space</li>
+  	<li>RedCloth 3.0.4 used to accept it</li>
+  	<li>Now we do too</li>
+  </ul>
+---
+name: ordered list with leading spaces
+in: " # notice the leading space\n # RedCloth 3.0.4 used to accept it\n # Now we do too"
+html: |-
+  <ol>
+  	<li>notice the leading space</li>
+  	<li>RedCloth 3.0.4 used to accept it</li>
+  	<li>Now we do too</li>
+  </ol>

data/test/table.yml

@@ -18,6 +18,13 @@ html: |-
   	</tr>
   </table>
   <h3>A header after the table</h3>
+latex: |+
+  \begin{tabular}{ l l l }
+    a & b & c \\
+    1 & 2 & 3 \\
+  \end{tabular}
+  \subsubsection*{A header after the table}
+  
 ---
 in: |
   |_. a|_. b|_. c|
@@ -56,6 +63,11 @@ html: |-
   		<td>row</td>
   	</tr>
   </table>
+latex: |+
+  \begin{tabular}{ l l l l l }
+    This & is & a & simple & table \\
+    This & is & a & simple & row \\
+  \end{tabular}
 ---
 in: |-
   table{border:1px solid black}.
@@ -144,25 +156,82 @@ html: |-
   </table>
 ---
 in: |-
-  |{background:#ddd}. Cell with gray background|
+  |{background:#ddd}. Cell with gray background|Normal cell|
   |\2. Cell spanning 2 columns|
-  |/3. Cell spanning 3 rows|
-  |>. Right-aligned cell|
+  |/2. Cell spanning 2 rows|one|
+  |two|
+  |>. Right-aligned cell|<. Left-aligned cell|
 html: |-
   <table>
   	<tr>
   		<td style="background:#ddd;">Cell with gray background</td>
+  		<td>Normal cell</td>
   	</tr>
   	<tr>
   		<td colspan="2">Cell spanning 2 columns</td>
   	</tr>
   	<tr>
-  		<td rowspan="3">Cell spanning 3 rows</td>
+  		<td rowspan="2">Cell spanning 2 rows</td>
+  		<td>one</td>
+  	</tr>
+  	<tr>
+  		<td>two</td>
   	</tr>
   	<tr>
   		<td style="text-align:right;">Right-aligned cell</td>
+  		<td style="text-align:left;">Left-aligned cell</td>
+  	</tr>
+  </table>
+latex: |+
+  \begin{tabular}{ l l }
+    Cell with gray background & Normal cell \\
+    \multicolumn{2}{ l l }{Cell spanning 2 columns} \\
+    \multirow{2}{*}{Cell spanning 2 rows} & one \\
+     & two \\
+    Right-aligned cell & Left-aligned cell \\
+  \end{tabular}
+---
+name: row spanning mid-row
+in: |-
+  |1|2|3|
+  |1|/3. 2|3|
+  |1|3|
+  |1|3|
+  |1|2|3|
+html: |-
+  <table>
+  	<tr>
+  		<td>1</td>
+  		<td>2</td>
+  		<td>3</td>
+  	</tr>
+  	<tr>
+  		<td>1</td>
+  		<td rowspan="3">2</td>
+  		<td>3</td>
+  	</tr>
+  	<tr>
+  		<td>1</td>
+  		<td>3</td>
+  	</tr>
+  	<tr>
+  		<td>1</td>
+  		<td>3</td>
+  	</tr>
+  	<tr>
+  		<td>1</td>
+  		<td>2</td>
+  		<td>3</td>
   	</tr>
   </table>
+latex: |+
+  \begin{tabular}{ l l l }
+    1 & 2 & 3 \\
+    1 & \multirow{3}{*}{2} & 3 \\
+    1 &  & 3 \\
+    1 &  & 3 \\
+    1 & 2 & 3 \\
+  \end{tabular}
 ---
 in: |
   {background:#ddd}. |S|Target|Complete|App|Milestone|