rtomayko · sometimesfood · Dec 8, 2010 · Dec 8, 2010
diff --git a/lib/ronn/roff.rb b/lib/ronn/roff.rb
@@ -256,7 +256,9 @@ def escape(text)
       text.gsub!(/&#(\d+);/) { $1.to_i.chr }                # dec entities
       text.gsub!('\\', '\e')                                # backslash
       text.gsub!('...', '\|.\|.\|.')                        # ellipses
-      text.gsub!(/['.-]/) { |m| "\\#{m}" }                  # control chars
+      # lines cannot start with a '.', insert zero-width character before
+      text.gsub!(/^\./, '\\\\&.')                           # dot at line start
+      text.gsub!(/['-]/) { |m| "\\#{m}" }                   # control chars
       text.gsub!(/(&[A-Za-z]+;)/) { ent[$1] || $1 }         # named entities
       text.gsub!('&amp;',  '&')                             # amps
       text
@@ -269,11 +271,6 @@ def quote(text)
     # write text to output buffer
     def write(text)
       return if text.nil? || text.empty?
-      # lines cannot start with a '.'. insert zero-width character before.
-      if text[0,2] == '\.' &&
-        (@buf.last && @buf.last[-1] == ?\n)
-        @buf << '\&'
-      end
       @buf << text
     end
 

diff --git a/test/definition_list_syntax.roff b/test/definition_list_syntax.roff
@@ -22,5 +22,5 @@ new paragraphs
 .
 .TP
 \fB\-\-somearg\fR=\fIVALUE\fR
-We can do that too\.
+We can do that too.
 
diff --git a/test/dots_at_line_start_test.roff b/test/dots_at_line_start_test.roff
@@ -4,7 +4,27 @@
 \fBdots_at_line_start_test\fR
 .
 .P
-There\'s a weird issue where dots at the beginning of a line generate troff warnings due to escaping\.
+There\'s a weird issue where dots at the beginning of a line generate troff warnings due to escaping.
 .
 .P
-\&\.\. let\'s see what happens\.
+\&.. let\'s see what happens.
+.
+.IP "" 4
+.
+.nf
+
+\&. This dot is escaped correctly.
+
+a test
+b test
+\&. This one is too.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\&.
+.
+.P
+(Single dots should get replaced correctly, too.)
diff --git a/test/dots_at_line_start_test.ronn b/test/dots_at_line_start_test.ronn
@@ -2,3 +2,13 @@ There's a weird issue where dots at the beginning of a line
 generate troff warnings due to escaping.
 
 .. let's see what happens.
+
+    . This dot is escaped correctly.
+
+    a test
+    b test
+    . This one is too.
+
+.
+
+(Single dots should get replaced correctly, too.)
diff --git a/test/ellipses.roff b/test/ellipses.roff
@@ -4,7 +4,7 @@
 \fBellipses\fR \- testing ellipses
 .
 .P
-Ellipses should be replaced\|\.\|\.\|\.
+Ellipses should be replaced\|.\|.\|.
 .
 .P
-\|\.\|\.\|\.also, they shouldn\'t interfere with regular dots at the beginning of a line\.
+\|.\|.\|.also, they shouldn\'t interfere with regular dots at the beginning of a line.
diff --git a/test/entity_encoding_test.roff b/test/entity_encoding_test.roff
@@ -58,4 +58,4 @@ Here\'s some special entities:
 .IP "" 0
 .
 .P
-Here\'s a line that uses non\-breaking spaces to force the last\~few\~words\~to\~wrap\~together\.
+Here\'s a line that uses non\-breaking spaces to force the last\~few\~words\~to\~wrap\~together.
diff --git a/test/markdown_syntax.roff b/test/markdown_syntax.roff
diff --git a/test/middle_paragraph.roff b/test/middle_paragraph.roff
@@ -7,7 +7,7 @@
 Foo
 .
 .P
-Always use \fBattr_reader\fR, \fBattr_writer\fR or \fBattr_accessor\fR\. Do not use \fBfor\|\.\|\.\|\.in\fR; use each instead\. Do not use \fBand\fR/\fBor\fR; use \fB&&\fR/\fB||\fR instead\.
+Always use \fBattr_reader\fR, \fBattr_writer\fR or \fBattr_accessor\fR\&. Do not use \fBfor\|.\|.\|.in\fR; use each instead. Do not use \fBand\fR/\fBor\fR; use \fB&&\fR/\fB||\fR instead.
 .
 .P
 Bar
diff --git a/test/missing_spaces.roff b/test/missing_spaces.roff
@@ -5,5 +5,5 @@
 .
 .TP
 \fB\-S\fR \fItext\fR, \fBsearch\fR \fItext\fR
-Performs a substring search of formula names for \fItext\fR\.
+Performs a substring search of formula names for \fItext\fR\&.
 
diff --git a/test/nested_list_with_code.roff b/test/nested_list_with_code.roff
@@ -4,7 +4,7 @@
 \fBtoggle_status\fR
 .
 .IP "\[ci]" 4
-Toggle the display of the status bar\.
+Toggle the display of the status bar.
 .
 .IP "" 0
 

diff --git a/test/section_reference_links.roff b/test/section_reference_links.roff
@@ -4,7 +4,7 @@
 \fBsection_reference_links\fR \- linking to sections
 .
 .SH "SECTION 1"
-See the following section\.
+See the following section.
 .
 .SH "SECTION 2"
 See \fISECTION 1\fR or \fIto put it another way\fR or even \fIlink this\fR
diff --git a/test/underline_spacing_test.roff b/test/underline_spacing_test.roff
@@ -8,14 +8,14 @@ This input
 .
 .TP
 \fB\-S\fR \fItext\fR, \fBsearch\fR \fItext\fR
-Performs a substring search of formula names for \fItext\fR\.
+Performs a substring search of formula names for \fItext\fR\&.
 .
 .TP
 \fB\-O\fR \fItext\fR, \fBother\fR \fItext\fR
-Does something else\.
+Does something else.
 .
 .P
-Should space text properly\.
+Should space text properly.
 .
 .P
 \fI!\-\- this is a comment \-\-\fR
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     Foo
     .
     .P
-    Always use \fBattr_reader\fR, \fBattr_writer\fR or \fBattr_accessor\fR\. Do not use \fBfor\|\.\|\.\|\.in\fR; use each instead\. Do not use \fBand\fR/\fBor\fR; use \fB&&\fR/\fB||\fR instead\.
+    Always use \fBattr_reader\fR, \fBattr_writer\fR or \fBattr_accessor\fR\&. Do not use \fBfor\|.\|.\|.in\fR; use each instead. Do not use \fBand\fR/\fBor\fR; use \fB&&\fR/\fB||\fR instead.
     .
     .P
     Bar