X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=cbits%2Fubconfc;h=47637a9ef48e97b2c35ee2141c9b92cf050bc023;hb=9708f4c2dd652dfd4a0181e35d184b852124d547;hp=6344eccafe9dc04a097d63b436e3d5c0da9c6526;hpb=66681b296084bc3683cab50986402e5da27f5912;p=ghc-base.git

diff --git a/cbits/ubconfc b/cbits/ubconfc
index 6344ecc..47637a9 100644
--- a/cbits/ubconfc
+++ b/cbits/ubconfc
@@ -153,8 +153,8 @@ function dumpblock()
 	updist=up-self
 	lowdist=low-self
 	titledist=title-self
-	rule="GENCAT_"cat", NUMCAT_"cat", "((convpos==1)?
-				("1, " updist ", " lowdist ", " titledist):
+	rule="GENCAT_"cat", NUMCAT_"cat", "((convpos==1)?                   \
+				("1, " updist ", " lowdist ", " titledist): \
 				("0, 0, 0, 0"))
 	if(cats[cat]=="")
 	{
@@ -308,7 +308,12 @@ int p(int c) \\
 */
 
 unipred(u_iswcntrl,GENCAT_CC)
-unipred(u_iswprint,~(GENCAT_ZL|GENCAT_ZP|GENCAT_CC|GENCAT_CF|GENCAT_CS|GENCAT_CO))
+unipred(u_iswprint, \
+(GENCAT_MC | GENCAT_NO | GENCAT_SK | GENCAT_ME | GENCAT_ND | \
+  GENCAT_PO | GENCAT_LT | GENCAT_PC | GENCAT_SM | GENCAT_ZS | \
+  GENCAT_LU | GENCAT_PD | GENCAT_SO | GENCAT_PE | GENCAT_PF | \
+  GENCAT_PS | GENCAT_SC | GENCAT_LL | GENCAT_LM | GENCAT_PI | \
+  GENCAT_NL | GENCAT_MN | GENCAT_LO))
 unipred_s(u_iswspace,GENCAT_ZS)
 unipred(u_iswupper,(GENCAT_LU|GENCAT_LT))
 unipred(u_iswlower,GENCAT_LL)
@@ -324,7 +329,7 @@ int p(int c) \\
 { \\
 	const struct _convrule_ *rule=getrule(convchars,NUM_CONVBLOCKS,c);\\
 	if(rule==&nullrule) return c;\\
-	return c+rule->##to;\\
+	return c+rule->to;\\
 }
 
 caseconv(u_towupper,updist)