Author: alexander Date: 2005-10-07 09:18:59 -0600 (Fri, 07 Oct 2005) New Revision: 894
Added: branches/utf8-newmake/packages/lfs-bootscripts/font-errors.dat branches/utf8-newmake/packages/scim-tables/Thai.png branches/utf8-newmake/packages/scim-tables/thai-table.patch Modified: branches/utf8-newmake/etc/profile branches/utf8-newmake/packages/kbd/Makefile branches/utf8-newmake/packages/lfs-bootscripts/Makefile branches/utf8-newmake/packages/lfs-bootscripts/font.dat branches/utf8-newmake/packages/lfs-bootscripts/lang.dat branches/utf8-newmake/packages/lfs-bootscripts/langconf branches/utf8-newmake/packages/scim-tables/Makefile branches/utf8-newmake/root/.xinitrc Log: Added Thai support. Reworked language configurator. Fixed Firefox home page. Modified: branches/utf8-newmake/etc/profile =================================================================== --- branches/utf8-newmake/etc/profile 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/etc/profile 2005-10-07 15:18:59 UTC (rev 894) @@ -8,7 +8,7 @@ PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig -WWW_HOME="/usr/share/LFS-BOOK-6.1-HTML/index.html" +WWW_HOME="/usr/share/LFS-BOOK-HTML/index.html" NNTPSERVER=news.linuxfromscratch.org Modified: branches/utf8-newmake/packages/kbd/Makefile =================================================================== --- branches/utf8-newmake/packages/kbd/Makefile 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/kbd/Makefile 2005-10-07 15:18:59 UTC (rev 894) @@ -12,6 +12,10 @@ URL-$(BELARUSIAN_FILE)= http://www.mova.org/bellinux/$(BELARUSIAN_FILE) SHA-$(BELARUSIAN_FILE)= c0026a915fff58cdc3b68bb57de4eec35a220c43 +THAI_FILE= thai-console-data_cvs20051001.tar.bz2 +URL-$(THAI_FILE)= http://linux.thai.net/pub/thailinux/software/snapshots/thai-console-data/$(THAI_FILE) +SHA-$(THAI_FILE)= 2d5e8f4d6cf488987600d455078fe8f5d4199217 + PATCH1= $(DIR)-backspace-1.patch URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1) SHA-$(PATCH1)= 39e332e42d5145dfc47786dba5eff63cda91d0ba @@ -24,7 +28,7 @@ URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3) SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500 -STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(PATCH1) $(PATCH3) +STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(THAI_FILE) $(PATCH1) $(PATCH3) ifeq ($(LFS-ARCH),sparc) STAGE2-DEPS += $(PATCH2) endif @@ -43,7 +47,7 @@ cp $(SRC)/{$(FILE),$(PATCH3)} $(LFSSRC) compile-stage2: - cd .. ; unpack $(BELARUSIAN_FILE) + cd .. ; unpack $(BELARUSIAN_FILE) ; unpack $(THAI_FILE) zcat ../bellinux/console/keymaps/by2_win.kmap.gz > data/keymaps/i386/qwerty/by2_win.map sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map patch -Np1 -i ../$(PATCH1) @@ -54,9 +58,20 @@ ./configure make $(PM) make install + # Turkish fixup + cp /usr/share/kbd/consoletrans/cp857_to_uni.trans /usr/share/kbd/unimaps/cp857.uni + # Thai fonts and keymaps + gzip ../thai-console-data/consolefonts/*.psf + install -m644 ../thai-console-data/consolefonts/*.psf.gz /usr/share/kbd/consolefonts + install -m644 ../thai-console-data/consoletrans/tis620.acm /usr/share/kbd/consoletrans/tis620_to_uni.trans + rename .kmap .map ../thai-console-data/keymaps/*.kmap ../thai-console-data/keymaps/experimental/*.kmap + sed -i 's,\+U,U,g' ../thai-console-data/keymaps/experimental/*.map + gzip ../thai-console-data/keymaps/*.map ../thai-console-data/keymaps/experimental/*.map + install -m644 ../thai-console-data/keymaps/*.map.gz ../thai-console-data/keymaps/experimental/*uni*.map.gz /usr/share/kbd/keymaps/i386/qwerty clean: -rm -rf $(DIR) -rm -rf bellinux + -rm -rf thai-console-data .PHONY: clean chroot compile-stage2 Modified: branches/utf8-newmake/packages/lfs-bootscripts/Makefile =================================================================== --- branches/utf8-newmake/packages/lfs-bootscripts/Makefile 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/lfs-bootscripts/Makefile 2005-10-07 15:18:59 UTC (rev 894) @@ -33,8 +33,7 @@ install -m 755 ../langconf /etc/rc.d/init.d/ ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf mkdir -p /etc/langconf - install -m 644 ../font.dat /etc/langconf - install -m 644 ../lang.dat /etc/langconf + install -m 644 ../*.dat /etc/langconf install -m 755 ../console /etc/rc.d/init.d/ rm -f /etc/rc.d/rc0.d/S99halt rm -f /etc/rc.d/rc6.d/S99reboot Added: branches/utf8-newmake/packages/lfs-bootscripts/font-errors.dat =================================================================== --- branches/utf8-newmake/packages/lfs-bootscripts/font-errors.dat 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/lfs-bootscripts/font-errors.dat 2005-10-07 15:18:59 UTC (rev 894) @@ -0,0 +1,4 @@ +All non-ASCII characters will be treated as non-printable\nuntil you set locale to something other than "C". +Some characters are missing from the console font.\nType "startx" to start the X session after login. +Your language is supported in X window system only.\nType "startx" to start the X session after login. +Your language is completely unsupported on this CD.\nIt is a bug, but we don't know how to fix it.\nPlease mail instructions to [email protected] Modified: branches/utf8-newmake/packages/lfs-bootscripts/font.dat =================================================================== --- branches/utf8-newmake/packages/lfs-bootscripts/font.dat 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/lfs-bootscripts/font.dat 2005-10-07 15:18:59 UTC (rev 894) @@ -1,31 +1,33 @@ -# Charset FONT ERROR? CAVEAT -ANSI_X3.4-1968 default8x16 0 You forgot to (correctly) set your locale! -BIG5 default8x16 1 Chinese is not supported by this Live CD. Sorry. -BIG5-HKSCS default8x16 1 Chinese is not supported by this Live CD. Sorry. +# Charset FONT ERRORCODE (from font-errors.dat) +ANSI_X3.4-1968 default8x16 1 +BIG5 default8x16 3 +BIG5-HKSCS default8x16 3 CP1251 cyr-sun16 -m cp1251 0 -CP1255 LatArCyrHeb-16 -m 8859-8 0 The "kbd" package does not support CP1255 encoding, using ISO-8859-8 instead. -EUC-JP default8x16 1 Japanese is not supported by this Live CD. Sorry. -EUC-KR default8x16 1 Korean is not supported by this Live CD. Sorry. -EUC-TW default8x16 1 Chinese is not supported by this Live CD. Sorry. -GB18030 default8x16 1 Chinese is not supported by this Live CD. Sorry. -GB2312 default8x16 1 Chinese is not supported by this Live CD. Sorry. -GBK default8x16 1 Chinese is not supported by this Live CD. Sorry. -GEORGIAN-PS default8x16 1 Georgian is not supported by this Live CD. Sorry. +CP1255 LatArCyrHeb-16 -m 8859-8 2 +EUC-JP default8x16 3 +EUC-KR default8x16 3 +EUC-TW default8x16 3 +GB18030 default8x16 3 +GB2312 default8x16 3 +GBK default8x16 3 +GEORGIAN-PS default8x16 4 ISO-8859-1 lat1-16 -m 8859-1 0 ISO-8859-2 lat2a-16 -m 8859-2 0 -ISO-8859-3 LatArCyrHeb-16 -m 8859-3 0 Bright colors are not available with this font. -ISO-8859-5 LatArCyrHeb-16 -m 8859-5 0 Bright colors are not available with this font. -ISO-8859-6 LatArCyrHeb-16 -m 8859-6 0 Bright colors are not available with this font. +ISO-8859-3 LatArCyrHeb-16 -m 8859-3 0 +ISO-8859-5 cyr-sun16 -m 8859-5 0 +ISO-8859-6 LatArCyrHeb-16 -m 8859-6 0 ISO-8859-7 iso07u-16 -m 8859-7 0 -ISO-8859-8 LatArCyrHeb-16 -m 8859-8 0 Bright colors are not available with this font. -ISO-8859-9 cp857.16 -u /usr/share/kbd/consoletrans/cp857_to_uni.trans -m 8859-9 0 -ISO-8859-10 LatArCyrHeb-16 -m 8859-10 0 Bright colors are not available with this font. -ISO-8859-13 LatArCyrHeb-16 -m 8859-13 0 Bright colors are not available with this font. -ISO-8859-14 default8x16 1 Welsh is not supported by this Live CD. Sorry. +ISO-8859-8 LatArCyrHeb-16 -m 8859-8 0 +ISO-8859-9 cp857.16 -u cp857 -m 8859-9 0 +ISO-8859-10 LatArCyrHeb-16 -m 8859-10 0 +ISO-8859-13 LatArCyrHeb-16 -m 8859-13 0 +ISO-8859-14 default8x16 3 ISO-8859-15 lat0-16 -m 8859-15 0 KOI8-R cyr-sun16 -m koi8-r 0 -KOI8-T cyr-sun16 -m koi8-r 0 The "kbd" package does not support KOI8-T encoding, using KOI8-R instead. +KOI8-T cyr-sun16 -m koi8-r 2 KOI8-U cyr-sun16 -m koi8-u 0 -PT154 cyr-sun16 -m cp1251 0 The "kbd" package does not support PT154 encoding, using CP1251 instead. -TIS-620 default8x16 1 Thai is not supported by this Live CD. Sorry. -UTF-8 LatArCyrHeb-16 0 +PT154 cyr-sun16 -m cp1251 2 +# FIXME: "tis-ptsmall.f16 -m tis620" may be more readable +TIS-620 tis-phaisarn.f16 -m tis620 0 +# This catches all essentially-UTF-8 scripts like Indic ones. +UTF-8 LatArCyrHeb-16 4 Modified: branches/utf8-newmake/packages/lfs-bootscripts/lang.dat =================================================================== --- branches/utf8-newmake/packages/lfs-bootscripts/lang.dat 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/lfs-bootscripts/lang.dat 2005-10-07 15:18:59 UTC (rev 894) @@ -1,61 +1,74 @@ -# DESCRIPTION LANG KEYMAP FONT LEGACY_CHARSET XKEYMAP -Default/Other C "" "" "" "en_US" -English,_USA_(ISO-8859-1) en_US "" "" "" "en_US" -English,_USA_(UTF-8) en_US.UTF-8 "" "" "iso-8859-1" "en_US" -English,_GB_(ISO-8859-1) en_GB "gb" "" "" "uk" -English,_GB_(UTF-8) en_GB.UTF-8 "gb" "" "iso-8859-1" "uk" -English,_Australia_(ISO-8859-1) en_AU "" "" "" "en_US" -English,_Australia_(UTF-8) en_AU.UTF-8 "" "" "iso-8859-1" "en_US" +# DESCRIPTION LANG KEYMAP LEGACY_CHARSET XKEYMAP +Default/Other C "" "" "en_US" +English,_USA_(ISO-8859-1) en_US "" "" "en_US" +English,_USA_(UTF-8) en_US.UTF-8 "" "iso-8859-1" "en_US" +English,_GB_(ISO-8859-1) en_GB "gb" "" "uk" +English,_GB_(UTF-8) en_GB.UTF-8 "gb" "iso-8859-1" "uk" +English,_Australia_(ISO-8859-1) en_AU "" "" "en_US" +English,_Australia_(UTF-8) en_AU.UTF-8 "" "iso-8859-1" "en_US" -Belarusian_(CP1251) be_BY "by2_win" "" "" "en_US,by(winkeys)" -Belarusian_(UTF-8) be_BY.UTF-8 "by" "" "iso-8859-5" "en_US,by(winkeys)" -Brazilian,_ABNT2_keymap_(ISO-8859-1) pt_BR "br-abnt2" "" "" "br-abnt2" -Brazilian,_ABNT2_keymap_(UTF-8) pt_BR.UTF-8 "br-abnt2" "" "iso-8859-1" "br-abnt2" -Bulgarian_(CP1251) bg_BG "bg_bds-cp1251" "" "" "en_US,bds_enhanced" -Bulgarian_(UTF-8) bg_BG.UTF-8 "bg_bds-utf8" "" "" "en_US,bds_enhanced" -French,_Canada_(ISO-8859-1) fr_CA "cf" "" "" "ca_enhanced" -French,_Canada_(UTF-8) fr_CA.UTF-8 "cf" "" "iso-8859-1" "ca_enhanced" -Czech_(ISO-8859-2) cs_CZ "cz" "" "" "cz" -Czech_(UTF-8) cs_CZ.UTF-8 "cz" "" "iso-8859-2" "cz" -Danish_(ISO-8859-1) da_DK "dk-latin1" "" "" "dk" -Danish_(UTF-8) da_DK.UTF-8 "dk-latin1" "" "iso-8859-1" "dk" -Finnish_(ISO-8859-1) fi_FI "fi-latin1" "" "" "fi" -Finnish_(ISO-8859-15) [EMAIL PROTECTED] "fi-latin9" "" "" "fi" -Finnish_(UTF-8) fi_FI.UTF-8 "fi-latin9" "" "iso-8859-15" "fi" -French_(ISO-8859-1) fr_FR "fr-latin1" "" "" "fr" -French_(ISO-8859-15) [EMAIL PROTECTED] "fr-latin9" "" "" "fr" -French_(UTF-8) fr_FR.UTF-8 "fr-latin9" "" "iso-8859-15" "fr" -German_(ISO-8859-1) de_DE "de-latin1" "" "" "de" -German_(ISO-8859-15) [EMAIL PROTECTED] "de-latin1+euro2" "" "" "de" -German_(UTF-8) de_DE.UTF-8 "de-latin1+euro2" "" "iso-8859-15" "de" -Greek_(ISO-8859-7) el_GR "gr" "" "" "en_US,el" -Greek_(UTF-8) el_GR.UTF-8 "gr" "iso07u-16" "iso-8859-7" "en_US,el" -Hungarian_(ISO-8859-2) hu_HU "hu101" "" "" "hu" -Hungarian_(UTF-8) hu_HU.UTF-8 "hu101" "" "iso-8859-2" "hu" -Icelandic_(ISO-8859-1) is_IS "is-latin1" "" "" "is" -Icelandic_(UTF-8) is_IS.UTF-8 "is-latin1" "" "iso-8859-1" "is" -Norwegian,_Bokmal_(ISO-8859-1) nb_NO "no-latin1" "" "" "no" -Norwegian,_Bokmal_(UTF-8) nb_NO.UTF-8 "no-latin1" "" "iso-8859-1" "no" -Norwegian,_Nynorsk_(ISO-8859-1) nn_NO "no-latin1" "" "" "no" -Norwegian,_Nynorsk_(UTF-8) nn_NO.UTF-8 "no-latin1" "" "iso-8859-1" "no" -Polish_(ISO-8859-2) pl_PL "pl" "" "" "pl2" -Polish_(UTF-8) pl_PL.UTF-8 "pl" "" "iso-8859-2" "pl2 -Portuguese_(ISO-8859-1) pt_PT "pt-latin1" "" "" "pt" -Portuguese_(ISO-8859-15) [EMAIL PROTECTED] "pt-latin9" "" "" "pt" -Portuguese_(UTF-8) pt_PT.UTF-8 "pt-latin9" "" "iso-8859-15" "pt" -Russian_(CP1251) ru_RU.CP1251 "ru_win" "" "" "en_US,ru(winkeys)" -Russian_(KOI8-R) ru_RU.KOI8-R "ru-ms" "" "" "en_US,ru(winkeys)" -Russian_(UTF-8) ru_RU.UTF-8 "ru-ms" "" "koi8-r" "en_US,ru(winkeys)" -Slovak,_QWERTZ_keyboard_(ISO-8859-2) sk_SK "sk-qwertz" "" "" "sk" -Slovak,_QWERTZ_keyboard_(UTF-8) sk_SK.UTF-8 "sk-qwertz" "" "iso-8859-2" "sk" -Slovak,_QWERTY_keyboard_(ISO-8859-2) sk_SK "sk-qwerty" "" "" "sk_qwerty" -Slovak,_QWERTY_keyboard_(UTF-8) sk_SK.UTF-8 "sk-qwerty" "" "iso-8859-2" "sk_qwerty" -Spanish_(ISO-8859-1) es_ES "es" "" "" "es" -Spanish_(ISO-8859-15) [EMAIL PROTECTED] "es+euro2" "" "" "es" -Spanish_(UTF-8) es_ES.UTF-8 "es+euro2" "" "iso-8859-15" "es" -Spanish,_Mexico_(ISO-8859-1) es_MX "la-latin1" "" "" "la" -Spanish,_Mexico_(UTF-8) es_MX.UTF-8 "la-latin1" "" "iso-8859-1" "la" -Swedish_(ISO-8859-1) sv_SE "sv-latin1" "" "" "se" -Swedish_(UTF-8) sv_SE.UTF-8 "sv-latin1" "" "iso-8859-1" "se" -Ukrainian_(KOI8-U) uk_UA "ua-ws" "" "" "en_US,ua(winkeys)" -Ukrainian_(UTF-8) uk_UA.UTF-8 "ua-utf-ws" "" "" "en_US,ua(winkeys)" +Belarusian_(CP1251) be_BY "by2_win" "" "en_US,by(winkeys)" +Belarusian_(UTF-8) be_BY.UTF-8 "by" "iso-8859-5" "en_US,by(winkeys)" +Brazilian,_ABNT2_keymap_(ISO-8859-1) pt_BR "br-abnt2" "" "br-abnt2" +Brazilian,_ABNT2_keymap_(UTF-8) pt_BR.UTF-8 "br-abnt2" "iso-8859-1" "br-abnt2" +Bulgarian_(CP1251) bg_BG "bg_bds-cp1251" "" "en_US,bds_enhanced" +Bulgarian_(UTF-8) bg_BG.UTF-8 "bg_bds-utf8" "" "en_US,bds_enhanced" +Chinese_(Traditional,_BIG5) zh_TW "" "" "en_US" +Chinese_(Traditional,_EUC-TW) zh_TW.EUC-TW "" "" "en_US" +Chinese_(Traditional,_UTF-8) zh_TW.UTF-8 "" "" "en_US" +Chinese_(Simplified,_GB2312) zh_CN "" "" "en_US" +Chinese_(Simplified,_GB18030) zh_CN.GB18030 "" "" "en_US" +Chinese_(Simplified,_GBK) zh_CN.GBK "" "" "en_US" +Chinese_(Simplified,_UTF-8) zh_CN.UTF-8 "" "" "en_US" +Czech_(ISO-8859-2) cs_CZ "cz" "" "cz" +Czech_(UTF-8) cs_CZ.UTF-8 "cz" "iso-8859-2" "cz" +Danish_(ISO-8859-1) da_DK "dk-latin1" "" "dk" +Danish_(UTF-8) da_DK.UTF-8 "dk-latin1" "iso-8859-1" "dk" +Finnish_(ISO-8859-1) fi_FI "fi-latin1" "" "fi" +Finnish_(ISO-8859-15) [EMAIL PROTECTED] "fi-latin9" "" "fi" +Finnish_(UTF-8) fi_FI.UTF-8 "fi-latin9" "iso-8859-15" "fi" +French_(ISO-8859-1) fr_FR "fr-latin1" "" "fr" +French_(ISO-8859-15) [EMAIL PROTECTED] "fr-latin9" "" "fr" +French_(UTF-8) fr_FR.UTF-8 "fr-latin9" "iso-8859-15" "fr" +French_(Canada,_ISO-8859-1) fr_CA "cf" "" "ca_enhanced" +French_(Canada,_UTF-8) fr_CA.UTF-8 "cf" "iso-8859-1" "ca_enhanced" +German_(ISO-8859-1) de_DE "de-latin1" "" "de" +German_(ISO-8859-15) [EMAIL PROTECTED] "de-latin1+euro2" "" "de" +German_(UTF-8) de_DE.UTF-8 "de-latin1+euro2" "iso-8859-15" "de" +Greek_(ISO-8859-7) el_GR "gr" "" "en_US,el" +Greek_(UTF-8) el_GR.UTF-8 "gr" "iso-8859-7" "en_US,el" +Hungarian_(ISO-8859-2) hu_HU "hu101" "" "hu" +Hungarian_(UTF-8) hu_HU.UTF-8 "hu101" "iso-8859-2" "hu" +Icelandic_(ISO-8859-1) is_IS "is-latin1" "" "is" +Icelandic_(UTF-8) is_IS.UTF-8 "is-latin1" "iso-8859-1" "is" +Japanese_(EUC-JP) ja_JP "" "" "en_US" +Japanese_(UTF-8) ja_JP.UTF-8 "" "" "en_US" +Korean_(EUC-KR) ko_KR "" "" "en_US" +Korean_(UTF-8) ko_KR.UTF-8 "" "" "en_US" +Norwegian,_Bokmal_(ISO-8859-1) nb_NO "no-latin1" "" "no" +Norwegian,_Bokmal_(UTF-8) nb_NO.UTF-8 "no-latin1" "iso-8859-1" "no" +Norwegian,_Nynorsk_(ISO-8859-1) nn_NO "no-latin1" "" "no" +Norwegian,_Nynorsk_(UTF-8) nn_NO.UTF-8 "no-latin1" "iso-8859-1" "no" +Polish_(ISO-8859-2) pl_PL "pl" "" "pl2" +Polish_(UTF-8) pl_PL.UTF-8 "pl" "iso-8859-2" "pl2 +Portuguese_(ISO-8859-1) pt_PT "pt-latin1" "" "pt" +Portuguese_(ISO-8859-15) [EMAIL PROTECTED] "pt-latin9" "" "pt" +Portuguese_(UTF-8) pt_PT.UTF-8 "pt-latin9" "iso-8859-15" "pt" +Russian_(CP1251) ru_RU.CP1251 "ru_win" "" "en_US,ru(winkeys)" +Russian_(KOI8-R) ru_RU.KOI8-R "ru-ms" "" "en_US,ru(winkeys)" +Russian_(UTF-8) ru_RU.UTF-8 "ru-ms" "koi8-r" "en_US,ru(winkeys)" +Slovak,_QWERTZ_keyboard_(ISO-8859-2) sk_SK "sk-qwertz" "" "sk" +Slovak,_QWERTZ_keyboard_(UTF-8) sk_SK.UTF-8 "sk-qwertz" "iso-8859-2" "sk" +Slovak,_QWERTY_keyboard_(ISO-8859-2) sk_SK "sk-qwerty" "" "sk_qwerty" +Slovak,_QWERTY_keyboard_(UTF-8) sk_SK.UTF-8 "sk-qwerty" "iso-8859-2" "sk_qwerty" +Spanish_(ISO-8859-1) es_ES "es" "" "es" +Spanish_(ISO-8859-15) [EMAIL PROTECTED] "es+euro2" "" "es" +Spanish_(UTF-8) es_ES.UTF-8 "es+euro2" "iso-8859-15" "es" +Spanish,_Mexico_(ISO-8859-1) es_MX "la-latin1" "" "la" +Spanish,_Mexico_(UTF-8) es_MX.UTF-8 "la-latin1" "iso-8859-1" "la" +Swedish_(ISO-8859-1) sv_SE "sv-latin1" "" "se" +Swedish_(UTF-8) sv_SE.UTF-8 "sv-latin1" "iso-8859-1" "se" +Thai_(TIS-620) th_TH "th-win-latin1" "" "en_US,th" +Thai_(UTF-8) th_TH.UTF-8 "th-win-uni" "" "en_US,th" +Ukrainian_(KOI8-U) uk_UA "ua-ws" "" "en_US,ua(winkeys)" +Ukrainian_(UTF-8) uk_UA.UTF-8 "ua-utf-ws" "" "en_US,ua(winkeys)" Modified: branches/utf8-newmake/packages/lfs-bootscripts/langconf =================================================================== --- branches/utf8-newmake/packages/lfs-bootscripts/langconf 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/lfs-bootscripts/langconf 2005-10-07 15:18:59 UTC (rev 894) @@ -16,7 +16,10 @@ DATABASE=/etc/langconf/lang.dat FONTDB=/etc/langconf/font.dat +ERRDB=/etc/langconf/font-errors.dat +F_ERROR=0 + same_locale() { for term in language territory charmap do @@ -26,24 +29,27 @@ } guess_selection() { - while read F_DESCRIPTION F_LANG F_KEYMAP F_FONT F_LEGACYCHARSET F_XKEYMAP + while read F_DESCRIPTION F_LANG F_KEYMAP F_LEGACYCHARSET F_XKEYMAP do if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ] then continue fi F_KEYMAP="${F_KEYMAP//\"/}" - F_FONT="${F_FONT//\"/}" F_LEGACYCHARSET="${F_LEGACYCHARSET//\"/}" F_XKEYMAP="${F_XKEYMAP//\"/}" same_locale "$F_LANG" "$LANG" && SELECTED="$F_DESCRIPTION" && return 0 done <$DATABASE - exit 1 + F_LANG="$LANG" + F_KEYMAP=defkeymap + F_LEGACYCHARSET="" + F_XKEYMAP="en_US" + return 1 } get_selection_dlg() { ARGS="" - while read F_DESCRIPTION F_LANG F_KEYMAP F_FONT F_LEGACYCHARSET F_XKEYMAP + while read F_DESCRIPTION F_JUNK do if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ] then @@ -54,7 +60,7 @@ done <$DATABASE DLG_COMMAND="dialog --title \"Regional settings\" --timeout 20 \ --default-item \"Default/Other\" \ - --menu \"Choose your locale and keymap\" -1 0 0 $ARGS" + --menu \"Choose your locale\" -1 0 0 $ARGS" SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3` if [ $? -ne 0 ] ; then @@ -63,22 +69,29 @@ } guess_font() { - F_CHARMAP=`LC_ALL=$F_LANG locale charmap` - while IFS=" " read CHARMAP FONT ERROR CAVEAT + # Select font that has all characters in the language + # Base the selection on the language's non-UTF-8 locale charmap + F_CHARMAP=`LC_ALL=${F_LANG%.UTF-8} locale charmap` + while IFS=" " read CHARMAP FONT ERROR do if [ "$F_CHARMAP" = "$CHARMAP" ] then F_FONT="$FONT" - if [ "$ERROR" = "1" ] + F_ERROR="$ERROR" + if [ "$F_ERROR" != "0" ] then - echo ERROR: + echo -e `sed -n "${F_ERROR}p" $ERRDB` + sleep 5 fi - if [ -n "$CAVEAT" ] - then - echo $CAVEAT - fi fi done <$FONTDB + + # If UTF-8 locale is used, drop any "-m" flag + case "$F_LANG" in + *.UTF-8) + F_FONT=${F_FONT% -m*} + ;; + esac } confirm() { @@ -91,7 +104,9 @@ \n\nKeymap autoconversion is used only together with UTF-8 locales. If you don't need to convert your keymap to UTF-8 (e.g. because it is already in UTF-8, or because you don't want UTF-8), don't fill in -that field.\" 0 0 5 \ +that field. +\n\nIn order to enhance Unicode coverage of the Linux console at the +cost of unavailable bright colors, use the LatArCyrHeb-16 font.\" 0 0 5 \ \"Locale:\" 1 1 \"$F_LANG\" 1 30 40 0 \ \"Console keymap:\" 2 1 \"$F_KEYMAP\" 2 30 40 0 \ \" autoconverted from charset:\" 3 1 \"$F_LEGACYCHARSET\" 3 30 40 0 \ @@ -117,11 +132,10 @@ sed -e '1d' \ -e '2s,^,F_LANG=",' \ -e '3s,^,F_KEYMAP=",' \ - -e '4s,^,F_FONT=",' \ - -e '5s,^,F_LEGACYCHARSET=",' \ - -e '6s,^,F_XKEYMAP=",' | sed -e 's,$,",'`" + -e '4s,^,F_LEGACYCHARSET=",' \ + -e '5s,^,F_XKEYMAP=",' | sed -e 's,$,",'`" [ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap - [ -z "$F_FONT" ] && guess_font + guess_font [ -z "$F_XKEYMAP" ] && F_XKEYMAP=us confirm } @@ -129,9 +143,9 @@ noninteractive_config() { guess_selection F_LANG="$LANG" + guess_font # Accept overrides to our guesses if given on the command line [ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap - [ -z "$F_FONT" ] && guess_font [ -z "$F_XKEYMAP" ] && F_XKEYMAP=us [ -n "$KEYMAP" ] && F_KEYMAP=${KEYMAP//+/ } [ -n "$FONT" ] && F_FONT=${FONT//+/ } @@ -168,3 +182,9 @@ fi sed -i "s/\"en_US\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf + +if [ "$F_ERROR" = "3" ] +then + echo '[ "$TERM" = "linux" ] && LC_ALL=C' >>/etc/profile + echo 'export LC_ALL' >>/etc/profile +fi Modified: branches/utf8-newmake/packages/scim-tables/Makefile =================================================================== --- branches/utf8-newmake/packages/scim-tables/Makefile 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/scim-tables/Makefile 2005-10-07 15:18:59 UTC (rev 894) @@ -8,6 +8,10 @@ URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/scim/$(FILE) SHA-$(FILE)= aab123b59e4047caf7cf65589c2fef907899325f +# Strictly speaking, not needed: Thai is already supported via XKB +FILE1= Thai.png +PATCH1= thai-table.patch + # Targets include $(ROOT)/scripts/functions @@ -16,10 +20,13 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(PATCH1) +stage2: Makefile $(FILE) $(std_build) compile-stage2: + cp ../$(FILE1) icons + patch -Np1 -i ../$(PATCH1) + autoreconf -i ./configure --prefix=/usr --sysconfdir=/etc make $(PM) make install Added: branches/utf8-newmake/packages/scim-tables/Thai.png =================================================================== (Binary files differ) Property changes on: branches/utf8-newmake/packages/scim-tables/Thai.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/utf8-newmake/packages/scim-tables/thai-table.patch =================================================================== --- branches/utf8-newmake/packages/scim-tables/thai-table.patch 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/packages/scim-tables/thai-table.patch 2005-10-07 15:18:59 UTC (rev 894) @@ -0,0 +1,248 @@ +Origin: http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/scim-tables/thai-table.patch +--- scim-tables-0.5.3/configure.ac~ 2005-09-06 18:17:52.000000000 +0900 ++++ scim-tables-0.5.3/configure.ac 2005-09-08 19:52:58.000000000 +0900 +@@ -160,6 +160,7 @@ + additional/Arabic.txt + additional/Danish.txt + additional/LaTeX.txt ++ additional/Thai.txt + additional/Viqr.txt + additional/Yawerty.txt + additional/IPA-X-SAMPA.txt +--- scim-tables-0.5.3/additional/Makefile.am~ 2005-09-06 18:17:52.000000000 +0900 ++++ scim-tables-0.5.3/additional/Makefile.am 2005-09-08 20:05:30.000000000 +0900 +@@ -21,6 +21,7 @@ + Arabic.txt.in \ + Danish.txt.in \ + LaTeX.txt.in \ ++ Thai.txt.in \ + Viqr.txt.in \ + Yawerty.txt.in \ + IPA-X-SAMPA.txt.in +@@ -29,6 +30,7 @@ + Arabic.txt \ + Danish.txt \ + LaTeX.txt \ ++ Thai.txt \ + Viqr.txt \ + Yawerty.txt \ + IPA-X-SAMPA.txt +@@ -38,6 +40,7 @@ + Arabic.bin \ + Danish.bin \ + LaTeX.bin \ ++ Thai.bin \ + Viqr.bin \ + Yawerty.bin \ + IPA-X-SAMPA.bin +--- scim-tables-0.5.3/additional/Thai.txt.in~ 2005-09-09 09:36:42.000000000 +0900 ++++ scim-tables-0.5.3/additional/Thai.txt.in 2005-09-09 09:37:28.000000000 +0900 +@@ -0,0 +1,198 @@ ++### File header must not be modified ++### This file must be encoded into UTF-8. ++### Derived from th-kesmanee.mim table in m17n-db. ++SCIM_Generic_Table_Phrase_Library_TEXT ++VERSION_1_0 ++ ++### Begin Table definition. ++BEGIN_DEFINITION ++ ++### An unique id to distinguish this table among others. ++### Use uuidgen to generate this kind of id. ++UUID = d63402a2-2268-44fc-b415-99eb2276ff7b ++ ++### A unique number indicates the version of this file. ++### For example the last modified date of this file. ++### This number must be less than 2^32. ++SERIAL_NUMBER = 20050908 ++ ++ICON = @SCIM_ICONDIR@/Thai.png ++ ++### The default name of this table ++NAME = Thai ++ ++### Author of this table ++AUTHOR = Jens Petersen <[EMAIL PROTECTED]> ++ ++### Supported locales of this table ++LANGUAGES = th ++ ++### Prompt string to be displayed in the status area. ++STATUS_PROMPT = Th ++ ++### If true then the first candidate phrase ++### will be selected automatically during inputing. ++AUTO_SELECT = TRUE ++ ++### If true then a multi wildcard will be appended ++### at the end of inputting string automatically. ++AUTO_WILDCARD = FALSE ++ ++### If true then the result string will be committed to client automatically. ++### This should be used with AUTO_SELECT = TRUE. ++AUTO_COMMIT = TRUE ++ ++### If true then the inputted string will be automatically splitted during inputing. ++AUTO_SPLIT = TRUE ++ ++### If true then the phrases' frequencies will be adjusted dynamically. ++DYNAMIC_ADJUST = FALSE ++ ++### If true then the preedit area will be filled up by the current candidate phrase automatically. ++AUTO_FILL = TRUE ++ ++### If true then the lookup table will always be shown if there is any candidate phrase. ++### Otherwise the lookup table won't be shown unless the user requires it by moving the preedit caret left. ++ALWAYS_SHOW_LOOKUP = FALSE ++ ++### Enable full width punctuation property ++USE_FULL_WIDTH_PUNCT = FALSE ++ ++### Use full width punctuation by default ++DEF_FULL_WIDTH_PUNCT = FALSE ++ ++### Enable full width letter property ++USE_FULL_WIDTH_LETTER = FALSE ++ ++### Use full width letter by default ++DEF_FULL_WIDTH_LETTER = FALSE ++ ++### The maxmium length of a key. ++MAX_KEY_LENGTH = 1 ++ ++### Valid input chars. ++VALID_INPUT_CHARS = !"#$%&'()*+,-./0123456789:;<=>[EMAIL PROTECTED]|}~ ++ ++### Single wildcard char, can have multiple chars. ++###SINGLE_WILDCARD_CHAR = ? ++ ++### Multi wildcard char. ++###MULTI_WILDCARD_CHAR = * ++ ++### The key strokes to split inputted string. ++### SPLIT_KEYS = quoteright ++ ++### The key strokes to commit the convert result to client. ++COMMIT_KEYS = VoidSymbol ++ ++### The key strokes to forward the inputted string to client. ++FORWARD_KEYS = VoidSymbol ++ ++### The key strokes to select candidiate phrases. ++SELECT_KEYS = VoidSymbol ++ ++### The key strokes to page up the lookup table. ++PAGE_UP_KEYS = VoidSymbol ++ ++### The key strokes to page down the lookup table. ++PAGE_DOWN_KEYS = VoidSymbol ++ ++END_DEFINITION ++ ++### Begin Table data. ++BEGIN_TABLE ++! # ++" ฦ ++# ๒ ++$ ๓ ++% ๔ ++& ั้ ++' ง ++( ๖ ++) ๗ ++* ๕ +++ ๙ ++, ม ++- ข ++. ใ ++/ ฝ ++0 จ ++1 ล ++2 / ++3 _ ++4 ภ ++5 ถ ++6 ุ ++7 ึ ++8 ค ++9 ต ++: ซ ++; ว ++< ฒ ++= ช ++> ฬ ++? ฦ ++@ ๑ ++A ฤ ++B ฺ ++C ฉ ++D ฏ ++E ฎ ++F โ ++G ฌ ++H ็ ++I ณ ++J ๋ ++K ษ ++L ศ ++M ๎ ++N ์ ++O ฯ ++P ญ ++Q ๐ ++R ฑ ++S ฆ ++T ธ ++U ๊ ++V ฮ ++W " ++X ) ++Y ํ ++Z ( ++[ บ ++\ ฿ ++] ล ++^ ู ++_ ๘ ++` ฃ ++a ฟ ++b ิ ++c แ ++d ก ++e ำ ++f ด ++g เ ++h ้ ++i ร ++j ่ ++k า ++l ส ++m ท ++n ื ++o น ++p ย ++q ๆ ++r พ ++s ห ++t ะ ++u ี ++v อ ++w ไ ++x ป ++y ั ++z ผ ++{ ฐ ++| ๏ ++} . ++~ ฅ ++END_TABLE +--- scim-tables-0.5.3/icons/Makefile.am~ 2005-09-15 16:33:35.000000000 +0900 ++++ scim-tables-0.5.3/icons/Makefile.am 2005-09-15 16:33:35.000000000 +0900 +@@ -57,6 +57,7 @@ + Nepali.png \ + Nippon.png \ + Simplex.png \ ++ Thai.png \ + Viqr.png \ + Wu.png \ + Wubi.png \ Modified: branches/utf8-newmake/root/.xinitrc =================================================================== --- branches/utf8-newmake/root/.xinitrc 2005-10-07 15:17:36 UTC (rev 893) +++ branches/utf8-newmake/root/.xinitrc 2005-10-07 15:18:59 UTC (rev 894) @@ -1,2 +1,6 @@ +# For languages that can't be displayed on Linux console, we have, e.g.: +# LC_ALL=C, LANG=zh_CN.UTF-8 +# Remove LC_ALL now so that LANG takes effect +unset LC_ALL scim -d exec startxfce4 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
