[Groff-commit] groff ChangeLog NEWS src/utils/afmtodit/afmtodi...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     08/07/24 12:06:25

Modified files:
        .              : ChangeLog NEWS 
        src/utils/afmtodit: afmtodit.man afmtodit.pl 

Log message:
        New options -f and -k for afmtodit.
        
        * src/afmtodit/afmtodit.pl: New options `-f NAME' sets the internal
        name of the groff font.
        New option `-k' disables output of kerning data.
        * src/afmtodit/afmtodit.man, NEWS: Document new options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1133&r2=1.1134
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.246&r2=1.247
http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/afmtodit/afmtodit.man?cvsroot=groff&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/afmtodit/afmtodit.pl?cvsroot=groff&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -b -r1.1133 -r1.1134
--- ChangeLog   18 Jul 2008 07:37:16 -0000      1.1133
+++ ChangeLog   24 Jul 2008 12:06:24 -0000      1.1134
@@ -1,3 +1,12 @@
+2008-07-24  Denis M. Wilson  <address@hidden>
+
+       New options -f and -k for afmtodit.
+
+       * src/afmtodit/afmtodit.pl: New options `-f NAME' sets the internal
+       name of the groff font.
+       New option `-k' disables output of kerning data.
+       * src/afmtodit/afmtodit.man, NEWS: Document new options.
+
 2008-07-18  Werner LEMBERG  <address@hidden>
 
        * src/preproc/tbl/table.cpp (table::compute_separation_factor): Emit

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- NEWS        16 Jan 2008 16:08:48 -0000      1.246
+++ NEWS        24 Jul 2008 12:06:24 -0000      1.247
@@ -156,6 +156,10 @@
 
 o New option `-c' to output more font information as comments.
 
+o New option `-k' to suppress output of kerning data.
+
+o New option `-f NAME' to set the internal name of the groff font.
+
 Macro Packages
 --------------
 

Index: src/utils/afmtodit/afmtodit.man
===================================================================
RCS file: /cvsroot/groff/groff/src/utils/afmtodit/afmtodit.man,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/utils/afmtodit/afmtodit.man     1 May 2006 08:37:13 -0000       1.16
+++ src/utils/afmtodit/afmtodit.man     24 Jul 2008 12:06:25 -0000      1.17
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2005, 2006, 2008
   Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
@@ -46,10 +46,11 @@
 .in +\w'\fBafmtodit 'u
 .ti \niu
 .B afmtodit
-.OP \-cmnsvx
+.OP \-ckmnsvx
 .OP \-a n
 .OP \-d desc_file
 .OP \-e enc_file
+.OP \-f internal_name
 .OP \-i n
 .I afm_file
 .I map_file
@@ -230,6 +231,11 @@
 default font directory is searched.
 .
 .TP
+.BI \-f name
+The internal name of the groff font is set to
+.IR name .
+.
+.TP
 .BI \-i n
 Generate an italic correction for each character so that 
 the character's width plus the character's italic correction
@@ -271,6 +277,11 @@
 for italic fonts.
 .
 .TP
+.B \-k
+Omit any kerning data from the groff font.
+This should be used only for mono-spaced fonts.
+.
+.TP
 .B \-m
 Prevent negative left italic correction values.
 .

Index: src/utils/afmtodit/afmtodit.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/utils/afmtodit/afmtodit.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/utils/afmtodit/afmtodit.pl      1 Jan 2007 13:49:55 -0000       1.20
+++ src/utils/afmtodit/afmtodit.pl      24 Jul 2008 12:06:25 -0000      1.21
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 # -*- Perl -*-
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #      Written by James Clark (address@hidden)
 #
@@ -30,10 +30,10 @@
 my $groff_sys_fontdir = "@FONTDIR@";
 
 use Getopt::Std;
-getopts('a:cd:e:i:mnsvx');
+getopts('a:cd:e:f:i:kmnsvx');
 
-our ($opt_a, $opt_c, $opt_d, $opt_e, $opt_i,
-     $opt_m, $opt_n, $opt_s, $opt_v, $opt_x);
+our ($opt_a, $opt_c, $opt_d, $opt_e, $opt_f, $opt_i,
+     $opt_k, $opt_m, $opt_n, $opt_s, $opt_v, $opt_x);
 
 if ($opt_v) {
     print "GNU afmtodit (groff) version @address@hidden";
@@ -41,8 +41,8 @@
 }
 
 if ($#ARGV != 2) {
-    die "usage: $prog [-cmnsvx] [-a angle] [-d DESC] [-e encoding]\n" .
-       "       [-i n] afmfile mapfile font\n";
+    die "usage: $prog [-ckmnsvx] [-a angle] [-d DESC] [-e encoding]\n" .
+       "       [-f name] [-i n] afmfile mapfile font\n";
 }
 
 my $afm = $ARGV[0];
@@ -75,6 +75,9 @@
     next if $#field < 0;
     if ($field[0] eq "FontName") {
        $psname = $field[1];
+       if($opt_f) {
+           $psname = $opt_f;
+       }
     }
     elsif($field[0] eq "Notice") {
        $notice = $_;
@@ -460,7 +463,7 @@
     print(" 0\n");
 }
 
-if ($#kern1 >= 0) {
+if (!$opt_k && $#kern1 >= 0) {
     print("\n");
     print("kernpairs\n");