jeremias 2005/02/01 23:33:14
Modified: src/foschema fop.xsd
Log:
Bug #33321
Fix for invalid regular expressions. Patch committed with modifications.
Submitted by: James Shaw <hertzsprrrung.at.btopenworld.com>
Revision Changes Path
1.4 +7 -7 xml-fop/src/foschema/fop.xsd
Index: fop.xsd
===================================================================
RCS file: /home/cvs/xml-fop/src/foschema/fop.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fop.xsd 27 Feb 2004 18:45:48 -0000 1.3
+++ fop.xsd 2 Feb 2005 07:33:14 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version = "1.0" encoding = "UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -777,7 +777,7 @@
</documentation>
</annotation>
<restriction base = "NMTOKEN">
- <pattern value = "[-+]?\d+"/>
+ <pattern value = "[\+\-]?\d+"/>
</restriction>
</simpleType>
<simpleType name = "number_Type">
@@ -790,7 +790,7 @@
</documentation>
</annotation>
<restriction base = "string">
- <pattern value = "[-+]?\d+\.\d*"/>
+ <pattern value = "[\+\-]?\d+\.\d*"/>
</restriction>
</simpleType>
<simpleType name = "length_Type">
@@ -806,7 +806,7 @@
</documentation>
</annotation>
<restriction base = "string">
- <pattern value = "[+-]?\d+\.?\d*(px|pt|mm|cm|in|em|%)"/>
+ <pattern value = "[\+\-]?\d+\.?\d*(px|pt|mm|cm|in|em|%)"/>
</restriction>
</simpleType>
<simpleType name = "length_range_Type">
@@ -898,7 +898,7 @@
</documentation>
</annotation>
<restriction base = "string">
- <pattern value = "[-+]?[1-3]?\d?\d?\.?\d*(deg|grad|rad)"/>
+ <pattern value = "[\+\-]?[1-3]?\d?\d?\.?\d*(deg|grad|rad)"/>
</restriction>
</simpleType>
<simpleType name = "percentage_Type">
@@ -911,7 +911,7 @@
</documentation>
</annotation>
<restriction base = "string">
- <pattern value = "[-+]?\d+\.?\d*%"/>
+ <pattern value = "[\+\-]?\d+\.?\d*%"/>
</restriction>
</simpleType>
<simpleType name = "character_Type">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
