Bug #33321

Fix for invalid regular expressions. Patch committed with modifications.
Submitted by: James Shaw <hertzsprrrung.at.btopenworld.com>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198361 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/foschema/fop.xsd b/src/foschema/fop.xsd
index dfc5f65fa2075341431ce5204bc3c1b7c94a09a3..030d92d0f5f8649c92da0cff9eb92ce531b71782 100644 (file)
--- a/src/foschema/fop.xsd
+++ b/src/foschema/fop.xsd
@@ -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">