[xml/sgml-commit] r1011 - in /packages/html-xml-utils/trunk/debian/patches: 00list fix_uncdata_additional_newline.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Tue Feb 12 14:19:06 2008
New Revision: 1011

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1011
Log:
* debian/patches/fix_uncdata_additional_newline.dpatch: Added.
  - uncdata.c: Use printf() and not puts() to replace several characters with
    entities to avoid additional newlines in verbatim elements.
* debian/patches/00list: Adjusted.


Added:
    packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch   (with props)
Modified:
    packages/html-xml-utils/trunk/debian/patches/00list

Modified: packages/html-xml-utils/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/00list?rev=1011&op=diff
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/00list (original)
+++ packages/html-xml-utils/trunk/debian/patches/00list Tue Feb 12 14:19:06 2008
@@ -1,1 +1,2 @@
 fix_manpage_issues
+fix_uncdata_additional_newline

Added: packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch?rev=1011&op=file
==============================================================================
--- packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch (added)
+++ packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch Tue Feb 12 14:19:06 2008
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_uncdata_additional_newline.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In "verbatim" elements (xml:space="preserved") the puts() function
+## DP:   would add an additional newline after the entity, which then breaks
+## DP:   what the user had in this element.
+
+ at DPATCH@
+diff -urNad trunk~/uncdata.c trunk/uncdata.c
+--- trunk~/uncdata.c	2007-10-23 13:10:52.000000000 +0200
++++ trunk/uncdata.c	2008-02-12 13:58:26.000000000 +0100
+@@ -103,9 +103,9 @@
+       break;
+     case CDATA:					/* Inside "<![CDATA[...]]>" */
+       if (c == ']') state = CDATA98;
+-      else if (c == '<') puts("&lt;");
+-      else if (c == '>') puts("&gt;");
+-      else if (c == '&') puts("&amp;"); 
++      else if (c == '<') printf("&lt;");
++      else if (c == '>') printf("&gt;");
++      else if (c == '&') printf("&amp;");
+       else putchar(c);
+       break;
+     case CDATA98:				/* Seen "]" */

Propchange: packages/html-xml-utils/trunk/debian/patches/fix_uncdata_additional_newline.dpatch
------------------------------------------------------------------------------
    svn:executable = *