From: Rudolf Polzer Date: Mon, 3 Aug 2015 16:14:34 +0000 (+0000) Subject: Merge branch 'sev/unifont_update' into 'master' X-Git-Tag: xonotic-v0.8.1~4 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=611be7dbdb01ee7206e1e52dba0c54596c76a92f;hp=737b6e2b75fae9b158cfb064d71a980be1c3004d Merge branch 'sev/unifont_update' into 'master' Unifont update This branch updates the GNU Unifont from version 5.1 to version 7.0.06. It also makes two changes which I consider useful: - Remove the version string from the font file name. This way, any future updates will not invalidate all references to the font. A problem that is illustrated with this update. - Move the Unifont to a dedicated package. Currently, individual copies are added to the other font packages. This causes a lot of redundancy. More importantly, it gives the impression that this is necessary for custom fonts as well, causing more redundancy and inconsistencies if the unifont is shared in custom font pk3 archives. This change also eliminates possible confusions about authorship of the fonts. See merge request !7 --- diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg index 11f25d90..8922ca09 100644 --- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg +++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg @@ -1,12 +1,12 @@ // must be loaded AFTER config.cfg set menu_font_cfg font-nimbussansl.cfg -loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize -loadfont notify fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize -loadfont chat fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize -loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9 -loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height -loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // menu font -loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font -loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc boldfont -loadfont user3 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12 16 // menu boldfont +loadfont console fonts/unifont,gfx/vera-sans $con_textsize +loadfont notify fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans $con_notifysize +loadfont chat fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans $con_chatsize +loadfont centerprint fonts/unifont,gfx/vera-sans 9 +loadfont infobar fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height +loadfont user0 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 12 // menu font +loadfont user1 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font +loadfont user2 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc boldfont +loadfont user3 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 12 16 // menu boldfont scoreboard_columns_set diff --git a/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf b/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf deleted file mode 100644 index ecc911d3..00000000 Binary files a/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf and /dev/null differ diff --git a/data/font-unifont.pk3dir/fonts/README b/data/font-unifont.pk3dir/fonts/README new file mode 100644 index 00000000..c0867d64 --- /dev/null +++ b/data/font-unifont.pk3dir/fonts/README @@ -0,0 +1,2 @@ +GNU Unifont 7.0.06 +http://unifoundry.com/unifont.html diff --git a/data/font-unifont.pk3dir/fonts/unifont.ttf b/data/font-unifont.pk3dir/fonts/unifont.ttf new file mode 100644 index 00000000..cefc731e Binary files /dev/null and b/data/font-unifont.pk3dir/fonts/unifont.ttf differ diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg index 81940ad2..2f98e326 100644 --- a/data/font-xolonium.pk3dir/font-xolonium.cfg +++ b/data/font-xolonium.pk3dir/font-xolonium.cfg @@ -1,12 +1,12 @@ // must be loaded AFTER config.cfg set menu_font_cfg font-xolonium.cfg -loadfont console fonts/unifont-5.1.20080907,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize -loadfont notify fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize -loadfont chat fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize -loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9 -loadfont infobar fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height -loadfont user0 fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // menu font -loadfont user1 fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font -loadfont user2 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font -loadfont user3 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12 16 // menu boldfont +loadfont console fonts/unifont,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize +loadfont notify fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_notifysize +loadfont chat fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_chatsize +loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 9 +loadfont infobar fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height +loadfont user0 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 12 // menu font +loadfont user1 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font +loadfont user2 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font +loadfont user3 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 12 16 // menu boldfont scoreboard_columns_set diff --git a/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf b/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf deleted file mode 100644 index ecc911d3..00000000 Binary files a/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf and /dev/null differ diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index cb6ec826..7cc8c639 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -486,6 +486,7 @@ case "$cmd" in ;; release-pack) release_common + verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir raw '' verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir low '-low' normaldds '' normal '-high' verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir low '-low' normaldds '' mapping '-mapping' normal '-high' @@ -533,6 +534,7 @@ case "$cmd" in Xonotic/gmqcc \ Xonotic/server \ Xonotic/key_0.d0pk \ + Xonotic/data/font-unifont-$pk3stamp.pk3 \ Xonotic/data/font-xolonium-$pk3stamp.pk3 verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip verbose mkzip Xonotic-$stamp-source$suffix.zip \ diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff index 564fa413..ad2ffa61 100755 --- a/misc/tools/xzipdiff +++ b/misc/tools/xzipdiff @@ -18,6 +18,7 @@ excludes=" Xonotic/data/xonotic-*-maps-low.pk3 Xonotic/data/xonotic-*-music-low.pk3 Xonotic/data/font-nimbussansl-*.pk3 + Xonotic/data/font-unifont-*.pk3 Xonotic/data/font-xolonium-*.pk3 "