groff-commit
[Top][All Lists]
Advanced

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

[groff] 02/21: [chem]: Stop copying "pic.tmac" into output.


From: G. Branden Robinson
Subject: [groff] 02/21: [chem]: Stop copying "pic.tmac" into output.
Date: Tue, 23 Aug 2022 14:18:40 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 3d01182575e4547c66a7090681de858b23a98fc1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Aug 18 09:06:27 2022 -0500

    [chem]: Stop copying "pic.tmac" into output.
    
    * contrib/chem/chem.pl: Stop copying "pic.tmac" (fallback troff macro
      definitions) into the output.  It might not be necessary and it is
      inappropriate to do so if a macro package offers its own definitions
      or the user has made other arrangements on the command line.  (The
      same thing can be achieved with the "-mpic" argument to the formatter
      or a front end.)  Bump version number.
---
 contrib/chem/ChangeLog |  9 +++++++++
 contrib/chem/chem.pl   | 10 +---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index f3a3741d8..3472ee572 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,12 @@
+2022-08-18  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * chem.pl: Stop copying "pic.tmac" (fallback troff macro
+       definitions) into the output.  It might not be necessary and it
+       is inappropriate to do so if a macro package offers its own
+       definitions or the user has made other arrangements on the
+       command line.  (The same thing can be achieved with the "-mpic"
+       argument to the formatter or a front end.)  Bump version number.
+
 2022-06-15  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * chem.1.man: Fix markup nits.  Use idiomatic input style,
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index 75f2b0094..fb4aa279d 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -23,7 +23,7 @@ my $Copyright = 'Copyright (C) 2006-2014 Free Software 
Foundation, Inc.';
 # settings
 ########################################################################
 
-my $Program_Version = '1.0.5';
+my $Program_Version = '1.0.6';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it.
@@ -50,7 +50,6 @@ use FindBin;
 my $Chem_Name;
 my $Groff_Version;
 my $File_chem_pic;
-my $File_pic_tmac;
 
 BEGIN {
   {
@@ -67,7 +66,6 @@ BEGIN {
       $at_at{'BINDIR'} = $chem_dir;
       $at_at{'G'} = '';
       $File_chem_pic = File::Spec->catfile($chem_dir, 'chem.pic');
-      $File_pic_tmac = File::Spec->catfile($chem_dir, '..', 'pic.tmac');
       $Groff_Version = '';
       $Chem_Name = 'chem';
     } else {
@@ -75,10 +73,8 @@ BEGIN {
       $at_at{'BINDIR'} = '@BINDIR@';
       $at_at{'G'} = '@g@';
       $at_at{'PICDIR'} = '@PICDIR@';
-      $at_at{'TMACDIR'} = '@MACRODIR@';
       $File_chem_pic =
        File::Spec->catfile($at_at{'PICDIR'}, 'chem.pic');
-      $File_pic_tmac = File::Spec->catfile($at_at{'TMACDIR'}, 'pic.tmac');
       $Chem_Name = $at_at{'G'} . 'chem';
     }
   }
@@ -209,10 +205,6 @@ my $Line = '';
     my @stdin = ();
     my $stdin = 0;
 
-    # for centralizing the pic code
-    open TMAC, "<$File_pic_tmac" and print <TMAC>;
-    close TMAC;
-
     foreach (@ARGV) {
       $count_minus++ if /^-$/;
     }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]