Skip to content

Commit

Permalink
Unify consolefonts maps (#161)
Browse files Browse the repository at this point in the history 
* Use openSUSE consolefonts map as default
  • Loading branch information
@imobachgs
imobachgs committed Jan 24, 2018
1 parent fc954d1 commit 11e22d9
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 160 deletions.
3 changes: 1 addition & 2 deletions console/src/Makefile.am
View file
Expand Up @@ -7,8 +7,7 @@ scrconf_DATA = \
scrconf/sysconfig_console.scr

ydata_DATA = \
data/consolefonts.ycp \
data/consolefonts_opensuse.ycp
data/consolefonts.ycp

EXTRA_DIST = $(module_DATA) $(scrconf_DATA) $(ydata_DATA)

Expand Down
115 changes: 27 additions & 88 deletions console/src/data/consolefonts.ycp
View file
Expand Up @@ -14,98 +14,45 @@
/*
* Maintainer: Thomas Fehr <fehr@suse.de>
*
* default consolefonts map
* consolefonts map
*/

$[
// LANG font unicode map screen map, console magic
"en_GB@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"en_GB" : [ "lat1-16.psfu", "", "none", "(B" ],
"en_US" : [ "lat1-16.psfu", "", "none", "(B" ],
"en" : [ "lat1-16.psfu", "", "none", "(B" ],
"en_US.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"en_GB.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"de_DE@euro" : [ "lat9w-16.psfu", "", "trivial", "(B" ],
"de_DE" : [ "lat1-16.psfu", "", "none", "(B" ],
"de_CH" : [ "lat1-16.psfu", "", "none", "(B" ],
"de" : [ "lat1-16.psfu", "", "none", "(B" ],
"de_DE.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"de_CH.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"de_AT.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"fr_FR@euro" : [ "lat9w-16.psfu", "", "trivial", "(B" ],
"fr_FR" : [ "lat1-16.psfu", "", "none", "(B" ],
"fr_CH" : [ "lat1-16.psfu", "", "none", "(B" ],
"fr" : [ "lat1-16.psfu", "", "none", "(B" ],
"fr_FR.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"it_IT@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"it_IT" : [ "lat1-16.psfu", "", "none", "(B" ],
"it" : [ "lat1-16.psfu", "", "none", "(B" ],
"it_IT.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"es_ES@euro" : [ "lat9w-16.psfu", "", "trivial", "(B" ],
"es_ES" : [ "lat1-16.psfu", "", "none", "(B" ],
"es" : [ "lat1-16.psfu", "", "none", "(B" ],
"es_ES.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"nl_NL@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"nl_NL" : [ "lat1-16.psfu", "", "none", "(B" ],
"nl" : [ "lat1-16.psfu", "", "none", "(B" ],
"nl_NL.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"pt_PT@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"pt_PT" : [ "lat1-16.psfu", "", "none", "(B" ],
"pt_BR" : [ "lat1-16.psfu", "", "trivial", "(B" ],
"pt" : [ "lat1-16.psfu", "", "none", "(B" ],
"pt_PT.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"pt_BR.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"ca_ES@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"ca_ES" : [ "lat1-16.psfu", "", "none", "(B" ],
"ca" : [ "lat1-16.psfu", "", "none", "(B" ],
"ca_ES.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"gl_ES@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"gl_ES" : [ "lat1-16.psfu", "", "none", "(B" ],
"gl" : [ "lat1-16.psfu", "", "none", "(B" ],
"gl_ES.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"br_FR@euro" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"br_FR" : [ "lat1-16.psfu", "", "none", "(B" ],
"br" : [ "lat1-16.psfu", "", "none", "(B" ],
"br_FR.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"en" : [ "eurlatgr.psfu", "", "none", "" ],
// The two-letters language is used as a fallback, so additional entries like
// the ones displayed below are not needed as long as they use the same values.
// "en_GB@euro" : [ "eurlatgr.psfu", "", "none", "" ],
// "en_GB" : [ "eurlatgr.psfu", "", "none", "" ],
// "en_US" : [ "eurlatgr.psfu", "", "none", "" ],
// "en_US.UTF-8" : [ "eurlatgr.psfu", "", "none", "" ],
// "en_GB.UTF-8" : [ "eurlatgr.psfu", "", "none", "" ],
"de" : [ "eurlatgr.psfu", "", "none", "" ],
"fr" : [ "eurlatgr.psfu", "", "none", "" ],
"it" : [ "eurlatgr.psfu", "", "none", "" ],
"es" : [ "eurlatgr.psfu", "", "none", "" ],
"nl" : [ "eurlatgr.psfu", "", "none", "" ],
"pt" : [ "eurlatgr.psfu", "", "none", "" ],
"ca" : [ "eurlatgr.psfu", "", "none", "" ],
"gl" : [ "eurlatgr.psfu", "", "none", "" ],
"br" : [ "eurlatgr.psfu", "", "none", "" ],
"pl" : [ "eurlatgr.psfu", "", "none", "" ],
"cs" : [ "eurlatgr.psfu", "", "none", "" ],
"sk" : [ "eurlatgr.psfu", "", "none", "" ],
"hu" : [ "eurlatgr.psfu", "", "none", "" ],
"lt" : [ "eurlatgr.psfu", "", "none", "" ],
"ja" : [ "eurlatgr.psfu", "", "none", "" ],
"tr" : [ "eurlatgr.psfu", "", "none", "" ],

"el_GR" : [ "iso07u-16.psfu", "", "trivial", "(K" ],
"el" : [ "iso07u-16.psfu", "", "trivial", "(K" ],
"el_GR.UTF-8" : [ "iso07u-16.psfu", "", "trivial", "(K" ],

"pl_PL" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"pl" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"pl_PL.UTF-8" : [ "lat2-16.psfu", "", "8859-2", "(K" ],

"cs_CZ" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"cs" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"cs_CZ.UTF-8" : [ "lat2-16.psfu", "", "8859-2", "(K" ],

"sk_SK" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"sk" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"sk_SK.UTF-8" : [ "lat2-16.psfu", "", "8859-2", "(K" ],

"hu_HU" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"hu" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"hu_HU.UTF-8" : [ "lat2-16.psfu", "", "8859-2", "(K" ],

"lt_LT" : [ "lat4a-16.psfu", "", "8859-13", "(K" ],
"lt" : [ "lat4a-16.psfu", "", "8859-13", "(K" ],
"lt_LT.UTF-8" : [ "lat4a-16.psfu", "", "8859-13", "(K" ],

"ru_RU.KOI8-R" : [ "UniCyr_8x16.psf", "", "koi2alt", "(K" ],
"ru" : [ "UniCyr_8x16.psf", "", "koi2alt", "(K" ],
"ru_RU.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],

"sr_RS@latin" : [ "lat2-16.psfu", "", "8859-2", "(K" ],
"sr_RS@latin" : [ "eurlatgr.psfu", "", "trivial", "" ],
"sr" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
"sr_RS.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],

Expand All @@ -117,13 +64,5 @@ $[

"bg_BG" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
"bg" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
"bg_BG.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],

"ja_JP.sjis" : [ "lat9w-16.psfu", "", "trivial", "(K" ],
"ja" : [ "lat1-16.psfu", "", "none", "(K" ],
"ja_JP.UTF-8" : [ "lat9w-16.psfu", "", "trivial", "(K" ],

"tr_TR" : [ "iso09.f16n", "", "none", "(K" ],
"tr" : [ "iso09.f16n", "", "none", "(K" ],
"tr_TR.UTF-8" : [ "iso09.f16n", "", "trivial", "(K" ]
"bg_BG.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ]
]
68 changes: 0 additions & 68 deletions console/src/data/consolefonts_opensuse.ycp
View file

This file was deleted.

2 changes: 1 addition & 1 deletion console/test/console_test.rb
View file
Expand Up @@ -26,7 +26,7 @@

it "sets console fonts for the given language" do
expect(Yast::UI).to receive(:SetConsoleFont)
.with("(K", "lat9w-16.psfu", "trivial", "", "es_ES")
.with("", "eurlatgr.psfu", "none", "", "es_ES")
Yast::Console.SelectFont(language)
end

Expand Down
6 changes: 6 additions & 0 deletions package/yast2-country.changes
View file
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 24 13:39:34 UTC 2018 - igonzalezsosa@suse.com

- Unify openSUSE and SLE console fonts maps (bsc#1068814).
- 4.0.17

-------------------------------------------------------------------
Mon Jan 15 08:51:32 UTC 2018 - jreidinger@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-country.spec
View file
Expand Up @@ -17,7 +17,7 @@


Name: yast2-country
Version: 4.0.16
Version: 4.0.17
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down

0 comments on commit 11e22d9

Please sign in to comment.