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

Re: CP1251 and termwrap



Ognyan Kulev wrote:
Eugeniy Meshcheryakov wrote:

Ognyan Kulev написав:

How KOI8-R is setup
for stage 2, so that we make CP1251 to be setup in the same way?

Add test for CP1251 in termwrap, or remove all the tests for languages
that have kbd or cyr entries in languagelist.

I've cloned the KOI8-R entry in termwrap and changed it for CP1251. All this in sarge branch of base-config.

The patch is attached.  This change was committed but later reverted.

Should I apply it to trunk? Without the patch, jfbterm is used, and that is generally OK.

Regards,
ogi
Index: termwrap
===================================================================
--- termwrap	(revision 1230)
+++ termwrap	(revision 1233)
@@ -343,6 +343,22 @@
 		;;
 	esac
 	;;
+CP1251)
+	# Bulgarian
+	case $TERMINAL in
+	console)
+		if [ -x /usr/bin/cyr ]; then
+			/usr/bin/cyr -s uni -f 16 -e cp1251 --ttys=/dev/tty1 bg_bds alt_shift_toggle
+		else
+			# Don't try to install in Bulgarian
+			# withour cyrrilic support on console
+			LANG=C
+			LC_ALL=C
+			unset LC_COLLATE
+		fi
+		;;
+	esac
+	;;
 UTF-8)
 	# Enable UTF-8 in console
 	case $TERMINAL in
@@ -355,7 +371,7 @@
 	;;
 *)
 	# Fallback jfbterm
-	# Mainly Korean, Chinese, Greek, Bulgarian
+	# Mainly Korean, Chinese, Greek
 	case $TERMINAL in
 	console)
 		try_load_fb
@@ -379,7 +395,7 @@
 	
 	# Fallback to C
 	case $ENCODING in
-	ISO-8859-1|ISO-8859-2|ISO-8859-9|ISO-8859-13|ISO-8859-15|KOI8-R|KOI8-U)
+	ISO-8859-1|ISO-8859-2|ISO-8859-9|ISO-8859-13|ISO-8859-15|KOI8-R|KOI8-U|CP1251)
 		# Nothing to do
 		;;
 	*)
@@ -421,8 +437,9 @@
 	# Unload ISO-8859-15 charset mapping, by loading ISO-8859-1 instead
 	try_load_charset $ORIG_ENCODING $ORIG_ACM $ORIG_FONT
 	;;
-KOI8-R|KOI8-U)
-	# Unload KOI8-R or KOI8-U charset mapping, by loading ISO-8859-1 instead
+KOI8-R|KOI8-U|CP1251)
+	# Unload KOI8-R, KOI8-U or CP1251 charset mapping,
+	# by loading ISO-8859-1 instead
 	try_load_charset $ORIG_ENCODING $ORIG_ACM $ORIG_FONT
 	;;
 UTF-8)

Reply to: