Skip to content

Commit 3422335

Browse files
committed
fontools (7jul26)
git-svn-id: svn://tug.org/texlive/trunk/Build/source@79613 c570f23f-e606-0410-a88d-b1316a301751
1 parent cfb5fda commit 3422335

4 files changed

Lines changed: 90 additions & 49 deletions

File tree

texk/texlive/linked_scripts/fontools/afm2afm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use File::Basename;
3737
use Getopt::Long;
3838
use Pod::Usage;
3939

40-
my $VERSION = "20260529";
40+
my $VERSION = "20260706";
4141

4242
parse_commandline();
4343

@@ -421,7 +421,7 @@ See the GNU General Public License for more details.
421421
422422
=head1 VERSION
423423
424-
This document describes B<afm2afm> version 20260529.
424+
This document describes B<afm2afm> version 20260706.
425425
426426
427427
=head1 RECENT CHANGES

texk/texlive/linked_scripts/fontools/autoinst

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use Getopt::Long ();
4141
use Pod::Usage ();
4242
use POSIX ();
4343

44-
my $VERSION = '20260529';
44+
my $VERSION = '20260706';
4545

4646
my ($d, $m, $y) = (localtime time)[3 .. 5];
4747
my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -162,7 +162,7 @@ package Attr;
162162

163163
=begin Comment
164164
165-
Some font names contain abbreviated words for width, weight and/or shape;
165+
Some fontnames contain abbreviated words for width, weight and/or shape;
166166
we unabbreviate these using the following table.
167167
168168
=end Comment
@@ -810,7 +810,7 @@ END_ERR_METADATA_MISSING
810810
$data->{fullname} = lc $data->{fullname};
811811

812812
# Remove all spaces from the metadata values,
813-
# as some of these will be used in LaTeX font names.
813+
# as some of these will be used in LaTeX fontnames.
814814
for my $key (keys %{$data}) {
815815
$data->{$key} =~ s/\s+//xmsg;
816816
}
@@ -945,12 +945,9 @@ END_ERR_METADATA_MISSING
945945
}
946946
# Some font families put italic shapes into separate families;
947947
# we merge these into the 'main' family.
948-
$shapes = join '|', Util::sort_desc_length(qw(it italic));
949-
if ($self->{family} =~ m/(.+?) ($shapes) \z/xmsi
950-
and ($self->{shape} eq 'regular'
951-
or $self->{shape} eq Attr::unabbreviate(lc($2)))) {
948+
if ($self->{family} =~ m/(.+?) italic \z/xmsi) {
952949
$self->{family} = $1;
953-
$self->{shape} = Attr::unabbreviate(lc($2));
950+
$self->{shape} = 'italic';
954951
}
955952

956953
# Some font families put different widths into separate families;
@@ -2275,7 +2272,7 @@ I'm using the following options:
22752272
mathspacing: $ARGV{mathspacing}
22762273
22772274
auto/manual: @{[ $ARGV{manual} ? 'manual' : 'auto' ]}
2278-
font name suffix: @{[ $ARGV{t1suffix} || '(none)' ]}
2275+
fontname suffix: @{[ $ARGV{t1suffix} || '(none)' ]}
22792276
22802277
END_ARGUMENTS
22812278

@@ -3124,7 +3121,7 @@ sub process_styles_options {
31243121
elsif ($ARGV{inferiors} eq 'sinf') { $FIGURESTYLE{Inf}{reqd} = ['sinf'] }
31253122
elsif ($ARGV{inferiors} eq 'dnom') { $FIGURESTYLE{Inf}{reqd} = ['dnom'] }
31263123
else {
3127-
# Apparently we mistook the first argument (font name) for
3124+
# Apparently we mistook the first argument (fontname) for
31283125
# an optional argument to -inferiors; let's undo that.
31293126
unshift @ARGV, $ARGV{inferiors};
31303127
$ARGV{inferiors} = 'auto';
@@ -3275,7 +3272,7 @@ END_WARNING_KPSEWHICH
32753272
I'm putting all generated files in "$ARGV{target}".
32763273
32773274
Please install these files into a suitable TEXMF directory,
3278-
update the file name database and run 'updmap' (or similar);
3275+
update the filename database and run 'updmap' (or similar);
32793276
see your TeX installation's documentation.
32803277
END_WARNING_DUMPING_FILES
32813278
}
@@ -3298,7 +3295,7 @@ END_WARNING_SPACES_IN_PATHS
32983295
# --------------------------------------------------------------------------
32993296
sub process_output_options{
33003297
# If the user gave -t1suffix *without* value as the last option,
3301-
# Getopt::Long may mistake the next argument (a font file name)
3298+
# Getopt::Long may mistake the next argument (a font filename)
33023299
# for the value of -t1suffix; we take care of this case
33033300
# by testing whether the value refers to an existing file
33043301
# and repairing things if necessary.
@@ -3564,7 +3561,7 @@ sub cleanup {
35643561

35653562
# Figure out whether the encoding option refers to a custom encoding file
35663563
# in the current directory, or to the name of one of our standard
3567-
# encodings. In the former case, we quote the file name, to account
3564+
# encodings. In the former case, we quote the filename, to account
35683565
# for possible spaces or other metacharacters; in the latter case,
35693566
# we add the 'fontools_' prefix.
35703567
if (-e $workitem->{encoding}) {
@@ -3619,7 +3616,7 @@ sub cleanup {
36193616

36203617

36213618
# --------------------------------------------------------------------------
3622-
# Modify the font and file names of all generated .pfb files.
3619+
# Modify the font- and filenames of all generated .pfb files.
36233620
# --------------------------------------------------------------------------
36243621
sub modify_fontnames {
36253622
my ($family, $fontlist) = @_;
@@ -4189,7 +4186,7 @@ do not allow redistributing such converted versions under their original name.
41894186
41904187
In order to try to meet such licensing requirements, B<autoinst> provides
41914188
a I<-t1suffix> command-line option that appends a suffix to the names
4192-
(both the file name and the internal font name)
4189+
(both the filename and the internal fontname)
41934190
of all generated Type1 fonts; see L</COMMAND-LINE OPTIONS> below.
41944191
41954192
Please note that I am not a lawyer and do not guarantee that
@@ -4295,13 +4292,13 @@ Multiple encodings may be specified as a comma-separated list
42954292
(without spaces!); the default choice of encodings is C<OT1,LY1,T1>.
42964293
42974294
For each encoding argument, B<autoinst> will first check if it is
4298-
the file name of an encoding file, and if found it will use that;
4295+
the filename of an encoding file, and if found it will use that;
42994296
otherwise the argument is assumed to be the name of one of
43004297
the built-in encodings.
4301-
If the argument is a file name,
4298+
If the argument is a filename,
43024299
B<autoinst> will define the font with an NFSS encoding
4303-
equal to the file name (minus a ".enc" extension),
4304-
except when the file name starts with "U_";
4300+
equal to the filename (minus a ".enc" extension),
4301+
except when the filename starts with "U_";
43054302
in that case the NFSS encoding will be "U"
43064303
and the part after "U_" will be used as the "enc" part
43074304
of the name of the generated font.
@@ -4409,10 +4406,10 @@ This latter effect cannot be re-enabled in B<autoinst>;
44094406
if you want typewriter text to be hyphenated, use the F<hyphenat> package.
44104407
44114408
If none of these options is specified, B<autoinst> tries to guess:
4412-
if the font's file name contains the string "mono"
4409+
if the font's filename contains the string "mono"
44134410
or if the field C<isFixedPitch> in the font's C<post> table is True,
44144411
it will select B<-typewriter>;
4415-
else if the file name contains "sans" it will select B<-sanserif>;
4412+
else if the filename contains "sans" it will select B<-sanserif>;
44164413
otherwise it will opt for B<-serif>.
44174414
44184415
=item B<-math>
@@ -4435,12 +4432,12 @@ when used in maths; some fonts need even more. Use your own judgement!
44354432
44364433
=item B<-t1suffix> [ = I<SUFFIX> ]
44374434
4438-
Tell B<autoinst> to modify the font names of all generated Type1-fonts,
4435+
Tell B<autoinst> to modify the fontnames of all generated Type1-fonts,
44394436
by adding I<SUFFIX> to the family name.
44404437
If you use this option without specifying a I<SUFFIX> value,
44414438
B<autoinst> will use the value "PS".
44424439
The default behaviour when this option is not given
4443-
is to not modify font names at all.
4440+
is to not modify fontnames at all.
44444441
44454442
See also L</OpenType fonts and licensing issues> in L<WARNINGS AND CAVEATS> above.
44464443
@@ -4511,7 +4508,7 @@ use C<-nfssweight="ul=">.
45114508
=item B<-opticalsizes>="I<pattern>=I<min>-I<max> [, I<pattern>=I<min>-I<max> ...]"
45124509
45134510
Manually set or override the fonts' optical size information.
4514-
If a font's file name matches I<pattern>, its optical size information
4511+
If a font's filename matches I<pattern>, its optical size information
45154512
will be set to the range I<min>-I<max> (both given in points).
45164513
The lower bound I<min> is included in the range, the upper bound I<max> isn't.
45174514
Empty values for I<min> and I<max> are interpreted as zero and infinity,
@@ -4526,8 +4523,8 @@ Example:
45264523
Fraunces72pt-Regular.otf \
45274524
Fraunces144pt-Regular.otf
45284525
4529-
The I<pattern> can be any string that is valid in file names
4530-
and LaTeX font names.
4526+
The I<pattern> can be any string that is valid in filenames
4527+
and LaTeX fontnames.
45314528
A default size range can be specified with an empty pattern:
45324529
45334530
-opticalsize="Capt=-8.4,=8.4-13,Subh=13-19.9,Disp=19.9-"
@@ -4536,7 +4533,7 @@ Patterns are tested in descending order of pattern length
45364533
and the first match wins, though B<autoinst> will warn if it finds
45374534
multiple matching patterns (except for the empty pattern).
45384535
4539-
If a font's file name does not contain any of the given patterns,
4536+
If a font's filename does not contain any of the given patterns,
45404537
the optical size data in the font's C<OS/2> table (if any) will be used.
45414538
45424539
B<autoinst> will adjust size ranges so that there are no gaps;
@@ -4549,7 +4546,7 @@ e.g., Fraunces in fact consists of three separate families
45494546
When given the I<-opticalsizes> option, B<autoinst> will try to remove
45504547
the optical size names (i.e., I<pattern>) from the family name,
45514548
so that all fonts will be installed as a single LaTeX family.
4552-
Note that Literata (and maybe other fonts as well) has file names
4549+
Note that Literata (and maybe other fonts as well) has filenames
45534550
like "Literata_24pt-Regular.ttf" but family names like "Literata 24pt";
45544551
in this case the I<pattern> "24pt" will be removed from the family name,
45554552
but the I<pattern> "_24pt" will not, since the underscore doesn't match.
@@ -4583,7 +4580,7 @@ B<autoinst> has finished:
45834580
to convert them to F<tfm/vf> format;
45844581
45854582
=item - move all generated files to a proper TEXMF tree,
4586-
and, if necessary, update the file name database;
4583+
and, if necessary, update the filename database;
45874584
45884585
=item - tell TeX about the new F<map> file
45894586
(usually by running C<updmap> or similar).
@@ -4593,7 +4590,7 @@ and, if necessary, update the file name database;
45934590
Note that some options (I<-target>, I<-vendor> and I<-typeface>)
45944591
are meaningless, and hence ignored, in manual mode.
45954592
4596-
Also note that font name modification doesn't happen in manual mode.
4593+
Also note that fontname modification doesn't happen in manual mode.
45974594
45984595
=item B<-nofigurekern>
45994596
@@ -4664,7 +4661,7 @@ GNU General Public License for more details.
46644661
46654662
=head1 VERSION
46664663
4667-
This document describes B<autoinst> version 20260529.
4664+
This document describes B<autoinst> version 20260706.
46684665
46694666
46704667
=head1 RECENT CHANGES
@@ -4673,6 +4670,10 @@ This document describes B<autoinst> version 20260529.
46734670
46744671
=over 12
46754672
4673+
=item I<2026-07-06>
4674+
4675+
Yea another bugfix: the "Facit" family was split into "Fac" and "Facit".
4676+
46764677
=item I<2026-05-29>
46774678
46784679
Small bugfix.
@@ -4688,7 +4689,7 @@ Several additions and bugfixes (reports and patches by Chris Spiel):
46884689
=item - Log all weights and widths that could not be mapped
46894690
to standard NFSS "series" codes
46904691
4691-
=item - Bugfix: font names starting with "ITC" would be parsed
4692+
=item - Bugfix: fontnames starting with "ITC" would be parsed
46924693
as "italic"
46934694
46944695
=back
@@ -4708,6 +4709,13 @@ When creating math fonts, we use the font's "mgrk" feature,
47084709
if present.
47094710
Fixed a few obscure bugs.
47104711
4712+
=back
4713+
4714+
4715+
=begin Really_old_history
4716+
4717+
=over 12
4718+
47114719
=item I<2025-09-09>
47124720
47134721
Use the font's WeightClass if its weight cannot be determined
@@ -4733,7 +4741,7 @@ except for Libertinus.
47334741
47344742
=item I<2025-06-23>
47354743
4736-
Introduced the "U_" rule for encoding file names.
4744+
Introduced the "U_" rule for encoding filenames.
47374745
47384746
=item I<2025-04-16>
47394747
@@ -4749,13 +4757,6 @@ for Source Serif 4 was biting Libertinus Serif Display
47494757
so we now test if the family is actually Source Serif 4
47504758
before applying that fix.
47514759
4752-
=back
4753-
4754-
4755-
=begin Really_old_history
4756-
4757-
=over 12
4758-
47594760
=item I<2024-01-04>
47604761
47614762
We take a more generic approach to font metadata parsing;
@@ -4836,7 +4837,7 @@ to improve compatibility with the F<microtype> package.
48364837
Made sure that F<pfb> fonts are always generated whenever
48374838
the input fonts are in F<otf> format.
48384839
Added the I<-t1suffix> command-line option,
4839-
to modify the font and file names of those generated Type1 fonts.
4840+
to modify the font- and filenames of those generated Type1 fonts.
48404841
48414842
=item I<2020-06-19>
48424843

texk/texlive/linked_scripts/fontools/ot2kpx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use Getopt::Long ();
3838
use List::Util @List::Util::EXPORT_OK;
3939
use Pod::Usage;
4040

41-
my $VERSION = "20260529";
41+
my $VERSION = "20260706";
4242

4343
our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
4444

@@ -858,7 +858,7 @@ See the GNU General Public License for more details.
858858
859859
=head1 VERSION
860860
861-
This document describes B<ot2kpx> version 20260529.
861+
This document describes B<ot2kpx> version 20260706.
862862
863863
864864
=head1 RECENT CHANGES

0 commit comments

Comments
 (0)