[groff] 01/01: In <groff-top>/contrib/groffer do:

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit 0a60c74f0a6e5756e8324fa9d253404f4413d3a1
Author: Bernd Warken <address@hidden>
Date:   Sun Jun 1 22:45:50 2014 +0200

    In <groff-top>/contrib/groffer do:
    
    groffer.pl:
        Fix ligature error `fi', etc. in pdf-mode by appending
        `-P-y -PU' to `grog' call.
        pfd2-mode works, but still has the ligature error.
    
    func.pl: Reorder.
    
    version.sh: Upgrade to version 2.1.1.
---
 contrib/groffer/ChangeLog  |   10 ++++++
 contrib/groffer/func.pl    |   78 +++++++++++++++++++++++---------------------
 contrib/groffer/groffer.pl |   15 +++++---
 contrib/groffer/version.sh |    4 +-
 4 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 7d046d4..659dedd 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-01  Bernd Warken  <address@hidden>
+
+       * groffer.pl: Fix ligature error `fi', etc. in pdf-mode by
+       appending `-P-y -PU' to `grog' call.  pfd2-mode works, but still
+       has the ligature error.
+
+       * func.pl: Reorder.
+
+       * version.sh: Upgrade to version 2.1.1.
+
 2014-05-31  Bernd Warken  <address@hidden>
 
        * groffer.pl, func.pl, groffer.man: Change all existing viewer
diff --git a/contrib/groffer/func.pl b/contrib/groffer/func.pl
index 4532ed7..e4b21c5 100644
--- a/contrib/groffer/func.pl
+++ b/contrib/groffer/func.pl
@@ -8,7 +8,7 @@
 # Copyright (C) 2006, 2009, 2014 Free Software Foundation, Inc.
 # Written by Bernd Warken <address@hidden>.
 
-# Last update: 31 May 2014
+# Last update: 01 Jun 2014
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -518,15 +518,15 @@ Window viewer or in several text modes.  All input is 
decompressed
 on-the-fly with all formats that gzip can handle.
 
 "filespec" is one of
-  "filename"       name of a readable file
-  "-"              for standard input
-  "man:name(n)"    man page "name" in section "n"
-  "man:name.n"     man page "name" in section "n"
-  "man:name"       man page "name" in first section found
-  "name(n)"        man page "name" in section "n"
-  "name.n"         man page "name" in section "n"
-  "n name"         man page "name" in section "n"
-  "name"           man page "name" in first section found
+  "filename"   name of a readable file
+  "-"          for standard input
+  "man:name(n)"        man page "name" in section "n"
+  "man:name.n" man page "name" in section "n"
+  "man:name"   man page "name" in first section found
+  "name(n)"    man page "name" in section "n"
+  "name.n"     man page "name" in section "n"
+  "n name"     man page "name" in section "n"
+  "name"       man page "name" in first section found
 where `section' is a single character out of [1-9on], optionally followed
 by some more letters that are called the `extension'.
 
@@ -542,38 +542,37 @@ All other short options are interpreted as "groff" 
formatting options.
 
 The most important groffer long options are
 
---apropos=name    start man's "apropos" program for "name".
+--apropos=name start man's "apropos" program for "name".
 --apropos-data=name
-                  "apropos" for "name" in man's data sections 4, 5, 7.
+               "apropos" for "name" in man's data sections 4, 5, 7.
 --apropos-devel=name
-                  "apropos" for "name" in development sections 2, 3, 9.
+               "apropos" for "name" in development sections 2, 3, 9.
 --apropos-progs=name
-                  "apropos" for "name" in man's program sections 1, 6, 8.
---auto            choose mode automatically from the default mode list.
---default         reset all options to the default value.
+               "apropos" for "name" in man's program sections 1, 6, 8.
+--auto         choose mode automatically from the default mode list.
+--default      reset all options to the default value.
 --default-modes=mode1,mode2,...
