ronn 0.4.1 → 0.5

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake/clean'
+require 'date'
 
 task :default => :test
 
@@ -51,12 +52,6 @@ if defined?(Gem)
     mv File.basename(f.name), f.name
   end
 
-  file 'pkg/ron-0.4.gem' => %w[pkg/ ron.gemspec] do |f|
-    sh "gem build ron.gemspec"
-    mv 'ron-0.4.gem', f.name
-  end
-  task :package => 'pkg/ron-0.4.gem'
-
   file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
     sh <<-SH
       git archive --prefix=ronn-#{source_version}/ --format=tar HEAD |

data/lib/ronn.rb

@@ -3,7 +3,7 @@
 # install standard UNIX roff(7) formatted manpages or to generate
 # beautiful HTML manpages.
 module Ronn
-  VERSION = '0.4.1'
+  VERSION = '0.5'
 
   require 'ronn/document'
   require 'ronn/roff'

data/lib/ronn/roff.rb

@@ -12,7 +12,7 @@ module Ronn
     end
 
     def to_s
-      @buf.join.gsub(/\s+$/, '')
+      @buf.join.gsub(/[ \t]+$/, '')
     end
 
   protected
@@ -24,6 +24,17 @@ module Ronn
       end
     end
 
+    def child_of?(node, tag)
+      while node
+        if node.name && node.name.downcase == tag
+          return true
+        else
+          node = node.parent
+        end
+      end
+      false
+    end
+
     def title_heading(name, section, tagline, manual, version, date)
       comment "generated with Ronn/v#{Ronn::VERSION}"
       comment "http://github.com/rtomayko/ronn/"
@@ -63,7 +74,7 @@ module Ronn
           macro "IP", %w["" 4] if indent
           macro "nf"
           write "\n"
-          inline_filter(node.search('code > *'))
+          inline_filter(node.children)
           macro "fi"
           macro "IP", %w["" 0] if indent
 
@@ -118,7 +129,9 @@ module Ronn
         prev = previous(node)
         text = node.to_html.dup
         text.sub!(/^\n+/m, '') if prev && prev.name == 'br'
-        if node.previous.nil? && node.next
+        if child_of?(node, 'pre')
+          # leave the text alone
+        elsif node.previous.nil? && node.next.nil?
           text.sub!(/\n+$/m, '')
         else
           text.sub!(/\n+$/m, ' ')
@@ -128,9 +141,13 @@ module Ronn
       elsif node.elem?
         case node.name
         when 'code'
-          write '\fB'
-          inline_filter(node.children)
-          write '\fR'
+          if child_of?(node, 'pre')
+            inline_filter(node.children)
+          else
+            write '\fB'
+            inline_filter(node.children)
+            write '\fR'
+          end
 
         when 'b', 'strong', 'kbd', 'samp'
           write '\fB'
@@ -167,6 +184,8 @@ module Ronn
         gsub(' ', ' ').
         gsub('&lt;',   '<').
         gsub('&gt;',   '>').
