Author: alexander
Date: 2006-01-07 23:55:32 -0700 (Sat, 07 Jan 2006)
New Revision: 1342
Added:
trunk/packages/fonts-firefly/
trunk/packages/fonts-firefly/Makefile
Removed:
trunk/packages/fonts-arphic/
Modified:
trunk/Makefile
trunk/doc/README
trunk/etc/fonts/local.conf
trunk/packages/Xorg-modular/Makefile
trunk/packages/fontconfig/Makefile
Log:
Replaced Arphic fonts with a single "AR PL New Sung" font from FireFly.
This reduces the CD size and finally fixes the "Chinese font tough on eyes" bug.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-01-07 13:47:39 UTC (rev 1341)
+++ trunk/Makefile 2006-01-08 06:55:32 UTC (rev 1342)
@@ -267,7 +267,7 @@
ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
ch-fontconfig ch-Xorg-modular ch-freefont ch-inputattach
ch-fonts-dejavu \
- ch-fonts-kochi ch-fonts-arphic ch-fonts-baekmuk ch-libjpeg ch-libtiff
ch-libart_lgpl \
+ ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk ch-libjpeg ch-libtiff
ch-libart_lgpl \
ch-openssh ch-glib2 ch-libungif ch-imlib ch-imlib2 \
ch-gc ch-w3m ch-cairo \
ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox \
Modified: trunk/doc/README
===================================================================
--- trunk/doc/README 2006-01-07 13:47:39 UTC (rev 1341)
+++ trunk/doc/README 2006-01-08 06:55:32 UTC (rev 1342)
@@ -182,17 +182,17 @@
use these fonts.
Use of this LiveCD with Chinese, Japanese or Korean language requires that
-your monitor has at least 96 pixels per inch in order for hieroglyphs to
+your monitor has at least 80 pixels per inch in order for hieroglyphs to
be recognizable (i.e., at least 12 pixels high). This means the following
minimum resolution:
- 15" => 1152x864
- 17" => 1280x1024
- 19" => 1400x1050
- 20" => 1600x1200
+ 15" => 1024x768
+ 17" => 1024x768
+ 19" => 1280x1024
+ 20" => 1280x1024
If your monitor cannot handle such resolution, edit the
-/etc/X11/xinit/xserverrc file with vim, nano or joe, and add the -dpi 96
+/etc/X11/xinit/xserverrc file with vim, nano or joe, and add the -dpi 94
parameter to the X server command line there.
THANKS
Modified: trunk/etc/fonts/local.conf
===================================================================
--- trunk/etc/fonts/local.conf 2006-01-07 13:47:39 UTC (rev 1341)
+++ trunk/etc/fonts/local.conf 2006-01-08 06:55:32 UTC (rev 1342)
@@ -7,6 +7,18 @@
<match target="font">
<edit name="autohint" mode="assign"><bool>true</bool></edit>
</match>
+<!-- Use the embedded bitmaps in the AR PL New Sung font when appropriate -->
+ <match target="font">
+ <test name="family">
+ <string>AR PL New Sung</string>
+ </test>
+ <test name="pixelsize" compare="less_eq">
+ <double>16.0</double>
+ </test>
+ <edit name="antialias" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
<!--
Enable sub-pixel rendering
<match target="font">
Modified: trunk/packages/Xorg-modular/Makefile
===================================================================
--- trunk/packages/Xorg-modular/Makefile 2006-01-07 13:47:39 UTC (rev
1341)
+++ trunk/packages/Xorg-modular/Makefile 2006-01-08 06:55:32 UTC (rev
1342)
@@ -154,7 +154,6 @@
./configure --help
./configure --prefix=/usr --localstatedir=/var $(EXTRA_FLAGS-$*)
make $(PM)
- make DESTDIR=$(ROOT)/debug/$* install
make install
compile-y-mesa:
@@ -171,9 +170,9 @@
autoreconf --force --install --verbose
# Fix build failure
sed -i -e '1i#include <linux/types.h>'
hw/xfree86/os-support/linux/lnx_agp.c
- # 96 dpi is more appropriate for today's displays as a guess
+ # 94 dpi is more appropriate for today's displays as a guess
# and still allows Terminal to fit into 800x600
- sed -i -e '/DPI/s,75,96,' hw/xfree86/common/xf86Priv.h hw/dmx/dmxinit.c
+ sed -i -e '/DPI/s,75,94,' hw/xfree86/common/xf86Priv.h hw/dmx/dmxinit.c
# Allow the use of builtin fonts from libXfont.so
sed -i -e 's,#ifdef KDRIVESERVER,#if 1,' dix/dixfonts.c
./configure --prefix=/usr --localstatedir=/var
--with-mesa-source=`pwd`/$(DIR2) --with-default-font-path=built-ins
Modified: trunk/packages/fontconfig/Makefile
===================================================================
--- trunk/packages/fontconfig/Makefile 2006-01-07 13:47:39 UTC (rev 1341)
+++ trunk/packages/fontconfig/Makefile 2006-01-08 06:55:32 UTC (rev 1342)
@@ -24,6 +24,7 @@
make $(PM)
make install
sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf
+ sed -i -e 's,^\(\t\t\t<family>Kochi.*\)$$,\1\n\t\t\t<family>AR PL New
Sung</family>,' /etc/fonts/fonts.conf
# UGLY HACK BELOW. Remove when Greek is supported in DejaVu Sans Mono.
# Needed in order to avoid fallback to (ugly) FreeMono in Terminal.
sed -i -e '/prefer/,+2s,^\(.*Sans\) Mono\(.*$$\),&\n\1\2,'
/etc/fonts/fonts.conf
Added: trunk/packages/fonts-firefly/Makefile
===================================================================
--- trunk/packages/fonts-firefly/Makefile 2006-01-07 13:47:39 UTC (rev
1341)
+++ trunk/packages/fonts-firefly/Makefile 2006-01-08 06:55:32 UTC (rev
1342)
@@ -0,0 +1,29 @@
+# FireFly fonts Makefile
+
+NM= fireflysung
+VRS= 1.3.0
+DIR= $(NM)-$(VRS)
+LOCATION= /usr/share/fonts
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://cle.linux.org.tw/fonts/FireFly/$(FILE)
+SHA-$(FILE)= a513386c18257febcbedb72b7a4e4aa21e930002
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ cp -v ./*.ttf $(LOCATION)
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
