[freetype2] master 4b3ea5c 2/3: [docmaker] Don't emit trailing newlines.

[Werner LEMBERG]

branch: master
commit 4b3ea5ca8f2ae7223bb1ad24bea07e659eec5f92
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [docmaker] Don't emit trailing newlines.
    
    * src/tools/docmaker/tohtml.py (HtmlFormatter::make_html_code):
    Use `rstrip'.
---
 ChangeLog                    |    7 +++++++
 src/tools/docmaker/tohtml.py |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a19b4de..21b5c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-09  Werner Lemberg  <address@hidden>
+
+       [docmaker] Don't emit trailing newlines.
+
+       * src/tools/docmaker/tohtml.py (HtmlFormatter::make_html_code):
+       Use `rstrip'.
+
 2016-02-07  Werner Lemberg  <address@hidden>
 
        * Version 2.6.3 released.
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 8da10b8..9b28780 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -390,7 +390,7 @@ class  HtmlFormatter( Formatter ):
         """Convert a code sequence to HTML."""
         line = code_header + '\n'
         for l in lines:
-            line = line + html_quote( l ) + '\n'
+            line = line + html_quote( l ).rstrip() + '\n'
 
         return line + code_footer