Merge branch 'patch'

sunaku · Jun 21, 2014 · 475ee93 · 475ee93
2 parents 0e57cb3 + 76b4a28
commit 475ee93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/md2man/rakefile/style.css b/lib/md2man/rakefile/style.css
@@ -1,4 +1,4 @@
-@import url('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css');
+@import url('https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css');
 
 @media all {
   h1,

diff --git a/lib/md2man/roff.rb b/lib/md2man/roff.rb
@@ -211,17 +211,17 @@ def entity text
 private
 
   def escape text, literally
-    if text then text.
-      # escape backslashes so that they appear in the printable output
-      gsub('\\', literally ? '\&\&' : '\\[rs]').
+    text.
 
-      # escape soft-hyphens so that they appear in the printable output
-      gsub('-', '\\-').
+    # escape backslashes so that they appear in the printable output
+    gsub('\\', literally ? '\&\&' : '\\[rs]').
 
-      # escape line-beginning control characters (period and single quote)
-      # by prefixing a non-printable, zero-width glyph (backslash ampersand)
-      gsub(/^(?=[.'])/, '\\\\&')
-    end
+    # escape soft-hyphens so that they appear in the printable output
+    gsub('-', '\\-').
+
+    # escape line-beginning control characters (period and single quote)
+    # by prefixing a non-printable, zero-width glyph (backslash ampersand)
+    gsub(/^(?=[.'])/, '\\\\&')
   end
 
   def remove_leading_pp text