[groff] 01/01: grog: split single character option collections "groff -JPT" into "groff -J -p -t" and the like

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit ab92634aa5b16c4b77b19f0aa98aa002a61ca17f
Author: Bernd Warken <address@hidden>
Date:   Wed Jun 18 20:47:27 2014 +0200

    grog: split single character option collections "groff -JPT" into "groff -J 
-p -t" and the like
---
 ChangeLog             |    9 +++++++++
 src/roff/grog/grog.pl |   19 +++++++++++++++----
 src/roff/grog/subs.pl |    6 +++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0241b17..54f73dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2014-06-18  Bernd Warken  <address@hidden>
 
+       * src/roff/grog/grog.pl: Corrections about `require' and `our'
+       definitions.
+
+       * src/roff/grog/subs.pl: In the `groff' output command line, split
+       the single character options collections into different
+       1-character options, each with a leading minus `-'..
+
+2014-06-18  Bernd Warken  <address@hidden>
+
        * src/roff/grog/subs.pl: Minor correction at `do_first_line'.
 
 2014-06-18  Bernd Warken  <address@hidden>
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index 7c288fb..5b6186a 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -54,7 +54,8 @@ my $grog_dir;
 if ($before_make) { # before installation
   my $grog_source_dir = $FindBin::Bin;
   $at_at{'BINDIR'} = $grog_source_dir;
-  $grog_dir = $grog_source_dir;
+# $grog_dir = $grog_source_dir;
+  $grog_dir = '.';
   my $top = $grog_source_dir . '/../../../';
   open FILE, '<', $top . 'VERSION' ||
     die 'Could not open top file VERSION.';
@@ -74,18 +75,22 @@ if ($before_make) { # before installation
 
 die "$grog_dir is not an existing directory;" unless -d $grog_dir;
 
-unshift(@INC, $grog_dir);
 
+#############
+# import subs
+unshift(@INC, $grog_dir);
 require 'subs.pl';
 
+
+###############
+# our variables
+
 our $Prog = $0;
 {
   my ($v, $d, $f) = File::Spec->splitpath($Prog);
   $Prog = $f;
 }
 
-&args_with_minus();
-
 
 # for first line check
 our %preprocs_tmacs = (
@@ -131,6 +136,12 @@ our $is_mmse = 0;
 
 our @FILES = @ARGV;
 
+
+##########
+# run subs
+
+&args_with_minus();
+
 foreach my $file ( @ARGV ) { # test for each file name in the arguments
   unless ( open(FILE, $file eq "-" ? $file : "< $file") ) {
     print STDERR "$Prog: can't open \`$file\': $!";
diff --git a/src/roff/grog/subs.pl b/src/roff/grog/subs.pl
index 0ed8dc8..2150d20 100644
--- a/src/roff/grog/subs.pl
+++ b/src/roff/grog/subs.pl
@@ -37,6 +37,7 @@ require v5.6;
 
 use warnings;
 use strict;
+
 use File::Spec;
 
 # for running programs
@@ -703,6 +704,9 @@ EOF
   if ( ( $Groff{'PS'} ||  $Groff{'PF'} ) &&  $Groff{'PE'} ) {
     $Groff{'pic'} = 1;
   }
+  if ( $Groff{'gideal'} ) {
+    $Groff{'pic'} = 1;
+  }
 
   $Groff{'refer'} ||= $Groff{'refer_open'} && $Groff{'refer_close'};
 
@@ -891,7 +895,7 @@ EOF
   }
 
   exit 0;
-}      # sub make_groff_line
+}      # sub &make_groff_line()
 
 
 ########################################################################