diff options
author | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
---|---|---|
committer | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
commit | cbeb0b26e4c7caa8d1b47de791a7418dc20a4567 (patch) | |
tree | e0f7e445de1aa22a42ef873dc4b1118a8105ae93 /src/cmd/dict/pgw.c | |
parent | 226d80b8213821af0cbf092d1507c52b504fd368 (diff) | |
download | plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.gz plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.bz2 plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.zip |
Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
Diffstat (limited to 'src/cmd/dict/pgw.c')
-rw-r--r-- | src/cmd/dict/pgw.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/cmd/dict/pgw.c b/src/cmd/dict/pgw.c index e3cb9374..8cdaec35 100644 --- a/src/cmd/dict/pgw.c +++ b/src/cmd/dict/pgw.c @@ -6,7 +6,7 @@ enum { Buflen=1000, - Maxaux=5, + Maxaux=5 }; /* Possible tags */ @@ -42,7 +42,7 @@ static Assoc tagtab[] = { {"pos", Pos}, {"sn", Sn}, {"u", U}, - {"wf", Wf}, + {"wf", Wf} }; /* Possible tag auxilliary info */ @@ -659,7 +659,7 @@ static Assoc spectab[] = { {"zced", 0x7a}, /* +cedilla */ {"zeta", 0x3b6}, {"zh", 0x292}, - {"zhacek", 0x17e}, + {"zhacek", 0x17e} }; /* The following special characters don't have close enough @@ -766,7 +766,7 @@ static Rune normtab[128] = { /*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE }; #if 0 static Rune phtab[128] = { @@ -786,7 +786,7 @@ static Rune phtab[128] = { /*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE }; static Rune grtab[128] = { /*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/ @@ -805,7 +805,7 @@ static Rune grtab[128] = { /*60*/ 0x60, 0x3b1, 0x3b2, 0x3be, 0x3b4, 0x3b5, 0x3c6, 0x3b3, 0x3b7, 0x3b9, 0x3c2, 0x3ba, 0x3bb, 0x3bc, 0x3bd, 0x3bf, /*70*/ 0x3c0, 0x3b8, 0x3c1, 0x3c3, 0x3c4, 0x3c5, 0x76, 0x3c9, - 0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE, + 0x3c7, 0x3c8, 0x3b6, 0x7b, 0x7c, 0x7d, 0x7e, NONE }; static Rune subtab[128] = { /*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/ @@ -824,7 +824,7 @@ static Rune subtab[128] = { /*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE }; static Rune suptab[128] = { /*0*/ /*1*/ /*2*/ /*3*/ /*4*/ /*5*/ /*6*/ /*7*/ @@ -843,7 +843,7 @@ static Rune suptab[128] = { /*60*/ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, /*70*/ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, NONE }; #endif @@ -1005,7 +1005,7 @@ pgwnextoff(long fromoff) return (Boffset(bdict)-n); } -static char *prkey = +static char *prkey1 = "KEY TO THE PRONUNCIATION\n" "\n" "I. CONSONANTS\n" @@ -1024,6 +1024,8 @@ static char *prkey = "ʃ ... shop (ʃɒp), dish (dɪʃ)\n" "tʃ ... chop (tʃɒp), ditch (dɪtʃ)\n" "ʒ ... vision (ˈvɪʒən), déjeuner (deʒøne)\n" +; +static char *prkey2 = "dʒ ... judge (dʒʌdʒ)\n" "ŋ ... singing (ˈsɪŋɪŋ), think (θiŋk)\n" "ŋg ... finger (ˈfiŋgə(r))\n" @@ -1037,6 +1039,8 @@ static char *prkey = "c ... Afrikaans baardmannetjie (ˈbaːrtmanəci)\n" "ɥ ... Fr. cuisine (kɥizin)\n" "\n" +; +static char *prkey3 = "II. VOWELS AND DIPTHONGS\n" "\n" "Short\n" @@ -1055,6 +1059,8 @@ static char *prkey = "ɔ ... Fr. homme (ɔm)\n" "o ... Fr. eau (o)\n" "ø ... Fr. peu (pø)\n" +; +static char *prkey4 = "œ ... Fr. boeuf (bœf), coeur (kœr)\n" "u ... Fr. douce (dus)\n" "ʏ ... Ger. Müller (ˈmʏlər)\n" @@ -1073,6 +1079,8 @@ static char *prkey = "øː ... Ger. Goethe (gøːtə)\n" "yː ... Ger. grün (gryːn)\n" "\n" +; +static char *prkey5 = "Nasal\n" "ɛ˜, æ˜ as in Fr. fin (fɛ˜, fæ˜)\n" "ã ... Fr. franc (frã)\n" @@ -1090,6 +1098,8 @@ static char *prkey = "ʊə ... tour (tʊə(r))\n" "ɔə ... boar (bɔə(r))\n" "\n" +; +static char *prkey6 = "III. STRESS\n" "\n" "Main stress: ˈ preceding stressed syllable\n" @@ -1101,7 +1111,8 @@ static char *prkey = void pgwprintkey(void) { - Bprint(bout, "%s", prkey); + Bprint(bout, "%s%s%s%s%s%s", + prkey1, prkey2, prkey3, prkey4, prkey5, prkey6); } /* |