Author: rfm
Date: Tue Jul 14 19:04:45 2015
New Revision: 38789
URL: http://svn.gna.org/viewcvs/gnustep?rev=38789&view=rev
Log:
Use up to date DTD
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Source/NSPropertyList.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=38789&r1=38788&r2=38789&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Tue Jul 14 19:04:45 2015
@@ -1,3 +1,11 @@
+2015-07-14 Richard Frith-Macdonald <[email protected]>
+
+ * Source/NSPropertyList.m: Write xml document headers referring to
+ the current location of Apple's property list dtd for compatibility
+ with software expecting to validate using that dtd.
+ Stefan Bidigaray pointed out that the heading we currently write is
+ very out of date.
+
2015-07-09 Richard Frith-Macdonald <[email protected]>
* Source/NSDebug.m: List memory allocation statistics in alphabetical
Modified: libs/base/trunk/Source/NSPropertyList.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSPropertyList.m?rev=38789&r1=38788&r2=38789&view=diff
==============================================================================
--- libs/base/trunk/Source/NSPropertyList.m (original)
+++ libs/base/trunk/Source/NSPropertyList.m Tue Jul 14 19:04:45 2015
@@ -52,6 +52,12 @@
static id boolN = nil;
static id boolY = nil;
+
+static const char *prefix =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
+ "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\";>\n"
+ "<plist version=\"1.0\">\n";
@class GSSloppyXMLParser;
@@ -2390,12 +2396,6 @@
if (aFormat == NSPropertyListXMLFormat_v1_0)
{
- const char *prefix =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist "
- "PUBLIC \"-//GNUstep//DTD plist 0.9//EN\" "
- "\"http://www.gnustep.org/plist-0_9.xml\";>\n"
- "<plist version=\"0.9\">\n";
-
[dest appendBytes: prefix length: strlen(prefix)];
OAppend(aPropertyList, loc, 0, step > 3 ? 3 : step, aFormat, dest);
[dest appendBytes: "</plist>" length: 8];
@@ -2459,12 +2459,6 @@
if (style == NSPropertyListXMLFormat_v1_0)
{
- const char *prefix =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist "
- "PUBLIC \"-//GNUstep//DTD plist 0.9//EN\" "
- "\"http://www.gnustep.org/plist-0_9.xml\";>\n"
- "<plist version=\"0.9\">\n";
-
[dest appendBytes: prefix length: strlen(prefix)];
OAppend(obj, loc, 0, step > 3 ? 3 : step, style, dest);
[dest appendBytes: "</plist>" length: 8];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