+        gsub(/&#x([0-9A-Fa-f]+);/) { $1.to_i(16).chr }.
+        gsub(/&#(\d+);/)           { $1.to_i.chr }.
         gsub('&amp;',  '&')
     end
 

data/man/markdown.5

@@ -1,4 +1,4 @@
-.\" generated with Ronn/v0.3
+.\" generated with Ronn/v0.4.2
 .\" http://github.com/rtomayko/ronn/
 .
 .TH "MARKDOWN" "5" "March 2010" "Ryan Tomayko" "Ronn Manual"
@@ -9,22 +9,30 @@
 .SH "SYNOPSIS"
 .
 .nf
+
 # Header 1 #
 ## Header 2 ##
 ### Header 3 ###             (Hashes on right are optional)
 #### Header 4 ####
 ##### Header 5 #####
+
 This is a paragraph, which is text surrounded by whitespace.
 Paragraphs can be on one line (or many), and can drone on for
 hours.
+
 [Reference style links][1] and [inline links](http://example.com)
 [1]: http://example.com "Title is optional"
+
 Inline markup like _italics_,  **bold**, and `code()`.
+
 ![picture alt](/images/photo.jpeg "Title is optional")
+
 > Blockquotes are like quoted text in email replies
 >> And, they can be nested
+
     code blocks are for preformatted
     text and must be indented with four spaces
+
 * Bullet lists are easy too
   * You can
   * even
@@ -87,12 +95,15 @@ For example, to add an HTML table to a Markdown article:
 .IP "" 4
 .
 .nf
+
 This is a regular paragraph.
+
 <table>
     <tr>
         <td>Foo</td>
     </tr>
 </table>
+
 This is another regular paragraph.
 .
 .fi
@@ -129,6 +140,7 @@ escape ampersands within URLs. Thus, if you want to link to:
 .IP "" 4
 .
 .nf
+
 http://images.google.com/images?num=30&q=larry+bird
 .
 .fi
@@ -141,6 +153,7 @@ you need to encode the URL as:
 .IP "" 4
 .
 .nf
+
 http://images.google.com/images?num=30&amp;q=larry+bird
 .
 .fi
@@ -164,6 +177,7 @@ So, if you want to include a copyright symbol in your article, you can write:
 .IP "" 4
 .
 .nf
+
 &copy;
 .
 .fi
@@ -176,6 +190,7 @@ and Markdown will leave it alone. But if you write:
 .IP "" 4
 .
 .nf
+
 AT&T
 .
 .fi
@@ -188,6 +203,7 @@ Markdown will translate it to:
 .IP "" 4
 .
 .nf
+
 AT&amp;T
 .
 .fi
@@ -202,6 +218,7 @@ such. But if you write:
 .IP "" 4
 .
 .nf
+
 4 < 5
 .
 .fi
@@ -214,6 +231,7 @@ Markdown will translate it to:
 .IP "" 4
 .
 .nf
+
 4 &lt; 5
 .
 .fi
@@ -262,8 +280,10 @@ headers) and dashes (for second\-level headers). For example:
 .IP "" 4
 .
 .nf
+
 This is an H1
 =============
+
 This is an H2
 \-\-\-\-\-\-\-\-\-\-\-\-\-
 .
@@ -281,8 +301,11 @@ corresponding to header levels 1\-6. For example:
 .IP "" 4
 .
 .nf
+
 # This is an H1
+
 ## This is an H2
+
 ###### This is an H6
 .
 .fi
@@ -299,8 +322,11 @@ determines the header level.) :
 .IP "" 4
 .
 .nf
+
 # This is an H1 #
+
 ## This is an H2 ##
+
 ### This is an H3 ######
 .
 .fi
@@ -316,6 +342,7 @@ wrap the text and put a \fB>\fR before every line:
 .IP "" 4
 .
 .nf
+
 > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
 > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
 > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
@@ -334,9 +361,11 @@ line of a hard\-wrapped paragraph:
 .IP "" 4
 .
 .nf
+
 > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
 consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
 Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+
 > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus adipiscing.
 .
@@ -351,6 +380,7 @@ adding additional levels of \fB>\fR:
 .IP "" 4
 .
 .nf
+
 > This is the first level of quoting.
 >
 > > This is nested blockquote.
@@ -368,6 +398,7 @@ and code blocks:
 .IP "" 4
 .
 .nf
+
 > ## This is a header.
 >
 > 1.   This is the first list item.
@@ -396,6 +427,7 @@ Unordered lists use asterisks, pluses, and hyphens \-\- interchangably
 .IP "" 4
 .
 .nf
+
 *   Red
 *   Green
 *   Blue
@@ -410,6 +442,7 @@ is equivalent to:
 .IP "" 4
 .
 .nf
+
 +   Red
 +   Green
 +   Blue
@@ -424,6 +457,7 @@ and:
 .IP "" 4
 .
 .nf
+
 \-   Red
 \-   Green
 \-   Blue
@@ -438,6 +472,7 @@ Ordered lists use numbers followed by periods:
 .IP "" 4
 .
 .nf
+
 1.  Bird
 2.  McHale
 3.  Parish
@@ -454,6 +489,7 @@ Markdown produces from the above list is:
 .IP "" 4
 .
 .nf
+
 <ol>
 <li>Bird</li>
 <li>McHale</li>
@@ -470,6 +506,7 @@ If you instead wrote the list in Markdown like this:
 .IP "" 4
 .
 .nf
+
 1.  Bird
 1.  McHale
 1.  Parish
@@ -484,6 +521,7 @@ or even:
 .IP "" 4
 .
 .nf
+
 3. Bird
 1. McHale
 8. Parish
@@ -514,6 +552,7 @@ To make lists look nice, you can wrap items with hanging indents:
 .IP "" 4
 .
 .nf
+
 *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
     Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
     viverra nec, fringilla in, laoreet vitae, risus.
@@ -530,6 +569,7 @@ But if you want to be lazy, you don't have to:
 .IP "" 4
 .
 .nf
+
 *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
 viverra nec, fringilla in, laoreet vitae, risus.
@@ -547,6 +587,7 @@ items in \fB<p>\fR tags in the HTML output. For example, this input:
 .IP "" 4
 .
 .nf
+
 *   Bird
 *   Magic
 .
@@ -560,6 +601,7 @@ will turn into:
 .IP "" 4
 .
 .nf
+
 <ul>
 <li>Bird</li>
 <li>Magic</li>
@@ -575,7 +617,9 @@ But this:
 .IP "" 4
 .
 .nf
+
 *   Bird
+
 *   Magic
 .
 .fi
@@ -588,6 +632,7 @@ will turn into:
 .IP "" 4
 .
 .nf
+
 <ul>
 <li><p>Bird</p></li>
 <li><p>Magic</p></li>
@@ -605,12 +650,15 @@ or one tab:
 .IP "" 4
 .
 .nf
+
 1.  This is a list item with two paragraphs. Lorem ipsum dolor
     sit amet, consectetuer adipiscing elit. Aliquam hendrerit
     mi posuere lectus.
+
     Vestibulum enim wisi, viverra nec, fringilla in, laoreet
     vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
     sit amet velit.
+
 2.  Suspendisse id sem consectetuer libero luctus adipiscing.
 .
 .fi
@@ -625,10 +673,13 @@ lazy:
 .IP "" 4
 .
 .nf
+
 *   This is a list item with two paragraphs.
+
     This is the second paragraph in the list item. You're
 only required to indent the first line. Lorem ipsum dolor
 sit amet, consectetuer adipiscing elit.
+
 *   Another item in the same list.
 .
 .fi
@@ -642,7 +693,9 @@ delimiters need to be indented:
 .IP "" 4
 .
 .nf
+
 *   A list item with a blockquote:
+
     > This is a blockquote
     > inside a list item.
 .
@@ -657,7 +710,9 @@ to be indented \fItwice\fR \-\- 8 spaces or two tabs:
 .IP "" 4
 .
 .nf
+
 *   A list item with a code block:
+
         <code goes here>
 .
 .fi
@@ -671,6 +726,7 @@ accident, by writing something like this:
 .IP "" 4
 .
 .nf
+
 1986. What a great season.
 .
 .fi
@@ -684,6 +740,7 @@ line. To avoid this, you can backslash\-escape the period:
 .IP "" 4
 .
 .nf
+
 1986\\. What a great season.
 .
 .fi
@@ -703,7 +760,9 @@ block by at least 4 spaces or 1 tab. For example, given this input:
 .IP "" 4
 .
 .nf
+
 This is a normal paragraph:
+
     This is a code block.
 .
 .fi
@@ -716,7 +775,9 @@ Markdown will generate:
 .IP "" 4
 .
 .nf
+
 <p>This is a normal paragraph:</p>
+
 <pre><code>This is a code block.
 </code></pre>
 .
@@ -731,7 +792,9 @@ line of the code block. For example, this:
 .IP "" 4
 .
 .nf
+
 Here is an example of AppleScript:
+
     tell application "Foo"
         beep
     end tell
@@ -746,7 +809,9 @@ will turn into:
 .IP "" 4
 .
 .nf
+
 <p>Here is an example of AppleScript:</p>
+
 <pre><code>tell application "Foo"
     beep
 end tell
@@ -770,6 +835,7 @@ ampersands and angle brackets. For example, this:
 .IP "" 4
 .
 .nf
+
     <div class="footer">
         &copy; 2004 Foo Corporation
     </div>
@@ -784,6 +850,7 @@ will turn into:
 .IP "" 4
 .
 .nf
+
 <pre><code>&lt;div class="footer"&gt;
     &amp;copy; 2004 Foo Corporation
 &lt;/div&gt;
@@ -807,10 +874,15 @@ following lines will produce a horizontal rule:
 .IP "" 4
 .
 .nf
+
 * * *
+
 ***
+
 *****
+
 \- \- \-
+
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 .
 .fi
@@ -834,7 +906,9 @@ title for the link, surrounded in quotes. For example:
 .IP "" 4
 .
 .nf
+
 This is [an example](http://example.com/ "Title") inline link.
+
 [This link](http://example.net/) has no title attribute.
 .
 .fi
@@ -847,8 +921,10 @@ Will produce:
 .IP "" 4
 .
 .nf
+
 <p>This is <a href="http://example.com/" title="Title">
 an example</a> inline link.</p>
+
 <p><a href="http://example.net/">This link</a> has no
 title attribute.</p>
 .
@@ -863,6 +939,7 @@ use relative paths:
 .IP "" 4
 .
 .nf
+
 See my [About](/about/) page for details.
 .
 .fi
@@ -876,6 +953,7 @@ which you place a label of your choosing to identify the link:
 .IP "" 4
 .
 .nf
+
 This is [an example][id] reference\-style link.
 .
 .fi
@@ -888,6 +966,7 @@ You can optionally use a space to separate the sets of brackets:
 .IP "" 4
 .
 .nf
+
 This is [an example] [id] reference\-style link.
 .
 .fi
@@ -901,6 +980,7 @@ on a line by itself:
 .IP "" 4
 .
 .nf
+
 [id]: http://example.com/  "Optional Title Here"
 .
 .fi
@@ -935,6 +1015,7 @@ The following three link definitions are equivalent:
 .IP "" 4
 .
 .nf
+
 [foo]: http://example.com/  "Optional Title Here"
 [foo]: http://example.com/  'Optional Title Here'
 [foo]: http://example.com/  (Optional Title Here)
@@ -953,6 +1034,7 @@ The link URL may, optionally, be surrounded by angle brackets:
 .IP "" 4
 .
 .nf
+
 [id]: <http://example.com/>  "Optional Title Here"
 .
 .fi
@@ -966,6 +1048,7 @@ or tabs for padding, which tends to look better with longer URLs:
 .IP "" 4
 .
 .nf
+
 [id]: http://example.com/longish/path/to/resource/here
     "Optional Title Here"
 .
@@ -985,6 +1068,7 @@ links:
 .IP "" 4
 .
 .nf
+
 [link text][a]
 [link text][A]
 .
@@ -1004,6 +1088,7 @@ Just use an empty set of square brackets \-\- e.g., to link the word
 .IP "" 4
 .
 .nf
+
 [Google][]
 .
 .fi
@@ -1016,6 +1101,7 @@ And then define the link:
 .IP "" 4
 .
 .nf
+
 [Google]: http://google.com/
 .
 .fi
@@ -1029,6 +1115,7 @@ multiple words in the link text:
 .IP "" 4
 .
 .nf
+
 Visit [Daring Fireball][] for more information.
 .
 .fi
@@ -1041,6 +1128,7 @@ And then define the link:
 .IP "" 4
 .
 .nf
+
 [Daring Fireball]: http://daringfireball.net/
 .
 .fi
@@ -1059,8 +1147,10 @@ Here's an example of reference links in action:
 .IP "" 4
 .
 .nf
+
 I get 10 times more traffic from [Google] [1] than from
 [Yahoo] [2] or [MSN] [3].
+
   [1]: http://google.com/        "Google"
   [2]: http://search.yahoo.com/  "Yahoo Search"
   [3]: http://search.msn.com/    "MSN Search"
@@ -1075,8 +1165,10 @@ Using the implicit link name shortcut, you could instead write:
 .IP "" 4
 .
 .nf
+
 I get 10 times more traffic from [Google][] than from
 [Yahoo][] or [MSN][].
+
   [google]: http://google.com/        "Google"
   [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
   [msn]:    http://search.msn.com/    "MSN Search"
@@ -1091,6 +1183,7 @@ Both of the above examples will produce the following HTML output:
 .IP "" 4
 .
 .nf
+
 <p>I get 10 times more traffic from <a href="http://google.com/"
 title="Google">Google</a> than from
 <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
@@ -1107,6 +1200,7 @@ Markdown's inline link style:
 .IP "" 4
 .
 .nf
+
 I get 10 times more traffic from [Google](http://google.com/ "Google")
 than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
 [MSN](http://search.msn.com/ "MSN Search").
@@ -1139,9 +1233,13 @@ HTML \fB<em>\fR tag; double \fB*\fR's or \fB_\fR's will be wrapped with an HTML
 .IP "" 4
 .
 .nf
+
 *single asterisks*
+
 _single underscores_
+
 **double asterisks**
+
 __double underscores__
 .
 .fi
@@ -1154,9 +1252,13 @@ will produce:
 .IP "" 4
 .
 .nf
+
 <em>single asterisks</em>
+
 <em>single underscores</em>
+
 <strong>double asterisks</strong>
+
 <strong>double underscores</strong>
 .
 .fi
@@ -1173,6 +1275,7 @@ Emphasis can be used in the middle of a word:
 .IP "" 4
 .
 .nf
+
 un*frigging*believable
 .
 .fi
@@ -1191,6 +1294,7 @@ escape it:
 .IP "" 4
 .
 .nf
+
 \\*this text is surrounded by literal asterisks\\*
 .
 .fi
@@ -1205,6 +1309,7 @@ normal paragraph. For example:
 .IP "" 4
 .
 .nf
+
 Use the `printf()` function.
 .
 .fi
@@ -1217,6 +1322,7 @@ will produce:
 .IP "" 4
 .
 .nf
+
 <p>Use the <code>printf()</code> function.</p>
 .
 .fi
@@ -1230,6 +1336,7 @@ multiple backticks as the opening and closing delimiters:
 .IP "" 4
 .
 .nf
+
 ``There is a literal backtick (`) here.``
 .
 .fi
@@ -1242,6 +1349,7 @@ which will produce this:
 .IP "" 4
 .
 .nf
+
 <p><code>There is a literal backtick (`) here.</code></p>
 .
 .fi
@@ -1256,7 +1364,9 @@ literal backtick characters at the beginning or end of a code span:
 .IP "" 4
 .
 .nf
+
 A single backtick in a code span: `` ` ``
+
 A backtick\-delimited string in a code span: `` `foo` ``
 .
 .fi
@@ -1269,7 +1379,9 @@ will produce:
 .IP "" 4
 .
 .nf
+
 <p>A single backtick in a code span: <code>`</code></p>
+
 <p>A backtick\-delimited string in a code span: <code>`foo`</code></p>
 .
 .fi
@@ -1284,6 +1396,7 @@ tags. Markdown will turn this:
 .IP "" 4
 .
 .nf
+
 Please don't use any `<blink>` tags.
 .
 .fi
@@ -1296,6 +1409,7 @@ into:
 .IP "" 4
 .
 .nf
+
 <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
 .
 .fi
@@ -1308,6 +1422,7 @@ You can write this:
 .IP "" 4
 .
 .nf
+
 `&#8212;` is the decimal\-encoded equivalent of `&mdash;`.
 .
 .fi
@@ -1320,6 +1435,7 @@ to produce:
 .IP "" 4
 .
 .nf
+
 <p><code>&amp;#8212;</code> is the decimal\-encoded
 equivalent of <code>&amp;mdash;</code>.</p>
 .
@@ -1341,7 +1457,9 @@ Inline image syntax looks like this:
 .IP "" 4
 .
 .nf
+
 ![Alt text](/path/to/img.jpg)
+
 ![Alt text](/path/to/img.jpg "Optional title")
 .
 .fi
@@ -1371,6 +1489,7 @@ Reference\-style image syntax looks like this:
 .IP "" 4
 .
 .nf
+
 ![Alt text][id]
 .
 .fi
@@ -1384,6 +1503,7 @@ are defined using syntax identical to link references:
 .IP "" 4
 .
 .nf
+
 [id]: url/to/image  "Optional title attribute"
 .
 .fi
@@ -1403,6 +1523,7 @@ Markdown supports a shortcut style for creating "automatic" links for URLs and e
 .IP "" 4
 .
 .nf
+
 <http://example.com/>
 .
 .fi
@@ -1415,6 +1536,7 @@ Markdown will turn this into:
 .IP "" 4
 .
 .nf
+
 <a href="http://example.com/">http://example.com/</a>
 .
 .fi
@@ -1430,6 +1552,7 @@ spambots. For example, Markdown will turn this:
 .IP "" 4
 .
 .nf
+
 <address@example.com>
 .
 .fi
@@ -1442,6 +1565,7 @@ into something like this:
 .IP "" 4
 .
 .nf
+
 <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
 &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
 &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
@@ -1470,6 +1594,7 @@ backslashes before the asterisks, like this:
 .IP "" 4
 .
 .nf
+
 \\*literal asterisks\\*
 .
 .fi
@@ -1482,6 +1607,7 @@ Markdown provides backslash escapes for the following characters:
 .IP "" 4
 .
 .nf
+
 \\   backslash
 `   backtick
 *   asterisk
@@ -1503,7 +1629,7 @@ _   underscore
 Markdown was created by John Gruber.
 .
 .P
-Manual page by Ryan Tomayko. It's pretty much a direct copy of the\fIMarkdown Syntax Reference\fR,
+Manual page by Ryan Tomayko. It's pretty much a direct copy of the \fIMarkdown Syntax Reference\fR,
 also by John Gruber.
 .
 .SH "SEE ALSO"

data/man/ronn.1

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.3
+.\" generated with Ronn/v0.4.2
 .\" http://github.com/rtomayko/ronn/
 .
-.TH "RONN" "1" "March 2010" "Ryan Tomayko" "Ronn Manual"
+.TH "RONN" "1" "April 2010" "Ryan Tomayko" "Ronn Manual"
 .
 .SH "NAME"
 \fBronn\fR \-\- build markdown\-based man pages
@@ -51,7 +51,7 @@ arguments change this behavior:
 .
 .TP
 \fB\-b\fR, \fB\-\-build\fR
-Write output directly to files instead of standard output. When the\fB\-\-roff\fR option is provided, writes roff output to \fIfile\fR.\fIsection\fR.
+Write output directly to files instead of standard output. When the \fB\-\-roff\fR option is provided, writes roff output to \fIfile\fR.\fIsection\fR.
 When the \fB\-\-html\fR option is provided, writes output to
 '\fIfile\fR.\fIsection\fR.html'.
 .
@@ -117,6 +117,7 @@ Generate \fBroff(7)\fR output on stdout:
 .IP "" 4
 .
 .nf
+
 $ ronn < hello.1.ronn
 .
 .fi
@@ -129,6 +130,7 @@ Build a roff file based on the input filename:
 .IP "" 4
 .
 .nf
+
 $ ronn \-b hello.1.ronn
 building: hello.1
 $ man hello.1
@@ -143,6 +145,7 @@ Build and open a standalone HTML file based on the input filename:
 .IP "" 4
 .
 .nf
+
 $ ronn \-b \-\-html test.1.ronn
 $ open test.1.html
 .
@@ -157,6 +160,7 @@ directory:
 .IP "" 4
 .
 .nf
+
 $ ronn \-b \-\-roff \-\-html *.ronn
 building: hello.1
 building: hello.1.html
@@ -173,6 +177,7 @@ View a ronn file in the same way as man(1) without building a roff file:
 .IP "" 4
 .
 .nf
+
 $ ronn \-m hello.1.ronn
 .
 .fi
@@ -185,6 +190,7 @@ Install the roff man page for a ronn file:
 .IP "" 4
 .
 .nf
+
 $ ronn \-i hello.1.ronn
 .
 .fi

data/man/ronn.5

@@ -1,4 +1,4 @@
-.\" generated with Ronn/v0.3
+.\" generated with Ronn/v0.4.2
 .\" http://github.com/rtomayko/ronn/
 .
 .TH "RONN" "5" "March 2010" "Ryan Tomayko" "Ronn Manual"
@@ -9,20 +9,29 @@
 .SH "SYNOPSIS"
 .
 .nf
+
 name(1) \-\- one sentence description
 ===================================
+
 ## SECTION HEADING
+
 A normal paragraph. This can span multiple lines and is
 terminated with two or more line endings \-\- just like
 Markdown.
+
 ## INLINE MARKUP
+
 Inline markup is used for `code` and `user input` (displayed
 in boldface), and also <variables> or _emphasis_.
+
 Manual page references like sh(1), markdown(5), roff(7), etc.
 are displayed in boldface and hyperlinked in HTML output.
+
 ## DEFINITION LISTS
+
 Definition lists are used to define options, arguments,
 variables, and other type of terms:
+
   * `\-a`, `\-\-arg1`=[_OPTION_]:
     One or more paragraphs describing the argument.
   * `\-b`, `\-\-arg2`:
@@ -53,6 +62,7 @@ this information. For example, this very man page begins:
 .IP "" 4
 .
 .nf
+
 ronn(5) \-\- humane manual page authoring format
 =============================================
 .
@@ -61,7 +71,7 @@ ronn(5) \-\- humane manual page authoring format
 .IP "" 0
 .
 .P
-Here, we're saying that the man page documents a thing named\fBronn\fR in manual section \fB5\fR (the "file formats" section; see
+Here, we're saying that the man page documents a thing named \fBronn\fR in manual section \fB5\fR (the "file formats" section; see
 manpages(5) for full section list) and that's quickly described
 as a "humane manual page authoring format".
 .
@@ -78,6 +88,7 @@ headings. A hash prefix syntax:
 .IP "" 4
 .
 .nf
+
 ## HEADING TEXT
 .
 .fi
@@ -90,6 +101,7 @@ Or, a dash underline syntax:
 .IP "" 4
 .
 .nf
+
 HEADING TEXT
 \-\-\-\-\-\-\-\-\-\-\-\-
 .
@@ -139,6 +151,7 @@ Here is grep(1)'s DESCRIPTION section represented in \fBronn\fR:
 .IP "" 4
 .
 .nf
+
 `Grep` searches the named input _FILE_ (or standard input if
 no files are named, or the file name `\-` is given) for lines
 containing a match to the given _PATTERN_. By default, `grep`
@@ -163,16 +176,20 @@ multiple paragraphs, code blocks, standard lists, and nested
 definition lists.
 .
 .P
-An example definition list, taken from BSD test(1)'s\fBDESCRIPTION\fR section:
+An example definition list, taken from BSD test(1)'s \fBDESCRIPTION\fR section:
 .
 .IP "" 4
 .
 .nf
+
  The following primaries are used to construct expressions:
+
    * `\-b` _file_:
      True if _file_ exists and is a block special file.
+
    * `\-c` _file_:
      True if _file_ exists and is a character special file.
+
    * `\-d` _file_:
      True if file exists and is a directory.
 .

data/man/ronn.7

@@ -1,4 +1,4 @@
-.\" generated with Ronn/v0.3
+.\" generated with Ronn/v0.4.2
 .\" http://github.com/rtomayko/ronn/
 .
 .TH "RONN" "7" "March 2010" "Ryan Tomayko" "Ronn Manual"
@@ -55,6 +55,7 @@ Install with Rubygems:
 .IP "" 4
 .
 .nf
+
 $ [sudo] gem install ronn
 $ ronn \-\-help
 .
@@ -68,6 +69,7 @@ Or, clone the git repository:
 .IP "" 4
 .
 .nf
+
 $ git clone git://github.com/rtomayko/ronn.git
 $ PATH=ronn/bin:$PATH
 $ ronn \-\-help
@@ -77,11 +79,13 @@ $ ronn \-\-help
 .IP "" 0
 .
 .SH "BASIC USAGE"
-To generate a roff man page from the included\fI\fBmarkdown.5.ronn\fR\fR file and open it with man(1):
+To generate a roff man page from the included \fBmarkdown.5.ronn\fR file and
+open it with man(1):
 .
 .IP "" 4
 .
 .nf
+
 $ ronn \-b man/markdown.5.ronn
 building: man/markdown.5
 $ man man/markdown.5
@@ -96,6 +100,7 @@ To generate a standalone HTML version:
 .IP "" 4
 .
 .nf
+
 $ ronn \-b \-\-html man/markdown.5.ronn
 building: man/markdown.5.html
 $ open man/markdown.5.html
@@ -110,6 +115,7 @@ To build roff and HTML versions of all ronn files:
 .IP "" 4
 .
 .nf
+
 $ ronn \-b \-\-roff \-\-html man/*.ronn
 .
 .fi
@@ -123,6 +129,7 @@ building intermediate files:
 .IP "" 4
 .
 .nf
+
 $ ronn \-m man/markdown.5.ronn
 .
 .fi

data/ronn.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'ronn'
-  s.version = '0.4.1'
-  s.date = '2010-03-08'
+  s.version = '0.5'
+  s.date = '2010-04-02'
 
   s.description = "The opposite of roff"
   s.summary     = "The opposite of roff"
@@ -17,9 +17,7 @@ Gem::Specification.new do |s|
     COPYING
     README.md
     Rakefile
-    bin/ron
     bin/ronn
-    lib/ron.rb
     lib/ronn.rb
     lib/ronn/document.rb
     lib/ronn/layout.html
@@ -32,7 +30,6 @@ Gem::Specification.new do |s|
     man/ronn.5.ronn
     man/ronn.7
     man/ronn.7.ronn
-    ron.gemspec
     ronn.gemspec
     test/angle_bracket_syntax.html
     test/angle_bracket_syntax.ronn
@@ -55,12 +52,12 @@ Gem::Specification.new do |s|
   ]
   # = MANIFEST =
 
-  s.executables = ['ronn', 'ron']
+  s.executables = ['ronn']
   s.test_files = s.files.select { |path| path =~ /^test\/.*_test.rb/ }
 
   s.extra_rdoc_files = %w[COPYING]
-  s.add_dependency 'hpricot',    '~> 0.8.2'
-  s.add_dependency 'rdiscount',   '~> 1.5.8'
+  s.add_dependency 'hpricot',     '>= 0.8.2'
+  s.add_dependency 'rdiscount',   '>= 1.5.8'
   s.add_development_dependency 'contest', '~> 0.1'
 
   s.has_rdoc = true

data/test/entity_encoding_test.roff

@@ -9,6 +9,7 @@ Your output <i>might</i> look like this:
 .IP "" 4
 .
 .nf
+
 * Chris
 *
 * &lt;b&gt;GitHub&lt;/b&gt;
@@ -17,3 +18,4 @@ Your output <i>might</i> look like this:
 .fi
 .
 .IP "" 0
+

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +21,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -36,7 +35,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -62,7 +61,6 @@ description: The opposite of roff
 email: rtomayko@gmail.com
 executables: 
 - ronn
-- ron
 extensions: []
 
 extra_rdoc_files: 
@@ -71,9 +69,7 @@ files:
 - COPYING
 - README.md
 - Rakefile
-- bin/ron
 - bin/ronn
-- lib/ron.rb
 - lib/ronn.rb
 - lib/ronn/document.rb
 - lib/ronn/layout.html
@@ -86,7 +82,6 @@ files:
 - man/ronn.5.ronn
 - man/ronn.7
 - man/ronn.7.ronn
-- ron.gemspec
 - ronn.gemspec
 - test/angle_bracket_syntax.html
 - test/angle_bracket_syntax.ronn

data/bin/ron

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec File.dirname(__FILE__) + '/ronn', *ARGV

data/lib/ron.rb

@@ -1,3 +0,0 @@
-# Ron 0.3 compatibility shim
-require 'ronn'
-Ron = Ronn

data/ron.gemspec

@@ -1,50 +0,0 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-
-  s.name = 'ron'
-  s.version = '0.4'
-  s.date = '2010-03-08'
-
-  s.description = "ron -- the opposite of roff -- is now known as 'ronn'"
-
-  s.summary     = (<<-TEXT).gsub(/^ {4}/, '')
-    IMPORTANT: ron -- the opposite of roff -- is now known as "ronn". Ownership
-    of the "ron" gem will be handed over to the Ruby Object Notation (Ron)
-    project in the not-too-distant future.
-
-    If you came here looking for "ron" -- the opposite of roff --, see the
-    "ronn" gem instead: http://rubygems.org/gems/ronn
-
-    If you came here looking for Ron (Ruby Object Notation), see the "Ron"
-    gem instead: http://rubygems.org/gems/Ron
-  TEXT
-
-  s.authors = ["Ryan Tomayko"]
-  s.email = "rtomayko@gmail.com"
-  s.files = %w[ron.gemspec]
-  s.executables = []
-  s.test_files = []
-
-  s.has_rdoc = true
-  s.homepage = "http://rtomayko.github.com/ronn/"
-  s.require_paths = ['.']
-  s.add_dependency 'ronn', '>= 0.4'
-
-  s.post_install_message = (<<-TEXT).gsub(/^ {4}/, '')
-    ==================================================================
-    WARNING: ron -- the opposite of roff -- is now known as "ronn"
-
-    The "ronn" gem has automatically been installed. However, in the
-    not-too-distant future, the "ron" gem will be owned by the
-    Ruby Object Notation <http://github.com/coatl/ron> project. Please
-    use the "ronn" gem to install ronn -- the opposite of roff -- from
-    this point forward.
-
-    If you meant to install the Ruby Object Notation (Ron) gem,
-    uninstall the "ron" and "ronn" gems and install the "Ron" gem:
-      gem uninstall ron ronn
-      gem install Ron
-    ==================================================================
-  TEXT
-end