Fixed issue with UTF8 hyphen.

[imagemagick] / config / thresholds.xml

diff --git a/config/thresholds.xml b/config/thresholds.xml
index 2432590d237b160d5aeb294d7f476b492f092bed..02b96a85af5238aa86c023ad1821d435b29917e1 100644 (file)
--- a/config/thresholds.xml
+++ b/config/thresholds.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE thresholds [
-<!ELEMENT thresholds (threshold)+>
-<!ELEMENT threshold (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST threshold map ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT thresholds (threshold)+>
+  <!ATTLIST thresholds xmlns CDATA #FIXED ''>
+  <!ELEMENT threshold (description,levels)>
+  <!ATTLIST threshold xmlns CDATA #FIXED '' alias NMTOKEN #IMPLIED
+    map NMTOKEN #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED ''>
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED '' divisor CDATA #REQUIRED
+    height CDATA #REQUIRED width CDATA #REQUIRED>
 ]>
 <!--
   Threshold Maps for Ordered Posterized Dither
@@ -302,13 +304,13 @@
   <threshold map="c7x7b" alias="c7x7">
     <description>Circles 7x7 (black)</description>
     <levels width="7" height="7" divisor="50">
-        2  7 17 26 15  6  1
-        8 16 33 39 32 13  5
-       18 34 44 48 43 31 14
-       27 40 45 49 47 38 25
-       20 35 41 46 42 30 24
-        9 19 36 37 29 22 12
-        3 10 21 28 23 11  4
+        3  9 18 28 17  8  2
+       10 24 33 39 32 23  7
+       19 34 44 48 43 31 16
+       25 40 45 49 47 38 27
+       20 35 41 46 42 29 15
+       11 21 36 37 28 22  6
+        4 12 13 26 14  5  1
     </levels>
   </threshold>
 
@@ -316,13 +318,13 @@
   <threshold map="c7x7w">
     <description>Circles 7x7 (white)</description>
     <levels width="7" height="7" divisor="50">
-       49 42 32 18 19 33 48
-       41 31 17 10 11 20 34
-       40 30  9  2  3 12 21
-       39 29  8  1  4  5 22
-       43 28 16  7  6 13 23
-       44 38 27 15 14 24 35
-       46 45 37 26 25 36 47
+       47 41 32 22 33 42 48
+       40 26 17 11 18 27 43
+       31 16  6  2  7 19 34
+       25 10  5  1  3 12 23
+       30 15  9  4  8 20 35
+       39 29 14 13 21 28 44
+       46 38 37 24 36 45 49
     </levels>
   </threshold>