diff options
| author | David Aspinall | 2003-09-24 22:57:23 +0000 |
|---|---|---|
| committer | David Aspinall | 2003-09-24 22:57:23 +0000 |
| commit | ccf89d821d14ee75e0917f9e579f7a4f4958ecb7 (patch) | |
| tree | 818421c013debacf8084d27e5603e598311036ab | |
| parent | 41f47cd0f0657b06270df089ac9f6c2c2863f642 (diff) | |
Update to 4.5.1-beta from sourceforge.
35 files changed, 1914 insertions, 4605 deletions
diff --git a/x-symbol/README.x-symbol-for-ProofGeneral b/x-symbol/README.x-symbol-for-ProofGeneral index ff96e392..d11cfad5 100644 --- a/x-symbol/README.x-symbol-for-ProofGeneral +++ b/x-symbol/README.x-symbol-for-ProofGeneral @@ -2,7 +2,7 @@ The code in this directory is taken from http://x-symbol.sourceforge.net/ -This is version 4.5 (based on pacakge release direct from author) +This is version 4.5.1-beta No changes have been made for Proof General, although the following rearrangements from the package directory layout diff --git a/x-symbol/etc/Makefile.emacs b/x-symbol/etc/Makefile.emacs index 8b22137e..2e2047f8 100644 --- a/x-symbol/etc/Makefile.emacs +++ b/x-symbol/etc/Makefile.emacs @@ -3,7 +3,7 @@ ## Copyright (C) 2002 Free Software Foundation, Inc. ## Author: Masayuki Ataka <ataka@milk.freemail.ne.jp> -## Version: 4.4.X +## Version: 4.5 ## Keywords: fonts, WYSIWYG, LaTeX, HTML, wp, math ## X-URL: http://x-symbol.sourceforge.net/ ## X-URL: http://isweb22.infoseek.co.jp/computer/pop-club/emacs/TeX.html diff --git a/x-symbol/etc/fonts/Makefile b/x-symbol/etc/fonts/Makefile index 20b032f7..55c047fd 100644 --- a/x-symbol/etc/fonts/Makefile +++ b/x-symbol/etc/fonts/Makefile @@ -1,7 +1,7 @@ ### Makefile --- create fonts for package x-symbol ## Author: Christoph Wedler <wedler@users.sourceforge.net> -## Version: 4.4 +## Version: 4.5 ## Keywords: fonts, WYSIWYG, LaTeX, HTML, wp, math ## X-URL: http://x-symbol.sourceforge.net/ @@ -79,8 +79,7 @@ echo: mkdirs: -if [ ! -d $(GENFONTS) ]; then mkdir $(GENFONTS); fi - -if [ ! -d $(PCFDIR) ]; then mkdir $(PCFDIR); \ - else rm -f $(PCFDIR)/*.pcf ; fi; + -if [ ! -d $(PCFDIR) ]; then mkdir $(PCFDIR); fi gens: $(GENS) diff --git a/x-symbol/etc/fonts/heriR12.bdf b/x-symbol/etc/fonts/heriR12.bdf index c3e15b79..f4e6b91a 100644 --- a/x-symbol/etc/fonts/heriR12.bdf +++ b/x-symbol/etc/fonts/heriR12.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1543,18 +1543,21 @@ F0 48 B0 ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 7 0 -BBX 6 6 0 1 +BBX 5 9 1 0 BITMAP -84 -78 -48 -48 -78 -84 +00 +00 +38 +40 +F8 +40 +F0 +40 +38 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1572,23 +1575,24 @@ F8 20 20 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 11 1 -2 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 8 0 +BBX 6 12 1 0 BITMAP -80 -80 -80 -80 -00 -00 +28 +10 00 +78 +84 80 -80 -80 -80 +60 +18 +04 +84 +84 +78 ENDCHAR STARTCHAR section ENCODING 167 @@ -1609,13 +1613,22 @@ BITMAP 88 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 1 0 8 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 4 10 1 0 BITMAP A0 +40 +00 +60 +90 +80 +60 +10 +90 +60 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1749,14 +1762,24 @@ E0 20 C0 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 8 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 12 1 0 BITMAP +28 +10 +00 +FE +02 +04 +08 +10 +20 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1802,16 +1825,22 @@ BBX 1 1 1 3 BITMAP 80 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 -3 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 5 10 0 0 BITMAP -40 +50 20 +00 +F8 +08 +10 20 -C0 +40 +80 +F8 ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -1849,53 +1878,53 @@ A0 50 A0 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 0 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 12 0 +BBX 10 9 1 0 BITMAP -4100 -C200 +3FC0 4400 +8400 +8400 +87C0 +8400 +8400 4400 -4900 -1300 -1500 -2780 -4100 +3FC0 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 0 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 11 0 +BBX 9 7 1 0 BITMAP -4100 -C200 -4400 -4800 -4B00 -1480 -1100 -2200 -4780 +7700 +8880 +8880 +8F80 +8800 +8880 +7700 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 0 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 11 1 0 BITMAP -E100 -2200 -4400 -2400 -C900 -0B00 -1500 -1780 -2100 +28 +00 +82 +82 +44 +44 +28 +10 +10 +10 +10 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3031,507 +3060,4 @@ BITMAP 20 C0 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 6 9 0 0 -BITMAP -40 -40 -50 -60 -C0 -40 -40 -40 -7C -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 10 9 1 0 -BITMAP -3FC0 -4400 -8400 -8400 -87C0 -8400 -8400 -4400 -3FC0 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 8 0 -BBX 6 12 1 0 -BITMAP -28 -10 -00 -78 -84 -80 -60 -18 -04 -84 -84 -78 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 11 1 0 -BITMAP -28 -00 -82 -82 -44 -44 -28 -10 -10 -10 -10 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 12 1 0 -BITMAP -28 -10 -00 -FE -02 -04 -08 -10 -20 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 8 -BITMAP -90 -60 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 3 3 1 3 -BITMAP -40 -E0 -40 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 8 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 8 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 -3 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -20 -20 -20 -20 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 -3 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -F8 -20 -20 -20 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 1 1 1 8 -BITMAP -80 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 7 1 0 -BITMAP -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 1 1 0 -BITMAP -8880 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 12 1 0 3 -BITMAP -FFF0 -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 7 1 0 3 -BITMAP -FE -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 0 -BITMAP -38 -40 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 0 -BITMAP -38 -48 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 6 0 -BBX 4 11 1 -2 -BITMAP -30 -40 -40 -E0 -40 -40 -40 -40 -40 -40 -80 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 4 0 -BBX 5 8 -1 0 -BITMAP -08 -10 -10 -20 -20 -40 -40 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 8 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 1 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 1 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 8 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 9 0 0 -BITMAP -40 -40 -40 -60 -C0 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 11 0 -BBX 9 7 1 0 -BITMAP -7700 -8880 -8880 -8F80 -8800 -8880 -7700 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 -3 -BITMAP -40 -80 -80 -60 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 13 8 0 0 -BITMAP -6200 -9400 -9400 -6800 -0B30 -14C8 -14C8 -2330 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 -2 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 6 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 6 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 -2 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 6 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 3 0 7 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 4 10 1 0 -BITMAP -A0 -40 -00 -60 -90 -80 -60 -10 -90 -60 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 8 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 5 1 4 -BITMAP -E880 -4D80 -4D80 -4A80 -4A80 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 10 0 0 -BITMAP -50 -20 -00 -F8 -08 -10 -20 -40 -80 -F8 -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 9 1 0 -BITMAP -00 -00 -38 -40 -F8 -40 -F0 -40 -38 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/fonts/heriR14.bdf b/x-symbol/etc/fonts/heriR14.bdf index 5090b4a7..ec821ac8 100644 --- a/x-symbol/etc/fonts/heriR14.bdf +++ b/x-symbol/etc/fonts/heriR14.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1685,18 +1685,22 @@ F8 62 DC ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 8 0 -BBX 6 6 1 2 +BBX 6 10 1 0 BITMAP -84 -78 -48 -48 -78 -84 +00 +18 +24 +40 +F8 +40 +F0 +40 +24 +18 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1715,25 +1719,26 @@ FE 10 10 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 13 1 -2 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 14 1 0 BITMAP -80 -80 -80 -80 -80 -00 -00 +28 +10 00 +38 +C6 +82 80 -80 -80 -80 -80 +60 +18 +06 +02 +82 +C6 +38 ENDCHAR STARTCHAR section ENCODING 167 @@ -1756,13 +1761,23 @@ C8 D8 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 1 0 9 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 6 11 1 0 BITMAP -D8 +50 +20 +00 +78 +84 +80 +78 +0C +04 +84 +78 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1904,14 +1919,26 @@ BITMAP 90 60 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 2 9 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 14 1 0 BITMAP +28 +10 +00 +FE +02 +04 +08 +18 +10 +20 +60 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1960,15 +1987,23 @@ BBX 2 1 1 4 BITMAP C0 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 -3 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 7 0 +BBX 6 11 0 0 BITMAP +50 20 -90 -60 +00 +FC +04 +08 +10 +20 +40 +80 +FC ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -2009,59 +2044,58 @@ BITMAP 48 90 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 10 11 1 0 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 15 0 +BBX 13 11 1 0 BITMAP +1FF8 +6300 4100 -C200 -4200 -4400 -4400 -4880 -0980 -1280 -1480 -27C0 -2080 +8100 +8100 +81F8 +8100 +8100 +4100 +6300 +1FF8 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 9 11 1 0 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 13 0 +BBX 11 8 1 0 BITMAP -4200 -C400 -4400 -4800 -4800 -5300 -1480 -2080 -2100 -4200 -4780 +7BC0 +CE60 +8420 +87E0 +8400 +8400 +CE60 +7BC0 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 11 11 0 0 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 9 13 0 0 BITMAP -6080 -9100 -2100 -1200 -9200 -6440 -04C0 -0940 -0A40 -13E0 -1040 +3600 +0000 +8080 +4100 +4100 +2200 +2200 +1400 +0800 +0800 +0800 +0800 +0800 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3296,541 +3330,4 @@ C2 30 60 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 9 0 -BBX 8 11 0 0 -BITMAP -20 -20 -20 -28 -30 -60 -A0 -20 -20 -20 -3F -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 13 11 1 0 -BITMAP -1FF8 -6300 -4100 -8100 -8100 -81F8 -8100 -8100 -4100 -6300 -1FF8 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 14 1 0 -BITMAP -28 -10 -00 -38 -C6 -82 -80 -60 -18 -06 -02 -82 -C6 -38 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 9 13 0 0 -BITMAP -3600 -0000 -8080 -4100 -4100 -2200 -2200 -1400 -0800 -0800 -0800 -0800 -0800 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 14 1 0 -BITMAP -28 -10 -00 -FE -02 -04 -08 -18 -10 -20 -60 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 9 -BITMAP -88 -70 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 4 4 1 3 -BITMAP -60 -F0 -F0 -60 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 9 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 9 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 -3 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -10 -10 -10 -10 -10 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 -3 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -FE -10 -10 -10 -10 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 2 1 1 9 -BITMAP -C0 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 8 1 0 -BITMAP -80 -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 12 1 1 0 -BITMAP -C630 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 14 1 0 4 -BITMAP -FFFC -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 1 0 4 -BITMAP -FF -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 0 -BITMAP -38 -40 -40 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 0 -BITMAP -38 -48 -48 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 13 0 -3 -BITMAP -07 -08 -08 -7E -10 -10 -10 -10 -10 -20 -20 -20 -C0 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 3 0 -BBX 5 10 -1 0 -BITMAP -08 -08 -10 -10 -20 -20 -40 -40 -80 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 1 9 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 2 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 2 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 8 -BITMAP -28 -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 11 0 0 -BITMAP -40 -40 -40 -40 -60 -C0 -40 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 13 0 -BBX 11 8 1 0 -BITMAP -7BC0 -CE60 -8420 -87E0 -8400 -8400 -CE60 -7BC0 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 3 2 -3 -BITMAP -40 -80 -E0 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 11 1 0 -BITMAP -0100 -6200 -9200 -9400 -6400 -0800 -1000 -16C0 -2920 -2920 -46C0 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 -2 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 0 8 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 1 8 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 -2 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 8 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 9 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 8 0 -BBX 6 11 1 0 -BITMAP -50 -20 -00 -78 -84 -80 -78 -0C -04 -84 -78 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 9 -BITMAP -68 -B0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 6 1 5 -BITMAP -FA20 -2360 -22A0 -22A0 -22A0 -22A0 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 7 0 -BBX 6 11 0 0 -BITMAP -50 -20 -00 -FC -04 -08 -10 -20 -40 -80 -FC -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 6 10 1 0 -BITMAP -00 -18 -24 -40 -F8 -40 -F0 -40 -24 -18 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/genfonts/heriR12sub.bdf b/x-symbol/etc/genfonts/heriR12sub.bdf index 33e16c91..fef7cf67 100644 --- a/x-symbol/etc/genfonts/heriR12sub.bdf +++ b/x-symbol/etc/genfonts/heriR12sub.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1543,18 +1543,21 @@ F0 48 B0 ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 7 0 -BBX 6 6 0 -2 +BBX 5 9 1 -3 BITMAP -84 -78 -48 -48 -78 -84 +00 +00 +38 +40 +F8 +40 +F0 +40 +38 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1572,23 +1575,24 @@ F8 20 20 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 11 1 -5 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 8 0 +BBX 6 12 1 -3 BITMAP -80 -80 -80 -80 -00 -00 +28 +10 00 +78 +84 80 -80 -80 -80 +60 +18 +04 +84 +84 +78 ENDCHAR STARTCHAR section ENCODING 167 @@ -1609,13 +1613,22 @@ BITMAP 88 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 1 0 5 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 4 10 1 -3 BITMAP A0 +40 +00 +60 +90 +80 +60 +10 +90 +60 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1749,14 +1762,24 @@ E0 20 C0 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 5 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 12 1 -3 BITMAP +28 +10 +00 +FE +02 +04 +08 +10 +20 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1802,16 +1825,22 @@ BBX 1 1 1 0 BITMAP 80 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 -6 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 5 10 0 -3 BITMAP -40 +50 20 +00 +F8 +08 +10 20 -C0 +40 +80 +F8 ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -1849,53 +1878,53 @@ A0 50 A0 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 -3 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 12 0 +BBX 10 9 1 -3 BITMAP -4100 -C200 +3FC0 4400 +8400 +8400 +87C0 +8400 +8400 4400 -4900 -1300 -1500 -2780 -4100 +3FC0 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 -3 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 11 0 +BBX 9 7 1 -3 BITMAP -4100 -C200 -4400 -4800 -4B00 -1480 -1100 -2200 -4780 +7700 +8880 +8880 +8F80 +8800 +8880 +7700 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 -3 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 11 1 -3 BITMAP -E100 -2200 -4400 -2400 -C900 -0B00 -1500 -1780 -2100 +28 +00 +82 +82 +44 +44 +28 +10 +10 +10 +10 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3031,507 +3060,4 @@ BITMAP 20 C0 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 6 9 0 -3 -BITMAP -40 -40 -50 -60 -C0 -40 -40 -40 -7C -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 10 9 1 -3 -BITMAP -3FC0 -4400 -8400 -8400 -87C0 -8400 -8400 -4400 -3FC0 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 8 0 -BBX 6 12 1 -3 -BITMAP -28 -10 -00 -78 -84 -80 -60 -18 -04 -84 -84 -78 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 11 1 -3 -BITMAP -28 -00 -82 -82 -44 -44 -28 -10 -10 -10 -10 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 12 1 -3 -BITMAP -28 -10 -00 -FE -02 -04 -08 -10 -20 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 5 -BITMAP -90 -60 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 3 3 1 0 -BITMAP -40 -E0 -40 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 5 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 5 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 -6 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -20 -20 -20 -20 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 -6 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -F8 -20 -20 -20 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 1 1 1 5 -BITMAP -80 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 7 1 -3 -BITMAP -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 1 1 -3 -BITMAP -8880 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 12 1 0 0 -BITMAP -FFF0 -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 7 1 0 0 -BITMAP -FE -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 -3 -BITMAP -38 -40 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 -3 -BITMAP -38 -48 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 6 0 -BBX 4 11 1 -5 -BITMAP -30 -40 -40 -E0 -40 -40 -40 -40 -40 -40 -80 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 4 0 -BBX 5 8 -1 -3 -BITMAP -08 -10 -10 -20 -20 -40 -40 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 5 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 -2 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 -2 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 5 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 9 0 -3 -BITMAP -40 -40 -40 -60 -C0 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 11 0 -BBX 9 7 1 -3 -BITMAP -7700 -8880 -8880 -8F80 -8800 -8880 -7700 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 -6 -BITMAP -40 -80 -80 -60 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 13 8 0 -3 -BITMAP -6200 -9400 -9400 -6800 -0B30 -14C8 -14C8 -2330 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 -5 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 3 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 3 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 -5 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 3 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 3 0 4 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 4 10 1 -3 -BITMAP -A0 -40 -00 -60 -90 -80 -60 -10 -90 -60 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 5 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 5 1 1 -BITMAP -E880 -4D80 -4D80 -4A80 -4A80 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 10 0 -3 -BITMAP -50 -20 -00 -F8 -08 -10 -20 -40 -80 -F8 -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 9 1 -3 -BITMAP -00 -00 -38 -40 -F8 -40 -F0 -40 -38 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/genfonts/heriR12sup.bdf b/x-symbol/etc/genfonts/heriR12sup.bdf index 116dba6c..60b03c26 100644 --- a/x-symbol/etc/genfonts/heriR12sup.bdf +++ b/x-symbol/etc/genfonts/heriR12sup.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1543,18 +1543,21 @@ F0 48 B0 ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 7 0 -BBX 6 6 0 5 +BBX 5 9 1 4 BITMAP -84 -78 -48 -48 -78 -84 +00 +00 +38 +40 +F8 +40 +F0 +40 +38 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1572,23 +1575,24 @@ F8 20 20 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 11 1 2 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 8 0 +BBX 6 12 1 4 BITMAP -80 -80 -80 -80 -00 -00 +28 +10 00 +78 +84 80 -80 -80 -80 +60 +18 +04 +84 +84 +78 ENDCHAR STARTCHAR section ENCODING 167 @@ -1609,13 +1613,22 @@ BITMAP 88 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 1 0 12 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 4 10 1 4 BITMAP A0 +40 +00 +60 +90 +80 +60 +10 +90 +60 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1749,14 +1762,24 @@ E0 20 C0 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 12 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 12 1 4 BITMAP +28 +10 +00 +FE +02 +04 +08 +10 +20 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1802,16 +1825,22 @@ BBX 1 1 1 7 BITMAP 80 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 1 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 5 10 0 4 BITMAP -40 +50 20 +00 +F8 +08 +10 20 -C0 +40 +80 +F8 ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -1849,53 +1878,53 @@ A0 50 A0 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 4 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 12 0 +BBX 10 9 1 4 BITMAP -4100 -C200 +3FC0 4400 +8400 +8400 +87C0 +8400 +8400 4400 -4900 -1300 -1500 -2780 -4100 +3FC0 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 4 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 11 0 +BBX 9 7 1 4 BITMAP -4100 -C200 -4400 -4800 -4B00 -1480 -1100 -2200 -4780 +7700 +8880 +8880 +8F80 +8800 +8880 +7700 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 10 0 -BBX 9 9 0 4 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 11 1 4 BITMAP -E100 -2200 -4400 -2400 -C900 -0B00 -1500 -1780 -2100 +28 +00 +82 +82 +44 +44 +28 +10 +10 +10 +10 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3031,507 +3060,4 @@ BITMAP 20 C0 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 6 9 0 4 -BITMAP -40 -40 -50 -60 -C0 -40 -40 -40 -7C -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 10 9 1 4 -BITMAP -3FC0 -4400 -8400 -8400 -87C0 -8400 -8400 -4400 -3FC0 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 8 0 -BBX 6 12 1 4 -BITMAP -28 -10 -00 -78 -84 -80 -60 -18 -04 -84 -84 -78 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 11 1 4 -BITMAP -28 -00 -82 -82 -44 -44 -28 -10 -10 -10 -10 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 12 1 4 -BITMAP -28 -10 -00 -FE -02 -04 -08 -10 -20 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 12 -BITMAP -90 -60 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 3 3 1 7 -BITMAP -40 -E0 -40 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 12 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 2 0 12 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 1 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -20 -20 -20 -20 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 12 1 1 -BITMAP -20 -20 -20 -F8 -20 -20 -20 -20 -F8 -20 -20 -20 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 1 1 1 12 -BITMAP -80 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 7 1 4 -BITMAP -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 1 1 4 -BITMAP -8880 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 12 0 -BBX 12 1 0 7 -BITMAP -FFF0 -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 7 1 0 7 -BITMAP -FE -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 4 -BITMAP -38 -40 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 9 0 4 -BITMAP -38 -48 -E8 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 6 0 -BBX 4 11 1 2 -BITMAP -30 -40 -40 -E0 -40 -40 -40 -40 -40 -40 -80 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 4 0 -BBX 5 8 -1 4 -BITMAP -08 -10 -10 -20 -20 -40 -40 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 2 0 -BBX 2 2 0 12 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 5 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 5 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 12 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 9 0 4 -BITMAP -40 -40 -40 -60 -C0 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 11 0 -BBX 9 7 1 4 -BITMAP -7700 -8880 -8880 -8F80 -8800 -8880 -7700 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 3 0 -BBX 3 4 0 1 -BITMAP -40 -80 -80 -60 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 13 8 0 4 -BITMAP -6200 -9400 -9400 -6800 -0B30 -14C8 -14C8 -2330 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 2 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 10 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 10 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 2 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 10 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 3 0 11 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 4 10 1 4 -BITMAP -A0 -40 -00 -60 -90 -80 -60 -10 -90 -60 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 4 2 0 12 -BITMAP -50 -A0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 11 0 -BBX 9 5 1 8 -BITMAP -E880 -4D80 -4D80 -4A80 -4A80 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 10 0 4 -BITMAP -50 -20 -00 -F8 -08 -10 -20 -40 -80 -F8 -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 7 0 -BBX 5 9 1 4 -BITMAP -00 -00 -38 -40 -F8 -40 -F0 -40 -38 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/genfonts/heriR14sub.bdf b/x-symbol/etc/genfonts/heriR14sub.bdf index 50f5a5de..32ab3ec4 100644 --- a/x-symbol/etc/genfonts/heriR14sub.bdf +++ b/x-symbol/etc/genfonts/heriR14sub.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1685,18 +1685,22 @@ F8 62 DC ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 8 0 -BBX 6 6 1 -1 +BBX 6 10 1 -3 BITMAP -84 -78 -48 -48 -78 -84 +00 +18 +24 +40 +F8 +40 +F0 +40 +24 +18 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1715,25 +1719,26 @@ FE 10 10 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 13 1 -5 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 14 1 -3 BITMAP -80 -80 -80 -80 -80 -00 -00 +28 +10 00 +38 +C6 +82 80 -80 -80 -80 -80 +60 +18 +06 +02 +82 +C6 +38 ENDCHAR STARTCHAR section ENCODING 167 @@ -1756,13 +1761,23 @@ C8 D8 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 1 0 6 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 6 11 1 -3 BITMAP -D8 +50 +20 +00 +78 +84 +80 +78 +0C +04 +84 +78 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1904,14 +1919,26 @@ BITMAP 90 60 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 2 6 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 14 1 -3 BITMAP +28 +10 +00 +FE +02 +04 +08 +18 +10 +20 +60 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1960,15 +1987,23 @@ BBX 2 1 1 1 BITMAP C0 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 -6 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 7 0 +BBX 6 11 0 -3 BITMAP +50 20 -90 -60 +00 +FC +04 +08 +10 +20 +40 +80 +FC ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -2009,59 +2044,58 @@ BITMAP 48 90 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 10 11 1 -3 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 15 0 +BBX 13 11 1 -3 BITMAP +1FF8 +6300 4100 -C200 -4200 -4400 -4400 -4880 -0980 -1280 -1480 -27C0 -2080 +8100 +8100 +81F8 +8100 +8100 +4100 +6300 +1FF8 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 9 11 1 -3 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 13 0 +BBX 11 8 1 -3 BITMAP -4200 -C400 -4400 -4800 -4800 -5300 -1480 -2080 -2100 -4200 -4780 +7BC0 +CE60 +8420 +87E0 +8400 +8400 +CE60 +7BC0 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 11 11 0 -3 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 9 13 0 -3 BITMAP -6080 -9100 -2100 -1200 -9200 -6440 -04C0 -0940 -0A40 -13E0 -1040 +3600 +0000 +8080 +4100 +4100 +2200 +2200 +1400 +0800 +0800 +0800 +0800 +0800 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3296,541 +3330,4 @@ C2 30 60 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 9 0 -BBX 8 11 0 -3 -BITMAP -20 -20 -20 -28 -30 -60 -A0 -20 -20 -20 -3F -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 13 11 1 -3 -BITMAP -1FF8 -6300 -4100 -8100 -8100 -81F8 -8100 -8100 -4100 -6300 -1FF8 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 14 1 -3 -BITMAP -28 -10 -00 -38 -C6 -82 -80 -60 -18 -06 -02 -82 -C6 -38 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 9 13 0 -3 -BITMAP -3600 -0000 -8080 -4100 -4100 -2200 -2200 -1400 -0800 -0800 -0800 -0800 -0800 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 14 1 -3 -BITMAP -28 -10 -00 -FE -02 -04 -08 -18 -10 -20 -60 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 6 -BITMAP -88 -70 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 4 4 1 0 -BITMAP -60 -F0 -F0 -60 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 6 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 6 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 -6 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -10 -10 -10 -10 -10 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 -6 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -FE -10 -10 -10 -10 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 2 1 1 6 -BITMAP -C0 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 8 1 -3 -BITMAP -80 -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 12 1 1 -3 -BITMAP -C630 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 14 1 0 1 -BITMAP -FFFC -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 1 0 1 -BITMAP -FF -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 -3 -BITMAP -38 -40 -40 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 -3 -BITMAP -38 -48 -48 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 13 0 -6 -BITMAP -07 -08 -08 -7E -10 -10 -10 -10 -10 -20 -20 -20 -C0 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 3 0 -BBX 5 10 -1 -3 -BITMAP -08 -08 -10 -10 -20 -20 -40 -40 -80 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 1 6 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 -1 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 -1 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 5 -BITMAP -28 -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 11 0 -3 -BITMAP -40 -40 -40 -40 -60 -C0 -40 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 13 0 -BBX 11 8 1 -3 -BITMAP -7BC0 -CE60 -8420 -87E0 -8400 -8400 -CE60 -7BC0 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 3 2 -6 -BITMAP -40 -80 -E0 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 11 1 -3 -BITMAP -0100 -6200 -9200 -9400 -6400 -0800 -1000 -16C0 -2920 -2920 -46C0 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 -5 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 0 5 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 1 5 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 -5 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 5 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 6 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 8 0 -BBX 6 11 1 -3 -BITMAP -50 -20 -00 -78 -84 -80 -78 -0C -04 -84 -78 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 6 -BITMAP -68 -B0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 6 1 2 -BITMAP -FA20 -2360 -22A0 -22A0 -22A0 -22A0 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 7 0 -BBX 6 11 0 -3 -BITMAP -50 -20 -00 -FC -04 -08 -10 -20 -40 -80 -FC -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 6 10 1 -3 -BITMAP -00 -18 -24 -40 -F8 -40 -F0 -40 -24 -18 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/genfonts/heriR14sup.bdf b/x-symbol/etc/genfonts/heriR14sup.bdf index 618f49de..f34ea909 100644 --- a/x-symbol/etc/genfonts/heriR14sup.bdf +++ b/x-symbol/etc/genfonts/heriR14sup.bdf @@ -59,7 +59,7 @@ RELATIVE_WEIGHT 50 CHARSET_COLLECTIONS "ASCII ISO8859-15 ADOBE-STANDARD" FULL_NAME "Herilane" ENDPROPERTIES -CHARS 230 +CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 @@ -1685,18 +1685,22 @@ F8 62 DC ENDCHAR -STARTCHAR currency -ENCODING -1 +STARTCHAR Euro +ENCODING 164 SWIDTH 556 0 DWIDTH 8 0 -BBX 6 6 1 7 +BBX 6 10 1 5 BITMAP -84 -78 -48 -48 -78 -84 +00 +18 +24 +40 +F8 +40 +F0 +40 +24 +18 ENDCHAR STARTCHAR yen ENCODING 165 @@ -1715,25 +1719,26 @@ FE 10 10 ENDCHAR -STARTCHAR brokenbar -ENCODING -1 -SWIDTH 260 0 -DWIDTH 3 0 -BBX 1 13 1 3 +STARTCHAR Scaron +ENCODING 166 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 7 14 1 5 BITMAP -80 -80 -80 -80 -80 -00 -00 +28 +10 00 +38 +C6 +82 80 -80 -80 -80 -80 +60 +18 +06 +02 +82 +C6 +38 ENDCHAR STARTCHAR section ENCODING 167 @@ -1756,13 +1761,23 @@ C8 D8 70 ENDCHAR -STARTCHAR dieresis -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 1 0 14 +STARTCHAR scaron +ENCODING 168 +SWIDTH 500 0 +DWIDTH 8 0 +BBX 6 11 1 5 BITMAP -D8 +50 +20 +00 +78 +84 +80 +78 +0C +04 +84 +78 ENDCHAR STARTCHAR copyright ENCODING 169 @@ -1904,14 +1919,26 @@ BITMAP 90 60 ENDCHAR -STARTCHAR acute -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 2 14 +STARTCHAR Zcaron +ENCODING 180 +SWIDTH 611 0 +DWIDTH 9 0 +BBX 7 14 1 5 BITMAP +28 +10 +00 +FE +02 +04 +08 +18 +10 +20 +60 40 80 +FE ENDCHAR STARTCHAR mu ENCODING 181 @@ -1960,15 +1987,23 @@ BBX 2 1 1 9 BITMAP C0 ENDCHAR -STARTCHAR cedilla -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 2 +STARTCHAR zcaron +ENCODING 184 +SWIDTH 500 0 +DWIDTH 7 0 +BBX 6 11 0 5 BITMAP +50 20 -90 -60 +00 +FC +04 +08 +10 +20 +40 +80 +FC ENDCHAR STARTCHAR onesuperior ENCODING 185 @@ -2009,59 +2044,58 @@ BITMAP 48 90 ENDCHAR -STARTCHAR onequarter -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 10 11 1 5 +STARTCHAR OE +ENCODING 188 +SWIDTH 1000 0 +DWIDTH 15 0 +BBX 13 11 1 5 BITMAP +1FF8 +6300 4100 -C200 -4200 -4400 -4400 -4880 -0980 -1280 -1480 -27C0 -2080 +8100 +8100 +81F8 +8100 +8100 +4100 +6300 +1FF8 ENDCHAR -STARTCHAR onehalf -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 9 11 1 5 +STARTCHAR oe +ENCODING 189 +SWIDTH 944 0 +DWIDTH 13 0 +BBX 11 8 1 5 BITMAP -4200 -C400 -4400 -4800 -4800 -5300 -1480 -2080 -2100 -4200 -4780 +7BC0 +CE60 +8420 +87E0 +8400 +8400 +CE60 +7BC0 ENDCHAR -STARTCHAR threequarters -ENCODING -1 -SWIDTH 834 0 -DWIDTH 12 0 -BBX 11 11 0 5 +STARTCHAR Ydieresis +ENCODING 190 +SWIDTH 667 0 +DWIDTH 9 0 +BBX 9 13 0 5 BITMAP -6080 -9100 -2100 -1200 -9200 -6440 -04C0 -0940 -0A40 -13E0 -1040 +3600 +0000 +8080 +4100 +4100 +2200 +2200 +1400 +0800 +0800 +0800 +0800 +0800 ENDCHAR STARTCHAR questiondown ENCODING 191 @@ -3296,541 +3330,4 @@ C2 30 60 ENDCHAR -STARTCHAR Lslash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 9 0 -BBX 8 11 0 5 -BITMAP -20 -20 -20 -28 -30 -60 -A0 -20 -20 -20 -3F -ENDCHAR -STARTCHAR OE -ENCODING 188 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 13 11 1 5 -BITMAP -1FF8 -6300 -4100 -8100 -8100 -81F8 -8100 -8100 -4100 -6300 -1FF8 -ENDCHAR -STARTCHAR Scaron -ENCODING 166 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 7 14 1 5 -BITMAP -28 -10 -00 -38 -C6 -82 -80 -60 -18 -06 -02 -82 -C6 -38 -ENDCHAR -STARTCHAR Ydieresis -ENCODING 190 -SWIDTH 667 0 -DWIDTH 9 0 -BBX 9 13 0 5 -BITMAP -3600 -0000 -8080 -4100 -4100 -2200 -2200 -1400 -0800 -0800 -0800 -0800 -0800 -ENDCHAR -STARTCHAR Zcaron -ENCODING 180 -SWIDTH 611 0 -DWIDTH 9 0 -BBX 7 14 1 5 -BITMAP -28 -10 -00 -FE -02 -04 -08 -18 -10 -20 -60 -40 -80 -FE -ENDCHAR -STARTCHAR breve -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 14 -BITMAP -88 -70 -ENDCHAR -STARTCHAR bullet -ENCODING -1 -SWIDTH 350 0 -DWIDTH 5 0 -BBX 4 4 1 8 -BITMAP -60 -F0 -F0 -60 -ENDCHAR -STARTCHAR caron -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 14 -BITMAP -A0 -40 -ENDCHAR -STARTCHAR circumflex -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 2 1 14 -BITMAP -40 -A0 -ENDCHAR -STARTCHAR dagger -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 2 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -10 -10 -10 -10 -10 -ENDCHAR -STARTCHAR daggerdbl -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 7 14 0 2 -BITMAP -10 -10 -10 -10 -FE -10 -10 -10 -10 -FE -10 -10 -10 -10 -ENDCHAR -STARTCHAR dotaccent -ENCODING -1 -SWIDTH 333 0 -DWIDTH 4 0 -BBX 2 1 1 14 -BITMAP -C0 -ENDCHAR -STARTCHAR dotlessi -ENCODING -1 -SWIDTH 278 0 -DWIDTH 3 0 -BBX 1 8 1 5 -BITMAP -80 -80 -80 -80 -80 -80 -80 -80 -ENDCHAR -STARTCHAR ellipsis -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 15 0 -BBX 12 1 1 5 -BITMAP -C630 -ENDCHAR -STARTCHAR emdash -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 14 0 -BBX 14 1 0 9 -BITMAP -FFFC -ENDCHAR -STARTCHAR endash -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 1 0 9 -BITMAP -FF -ENDCHAR -STARTCHAR fi -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 5 -BITMAP -38 -40 -40 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR fl -ENCODING -1 -SWIDTH 500 0 -DWIDTH 6 0 -BBX 5 11 0 5 -BITMAP -38 -48 -48 -E8 -48 -48 -48 -48 -48 -48 -48 -ENDCHAR -STARTCHAR florin -ENCODING -1 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 8 13 0 2 -BITMAP -07 -08 -08 -7E -10 -10 -10 -10 -10 -20 -20 -20 -C0 -ENDCHAR -STARTCHAR fraction -ENCODING -1 -SWIDTH 167 0 -DWIDTH 3 0 -BBX 5 10 -1 5 -BITMAP -08 -08 -10 -10 -20 -20 -40 -40 -80 -80 -ENDCHAR -STARTCHAR grave -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 2 2 1 14 -BITMAP -80 -40 -ENDCHAR -STARTCHAR guilsinglleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 7 -BITMAP -20 -40 -80 -40 -20 -ENDCHAR -STARTCHAR guilsinglright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 5 1 7 -BITMAP -80 -40 -20 -40 -80 -ENDCHAR -STARTCHAR hungarumlaut -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 13 -BITMAP -28 -50 -A0 -ENDCHAR -STARTCHAR lslash -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 3 11 0 5 -BITMAP -40 -40 -40 -40 -60 -C0 -40 -40 -40 -40 -40 -ENDCHAR -STARTCHAR oe -ENCODING 189 -SWIDTH 944 0 -DWIDTH 13 0 -BBX 11 8 1 5 -BITMAP -7BC0 -CE60 -8420 -87E0 -8400 -8400 -CE60 -7BC0 -ENDCHAR -STARTCHAR ogonek -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 3 3 2 2 -BITMAP -40 -80 -E0 -ENDCHAR -STARTCHAR perthousand -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 11 1 5 -BITMAP -0100 -6200 -9200 -9400 -6400 -0800 -1000 -16C0 -2920 -2920 -46C0 -ENDCHAR -STARTCHAR quotedblbase -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 3 0 3 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotedblleft -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 0 13 -BITMAP -48 -90 -D8 -ENDCHAR -STARTCHAR quotedblright -ENCODING -1 -SWIDTH 333 0 -DWIDTH 6 0 -BBX 5 3 1 13 -BITMAP -D8 -48 -90 -ENDCHAR -STARTCHAR quotesinglbase -ENCODING -1 -SWIDTH 222 0 -DWIDTH 3 0 -BBX 2 3 1 3 -BITMAP -C0 -40 -80 -ENDCHAR -STARTCHAR quotesingle -ENCODING -1 -SWIDTH 191 0 -DWIDTH 3 0 -BBX 1 3 1 13 -BITMAP -80 -80 -80 -ENDCHAR -STARTCHAR ring -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 4 3 0 14 -BITMAP -60 -90 -60 -ENDCHAR -STARTCHAR scaron -ENCODING 168 -SWIDTH 500 0 -DWIDTH 8 0 -BBX 6 11 1 5 -BITMAP -50 -20 -00 -78 -84 -80 -78 -0C -04 -84 -78 -ENDCHAR -STARTCHAR tilde -ENCODING -1 -SWIDTH 333 0 -DWIDTH 5 0 -BBX 5 2 0 14 -BITMAP -68 -B0 -ENDCHAR -STARTCHAR trademark -ENCODING -1 -SWIDTH 1000 0 -DWIDTH 13 0 -BBX 11 6 1 10 -BITMAP -FA20 -2360 -22A0 -22A0 -22A0 -22A0 -ENDCHAR -STARTCHAR zcaron -ENCODING 184 -SWIDTH 500 0 -DWIDTH 7 0 -BBX 6 11 0 5 -BITMAP -50 -20 -00 -FC -04 -08 -10 -20 -40 -80 -FC -ENDCHAR -STARTCHAR Euro -ENCODING 164 -SWIDTH 556 0 -DWIDTH 8 0 -BBX 6 10 1 5 -BITMAP -00 -18 -24 -40 -F8 -40 -F0 -40 -24 -18 -ENDCHAR ENDFONT diff --git a/x-symbol/etc/pcf/heriR12.pcf b/x-symbol/etc/pcf/heriR12.pcf Binary files differindex dcedb337..5fa53d13 100644 --- a/x-symbol/etc/pcf/heriR12.pcf +++ b/x-symbol/etc/pcf/heriR12.pcf diff --git a/x-symbol/etc/pcf/heriR12sub.pcf b/x-symbol/etc/pcf/heriR12sub.pcf Binary files differindex 7cf4ad5d..74d65a43 100644 --- a/x-symbol/etc/pcf/heriR12sub.pcf +++ b/x-symbol/etc/pcf/heriR12sub.pcf diff --git a/x-symbol/etc/pcf/heriR12sup.pcf b/x-symbol/etc/pcf/heriR12sup.pcf Binary files differindex 82b18649..5e96d33e 100644 --- a/x-symbol/etc/pcf/heriR12sup.pcf +++ b/x-symbol/etc/pcf/heriR12sup.pcf diff --git a/x-symbol/etc/pcf/heriR14.pcf b/x-symbol/etc/pcf/heriR14.pcf Binary files differindex 957413d7..a2649621 100644 --- a/x-symbol/etc/pcf/heriR14.pcf +++ b/x-symbol/etc/pcf/heriR14.pcf diff --git a/x-symbol/etc/pcf/heriR14sub.pcf b/x-symbol/etc/pcf/heriR14sub.pcf Binary files differindex efaecd02..3edc5620 100644 --- a/x-symbol/etc/pcf/heriR14sub.pcf +++ b/x-symbol/etc/pcf/heriR14sub.pcf diff --git a/x-symbol/etc/pcf/heriR14sup.pcf b/x-symbol/etc/pcf/heriR14sup.pcf Binary files differindex 164b3c19..3b374aaa 100644 --- a/x-symbol/etc/pcf/heriR14sup.pcf +++ b/x-symbol/etc/pcf/heriR14sup.pcf diff --git a/x-symbol/info/x-symbol.info b/x-symbol/info/x-symbol.info index 75d4ab4e..cf5e4bb7 100644 --- a/x-symbol/info/x-symbol.info +++ b/x-symbol/info/x-symbol.info @@ -10,8 +10,8 @@ END-INFO-DIR-ENTRY LaTeX, HTML and other "token languages". It uses additional fonts and provide input methods to insert their characters into your document. - This is Edition 4.5 (XEmacs) of the X-Symbol Manual for X-Symbol -4.5, March 2003. + This is Edition 4.5.1 (XEmacs) of the X-Symbol Manual for X-Symbol +4.5.1, May 2003. Copyright (c) 1998-2003 Free Software Foundation, Inc. @@ -47,12 +47,12 @@ real super-/subscripts and are also supported. document, including the indexes. The rest of the menu lists all the lower level nodes in the document. - This is Edition 4.5 (XEmacs) of the X-Symbol Manual for X-Symbol -4.5, March 2003. For recent changes, see *Note News::. + This is Edition 4.5.1 (XEmacs) of the X-Symbol Manual for X-Symbol +4.5.1, May 2003. For recent changes, see *Note News::. Bug fixes, bug reports, improvements, and suggestions are strongly -appreciated. Please read section *Note Bug Reports:: if you want to -contact the maintainer of package X-Symbol. +appreciated. If you want to contact the maintainer of package X-Symbol, +please read *Note Bug Reports::. * Menu: @@ -237,6 +237,7 @@ History and Projects News: Changes in Recent Versions of X-Symbol +* Changes New:: To be announced. * Changes 4.5:: Released Mar 2003 as beta. * Changes 4.4:: Released June 2002 as beta. * Changes 4.1:: Released Mar 2002 as beta. @@ -424,8 +425,9 @@ impression of what can be customized, and it even lists all related user options, but it does not describes the technical format of possible values of each option. - Section *Note X-Symbol Internals:: is for the curious reader and for -people who want to define their own token language. + If you want to learn something about X-Symbol's internals, e.g., if +you want to define your own token language, see *Note X-Symbol +Internals::. This manual does not explain Emacs in general or some optional programs used by this package such as `convert' (used to produce the @@ -847,11 +849,16 @@ conversion. When doing multiple conversion, the sequence matters. `efs'/`ange-ftp'! `latin-unity' - Can be used with package X-Symbol, functionality is already - provided by X-Symbol for Latin-{1,2,3,5,9} characters: remapping - (*note Char Aliases::.) and recoding (*note File Coding::.). Has - some safe-encoding mechanism, but the test comes currently too - early (*note Wishlist Emacs::.). + This XEmacs package can be used with package X-Symbol, + functionality is already provided by X-Symbol for + Latin-{1,2,3,5,9} characters: remapping (*note Char Aliases::.) + and recoding (*note File Coding::.). Has some safe-encoding + mechanism, but the test comes currently too early (*note Wishlist + Emacs::.). + +`ucs-tables' + The Emacs minor modes `unify-8859-on-decoding-mode' and + `unify-8859-on-encoding-mode' can be used with package X-Symbol. `vc' If you use package `crypt', `vc-next-action' and friends encode @@ -887,8 +894,8 @@ Miscellaneous Packages `ispell' The package `ispell' assumes the buffer contents to be the same as the file contents and does not provide any hook to fix this. This - should be fixed in `ispell', *Note Wishlist Emacs::. *Note FAQ - Spell Check::. + should be fixed in `ispell', see *Note Wishlist Emacs::. *Note + FAQ Spell Check::. Use a future version (hopefully v3.4). Includes special X-Symbol initialization/handling and defines additional token languages. @@ -1104,7 +1111,7 @@ might not look nice (*note FAQ Font Size::.). `x-symbol-mule-change-default-face' Package X-Symbol does not change the fonts of pre-defined Mule charsets (this can be changed by this variable). Thus, the - variables from Section *Note Installing Fonts Lisp:: might have no + variables from *Note Installing Fonts Lisp:: might have no influence if Emacs already has defined fonts for the corresponding charsets. @@ -1175,7 +1182,7 @@ Concepts of Package X-Symbol This chapter describes the concepts of package X-Symbol. It contains quite a few forward references to feature which are based on these -concepts, such as *Note Input Methods:: and *Note Features::. +concepts, such as *Note Input Methods::, and *Note Features::. * Menu: @@ -1203,7 +1210,7 @@ entity" (`sgml'), "BibTeX macro" (`bib'), and "TeXinfo command" (`texi'), see *Note Supported Languages::. The token language determines the conversion between X-Symbol -characters and tokens (*Note Conversion::), the input methods (*note +characters and tokens (*note Conversion::.), the input methods (*note Input Methods::.), and various other features (*note Features::.). The token language is defined by the following buffer-local variable: @@ -1366,7 +1373,7 @@ cases: * If the normal file encoding is unsupported (any file encoding is invalid in this case) or if the normal file encoding is supported and the file does not contain 8bit characters, we always encode - all X-Symbol character (*Note Controlling 8bit Coding::). The + all X-Symbol character (*note Controlling 8bit Coding::.). The modeline includes `-i' to represent the file encoding (*note Minor Mode::.), except if the default encoding is `nil', the normal file encoding is unsupported, and the variable `x-symbol-coding' is not @@ -1391,7 +1398,7 @@ Store or Encode 8bit Characters ------------------------------- You can specify that 8bit characters (according to the coding in your -file, *Note File Coding::), are not encoded to tokens (when saving a +file, see *Note File Coding::), are not encoded to tokens (when saving a file), by setting the following buffer-local variable: `x-symbol-8bits' @@ -1460,7 +1467,7 @@ variable: will happen. That means: only decode canonical tokens, and, if `x-symbol-8bits' is non-`nil' (*note Controlling 8bit Coding::.), do not decode tokens which would be decoded to 8bit characters - (according to the coding in your file, *Note File Coding::). + (according to the coding in your file, see *Note File Coding::). You can set this variable in the "local variables list" near the end of the file (*note File Variables: (xemacs)File Variables.), @@ -1516,7 +1523,8 @@ in the menu): Encode all characters in buffer to tokens. No recoding will be performed since 8bit characters will always be encoded if the file coding is different to the default coding, since `x-symbol-8bits' - is relative to the file coding, *Note Controlling 8bit Coding::. + is relative to the file coding, see *Note Controlling 8bit + Coding::. All commands work on the region if it is active, or the (narrowed part of the) buffer if no region is active. @@ -1688,7 +1696,8 @@ X-Symbol is turned on: `x-symbol-LANG-modes' Major modes which use token language LANG by default. *Note - Supported Languages::. + Supported Languages::. The languages are checked in registration + order (the order shown in the language selection submenus). `x-symbol-LANG-auto-style' Default values for the above mentioned variables `x-symbol-mode', @@ -1821,7 +1830,7 @@ which can be used for the following: for TeX's math-mode characters if we are in text-mode. The token classes for individual token languages are explained in the -corresponding sections of chapter *Note Supported Languages::: +corresponding sections of *Note Supported Languages::: `x-symbol-LANG-header-groups-alist' The Grid and Menu headers for each token language LANG. @@ -2049,7 +2058,7 @@ commands are used if the mouse pointer is over an highlighted character. window and scroll up in the lower half of the window. `<button3>' - Pops up the X-Symbol menu, *Note Input Method Menu::). + Pops up the X-Symbol menu, see *Note Input Method Menu::). When using the keyboard to select a character, the following command could be useful: @@ -2322,8 +2331,8 @@ following variables: complicated to you (it is), it actually ensures consistency across all input methods. *Note Defining Input Methods::. - For example., if you prefer charsym `epsilon1' over `epsilon' - (influences input method , you might want to use: + For example, if you prefer charsym `epsilon1' over `epsilon' you + might want to use: (setq x-symbol-user-table '((epsilon1 t (greek1 "e" nil "epsilon") nil -3000))) @@ -2413,10 +2422,6 @@ by setting the following variables: Super-/subscript commands are `^'/`_' (*note TeX Macro::.) and `<sup>'/`<sub>' (*note SGML Entity::.): -`x-symbol-LANG-font-lock-keywords' - The super-/subscript `font-lock' keywords for each token language - LANG. - File: x-symbol.info, Node: Images, Next: Info, Prev: Super and Subscripts, Up: Features @@ -2935,8 +2940,8 @@ controlled by: if the character is not of the correct TeX mode, i.e., it only produces a math-mode character in a math area and a text-mode character in a text area (this test requires package `texmathp', - *Note LaTeX Packages::). Postfix tilde is not electric, because - `~' produces a space in TeX. + see *Note LaTeX Packages::). Postfix tilde is not electric, + because `~' produces a space in TeX. `x-symbol-tex-token-suppress-space' Input method Token (*note Input Method Token::.) only converts a @@ -3180,7 +3185,7 @@ works as follows: not followed by a `%' (comment character), replace the macro by the corresponding character and delete the space. (The character following the space must be a letter with unique - decoding, *Note Unique Decoding::.) + decoding, see *Note Unique Decoding::.) - Otherwise, do *not decode* the macro! @@ -4012,14 +4017,18 @@ our case, a leading character, *note Char Representation::.) when looking at a character. Thus, you should probably not use encodings which represent characters in your default font with a special syntax. + * In general, escape sequences use the digits of the current font. + Thus, you should probably define the encodings 48 to 57 as digits + `0' to `9'. + * In LaTeX buffers, characters in `$%\{}' have a special syntax. - Thus, you should you should probably not use encodings 36, 37, 92, - 123 and 125 for characters which could also be useful with token - languages `tex' and `utex'. + Thus, you should probably not use encodings 36, 37, 92, 123 and + 125 for characters which could also be useful with token languages + `tex' and `utex'. * In HTML buffers, characters in `&<>' have a special syntax. Thus, - you should you should probably not use encodings 38, 60 and 62 for - characters which could also be useful with token language `sgml'. + you should probably not use encodings 38, 60 and 62 for characters + which could also be useful with token language `sgml'. You have to tell package X-Symbol which fonts to use for the normal text, subscripts and superscripts. *Note Installing Fonts Lisp::. @@ -4706,7 +4715,7 @@ causes: * You use some version control commands. You have probably noticed that these versions control commands also turn off `font-lock' in modes where you don't use X-Symbol, i.e., this is not a problem of - package X-Symbol. *note Wishlist Emacs::. and *Note Spurious + package X-Symbol. *Note Wishlist Emacs::. *Note Spurious Encodings::. @@ -4867,7 +4876,8 @@ character is followed by a letter or by `@'. Thus, decoding * Suggestion: Also use a space before `\oplus'. The alternative would be to delete the space which other people won't like. - *Note TeX Macro Conversion:: for an exact description. + For an exact description, *Note TeX Macro Conversion:: for an exact +description. File: x-symbol.info, Node: FAQ 8bit Chars, Next: FAQ Hyphen, Prev: FAQ Additional Spaces, Up: FAQ @@ -4948,9 +4958,9 @@ How to Use X-Symbol with Gnus or VM You can also use X-Symbol to read and write your News and Mails. This sections includes coding for your `~/.emacs' if you want to do so. -It has been tested for GNUS-5.8.8 and VM-6.96; if you use RMAIL or +It has been tested for Gnus-5.8.8 and VM-6.96; if you use RMAIL or MH-E, you have to try to find a solution yourself (please send it to -me). Support for GNUS might become a standard part of X-Symbol. +me). Support for Gnus might become a standard part of X-Symbol. (custom-set-variables '(x-symbol-auto-style-alist @@ -4978,7 +4988,7 @@ message. (x-symbol-mode-internal nil))) (add-hook 'gnus-article-prepare-hook 'x-symbol-x-gnus-prepare) - Since GNUS reuses the `*Article*' buffer, where X-Symbol could have + Since Gnus reuses the `*Article*' buffer, where X-Symbol could have been turned on previously, we must make sure that X-Symbol is turned off with the new article. @@ -4992,7 +5002,7 @@ off with the new article. (x-symbol-mode-internal nil))))) (add-hook 'vm-select-message-hook 'x-symbol-x-gnus-prepare) - The same thing for VM, although the hook is not as nice as GNUS' + The same thing for VM, although the hook is not as nice as Gnus' one; the function therefore might depend a bit too much on VM's interna. (put 'vm-mode 'x-symbol-mode-disable @@ -5021,14 +5031,19 @@ registry-encoding other than `iso8859-1' (Western encoding). send a bug report (*note Bugs: (xemacs)Bugs.). This might look tedious to you, but it actually saves a lot of time (your time, too). + The *general recommendation* for bug/problem reports is: give the +impression that your really have tried to find the necessary information +yourself and make your report precise while including all information +you have. + For each bug/problem report or question you want to send to the maintainer, please use the following sequence: 1. Make sure that you use the *newest version* of X-Symbol. You are - reading Edition 4.5 (XEmacs) of the manual for X-Symbol 4.5. + reading Edition 4.5.1 (XEmacs) of the manual for X-Symbol 4.5.1. 2. Read the manual, especially *Note Checking Installation::, *Note - Problems:: and *Note FAQ::. The four indexes (*note Indexes::.) + Problems::, and *Note FAQ::. The four indexes (*note Indexes::.) might also lead you to an answer to your question. 3. Use `M-x x-symbol-package-bug' (also to be found in X-Symbol's @@ -5044,8 +5059,8 @@ maintainer, please use the following sequence: If `M-x x-symbol-package-bug' fails to work, you have a problem with your installation and your report should be about this problem. In this case, use `x-symbol VERSION; SUMMARY' as Subject - header where VERSION is the version of X-Symbol and SUMMARY is a - brief summary of your installation problem. + header where VERSION is the version of X-Symbol (it should be + 4.5.1) and SUMMARY is a brief summary of your installation problem. (*Rationale*: This command automatically extracts some essential information without any work by you. Don't waste your time @@ -5058,9 +5073,9 @@ maintainer, please use the following sequence: ..., but didn't find anything which helped me with the following problem: - The sections SECTION1, SECTION2, etc are names (not numbers!) of - the sections (not whole chapters!) in the manual where you would - expect an answer to your question/problem/bug. + The sections SECTION1, SECTION2, etc are names of the sections + (not whole chapters) in the manual where you would expect an + answer to your question/problem/bug. If you didn't know which sections to inspect, please check the indexes. If they are not helpful, send me words/terms which @@ -5129,9 +5144,9 @@ maintainer, please use the following sequence: the size of `MY-PROBLEM.el' as described above. 9. If the problem is not reproducible with an *arbitrary* (`.tex', - `.html', ...) file, try to minimize the file such that the problem - can be still reproducible, and include the file with its full file - name into your bug report. + `.html', ...) file, include the file with its full file name into + your bug report. (If you like, you can try to minimize the file + if the problem is still reproducible.) (*Rationale*: Most problems are only reproducible with specific files.) @@ -5199,6 +5214,7 @@ changes before Version 3.0. * Menu: +* Changes New:: To be announced. * Changes 4.5:: Released Mar 2003 as beta. * Changes 4.4:: Released June 2002 as beta. * Changes 4.1:: Released Mar 2002 as beta. @@ -5210,7 +5226,17 @@ changes before Version 3.0. * Changes Old:: Overview of old releases. -File: x-symbol.info, Node: Changes 4.5, Next: Changes 4.4, Prev: News, Up: News +File: x-symbol.info, Node: Changes New, Next: Changes 4.5, Prev: News, Up: News + +Changes in X-Symbol 4.5.1 +------------------------- + + Version 4.5.1 has not yet been announced. + + * Various bug fixes and minor changes. + + +File: x-symbol.info, Node: Changes 4.5, Next: Changes 4.4, Prev: Changes New, Up: News Changes in X-Symbol 4.5 ----------------------- @@ -5230,9 +5256,9 @@ Changes in X-Symbol 4.5 * Bug fix (Emacs): package now works with package `crypt'/`crypt++'. * Token language `sgml': always encode characters to entity - references by default (not possible with most Latin-N characters, - where we still use character entities). Include `hm--html-mode', - `html-helper-mode', remove `sgml-mode' as typical major modes. + references by default (where defined by the HTML standard). + Include `hm--html-mode', `html-helper-mode', remove `sgml-mode' as + typical major modes which use X-Symbol. * Token language `tex': support some symbols of package `stmaryrd.sty'. @@ -5263,8 +5289,8 @@ Changes in X-Symbol 4.5 File: x-symbol.info, Node: Changes 4.4, Next: Changes 4.1, Prev: Changes 4.5, Up: News -Changes in X-Symbol 4.2, 4.3, 4.4 ---------------------------------- +Changes in X-Symbol 4.2 to 4.4 +------------------------------ Version 4.4 has been released on June 2002 as beta. @@ -5610,38 +5636,34 @@ File: x-symbol.info, Node: Wishlist Fonts, Next: Wishlist Emacs, Prev: Wishli Wishlist: Generated Fonts ------------------------- - One direction of font generation would be from `.bdf' or `.pcf' font -files to Windows fonts to get rid of the limited support for XEmacs on -Windows (*note Requirements::.). If you have successfully converted -X-Symbol's fonts from the Unix format to the Windows format (via -`bdftofon' or whatever) or if you have free and real Latin-N fonts for -Windows, please *let me know*! I would also appreciate if you would -actively try to get those missing Windows fonts. + A specific direction of font generation would be from `.bdf' or +`.pcf' font files to Windows fonts to get rid of the limited support +for XEmacs on Windows (*note Requirements::.). If you have +successfully converted X-Symbol's fonts from the Unix format to the +Windows format (via `bdftofon' or whatever) or if you have free and +real Latin-N fonts for Windows, please *let me know*! I would also +appreciate if you would actively try to get those missing Windows fonts. - Solofo Ramangalahy suggests to automatically generate the `.bdf' -fonts from other sources. This would have various advantages: + The general direction is to automatically generate the `.bdf' or +`.fon' fonts from other sources. This would have various advantages: * We could easily create different sizes for our symbol font. - * It would be quite simple to create a `.bdf' font for AmsTeX - macros, calligraphical letters etc, which would be displayed as - X-Symbol characters by package X-Symbol. + * It would be quite simple to create a font for AmsTeX macros, etc., + which would be displayed as X-Symbol characters by package + X-Symbol. * We could easily create different sizes for our symbol font. - Solofo has worked on Postscript fonts. Although the results are good -for big sizes, this cannot replace bdf fonts for "small" sizes like 14. -Besides, the X font server is not very good for postscript fonts -(compared with ATM where you have anti-aliasing for example). Now that -XEmacs run under Windows, it may be that the result is better under -Windows than under Unix. This has not been tested. + * We would have fonts for both X11 and Windows. - An other possibility is to use true type fonts as true type font -servers can achieve better results with good hinted fonts. This has -not been done yet. + New fonts for X-Symbol are being worked on. You can find material to +generate them at the web pages of X-Symbol (http://x-symbol.sourceforge.net/news.html). Quite a few problems needs to be fixed though, so +it is considered as experimental. You are welcome to try, fix and +report on the X-Symbol development mailing list (x-symbol-devel@lists.sourceforge.net). - There are also some problems which are not optimally solved in the -current xsymb font either: + General open design issues (i.e., they could be re-thought for the +currently used handcrafted fonts, too) are: * Different TeX macros (same appearance, different TeX class = different spacing) use the same MetaFont character, e.g., `\dagger' @@ -5662,20 +5684,6 @@ character anyway.... Here are the options: - not distinguished - Solofo Ramangalahy originally though of generating the `.bdf' fonts -out of TeX fonts (`.mf', `.pk') by `mftobdf' of SeeTeX, which can be -found at `CTAN/dviware/seetex/' among others distributions having this -tool. He dropped this idea for the following reason: - - The created fonts need some correction by hand, since it's - difficult to make good fonts at small size. MF fonts were created - to be printed at high resolutions (in the MetaFont book, cheapo is - 200 pixel per inch, resolution of screens are around 100 pixel per - inch). The parameters `blacker', `fillin' and `o_correction' are - not sufficient for tuning the computer modern fonts at low - resolutions (they will not do the job of hints of a postscript - font). - File: x-symbol.info, Node: Wishlist Emacs, Next: Wishlist LaTeX, Prev: Wishlist Fonts, Up: Wishlist @@ -5689,7 +5697,7 @@ Wishlist: Changes in Emacs/XEmacs * The package `ispell' assumes the buffer contents to be the same as the file contents and does not provide any hook to fix this. This - should be fixed in `ispell' (it will be better in Emacs-21.4), + should be fixed in `ispell' (it will be better in Emacs-21.4), see *Note Miscellaneous Packages::. * Some versions control commands turn off `font-lock'. This should @@ -5729,8 +5737,8 @@ Wishlist: Changes in Emacs/XEmacs `post-error-or-quit-hook'. *Note Nomule Problems::. * In XEmacs. There are some bugs in package `custom'/`widget' - (XEmacs-21.0-b59) which are visible during the customization of - X-Symbol. + (still in XEmacs-21.4) which are visible during the customization + of X-Symbol. File: x-symbol.info, Node: Wishlist LaTeX, Next: Wishlist Various, Prev: Wishlist Emacs, Up: Wishlist @@ -5841,6 +5849,11 @@ and decoding right. Christophe Raffalli suggested to use a decode method which can be used for a larger class of token languages. He also proved that it is faster. + Solofo Ramangalahy is working on scripts to generate X-Symbol fonts +from other sources. This has various advantages and is discussed in +more detail at *Note Wishlist Fonts::. His work is now available at the +X-Symbol download area. + Package `math-mode' by Renaud Marlet and the extension of it by Julian Bradfield gave the basic idea for the following features: supporting TeX's math macros, input methods token, context/electric, @@ -5872,10 +5885,10 @@ Klee, Gerwin Klein, Thomas Kleymann, Ekkehard Koehler, Fred Labrosse, Jan-Ake Larsson, Bernhard Lehner, Stefan Monnier, Harald Muehlboeck, Karsten Muehlmann, Jakub Narebski, Peter Mo/ller Neergaard, Raymond Nijssen, David von Oheimb, Alex Ott, Sudeep Kumar Palat, Arshak -Petrosyan, Jim Radford, Christophe Raffalli, Solofo Ramangalahy, -Marciano Siniscalchi, Richard M. Stallman, Alex Russell, Eli Tziperman, -Jan Vroonhof, Markus Wenzel, Sabine Wetzel, Pierre-Henri Wuillemin, -Roland Zumkeller, Marco Zunino, Gerard Zwaan. +Petrosyan, Jim Radford, Christophe Raffalli, Solofo Ramangalahy, Alex +Russell, Marciano Siniscalchi, Richard M. Stallman, Axel Thimm, Eli +Tziperman, Jan Vroonhof, Markus Wenzel, Sabine Wetzel, Pierre-Henri +Wuillemin, Roland Zumkeller, Marco Zunino, Gerard Zwaan. Thanks for general information to: Per Abrahamsen, Steve L. Baur, Kenichi Handa, David Kastrup, Gerd Moellmann, Stefan Monnier, Primoz @@ -5970,19 +5983,19 @@ Program and Package Index * amssymb.sty: TeX Macro Symbols. * ange-ftp: File IO Packages. * auctex <1>: Requirements. -* auctex <2>: LaTeX Packages. -* auctex: Spurious Encodings. +* auctex <2>: Spurious Encodings. +* auctex: LaTeX Packages. * bdftofon: Wishlist Fonts. * bib-cite: LaTeX Packages. * bibtex: BibTeX Macro. * comint: File IO Packages. * completion: Miscellaneous Packages. -* convert <1>: Installing Image Converter. -* convert <2>: Images. +* convert <1>: Images. +* convert <2>: Image Conversion. * convert <3>: Requirements. -* convert: Image Conversion. -* crypt <1>: No Encoding. -* crypt <2>: File IO Packages. +* convert: Installing Image Converter. +* crypt <1>: File IO Packages. +* crypt <2>: No Encoding. * crypt <3>: Open Questions. * crypt: Spurious Encodings. * crypt++: File IO Packages. @@ -5993,13 +6006,13 @@ Program and Package Index * Exceed: Installing Fonts Exceed. * fast-lock: Syntax Hiliting Packages. * flyspell: Miscellaneous Packages. -* font-latex <1>: Syntax Hiliting Packages. -* font-latex: FAQ Stupid Subscripts. -* font-lock <1>: FAQ Stupid Subscripts. -* font-lock <2>: FAQ font-lock. +* font-latex <1>: FAQ Stupid Subscripts. +* font-latex: Syntax Hiliting Packages. +* font-lock <1>: Syntax Hiliting Packages. +* font-lock <2>: FAQ Stupid Subscripts. * font-lock <3>: Char Representation. -* font-lock <4>: Requirements. -* font-lock: Syntax Hiliting Packages. +* font-lock <4>: FAQ font-lock. +* font-lock: Requirements. * fontenc.sty: TeX Macro Symbols. * format: Alt Auto Conversion. * frame-icon: Acknowledgments. @@ -6011,20 +6024,20 @@ Program and Package Index * iso-cvt: File IO Packages. * iso-sgml: File IO Packages. * ispell <1>: FAQ Spell Check. -* ispell <2>: Miscellaneous Packages. -* ispell: Wishlist Emacs. +* ispell <2>: Wishlist Emacs. +* ispell: Miscellaneous Packages. * jka-compr: File IO Packages. -* latex2html <1>: Installing Manual. -* latex2html: Requirements. +* latex2html <1>: Requirements. +* latex2html: Installing Manual. * latexsym.sty: TeX Macro Symbols. -* latin-unity <1>: Char Aliases. -* latin-unity: File IO Packages. +* latin-unity <1>: File IO Packages. +* latin-unity: Char Aliases. * lazy-lock: Syntax Hiliting Packages. * lazy-shot <1>: Requirements. * lazy-shot: Syntax Hiliting Packages. -* makeinfo <1>: TeXinfo Command. -* makeinfo <2>: Requirements. -* makeinfo: Installing Manual. +* makeinfo <1>: Requirements. +* makeinfo <2>: Installing Manual. +* makeinfo: TeXinfo Command. * math-mode: Acknowledgments. * Mathematica: FAQ Strange Chars. * Message: FAQ News and Mail. @@ -6040,16 +6053,17 @@ Program and Package Index * reftex: LaTeX Packages. * session: Miscellaneous Packages. * stmaryrd.sty: TeX Macro Symbols. -* texi2dvi <1>: Installing Manual. -* texi2dvi: Requirements. +* texi2dvi <1>: Requirements. +* texi2dvi: Installing Manual. * texi2html: TeXinfo Command. * texinfo: TeXinfo Command. -* texmathp <1>: TeX Macro Basics. +* texmathp <1>: LaTeX Packages. * texmathp <2>: Requirements. -* texmathp: LaTeX Packages. -* vc <1>: Spurious Encodings. +* texmathp: TeX Macro Basics. +* ucs-tables: File IO Packages. +* vc <1>: File IO Packages. * vc <2>: Wishlist Emacs. -* vc: File IO Packages. +* vc: Spurious Encodings. * VM: FAQ News and Mail. * x-compose: Miscellaneous Packages. * XEmacs: Requirements. @@ -6102,8 +6116,8 @@ Command, Function and Variable Index * sgml-slash: Tagging Insert Commands. * TeX-insert-dollar: Tagging Insert Commands. * TeX-insert-punctuation: Tagging Insert Commands. -* TeX-insert-quote: Tagging Insert Commands. * tex-insert-quote: Tagging Insert Commands. +* TeX-insert-quote: Tagging Insert Commands. * TeX-master <1>: TeX Macro Basics. * TeX-master <2>: TeX Macro Features. * TeX-master: LaTeX Packages. @@ -6112,6 +6126,8 @@ Command, Function and Variable Index * TeX-translate-location-hook: LaTeX Packages. * TEXINPUTS: TeX Macro Features. * TEXPICTS: TeX Macro Features. +* unify-8859-on-decoding-mode: File IO Packages. +* unify-8859-on-encoding-mode: File IO Packages. * vc-next-action: File IO Packages. * vm: FAQ News and Mail. * vm-mail: FAQ News and Mail. @@ -6124,8 +6140,8 @@ Command, Function and Variable Index * write-file-hooks <1>: No Encoding. * write-file-hooks: Alt Auto Conversion. * write-region: No Encoding. -* write-region-annotate-functions <1>: Alt Auto Conversion. -* write-region-annotate-functions: Wishlist Emacs. +* write-region-annotate-functions <1>: Wishlist Emacs. +* write-region-annotate-functions: Alt Auto Conversion. * x-symbol-8bits: Controlling 8bit Coding. * x-symbol-after-init-input-hook: Customizing Input Method. * x-symbol-auto-8bit-search-limit: Controlling 8bit Coding. @@ -6171,22 +6187,22 @@ Command, Function and Variable Index * x-symbol-grid-ignore-charsyms: Input Method Grid. * x-symbol-grid-reuse: Input Method Grid. * x-symbol-grid-tab-width: Input Method Grid. -* x-symbol-group-input-alist <1>: Customizing Input Methods. -* x-symbol-group-input-alist: Customizing Input Method. +* x-symbol-group-input-alist <1>: Customizing Input Method. +* x-symbol-group-input-alist: Customizing Input Methods. * x-symbol-group-syntax-alist: Misc Internals. * x-symbol-header-groups-alist: Customizing Input Method. * x-symbol-heading-strut-glyph: Input Method Grid. * x-symbol-help: Input Method Keyboard. -* x-symbol-idle-delay <1>: Super and Subscripts. -* x-symbol-idle-delay: Info. +* x-symbol-idle-delay <1>: Info. +* x-symbol-idle-delay: Super and Subscripts. * x-symbol-image: Image Display. * x-symbol-image-cache-directories: Image Caching. * x-symbol-image-colormap-allocation: Image Conversion. * x-symbol-image-convert-colormap: Image Conversion. * x-symbol-image-convert-file-alist: Image Conversion. * x-symbol-image-convert-mono-regexp: Image Conversion. -* x-symbol-image-convert-program <1>: Installing Image Converter. -* x-symbol-image-convert-program: Image Conversion. +* x-symbol-image-convert-program <1>: Image Conversion. +* x-symbol-image-convert-program: Installing Image Converter. * x-symbol-image-converter <1>: Installing Image Converter. * x-symbol-image-converter: Image Conversion. * x-symbol-image-current-marker: Image Editor. @@ -6207,10 +6223,10 @@ Command, Function and Variable Index * x-symbol-image-update-cache: Image Caching. * x-symbol-image-use-remote: Image Caching. * x-symbol-init-language-interactive: Language Internals. -* x-symbol-initialize <1>: Open Questions. -* x-symbol-initialize: Installing Lisp. -* x-symbol-installer-address <1>: Package Information. -* x-symbol-installer-address: System-wide Installation. +* x-symbol-initialize <1>: Installing Lisp. +* x-symbol-initialize: Open Questions. +* x-symbol-installer-address <1>: System-wide Installation. +* x-symbol-installer-address: Package Information. * x-symbol-key-min-length: Customizing Input Methods. * x-symbol-key-suffix-string: Char Descriptions. * x-symbol-LANG-auto-style: Minor Mode. @@ -6218,7 +6234,6 @@ Command, Function and Variable Index * x-symbol-LANG-class-face-alist: Char Group. * x-symbol-LANG-electric-ignore: Input Method Electric. * x-symbol-LANG-extra-menu-items: Minor Mode. -* x-symbol-LANG-font-lock-keywords: Super and Subscripts. * x-symbol-LANG-header-groups-alist: Char Group. * x-symbol-LANG-image-cached-dirs: Image Caching. * x-symbol-LANG-image-keywords: Image Display. @@ -6796,144 +6811,145 @@ Concept Index Tag Table: -Node: Top1403 -Node: Introduction12086 -Node: Copying12710 -Node: Summary14748 -Node: About18257 -Node: Installation20065 -Node: Requirements21694 -Node: Installing Files23374 -Node: System-wide Installation24919 -Node: Installing Lisp26697 -Node: Installing Image Converter28465 -Node: Package Integration29959 -Node: LaTeX Packages31272 -Node: Syntax Hiliting Packages34193 -Node: File IO Packages35670 -Node: Miscellaneous Packages37745 -Node: Installing Fonts39703 -Node: Installing Fonts Exceed43260 -Node: Installing Fonts Lisp45517 -Node: Installing Manual48570 -Node: Checking Installation49732 -Node: Concepts51230 -Node: Token Language52018 -Node: Conversion53584 -Node: Default Coding54887 -Node: File Coding57325 -Node: Controlling 8bit Coding60802 -Node: Unique Decoding62802 -Node: Conversion Commands64870 -Node: Copy with Conversion66780 -Node: Char Aliases68622 -Node: Minor Mode70734 -Node: Poor Mans Mule74596 -Node: Role of font-lock76133 -Node: Char Group77412 -Node: Input Methods79733 -Node: Introducing Input Methods81246 -Node: Input Method Token83328 -Node: Input Method Read Token84627 -Node: Input Method Menu85580 -Node: Input Method Grid87058 -Node: Input Method Keyboard90524 -Node: Input Method Context92738 -Node: Input Method Electric94978 -Node: Input Method Quail97704 -Node: Customizing Input Method98402 -Node: Features100049 -Node: Super and Subscripts100739 -Node: Images103379 -Node: Image Display104209 -Node: Image Conversion106118 -Node: Image Caching108865 -Node: Special Images111605 -Node: Image Editor112907 -Node: Info114690 -Node: Ascii Representation116834 -Node: Package Information117982 -Node: Supported Languages118906 -Node: Pseudo Language119606 -Node: TeX Macro120648 -Node: TeX Macro Basics121465 -Node: TeX Macro Features124641 -Node: TeX Macro Problems128206 -Node: TeX Macro Conversion133153 -Node: TeX Macro Symbols137380 -Node: SGML Entity140578 -Node: SGML Entity Basics141306 -Node: SGML Entity Features143224 -Node: SGML Entity Conversion144938 -Node: BibTeX Macro146341 -Node: TeXinfo Command147981 -Node: External Languages150629 -Node: X-Symbol Internals151105 -Node: Char Representation152096 -Node: Defining Charsets154357 -Node: Defining Input Methods156374 -Node: Input Method Objectives156995 -Node: Intro Char Descriptions158916 -Node: Char Descriptions161438 -Node: Example Char Descriptions165065 -Node: Customizing Input Methods167013 -Node: Extending X-Symbol168503 -Node: Extending with Fonts169274 -Node: Input Definitions171192 -Node: Font Definition File173767 -Node: Language Extension File175116 -Node: Language Definition File177145 -Node: Various Internals179280 -Node: Tagging Insert Commands179603 -Node: Avoiding Flickering180378 -Node: Design Alternatives181268 -Node: Alt Token Representations181725 -Node: Alt Global Mode184582 -Node: Alt Auto Conversion185510 -Node: Language Internals187150 -Node: Misc Internals189653 -Node: Problems190365 -Node: Nomule Problems190980 -Node: Spurious Encodings194041 -Node: No Encoding196055 -Node: FAQ196712 -Node: FAQ XEmacs Core197838 -Node: FAQ font-lock198701 -Node: FAQ Strange Chars199776 -Node: FAQ No Subscripts201637 -Node: FAQ Stupid Subscripts202650 -Node: FAQ Font Size204372 -Node: FAQ Conversion205224 -Node: FAQ Additional Spaces205688 -Node: FAQ 8bit Chars206636 -Node: FAQ Hyphen207308 -Node: FAQ Spell Check207915 -Node: FAQ News and Mail209449 -Node: Bug Reports212198 -Node: History219592 -Node: News219957 -Node: Changes 4.5220739 -Node: Changes 4.4222388 -Node: Changes 4.1224566 -Node: Changes 3.4225025 -Node: Changes 3.3226188 -Node: Changes 3.2226953 -Node: Changes 3.1227709 -Node: Changes 3.0228378 -Node: Changes Old230384 -Node: Wishlist232429 -Node: Wishlist Languages233266 -Node: Wishlist Fonts233832 -Node: Wishlist Emacs237143 -Node: Wishlist LaTeX239607 -Node: Wishlist Various240907 -Node: Wishlist Rejected241547 -Node: Open Questions242231 -Node: Acknowledgments243408 -Node: Indexes247246 -Node: Key Index247882 -Node: Program Index250066 -Node: Variable Index255655 -Node: Concept Index271896 +Node: Top1405 +Node: Introduction12132 +Node: Copying12756 +Node: Summary14794 +Node: About18303 +Node: Installation20134 +Node: Requirements21763 +Node: Installing Files23443 +Node: System-wide Installation24988 +Node: Installing Lisp26766 +Node: Installing Image Converter28534 +Node: Package Integration30028 +Node: LaTeX Packages31341 +Node: Syntax Hiliting Packages34262 +Node: File IO Packages35739 +Node: Miscellaneous Packages37984 +Node: Installing Fonts39946 +Node: Installing Fonts Exceed43503 +Node: Installing Fonts Lisp45760 +Node: Installing Manual48805 +Node: Checking Installation49967 +Node: Concepts51465 +Node: Token Language52254 +Node: Conversion53821 +Node: Default Coding55124 +Node: File Coding57562 +Node: Controlling 8bit Coding61040 +Node: Unique Decoding63044 +Node: Conversion Commands65116 +Node: Copy with Conversion67035 +Node: Char Aliases68877 +Node: Minor Mode70989 +Node: Poor Mans Mule74959 +Node: Role of font-lock76496 +Node: Char Group77775 +Node: Input Methods80088 +Node: Introducing Input Methods81601 +Node: Input Method Token83683 +Node: Input Method Read Token84982 +Node: Input Method Menu85935 +Node: Input Method Grid87413 +Node: Input Method Keyboard90883 +Node: Input Method Context93097 +Node: Input Method Electric95337 +Node: Input Method Quail98063 +Node: Customizing Input Method98761 +Node: Features100380 +Node: Super and Subscripts101070 +Node: Images103592 +Node: Image Display104422 +Node: Image Conversion106331 +Node: Image Caching109078 +Node: Special Images111818 +Node: Image Editor113120 +Node: Info114903 +Node: Ascii Representation117047 +Node: Package Information118195 +Node: Supported Languages119119 +Node: Pseudo Language119819 +Node: TeX Macro120861 +Node: TeX Macro Basics121678 +Node: TeX Macro Features124858 +Node: TeX Macro Problems128423 +Node: TeX Macro Conversion133370 +Node: TeX Macro Symbols137601 +Node: SGML Entity140799 +Node: SGML Entity Basics141527 +Node: SGML Entity Features143445 +Node: SGML Entity Conversion145159 +Node: BibTeX Macro146562 +Node: TeXinfo Command148202 +Node: External Languages150850 +Node: X-Symbol Internals151326 +Node: Char Representation152317 +Node: Defining Charsets154578 +Node: Defining Input Methods156595 +Node: Input Method Objectives157216 +Node: Intro Char Descriptions159137 +Node: Char Descriptions161659 +Node: Example Char Descriptions165286 +Node: Customizing Input Methods167234 +Node: Extending X-Symbol168724 +Node: Extending with Fonts169495 +Node: Input Definitions171550 +Node: Font Definition File174125 +Node: Language Extension File175474 +Node: Language Definition File177503 +Node: Various Internals179638 +Node: Tagging Insert Commands179961 +Node: Avoiding Flickering180736 +Node: Design Alternatives181626 +Node: Alt Token Representations182083 +Node: Alt Global Mode184940 +Node: Alt Auto Conversion185868 +Node: Language Internals187508 +Node: Misc Internals190011 +Node: Problems190723 +Node: Nomule Problems191338 +Node: Spurious Encodings194399 +Node: No Encoding196413 +Node: FAQ197070 +Node: FAQ XEmacs Core198196 +Node: FAQ font-lock199059 +Node: FAQ Strange Chars200131 +Node: FAQ No Subscripts201992 +Node: FAQ Stupid Subscripts203005 +Node: FAQ Font Size204727 +Node: FAQ Conversion205579 +Node: FAQ Additional Spaces206043 +Node: FAQ 8bit Chars207017 +Node: FAQ Hyphen207689 +Node: FAQ Spell Check208296 +Node: FAQ News and Mail209830 +Node: Bug Reports212579 +Node: History220215 +Node: News220580 +Node: Changes New221411 +Node: Changes 4.5221640 +Node: Changes 4.4223268 +Node: Changes 4.1225440 +Node: Changes 3.4225899 +Node: Changes 3.3227062 +Node: Changes 3.2227827 +Node: Changes 3.1228583 +Node: Changes 3.0229252 +Node: Changes Old231258 +Node: Wishlist233303 +Node: Wishlist Languages234140 +Node: Wishlist Fonts234706 +Node: Wishlist Emacs237117 +Node: Wishlist LaTeX239590 +Node: Wishlist Various240890 +Node: Wishlist Rejected241530 +Node: Open Questions242214 +Node: Acknowledgments243391 +Node: Indexes247479 +Node: Key Index248115 +Node: Program Index250299 +Node: Variable Index255947 +Node: Concept Index272243 End Tag Table diff --git a/x-symbol/lisp/ChangeLog b/x-symbol/lisp/ChangeLog index 1d3d95b0..87d9f0a8 100644 --- a/x-symbol/lisp/ChangeLog +++ b/x-symbol/lisp/ChangeLog @@ -1,4 +1,26 @@ -2003-03-06 Christoph Wedler <wedler@users.sourceforge.net> +2003-05-12 Christoph Wedler <wedler@users.sourceforge.net> + + * X-Symbol 4.5.1-beta. + + * Bug fix: unique decoding would not be unique for TeX + accents starting with \c, \k, \v, \u, \H, \r. + * Bug fix, Emacs-21.2: Makefile.emacs would not work, + variable `image-types' is not defined in -batch Emacs. + * Emacs-21.3.50: Would not work with with default value + nil for `x-symbol-emacs-has-correct-find-safe-coding'. + * Emacs: would issue a warning with value "ASCII" for + `current-language-environment'. + * Don't provide Emacs bug workaround for images with + Emacs-21.3.50. I want to know why it's necessary, i.e., + write an Emacs bug report... + * New variable `x-symbol-set-coding-system-if-undecided' + for Emacs, defaults to t. + + Report from Andreas Klein, Eli Tziperman. + +2003-03-14 Christoph Wedler <wedler@users.sourceforge.net> + + * X-Symbol 4.5-beta. * Bug fix: would not hightlight subscripts when using font-lock without any font-lock support mode if X-Symbol @@ -7,8 +29,13 @@ crypt/crypt++. * Bug fix, XEmacs: using C-s = isearch would not always reveal the full subscript command when necessary. - * Make |- and |= electric. + * Bug workaround, Emacs/Windows: would show boxes instead + Latin-9 characters, sort characters in Latin-9 bdf file. + * Emacs/Windows: add origfonts/ to Windows font path. + * Make contexts |- and |= electric. * Provide unzipped PDF and PS version of manual on web. + * Internal: renamed the prefix of language accesses from + `x-symbol-' to `x-symbol-LANG-'. * Manual, docstring and Makefile updates. Report from Felix E. Klee, Gerwin Klein. diff --git a/x-symbol/lisp/_pkg.el b/x-symbol/lisp/_pkg.el index 29ae7244..21347fe5 100644 --- a/x-symbol/lisp/_pkg.el +++ b/x-symbol/lisp/_pkg.el @@ -1,5 +1,5 @@ ;;;###autoload (if (fboundp 'package-provide) (package-provide 'x-symbol - :version 4.50 + :version 4.51 :type 'regular)) diff --git a/x-symbol/lisp/auto-autoloads.el b/x-symbol/lisp/auto-autoloads.el index 11e61782..cdd29e1a 100644 --- a/x-symbol/lisp/auto-autoloads.el +++ b/x-symbol/lisp/auto-autoloads.el @@ -3,7 +3,7 @@ ;;;### (autoloads nil "_pkg" "lisp/_pkg.el") -(if (fboundp 'package-provide) (package-provide 'x-symbol :version 4.5 :type 'regular)) +(if (fboundp 'package-provide) (package-provide 'x-symbol :version 4.51 :type 'regular)) ;;;*** @@ -24,24 +24,29 @@ nil." t nil) (autoload 'x-symbol-mode "x-symbol-hooks" "\ Toggle X-Symbol mode. -If ARG is a cons, e.g., when \\[x-symbol-mode] is preceded by one or -more \\[universal-argument]'s with no digits, turn on X-Symbol mode -conditionally, see MODE-ON in `x-symbol-auto-mode-alist'. Otherwise, -turn X-Symbol mode on if ARG is positive, else turn it off. If some -X-Symbol specific local variables are not buffer-local, set them to -reasonable values according to `x-symbol-buffer-mode-alist' and -`x-symbol-auto-mode-alist'. +Toggle X-Symbol mode. If provided with a prefix argument, turn X-Symbol +mode on if the numeric value of the argument is positive, else turn it +off. If no token language can be deduced, ask for a token language; if +provided with a non-numeric prefix argument, always ask. + +By default, X-Symbol mode is disabled in special major-modes visiting a +file, e.g., `vm-mode'. Use a prefix argument to be asked whether to +turn in on anyway. + +When not already defined, various buffer-local variables are set when +turning on X-Symbol. See `x-symbol-auto-style-alist' and the language +access `x-symbol-LANG-modes'. Turning X-Symbol mode on requires a valid `x-symbol-language' and also decodes tokens if the mode was turned off before, see -\\[x-symbol-decode]. Turning X-Symbol mode off also encodes x-symbol -characters if the mode was turned on before, see \\[x-symbol-encode]. -If argument INIT is non-nil, the old mode status is assumed to be off." t nil) +\\[x-symbol-decode-recode]. Turning X-Symbol mode off also encodes +x-symbol characters if the mode was turned on before, see +\\[x-symbol-encode-recode]. If optional argument SPECIAL has value +`init', the old mode status is assumed to be off." t nil) (autoload 'turn-on-x-symbol-conditionally "x-symbol-hooks" "\ Turn on x-symbol mode conditionally, see `x-symbol-mode'. -Call `x-symbol-mode' with a cons for ARG and a non-nil INIT. Used in -`hack-local-variables-hook'." nil nil) +Call `x-symbol-mode' with SPECIAL having value `init'." nil nil) (autoload 'x-symbol-fontify "x-symbol-hooks" "\ Re-fontify region between BEG and END." t nil) @@ -84,7 +89,7 @@ button2 starts an image editor, see `x-symbol-image-editor-alist'. button3 pops up a menu, see `x-symbol-image-menu'. The image insertion commands are recognized by keywords in the language -access `x-symbol-image-keywords' whose value have the form +access `x-symbol-LANG-image-keywords' whose value have the form (IMAGE-REGEXP KEYWORD ...) IMAGE-REGEXP should match all images files and is used to initialize the buffer local memory cache, see `x-symbol-image-init-memory-cache'. @@ -96,8 +101,8 @@ name of the corresponding image file. If FUNCTION returns nil, the command is not highlighted. Relative image file names are expanded in the directory returned by the -function in the language access `x-symbol-master-directory', value nil -means function `default-directory'. Implicitly relative image file +function in the language access `x-symbol-LANG-master-directory', value +nil means function `default-directory'. Implicitly relative image file names are searched in a search path, see `x-symbol-image-use-remote'." t nil) (autoload 'x-symbol-image-after-change-function "x-symbol-image" "\ @@ -200,9 +205,13 @@ commands `x-symbol-encode' and `x-symbol-mode'. Note that in most token languages, different tokens might be decoded to the same character, e.g., \\neq and \\ne in `tex', Ä and Ä -in `sgml'!" t nil) +in `sgml', see `x-symbol-unique'!" t nil) -(autoload 'x-symbol-decode "x-symbol" nil t nil) +(autoload 'x-symbol-decode "x-symbol" "\ +Decode all tokens in active region or buffer to characters. +As opposed to `x-symbol-decode-recode', this function performs no +recoding, i.e., `x-symbol-coding' is considered to have the value of +`x-symbol-default-coding'." t nil) (autoload 'x-symbol-encode-recode "x-symbol" "\ Encode all characters in active region or buffer to tokens. @@ -212,7 +221,13 @@ Variables `x-symbol-8bits' and `x-symbol-coding' determine whether to encode 8bit characters. See also commands `x-symbol-decode' and `x-symbol-mode'." t nil) -(autoload 'x-symbol-encode "x-symbol" nil t nil) +(autoload 'x-symbol-encode "x-symbol" "\ +Encode all characters in active region or buffer to tokens. +As opposed to `x-symbol-encode-recode', this function performs no +recoding, i.e., `x-symbol-coding' is considered to have the value of +`x-symbol-default-coding'. Additionally, `x-symbol-8bits' is assumed to +be nil if `x-symbol-coding' is not nil or not having the same value as +`x-symbol-default-coding'." t nil) (autoload 'x-symbol-unalias "x-symbol" "\ Resolve all character aliases in active region or buffer. @@ -230,16 +245,14 @@ resolve a single character before point with \\[x-symbol-modify-key]. if you have a latin-1 font by default, the `adiaeresis' in a latin-2 encoded file is a latin-1 `adiaeresis' in the buffer. When saving the buffer, its is again the right 8bit character in the latin-2 encoded -file. But note: CHAR ALIASES ARE NOT ENCODED WHEN SAVING THE FILE. -Invoke this command before, if your buffers have char aliases! Seven -positions in latin-3 fonts are not used, the corresponding 8bit bytes in -latin-3 encoded files are not changed. - -In normal cases, buffers do not have char aliases: in XEmacs/Mule, this -is only possible if you copy characters from buffers with characters -considered as char aliases by package x-symbol, e.g., from the Mule file -\"european.el\". In XEmacs/no-Mule, this is only possible if you use -commands like `\\[universal-argument] 2 3 4'. +file. Seven positions in latin-3 fonts are not used, the corresponding +8bit bytes in latin-3 encoded files are not changed. + +In normal cases, buffers do not have char aliases: with Mule support, +this is only possible if you copy characters from buffers with +characters considered as char aliases by package x-symbol, e.g., from +the Mule file \"european.el\". Without Mule support, this is only +possible if you use commands like `\\[universal-argument] 2 3 4'. The reason why package x-symbol does not support all versions of `adiaeresis'es: diff --git a/x-symbol/lisp/x-symbol-bib.el b/x-symbol/lisp/x-symbol-bib.el index 9f2fabc0..2b7e85d9 100644 --- a/x-symbol/lisp/x-symbol-bib.el +++ b/x-symbol/lisp/x-symbol-bib.el @@ -1,10 +1,10 @@ ;;; x-symbol-bib.el --- token language "BibTeX macro" for package x-symbol -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003 Free Software Foundation, Inc. ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -40,39 +40,42 @@ ;;;=========================================================================== (defcustom x-symbol-bib-auto-style '(t nil nil nil nil nil) - "TODO" + "Values for X-Symbol's buffer-local variables with language `bib'. +See language access `x-symbol-LANG-auto-style'." :group 'x-symbol-bib :group 'x-symbol-mode :type 'x-symbol-auto-style) (defcustom x-symbol-bib-modeline-name "bib" - "*String naming the language TeX in the modeline." + "Modeline name of token language `bib'. +See language access `x-symbol-LANG-modeline-name'." :group 'x-symbol-bib :type 'string) (defcustom x-symbol-bib-header-groups-alist x-symbol-tex-header-groups-alist - "*If non-nil, used in TeX specific grid/menu. -See `x-symbol-header-groups-alist'." + "Header/submenu specification of the specific menu for language `bib'. +See language access `x-symbol-LANG-header-groups-alist'." :group 'x-symbol-bib :group 'x-symbol-input-init :type 'x-symbol-headers) (defcustom x-symbol-bib-electric-ignore x-symbol-tex-electric-ignore - "*Additional TeX version of `x-symbol-electric-ignore'." + "Specification restricting input method ELECTRIC with language `bib'. +See language access `x-symbol-LANG-electric-ignore'." :group 'x-symbol-bib :group 'x-symbol-input-control :type 'x-symbol-function-or-regexp) (defcustom x-symbol-bib-class-alist x-symbol-tex-class-alist - "Alist for TeX's token classes displayed by info in echo area. -See `x-symbol-language-access-alist' for details." + "Token classes displayed by info in echo area, for language `bib'. +See language access `x-symbol-LANG-class-alist'." :group 'x-symbol-bib :group 'x-symbol-info-strings :type 'x-symbol-class-info) (defcustom x-symbol-bib-class-face-alist x-symbol-tex-class-face-alist - "Alist for TeX's color scheme in TeX's grid and info. -See `x-symbol-language-access-alist' for details." + "Color scheme in language specific grid and info, for language `bib'. +See language access `x-symbol-LANG-class-face-alist'." :group 'x-symbol-bib :group 'x-symbol-input-init :group 'x-symbol-info-general @@ -90,21 +93,26 @@ See `x-symbol-language-access-alist' for details." :decode-spec (?\\) :input-spec (?\\ (math . "[a-z@-Z]")) :token-list x-symbol-bib-default-token-list) - "Token grammar for language `bib'.") + "Grammar of token language `bib'. +See language access `x-symbol-LANG-token-grammar'.") (defvar x-symbol-bib-required-fonts x-symbol-tex-required-fonts - "List of features providing fonts for language `bib'.") + "Features providing required fonts for language `bib'. +See language access `x-symbol-LANG-required-fonts'.") (defvar x-symbol-bib-user-table nil "User table defining TeX macros, used in `x-symbol-bib-table'.") (defvar x-symbol-bib-table (append x-symbol-bib-user-table x-symbol-tex-table) - "Complete table defining Unique TeX macros, see `x-symbol-bib-user-table'. -Default value uses all definitions in `x-symbol-bib-table'.") + "Table defining `bib' tokens for the characters. +See language access `x-symbol-LANG-table'. Default value uses all +definitions in `x-symbol-tex-table'. Use `x-symbol-bib-user-table' to +define private TeX macros or shadow existing ones. ") (defvar x-symbol-bib-generated-data nil - "Internal.") + "Generated data for token language `bib'. +See language access `x-symbol-LANG-generated-data'.") (defun x-symbol-bib-default-token-list (tokens) (if (stringp tokens) diff --git a/x-symbol/lisp/x-symbol-emacs.el b/x-symbol/lisp/x-symbol-emacs.el index 696d9b54..06025a48 100644 --- a/x-symbol/lisp/x-symbol-emacs.el +++ b/x-symbol/lisp/x-symbol-emacs.el @@ -4,7 +4,7 @@ ;; ;; Authors: Stefan Monnier, Christoph Wedler ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5.X ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -28,16 +28,22 @@ ;; \\[x-symbol-package-web]) and read the info (use \\[x-symbol-package-info]). (provide 'x-symbol-emacs) +;; TODO: Emacs has `buffer-substring-no-properties' (unless (fboundp 'emacs-version>=) - (defun emacs-version>= (major &optional minor) - "Return true if the Emacs version is >= to the given MAJOR, and -MINOR numbers, MINOR is optional. MINOR is only used in the test if it -is non-nil." +(defun emacs-version>= (major &optional minor patch) + "Return true if the Emacs version is >= to the given version. +The version is provided by the required argument MAJOR, and the optional +arguments MINOR and PATCH. Only the non-nil arguments are used in the +test." (cond ((> emacs-major-version major)) ((< emacs-major-version major) nil) ((null minor)) - ((>= emacs-minor-version minor))))) + ((> emacs-minor-version minor)) + ((< emacs-minor-version minor) nil) + ((null patch)) + ((string-match "^[0-9]+\\.[0-9]+\\.\\([0-9]+\\)" emacs-version) + (>= (string-to-int (match-string 1 emacs-version)) patch))))) ;;;=========================================================================== @@ -73,7 +79,8 @@ is non-nil." ;; src/fileio.c,v 1.447: (defvar x-symbol-emacs-has-correct-find-safe-coding - (emacs-version>= 21 4)) + (not (and (boundp 'char-coding-system-table) + (arrayp char-coding-system-table)))) ;; lisp/format.el,v 1.39 (with src/fileio.c,v 1.447): ;; (setq x-symbol-auto-conversion-method 'format) @@ -86,7 +93,10 @@ is non-nil." ;;; Bugs: -(defvar x-symbol-emacs-after-create-image-function 'clear-image-cache) +(defvar x-symbol-emacs-after-create-image-function +;; I want to know why `clear-image-cache' is necessary sometimes, +;; 'redraw-display is not enough + (if (emacs-version>= 21 3 50) nil 'clear-image-cache)) ;;; Todo: @@ -109,6 +119,8 @@ is non-nil." (require 'fontset) ;seems not to be loaded in batch mode ;; temp hack: +(defvar image-types nil) ; necessary in Emacs-21.2 w/o image + ; support, still in Emacs-21.3? (if (memq 'png image-types) (provide 'png)) (if (memq 'gif image-types) (provide 'gif)) @@ -220,6 +232,7 @@ is non-nil." ;;; Char tables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; TODO: use 'x-symbol instead 'generic with Emacs (put 'generic 'char-table-extra-slots 0) (unless (fboundp 'put-char-table) (defun put-char-table (range val tab) (set-char-table-range tab range val))) @@ -324,6 +337,7 @@ are separated with SEPARATOR (\", \" by default)." (< (length x) (length y)))) (or separator ", ")))) +;; defined in Emacs-21.3.50 (unless (fboundp 'file-remote-p) (defun file-remote-p (file-name) "Test whether FILE-NAME is looked for on a remote system." @@ -382,7 +396,7 @@ are separated with SEPARATOR (\", \" by default)." (defvar x-symbol-emacs-w32-font-directories (mapcar (lambda (dir) (expand-file-name dir x-symbol-data-directory)) - '("fonts/" "genfonts/"))) + '("fonts/" "origfonts/" "genfonts/"))) (if (and (eq window-system 'w32) x-symbol-emacs-w32-font-directories diff --git a/x-symbol/lisp/x-symbol-hooks.el b/x-symbol/lisp/x-symbol-hooks.el index 41540816..22d82460 100644 --- a/x-symbol/lisp/x-symbol-hooks.el +++ b/x-symbol/lisp/x-symbol-hooks.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5.X ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -246,6 +246,9 @@ Use \"locale -ck code_set_name charmap\" and search for the value of (when (coding-system-p cs) (setq name (cdr (assq (coding-system-base cs) '((raw-text . iso-8859-1) ; console + ;; (undecided . iso-8859-1) "-i" is correct + ;; here, see + ;; `x-symbol-set-coding-system-if-undecided' (iso-latin-1 . iso-8859-1) (iso-latin-1-with-esc . iso-8859-1) (iso-latin-2 . iso-8859-2) @@ -280,7 +283,8 @@ Use \"locale -ck code_set_name charmap\" and search for the value of (let* ((cs (default-value 'buffer-file-coding-system)) (val (cond (cs (x-symbol-buffer-coding cs)) - ((equal current-language-environment "English") + ((member (downcase current-language-environment) + '("english" "ascii")) 'iso-8859-1))) (loc (x-symbol-coding-system-from-locale))) (and loc @@ -364,56 +368,64 @@ You should not set this variable directly, use `x-symbol-register-language' instead!") (defcustom x-symbol-charsym-name "x-symbol charsym" - "Name of the pseudo token language x-symbol charsym. -This pseudo language corresponds to `x-symbol-language' having value nil -and is used for input methods, not for decoding and encoding. See -`x-symbol-language-text'." + "Standard name of the pseudo token language x-symbol charsym. +See language access `x-symbol-LANG-name'. The pseudo language +corresponds to `x-symbol-language' having value nil and is only used for +input methods. See `x-symbol-language-text'." :group 'x-symbol-miscellaneous :type 'string) (defcustom x-symbol-tex-name "TeX macro" - "Name of token language `tex'. See `x-symbol-name'." + "Standard name of token language `tex'. +See language access `x-symbol-LANG-name'." :group 'x-symbol-tex :type 'string) (defcustom x-symbol-tex-modes '(tex-mode latex-mode plain-tex-mode noweb-mode) - "Major modes using language `tex'. See `x-symbol-mode'." + "Major modes typically using X-Symbol with token language `tex'. +See language access `x-symbol-LANG-modes'." :group 'x-symbol-tex :group 'x-symbol-mode :type '(repeat function)) (defcustom x-symbol-sgml-name "SGML entity" - "Name of token language `sgml'. See `x-symbol-name'." + "Standard name of token language `sgml'. +See language access `x-symbol-LANG-name'." :group 'x-symbol-sgml :type 'string) (defcustom x-symbol-sgml-modes ;;'(sgml-mode xml-mode html-mode hm--html-mode html-helper-mode) '(html-mode hm--html-mode html-helper-mode) - "Major modes using language `sgml'. See `x-symbol-modes'." + "Major modes typically using X-Symbol with language `sgml'. +See language access `x-symbol-LANG-modes'." :group 'x-symbol-sgml :group 'x-symbol-mode :type '(repeat function)) (defcustom x-symbol-bib-name "BibTeX macro" - "Name of token language `bib'. See `x-symbol-name'." + "Standard name of token language `bib'. +See language access `x-symbol-LANG-name'." :group 'x-symbol-bib :type 'string) (defcustom x-symbol-bib-modes '(bibtex-mode) - "Major modes using language `bib'. See `x-symbol-modes'." + "Major modes typically using X-Symbol with language `bib'. +See language access `x-symbol-LANG-modes'." :group 'x-symbol-bib :group 'x-symbol-mode :type '(repeat function)) (defcustom x-symbol-texi-name "TeXinfo command" - "Name of token language `tex'. See `x-symbol-name'." + "Standard name of token language `texi'. +See language access `x-symbol-LANG-name'." :group 'x-symbol-texi :type 'string) (defcustom x-symbol-texi-modes '(texinfo-mode) - "Major modes using language `texi'. See `x-symbol-modes'." + "Major modes typically using X-Symbol with language `texi'. +See language access `x-symbol-LANG-modes'." :group 'x-symbol-texi :group 'x-symbol-mode :type '(repeat function)) @@ -447,11 +459,18 @@ info in the echo area, etc.") (defvar x-symbol-coding nil "*Coding of 8bit characters in a file. -Supported values are `iso-8859-1', `iso-8859-2', `iso-8859-3' and -`iso-8859-9', value nil means the value of `x-symbol-default-coding'. Determines which characters are considered to be 8bit characters for -file operations. Function `x-symbol-mode' sets this variable to a -reasonable value if the variable is not yet buffer-local. +file operations. Supported values are `iso-8859-1', `iso-8859-2', +`iso-8859-3', `iso-8859-9', and `iso-8859-15'. Value nil means a value +according to `buffer-file-coding-system' with Mule support, or the value +of `x-symbol-default-coding' without Mule support. + +With Mule support, any value other than `nil' is considered invalid if +encoding according to `buffer-file-coding-system' is neither the same as +this value nor the same as `x-symbol-default-coding'. + +Function `x-symbol-mode' sets this variable to a reasonable value if the +variable is not yet buffer-local. During decoding, e.g., when visiting a file, the value is always important for the interpretation of 8bit characters, an invalid value is @@ -469,8 +488,10 @@ is valid and `x-symbol-8bits' is non-nil.") "*If non-nil, do not encode 8bit characters. Variable `x-symbol-coding' determines which characters are assumed to be 8bit characters. Note that tokens representing 8bit characters are -always decoded. Function `x-symbol-mode' sets this variable to a -reasonable value if the variable is not yet buffer-local.") +always decoded, except if `x-symbol-unique' is non-nil. + +Function `x-symbol-mode' sets this variable to a reasonable value if the +variable is not yet buffer-local.") ;; TODO: link to `x-symbol-unique' (make-variable-buffer-local 'x-symbol-8bits) @@ -479,8 +500,14 @@ reasonable value if the variable is not yet buffer-local.") '(x-symbol-update-modeline)) (defvar x-symbol-unique nil - "*If non-nil, only decode canonical tokens.") -;; TODO: link to `x-symbol-8bits' + "*If non-nil, only decode canonical tokens. +Canonical tokens are those which are produced when X-Symbol encodes the +corresponding character. If `x-symbol-8bits' is non-nil, do not decode +tokens which would be decoded to 8bit characters according to +`x-symbol-coding'. + +Function `x-symbol-mode' sets this variable to a reasonable value if the +variable is not yet buffer-local.") (make-variable-buffer-local 'x-symbol-unique) (put 'x-symbol-unique 'permanent-local t) @@ -489,10 +516,12 @@ reasonable value if the variable is not yet buffer-local.") (defvar x-symbol-subscripts nil "*If non-nil, use special fonts to display super- and subscripts. -This feature must be supported by the token language dependent font-lock -keywords. Function `x-symbol-mode' sets this variable to a reasonable -value if the variable is not yet buffer-local. Some parts of the text -might be invisible, see also variable `x-symbol-reveal-invisible'.") +This feature must be supported by the token language via language access +`x-symbol-LANG-subscript-matcher'. Some parts of the text might be +invisible, see also variable `x-symbol-reveal-invisible'. + +Function `x-symbol-mode' sets this variable to a reasonable value if the +variable is not yet buffer-local.") (make-variable-buffer-local 'x-symbol-subscripts) (x-symbol-define-user-options 'x-symbol-subscripts '(t) @@ -500,10 +529,11 @@ might be invisible, see also variable `x-symbol-reveal-invisible'.") (defvar x-symbol-image nil "*If non-nil, show little glyphs after image insertion commands. -This feature must be supported by the token language dependent image -keywords, see `x-symbol-image-parse-buffer'. Function `x-symbol-mode' -sets this variable to a reasonable value if the variable is not yet -buffer-local.") +This feature must be supported by the token language via language access +`x-symbol-LANG-image-keywords'. + +Function `x-symbol-mode' sets this variable to a reasonable value if the +variable is not yet buffer-local.") (make-variable-buffer-local 'x-symbol-image) (x-symbol-define-user-options 'x-symbol-image '(t) @@ -535,6 +565,9 @@ Used when finding an appropriate value for `x-symbol-8bits'. See also "*Alist to setup X-Symbol values for buffers visiting files. Elements look like (MATCH LANGUAGE MODE-ON CODING 8BITS UNIQUE SUBSCRIPTS IMAGE) +or + (MATCH LANGUAGE . VARIABLE) + If MATCH matches a buffer in which command `x-symbol-mode' is invoked, the rest of the element is used to setup some buffer-local x-symbol specific variables. If no element matches, set `x-symbol-language' to @@ -542,21 +575,22 @@ the symbol property `x-symbol-language' of the major mode symbol if the variable is not already buffer-local. If `x-symbol-mode' is not already buffer-local, MODE-ON determines -whether to turn the mode on if `x-symbol-mode' is called with a cons as -prefix argument. LANGUAGE, CODING, 8BITS, UNIQUE, SUBSCRIPTS and IMAGE -are used to set `x-symbol-language', `x-symbol-coding', -`x-symbol-8bits', `x-symbol-unique', `x-symbol-subscripts' and -`x-symbol-image' if these values are not already buffer-local. +whether to turn the mode on with `turn-on-x-symbol-conditionally'. +LANGUAGE, CODING, 8BITS, UNIQUE, SUBSCRIPTS and IMAGE are used to set +`x-symbol-language', `x-symbol-coding', `x-symbol-8bits', +`x-symbol-unique', `x-symbol-subscripts' and `x-symbol-image' if these +values are not already buffer-local. MATCH is either a list of major modes which must include the mode of the current buffer or a regexp matching the file name ignoring some suffixes, see `x-symbol-auto-mode-suffixes', or a value used directly. + MODE-ON, LANGUAGE, CODING, 8BITS, UNIQUE, SUBSCRIPTS and IMAGE are `eval'ed in that order. During the evaluation, `x-symbol-mode' is non-nil according to MODE-ON. -See the documentation of `x-symbol-auto-style' for the auto-style -language accesses." +VARIABLE is a symbol whose value contains the above mentioned values, +see the language access `x-symbol-LANG-auto-style'." :group 'x-symbol-mode :type '(repeat (cons :format "%v" (choice (repeat :tag "In major modes" @@ -694,25 +728,29 @@ nil." ;;;###autoload (defun x-symbol-mode (&optional arg special) "Toggle X-Symbol mode. -If ARG is a cons, e.g., when \\[x-symbol-mode] is preceded by one or -more \\[universal-argument]'s with no digits, turn on X-Symbol mode -conditionally, see MODE-ON in `x-symbol-auto-mode-alist'. Otherwise, -turn X-Symbol mode on if ARG is positive, else turn it off. If some -X-Symbol specific local variables are not buffer-local, set them to -reasonable values according to `x-symbol-buffer-mode-alist' and -`x-symbol-auto-mode-alist'. +Toggle X-Symbol mode. If provided with a prefix argument, turn X-Symbol +mode on if the numeric value of the argument is positive, else turn it +off. If no token language can be deduced, ask for a token language; if +provided with a non-numeric prefix argument, always ask. + +By default, X-Symbol mode is disabled in special major-modes visiting a +file, e.g., `vm-mode'. Use a prefix argument to be asked whether to +turn in on anyway. + +When not already defined, various buffer-local variables are set when +turning on X-Symbol. See `x-symbol-auto-style-alist' and the language +access `x-symbol-LANG-modes'. Turning X-Symbol mode on requires a valid `x-symbol-language' and also decodes tokens if the mode was turned off before, see -\\[x-symbol-decode]. Turning X-Symbol mode off also encodes x-symbol -characters if the mode was turned on before, see \\[x-symbol-encode]. -If argument INIT is non-nil, the old mode status is assumed to be off." +\\[x-symbol-decode-recode]. Turning X-Symbol mode off also encodes +x-symbol characters if the mode was turned on before, see +\\[x-symbol-encode-recode]. If optional argument SPECIAL has value +`init', the old mode status is assumed to be off." (interactive (list current-prefix-arg 'interactive)) (if (eq special 'init) (setq x-symbol-mode nil)) (let* ((old-mode (if (eq special 'init) nil x-symbol-mode)) - (new-mode (if arg - (> (prefix-numeric-value arg) 0) - (not x-symbol-mode))) + (new-mode (if arg (> (prefix-numeric-value arg) 0) (not old-mode))) (disabled0 (assq major-mode x-symbol-mode-disable-alist)) (disabled1 (if disabled0 (cdr disabled0) @@ -757,7 +795,7 @@ If argument INIT is non-nil, the old mode status is assumed to be off." (let ((langs x-symbol-language-alist)) (while langs (if (memq major-mode - (symbol-value (get (caar langs) 'x-symbol-modes))) + (symbol-value (get (caar langs) 'x-symbol-LANG-modes))) (setq style (cons (caar langs) t) langs nil) (setq langs (cdr langs)))))) @@ -767,7 +805,7 @@ If argument INIT is non-nil, the old mode status is assumed to be off." ;; check language ---------------------------------------------------- (if (and x-symbol-language (symbolp x-symbol-language) - (get x-symbol-language 'x-symbol-feature)) + (get x-symbol-language 'x-symbol-LANG-feature)) (when (and (eq special 'interactive) (consp arg)) (setq x-symbol-language (x-symbol-read-language @@ -784,12 +822,12 @@ If argument INIT is non-nil, the old mode status is assumed to be off." (if x-symbol-language (setq x-symbol-language nil))) (setq style nil)) (when x-symbol-language - (require (get x-symbol-language 'x-symbol-feature)) + (require (get x-symbol-language 'x-symbol-LANG-feature)) (setq style (cond ((or (null style) (eq (cdr style) t) (not (eq (car style) x-symbol-language))) (symbol-value (get x-symbol-language - 'x-symbol-auto-style))) + 'x-symbol-LANG-auto-style))) ((and (symbolp (cdr style)) (boundp (cdr style))) (symbol-value (cdr style))) (t @@ -821,8 +859,7 @@ If argument INIT is non-nil, the old mode status is assumed to be off." ;;;###autoload (defun turn-on-x-symbol-conditionally () "Turn on x-symbol mode conditionally, see `x-symbol-mode'. -Call `x-symbol-mode' with a cons for ARG and a non-nil INIT. Used in -`hack-local-variables-hook'." +Call `x-symbol-mode' with SPECIAL having value `init'." (x-symbol-mode (and (local-variable-p 'x-symbol-mode (current-buffer)) (if x-symbol-mode 1 0)) 'init)) @@ -952,7 +989,7 @@ Added to `after-insert-file-functions' if (setq len (- (point-max) (point-min))))) (lwarn 'x-symbol 'warning ;; might leed to quite a few warnings with old XEmacs, get those - "Wrong point position provided for function in `after-insert-file-functions'"))) + "Wrong point position %d (len: %d, max: %d) provided by Emacs for functions in `after-insert-file-functions'" (point) len (point-max)))) len) (defun x-symbol-write-region-annotate-function (start end) @@ -1050,10 +1087,10 @@ Its value is set by `x-symbol-update-modeline'.") (add-minor-mode 'x-symbol-mode 'x-symbol-modeline-string x-symbol-mode-map) (put 'x-symbol-mode :menu-tag "X-Symbol") -(defvar x-symbol-early-language-access-alist - '((x-symbol-name "name" nil stringp) - (x-symbol-modes "modes" t listp) ; TODO: non-optional - (x-symbol-auto-style "auto-style" require))) +(defconst x-symbol-early-language-access-alist + '((x-symbol-LANG-name "name" nil stringp) + (x-symbol-LANG-modes "modes" t listp) ; TODO: non-optional + (x-symbol-LANG-auto-style "auto-style" require))) (defun x-symbol-init-language-accesses (language alist) "Initialize accesses for token language LANGUAGE according to ALIST. @@ -1061,7 +1098,7 @@ The symbol property `x-symbol-feature' of LANGUAGE must be set before. See also `x-symbol-language-access-alist'." ;;If optional NO-TEST is nil, accesses which do not point to a bound ;;variable are not set. - (let ((feature (get language 'x-symbol-feature)) + (let ((feature (get language 'x-symbol-LANG-feature)) (ok t) symbol) (dolist (item alist) @@ -1091,8 +1128,8 @@ See also `x-symbol-language-access-alist'." FEATURE is a feature which `provide's LANGUAGE. MODES are major modes which typically use LANGUAGE. Using LANGUAGE's accesses will initialize LANGUAGE, see `x-symbol-language-value'." - (unless (get language 'x-symbol-feature) - (put language 'x-symbol-feature feature)) + (unless (get language 'x-symbol-LANG-feature) + (put language 'x-symbol-LANG-feature feature)) (unless (x-symbol-init-language-accesses language x-symbol-early-language-access-alist) @@ -1102,7 +1139,8 @@ LANGUAGE, see `x-symbol-language-value'." (setq x-symbol-language-alist (nconc x-symbol-language-alist (list (cons language - (symbol-value (get language 'x-symbol-name)))))))) + (symbol-value + (get language 'x-symbol-LANG-name)))))))) ;;;###autoload (defun x-symbol-initialize (&optional arg) @@ -1169,6 +1207,8 @@ X-Symbol twice." x-symbol-font-directory) nil t) (not (eq 0 (call-process "xset" nil nil nil "fp+" x-symbol-font-directory)))))) + ;; one cause: other dir with X-Symbol fonts already exists (old + ;; installation) (lwarn 'x-symbol 'error "Couldn't add %s to X font path" x-symbol-font-directory)) ;; Package fast-lock ----------------------------------------------------- diff --git a/x-symbol/lisp/x-symbol-image.el b/x-symbol/lisp/x-symbol-image.el index 33ea94b2..525c3c7c 100644 --- a/x-symbol/lisp/x-symbol-image.el +++ b/x-symbol/lisp/x-symbol-image.el @@ -1,10 +1,10 @@ ;;; x-symbol-image.el --- display glyphs at the end of image insertion commands -;; Copyright (C) 1997-1999, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1997-1999, 2001, 2003 Free Software Foundation, Inc. ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -160,7 +160,7 @@ button2 starts an image editor, see `x-symbol-image-editor-alist'. button3 pops up a menu, see `x-symbol-image-menu'. The image insertion commands are recognized by keywords in the language -access `x-symbol-image-keywords' whose value have the form +access `x-symbol-LANG-image-keywords' whose value have the form (IMAGE-REGEXP KEYWORD ...) IMAGE-REGEXP should match all images files and is used to initialize the buffer local memory cache, see `x-symbol-image-init-memory-cache'. @@ -172,8 +172,8 @@ name of the corresponding image file. If FUNCTION returns nil, the command is not highlighted. Relative image file names are expanded in the directory returned by the -function in the language access `x-symbol-master-directory', value nil -means function `default-directory'. Implicitly relative image file +function in the language access `x-symbol-LANG-master-directory', value +nil means function `default-directory'. Implicitly relative image file names are searched in a search path, see `x-symbol-image-use-remote'." (interactive) (save-excursion @@ -239,12 +239,13 @@ cache files." (unwind-protect (let (;;(case-fold-search nil) (keywords (cdr (x-symbol-language-value - 'x-symbol-image-keywords))) + 'x-symbol-LANG-image-keywords))) (cached-dirs (cons nil (mapcar 'file-name-as-directory (x-symbol-language-value - 'x-symbol-image-cached-dirs)))) - (master-dir (x-symbol-language-value 'x-symbol-master-directory)) + 'x-symbol-LANG-image-cached-dirs)))) + (master-dir (x-symbol-language-value + 'x-symbol-LANG-master-directory)) keyword matcher file-fn file-args file extent cache-elem extent-beg extent-end) (if master-dir (funcall master-dir)) @@ -311,7 +312,7 @@ cache files." (defun x-symbol-image-default-file-name (num &optional regexp extension) "Return image file name for last match. -Default FUNCTION in language access `x-symbol-image-keywords', see +Default FUNCTION in language access `x-symbol-LANG-image-keywords', see `x-symbol-image-parse-buffer'. Return text matched by the NUMth regexp group of the corresponding keyword regexp. If REGEXP is non-nil and the file name does not match REGEXP, add EXTENSION to the file name." @@ -328,14 +329,16 @@ file name does not match REGEXP, add EXTENSION to the file name." (defun x-symbol-image-init-memory-cache () "Create an empty memory cache. Scan all directories in the searchpath and all subdirectories in the -language access `x-symbol-image-cached-dirs' for files matched by -IMAGE-REGEXP in the language access `x-symbol-image-keywords' to build -`x-symbol-image-memory-cache' where all GLYPHs are nil." +language access `x-symbol-LANG-image-cached-dirs' for files matched by +IMAGE-REGEXP in the language access `x-symbol-LANG-image-keywords' to +build `x-symbol-image-memory-cache' where all GLYPHs are nil." (let* ((master-dir (funcall (x-symbol-language-value - 'x-symbol-master-directory))) - (cached-dirs (x-symbol-language-value 'x-symbol-image-cached-dirs)) + 'x-symbol-LANG-master-directory))) + (cached-dirs (x-symbol-language-value + 'x-symbol-LANG-image-cached-dirs)) (path (x-symbol-image-searchpath master-dir)) - (suffixes (car (x-symbol-language-value 'x-symbol-image-keywords))) + (suffixes (car (x-symbol-language-value + 'x-symbol-LANG-image-keywords))) implicit-dirs dirs dir) (setq x-symbol-image-memory-cache nil) @@ -367,12 +370,12 @@ IMAGE-REGEXP in the language access `x-symbol-image-keywords' to build (defun x-symbol-image-searchpath (master-dir) "Return language dependent image searchpath in reverse order. -Uses the language accesses `x-symbol-image-searchpath' and -`x-symbol-master-directory' (via argument MASTER-DIR). Include all +Uses the language accesses `x-symbol-LANG-image-searchpath' and +`x-symbol-LANG-master-directory' (via argument MASTER-DIR). Include all subdirectories of elements in the image searchpath ending with \"//\", except symbolic links if `x-symbol-image-searchpath-follow-symlink' is nil." - (let ((path (or (x-symbol-language-value 'x-symbol-image-searchpath) + (let ((path (or (x-symbol-language-value 'x-symbol-LANG-image-searchpath) '("./"))) (dirs nil) dir truename slashslash) @@ -431,10 +434,11 @@ nil." "Start image editor for the image file FILE used in BUFFER. If BUFFER is nil, just return string describing the command. See `x-symbol-image-editor-alist' and `x-symbol-image-current-marker'." - (interactive (list (read-file-name "Edit image design file for: " - (funcall (x-symbol-language-value - 'x-symbol-master-directory))) - (current-buffer))) + (interactive + (list (read-file-name "Edit image design file for: " + (funcall (x-symbol-language-value + 'x-symbol-LANG-master-directory))) + (current-buffer))) (let ((result (and file (x-symbol-match-in-alist file x-symbol-image-editor-alist)))) (and file buffer (setq file (x-symbol-image-active-file file buffer))) @@ -514,7 +518,7 @@ instead." (save-excursion (set-buffer buffer) (let ((master-dir (funcall (x-symbol-language-value - 'x-symbol-master-directory))) + 'x-symbol-LANG-master-directory))) path) (if (or (string-match x-symbol-image-explicitly-relative-regexp file) (file-name-absolute-p file)) diff --git a/x-symbol/lisp/x-symbol-macs.el b/x-symbol/lisp/x-symbol-macs.el index d8a60fc1..7245d3bb 100644 --- a/x-symbol/lisp/x-symbol-macs.el +++ b/x-symbol/lisp/x-symbol-macs.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4 +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ diff --git a/x-symbol/lisp/x-symbol-mule.el b/x-symbol/lisp/x-symbol-mule.el index c4e14150..7c25b5e7 100644 --- a/x-symbol/lisp/x-symbol-mule.el +++ b/x-symbol/lisp/x-symbol-mule.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization, Mule ;; X-URL: http://x-symbol.sourceforge.net/ diff --git a/x-symbol/lisp/x-symbol-nomule.el b/x-symbol/lisp/x-symbol-nomule.el index 38f8c532..9ca2d483 100644 --- a/x-symbol/lisp/x-symbol-nomule.el +++ b/x-symbol/lisp/x-symbol-nomule.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ diff --git a/x-symbol/lisp/x-symbol-sgml.el b/x-symbol/lisp/x-symbol-sgml.el index 8bb89844..98ae41a2 100644 --- a/x-symbol/lisp/x-symbol-sgml.el +++ b/x-symbol/lisp/x-symbol-sgml.el @@ -1,10 +1,10 @@ ;;; x-symbol-sgml.el --- token language "SGML entity" for package x-symbol -;; Copyright (C) 1996-1999, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2002, 2003 Free Software Foundation, Inc. ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -43,7 +43,8 @@ (x-symbol-auto-coding-alist x-symbol-sgml-auto-coding-alist) x-symbol-coding (not x-symbol-mode) x-symbol-mode x-symbol-mode) - "TODO" + "Values for X-Symbol's buffer-local variables with language `sgml'. +See language access `x-symbol-LANG-auto-style'." :group 'x-symbol-sgml :group 'x-symbol-mode :type 'x-symbol-auto-style) @@ -55,9 +56,9 @@ ("iso-8859-3" . iso-8859-3) ("iso-8859-9" . iso-8859-9) ("iso-8859-15" . iso-8859-15))) - "*Alist used to determine the file coding of SGML/HTML buffers. -Used in the default value of `x-symbol-auto-mode-alist'. See -variable `x-symbol-auto-coding-alist' for details." + "*Alist used to determine the file coding with language `sgml'. +Used in the default value of `x-symbol-sgml-auto-style'. See variable +`x-symbol-auto-coding-alist' for details." :group 'x-symbol-sgml :group 'x-symbol-mode :type 'x-symbol-auto-coding) @@ -84,7 +85,8 @@ Used in `x-symbol-sgml-class-face-alist'." :group 'x-symbol-info-general) (defcustom x-symbol-sgml-modeline-name "sgml" - "*String naming the language SGML in the modeline." + "Modeline name of token language `sgml'. +See language access `x-symbol-LANG-modeline-name'." :group 'x-symbol-sgml :type 'string) @@ -102,8 +104,8 @@ Used in `x-symbol-sgml-class-face-alist'." ("Circumflex, Caron" circumflex caron) ("Diaeresis, Umlaut" diaeresis hungarumlaut) ("Acute, Grave" acute grave)) - "*If non-nil, used in SGML specific grid/menu. -See `x-symbol-header-groups-alist'." + "Header/submenu specification of the specific menu for language `sgml'. +See language access `x-symbol-LANG-header-groups-alist'." :group 'x-symbol-sgml :group 'x-symbol-input-init :type 'x-symbol-headers) @@ -113,8 +115,8 @@ See `x-symbol-header-groups-alist'." (noname "SGML char-ref" (x-symbol-emph-info-face)) (VALID "SGML entity" (x-symbol-info-face)) (INVALID "no SGML entity" (x-symbol-emph-info-face))) - "Alist for SGML's token classes displayed by info in echo area. -See `x-symbol-language-access-alist' for details." + "Token classes displayed by info in echo area, for language `sgml'. +See language access `x-symbol-LANG-class-alist'." :group 'x-symbol-sgml :group 'x-symbol-info-strings :type 'x-symbol-class-info) @@ -122,38 +124,48 @@ See `x-symbol-language-access-alist' for details." (defcustom x-symbol-sgml-class-face-alist '((symbol x-symbol-sgml-symbol-face (x-symbol-sgml-symbol-face)) (noname x-symbol-sgml-noname-face (x-symbol-sgml-noname-face))) - "Alist for SGML's color scheme in SGML's grid and info. -See `x-symbol-language-access-alist' for details." + "Color scheme in language specific grid and info, for language `sgml'. +See language access `x-symbol-LANG-class-face-alist'." :group 'x-symbol-sgml :group 'x-symbol-input-init :group 'x-symbol-info-general :type 'x-symbol-class-faces) (defcustom x-symbol-sgml-electric-ignore nil - "*Additional SGML version of `x-symbol-electric-ignore'." + "Specification restricting input method ELECTRIC with language `sgml'. +See language access `x-symbol-LANG-electric-ignore'." :group 'x-symbol-sgml :group 'x-symbol-input-control :type 'x-symbol-function-or-regexp) - (defvar x-symbol-sgml-token-list 'x-symbol-sgml-token-list-name - "Function returning a list of SGML entities from table specification. -The TOKEN-SPEC in sgml table look like (NUMBER STRING...) where NUMBER -is the Unicode value. See `x-symbol-init-language', -`x-symbol-sgml-token-list-name', `x-symbol-sgml-token-list-code' and -`x-symbol-sgml-token-list-netscape'.") + "Symbol specifying the token definition for language `sgml'. +Allowed values are + - `x-symbol-sgml-token-list-name': the canonical token for a character + is a entity references, + - `x-symbol-sgml-token-list-code': the canonical token for a character + is a character references, + - `x-symbol-sgml-token-list-netscape': the canonical token for a + Latin-1 character is a entity references, for others, it is a + character references. Bug workaround for Netscape, v4.6 or lower. + +The value is used by function `x-symbol-sgml-default-token-list' which +is used for the definition of the conversion tables. See +`x-symbol-sgml-token-grammar'.") (defvar x-symbol-sgml-token-grammar '(x-symbol-make-grammar :decode-regexp "&[#0-9A-Za-z]+;" :token-list x-symbol-sgml-default-token-list) - "Token grammar for language `sgml'.") + "Grammar of token language `sgml'. +See language access `x-symbol-LANG-token-grammar'.") (defvar x-symbol-sgml-user-table nil "User table defining SGML entities, used in `x-symbol-sgml-table'.") (defvar x-symbol-sgml-generated-data nil - "Internal.") + "Generated data for token language `sgml'. +See language access `x-symbol-LANG-generated-data'.") ;;;=========================================================================== @@ -168,15 +180,15 @@ See `x-symbol-image-parse-buffer'." :type 'function) (defcustom x-symbol-sgml-image-searchpath '("./") - "Search path used for implicitly relative image file names. -See `x-symbol-image-use-remote'." + "Search path for implicitly relative image file names. +See language access `x-symbol-LANG-image-searchpath'." :group 'x-symbol-sgml :group 'x-symbol-image-language :type '(repeat directory)) (defcustom x-symbol-sgml-image-cached-dirs '("images/" "pictures/") - "Directory parts of image file names stored in the memory cache. -See `x-symbol-image-use-remote'." + "Directory parts of images stored in the memory cache. +See language access `x-symbol-LANG-image-cached-dirs'." :group 'x-symbol-sgml :group 'x-symbol-image-language :type '(repeat string)) @@ -215,8 +227,8 @@ E.g., I add the following element to this variable: '("\\.\\(gif\\|png\\|jpe?g\\)\\'" ("<img[ \t][^\n>]*src=\"\\([^\n\"]+\\)\"[^\n>]*>" x-symbol-sgml-image-file-truename 1)) - "Keywords used to find image insertion commands. -See `x-symbol-image-parse-buffer'." + "Keywords for image insertion commands of language `sgml'. +See language access `x-symbol-LANG-image-keywords'." :group 'x-symbol-sgml :group 'x-symbol-image-language :type 'x-symbol-image-keywords) @@ -236,7 +248,8 @@ keyword regexp, after being processed according to ;;;=========================================================================== (defcustom x-symbol-sgml-subscript-matcher 'x-symbol-sgml-subscript-matcher - "TODO" + "Function matching super-/subscripts for language `sgml'. +See language access `x-symbol-LANG-subscript-matcher'." :group 'x-symbol-sgml :type 'function) @@ -262,7 +275,7 @@ or subscript tag." (defcustom x-symbol-sgml-font-lock-alist '(("<sub>" . "</sub>") ("<sup>" . "</sup>")) - "Alist for correct tag pairs for SGML's super- and subscripts. + "Alist for correct tag pairs for HTML's super- and subscripts. Each element looks like (OPEN . CLOSE). All keys OPEN in this alist should be matched by `x-symbol-sgml-font-lock-regexp', all CLOSEs should be matched by `x-symbol-sgml-font-lock-limit-regexp'." @@ -631,9 +644,10 @@ be matched by `x-symbol-sgml-font-lock-limit-regexp'." x-symbol-sgml-latinN-table x-symbol-sgml-xsymb0-table x-symbol-sgml-xsymb1-table) - "Complete table defining SGML entities. -Use `x-symbol-sgml-user-table' to define/shadow private entities. -See `x-symbol-init-language' and `x-symbol-sgml-token-list'.") + "Table defining `sgml' tokens for the characters. +See language access `x-symbol-LANG-table' and variable +`x-symbol-sgml-token-list'. Use `x-symbol-sgml-user-table' to define +private SGML entities or shadow existing ones.") ;;;=========================================================================== diff --git a/x-symbol/lisp/x-symbol-tex.el b/x-symbol/lisp/x-symbol-tex.el index cfcbaf4e..d9c073f9 100644 --- a/x-symbol/lisp/x-symbol-tex.el +++ b/x-symbol/lisp/x-symbol-tex.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5.X ;; Keywords: WYSIWYG, LaTeX, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -61,7 +61,8 @@ 'x-symbol-tex-auto-coding-alist))) x-symbol-coding (not x-symbol-mode) x-symbol-mode x-symbol-mode) - "See the documentation of `x-symbol-auto-style'." + "Values for X-Symbol's buffer-local variables with language `tex'. +See language access `x-symbol-LANG-auto-style'." :group 'x-symbol-tex :group 'x-symbol-mode :type 'x-symbol-auto-style) @@ -76,15 +77,16 @@ ("\\`[ \t]*%&.*[ \t]+--?translate-file[ \t]*=[ \t]*i\\([A-Za-z]+[0-9]+\\)-" 1 ("l1" . iso-8859-1) ("l2" . iso-8859-2))) - "*Alist used to determine the file coding of TeX/LaTeX buffers. -Used in the default value of `x-symbol-auto-mode-alist'. See -variable `x-symbol-auto-coding-alist' for details." + "*Alist used to determine the file coding with language `tex'. +Used in the default value of `x-symbol-tex-auto-style'. See variable +`x-symbol-auto-coding-alist' for details." :group 'x-symbol-tex :group 'x-symbol-mode :type 'x-symbol-auto-coding) (defcustom x-symbol-tex-coding-master 'TeX-master - "*If non-nil, symbol of local variable with name of master file." + "*If non-nil, symbol of local variable with name of master file. +Used inside function `x-symbol-tex-auto-coding-alist'." :group 'x-symbol-tex :group 'x-symbol-mode :type 'boolean) @@ -95,25 +97,27 @@ variable `x-symbol-auto-coding-alist' for details." ;;;=========================================================================== (defcustom x-symbol-tex-modeline-name "tex" - "*String naming the language TeX in the modeline." + "Modeline name of token language `tex'. +See language access `x-symbol-LANG-modeline-name'." :group 'x-symbol-tex :type 'string) (defcustom x-symbol-tex-header-groups-alist nil - "*If non-nil, used in TeX specific grid/menu. -See `x-symbol-header-groups-alist'." + "Header/submenu specification of the specific menu for language `tex'. +See language access `x-symbol-LANG-header-groups-alist'." :group 'x-symbol-tex :group 'x-symbol-input-init :type 'x-symbol-headers) (defcustom x-symbol-tex-electric-ignore 'x-symbol-tex-default-electric-ignore - "*Additional TeX version of `x-symbol-electric-ignore'." + "Specification restricting input method ELECTRIC with language `tex'. +See language access `x-symbol-LANG-electric-ignore'." :group 'x-symbol-tex :group 'x-symbol-input-control :type 'x-symbol-function-or-regexp) (defcustom x-symbol-tex-electric-ignore-regexp "[A-Za-z]~\\'" - "*Regexp match contexts not to be used in TeX for input method ELECTRIC. + "*Regexp matching contexts not to be used for input method ELECTRIC. Used by `x-symbol-tex-default-electric-ignore'." :group 'x-symbol-tex :group 'x-symbol-input-control @@ -135,7 +139,8 @@ according to `x-symbol-token-input', it will not insert the space." :active (and x-symbol-mode (not buffer-read-only))] ["tex: Remove Braces around Letters" x-symbol-tex-xdecode-old :active (and x-symbol-mode (not buffer-read-only))])) - "Extra menu entries for language `tex'.") + "Extra menu entries in menu for language `tex'. +See language access `x-symbol-LANG-extra-menu-items'.") (defvar x-symbol-tex-token-grammar '(x-symbol-make-grammar @@ -146,7 +151,8 @@ according to `x-symbol-token-input', it will not insert the space." :input-spec x-symbol-tex-token-input :token-list x-symbol-tex-default-token-list :after-init x-symbol-tex-after-init-language) - "Token grammar for language `tex'.") + "Grammar of token language `tex'. +See language access `x-symbol-LANG-token-grammar'.") ;; The following vars could be made customizable, but it would not be a good ;; idea if different users have a different decode behavior: @@ -167,7 +173,8 @@ The regexp should also match the surrounding braces.") "User table defining TeX macros, used in `x-symbol-tex-table'.") (defvar x-symbol-tex-generated-data nil - "Internal.") + "Generated data for token language `tex'. +See language access `x-symbol-LANG-generated-data'.") ;;;=========================================================================== @@ -175,8 +182,8 @@ The regexp should also match the surrounding braces.") ;;;=========================================================================== (defcustom x-symbol-tex-master-directory 'x-symbol-tex-default-master-directory - "Function returning the directory of the master file or nil. -See `x-symbol-image-parse-buffer'." + "Specification of the master directory for images for language `tex'. +See language access `x-symbol-LANG-master-directory'." :group 'x-symbol-tex :group 'x-symbol-image-language :type 'function) @@ -193,15 +200,15 @@ See `x-symbol-image-parse-buffer'." (member (setq dir (file-name-as-directory dir)) result) (push dir result)))) (nreverse (if (member "./" result) result (cons "./" result)))) - "Search path used for implicitly relative image file names. -See `x-symbol-image-use-remote'." + "Search path for implicitly relative image file names. +See language access `x-symbol-LANG-image-searchpath'." :group 'x-symbol-tex :group 'x-symbol-image-language :type '(repeat directory)) (defcustom x-symbol-tex-image-cached-dirs '("figures/") - "Directory parts of image file names stored in the memory cache. -See `x-symbol-image-use-remote'." + "Directory parts of images stored in the memory cache. +See language access `x-symbol-LANG-image-cached-dirs'." :group 'x-symbol-tex :group 'x-symbol-image-language :type '(repeat string)) @@ -213,8 +220,8 @@ See `x-symbol-image-use-remote'." ("\\\\e?psfig[ \t]*{file=\\([^ \t\n,{}]+\\.e?ps\\)[^\n{}]*}" 1) ("\\\\includegraphics\\*?[ \t]*\\(\\[[^][\n]*\\]\\)?\\(\\[[^][\n]*\\]\\)?{\\([^ \t\n,{}]+\\)}" 3 ".\\.[^./]+\\'" ".eps") ("\\\\input[ \t]*{\\([^ \t\n,{}]+\\.pstex\\)_t}" 1)) - "Keywords used to find image insertion commands. -See `x-symbol-image-parse-buffer'." + "Keywords for image insertion commands of language `tex'. +See language access `x-symbol-LANG-image-keywords'." :group 'x-symbol-tex :group 'x-symbol-image-language :type 'x-symbol-image-keywords) @@ -224,15 +231,16 @@ See `x-symbol-image-parse-buffer'." ;;; Super- and Subscripts ;;;=========================================================================== -(defcustom x-symbol-tex-invisible-braces nil - "TODO" +(defcustom x-symbol-tex-subscript-matcher 'x-symbol-tex-subscript-matcher + "Function matching super-/subscripts for language `tex'. +See language access `x-symbol-LANG-subscript-matcher'." :group 'x-symbol-tex - :type 'boolean) + :type 'function) -(defcustom x-symbol-tex-subscript-matcher 'x-symbol-tex-subscript-matcher +(defcustom x-symbol-tex-invisible-braces nil "TODO" :group 'x-symbol-tex - :type 'function) + :type 'boolean) (defcustom x-symbol-tex-font-lock-allowed-faces '(tex-math-face @@ -303,8 +311,8 @@ Used in `x-symbol-tex-class-face-alist'." (user "user" (x-symbol-emph-info-face)) (VALID "unknown TeX class" (x-symbol-emph-info-face)) (INVALID "no TeX macro" (x-symbol-emph-info-face))) - "Alist for TeX's token classes displayed by info in echo area. -See `x-symbol-language-access-alist' for details." + "Token classes displayed by info in echo area, for language `tex'. +See language access `x-symbol-LANG-class-alist'." :group 'x-symbol-tex :group 'x-symbol-info-strings :type 'x-symbol-class-info) @@ -312,8 +320,8 @@ See `x-symbol-language-access-alist' for details." (defcustom x-symbol-tex-class-face-alist '((math x-symbol-tex-math-face (x-symbol-tex-math-face)) (text x-symbol-tex-text-face (x-symbol-tex-text-face))) - "Alist for TeX's color scheme in TeX's grid and info. -See `x-symbol-language-access-alist' for details." + "Color scheme in language specific grid and info, for language `tex'. +See language access `x-symbol-LANG-class-face-alist'." :group 'x-symbol-tex :group 'x-symbol-input-init :group 'x-symbol-info-general @@ -409,7 +417,8 @@ as default value for `x-symbol-tex-electric-ignore'." ;;;=========================================================================== (defvar x-symbol-tex-required-fonts nil - "List of features providing fonts for language `tex'.") + "Features providing required fonts for language `tex'. +See language access `x-symbol-LANG-required-fonts'.") (defvar x-symbol-tex-latin1-table '((nobreakspace (space) . "\\nobreakspace") @@ -881,9 +890,10 @@ as default value for `x-symbol-tex-electric-ignore'." x-symbol-tex-latinN-table x-symbol-tex-xsymb0-table x-symbol-tex-xsymb1-table) - "Complete table defining TeX macros. -Use `x-symbol-tex-user-table' to define/shadow private TeX macros. -See `x-symbol-init-language' and `x-symbol-tex-token-list'.") + "Table defining `tex' tokens for the characters. +See language access `x-symbol-LANG-table'. Use +`x-symbol-tex-user-table' to define private TeX macros or shadow +existing ones.") ;;;=========================================================================== @@ -1025,14 +1035,14 @@ See `x-symbol-init-language' and `x-symbol-tex-token-list'.") ;; here instead using an complicated regexp for the main search (when (looking-at " [A-Za-z]\\|{}") (goto-char (setq end (match-end 0))) - (when (setq token (buffer-substring beg end) - token (symbol-value - (intern-soft (buffer-substring beg end) - decode-obarray))) - (goto-char end) - (insert-before-markers (gethash (car token) - x-symbol-cstring-table)) - (delete-region beg end)))))))) + (when (setq token (symbol-value + (intern-soft (buffer-substring beg end) + decode-obarray))) + (unless (x-symbol-decode-unique-test token unique) + (goto-char end) + (insert-before-markers (gethash (car token) + x-symbol-cstring-table)) + (delete-region beg end))))))))) (defun x-symbol-tex-token-input (input-regexp decode-obarray command-char) (let ((res (x-symbol-match-token-before diff --git a/x-symbol/lisp/x-symbol-texi.el b/x-symbol/lisp/x-symbol-texi.el index cad7885a..79fceeee 100644 --- a/x-symbol/lisp/x-symbol-texi.el +++ b/x-symbol/lisp/x-symbol-texi.el @@ -1,10 +1,10 @@ ;;; x-symbol-texi.el --- token language "TeXinfo command" for package x-symbol -;; Copyright (C) 2000, 2002 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, TeXinfo, wp, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -39,13 +39,15 @@ ;;;=========================================================================== (defcustom x-symbol-texi-auto-style '(t nil nil nil nil nil) - "TODO" + "Values for X-Symbol's buffer-local variables with language `texi'. +See language access `x-symbol-LANG-auto-style'." :group 'x-symbol-texi :group 'x-symbol-mode :type 'x-symbol-auto-style) (defcustom x-symbol-texi-modeline-name "texi" - "*String naming the language TeXinfo in the modeline." + "Modeline name of token language `texi'. +See language access `x-symbol-LANG-modeline-name'." :group 'x-symbol-texi :type 'string) @@ -58,14 +60,15 @@ ("Circumflex, Caron" circumflex caron) ("Diaeresis, Umlaut" diaeresis hungarumlaut) ("Acute, Grave" acute grave)) - "*If non-nil, used in TeXinfo specific grid/menu. -See `x-symbol-header-groups-alist'." + "Header/submenu specification of the specific menu for language `texi'. +See language access `x-symbol-LANG-header-groups-alist'." :group 'x-symbol-texi :group 'x-symbol-input-init :type 'x-symbol-headers) (defcustom x-symbol-texi-electric-ignore nil - "*Additional TeXinfo version of `x-symbol-electric-ignore'." + "Specification restricting input method ELECTRIC with language `texi'. +See language access `x-symbol-LANG-electric-ignore'." :group 'x-symbol-texi :group 'x-symbol-input-control :type 'x-symbol-function-or-regexp) @@ -77,15 +80,15 @@ See `x-symbol-header-groups-alist'." (no-code "not as code" (x-symbol-emph-info-face)) (VALID "unknown TeXinfo command" (x-symbol-emph-info-face)) (INVALID "no TeXinfo command" (x-symbol-emph-info-face))) - "Alist for TeXinfo's token classes displayed by info in echo area. -See `x-symbol-language-access-alist' for details." + "Token classes displayed by info in echo area, for language `texi'. +See language access `x-symbol-LANG-class-alist'." :group 'x-symbol-texi :group 'x-symbol-info-strings :type 'x-symbol-class-info) (defcustom x-symbol-texi-class-face-alist nil - "Alist for TeXinfo's color scheme in TeXinfo's grid and info. -See `x-symbol-language-access-alist' for details." + "Color scheme in language specific grid and info, for language `texi'. +See language access `x-symbol-LANG-class-face-alist'." :group 'x-symbol-texi :group 'x-symbol-input-init :group 'x-symbol-info-general @@ -98,13 +101,15 @@ See `x-symbol-language-access-alist' for details." :decode-regexp "@\\(?:[A-Za-z]+{[A-Za-z]?}\\|[{}]\\|[~^\"'`][A-Za-z]\\|,{[A-Za-z]}\\)" :decode-spec (?@)) - "Token grammar for language `texi'.") + "Grammar of token language `texi'. +See language access `x-symbol-LANG-token-grammar'.") (defvar x-symbol-texi-user-table nil "User table defining TeXinfo commands, used in `x-symbol-texi-table'.") (defvar x-symbol-texi-generated-data nil - "Internal.") + "Generated data for token language `texi'. +See language access `x-symbol-LANG-generated-data'.") ;;;=========================================================================== @@ -325,9 +330,10 @@ See `x-symbol-language-access-alist' for details." x-symbol-texi-latin1-table x-symbol-texi-latinN-table x-symbol-texi-xsymbX-table) - "Complete table defining TeXinfo commands. -Use `x-symbol-texi-user-table' to define/shadow private TeXinfo commands. -See `x-symbol-init-language' and `x-symbol-texi-token-list'.") + "Table defining `texi' tokens for the characters. +See language access `x-symbol-LANG-table'. Use +`x-symbol-texi-user-table' to define private TeXinfo commands or shadow +existing ones.") ;;; Local IspellPersDict: .ispell_xsymb ;;; x-symbol-texi.el ends here diff --git a/x-symbol/lisp/x-symbol-vars.el b/x-symbol/lisp/x-symbol-vars.el index fae76fb1..3fc3358c 100644 --- a/x-symbol/lisp/x-symbol-vars.el +++ b/x-symbol/lisp/x-symbol-vars.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5.X ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -37,7 +37,7 @@ (require 'x-symbol-hooks) (eval-when-compile (require 'cl)) -(defconst x-symbol-version "4.4.5g" +(defconst x-symbol-version "4.5.1" "Current development version of package X-Symbol. Check <http://x-symbol.sourceforge.net/> for the newest.") @@ -147,19 +147,140 @@ Check <http://x-symbol.sourceforge.net/> for the newest.") (sexp :tag "Super/subscripts (eval'd)") (sexp :tag "Show images (eval'd)"))) -(defconst x-symbol-name 'stringp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-name' contains the long -name of the token language LANG. See `x-symbol-register-language'.") -(defconst x-symbol-modes 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-modes' contains the major -modes of buffer which will typically use X-Symbol with token language -LANG. See `x-symbol-register-language'.") +;;;=========================================================================== +;;; Custom widgets, general +;;;=========================================================================== + +;; Shouldn't this be generally a useful widget type? +(define-widget 'x-symbol-command 'function + "A lisp command." + :prompt-match 'commandp + :tag "Command") + +(define-widget 'x-symbol-charsym 'symbol + "X-Symbol charsym." + :tag "X-Symbol charsym") + +(define-widget 'x-symbol-group 'symbol + "X-Symbol charsym group." + :tag "Charsym group") + +(define-widget 'x-symbol-coding 'choice + "X-Symbol 8bit character coding." + :tag "8bit coding" + :args '((const iso-8859-1) + (const iso-8859-2) + (const iso-8859-3) + (const iso-8859-9) + (const iso-8859-15))) + +(define-widget 'x-symbol-function-or-regexp 'choice + "Function or regexp, see `x-symbol-call-function-or-regexp'." + :args '((const :tag "None" nil) regexp function)) + +(define-widget 'x-symbol-fancy-spec 'repeat + "X-Symbol specification for fancy strings, without string." + :args '((group :value (0 -1 x-symbol-info-face) + (option (group :inline t :extra-offset -4 + :value (0 -1) + (integer :tag "From") + (option (integer :tag "To" :value -1)))) + (repeat :tag "Faces" :inline t (face :tag "Face"))))) -(defconst x-symbol-auto-style nil - "Variable used to document a language access. +(define-widget 'x-symbol-fancy 'cons + "X-Symbol specification for fancy strings, with string." + :args '(string (x-symbol-fancy-spec :tag "Face specifications"))) + + +;;;=========================================================================== +;;; Custom simple, special +;;;=========================================================================== + +(define-widget 'x-symbol-auto-coding 'repeat + "X-Symbol automatic coding control." + :args '((cons :format "%v" + regexp + (choice x-symbol-coding + (cons :tag "Depending on" + (integer :tag "Match") + (repeat (cons :format "%v" + (string :tag "Key") + x-symbol-coding))))))) + +(define-widget 'x-symbol-headers 'repeat + "Headers for grid and menu." + :args '((cons :format "%v" + (string :tag "Header") + (repeat x-symbol-group)))) + +(define-widget 'x-symbol-class-info 'repeat + "Definitions for X-Symbol token language classes." + :args '((cons :format "%v" + (symbol :tag "Token class" :value VALID) + (choice (const :tag "No info" nil) + (x-symbol-fancy :tag "Info"))))) + +(define-widget 'x-symbol-class-faces 'repeat + "Definitions for X-Symbol token language classes." + :args '((list :format "%v" + (symbol :tag "Token class") + (face :tag "Face in grid" :value default) + (x-symbol-fancy-spec :inline t + :tag "Faces for tokens in info")))) + +(define-widget 'x-symbol-image-keywords 'cons + "Format of image keywords" + :args '((regexp :tag "Regexp matching all image files") + (repeat + (list :format "%v" + :value ("IMAGE \"\\([A-Za-z0-9]\\)\"" 1) + regexp + (option (function :match (lambda (widget arg) + (and arg (symbolp arg))) + :value x-symbol-image-default-file-name)) + (repeat :inline t :tag "Arguments" sexp))))) + + +;;;=========================================================================== +;;; custom set function +;;;=========================================================================== + +(defconst x-symbol-cache-variables '(x-symbol-fancy-value-cache + x-symbol-charsym-info-cache + x-symbol-charsym-info-cache + x-symbol-language-info-caches + x-symbol-coding-info-cache + x-symbol-keys-info-cache) + "Internal. Cache variables.") + +;; TODO: not used anymore (would prevent files to be compilable w/o X-Symbol +(defun x-symbol-set-cache-variable (var value) + "Set VAR's value to VALUE. +Custom set function of variables for fancy strings." + (set var value) + (dolist (cache x-symbol-cache-variables) + (and (boundp cache) (set cache nil)))) + + +;;;=========================================================================== +;;; Language Accesses +;;;=========================================================================== + +(defconst x-symbol-LANG-name "Token Language" + "Language access: standard name of the token language. +For each token language LANG, `x-symbol-LANG-name' is a string with the +standard name of the token language LANG. See +`x-symbol-register-language'.") + +(defconst x-symbol-LANG-modes '(major-mode-1 major-mode-2) + "Language access: major modes typically using the token language. +For each token language LANG, `x-symbol-LANG-modes' is a list of major +modes of buffers which will typically use X-Symbol with token language +LANG. See `x-symbol-register-language' and `x-symbol-mode'.") + +(defconst x-symbol-LANG-auto-style '(t nil nil nil nil nil) + "Language access: values for X-Symbol's buffer-local variables. For each token language LANG, `x-symbol-LANG-auto-style' determines how to set X-Symbol specific buffer-local variables if these variables do not already have a buffer-local value. @@ -168,9 +289,9 @@ A value of such a language access looks like (MODE-ON CODING 8BITS UNIQUE SUBSCRIPTS IMAGE) If `x-symbol-mode' is not already buffer-local, MODE-ON determines -whether to turn the mode on if \\[x-symbol-mode] is called with a cons -as prefix argument. CODING, 8BITS, UNIQUE, SUBSCRIPTS and IMAGE are -used to set `x-symbol-coding', `x-symbol-8bits', `x-symbol-unique', +whether to turn the mode on with `turn-on-x-symbol-conditionally'. +CODING, 8BITS, UNIQUE, SUBSCRIPTS and IMAGE are used to set +`x-symbol-coding', `x-symbol-8bits', `x-symbol-unique', `x-symbol-subscripts' and `x-symbol-image' if these values are not already buffer-local. @@ -212,18 +333,23 @@ Users might prefer to customize `x-symbol-auto-style-alist' instead.") ;; :inline t :extra-offset -4 ;; (sexp :tag "Show images (eval'd)")))))))))))))) -;; `x-symbol-modeline-name' is also variable +(defcustom x-symbol-LANG-modeline-name "lang" + "Language access: modeline name of the token language. +For each token language LANG, `x-symbol-LANG-modeline-name' is a +string with the name of the token language LANG in the modeline." + :group 'x-symbol-miscellaneous + :type 'string) -(defconst x-symbol-required-fonts 'listp - "Variable used to document a language access. -For each token language LANG, optional `x-symbol-LANG-required-fonts' -contains the features which are required for the tokens of language -LANG.") +(defconst x-symbol-LANG-required-fonts nil + "Language access: features providing required fonts. +For each token language LANG, `x-symbol-LANG-required-fonts' is a list +of features which are required for the tokens of language LANG.") -(defconst x-symbol-token-grammar 'x-symbol-make-grammar - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-token-grammar' contains the -grammar of the language LANG. The value looks like +(defconst x-symbol-LANG-token-grammar + '(x-symbol-make-grammar :decode-regexp "&[#0-9A-Za-z]+;") + "Language access: grammar of token language. +For each token language LANG, `x-symbol-LANG-token-grammar' describes +the grammar of the language LANG. The value looks like (x-symbol-make-grammar :token-list TOKEN-LIST :after-init AFTER-INIT @@ -287,65 +413,89 @@ matches the character before the position. In AFTER, each REGEXP matches the buffer contents directly following the position, except in INPUT-SPEC.") -(defconst x-symbol-generated-data 'null - "Variable used to document a generated language access. -For each token language LANG, `x-symbol-LANG-generated-data' contains -various generated data for a token language, like the conversion +(defconst x-symbol-LANG-generated-data nil + "Language access: generated data for token language. +For each token language LANG, `x-symbol-LANG-generated-data' is used to +store various generated data for a token language, like the conversion tables.") -(defconst x-symbol-table 'consp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-table' defines the tokens -for the characters with its token classes etc. Each element in TABLE -looks like \(CHARSYM CLASSES . TOKEN-SPEC) or nil.\ +(defconst x-symbol-LANG-table '((adiaeresis () "ä")) + "Language access: table defining tokens for the characters. +For each token language LANG, `x-symbol-LANG-table' is a list with +elements defining the tokens for the characters with its token classes +etc. Each element in TABLE looks like + + \(CHARSYM CLASSES . TOKEN-SPEC) or nil. CHARSYM is the charsym of the character which represents the tokens defined via TOKEN-SPEC, see also TOKEN-LIST in language access -`x-symbol-token-grammar'. CLASSES are the token classes of the +`x-symbol-LANG-token-grammar'. CLASSES are the token classes of the character.") -;; `x-symbol-header-groups-alist' is also a variable +(defconst x-symbol-LANG-header-groups-alist nil + "Language access: header/submenu specification for characters. +For each token language LANG, `x-symbol-LANG-header-groups-alist', if +non-nil, is used instead `x-symbol-header-groups-alist' to specify the +structure of language specific grid and menu.") + +(defconst x-symbol-LANG-class-alist + '((VALID "Language Token" (x-symbol-info-face)) + (INVALID "no Language Token" (x-symbol-emph-info-face))) + "Language access: token classes displayed by info in echo area. +For each token language LANG, `x-symbol-LANG-class-alist' is a list of +token class specifications used for the info in the echo area, see +`x-symbol-character-info'. Each element looks like + + \(CLASS . SPEC) -(defconst x-symbol-class-alist 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-class-alist' is used for -the info in the echo area, see `x-symbol-character-info'. Each element -looks like \(CLASS . SPEC) where CLASS is a valid token class, see -`x-symbol-init-language' and SPEC is used according to -`x-symbol-fancy-string'. You should define entries for the CLASSes -`VALID' and `INVALID'.") +where CLASS is a valid token class, see `x-symbol-init-language' and +SPEC is used according to `x-symbol-fancy-string'. You should define +entries for the CLASSes `VALID' and `INVALID'.") -(defconst x-symbol-class-face-alist 'listp - "Variable used to document an language access. +(defconst x-symbol-LANG-class-face-alist nil + "Language access: color scheme in language specific grid and info. For each token language LANG, `x-symbol-LANG-class-face-alist' is used for the color scheme in the language dependent grid and token info. -Each element looks like \(CLASS FACE . FACE-SPECS) where CLASS is a -valid token class, FACE is used for the character in the grid, and -FACE-SPECS is used according to `x-symbol-fancy-string'.") - -;; `x-symbol-electric-ignore' is also a variable - -(defconst x-symbol-extra-menu-items 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-extra-menu-items' define -extra menu items to be used in the language specific menu. It contains -elements of the form \(SUBMENU ITEM...) where SUBMENU is either -\"Conversion\" or \"Other Commands\", the ITEMs are additional menu -items at the end of the corresponding submenu.") - -(defvar x-symbol-subscript-matcher nil - "Internal. Variable used to document a language access. +Each element looks like + + \(CLASS FACE . FACE-SPECS) + +where CLASS is a valid token class, FACE is used for the character in +the grid, and FACE-SPECS is used according to `x-symbol-fancy-string'.") + +(defconst x-symbol-LANG-electric-ignore nil + "Language access: specification restricting input method ELECTRIC. +For each token language LANG, `x-symbol-LANG-electric-ignore' is used +additionaly to `x-symbol-electric-ignore' to match contexts/charsyms to +be ignored by input method ELECTRIC. + +The value is nil, a regexp matching contexts not to be replaced, or a +function valled with arguments CONTEXT and CHARSYM, which should return +non-nil if the context should not be replaced by the character for +CHARSYM.") + +(defconst x-symbol-LANG-extra-menu-items nil + "Language access: extra menu items in language specific menu. +For each token language LANG, `x-symbol-LANG-extra-menu-items' defines +extra menu items to be used in the language specific menu. Its value is +a list of elements in the form \(SUBMENU ITEM...) where SUBMENU is +either \"Conversion\" or \"Other Commands\", the ITEMs are additional +menu items at the end of the corresponding submenu.") + +(defconst x-symbol-LANG-subscript-matcher nil + "Language access: function matching super-/subscripts. For each token language LANG, `x-symbol-LANG-subscript-matcher', if -non-nil, contains a matcher function for font-lock. It should return -nil for no match, `x-symbol-sup-face'/`x-symbol-sub-face' for a -super-/subscript match. The `match-date' should have three regexp -groups: group 1 for the open command, group 2 for the contents, and -group 3 for the close command.") +non-nil, is a matcher function for font-lock. It should return nil for +no match, `x-symbol-sup-face'/`x-symbol-sub-face' for a super-/subscript +match. The `match-date' should have three regexp groups: group 1 for +the open command, group 2 for the contents, and group 3 for the close +command.") -(defconst x-symbol-image-keywords 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-image-keywords' contains -the value \(IMAGE-REGEXP KEYWORD ...). +(defconst x-symbol-LANG-image-keywords nil + "Language access: keywords for image insertion commands. +For each token language LANG, `x-symbol-LANG-image-keywords' is a list + + \(IMAGE-REGEXP KEYWORD...). IMAGE-REGEXP should match all images files and is used to initialize the buffer local memory cache, see `x-symbol-image-init-memory-cache'. @@ -356,138 +506,25 @@ commands matched by REGEXP are highlighted. FUNCTION, which defaults to name of the corresponding image file. If FUNCTION returns nil, the command is not highlighted. See `x-symbol-image-parse-buffer'.") -(defconst x-symbol-master-directory 'functionp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-master-directory' contains -a function which returns the directory of the master file, see -`x-symbol-image-parse-buffer'.") - -(defconst x-symbol-image-searchpath 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-image-searchpath' contains -the search path for implicitly relative image file names, i.e., a list -of relative directories. See x-symbol-image-use-remote'.") - -(defconst x-symbol-image-cached-dirs 'listp - "Variable used to document a language access. -For each token language LANG, `x-symbol-LANG-image-cached-dirs' contains -a list of directory parts of image file names stored in the memory -cache. See `x-symbol-image-use-remote'.") - - -;;;=========================================================================== -;;; Custom widgets, general -;;;=========================================================================== - -;; Shouldn't this be generally a useful widget type? -(define-widget 'x-symbol-command 'function - "A lisp command." - :prompt-match 'commandp - :tag "Command") - -(define-widget 'x-symbol-charsym 'symbol - "X-Symbol charsym." - :tag "X-Symbol charsym") - -(define-widget 'x-symbol-group 'symbol - "X-Symbol charsym group." - :tag "Charsym group") - -(define-widget 'x-symbol-coding 'choice - "X-Symbol 8bit character coding." - :tag "8bit coding" - :args '((const iso-8859-1) - (const iso-8859-2) - (const iso-8859-3) - (const iso-8859-9) - (const iso-8859-15))) - -(define-widget 'x-symbol-function-or-regexp 'choice - "Function or regexp, see `x-symbol-call-function-or-regexp'." - :args '((const :tag "None" nil) regexp function)) +(defconst x-symbol-LANG-master-directory nil + "Language access: specification of the master directory for images. +For each token language LANG, `x-symbol-LANG-master-directory', if +non-nil, is a function which returns the directory of the master file, +see `x-symbol-image-parse-buffer'.") -(define-widget 'x-symbol-fancy-spec 'repeat - "X-Symbol specification for fancy strings, without string." - :args '((group :value (0 -1 x-symbol-info-face) - (option (group :inline t :extra-offset -4 - :value (0 -1) - (integer :tag "From") - (option (integer :tag "To" :value -1)))) - (repeat :tag "Faces" :inline t (face :tag "Face"))))) +(defconst x-symbol-LANG-image-searchpath nil + "Language access: search path for implicitly relative image file names. +For each token language LANG, `x-symbol-LANG-image-searchpath' is a list +of directories which are checked if the image file name is implicitly +relative. Relative directories are relative to the directory returned +by the language access `x-symbol-LANG-master-directory'. See +`x-symbol-image-use-remote'.") -(define-widget 'x-symbol-fancy 'cons - "X-Symbol specification for fancy strings, with string." - :args '(string (x-symbol-fancy-spec :tag "Face specifications"))) - - -;;;=========================================================================== -;;; Custom simple, special -;;;=========================================================================== - -(define-widget 'x-symbol-auto-coding 'repeat - "X-Symbol automatic coding control." - :args '((cons :format "%v" - regexp - (choice x-symbol-coding - (cons :tag "Depending on" - (integer :tag "Match") - (repeat (cons :format "%v" - (string :tag "Key") - x-symbol-coding))))))) - -(define-widget 'x-symbol-headers 'repeat - "Headers for grid and menu." - :args '((cons :format "%v" - (string :tag "Header") - (repeat x-symbol-group)))) - -(define-widget 'x-symbol-class-info 'repeat - "Definitions for X-Symbol token language classes." - :args '((cons :format "%v" - (symbol :tag "Token class" :value VALID) - (choice (const :tag "No info" nil) - (x-symbol-fancy :tag "Info"))))) - -(define-widget 'x-symbol-class-faces 'repeat - "Definitions for X-Symbol token language classes." - :args '((list :format "%v" - (symbol :tag "Token class") - (face :tag "Face in grid" :value default) - (x-symbol-fancy-spec :inline t - :tag "Faces for tokens in info")))) - -(define-widget 'x-symbol-image-keywords 'cons - "Format of image keywords" - :args '((regexp :tag "Regexp matching all image files") - (repeat - (list :format "%v" - :value ("IMAGE \"\\([A-Za-z0-9]\\)\"" 1) - regexp - (option (function :match (lambda (widget arg) - (and arg (symbolp arg))) - :value x-symbol-image-default-file-name)) - (repeat :inline t :tag "Arguments" sexp))))) - - -;;;=========================================================================== -;;; custom set function -;;;=========================================================================== - -(defconst x-symbol-cache-variables '(x-symbol-fancy-value-cache - x-symbol-charsym-info-cache - x-symbol-charsym-info-cache - x-symbol-language-info-caches - x-symbol-coding-info-cache - x-symbol-keys-info-cache) - "Internal. Cache variables.") - -;; TODO: not used anymore (would prevent files to be compilable w/o X-Symbol -(defun x-symbol-set-cache-variable (var value) - "Set VAR's value to VALUE. -Custom set function of variables for fancy strings." - (set var value) - (dolist (cache x-symbol-cache-variables) - (and (boundp cache) (set cache nil)))) +(defconst x-symbol-LANG-image-cached-dirs nil + "Language access: directory parts of images stored in the memory cache. +For each token language LANG, `x-symbol-LANG-image-cached-dirs' is a +list of directory parts of image file names stored in the memory cache. +See `x-symbol-image-use-remote'.") ;;;=========================================================================== @@ -551,9 +588,8 @@ quite annoying, the following conditions must be fulfilled: * Contexts matched by a global or a token language dependent regexp are not replaced. Functions can also be used to prevent a context to be replaced by a character. E.g., with language \"TeX macro\", only - replace \"->\" by \\to if we are in TeX's math mode (using library - texmathp by Carsten Dominik). See `x-symbol-context-ignore' and - `x-symbol-electric-ignore'." + replace \"->\" by \\to if we are in TeX's math mode (using texmathp). + See `x-symbol-context-ignore' and `x-symbol-electric-ignore'." :group 'x-symbol-input-control :type 'boolean) @@ -671,11 +707,9 @@ before point. See also `x-symbol-character-info'." ;;; Texts, Modeline appearance ;;;=========================================================================== -(defcustom x-symbol-modeline-name "none" - "*String naming the pseudo language \"x-symbol charsym\" in the modeline. - -For each token language LANG, `x-symbol-LANG-modeline-name' contains a -string naming LANG in the modeline." +(defcustom x-symbol-charsym-modeline-name "none" + "Modeline name of the pseudo language x-symbol charsym. +See language access `x-symbol-LANG-modeline-name'." :group 'x-symbol-miscellaneous :type 'string) @@ -713,6 +747,7 @@ The elements look like (CODING . NAME) where CODING is a valid value for (iso-8859-15 . "-l9") (info . "-i") (error . "-err")) + ;; TODO: describe none, info, error "*Alist of codings with their names in the modeline. The elements look like (CODING . NAME) where CODING is a valid value for `x-symbol-coding' and NAME is used by `x-symbol-coding-modeline-text'." @@ -721,7 +756,7 @@ The elements look like (CODING . NAME) where CODING is a valid value for (defcustom x-symbol-modeline-state-list '(" XS:" - (x-symbol-modeline-name . x-symbol-language-modeline-text) + (x-symbol-language . x-symbol-language-modeline-text) (x-symbol-8bits "8") (x-symbol-unique "*") (x-symbol-coding . x-symbol-coding-modeline-text) @@ -733,14 +768,14 @@ This function constructs `x-symbol-modeline-string' by concatenating the result from the elements in this list. Each element looks like SEPARATOR or (VARIABLE NON-NIL . NIL) or - (ARG . FUNCTION) + (VARIABLE . FUNCTION) SEPARATOR is a string and is used directly, only use the first from two consecutive SEPARATORs. If VARIABLE is non-nil, use NON-NIL, otherwise NIL, both NON-NIL and NIL should be strings or nil. FUNCTION is called -with argument ARG and should return a string or nil. Two SEPARATORs -where all the elements in between return nil, are considered to be -consecutive." +with the value of VARIABLE as argument and should return a string or +nil. Two SEPARATORs where all the elements in between return nil, are +considered to be consecutive." :group 'x-symbol-mode :type '(repeat (choice (string :tag "Separator") (cons :tag "Depending on variable" @@ -755,6 +790,15 @@ consecutive." (sexp :tag "With argument") function)))) +;; Emacs only? +(defcustom x-symbol-set-coding-system-if-undecided t ; TODO: nil? + "*If non-nil, set coding system if undecided when turning on X-Symbol. +If this variable is non-nil, `x-symbol-default-coding' is non-nil, and +`buffer-file-coding-system' specifies an undecided coding system, set +`buffer-file-coding-system' according to `x-symbol-default-coding'." + :group 'x-symbol-mode + :type 'boolean) + ;;;=========================================================================== ;;; Minor mode control @@ -1608,7 +1652,7 @@ See `x-symbol-latin5-cset' and `x-symbol-init-cset'.") ;; the normal helvetica font... (defvar x-symbol-latin9-fonts '("-vh-herilane%s-medium-r-normal-*-%d-*-*-*-*-*-iso8859-15") - "Fonts with registry/encoding \"iso8859-1\". + "Fonts with registry/encoding \"iso8859-15\". See `x-symbol-latin9-cset' and `x-symbol-init-cset'.") (defvar x-symbol-xsymb0-fonts @@ -1656,9 +1700,9 @@ cached image. See also `x-symbol-image-special-glyphs'." (defcustom x-symbol-image-use-remote nil "*If nil, only show glyphs which can be stored in the memory cache. The memory cache stores glyphs for file names without directory part or -a directory part in the language access `x-symbol-image-cached-dirs', -e.g., it should contain \"images\", if \"images/mail.png\" should be -stored in the memory cache. +a directory part in the language access +`x-symbol-LANG-image-cached-dirs', e.g., it should contain \"images\", +if \"images/mail.png\" should be stored in the memory cache. If this variable is nil, use `x-symbol-image-remote-glyph' for image files not in the memory cache. If it is non-nil, try to find the image @@ -1668,13 +1712,13 @@ since file accesses are necessary for every command. When searching for the images file, all file names, including directories in a search path, are relative to the return value of the -function in language access `x-symbol-master-directory', value nil means -function `default-directory'. +function in language access `x-symbol-LANG-master-directory', value nil +means function `default-directory'. Implicitly relative file names, i.e., those which are neither absolute nor are matched by `x-symbol-image-explicitly-relative-regexp', are searched in the directories of language access -`x-symbol-image-searchpath'." +`x-symbol-LANG-image-searchpath'." :group 'x-symbol-image-general :type 'boolean) diff --git a/x-symbol/lisp/x-symbol-xmacs.el b/x-symbol/lisp/x-symbol-xmacs.el index 8e62d4b5..88a21be9 100644 --- a/x-symbol/lisp/x-symbol-xmacs.el +++ b/x-symbol/lisp/x-symbol-xmacs.el @@ -1,10 +1,10 @@ ;;; x-symbol-xmacs.el --- make package x-symbol work with XEmacs -;; Copyright (C) 1998-1999, 2001-2002 Free Software Foundation, Inc. +;; Copyright (C) 1998-1999, 2001-2003 Free Software Foundation, Inc. ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5 ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ diff --git a/x-symbol/lisp/x-symbol.el b/x-symbol/lisp/x-symbol.el index 4abb96dd..093fcc89 100644 --- a/x-symbol/lisp/x-symbol.el +++ b/x-symbol/lisp/x-symbol.el @@ -4,7 +4,7 @@ ;; ;; Author: Christoph Wedler <wedler@users.sourceforge.net> ;; Maintainer: (Please use `M-x x-symbol-package-bug' to contact the maintainer) -;; Version: 4.4.X +;; Version: 4.5.X ;; Keywords: WYSIWYG, LaTeX, HTML, wp, math, internationalization ;; X-URL: http://x-symbol.sourceforge.net/ @@ -64,32 +64,37 @@ ;;;=========================================================================== (defconst x-symbol-language-access-alist - `((x-symbol-auto-style "auto-style" t listp) ; redefinition, TODO: optional is just temporary - (x-symbol-modeline-name "modeline-name" nil stringp) - (x-symbol-required-fonts "required-fonts" t listp) - (x-symbol-token-grammar "token-grammar" nil - ,(lambda (x) - (or (vectorp x) - (eq (car-safe x) 'x-symbol-make-grammar)))) + `((x-symbol-LANG-auto-style "auto-style" t listp) ; redefinition, TODO: optional is just temporary + (x-symbol-LANG-modeline-name "modeline-name" nil stringp) + (x-symbol-LANG-required-fonts "required-fonts" t listp) + (x-symbol-LANG-token-grammar "token-grammar" nil + ,(lambda (x) + (or (vectorp x) + (eq (car-safe x) + 'x-symbol-make-grammar)))) ;;(x-symbol-input-token-grammar "input-token-grammar" nil consp) - (x-symbol-table "table" nil consp) - (x-symbol-generated-data "generated-data" nil null) + (x-symbol-LANG-table "table" nil consp) + (x-symbol-LANG-generated-data "generated-data" nil null) ;; input methods - (x-symbol-header-groups-alist "header-groups-alist" nil listp) - (x-symbol-class-alist "class-alist" nil listp) - (x-symbol-class-face-alist "class-face-alist" t listp) - (x-symbol-electric-ignore "electric-ignore") - (x-symbol-extra-menu-items "extra-menu-items" t listp) + (x-symbol-LANG-header-groups-alist "header-groups-alist" nil listp) + (x-symbol-LANG-class-alist "class-alist" nil listp) + (x-symbol-LANG-class-face-alist "class-face-alist" t listp) + (x-symbol-LANG-electric-ignore "electric-ignore") + (x-symbol-LANG-extra-menu-items "extra-menu-items" t listp) ;; super-/subscripts, images - (x-symbol-subscript-matcher "subscript-matcher" t) - (x-symbol-image-keywords "image-keywords" t listp) - (x-symbol-master-directory "master-directory" x-symbol-image-keywords - functionp) - (x-symbol-image-searchpath "image-searchpath" x-symbol-image-keywords - listp) - (x-symbol-image-cached-dirs "image-cached-dirs" x-symbol-image-keywords - listp)) + (x-symbol-LANG-subscript-matcher "subscript-matcher" t) + (x-symbol-LANG-image-keywords "image-keywords" t listp) + (x-symbol-LANG-master-directory "master-directory" + x-symbol-LANG-image-keywords + functionp) + (x-symbol-LANG-image-searchpath "image-searchpath" + x-symbol-LANG-image-keywords + listp) + (x-symbol-LANG-image-cached-dirs "image-cached-dirs" + x-symbol-LANG-image-keywords + listp)) "Alist of token language dependent variable accesses. +OUTDATED. Each element looks like (ACCESS . SUFFIX) or (ACCESS MULE . NOMULE). With the first form, the symbol of the LANGUAGE dependent variable is `FEATURE-SUFFIX' where FEATURE is the value of LANGUAGE's symbol @@ -410,16 +415,17 @@ accesses, see `x-symbol-language-access-alist'." The returned value is (FACE . FACE-SPECS) where FACE is used for the grid and FACE-SPECS for the token in the info. For the format of FACE-SPECS, see `x-symbol-fancy-string'. The value depends on the first -token class and the language access `x-symbol-class-face-alist'." +token class and the language access `x-symbol-LANG-class-face-alist'." (cdr (assq (car (gethash charsym (x-symbol-generated-token-classes (x-symbol-language-value - 'x-symbol-generated-data language)))) - (x-symbol-language-value 'x-symbol-class-face-alist language)))) + 'x-symbol-LANG-generated-data language)))) + (x-symbol-language-value 'x-symbol-LANG-class-face-alist + language)))) (defun x-symbol-image-available-p () "Non-nil, if `x-symbol-image' can be set in current file." - (and (x-symbol-language-value 'x-symbol-image-keywords) + (and (x-symbol-language-value 'x-symbol-LANG-image-keywords) (null (file-remote-p default-directory)))) (defun x-symbol-default-context-info-ignore (context charsym) @@ -472,7 +478,7 @@ If LANGUAGE is non-nil, the result looks like (TOKEN . MISC)." x-symbol-fchar-tables))))) (gethash charsym (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data + 'x-symbol-LANG-generated-data (or language x-symbol-language))))) (gethash charsym (cdr (assq (or (x-symbol-buffer-coding) x-symbol-default-coding @@ -563,7 +569,7 @@ When non-nil, use format string FORMAT." "Return text for LANGUAGE, to be presented to the user. LANGUAGE defaults to `x-symbol-language'. If LANGUAGE is nil, return `x-symbol-charsym-name'. When non-nil, use format string FORMAT." - (let ((text (or (x-symbol-language-value 'x-symbol-name language) + (let ((text (or (x-symbol-language-value 'x-symbol-LANG-name language) x-symbol-charsym-name))) (if format (format format text) text))) @@ -587,15 +593,14 @@ otherwise just return text for CODING1." (defun x-symbol-language-modeline-text (language) "Return text for LANGUAGE, to be presented in the modeline." - (or (and (setq language (and (boundp language) (symbol-value language))) - (x-symbol-language-value 'x-symbol-modeline-name)) - x-symbol-modeline-name)) + (if language + (x-symbol-language-value 'x-symbol-LANG-modeline-name language) + x-symbol-charsym-modeline-name)) (defun x-symbol-coding-modeline-text (coding) - "Return text for symbol value of CODING, to be used in the modeline. -Use association in `x-symbol-coding-modeline-alist' if value of CODING -differs from `x-symbol-default-coding', \"\" otherwise." - (setq coding (and (boundp coding) (symbol-value coding))) + "Return text for CODING, to be used in the modeline. +Use association in `x-symbol-coding-modeline-alist' if CODING differs +from `x-symbol-default-coding', \"\" otherwise." (let ((buffer-coding (x-symbol-buffer-coding))) (cdr (assq (cond ((null buffer-coding) (if x-symbol-8bits 'error (if coding 'info 'none))) @@ -743,7 +748,7 @@ package X-Symbol: Thank you for trying package X-Symbol. If you have problems, please use `M-x x-symbol-package-bug' to contact the maintainer. Do not assume that I remember the contents of your message (appended to this reply)... -er, I have actually deleted it.") +err, I have actually deleted it.") (goto-char (point-max)) (when (get-buffer " *gnus article copy*") (newline) @@ -794,11 +799,11 @@ which defaults to `x-symbol-exec-threshold'. Before decoding, decode ;; * Latin decode alists are ordered, see `x-symbol-init-latin-decoding' ;; * No part of the association is a KEY in the conversion alists ;; * Keys in conversion alists are ordered: long...short - (let* ((grammar (x-symbol-language-value 'x-symbol-token-grammar)) + (let* ((grammar (x-symbol-language-value 'x-symbol-LANG-token-grammar)) (decode-obarray (if x-symbol-language (x-symbol-generated-decode-obarray (x-symbol-language-value - 'x-symbol-generated-data)))) + 'x-symbol-LANG-generated-data)))) (buffer-coding (x-symbol-buffer-coding)) (unique (and x-symbol-unique t))) ;; TODO: recheck. Decode uniquely and do not decode to 8bit if current @@ -854,7 +859,7 @@ which defaults to `x-symbol-exec-threshold'. Before decoding, decode (intern-soft string (x-symbol-generated-decode-obarray (x-symbol-language-value - 'x-symbol-generated-data)))))) + 'x-symbol-LANG-generated-data)))))) (if token (gethash (car token) x-symbol-cstring-table))))) (defun x-symbol-decode-lisp (contexts decode-regexp decode-obarray unique) @@ -910,10 +915,10 @@ characters in `x-symbol-coding' or `x-symbol-default-coding' if between START and END to BUFFER, make BUFFER current and do conversion there. If BUFFER is non-nil, START and END must be buffer positions or START is a string, see kludgy feature of `write-region'." - (let ((grammar (x-symbol-language-value 'x-symbol-token-grammar)) + (let ((grammar (x-symbol-language-value 'x-symbol-LANG-token-grammar)) (encode-table (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data))) + 'x-symbol-LANG-generated-data))) (buffer-coding (x-symbol-buffer-coding)) (coding (if x-symbol-coding (if (assq x-symbol-coding x-symbol-fchar-tables) @@ -1007,7 +1012,7 @@ commands `x-symbol-encode' and `x-symbol-mode'. Note that in most token languages, different tokens might be decoded to the same character, e.g., \\neq and \\ne in `tex', Ä\; and Ä\; -in `sgml'!" +in `sgml', see `x-symbol-unique'!" (interactive (and (region-active-p) (list (region-beginning) (region-end)))) (unless x-symbol-language (error "No token language which can be used for decoding")) @@ -1029,6 +1034,10 @@ in `sgml'!" ;;;###autoload (defun x-symbol-decode (&optional beg end) + "Decode all tokens in active region or buffer to characters. +As opposed to `x-symbol-decode-recode', this function performs no +recoding, i.e., `x-symbol-coding' is considered to have the value of +`x-symbol-default-coding'." (interactive (and (region-active-p) (list (region-beginning) (region-end)))) (if (or (null x-symbol-coding) (eq x-symbol-coding x-symbol-default-coding)) @@ -1066,11 +1075,12 @@ encode 8bit characters. See also commands `x-symbol-decode' and ;;;###autoload (defun x-symbol-encode (&optional beg end) -;; "Encode all characters in active region or buffer to tokens. -;;If called interactively and if the region is active, BEG and END are the -;;boundaries of the region. BEG and END default to the buffer boundaries. -;;Always encode all 8bit characters, as opposed to \\[x-symbol-encode], -;;i.e., `x-symbol-8bits' is assumed to be nil here." + "Encode all characters in active region or buffer to tokens. +As opposed to `x-symbol-encode-recode', this function performs no +recoding, i.e., `x-symbol-coding' is considered to have the value of +`x-symbol-default-coding'. Additionally, `x-symbol-8bits' is assumed to +be nil if `x-symbol-coding' is not nil or not having the same value as +`x-symbol-default-coding'." (interactive (and (region-active-p) (list (region-beginning) (region-end)))) (if (or (null x-symbol-coding) (eq x-symbol-coding x-symbol-default-coding)) @@ -1098,16 +1108,14 @@ resolve a single character before point with \\[x-symbol-modify-key]. if you have a latin-1 font by default, the `adiaeresis' in a latin-2 encoded file is a latin-1 `adiaeresis' in the buffer. When saving the buffer, its is again the right 8bit character in the latin-2 encoded -file. But note: CHAR ALIASES ARE NOT ENCODED WHEN SAVING THE FILE. -Invoke this command before, if your buffers have char aliases! Seven -positions in latin-3 fonts are not used, the corresponding 8bit bytes in -latin-3 encoded files are not changed. +file. Seven positions in latin-3 fonts are not used, the corresponding +8bit bytes in latin-3 encoded files are not changed. -In normal cases, buffers do not have char aliases: in XEmacs/Mule, this -is only possible if you copy characters from buffers with characters -considered as char aliases by package x-symbol, e.g., from the Mule file -\"european.el\". In XEmacs/no-Mule, this is only possible if you use -commands like `\\[universal-argument] 2 3 4'. +In normal cases, buffers do not have char aliases: with Mule support, +this is only possible if you copy characters from buffers with +characters considered as char aliases by package x-symbol, e.g., from +the Mule file \"european.el\". Without Mule support, this is only +possible if you use commands like `\\[universal-argument] 2 3 4'. The reason why package x-symbol does not support all versions of `adiaeresis'es: @@ -1148,6 +1156,9 @@ The reason why package x-symbol does not support all versions of count (x-symbol-region-text t))))) (defun x-symbol-copy-region-encoded (start end) + "Save the region encoded, as if killed. +Encode characters as `x-symbol-encode' does, but without traces in +current buffer. Save the region as `copy-region-as-kill' does." ;; WARNING: args might change (for prefix arg: kill, append/prepend). No, ;; this command does not append after a kill as `copy-region-as-kill' does. ;; I think it's quite strange to append after a kill, but not after another @@ -1173,6 +1184,9 @@ The reason why package x-symbol does not support all versions of (copy-region-as-kill start end))) (defun x-symbol-yank-decoded (&optional arg) + "Reinsert and decode the last stretch of killed text. +Reinsert text as `yank' does. Decode characters as `x-symbol-decode' +does, but without adding unnessary entries to the `buffer-undo-list'." ;; Can also be inserted+decoded directly. But it would be much longer when ;; doing it right (`buffer-undo-list', disable font-lock, etc). (interactive "*P") @@ -1203,11 +1217,10 @@ The reason why package x-symbol does not support all versions of (while alist (cond ((stringp (car alist)) (or sep (setq sep (car alist)))) - ((setq string (if (functionp (cdar alist)) - (funcall (cdar alist) (caar alist)) - (if (symbol-value (caar alist)) - (cadar alist) - (cddar alist)))) + ((setq string (let ((value (symbol-value (caar alist)))) + (if (functionp (cdar alist)) + (funcall (cdar alist) value) + (if value (cadar alist) (cddar alist))))) (when sep (push sep strings) (setq sep nil)) (push string strings))) (setq alist (cdr alist))) @@ -1316,6 +1329,10 @@ where KEY is equal to the MATCH'th regexp group of the match." (0 (progn x-symbol-nomule-font-lock-face) prepend))))) "TODO") +(defvar x-symbol-subscript-matcher nil + "Internal. +Used during the font-lock highlighting process.") + (defvar x-symbol-subscript-type nil "Internal") @@ -1330,7 +1347,7 @@ where KEY is equal to the MATCH'th regexp group of the match." (and x-symbol-mode x-symbol-subscripts (find-face 'x-symbol-sub-face) ; TODO: not if in Emacs-21.4 (find-face 'x-symbol-sup-face) ; ditto - (x-symbol-language-value 'x-symbol-subscript-matcher))) + (x-symbol-language-value 'x-symbol-LANG-subscript-matcher))) (if (eq x-symbol-subscript-matcher 'ignore) (setq x-symbol-subscript-matcher nil))) @@ -1406,7 +1423,17 @@ command `x-symbol-mode' for details." (progn (decode-coding-region (point-min) (point-max) 'undecided) (set-buffer-multibyte t)) - (set-buffer-modified-p modified))))) + (set-buffer-modified-p modified)))) + (and x-symbol-mode + x-symbol-set-coding-system-if-undecided + x-symbol-default-coding + (let ((cs (car (rassq x-symbol-default-coding + '((iso-latin-1 . iso-8859-1) + (iso-latin-2 . iso-8859-2) + (iso-latin-3 . iso-8859-3) + (iso-latin-9 . iso-8859-9) + (iso-latin-15 . iso-8859-15)))))) + (if cs (set-buffer-file-coding-system cs))))) (if x-symbol-mode (x-symbol-init-font-lock)) (if conversion (let ((modified (buffer-modified-p)) @@ -1505,7 +1532,8 @@ Used in `change-major-mode-hook'." (defun x-symbol-extra-filter (menu-items) (let ((extra (assoc (aref (car menu-items) 0) - (x-symbol-language-value 'x-symbol-extra-menu-items)))) + (x-symbol-language-value + 'x-symbol-LANG-extra-menu-items)))) (if extra (append (cdr menu-items) (cdr extra)) (cdr menu-items)))) @@ -1525,7 +1553,7 @@ Append the global or token-language specific menu to MENU-ITEMS." (or (and x-symbol-local-menu x-symbol-language (x-symbol-generated-menu-alist - (x-symbol-language-value 'x-symbol-generated-data))) + (x-symbol-language-value 'x-symbol-LANG-generated-data))) x-symbol-menu-alist))) @@ -1721,10 +1749,10 @@ See `x-symbol-init-language'." (if language (if (get language 'x-symbol-initialized) (message "Token language %S is already initialized" - (x-symbol-language-value 'x-symbol-name language)) + (x-symbol-language-value 'x-symbol-LANG-name language)) (if (x-symbol-init-language language) (message "Token language %S has been initialized" - (x-symbol-language-value 'x-symbol-name language)) + (x-symbol-language-value 'x-symbol-LANG-name language)) (error "Failed to initialize token language `%s'" language))))) (defun x-symbol-list-menu (reference charsym) @@ -1744,7 +1772,7 @@ buffer REFERENCE, see `x-symbol-insert-command'." (car (gethash charsym (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data + 'x-symbol-LANG-generated-data (car language))))) (symbol-name charsym))) (push (vector token @@ -1859,7 +1887,7 @@ mouse is in the upper half of the window, scroll up, otherwise." (plist-put x-symbol-language-info-caches language cache))) (or (gethash charsym cache) (let* ((data (x-symbol-language-value - 'x-symbol-generated-data language)) + 'x-symbol-LANG-generated-data language)) (token (gethash charsym (x-symbol-generated-encode-table data)))) (x-symbol-puthash @@ -1874,7 +1902,8 @@ mouse is in the upper half of the window, scroll up, otherwise." (x-symbol-fancy-associations (gethash charsym (x-symbol-generated-token-classes data)) - (x-symbol-language-value 'x-symbol-class-alist language) + (x-symbol-language-value 'x-symbol-LANG-class-alist + language) 'x-symbol-info-classes-pre 'x-symbol-info-classes-sep 'x-symbol-info-classes-post @@ -1932,7 +1961,7 @@ describing key bindings." (concat intro (gethash charsym x-symbol-fontified-cstring-table) (x-symbol-fancy-value 'x-symbol-info-token-pre) - (if (get language 'x-symbol-name) + (if (get language 'x-symbol-LANG-name) (x-symbol-language-info charsym language) (x-symbol-charsym-info charsym)) (x-symbol-coding-info charsym) @@ -2123,7 +2152,12 @@ See `x-symbol-reveal-invisible', `x-symbol-character-info' and ;; (setq cw2 quail-overlay))) ;; ;;(quail-point-in-conversion-region))) (setq info (x-symbol-point-info after before)) - (display-message 'no-log info))))) + (if (featurep 'xemacs) + (display-message 'no-log info) + (let ((resize-mini-windows nil)) + (display-message 'no-log info) + ;;(sit-for 0.01) ; does not work, resizes after 0.01s + )))))) (defun x-symbol-start-itimer-once () "Start idle timer for function `x-symbol-show-info-and-invisible'. @@ -2160,7 +2194,8 @@ Used in `x-symbol-post-command-hook.'" (defvar x-symbol-language-history nil - "History of token languages, long form, see access `x-symbol-name'.") + "History of token languages, long form. +See language access `x-symbol-LANG-name'.") (defvar x-symbol-token-history nil "History of tokens of any language.") @@ -2223,7 +2258,7 @@ Otherwise signal error `undefined-keystroke-sequence'." (let* ((token (if x-symbol-language (car (gethash charsym (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data)))))) + 'x-symbol-LANG-generated-data)))))) (language (x-symbol-read-language (format "Insert %s in token language (default %s): " charsym @@ -2235,12 +2270,12 @@ Otherwise signal error `undefined-keystroke-sequence'." (or (null (setq lang (cdr lang))) (gethash charsym (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data + 'x-symbol-LANG-generated-data lang)))))))) (or (if language (car (gethash charsym (x-symbol-generated-encode-table (x-symbol-language-value - 'x-symbol-generated-data + 'x-symbol-LANG-generated-data language))))) (symbol-name charsym)))) @@ -2325,13 +2360,13 @@ nil, argument ARG is passed to `x-symbol-insert-command'." (decode-obarray (if language (x-symbol-generated-decode-obarray (x-symbol-language-value - 'x-symbol-generated-data language)) + 'x-symbol-LANG-generated-data language)) x-symbol-charsym-decode-obarray)) (completion (try-completion "" decode-obarray)) (completion-ignore-case (if language (x-symbol-grammar-case-function (x-symbol-language-value - 'x-symbol-token-grammar language)))) + 'x-symbol-LANG-token-grammar language)))) (cstring (completing-read (format "Insert %s %s: " (car arg-strings) (cdr arg-strings)) decode-obarray @@ -2374,7 +2409,7 @@ non-nil, see `x-symbol-list-restore'." x-symbol-language (x-symbol-generated-grid-alist (x-symbol-language-value - 'x-symbol-generated-data)))) + 'x-symbol-LANG-generated-data)))) (language (and grid-alist x-symbol-language)) (win-config (and x-symbol-temp-grid (current-window-configuration))) ;;(ref-buffer (and x-symbol-temp-grid (current-buffer))) @@ -2490,11 +2525,12 @@ argument. Also prepare the use of `undo' and `unexpand-abbrev'." (defun x-symbol-replace-token (&optional command-char) "Replace token by corresponding character. If COMMAND-STRING is non-nil, check token shape." - (let* ((grammar (x-symbol-language-value 'x-symbol-token-grammar)) - (generated (x-symbol-language-value 'x-symbol-generated-data)) + (let* ((grammar (x-symbol-language-value 'x-symbol-LANG-token-grammar)) + (generated (x-symbol-language-value 'x-symbol-LANG-generated-data)) (decode-obarray (x-symbol-generated-decode-obarray generated)) (case-fold-search (x-symbol-grammar-case-function ;#dynamic - (x-symbol-language-value 'x-symbol-token-grammar))) + (x-symbol-language-value + 'x-symbol-LANG-token-grammar))) (input-regexp (x-symbol-grammar-input-regexp grammar)) (input-spec (x-symbol-grammar-input-spec grammar)) (beg (- (point) (x-symbol-generated-max-token-len generated) @@ -2695,7 +2731,7 @@ Called in `x-symbol-post-command-hook', see `x-symbol-electric-input'." (x-symbol-call-function-or-regexp x-symbol-electric-ignore context (cdr pos+charsym)) (x-symbol-call-function-or-regexp - (x-symbol-language-value 'x-symbol-electric-ignore) + (x-symbol-language-value 'x-symbol-LANG-electric-ignore) context (cdr pos+charsym)) (x-symbol-replace-from (car pos+charsym) (cdr pos+charsym))))))) @@ -3526,7 +3562,7 @@ The rotate score is more important than the modify score." "Return an alists with headers and their charsyms. If optional argument LANGUAGE is non-nil, only collect valid charsym in that language. Used for menu and grid. See variable and language -access `x-symbol-header-groups-alist'." +access `x-symbol-LANG-header-groups-alist'." (let (group-alist) (dolist (charsym x-symbol-all-charsyms) (when (or (null language) @@ -3545,7 +3581,7 @@ access `x-symbol-header-groups-alist'." (cdr header-groups))))) (or (and language (symbol-value - (get language 'x-symbol-header-groups-alist))) + (get language 'x-symbol-LANG-header-groups-alist))) x-symbol-header-groups-alist)))) (defun x-symbol-init-grid/menu (&optional language) @@ -3607,7 +3643,7 @@ language." menu-alist (nreverse menu-alist)) (if language (let ((generated (symbol-value - (get language 'x-symbol-generated-data)))) + (get language 'x-symbol-LANG-generated-data)))) (setf (x-symbol-generated-menu-alist generated) menu-alist) (setf (x-symbol-generated-grid-alist generated) grid-alist)) (setq x-symbol-menu-alist menu-alist @@ -3823,7 +3859,8 @@ Set conversion alists according to table and initialize executables, see `x-symbol-init-input'. LANGUAGE should have been registered with `x-symbol-register-language' before. -Each element in TABLE, the language access `x-symbol-table', looks like +Each element in TABLE, the language access `x-symbol-LANG-table', looks +like (CHARSYM CLASSES . TOKEN-SPEC) or nil. With the first form, pass TOKEN-SPEC to the language aspect @@ -3841,32 +3878,34 @@ CLASSES are a list of symbols which are used for the character info in the echo are, see `x-symbol-character-info', the grid coloring scheme, and probably by the token language dependent control of input method ELECTRIC, see `x-symbol-electric-input'. They are used by the language -accesses `x-symbol-class-alist' and `x-symbol-class-face-alist'. +accesses `x-symbol-LANG-class-alist' and +`x-symbol-LANG-class-face-alist'. If non-nil, the language aspect `x-symbol-input-token-ignore' \"hides\" some tokens from input method token. `x-symbol-call-function-or-regexp' uses it with TOKEN and CHARSYM." - (when (get language 'x-symbol-feature) - (require (get language 'x-symbol-feature)) + (when (get language 'x-symbol-LANG-feature) + (require (get language 'x-symbol-LANG-feature)) (x-symbol-init-language-accesses language x-symbol-language-access-alist) (put language 'x-symbol-initialized t) - (dolist (feature (x-symbol-language-value 'x-symbol-required-fonts + (dolist (feature (x-symbol-language-value 'x-symbol-LANG-required-fonts language)) (require feature)) (x-symbol-init-input) - (let ((grammar (x-symbol-language-value 'x-symbol-token-grammar language))) + (let ((grammar (x-symbol-language-value 'x-symbol-LANG-token-grammar + language))) (when (eq (car-safe grammar) 'x-symbol-make-grammar) (setq grammar (apply 'x-symbol-make-grammar (cdr grammar))) - (set (get language 'x-symbol-token-grammar) grammar)) + (set (get language 'x-symbol-LANG-token-grammar) grammar)) (let ((token-list (x-symbol-grammar-token-list grammar)) (after-init (x-symbol-grammar-after-init grammar)) - (class-alist (x-symbol-language-value 'x-symbol-class-alist + (class-alist (x-symbol-language-value 'x-symbol-LANG-class-alist language)) decode-alist encode-alist classes-alist (warn-double t) used-charsyms used-tokens secondary (max-token-len 0) tlen) - (dolist (entry (x-symbol-language-value 'x-symbol-table language)) + (dolist (entry (x-symbol-language-value 'x-symbol-LANG-table language)) (if (null entry) (setq warn-double nil) (let* ((charsym (car entry)) @@ -3913,7 +3952,7 @@ uses it with TOKEN and CHARSYM." (setq max-token-len tlen)) (setq secondary t))))))) ;; set vars ---------------------------------------------------------- - (set (get language 'x-symbol-generated-data) + (set (get language 'x-symbol-LANG-generated-data) (x-symbol-make-generated-data :encode-table (x-symbol-alist-to-hash-table encode-alist) :decode-obarray (x-symbol-alist-to-obarray decode-alist) diff --git a/x-symbol/man/Makefile b/x-symbol/man/Makefile index 86a61610..281d5fb5 100644 --- a/x-symbol/man/Makefile +++ b/x-symbol/man/Makefile @@ -40,6 +40,7 @@ EFLAG_FINAL = --kill # @url and @uref. Use expanded texi file for texi2pdf... PRELOADS = -eval "(progn \ (defun texi-expand (last) \ + (setq buffer-read-only nil) \ (let (replaces text) \ (goto-char (point-min)) \ (while (re-search-forward \"^@set[ \\t]+\\\\([a-zA-Z-_]+\\\\)[ \\t]+\\\\(.+\\\\)\" \ diff --git a/x-symbol/man/x-symbol.init b/x-symbol/man/x-symbol.init index 93447ada..533c2248 100644 --- a/x-symbol/man/x-symbol.init +++ b/x-symbol/man/x-symbol.init @@ -61,7 +61,7 @@ sub T2H_XSYMB_Top_footer my $fh = shift; print $fh '<p class=print> To <strong>print</strong> out the manual, you might want to download -<a href="x-symbol.pdf">the PDF version (~735k)</a> or +<a href="x-symbol.pdf">the PDF version (~730k)</a> or <a href="x-symbol.ps">the Postscript version (~720k)</a>, both in A4 format</a>. Other formats can be produced from the TeXinfo source in the distribution of X-Symbol.'; diff --git a/x-symbol/man/x-symbol.texi b/x-symbol/man/x-symbol.texi index 5d00d2f9..b7e4a19b 100644 --- a/x-symbol/man/x-symbol.texi +++ b/x-symbol/man/x-symbol.texi @@ -11,11 +11,12 @@ @settitle X-Symbol Manual @setchapternewpage odd -@set edition 4.5 -@set version 4.5 -@set update March 2003 -@set http http://x-symbol.sourceforge.net +@set edition 4.5.1 +@set version 4.5.1 +@set update May 2003 +@set url http://x-symbol.sourceforge.net @set maintainer wedler@@users.sourceforge.net +@set listdevel x-symbol-devel@@lists.sourceforge.net @c for cross references to other manuals @ifset GNU @@ -134,8 +135,8 @@ Manual for X-Symbol @value{version}, @value{update}. For recent changes, see @ref{News}. Bug fixes, bug reports, improvements, and suggestions are strongly -appreciated. Please read section @ref{Bug Reports} if you want to -contact the maintainer of package X-Symbol. +appreciated. If you want to contact the maintainer of package X-Symbol, +please read @ref{Bug Reports}. @end ifinfo @menu @@ -310,7 +311,7 @@ Frequently Asked Questions * FAQ 8bit Chars:: I do not want 8bit characters in the file. * FAQ Hyphen:: I cannot distinguish @code{hyphen} from @samp{-}. * FAQ Spell Check:: I have problems with spell-checking. -* FAQ News and Mail:: I want to use X-Symbol in Gnus or VM. +* FAQ News and Mail:: I want to use X-Symbol in Gnus or @sc{vm}. History and Projects @@ -321,6 +322,7 @@ History and Projects News: Changes in Recent Versions of X-Symbol +* Changes New:: To be announced. * Changes 4.5:: Released Mar 2003 as beta. * Changes 4.4:: Released June 2002 as beta. * Changes 4.1:: Released Mar 2002 as beta. @@ -534,7 +536,7 @@ screen shots. You are strongly encouraged to read them carefully. They probably provide enough info for the standard user and can be found at: @display - @uref{@value{http}/} + @uref{@value{url}/} @end display @item @@ -550,8 +552,8 @@ of what can be customized, and it even lists all related user options, but it does not describes the technical format of possible values of each option. -Section @ref{X-Symbol Internals} is for the curious reader and for -people who want to define their own token language. +If you want to learn something about X-Symbol's internals, e.g., if you +want to define your own token language, see @ref{X-Symbol Internals}. This manual does not explain Emacs in general or some optional programs used by this package such as @code{convert} (used to produce the image @@ -669,8 +671,8 @@ Manual}. @cindex Tarball @cindex Binary Distribution -If you use Emacs, please check the @uref{@value{http}/news.html, web -pages of X-Symbol}. +If you use Emacs, please check the @uref{@value{url}/news.html,web pages +of X-Symbol}. In this section, we assume that you want to install the binary distribution (also called the binary tarball) of package X-Symbol in @@ -1095,13 +1097,19 @@ X-Symbol, at least in older Emacsen): load @code{jka-compr} after @item latin-unity @pindex latin-unity -Can be used with package X-Symbol, functionality is already provided by +This XEmacs package can be used with package X-Symbol, functionality is already provided by X-Symbol for Latin-@{1,2,3,5,9@} characters: remapping (@pxref{Char Aliases}) and recoding (@pxref{File Coding}). Has some safe-encoding mechanism, but the test comes currently too early (@pxref{Wishlist Emacs}). -@c also ucs-tables.el? should be no problem@dots{} +@c TODO: test mule-ucs.el with Emacs-21.4 +@item ucs-tables +@pindex ucs-tables +@findex unify-8859-on-decoding-mode +@findex unify-8859-on-encoding-mode +The Emacs minor modes @code{unify-8859-on-decoding-mode} and +@code{unify-8859-on-encoding-mode} can be used with package X-Symbol. @item vc @pindex vc @@ -1147,7 +1155,7 @@ Should work with X-Symbol. @pindex ispell The package @code{ispell} assumes the buffer contents to be the same as the file contents and does not provide any hook to fix this. This -should be fixed in @code{ispell}, @ref{Wishlist Emacs}. @xref{FAQ +should be fixed in @code{ispell}, see @ref{Wishlist Emacs}. @xref{FAQ Spell Check}. @pindex ProofGeneral @@ -1405,7 +1413,7 @@ available. @item x-symbol-mule-change-default-face Package X-Symbol does not change the fonts of pre-defined Mule charsets (this can be changed by this variable). Thus, the variables from -Section @ref{Installing Fonts Lisp} might have no influence if Emacs +@ref{Installing Fonts Lisp} might have no influence if Emacs already has defined fonts for the corresponding charsets. @end vtable @@ -1500,7 +1508,7 @@ ImageMagick (@pxref{Installing Image Converter}). This chapter describes the concepts of package X-Symbol. It contains quite a few forward references to feature which are based on these -concepts, such as @ref{Input Methods} and @ref{Features}. +concepts, such as @ref{Input Methods}, and @ref{Features}. @menu * Token Language:: What does a X-Symbol character represent. @@ -1530,7 +1538,7 @@ For details of predefined token languages ``@TeX{} macro'' (@code{tex}), ``@TeX{}info command'' (@code{texi}), see @ref{Supported Languages}. The token language determines the conversion between X-Symbol characters -and tokens (@ref{Conversion}), the input methods (@pxref{Input +and tokens (@pxref{Conversion}), the input methods (@pxref{Input Methods}), and various other features (@pxref{Features}). The token language is defined by the following buffer-local variable: @@ -1729,7 +1737,7 @@ cases: If the normal file encoding is unsupported (any file encoding is invalid in this case) or if the normal file encoding is supported and the file does not contain 8bit characters, we always encode all X-Symbol -character (@xref{Controlling 8bit Coding}). The modeline includes +character (@pxref{Controlling 8bit Coding}). The modeline includes @samp{-i} to represent the file encoding (@pxref{Minor Mode}), except if the default encoding is @code{nil}, the normal file encoding is unsupported, and the variable @code{x-symbol-coding} is not specified. @@ -1759,7 +1767,7 @@ enabled, but you see the currency character without X-Symbol. @cindex Latin in File You can specify that 8bit characters (according to the coding in your -file, @ref{File Coding}), are not encoded to tokens (when saving a +file, see @ref{File Coding}), are not encoded to tokens (when saving a file), by setting the following buffer-local variable: @vtable @code @@ -1838,7 +1846,7 @@ Whether to limit the decoding in such a way that no normalization will happen. That means: only decode canonical tokens, and, if @code{x-symbol-8bits} is non-@code{nil} (@pxref{Controlling 8bit Coding}), do not decode tokens which would be decoded to 8bit characters -(according to the coding in your file, @ref{File Coding}). +(according to the coding in your file, see @ref{File Coding}). You can set this variable in the ``local variables list'' near the end of the file (@pxref{File Variables,,,@value{emacs},@value{emacsman}}), @@ -1911,7 +1919,7 @@ Encode all characters in buffer to tokens or recode them. Encode all characters in buffer to tokens. No recoding will be performed since 8bit characters will always be encoded if the file coding is different to the default coding, since @code{x-symbol-8bits} -is relative to the file coding, @ref{Controlling 8bit Coding}. +is relative to the file coding, see @ref{Controlling 8bit Coding}. @end table All commands work on the region if it is active, or the (narrowed part @@ -2116,7 +2124,8 @@ the modeline by @samp{s}, @item x-symbol-@var{lang}-modes Major modes which use token language @var{lang} by default. -@xref{Supported Languages}. +@xref{Supported Languages}. The languages are checked in registration +order (the order shown in the language selection submenus). @item x-symbol-@var{lang}-auto-style Default values for the above mentioned variables @code{x-symbol-mode}, @@ -2286,7 +2295,7 @@ math-mode characters if we are in text-mode. @end itemize The token classes for individual token languages are explained in the -corresponding sections of chapter @ref{Supported Languages}: +corresponding sections of @ref{Supported Languages}: @vtable @code @item x-symbol-@var{lang}-header-groups-alist @@ -2311,7 +2320,7 @@ The coloring scheme for each token language @var{lang}. An X-Symbol @dfn{input method} is a way, provided by package X-Symbol, to insert a X-Symbol character (not in the sense of Mule's ``input methods''). For a short overview with screenshots, see the -@uref{@value{http}/details.html, web pages of X-Symbol}. +@uref{@value{url}/details.html,web pages of X-Symbol}. Input methods Token and Electric change the normal way to insert characters a bit. Therefore, they require X-Symbol mode to be turned on @@ -2581,7 +2590,7 @@ and scroll up in the lower half of the window. @item @key{button3} @kindex @key{button3} -Pops up the X-Symbol menu, @ref{Input Method Menu}). +Pops up the X-Symbol menu, see @ref{Input Method Menu}). @end table When using the keyboard to select a character, the following command @@ -2931,8 +2940,7 @@ While this kind of indirection might seem complicated to you (it is), it actually ensures consistency across all input methods. @xref{Defining Input Methods}. -For example., if you prefer charsym @code{epsilon1} over @code{epsilon} -(influences input method , +For example, if you prefer charsym @code{epsilon1} over @code{epsilon} you might want to use: @lisp @@ -3039,12 +3047,6 @@ Time in seconds of idle time before revealing invisible characters. Super-/subscript commands are @code{^}/@code{_} (@pxref{TeX Macro}) and @code{<sup>}/@code{<sub>} (@pxref{SGML Entity}): -@vtable @code -@item x-symbol-@var{lang}-font-lock-keywords -The super-/subscript @code{font-lock} keywords for each token language -@var{lang}. -@end vtable - @c =========================================================================== @node Images, Info, Super and Subscripts, Features @@ -3686,7 +3688,7 @@ letters and other text-mode symbols. Input method Electric (@pxref{Input Method Electric}) is disabled if the character is not of the correct @TeX{} mode, i.e., it only produces a math-mode character in a math area and a text-mode character in a text -area (this test requires package @code{texmathp}, @ref{LaTeX Packages}). +area (this test requires package @code{texmathp}, see @ref{LaTeX Packages}). Postfix tilde is not electric, because @samp{~} produces a space in @TeX{}. @@ -3976,7 +3978,7 @@ we have the following rule: If we have exactly one blank, the blank is a space, and it is not followed by a @samp{%} (comment character), replace the macro by the corresponding character and delete the space. (The character following -the space must be a letter with unique decoding, @ref{Unique Decoding}.) +the space must be a letter with unique decoding, see @ref{Unique Decoding}.) @item Otherwise, do @emph{not decode} the macro! @@ -5031,14 +5033,19 @@ characters in your default font with a special syntax. @itemize @bullet @item +In general, escape sequences use the digits of the current font. Thus, +you should probably define the encodings 48 to 57 as digits @samp{0} to +@samp{9}. + +@item In La@TeX{} buffers, characters in @samp{$%\@{@}} have a special -syntax. Thus, you should you should probably not use encodings 36, 37, +syntax. Thus, you should probably not use encodings 36, 37, 92, 123 and 125 for characters which could also be useful with token languages @code{tex} and @code{utex}. @item In HTML buffers, characters in @samp{&<>} have a special syntax. Thus, -you should you should probably not use encodings 38, 60 and 62 for +you should probably not use encodings 38, 60 and 62 for characters which could also be useful with token language @code{sgml}. @end itemize @@ -5980,7 +5987,7 @@ It is assumed that you had successfully installed package X-Symbol, see * FAQ 8bit Chars:: I do not want 8bit characters in the file. * FAQ Hyphen:: I cannot distinguish @code{hyphen} from @samp{-}. * FAQ Spell Check:: I have problems with spell-checking. -* FAQ News and Mail:: I want to use X-Symbol in Gnus or VM. +* FAQ News and Mail:: I want to use X-Symbol in Gnus or @sc{vm}. @end menu @@ -6040,7 +6047,7 @@ installation). You use some version control commands. You have probably noticed that these versions control commands also turn off @code{font-lock} in modes where you don't use X-Symbol, i.e., this is not a problem of package -X-Symbol. @pxref{Wishlist Emacs} and @ref{Spurious Encodings}. +X-Symbol. @xref{Wishlist Emacs}. @xref{Spurious Encodings}. @end itemize @@ -6244,7 +6251,7 @@ Suggestion: Also use a space before @code{\oplus}. The alternative would be to delete the space which other people won't like. @end itemize -@xref{TeX Macro Conversion} for an exact description. +For an exact description, @xref{TeX Macro Conversion} for an exact description. @node FAQ 8bit Chars, FAQ Hyphen, FAQ Additional Spaces, FAQ @@ -6333,7 +6340,7 @@ of @code{ispell}, you even get a paragraph here in @node FAQ News and Mail, , FAQ Spell Check, FAQ @comment node-name, next, previous, up -@subsection How to Use X-Symbol with Gnus or VM +@subsection How to Use X-Symbol with Gnus or @sc{vm} @cindex News Reader @cindex Mail Reader @pindex Gnus @@ -6342,9 +6349,9 @@ of @code{ispell}, you even get a paragraph here in You can also use X-Symbol to read and write your News and Mails. This sections includes coding for your @file{~/.emacs} if you want to do so. -It has been tested for @sc{Gnus}-5.8.8 and @sc{VM}-6.96; if you use -@sc{RMAIL} or @sc{mh-e}, you have to try to find a solution yourself -(please send it to me). Support for @sc{Gnus} might become a standard +It has been tested for Gnus-5.8.8 and @sc{vm}-6.96; if you use +@sc{rmail} or @sc{mh-e}, you have to try to find a solution yourself +(please send it to me). Support for Gnus might become a standard part of X-Symbol. @lisp @@ -6387,7 +6394,7 @@ message. (add-hook 'gnus-article-prepare-hook 'x-symbol-x-gnus-prepare) @end lisp -Since @sc{Gnus} reuses the @file{*Article*} buffer, where X-Symbol could +Since Gnus reuses the @file{*Article*} buffer, where X-Symbol could have been turned on previously, we must make sure that X-Symbol is turned off with the new article. @@ -6405,9 +6412,9 @@ turned off with the new article. (add-hook 'vm-select-message-hook 'x-symbol-x-gnus-prepare) @end lisp -The same thing for @sc{VM}, although the hook is not as nice as -@sc{Gnus}' one; the function therefore might depend a bit too much on -@sc{VM}'s interna. +The same thing for @sc{vm}, although the hook is not as nice as +Gnus' one; the function therefore might depend a bit too much on +@sc{vm}'s interna. @findex vm-mode @findex vm-presentation-mode @@ -6417,11 +6424,11 @@ The same thing for @sc{VM}, although the hook is not as nice as (custom-set-variables '(vm-fill-paragraphs-containing-long-lines 80)) @end lisp -You cannot use X-Symbol in VM Mode, only in VM Presentation Mode +You cannot use X-Symbol in @sc{vm} Mode, only in @sc{vm} Presentation Mode (X-Symbol would change your @file{INBOX}). The first (optional) Emacs Lisp expression gives you a better error message when you try to turn on -X-Symbol Mode in VM Mode. The second line makes sure that @sc{VM} -always uses VM Presentation Mode to display the articles. +X-Symbol Mode in @sc{vm} Mode. The second line makes sure that @sc{vm} +always uses @sc{vm} Presentation Mode to display the articles. @c =========================================================================== @@ -6446,6 +6453,11 @@ send a bug report (@pxref{Bugs,,,@value{emacs},@value{emacsman}}). This might look tedious to you, but it actually saves a lot of time (your time, too). +The @strong{general recommendation} for bug/problem reports is: give the +impression that your really have tried to find the necessary information +yourself and make your report precise while including all information +you have. + For each bug/problem report or question you want to send to the maintainer, please use the following sequence: @@ -6456,7 +6468,7 @@ reading Edition @value{edition} (@value{subedition}) of the manual for X-Symbol @value{version}. @item -Read the manual, especially @ref{Checking Installation}, @ref{Problems} +Read the manual, especially @ref{Checking Installation}, @ref{Problems}, and @ref{FAQ}. The four indexes (@pxref{Indexes}) might also lead you to an answer to your question. @@ -6474,8 +6486,9 @@ message body from Emacs' @file{*mail*} buffer to your mail tool. If @kbd{M-x x-symbol-package-bug} fails to work, you have a problem with your installation and your report should be about this problem. In this case, use @samp{x-symbol @var{version}; @var{summary}} as Subject header -where @var{version} is the version of X-Symbol and @var{summary} is a -brief summary of your installation problem. +where @var{version} is the version of X-Symbol (it should be +@value{version}) and @var{summary} is a brief summary of your +installation problem. (@emph{Rationale}: This command automatically extracts some essential information without any work by you. Don't waste your time pondering whether @@ -6492,9 +6505,9 @@ In the manual, I checked the sections @var{section1}, @var{section2}, problem: @end quotation -The sections @var{section1}, @var{section2}, etc are names (not -numbers!) of the sections (not whole chapters!) in the manual where you -would expect an answer to your question/problem/bug. +The sections @var{section1}, @var{section2}, etc are names of the +sections (not whole chapters) in the manual where you would expect an +answer to your question/problem/bug. If you didn't know which sections to inspect, please check the indexes. If they are not helpful, send me words/terms which should be included in @@ -6578,9 +6591,9 @@ the size of @file{@var{my-problem}.el} as described above. @item If the problem is not reproducible with an @emph{arbitrary} -(@file{.tex}, @file{.html}, @dots{}) file, try to minimize the file such that -the problem can be still reproducible, and include the file with its -full file name into your bug report. +(@file{.tex}, @file{.html}, @dots{}) file, include the file with its full file +name into your bug report. (If you like, you can try to minimize the +file if the problem is still reproducible.) (@emph{Rationale}: Most problems are only reproducible with specific files.) @@ -6667,6 +6680,7 @@ This is the complete history of X-Symbol. It just lists the major changes before Version 3.0. @menu +* Changes New:: To be announced. * Changes 4.5:: Released Mar 2003 as beta. * Changes 4.4:: Released June 2002 as beta. * Changes 4.1:: Released Mar 2002 as beta. @@ -6679,16 +6693,20 @@ changes before Version 3.0. @end menu -@c * Changes New:: To be announced. -@c @node Changes New, Changes 4.4, News, News -@c @comment node-name, next, previous, up -@c @subsection Changes in X-Symbol @value{version} +@node Changes New, Changes 4.5, News, News +@comment node-name, next, previous, up +@subsection Changes in X-Symbol @value{version} -@c Version @value{version} has not yet been announced. +Version @value{version} has not yet been announced. + +@itemize @bullet +@item +Various bug fixes and minor changes. +@end itemize -@node Changes 4.5, Changes 4.4, News, News +@node Changes 4.5, Changes 4.4, Changes New, News @comment node-name, next, previous, up @subsection Changes in X-Symbol 4.5 @@ -6713,9 +6731,9 @@ Bug fix (Emacs): package now works with package @item Token language @code{sgml}: always encode characters to entity -references by default (not possible with most Latin-N characters, where -we still use character entities). Include @code{hm--html-mode}, -@code{html-helper-mode}, remove @code{sgml-mode} as typical major modes. +references by default (where defined by the HTML standard). Include +@code{hm--html-mode}, @code{html-helper-mode}, remove @code{sgml-mode} +as typical major modes which use X-Symbol. @item Token language @code{tex}: support some symbols of package @@ -6756,7 +6774,7 @@ Various bug fixes and minor changes. @node Changes 4.4, Changes 4.1, Changes 4.5, News @comment node-name, next, previous, up -@subsection Changes in X-Symbol 4.2, 4.3, 4.4 +@subsection Changes in X-Symbol 4.2 to 4.4 Version 4.4 has been released on June 2002 as beta. @@ -7208,44 +7226,41 @@ Fonts}). @cindex Windows Fonts @pindex bdftofon -One direction of font generation would be from @file{.bdf} or +A specific direction of font generation would be from @file{.bdf} or @file{.pcf} font files to Windows fonts to get rid of the limited support for XEmacs on Windows (@pxref{Requirements}). If you have successfully converted X-Symbol's fonts from the Unix format to the -Windows format (via @code{bdftofon} or whatever) or if you have free -and real Latin-N fonts for Windows, please @emph{let me know}! I -would also appreciate if you would actively try to get those missing -Windows fonts. +Windows format (via @code{bdftofon} or whatever) or if you have free and +real Latin-N fonts for Windows, please @emph{let me know}! I would also +appreciate if you would actively try to get those missing Windows fonts. -Solofo Ramangalahy suggests to automatically generate the @file{.bdf} -fonts from other sources. This would have various advantages: +The general direction is to automatically generate the @file{.bdf} or +@file{.fon} fonts from other sources. This would have various +advantages: @itemize @bullet @item We could easily create different sizes for our symbol font. @item -It would be quite simple to create a @file{.bdf} font for Ams@TeX{} -macros, calligraphical letters etc, which would be displayed as X-Symbol -characters by package X-Symbol. +It would be quite simple to create a font for Ams@TeX{} macros, etc., +which would be displayed as X-Symbol characters by package X-Symbol. @item We could easily create different sizes for our symbol font. + +@item +We would have fonts for both X11 and Windows. @end itemize -Solofo has worked on Postscript fonts. Although the results are good -for big sizes, this cannot replace bdf fonts for ``small'' sizes like -14. Besides, the X font server is not very good for postscript fonts -(compared with ATM where you have anti-aliasing for example). Now that -XEmacs run under Windows, it may be that the result is better under -Windows than under Unix. This has not been tested. - -An other possibility is to use true type fonts as true type font servers -can achieve better results with good hinted fonts. This has not been -done yet. +New fonts for X-Symbol are being worked on. You can find material to +generate them at the @uref{@value{url}/news.html,web pages of X-Symbol}. +Quite a few problems needs to be fixed though, so it is considered as +experimental. You are welcome to try, fix and report on the +@uref{@value{listdevel},X-Symbol development mailing list}. -There are also some problems which are not optimally solved in the current -xsymb font either: +General open design issues (i.e., they could be re-thought for the +currently used handcrafted fonts, too) are: @itemize @bullet @item @@ -7263,8 +7278,8 @@ exactly like it. @end itemize We could ask the question whether we should really distinguish the -characters by appearance@dots{}we have the minibuffer info for the -X-Symbol character anyway@dots{}. Here are the options: +characters by appearance@dots{}we have the minibuffer info for the X-Symbol +character anyway@dots{}. Here are the options: @itemize @minus @item @@ -7275,21 +7290,6 @@ distinguished by different spacing (my current favorite), not distinguished @end itemize -Solofo Ramangalahy originally though of generating the @file{.bdf} fonts -out of @TeX{} fonts (@file{.mf}, @file{.pk}) by @code{mftobdf} of -See@TeX{}, which can be found at @file{@var{ctan}/dviware/seetex/} among -others distributions having this tool. He dropped this idea for the -following reason: - -@quotation -The created fonts need some correction by hand, since it's difficult to -make good fonts at small size. MF fonts were created to be printed at -high resolutions (in the MetaFont book, cheapo is 200 pixel per inch, -resolution of screens are around 100 pixel per inch). The parameters -@samp{blacker}, @samp{fillin} and @samp{o_correction} are not sufficient -for tuning the computer modern fonts at low resolutions (they will not -do the job of hints of a postscript font). -@end quotation @node Wishlist Emacs, Wishlist LaTeX, Wishlist Fonts, Wishlist @comment node-name, next, previous, up @@ -7311,7 +7311,7 @@ would be easier. The package @code{ispell} assumes the buffer contents to be the same as the file contents and does not provide any hook to fix this. This should be fixed in @code{ispell} (it will be better in Emacs-21.4), -@ref{Miscellaneous Packages}. +see @ref{Miscellaneous Packages}. @item @pindex vc @@ -7362,7 +7362,7 @@ with an error or quit (as it is in Emacs) or having some @item In XEmacs. There are some bugs in package @code{custom}/@code{widget} -(XEmacs-21.0-b59) which are visible during the customization of +(still in XEmacs-21.4) which are visible during the customization of X-Symbol. @end itemize @@ -7512,6 +7512,11 @@ encoding and decoding right. Christophe Raffalli suggested to use a decode method which can be used for a larger class of token languages. He also proved that it is faster. +Solofo Ramangalahy is working on scripts to generate X-Symbol fonts from +other sources. This has various advantages and is discussed in more detail at +@ref{Wishlist Fonts}. His work is now available at the +X-Symbol download area. + Package @code{math-mode} by Renaud Marlet and the extension of it by Julian Bradfield gave the basic idea for the following features: supporting @TeX{}'s math macros, input methods token, context/electric, @@ -7545,10 +7550,10 @@ E. Klee, Gerwin Klein, Thomas Kleymann, Ekkehard Koehler, Fred Labrosse, Jan-Ake Larsson, Bernhard Lehner, Stefan Monnier, Harald Muehlboeck, Karsten Muehlmann, Jakub Narebski, Peter M@o{}ller Neergaard, Raymond Nijssen, David von Oheimb, Alex Ott, Sudeep Kumar Palat, Arshak -Petrosyan, Jim Radford, Christophe Raffalli, Solofo Ramangalahy, -Marciano Siniscalchi, Richard M. Stallman, Alex Russell, Eli Tziperman, -Jan Vroonhof, Markus Wenzel, Sabine Wetzel, Pierre-Henri Wuillemin, -Roland Zumkeller, Marco Zunino, Gerard Zwaan. +Petrosyan, Jim Radford, Christophe Raffalli, Solofo Ramangalahy, Alex +Russell, Marciano Siniscalchi, Richard M. Stallman, Axel Thimm, Eli +Tziperman, Jan Vroonhof, Markus Wenzel, Sabine Wetzel, Pierre-Henri +Wuillemin, Roland Zumkeller, Marco Zunino, Gerard Zwaan. @i{Thanks for general information to:} Per Abrahamsen, Steve L. Baur, Kenichi Handa, David Kastrup, Gerd Moellmann, Stefan Monnier, Primoz |