libwine: Add C1_DEFINED to our C1 types and set it properly.
This commit is contained in:
parent
49a4e8dfb8
commit
f2b8873b1d
|
@ -378,6 +378,7 @@ extern "C" {
|
|||
#define C1_BLANK 0x0040
|
||||
#define C1_XDIGIT 0x0080
|
||||
#define C1_ALPHA 0x0100
|
||||
#define C1_DEFINED 0x0200
|
||||
|
||||
/* Type 2 flags */
|
||||
#define C2_LEFTTORIGHT 0x0001
|
||||
|
|
|
@ -111,41 +111,42 @@ my %ctype =
|
|||
"cntrl" => 0x0020,
|
||||
"blank" => 0x0040,
|
||||
"xdigit" => 0x0080,
|
||||
"alpha" => 0x0100
|
||||
"alpha" => 0x0100,
|
||||
"defin" => 0x0200
|
||||
);
|
||||
|
||||
my %categories =
|
||||
(
|
||||
"Lu" => $ctype{"alpha"}|$ctype{"upper"}, # Letter, Uppercase
|
||||
"Ll" => $ctype{"alpha"}|$ctype{"lower"}, # Letter, Lowercase
|
||||
"Lt" => $ctype{"alpha"}|$ctype{"upper"}|$ctype{"lower"}, # Letter, Titlecase
|
||||
"Mn" => 0, # Mark, Non-Spacing
|
||||
"Mc" => 0, # Mark, Spacing Combining
|
||||
"Me" => 0, # Mark, Enclosing
|
||||
"Nd" => $ctype{"digit"}, # Number, Decimal Digit
|
||||
"Nl" => $ctype{"alpha"}, # Number, Letter
|
||||
"No" => 0, # Number, Other
|
||||
"Zs" => $ctype{"space"}, # Separator, Space
|
||||
"Zl" => $ctype{"space"}, # Separator, Line
|
||||
"Zp" => $ctype{"space"}, # Separator, Paragraph
|
||||
"Cc" => $ctype{"cntrl"}, # Other, Control
|
||||
"Cf" => $ctype{"cntrl"}, # Other, Format
|
||||
"Cs" => 0, # Other, Surrogate
|
||||
"Co" => 0, # Other, Private Use
|
||||
"Cn" => 0, # Other, Not Assigned
|
||||
"Lm" => $ctype{"alpha"}, # Letter, Modifier
|
||||
"Lo" => $ctype{"alpha"}, # Letter, Other
|
||||
"Pc" => $ctype{"punct"}, # Punctuation, Connector
|
||||
"Pd" => $ctype{"punct"}, # Punctuation, Dash
|
||||
"Ps" => $ctype{"punct"}, # Punctuation, Open
|
||||
"Pe" => $ctype{"punct"}, # Punctuation, Close
|
||||
"Pi" => $ctype{"punct"}, # Punctuation, Initial quote
|
||||
"Pf" => $ctype{"punct"}, # Punctuation, Final quote
|
||||
"Po" => $ctype{"punct"}, # Punctuation, Other
|
||||
"Sm" => 0, # Symbol, Math
|
||||
"Sc" => 0, # Symbol, Currency
|
||||
"Sk" => 0, # Symbol, Modifier
|
||||
"So" => 0 # Symbol, Other
|
||||
"Lu" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"upper"}, # Letter, Uppercase
|
||||
"Ll" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"lower"}, # Letter, Lowercase
|
||||
"Lt" => $ctype{"defin"}|$ctype{"alpha"}|$ctype{"upper"}|$ctype{"lower"}, # Letter, Titlecase
|
||||
"Mn" => $ctype{"defin"}, # Mark, Non-Spacing
|
||||
"Mc" => $ctype{"defin"}, # Mark, Spacing Combining
|
||||
"Me" => $ctype{"defin"}, # Mark, Enclosing
|
||||
"Nd" => $ctype{"defin"}|$ctype{"digit"}, # Number, Decimal Digit
|
||||
"Nl" => $ctype{"defin"}|$ctype{"alpha"}, # Number, Letter
|
||||
"No" => $ctype{"defin"}, # Number, Other
|
||||
"Zs" => $ctype{"defin"}|$ctype{"space"}, # Separator, Space
|
||||
"Zl" => $ctype{"defin"}|$ctype{"space"}, # Separator, Line
|
||||
"Zp" => $ctype{"defin"}|$ctype{"space"}, # Separator, Paragraph
|
||||
"Cc" => $ctype{"defin"}|$ctype{"cntrl"}, # Other, Control
|
||||
"Cf" => $ctype{"defin"}|$ctype{"cntrl"}, # Other, Format
|
||||
"Cs" => $ctype{"defin"}, # Other, Surrogate
|
||||
"Co" => $ctype{"defin"}, # Other, Private Use
|
||||
"Cn" => $ctype{"defin"}, # Other, Not Assigned
|
||||
"Lm" => $ctype{"defin"}|$ctype{"alpha"}, # Letter, Modifier
|
||||
"Lo" => $ctype{"defin"}|$ctype{"alpha"}, # Letter, Other
|
||||
"Pc" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Connector
|
||||
"Pd" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Dash
|
||||
"Ps" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Open
|
||||
"Pe" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Close
|
||||
"Pi" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Initial quote
|
||||
"Pf" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Final quote
|
||||
"Po" => $ctype{"defin"}|$ctype{"punct"}, # Punctuation, Other
|
||||
"Sm" => $ctype{"defin"}, # Symbol, Math
|
||||
"Sc" => $ctype{"defin"}, # Symbol, Currency
|
||||
"Sk" => $ctype{"defin"}, # Symbol, Modifier
|
||||
"So" => $ctype{"defin"} # Symbol, Other
|
||||
);
|
||||
|
||||
# a few characters need additional categories that cannot be determined automatically
|
||||
|
|
4212
libs/wine/wctype.c
4212
libs/wine/wctype.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue