rebuilt chvalid.def from scratch based on XML 2nd edition REC and
* chvalid.def chvalid.c include/libxml/chvalid.h: rebuilt
chvalid.def from scratch based on XML 2nd edition REC
and regenerated the code.
Daniel
diff --git a/chvalid.def b/chvalid.def
index 1aab420..c0fd3fd 100755
--- a/chvalid.def
+++ b/chvalid.def
@@ -1,8 +1,11 @@
name xmlIsChar
-ur 0x09 0x0a 0x0d 0x20..0xff
-ur 0x000100..0x00d7ff
-ur 0x00e000..0x00fffd
-ur 0x010000..0x10ffff
+ur 0x9
+ur 0xA
+ur 0xD
+ur 0x20..0xFF
+ur 0x0100..0xD7FF
+ur 0xE000..0xFFFD
+ur 0x10000..0x10FFFF
end xmlIsChar
name xmlIsPubidChar
@@ -17,326 +20,342 @@
end xmlIsBlank
name xmlIsBaseChar
-ur 0x41..0x5a 0x61..0x7a 0xc0..0xd6 0xd8..0xf6 0xf8..0xff
-ur 0x000100..0x000131
-ur 0x000134..0x00013e
-ur 0x000141..0x000148
-ur 0x00014a..0x00017e
-ur 0x000180..0x0001c3
-ur 0x0001cd..0x0001f0
-ur 0x0001f4..0x0001f5
-ur 0x0001fa..0x000217
-ur 0x000250..0x0002a8
-ur 0x0002bb..0x0002c1
-ur 0x000386..0x000386
-ur 0x000388..0x00038a
-ur 0x00038c
-ur 0x00038e..0x0003a1
-ur 0x0003a3..0x0003ce
-ur 0x0003d0..0x0003d6
-ur 0x0003da
-ur 0x0003dc
-ur 0x0003de
-ur 0x0003e0
-ur 0x0003e2..0x0003f3
-ur 0x000401..0x00040c
-ur 0x00040e..0x00044f
-ur 0x000451..0x00045c
-ur 0x00045e..0x000481
-ur 0x000490..0x0004c4
-ur 0x0004c7..0x0004c8
-ur 0x0004cb..0x0004cc
-ur 0x0004d0..0x0004eb
-ur 0x0004ee..0x0004f5
-ur 0x0004f8..0x0004f9
-ur 0x000531..0x000556
-ur 0x000559
-ur 0x000561..0x000586
-ur 0x0005d0..0x0005ea
-ur 0x0005f0..0x0005f2
-ur 0x000621..0x00063a
-ur 0x000641..0x00064a
-ur 0x000671..0x0006b7
-ur 0x0006ba..0x0006be
-ur 0x0006c0..0x0006ce
-ur 0x0006d0..0x0006d3
-ur 0x0006d5
-ur 0x0006e5..0x0006e6
-ur 0x000905..0x000939
-ur 0x00093d
-ur 0x000958..0x000961
-ur 0x000985..0x00098c
-ur 0x00098f..0x000990
-ur 0x000993..0x0009a8
-ur 0x0009aa..0x0009b0
-ur 0x0009b2
-ur 0x0009b6..0x0009b9
-ur 0x0009dc..0x0009dd
-ur 0x0009df..0x0009e1
-ur 0x0009f0..0x0009f1
-ur 0x000a05..0x000a0a
-ur 0x000a0f..0x000a10
-ur 0x000a13..0x000a28
-ur 0x000a2a..0x000a30
-ur 0x000a32..0x000a33
-ur 0x000a35..0x000a36
-ur 0x000a38..0x000a39
-ur 0x000a59..0x000a5c
-ur 0x000a5e
-ur 0x000a72..0x000a74
-ur 0x000a85..0x000a8b
-ur 0x000a8d
-ur 0x000a8f..0x000a91
-ur 0x000a93..0x000aa8
-ur 0x000aaa..0x000ab0
-ur 0x000ab2..0x000ab3
-ur 0x000ab5..0x000ab9
-ur 0x000abd
-ur 0x000ae0
-ur 0x000b05..0x000b0c
-ur 0x000b0f..0x000b10
-ur 0x000b13..0x000b28
-ur 0x000b2a..0x000b30
-ur 0x000b32..0x000b33
-ur 0x000b36..0x000b39
-ur 0x000b3d
-ur 0x000b5c..0x000b5d
-ur 0x000b5f..0x000b61
-ur 0x000b85..0x000b8a
-ur 0x000b8e..0x000b90
-ur 0x000b92..0x000b95
-ur 0x000b99..0x000b9a
-ur 0x000b9c
-ur 0x000b9e..0x000b9f
-ur 0x000ba3..0x000ba4
-ur 0x000ba8..0x000baa
-ur 0x000bae..0x000bb5
-ur 0x000bb7..0x000bb9
-ur 0x000c05..0x000c0c
-ur 0x000c0e..0x000c10
-ur 0x000c12..0x000c28
-ur 0x000c2a..0x000c33
-ur 0x000c35..0x000c39
-ur 0x000c60..0x000c61
-ur 0x000c85..0x000c8c
-ur 0x000c8e..0x000c90
-ur 0x000c92..0x000ca8
-ur 0x000caa..0x000cb3
-ur 0x000cb5..0x000cb9
-ur 0x000cde
-ur 0x000ce0..0x000ce1
-ur 0x000d05..0x000d0c
-ur 0x000d0e..0x000d10
-ur 0x000d12..0x000d28
-ur 0x000d2a..0x000d39
-ur 0x000d60..0x000d61
-ur 0x000e01..0x000e2e
-ur 0x000e30
-ur 0x000e32..0x000e33
-ur 0x000e40..0x000e45
-ur 0x000e81..0x000e82
-ur 0x000e84..0x000e84
-ur 0x000e87..0x000e88
-ur 0x000e8a
-ur 0x000e8d
-ur 0x000e94..0x000e97
-ur 0x000e99..0x000e9f
-ur 0x000ea1..0x000ea3
-ur 0x000ea5
-ur 0x000ea7
-ur 0x000eaa..0x000eab
-ur 0x000ead..0x000eae
-ur 0x000eb0
-ur 0x000eb2..0x000eb3
-ur 0x000ebd
-ur 0x000ec0..0x000ec4
-ur 0x000f40..0x000f47
-ur 0x000f49..0x000f69
-ur 0x0010a0..0x0010c5
-ur 0x0010d0..0x0010f6
-ur 0x001100
-ur 0x001102..0x001103
-ur 0x001105..0x001107
-ur 0x001109
-ur 0x00110b..0x00110c
-ur 0x00110e..0x001112
-ur 0x00113c
-ur 0x00113e
-ur 0x001140
-ur 0x00114c
-ur 0x00114e
-ur 0x001150
-ur 0x001154..0x001155
-ur 0x001159
-ur 0x00115f..0x001161
-ur 0x001163
-ur 0x001165
-ur 0x001167
-ur 0x001169
-ur 0x00116d..0x00116e
-ur 0x001172..0x001173
-ur 0x001175
-ur 0x00119e
-ur 0x0011a8
-ur 0x0011ab
-ur 0x0011ae..0x0011af
-ur 0x0011b7..0x0011b8
-ur 0x0011ba
-ur 0x0011bc..0x0011c2
-ur 0x0011eb
-ur 0x0011f0
-ur 0x0011f9
-ur 0x001e00..0x001e9b
-ur 0x001ea0..0x001ef9
-ur 0x001f00..0x001f15
-ur 0x001f18..0x001f1d
-ur 0x001f20..0x001f45
-ur 0x001f48..0x001f4d
-ur 0x001f50..0x001f57
-ur 0x001f59
-ur 0x001f5b
-ur 0x001f5d
-ur 0x001f5f..0x001f7d
-ur 0x001f80..0x001fb4
-ur 0x001fb6..0x001fbc
-ur 0x001fbe
-ur 0x001fc2..0x001fc4
-ur 0x001fc6..0x001fcc
-ur 0x001fd0..0x001fd3
-ur 0x001fd6..0x001fdb
-ur 0x001fe0..0x001fec
-ur 0x001ff2..0x001ff4
-ur 0x001ff6..0x001ffc
-ur 0x002126
-ur 0x00212a..0x00212b
-ur 0x00212e
-ur 0x002180..0x002182
-ur 0x003041..0x003094
-ur 0x0030a1..0x0030fa
-ur 0x003105..0x00312c
-ur 0x00ac00..0x00d7a3
-end
-name xmlIsDigit
-ur 0x30..0x39
-ur 0x660..0x669
-ur 0x6f0..0x6f9
-ur 0x966..0x96f
-ur 0x9e6..0x9ef
-ur 0xa66..0xa6f
-ur 0xae6..0xaef
-ur 0xb66..0xb6f
-ur 0xbe7..0xbef
-ur 0xc66..0xc6f
-ur 0xce6..0xcef
-ur 0xd66..0xd6f
-ur 0xe50..0xe59
-ur 0xed0..0xed9
-ur 0xf20..0xf29
-end
-name xmlIsCombining
-ur 0x0300..0x0345
-ur 0x0360..0x0361
-ur 0x0483..0x0486
-ur 0x0591..0x05A1
-ur 0x05A3..0x05B9
-ur 0x05BB..0x05BD
-ur 0x05BF
-ur 0x05C1..0x05C2
-ur 0x05C4
-ur 0x064B..0x0652
-ur 0x0670
-ur 0x06D6..0x06DC
-ur 0x06DD..0x06DF
-ur 0x06E0..0x06E4
-ur 0x06E7..0x06E8
-ur 0x06EA..0x06ED
-ur 0x0901..0x0903
-ur 0x093C
-ur 0x093E..0x094C
-ur 0x094D
-ur 0x0951..0x0954
-ur 0x0962..0x0963
-ur 0x0981..0x0983
-ur 0x09BC
-ur 0x09BE
-ur 0x09BF
-ur 0x09C0..0x09C4
-ur 0x09C7..0x09C8
-ur 0x09CB..0x09CD
-ur 0x09D7
-ur 0x09E2..0x09E3
-ur 0x0A02
-ur 0x0A3C
-ur 0x0A3E
-ur 0x0A3F
-ur 0x0A40..0x0A42
-ur 0x0A47..0x0A48
-ur 0x0A4B..0x0A4D
-ur 0x0A70..0x0A71
-ur 0x0A81..0x0A83
-ur 0x0ABC
-ur 0x0ABE..0x0AC5
-ur 0x0AC7..0x0AC9
-ur 0x0ACB..0x0ACD
-ur 0x0B01..0x0B03
-ur 0x0B3C
-ur 0x0B3E..0x0B43
-ur 0x0B47..0x0B48
-ur 0x0B4B..0x0B4D
-ur 0x0B56..0x0B57
-ur 0x0B82..0x0B83
-ur 0x0BBE..0x0BC2
-ur 0x0BC6..0x0BC8
-ur 0x0BCA..0x0BCD
-ur 0x0BD7
-ur 0x0C01..0x0C03
-ur 0x0C3E..0x0C44
-ur 0x0C46..0x0C48
-ur 0x0C4A..0x0C4D
-ur 0x0C55..0x0C56
-ur 0x0C82..0x0C83
-ur 0x0CBE..0x0CC4
-ur 0x0CC6..0x0CC8
-ur 0x0CCA..0x0CCD
-ur 0x0CD5..0x0CD6
-ur 0x0D02..0x0D03
-ur 0x0D3E..0x0D43
-ur 0x0D46..0x0D48
-ur 0x0D4A..0x0D4D
-ur 0x0D57
-ur 0x0E31
-ur 0x0E34..0x0E3A
-ur 0x0E47..0x0E4E
-ur 0x0EB1
-ur 0x0EB4..0x0EB9
-ur 0x0EBB..0x0EBC
-ur 0x0EC8..0x0ECD
-ur 0x0F18..0x0F19
-ur 0x0F35
-ur 0x0F37
-ur 0x0F39
-ur 0x0F3E
-ur 0x0F3F
-ur 0x0F71..0x0F84
-ur 0x0F86..0x0F8B
-ur 0x0F90..0x0F95
-ur 0x0F97
-ur 0x0F99..0x0FAD
-ur 0x0FB1..0x0FB7
-ur 0x0FB9
-ur 0x20D0..0x20DC
-ur 0x20E1
-ur 0x302A..0x302F
-ur 0x3099
-ur 0x309A
-end
-name xmlIsExtender
-ur 0xb7 0x2d0 0x2d1 0x387 0x640 0xe46 0xec6 0x3005 0x3031 0x3032
-ur 0x3033 0x3034 0x3035 0x309d 0x309e 0x30fc 0x30fd 0x30fe
-end
+ur 0x0041..0x005A
+ur 0x0061..0x007A
+ur 0x00C0..0x00D6
+ur 0x00D8..0x00F6
+ur 0x00F8..0x00FF
+ur 0x0100..0x0131
+ur 0x0134..0x013E
+ur 0x0141..0x0148
+ur 0x014A..0x017E
+ur 0x0180..0x01C3
+ur 0x01CD..0x01F0
+ur 0x01F4..0x01F5
+ur 0x01FA..0x0217
+ur 0x0250..0x02A8
+ur 0x02BB..0x02C1
+ur 0x0386
+ur 0x0388..0x038A
+ur 0x038C
+ur 0x038E..0x03A1
+ur 0x03A3..0x03CE
+ur 0x03D0..0x03D6
+ur 0x03DA
+ur 0x03DC
+ur 0x03DE
+ur 0x03E0
+ur 0x03E2..0x03F3
+ur 0x0401..0x040C
+ur 0x040E..0x044F
+ur 0x0451..0x045C
+ur 0x045E..0x0481
+ur 0x0490..0x04C4
+ur 0x04C7..0x04C8
+ur 0x04CB..0x04CC
+ur 0x04D0..0x04EB
+ur 0x04EE..0x04F5
+ur 0x04F8..0x04F9
+ur 0x0531..0x0556
+ur 0x0559
+ur 0x0561..0x0586
+ur 0x05D0..0x05EA
+ur 0x05F0..0x05F2
+ur 0x0621..0x063A
+ur 0x0641..0x064A
+ur 0x0671..0x06B7
+ur 0x06BA..0x06BE
+ur 0x06C0..0x06CE
+ur 0x06D0..0x06D3
+ur 0x06D5
+ur 0x06E5..0x06E6
+ur 0x0905..0x0939
+ur 0x093D
+ur 0x0958..0x0961
+ur 0x0985..0x098C
+ur 0x098F..0x0990
+ur 0x0993..0x09A8
+ur 0x09AA..0x09B0
+ur 0x09B2
+ur 0x09B6..0x09B9
+ur 0x09DC..0x09DD
+ur 0x09DF..0x09E1
+ur 0x09F0..0x09F1
+ur 0x0A05..0x0A0A
+ur 0x0A0F..0x0A10
+ur 0x0A13..0x0A28
+ur 0x0A2A..0x0A30
+ur 0x0A32..0x0A33
+ur 0x0A35..0x0A36
+ur 0x0A38..0x0A39
+ur 0x0A59..0x0A5C
+ur 0x0A5E
+ur 0x0A72..0x0A74
+ur 0x0A85..0x0A8B
+ur 0x0A8D
+ur 0x0A8F..0x0A91
+ur 0x0A93..0x0AA8
+ur 0x0AAA..0x0AB0
+ur 0x0AB2..0x0AB3
+ur 0x0AB5..0x0AB9
+ur 0x0ABD
+ur 0x0AE0
+ur 0x0B05..0x0B0C
+ur 0x0B0F..0x0B10
+ur 0x0B13..0x0B28
+ur 0x0B2A..0x0B30
+ur 0x0B32..0x0B33
+ur 0x0B36..0x0B39
+ur 0x0B3D
+ur 0x0B5C..0x0B5D
+ur 0x0B5F..0x0B61
+ur 0x0B85..0x0B8A
+ur 0x0B8E..0x0B90
+ur 0x0B92..0x0B95
+ur 0x0B99..0x0B9A
+ur 0x0B9C
+ur 0x0B9E..0x0B9F
+ur 0x0BA3..0x0BA4
+ur 0x0BA8..0x0BAA
+ur 0x0BAE..0x0BB5
+ur 0x0BB7..0x0BB9
+ur 0x0C05..0x0C0C
+ur 0x0C0E..0x0C10
+ur 0x0C12..0x0C28
+ur 0x0C2A..0x0C33
+ur 0x0C35..0x0C39
+ur 0x0C60..0x0C61
+ur 0x0C85..0x0C8C
+ur 0x0C8E..0x0C90
+ur 0x0C92..0x0CA8
+ur 0x0CAA..0x0CB3
+ur 0x0CB5..0x0CB9
+ur 0x0CDE
+ur 0x0CE0..0x0CE1
+ur 0x0D05..0x0D0C
+ur 0x0D0E..0x0D10
+ur 0x0D12..0x0D28
+ur 0x0D2A..0x0D39
+ur 0x0D60..0x0D61
+ur 0x0E01..0x0E2E
+ur 0x0E30
+ur 0x0E32..0x0E33
+ur 0x0E40..0x0E45
+ur 0x0E81..0x0E82
+ur 0x0E84
+ur 0x0E87..0x0E88
+ur 0x0E8A
+ur 0x0E8D
+ur 0x0E94..0x0E97
+ur 0x0E99..0x0E9F
+ur 0x0EA1..0x0EA3
+ur 0x0EA5
+ur 0x0EA7
+ur 0x0EAA..0x0EAB
+ur 0x0EAD..0x0EAE
+ur 0x0EB0
+ur 0x0EB2..0x0EB3
+ur 0x0EBD
+ur 0x0EC0..0x0EC4
+ur 0x0F40..0x0F47
+ur 0x0F49..0x0F69
+ur 0x10A0..0x10C5
+ur 0x10D0..0x10F6
+ur 0x1100
+ur 0x1102..0x1103
+ur 0x1105..0x1107
+ur 0x1109
+ur 0x110B..0x110C
+ur 0x110E..0x1112
+ur 0x113C
+ur 0x113E
+ur 0x1140
+ur 0x114C
+ur 0x114E
+ur 0x1150
+ur 0x1154..0x1155
+ur 0x1159
+ur 0x115F..0x1161
+ur 0x1163
+ur 0x1165
+ur 0x1167
+ur 0x1169
+ur 0x116D..0x116E
+ur 0x1172..0x1173
+ur 0x1175
+ur 0x119E
+ur 0x11A8
+ur 0x11AB
+ur 0x11AE..0x11AF
+ur 0x11B7..0x11B8
+ur 0x11BA
+ur 0x11BC..0x11C2
+ur 0x11EB
+ur 0x11F0
+ur 0x11F9
+ur 0x1E00..0x1E9B
+ur 0x1EA0..0x1EF9
+ur 0x1F00..0x1F15
+ur 0x1F18..0x1F1D
+ur 0x1F20..0x1F45
+ur 0x1F48..0x1F4D
+ur 0x1F50..0x1F57
+ur 0x1F59
+ur 0x1F5B
+ur 0x1F5D
+ur 0x1F5F..0x1F7D
+ur 0x1F80..0x1FB4
+ur 0x1FB6..0x1FBC
+ur 0x1FBE
+ur 0x1FC2..0x1FC4
+ur 0x1FC6..0x1FCC
+ur 0x1FD0..0x1FD3
+ur 0x1FD6..0x1FDB
+ur 0x1FE0..0x1FEC
+ur 0x1FF2..0x1FF4
+ur 0x1FF6..0x1FFC
+ur 0x2126
+ur 0x212A..0x212B
+ur 0x212E
+ur 0x2180..0x2182
+ur 0x3041..0x3094
+ur 0x30A1..0x30FA
+ur 0x3105..0x312C
+ur 0xAC00..0xD7A3
+end xmlIsBaseChar
+
name xmlIsIdeographic
-ur 0x4300..0x9fa5
-ur 0xf900..0xfa2d
+ur 0x4E00..0x9FA5
+ur 0x3007
ur 0x3021..0x3029
-ur 0x3007
-end
+end xmlIsIdeographic
+
+name xmlIsCombining
+ur 0x0300..0x0345
+ur 0x0360..0x0361
+ur 0x0483..0x0486
+ur 0x0591..0x05A1
+ur 0x05A3..0x05B9
+ur 0x05BB..0x05BD
+ur 0x05BF
+ur 0x05C1..0x05C2
+ur 0x05C4
+ur 0x064B..0x0652
+ur 0x0670
+ur 0x06D6..0x06DC
+ur 0x06DD..0x06DF
+ur 0x06E0..0x06E4
+ur 0x06E7..0x06E8
+ur 0x06EA..0x06ED
+ur 0x0901..0x0903
+ur 0x093C
+ur 0x093E..0x094C
+ur 0x094D
+ur 0x0951..0x0954
+ur 0x0962..0x0963
+ur 0x0981..0x0983
+ur 0x09BC
+ur 0x09BE
+ur 0x09BF
+ur 0x09C0..0x09C4
+ur 0x09C7..0x09C8
+ur 0x09CB..0x09CD
+ur 0x09D7
+ur 0x09E2..0x09E3
+ur 0x0A02
+ur 0x0A3C
+ur 0x0A3E
+ur 0x0A3F
+ur 0x0A40..0x0A42
+ur 0x0A47..0x0A48
+ur 0x0A4B..0x0A4D
+ur 0x0A70..0x0A71
+ur 0x0A81..0x0A83
+ur 0x0ABC
+ur 0x0ABE..0x0AC5
+ur 0x0AC7..0x0AC9
+ur 0x0ACB..0x0ACD
+ur 0x0B01..0x0B03
+ur 0x0B3C
+ur 0x0B3E..0x0B43
+ur 0x0B47..0x0B48
+ur 0x0B4B..0x0B4D
+ur 0x0B56..0x0B57
+ur 0x0B82..0x0B83
+ur 0x0BBE..0x0BC2
+ur 0x0BC6..0x0BC8
+ur 0x0BCA..0x0BCD
+ur 0x0BD7
+ur 0x0C01..0x0C03
+ur 0x0C3E..0x0C44
+ur 0x0C46..0x0C48
+ur 0x0C4A..0x0C4D
+ur 0x0C55..0x0C56
+ur 0x0C82..0x0C83
+ur 0x0CBE..0x0CC4
+ur 0x0CC6..0x0CC8
+ur 0x0CCA..0x0CCD
+ur 0x0CD5..0x0CD6
+ur 0x0D02..0x0D03
+ur 0x0D3E..0x0D43
+ur 0x0D46..0x0D48
+ur 0x0D4A..0x0D4D
+ur 0x0D57
+ur 0x0E31
+ur 0x0E34..0x0E3A
+ur 0x0E47..0x0E4E
+ur 0x0EB1
+ur 0x0EB4..0x0EB9
+ur 0x0EBB..0x0EBC
+ur 0x0EC8..0x0ECD
+ur 0x0F18..0x0F19
+ur 0x0F35
+ur 0x0F37
+ur 0x0F39
+ur 0x0F3E
+ur 0x0F3F
+ur 0x0F71..0x0F84
+ur 0x0F86..0x0F8B
+ur 0x0F90..0x0F95
+ur 0x0F97
+ur 0x0F99..0x0FAD
+ur 0x0FB1..0x0FB7
+ur 0x0FB9
+ur 0x20D0..0x20DC
+ur 0x20E1
+ur 0x302A..0x302F
+ur 0x3099
+ur 0x309A
+end xmlIsCombining
+
+name xmlIsDigit
+ur 0x0030..0x0039
+ur 0x0660..0x0669
+ur 0x06F0..0x06F9
+ur 0x0966..0x096F
+ur 0x09E6..0x09EF
+ur 0x0A66..0x0A6F
+ur 0x0AE6..0x0AEF
+ur 0x0B66..0x0B6F
+ur 0x0BE7..0x0BEF
+ur 0x0C66..0x0C6F
+ur 0x0CE6..0x0CEF
+ur 0x0D66..0x0D6F
+ur 0x0E50..0x0E59
+ur 0x0ED0..0x0ED9
+ur 0x0F20..0x0F29
+end xmlIsDigit
+
+name xmlIsExtender
+ur 0x00B7
+ur 0x02D0
+ur 0x02D1
+ur 0x0387
+ur 0x0640
+ur 0x0E46
+ur 0x0EC6
+ur 0x3005
+ur 0x3031..0x3035
+ur 0x309D..0x309E
+ur 0x30FC..0x30FE
+end xmlIsExtender