groffer: add utf8 and make it the default for --tty

6 files changed, 19 insertions, 10 deletions

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 33df11f9d..410da0f73 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,11 @@
 2014-08-02  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* version.sh: Version 2.2.4
+
+	* groffer.pl: Change default `tty' to `utf8'.
+
+2014-08-02  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	Version 2.2.3
 
 2014-07-06  Bernd Warken  <groff-bernd.warken-72@web.de>
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index e277d3b72..d751752f2 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -14,7 +14,7 @@ This file was written by Bernd Warken <groff-bernd.warken-72@web.de>.
 .
 .
 .P
-Latest update: 4 Jul 2014
+Latest update: 1 Aug 2014
 ..
 .de co
 Copyright (C) 2001\[en]2002, 2004\[en]2006, 2009\[en]2012, 2014
@@ -235,6 +235,7 @@ Long options can be abbreviated in several ways.
 .OP \-\-text
 .OP \-\-to\-stdout
 .OP \-\-tty
+.OP \-\-utf8
 .OP \-\-viewer prog
 .OP \-\-www
 .OP \-\-x\~\fR|\fB\~\-\-X
@@ -539,7 +540,7 @@ and
 in \%\f[CR]X\~Window\f[] with different viewers and
 .I mode tty
 with device
-.I latin1
+.I utf8
 under
 .B less
 on a terminal; other modes are tested if the programs for the main
@@ -1096,6 +1097,7 @@ to the different character sets, such as
 .BR \%ascii ,
 .BR \%utf8 ,
 .BR \%latin1 ,
+.BR \%utf8 ,
 and others.
 .
 Each of these arguments switches
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index 26a81438c..ae8854721 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -10,7 +10,7 @@
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
-# Last update: 11 Jun 2014
+# Last update: 2 Aug 2014
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -166,8 +166,8 @@ our @Conf_Files = (File::Spec->catfile(File::Spec->rootdir(),
 		 );
 
 our @Default_Modes = ('pdf', 'pdf2', 'html', 'ps', 'x', 'dvi', 'tty');
-our $Default_Resolution = 75;
-our $Default_tty_Device = 'latin1';
+our $Default_Resolution = 100;
+our $Default_tty_Device = 'utf8';
 
 our @Macro_Packages = ('-man', '-mdoc', '-me', '-mm', '-mom', '-ms');
 
diff --git a/contrib/groffer/main_subs.pl b/contrib/groffer/main_subs.pl
index 412caaea7..3d61da51e 100644
--- a/contrib/groffer/main_subs.pl
+++ b/contrib/groffer/main_subs.pl
@@ -66,9 +66,9 @@ sub main_set_options {
   'debug-keep', 'debug-lm', 'debug-params', 'debug-stacks',
   'debug-tmpdir', 'debug-user', 'default', 'do-nothing', 'dvi',
   'groff', 'help', 'intermediate-output', 'html', 'latin1', 'man',
-  'no-location', 'no-man', 'no-special', 'pdf', 'pdf2', 'ps', 'rv', 'source',
-  'text', 'to-stdout', 'text-device', 'tty', 'tty-device', 'version',
-  'whatis', 'where', 'www', 'x', 'X');
+  'no-location', 'no-man', 'no-special', 'pdf', 'pdf2', 'ps', 'rv',
+  'source', 'text', 'to-stdout', 'text-device', 'tty', 'tty-device',
+  'utf8', 'version', 'whatis', 'where', 'www', 'x', 'X');
 
 ### main_set_options()
   my @opts_groffer_long_arg =
diff --git a/contrib/groffer/subs.pl b/contrib/groffer/subs.pl
index 8960c6dff..8d175a786 100644
--- a/contrib/groffer/subs.pl
+++ b/contrib/groffer/subs.pl
@@ -558,7 +558,7 @@ The most important groffer long options are
 --help		display this helping output.
 --html		display in a web browser.
 --man		check file parameters first whether they are man pages.
---mode=auto|dvi|groff|html|pdf|ps|source|text|tty|www|x|X
+--mode=auto|dvi|groff|html|pdf|ps|source|text|tty|utf8|www|x|X
 		choose display mode.
 --no-man	disable man-page facility.
 --no-special	disable --all, --apropos*, and --whatis
@@ -569,6 +569,7 @@ The most important groffer long options are
 --text		output in a text device without a pager.
 --to-stdout	output the content of the mode file without display.
 --tty		display with a pager on text terminal even when in X.
+--utf8		unicode text mode
 --viewer	choose a viewer for the actual device mode
 --whatis	display the file name and description of man pages
 --www		same as --html.
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 72275b061..b46b811ef 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -29,7 +29,7 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='2.2.3';
+_PROGRAM_VERSION='2.2.4';
 _LAST_UPDATE='2 Aug 2014';
 
 # this setting of the groff version is only used before make is run,