From owner-freebsd-qa Mon Dec 17 6:14:10 2001 Delivered-To: freebsd-qa@freebsd.org Received: from straylight.ringlet.net (sentinel.office1.bg [217.75.134.126]) by hub.freebsd.org (Postfix) with SMTP id F342437B416 for ; Mon, 17 Dec 2001 06:13:59 -0800 (PST) Received: (qmail 6187 invoked by uid 1000); 17 Dec 2001 13:36:32 -0000 Date: Mon, 17 Dec 2001 15:36:32 +0200 From: Peter Pentchev To: qa@FreeBSD.org Cc: ache@FreeBSD.org Subject: MFC'ing the sysinstall fonts settings Message-ID: <20011217153632.A5811@straylight.oblivion.bg> Mail-Followup-To: qa@FreeBSD.org, ache@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-qa@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi, Are there any objections to the attached patch, which merges back into RELENG_4 some additional sysinstall font menu items? I thought of this as part of my efforts to make the Bulgarian locale/charmaps/fonts/keymaps as visible as possible in 4.5-RELEASE, and I found that the fonts menu in -CURRENT already has IBM 1251. While we're here, are the font designations in the menu really the best ones? If we should go by the WG15 definitions at ftp://std.dkuug.dk/, which Andrey Chernov (CC'd) pointed out to me in the audit trail of a PR discussiong Bulgarian locale definitions, then some of those fonts might have to change to a 'CP' prefix. On the other hand, other charmaps do not have a 'CP' prefix, and for them the 'IBM' prefix might be best; all of this might lead to a mess of 'CP' and 'IBM' font names, so maybe things should be left just as they are right now :) So.. any comments? Should the fonts menu be MFC'd just as it is, or should any font names be changed? G'luck, Peter -- If this sentence were in Chinese, it would say something else. Index: src/release/sysinstall/menus.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/menus.c,v retrieving revision 1.252.2.54 diff -u -r1.252.2.54 menus.c --- src/release/sysinstall/menus.c 17 Dec 2001 08:32:33 -0000 1.252.2.54 +++ src/release/sysinstall/menus.c 17 Dec 2001 13:26:05 -0000 @@ -2010,9 +2010,9 @@ "you can select the appropriate font below.", "Choose a font", NULL, - { { "1 None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL, + { { "1 None", "Use hardware default font", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=NO,font8x14=NO,font8x16=NO" }, - { "2 IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL, + { "2 IBM 437", "English and others, VGA default", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" }, { "3 IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" }, @@ -2022,11 +2022,21 @@ "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866b-8x16,mousechar_start=3" }, { "6 IBM 866u", "Ukrainian, IBM encoding (use with KOI8-U screenmap)", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=cp866u-8x8,font8x14=cp866u-8x14,font8x16=cp866u-8x16,mousechar_start=3" }, - { "7 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "7 IBM 1251", "Cyrillic, MS Windows encoding", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=cp1251-8x8,font8x14=cp1251-8x14,font8x16=cp1251-8x16,mousechar_start=3" }, + { "8 ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" }, - { "8 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + { "9 ISO 8859-2", "Eastern Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=iso02-8x8,font8x14=iso02-8x14,font8x16=iso02-8x16" }, - { "9 SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, + { "a ISO 8859-4", "Baltic, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=iso04-8x8,font8x14=iso04-8x14,font8x16=iso04-8x16" }, + { "b ISO 8859-7", "Greek, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=iso07-8x8,font8x14=iso07-8x14,font8x16=iso07-8x16" }, + { "c ISO 8859-8", "Hebrew, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=iso08-8x8,font8x14=iso08-8x14,font8x16=iso08-8x16" }, + { "d ISO 8859-15", "Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL, + "font8x8=iso15-8x8,font8x14=iso15-8x14,font8x16=iso15-8x16" }, + { "e SWISS", "English, better resolution", dmenuVarCheck, dmenuSetVariables, NULL, "font8x8=swiss-8x8,font8x14=NO,font8x16=swiss-8x16" }, { NULL } }, }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-qa" in the body of the message