summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-03-14 01:49:18 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-03-14 01:49:18 +0000
commite20ec108e9544bc477eea2dcb76254c61772a39c (patch)
treea3a9d56d8bfe1b671d3eb2547e5478b7d7fec740
parent0af8ff60b3f560339e6f3f9bcf7ac5bc99d8187f (diff)
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=304 -XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Add some font encodings ("cns11643-1", "cns11643-2", "cns11643-3" and "suneu-greek") and fix the gb2312.1980-0.enc file to work on fonts which only have PRC and no unicode mapping (examples for such fonts can be found on Solaris 2.8 /usr/openwin/lib/locale/zh/X11/fonts/TrueType/), a=kaleb@keithley.org
-rw-r--r--mkfontscale.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkfontscale.c b/mkfontscale.c
index c00b051..721a6a9 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -19,7 +19,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.2 2003/12/06 13:24:29 kaleb Exp $ */
+/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.4 2004/03/05 13:41:16 eich Exp $ */
/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */
#include <stdio.h>
@@ -70,10 +70,11 @@ char *encodings_array[] =
"iso8859-15", "iso8859-16",
"ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
"tis620-2",
- "sun.unicode.india-0",
+ "sun.unicode.india-0", "suneu-greek",
"adobe-standard", "adobe-symbol",
"ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
/* But not "adobe-dingbats", as it uses generic glyph names. */
+ "cns11643-1", "cns11643-2", "cns11643-3",
"jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0",
"jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0",
"gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",