-                  set sequence of automatically tried modes.
---dvi             display in a viewer for TeX device independent format.
---groff           process like groff, disable viewing features.
---help            display this helping output.
---html            display in a web browser.
---man             check file parameters first whether they are man pages.
+               set sequence of automatically tried modes.
+--dvi          display in a viewer for TeX device independent format.
+--groff                process like groff, disable viewing features.
+--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
-                  choose display mode.
---no-man          disable man-page facility.
---no-special      disable --all, --apropos*, and --whatis
---pager=program   preset the paging program for tty mode.
---pdf             display in a PDF viewer.
---ps              display in a Postscript viewer.
---source          output as roff source.
---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.
---viewer          choose a viewer for the actual device mode
---viewer-tty      choose a viewer for the actual text mode
---whatis          display the file name and description of man pages
---www             same as --html.
---x --X           display with "gxditview" using an X* device.
+               choose display mode.
+--no-man       disable man-page facility.
+--no-special   disable --all, --apropos*, and --whatis
+--pager=program preset the paging program for tty mode.
+--pdf          display in a PDF viewer.
+--ps           display in a Postscript viewer.
+--source       output as roff source.
+--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.
+--viewer       choose a viewer for the actual device mode
+--whatis       display the file name and description of man pages
+--www          same as --html.
+--x --X                display with "gxditview" using an X* device.
 
 The usual X Windows toolkit options transformed into GNU long options:
 --background=color, --bd=size, --bg=color, --bordercolor=color,
@@ -794,3 +793,8 @@ sub wait {
 }                              # wait()
 
 1;
+########################################################################
+### Emacs settings
+# Local Variables:
+# mode: CPerl
+# End:
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index 1a7b65b..5be47c9 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -10,7 +10,7 @@
 
 # Written by Bernd Warken <address@hidden>.
 
-# Last update: 31 May 2014
+# Last update: 01 Jun 2014
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -151,6 +151,7 @@ do "$file_perl_test_pl" or die "Perl test: $@";
 
 require 'func.pl';
 require 'man.pl';
+# require 'sub.pl';
 
 @Path = &path_uniq( File::Spec->path() );
 
@@ -171,7 +172,7 @@ my @Conf_Files = (File::Spec->catfile(File::Spec->rootdir(),
                                      'groffer.conf')
                 );
 
-my @Default_Modes = ('pdf', 'html', 'ps', 'x', 'dvi', 'tty');
+my @Default_Modes = ('pdf', 'pdf2', 'html', 'ps', 'x', 'dvi', 'tty');
 my $Default_Resolution = 75;
 my $Default_tty_Device = 'latin1';
 
@@ -769,7 +770,7 @@ sub main_config_params {    # handle configuration files
     } @Filespecs = ('-') unless (@Filespecs);
     @ARGV = (@Options, '--', @Filespecs);
   }
-}
+} # main_config_params()
 
 if (0) {
   print STDERR "<$_>\n" foreach @ARGV;
@@ -833,7 +834,7 @@ sub main_parse_params {
                        'lbp' => 'groff',
                        'lj4' => 'groff',
                        'pdf' => 'pdf',
-                       'pdf2' => 'pdf',
+                       'pdf2' => 'pdf2',
                        'ps' => 'ps',
                        'utf8' => 'tty',
                       );
@@ -925,7 +926,7 @@ sub main_parse_params {
                         'www' => 'html',
                         'dvi' => 'dvi',
                         'pdf' => 'pdf',
-                        'pdf2' => 'pdf',
+                        'pdf2' => 'pdf2',
                         'ps' => 'ps',
                         'text' => 'text',
                         'tty' => 'tty',
@@ -1263,6 +1264,7 @@ sub _get_prog_args {
 
   my $mode = lc($_[0]);
   my $MODE = uc($mode);
+  $MODE = 'PDF' if ( $MODE =~ /^PDF2$/ );
 
   my $xlist = $Viewer_X{$MODE};
   my $ttylist = $Viewer_tty{$MODE};
@@ -1997,7 +1999,7 @@ sub main_display {
 
     /^pdf$/ and do {
       $modefile .= '.pdf';
-      $groggy = `cat $tmp_cat | grog -Tpdf`;
+      $groggy = `cat $tmp_cat | grog -Tpdf -P-y -PU`;
       die "main_display(): grog error;" if $?;
       chomp $groggy;
       print STDERR "grog output: $groggy\n" if $Debug{'GROG'};
@@ -2005,6 +2007,7 @@ sub main_display {
       next SWITCH;
     };
 
+
     /^pdf2$/ and do {
       if ($Opt{'DEVICE'} && $Opt{'DEVICE'} ne 'ps') {
        warn "main_display(): " .
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 9c2a592..96b9c63 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -29,8 +29,8 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='2.1.0';
-_LAST_UPDATE='31 May 2014';
+_PROGRAM_VERSION='2.1.1';
+_LAST_UPDATE='01 Jun 2014';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.