Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Generate oldschool Latin-1 variants of Spleen fonts.



details:   https://anonhg.NetBSD.org/src/rev/894447610124
branches:  trunk
changeset: 977008:894447610124
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Oct 11 17:49:07 2020 +0000

description:
Generate oldschool Latin-1 variants of Spleen fonts.

Needed so ctwm can load them. ctwm uses XCreateFontSet which for some
reason seems adverse to returning UTF-8 fonts...

diffstat:

 distrib/sets/lists/xfont/mi                                  |   8 +++++++-
 external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile |  12 +++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r ee6d67264705 -r 894447610124 distrib/sets/lists/xfont/mi
--- a/distrib/sets/lists/xfont/mi       Sun Oct 11 17:18:34 2020 +0000
+++ b/distrib/sets/lists/xfont/mi       Sun Oct 11 17:49:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.43 2020/10/10 08:33:29 nia Exp $
+# $NetBSD: mi,v 1.44 2020/10/11 17:49:07 nia Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4321,11 +4321,17 @@
 ./usr/X11R7/lib/X11/fonts/misc/k14.pcf.gz              xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/nil2.pcf.gz             xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-12x24.pcf.gz     xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-12x24-ISO8859-1.pcf.gz   xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-16x32.pcf.gz     xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-16x32-ISO8859-1.pcf.gz   xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-32x64.pcf.gz     xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-32x64-ISO8859-1.pcf.gz   xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-5x8.pcf.gz       xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-5x8-ISO8859-1.pcf.gz     xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-6x12.pcf.gz      xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-6x12-ISO8859-1.pcf.gz    xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/spleen-8x16.pcf.gz      xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-8x16-ISO8859-1.pcf.gz    xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/util/map-ISO8859-1           xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/util/map-ISO8859-10          xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/util/map-ISO8859-11          xfont   share,xorg,x11fonts
diff -r ee6d67264705 -r 894447610124 external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile
--- a/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile      Sun Oct 11 17:18:34 2020 +0000
+++ b/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile      Sun Oct 11 17:49:07 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/10/10 07:28:04 nia Exp $
+#      $NetBSD: Makefile,v 1.2 2020/10/11 17:49:08 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -8,12 +8,10 @@
 X11SRCDIR.font-spleen-misc= \
        ${X11SRCDIR}/external/bsd/${FONTSRCPKG}
 
-BDFFILES+=     spleen-12x24.bdf
-BDFFILES+=     spleen-16x32.bdf
-BDFFILES+=     spleen-32x64.bdf
-BDFFILES+=     spleen-5x8.bdf
-BDFFILES+=     spleen-6x12.bdf
-BDFFILES+=     spleen-8x16.bdf
+.for size in 32x64 16x32 12x24 8x16 6x12 5x8
+BDFFILES+=     spleen-${size}.bdf
+UCSFILES+=     spleen-${size} ISO8859-1
+.endfor
 
 .include "../../Makefile.bdf"
 



Home | Main Index | Thread Index | Old Index