Mercurial Mercurial > sustaining > oi_151a > g11n > g11n / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6987218 Wrong links to Indic(Lohit) fonts in mp.conf
authorhnhn
Thu, 13 Jan 2011 13:36:54 +0100
changeset 518 5c6047730f66
parent 517 be15a43b9af4
child 519 cff3eb0cf6ff
6987218 Wrong links to Indic(Lohit) fonts in mp.conf
src/cmd/mp/conf/mp.conf file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ja_JP.UTF-8/mp.conf file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ko.UTF-8/mp.conf.B file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ko.UTF-8/mp.conf.T file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ko.UTF-8/mp.conf.U file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh.UTF-8/mp.conf.B file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh.UTF-8/mp.conf.T file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh.UTF-8/mp.conf.U file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh_HK.UTF-8/mp.conf file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.B file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.T file | annotate | diff | comparison | revisions
src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.U file | annotate | diff | comparison | revisions 
--- a/src/cmd/mp/conf/mp.conf	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/conf/mp.conf	Thu Jan 13 13:36:54 2011 +0100
@@ -18,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # mp initial config file version
 #
@@ -72,14 +70,14 @@
 FontNameAlias	tt_arabicR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_ctltamilR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_ta.ttf
-FontNameAlias	tt_tamilR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_ta.ttf
-FontNameAlias	tt_ctlgujaratiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_gu.ttf
-FontNameAlias	tt_gujaratiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_gu.ttf
-FontNameAlias	tt_punjabiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_pa.ttf
-FontNameAlias	tt_ctlpunjabiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_pa.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_ctltamilR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Tamil.ttf
+FontNameAlias	tt_tamilR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Tamil.ttf
+FontNameAlias	tt_ctlgujaratiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Gujarati.ttf
+FontNameAlias	tt_gujaratiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Gujarati.ttf
+FontNameAlias	tt_punjabiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Punjabi.ttf
+FontNameAlias	tt_ctlpunjabiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Punjabi.ttf
 FontNameAlias	tt_kannadaR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/Malige-n.ttf
 FontNameAlias	tt_ctlkannadaR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/Malige-n.ttf
 FontNameAlias	tt_teluguR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/vemana.ttf
--- a/src/cmd/mp/locale/ja_JP.UTF-8/mp.conf	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/ja_JP.UTF-8/mp.conf	Thu Jan 13 13:36:54 2011 +0100
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 FontNameAlias	sunudcjaR	TrueType	$HOME/.fonts/eudc.ttf
@@ -73,8 +72,8 @@
 FontNameAlias	tt_ctlhebrewR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 
 #
--- a/src/cmd/mp/locale/ko.UTF-8/mp.conf.B	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/ko.UTF-8/mp.conf.B	Thu Jan 13 13:36:54 2011 +0100
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Korean font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontNameAlias	iso88591B	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Bold.ttf
 FontNameAlias	iso88591I	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Italic.ttf
@@ -73,8 +70,8 @@
 FontNameAlias	tt_arabicR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- a/src/cmd/mp/locale/ko.UTF-8/mp.conf.T	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/ko.UTF-8/mp.conf.T	Thu Jan 13 13:36:54 2011 +0100
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Korean font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontNameAlias	iso88591B	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Bold.ttf
 FontNameAlias	iso88591I	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Italic.ttf
@@ -73,8 +70,8 @@
 FontNameAlias	tt_ctlhebrewR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- a/src/cmd/mp/locale/ko.UTF-8/mp.conf.U	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/ko.UTF-8/mp.conf.U	Thu Jan 13 13:36:54 2011 +0100
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Korean font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontGroup	iso88591	TrueType	iso88591R
 
@@ -78,10 +75,10 @@
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontGroup	tt_thai	TrueType	tt_thaiR
 
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_ctlhindi	TrueType	tt_ctlhindiR
 
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_hindi	TrueType	tt_hindiR
 
 #
--- a/src/cmd/mp/locale/zh.UTF-8/mp.conf.B	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh.UTF-8/mp.conf.B	Thu Jan 13 13:36:54 2011 +0100
@@ -18,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Simplified Chinese font preferred version.
 #
@@ -74,8 +72,8 @@
 FontNameAlias	tt_arabicR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 
 #
--- a/src/cmd/mp/locale/zh.UTF-8/mp.conf.T	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh.UTF-8/mp.conf.T	Thu Jan 13 13:36:54 2011 +0100
@@ -18,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Simplified Chinese font preferred version.
 #
@@ -75,8 +73,8 @@
 FontNameAlias	tt_arabicR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 
 #
--- a/src/cmd/mp/locale/zh.UTF-8/mp.conf.U	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh.UTF-8/mp.conf.U	Thu Jan 13 13:36:54 2011 +0100
@@ -18,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)mp.conf	1.26	09/06/06 SMI"
+
 #
 # Simplified Chinese font preferred version.
 #
@@ -79,10 +77,10 @@
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontGroup	tt_thai	TrueType	tt_thaiR
 
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_ctlhindi	TrueType	tt_ctlhindiR
 
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_hindi	TrueType	tt_hindiR
 
 #
--- a/src/cmd/mp/locale/zh_HK.UTF-8/mp.conf	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh_HK.UTF-8/mp.conf	Thu Jan 13 13:36:54 2011 +0100
@@ -18,14 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
 # Traditional Chinese font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/share/fonts/TrueType/liberation/LiberationMono-Regular.ttf
 FontNameAlias	iso88591B	TrueType	/usr/share/fonts/TrueType/liberation/LiberationMono-Bold.ttf
 FontNameAlias	iso88591I	TrueType	/usr/share/fonts/TrueType/liberation/LiberationMono-Italic.ttf
@@ -74,8 +72,8 @@
 FontNameAlias	tt_arabicR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/share/fonts/TrueType/dejavu/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/share/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- a/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.B	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.B	Thu Jan 13 13:36:54 2011 +0100
@@ -18,14 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
 # Traditional Chinese font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontNameAlias	iso88591B	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Bold.ttf
 FontNameAlias	iso88591I	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Italic.ttf
@@ -74,8 +72,8 @@
 FontNameAlias	tt_ctlhebrewR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- a/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.T	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.T	Thu Jan 13 13:36:54 2011 +0100
@@ -18,14 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
 # Traditional Chinese font preferred version.
 #
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontNameAlias	iso88591B	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Bold.ttf
 FontNameAlias	iso88591I	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Italic.ttf
@@ -72,8 +70,8 @@
 FontNameAlias	tt_ctlhebrewR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_ctlthaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- a/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.U	Thu Jan 13 13:30:52 2011 +0100
+++ b/src/cmd/mp/locale/zh_TW.UTF-8/mp.conf.U	Thu Jan 13 13:36:54 2011 +0100
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
 # Traditional Chinese font preferred version.
 #
-
-
 FontNameAlias	iso88591R	TrueType	/usr/X11/lib/X11/fonts/TTF/LiberationMono-Regular.ttf
 FontGroup	iso88591	TrueType	iso88591R
 
@@ -78,10 +75,10 @@
 FontNameAlias	tt_thaiR	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSans.ttf
 FontGroup	tt_thai	TrueType	tt_thaiR
 
-FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_ctlhindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_ctlhindi	TrueType	tt_ctlhindiR
 
-FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/indic-fonts-core/lohit_hi.ttf
+FontNameAlias	tt_hindiR	TrueType	/usr/X11/lib/X11/fonts/TrueType/lohit/Lohit-Hindi.ttf
 FontGroup	tt_hindi	TrueType	tt_hindiR
 
 #
sustaining/oi_151a/g11n/g11n