terminus-4.40-alt-cp866 --- terminus-font/Makefile | 20 ++++++++++++++------ terminus-font/README | 5 +++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/terminus-font/Makefile b/terminus-font/Makefile index 55fed41..f639df1 100644 --- a/terminus-font/Makefile +++ b/terminus-font/Makefile @@ -20,6 +20,7 @@ REG_8859_15 = ISO8859 15 REG_8859_16 = ISO8859 16 REG_MS_1255 = Microsoft CP1255 REG_IBM_437 = IBM CP437 +REG_IBM_866 = IBM CP866 REG_KOI8_R = KOI8 R REG_KOI8_U = KOI8 U REG_BG_MIK = Bulgarian MIK @@ -36,6 +37,7 @@ PSF_8859_13 = ter-d12n.psf ter-d14n.psf ter-d14b.psf ter-d16n.psf ter-d16b.psf t PSF_8859_16 = ter-g12n.psf ter-g14n.psf ter-g14b.psf ter-g16n.psf ter-g16b.psf ter-g18n.psf ter-g18b.psf ter-g20n.psf ter-g20b.psf ter-g22n.psf ter-g22b.psf ter-g24n.psf ter-g24b.psf ter-g28n.psf ter-g28b.psf ter-g32n.psf ter-g32b.psf PSF_MS_1255 = ter-h12n.psf ter-h14n.psf ter-h14b.psf ter-h16n.psf ter-h16b.psf ter-h18n.psf ter-h18b.psf ter-h20n.psf ter-h20b.psf ter-h22n.psf ter-h22b.psf ter-h24n.psf ter-h24b.psf ter-h28n.psf ter-h28b.psf ter-h32n.psf ter-h32b.psf PSF_IBM_437 = ter-i12n.psf ter-i14n.psf ter-i14b.psf ter-i16n.psf ter-i16b.psf ter-i18n.psf ter-i18b.psf ter-i20n.psf ter-i20b.psf ter-i22n.psf ter-i22b.psf ter-i24n.psf ter-i24b.psf ter-i28n.psf ter-i28b.psf ter-i32n.psf ter-i32b.psf +PSF_IBM_866 = ter-a12n.psf ter-a14n.psf ter-a14b.psf ter-a14v.psf ter-a16n.psf ter-a16b.psf ter-a16v.psf ter-a18n.psf ter-a18b.psf ter-a20n.psf ter-a20b.psf ter-a22n.psf ter-a22b.psf ter-a24n.psf ter-a24b.psf ter-a28n.psf ter-a28b.psf ter-a32n.psf ter-a32b.psf PSF_KOI8_RV = ter-k14n.psf ter-k14b.psf ter-k16n.psf ter-k16b.psf PSF_KOI8_R = ter-k12n.psf ter-k18n.psf ter-k18b.psf ter-k20n.psf ter-k20b.psf ter-k22n.psf ter-k22b.psf ter-k24n.psf ter-k24b.psf ter-k28n.psf ter-k28b.psf ter-k32n.psf ter-k32b.psf PSF_BG_MIK = ter-m12n.psf ter-m14n.psf ter-m14b.psf ter-m16n.psf ter-m16b.psf ter-m18n.psf ter-m18b.psf ter-m20n.psf ter-m20b.psf ter-m22n.psf ter-m22b.psf ter-m24n.psf ter-m24b.psf ter-m28n.psf ter-m28b.psf ter-m32n.psf ter-m32b.psf @@ -43,7 +45,7 @@ PSF_PT_154 = ter-p12n.psf ter-p14n.psf ter-p14b.psf ter-p16n.psf ter-p16b.psf t PSF_KOI8_UV = ter-u14n.psf ter-u14b.psf ter-u16n.psf ter-u16b.psf PSF_KOI8_U = ter-u12n.psf ter-u18n.psf ter-u18b.psf ter-u20n.psf ter-u20b.psf ter-u22n.psf ter-u22b.psf ter-u24n.psf ter-u24b.psf ter-u28n.psf ter-u28b.psf ter-u32n.psf ter-u32b.psf PSF_XOS4_2 = ter-v12n.psf ter-v14n.psf ter-v14b.psf ter-v16n.psf ter-v16b.psf ter-v18n.psf ter-v18b.psf ter-v20n.psf ter-v20b.psf ter-v22n.psf ter-v22b.psf ter-v24n.psf ter-v24b.psf ter-v28n.psf ter-v28b.psf ter-v32n.psf ter-v32b.psf -PSF = $(PSF_8859_1) $(PSF_8859_2) $(PSF_8859_7) $(PSF_8859_9) $(PSF_MS_1251) $(PSF_8859_13) $(PSF_8859_16) $(PSF_MS_1255) $(PSF_IBM_437) $(PSF_KOI8_RV) $(PSF_KOI8_R) $(PSF_BG_MIK) $(PSF_PT_154) $(PSF_KOI8_UV) $(PSF_KOI8_U) $(PSF_XOS4_2) +PSF = $(PSF_8859_1) $(PSF_8859_2) $(PSF_8859_7) $(PSF_8859_9) $(PSF_MS_1251) $(PSF_8859_13) $(PSF_8859_16) $(PSF_MS_1255) $(PSF_IBM_437) $(PSF_IBM_866) $(PSF_KOI8_RV) $(PSF_KOI8_R) $(PSF_BG_MIK) $(PSF_PT_154) $(PSF_KOI8_UV) $(PSF_KOI8_U) $(PSF_XOS4_2) PSF_VGAW_8859_1 = ter-114v.psf ter-116v.psf PSF_VGAW_8859_2 = ter-214v.psf ter-216v.psf @@ -54,12 +56,13 @@ PSF_VGAW_8859_13 = ter-d14v.psf ter-d16v.psf PSF_VGAW_8859_16 = ter-g14v.psf ter-g16v.psf PSF_VGAW_MS_1255 = ter-h14v.psf ter-h16v.psf PSF_VGAW_IBM_437 = ter-i14v.psf ter-i16v.psf +PSF_VGAW_IBM_866 = ter-a14v.psf ter-a16v.psf PSF_VGAW_KOI8_RV = ter-k14v.psf ter-k16v.psf PSF_VGAW_BG_MIK = ter-m14v.psf ter-m16v.psf PSF_VGAW_PT_154 = ter-p14v.psf ter-p16v.psf PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf PSF_VGAW_XOS4_2 = ter-v14v.psf ter-v16v.psf -PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_MS_1255) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2) +PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_MS_1255) $(PSF_VGAW_IBM_437) $(RAW_VGAW_IBM_866) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2) PCF_8859_1 = ter-112n.pcf ter-112b.pcf ter-114n.pcf ter-114b.pcf ter-116n.pcf ter-116b.pcf ter-118n.pcf ter-118b.pcf ter-120n.pcf ter-120b.pcf ter-122n.pcf ter-122b.pcf ter-124n.pcf ter-124b.pcf ter-128n.pcf ter-128b.pcf ter-132n.pcf ter-132b.pcf PCF_8859_2 = ter-212n.pcf ter-212b.pcf ter-214n.pcf ter-214b.pcf ter-216n.pcf ter-216b.pcf ter-218n.pcf ter-218b.pcf ter-220n.pcf ter-220b.pcf ter-222n.pcf ter-222b.pcf ter-224n.pcf ter-224b.pcf ter-228n.pcf ter-228b.pcf ter-232n.pcf ter-232b.pcf @@ -85,10 +88,10 @@ OTB = ter-u12n.otb ter-u12b.otb ter-u14n.otb ter-u14b.otb ter-u16n.otb ter-u16b. all: $(PSF) $(PCF) DESTDIR = -prefix = /usr/local -psfdir = $(prefix)/share/consolefonts -x11dir = $(prefix)/share/fonts/terminus -otbdir = $(prefix)/share/fonts/terminus +prefix = /usr +psfdir = /lib/kbd/consolefonts +x11dir = /usr/share/fonts/bitmap/terminus +otbdir = /usr/share/fonts/otb/terminus install: $(PSF) $(PCF) mkdir -p $(DESTDIR)$(psfdir) @@ -116,6 +119,7 @@ VGA_8859_13 = uni/vgagr.uni uni/ascii-h.uni uni/vga-1257.uni uni/8859-13.uni VGA_8859_16 = uni/vgagr.uni uni/ascii-h.uni uni/nls-1250.uni uni/8859-16.uni VGA_MS_1255 = uni/vgagr.uni uni/ascii-h.uni uni/win-1255.uni VGA_IBM_437 = uni/cntrl.uni uni/ascii-h.uni uni/ibm-437.uni +VGA_IBM_866 = uni/cntrl.uni uni/ascii-h.uni uni/ibm-866.uni VGA_KOI8_RV = uni/cntrl.uni uni/ascii-h.uni uni/koibm8-r.uni VGA_KOI8_R = uni/cntrl.uni uni/ascii-h.uni uni/koi8-r.uni VGA_BG_MIK = uni/cntrl.uni uni/ascii-h.uni uni/bg-mik.uni @@ -133,6 +137,7 @@ DUP_8859_13 = dup/vgagr.dup dup/ascii-h.dup DUP_8859_16 = dup/vgagr.dup dup/ascii-h.dup DUP_MS_1255 = dup/vgagr.dup dup/ascii-h.dup DUP_IBM_437 = dup/cntrl.dup dup/ascii-h.dup dup/ibm-437.dup +DUP_IBM_866 = dup/cntrl.dup dup/ascii-h.dup dup/ibm-866.dup DUP_KOI8_RV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup DUP_KOI8_R = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup DUP_BG_MIK = dup/cntrl.dup dup/ascii-h.dup dup/ibm-437.dup @@ -168,6 +173,9 @@ $(PSF_MS_1255) $(PSF_VGAW_MS_1255): ter-h%.psf : ter-u%.bdf $(VGA_MS_1255) $(DUP $(PSF_IBM_437) $(PSF_VGAW_IBM_437): ter-i%.psf : ter-u%.bdf $(VGA_IBM_437) $(DUP_IBM_437) $(UCS2ANY) $< $(REG_IBM_437) $(VGA_IBM_437) | $(BDF2PSF) -o $@ $(DUP_IBM_437) +$(PSF_IBM_866) $(PSF_VGAW_IBM_866): ter-a%.psf : ter-u%.bdf $(VGA_IBM_866) $(DUP_IBM_866) + $(UCS2ANY) $< $(REG_IBM_866) $(VGA_IBM_866) | $(BDF2PSF) -o $@ $(DUP_IBM_866) + $(PSF_KOI8_RV) $(PSF_VGAW_KOI8_RV): ter-k%.psf : ter-u%.bdf $(VGA_KOI8_RV) $(DUP_KOI8_RV) $(UCS2ANY) $< $(REG_KOI8_R) $(VGA_KOI8_RV) | $(BDF2PSF) -o $@ $(DUP_KOI8_RV) diff --git a/terminus-font/README b/terminus-font/README index ebdeb01..a90a584 100644 --- a/terminus-font/README +++ b/terminus-font/README @@ -136,7 +136,7 @@ $ ./configure INT=node EXT=js - code pages ISO8859-1/ISO8859-15/Windows-1252, ISO8859-2/Windows-1250, Windows-1251/ISO8859-5, ISO8859-9/Windows-1254, ISO8859-16, ISO8859-7/Windows-1253, ISO8859-13/Windows-1257, IBM-437, - Bulgarian-MIK, KOI8-R, KOI8-U, Paratype-PT154, combined + IBM-866, Bulgarian-MIK, KOI8-R, KOI8-U, Paratype-PT154, combined - format PC Screen Font (PSF) with unicode data @@ -195,6 +195,7 @@ ter-d* iso13, cp1257 ISO8859-13, Windows-1257 ter-g* iso16 ISO8859-16 ter-h* cp1255, iso08 Windows-1258, ISO8859-8 ter-i* cp437 IBM-437 +ter-a* cp866 IBM-866 (aka DOS alternative Cyrillic) ter-k* koi8r KOI8-R ter-m* mik Bulgarian-MIK ter-p* pt154 Paratype-PT154 @@ -223,7 +224,7 @@ The ISO8859-16 font also includes all letters and accents from Windows-1250. - weights normal, bold - code pages ISO8859-1/Windows-1252, ISO8859-2, ISO8859-5, ISO8859-7, ISO8859-9/Windows-1254, ISO8859-13, ISO8859-15, ISO8859-16, - Windows-1251, IBM-437, KOI8-R, KOI8-U, Paratype-PT154 and + Windows-1251, IBM-437, IBM-866, KOI8-R, KOI8-U, Paratype-PT154 and ISO10646-1 (unicode) - format Portable Compiled Font (PCF) -- tg: (90f7992..) terminus-4.40-alt-cp866 (depends on: terminus-4.40-alt-be2)