texlive[73356] trunk: fontools (7jan25)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 7 22:07:24 CET 2025
Revision: 73356
https://tug.org/svn/texlive?view=revision&revision=73356
Author: karl
Date: 2025-01-07 22:07:24 +0100 (Tue, 07 Jan 2025)
Log Message:
-----------
fontools (7jan25)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst
trunk/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
trunk/Master/texmf-dist/doc/man/man1/afm2afm.1
trunk/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/autoinst.1
trunk/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
trunk/Master/texmf-dist/doc/man/man1/ot2kpx.1
trunk/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
trunk/Master/texmf-dist/doc/support/fontools/splitttc
trunk/Master/texmf-dist/scripts/fontools/afm2afm
trunk/Master/texmf-dist/scripts/fontools/autoinst
trunk/Master/texmf-dist/scripts/fontools/ot2kpx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/support/fontools/LICENSE
trunk/Master/texmf-dist/doc/support/fontools/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/support/fontools/GPLv2.txt
trunk/Master/texmf-dist/doc/support/fontools/README
Modified: trunk/Build/source/texk/texlive/linked_scripts/fontools/afm2afm
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/fontools/afm2afm 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Build/source/texk/texlive/linked_scripts/fontools/afm2afm 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20231230";
+my $VERSION = "20250107";
parse_commandline();
@@ -398,7 +398,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -421,7 +421,7 @@
=head1 VERSION
-This document describes B<afm2afm> version 20231230.
+This document describes B<afm2afm> version 20250107.
=head1 RECENT CHANGES
Modified: trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Build/source/texk/texlive/linked_scripts/fontools/autoinst 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@
use Pod::Usage ();
use POSIX ();
-my $VERSION = '20231230';
+my $VERSION = '20250107';
my ($d, $m, $y) = (localtime time)[3 .. 5];
my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -168,7 +168,6 @@
comp => 'compressed',
cond => 'condensed',
demi => 'demibold',
- exp => 'expanded',
extcond => 'extracondensed',
hair => 'hairline',
incline => 'inclined',
@@ -285,7 +284,7 @@
c => [ qw( condensed ) ],
sc => [ qw( semicondensed narrow ) ],
'' => [ qw( regular ) ],
- sx => [ qw( semiextended semiexpanded wide ) ],
+ sx => [ qw( semiextended semiexpanded wide) ],
x => [ qw( extended expanded ) ],
ex => [],
ux => [],
@@ -321,6 +320,57 @@
=begin Comment
+ The next two tables, DEFAULT_WEIGHT and DEFAULT_WIDTH, map
+ weight_class and width_class indicators (from a font's OS/2 table)
+ to default weight and width names. We use these names as a last resort
+ if font metadata parsing fails.
+
+ The mapping from weight_class and width_class to weight or width names
+ is taken from the OpenType specification (see 5.2.8.3 and 5.2.8.4).
+
+=end Comment
+
+=cut
+
+my %DEFAULT_WEIGHT = (
+ 100 => 'thin',
+ 200 => 'extralight',
+ 300 => 'light',
+ 400 => 'regular',
+ 500 => 'medium',
+ 600 => 'semibold',
+ 700 => 'bold',
+ 800 => 'extrabold',
+ 900 => 'black',
+);
+
+sub get_default_weight {
+ my $weight_class = shift;
+
+ return $DEFAULT_WEIGHT{$weight_class};
+}
+
+my %DEFAULT_WIDTH = (
+ 1 => 'ultracondensed',
+ 2 => 'extracondensed',
+ 3 => 'condensed',
+ 4 => 'semicondensed',
+ 5 => 'regular',
+ 6 => 'semiexpanded',
+ 7 => 'expanded',
+ 8 => 'extraexpanded',
+ 9 => 'ultraexpanded',
+);
+
+sub get_default_width {
+ my $width_class = shift;
+
+ return $DEFAULT_WIDTH{$width_class};
+}
+
+
+=begin Comment
+
The SHAPE table maps various shape names to NFSS codes.
Like in the other * tables, entries may be added to teach autoinst
@@ -530,6 +580,22 @@
$from_nfss->{width}{$nfsswidth} = [];
}
+ # Warn if we (still) don't have a regular weight or width
+ if (!@{$from_nfss->{weight}{''}}) {
+ warn <<"END_NO_REGULAR_WEIGHT";
+[WARNING] I could not find a 'Regular' weight;
+ consider using the '-nfssweight=m=...' option
+ (see the documentation).
+END_NO_REGULAR_WEIGHT
+ }
+ if (!@{$from_nfss->{width}{''}}) {
+ warn <<"END_NO_REGULAR_WIDTH";
+[WARNING] I could not find a 'Regular' width;
+ consider using the '-nfsswidth=m=...' option
+ (see the documentation).
+END_NO_REGULAR_WIDTH
+ }
+
# Reverse the %from_nfss mapping to get %to_nfss
my %to_nfss;
NFSSWEIGHT:
@@ -592,9 +658,9 @@
my $metadata = _get_metadata($filename);
+ $self->_get_missing_metadata($filename);
+
$self->_parse_metadata($metadata)
- ->_parse_cffdata()
- ->_parse_os2data()
->_parse_featuredata()
->_parse_sizedata()
->_parse_nfss_classification()
@@ -627,6 +693,87 @@
# --------------------------------------------------------------------------
+# Get some missing metadata from the font file.
+#
+# otfinfo doesn't extract all the metadata we need, so we parse some of
+# the raw tables from the font file ourselves to get the missing metadata.
+# --------------------------------------------------------------------------
+sub _get_missing_metadata {
+ my ($self, $filename) = @_;
+
+ my $tables;
+ eval {
+ my $cmd = qq(otfinfo --tables "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $tables = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ # We need the cff_name because cfftot1 uses that instead of
+ # the font's PostScript name.
+ $self->{cff_name} = '';
+ if (index($tables, 'CFF') > -1) {
+ my $cff_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "CFF" "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $cff_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my ($name_index) = unpack '@8C/Z', $cff_table;
+
+ $self->{cff_name} = $name_index;
+ }
+
+ # WeightClass and WidthClass contain (numerical) indications
+ # of the font's weight and width
+ $self->{weight_class} = 400;
+ $self->{width_class} = 5;
+ if (index($tables, 'OS/2') > -1) {
+ my $os2_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "OS/2" "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $os2_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table;
+
+ $self->{weight_class} = $weight_class;
+ $self->{width_class} = $width_class;
+ }
+
+ # isFixedPitch does (or at least should) indicate whether
+ # the font is fixed-pitch (i.e., monospaced).
+ if (index($tables, 'post') > -1) {
+ my $post_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "post" "$self->{filename}");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $post_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my $is_fixed_pitch = unpack '@12N', $post_table;
+
+ $self->{is_fixed_pitch} = $is_fixed_pitch;
+ }
+
+ return $self;
+}
+
+
+# --------------------------------------------------------------------------
# Processes the basic metadata for this font.
# --------------------------------------------------------------------------
sub _parse_metadata {
@@ -662,11 +809,18 @@
$data->{subfamily} =~ s/\A (?: ST | T | SD | D)//xms;
}
- # move Adobe's optical size from family to subfamily
- for my $optical (qw(Caption SmText SmallText Subhead Display)) {
- if ($data->{family} =~ s/$optical\z//xms) {
- $data->{subfamily} .= $optical;
- last;
+ # Adobe's Source Serif 4 family name contains the name of the optical master;
+ # we don't want this, as all these fonts should be part of the same family,
+ # with different values for the optical size range.
+ # We therefore move the optical master name from the family to the subfamily.
+ # We don't discard this information entirely, since we need it later on
+ # in _parse_sizedata().
+ if ($data->{family} =~ m/SourceSerifFour/xmsi) {
+ for my $optical (qw(Caption SmText SmallText Subhead Display)) {
+ if ($data->{family} =~ s/$optical\z//xms) {
+ $data->{subfamily} .= $optical;
+ last;
+ }
}
}
@@ -802,6 +956,31 @@
$self->{basicshape} = Attr::to_nfss($self->{shape});
+ # Work around a bug(?) in League Mono: the Regular width has
+ # a WidthClass of 6 instead of 5; that would cause our test below
+ # to (mis)classify it as SemiCondensed.
+ if ($self->{family} eq 'LeagueMono'
+ and $self->{width} eq 'regular'
+ and $self->{width_class} == 6) {
+ $self->{width_class} = 5;
+ }
+
+ # A last-resort approach: if we couldn't parse weight or width,
+ # we use the WeightClass and WidthClass indicators to derive
+ # a default value for weight or width.
+ # The reason we only use this as a last resort is that some fonts
+ # contain non-standard or otherwise non-meaningful values
+ # for these indicators.
+ if ($self->{weight} eq 'regular'
+ and $self->{weight_class} != 400) {
+ $self->{weight} = Attr::get_default_weight($self->{weight_class}) // 'regular';
+ }
+
+ if ($self->{width} eq 'regular'
+ and $self->{width_class} != 5) {
+ $self->{width} = Attr::get_default_width($self->{width_class}) // 'regular';
+ }
+
# We define 'series' as 'weight + width'. This matches NFSS,
# but contradicts how most fonts are named (which is 'width + weight').
$self->{series}
@@ -810,77 +989,13 @@
: $self->{weight} . $self->{width}
;
- return $self;
-}
+ $self->{cff_name} ||= $self->{name};
-
-# --------------------------------------------------------------------------
-# Reads the 'Name INDEX' entry from the CFF table, if that exists.
-#
-# We need this entry only because cfftot1 uses it instead of
-# --------------------------------------------------------------------------
-sub _parse_cffdata {
- my $self = shift;
-
- my $tables;
- eval {
- my $cmd = qq(otfinfo --tables "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $tables = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- if (index($tables, 'CFF') == -1) {
- $self->{cff_name} = $self->{name};
- return $self;
- }
-
- my $cff_table;
- eval {
- my $cmd = qq(otfinfo --dump-table "CFF" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $cff_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- my ($name_index) = unpack '@8C/Z', $cff_table;
-
- $self->{cff_name} = $name_index;
-
return $self;
}
# --------------------------------------------------------------------------
-# Parses usWeightClass and usWidthClass from the OS/2 table.
-# --------------------------------------------------------------------------
-sub _parse_os2data {
- my $self = shift;
-
- my $os2_table;
- eval {
- my $cmd = qq(otfinfo --dump-table "OS/2" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $os2_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table;
-
- $self->{weight_class} = $weight_class;
- $self->{width_class} = $width_class;
-
- return $self;
-}
-
-
-# --------------------------------------------------------------------------
# Returns a list of features that this font supports.
# We include 'kern' in this list even if there is only a 'kern' table
# (but no feature), since otftotfm can also use the (legacy) table.
@@ -952,6 +1067,10 @@
&& $minsize == 8.9 && $maxsize == 13.9) {
($minsize, $maxsize) = (23, 72);
}
+ # Adobe's Source Serif 4 follows the latest version of the OpenType
+ # spec and keeps its optical size info in the STAT (Style Attributes)
+ # table rather than in the OS/2 table. This isn't (yet?) supported
+ # by otfinfo, so we add the missing size info here.
elsif ($self->{family} eq 'SourceSerifFour'
&& $minsize == 0 && $maxsize == 0) {
if ($self->{subfamily} eq 'Caption') {
@@ -986,24 +1105,12 @@
sub _parse_nfss_classification {
my $self = shift;
- my $classification;
- eval {
- my $cmd = qq(otfinfo --dump-table "post" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- my $post_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
+ $self->{nfss} = $self->{is_fixed_pitch} ? 'tt'
+ : $self->{filename} =~ m/mono(?!type)/xmsi ? 'tt'
+ : $self->{filename} =~ m/sans/xmsi ? 'sf'
+ : 'rm'
+ ;
- my $is_fixed_pitch = unpack '@12N', $post_table;
-
- $self->{nfss} = $is_fixed_pitch ? 'tt'
- : $self->{filename} =~ m/mono(?!type)/xmsi ? 'tt'
- : $self->{filename} =~ m/sans/xmsi ? 'sf'
- : 'rm'
- ;
- } or warn "[WARNING] $@";
-
return $self;
}
@@ -4279,7 +4386,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -4302,7 +4409,7 @@
=head1 VERSION
-This document describes B<autoinst> version 20231230.
+This document describes B<autoinst> version 20250107.
=head1 RECENT CHANGES
@@ -4311,6 +4418,22 @@
=over 12
+=item I<2025-01-07>
+
+The 'fix' in font metadata parsing that we introduced
+for Source Serif 4 was biting Libertinus Serif Display
+(and maybe other fonts as well),
+so we now test if the family is actually Source Serif 4
+before applying that fix.
+
+=item I<2024-01-04>
+
+We take a more generic approach to font metadata parsing;
+this should work better for fonts with unusually named weights
+or widths.
+We now also warn in font metadata parsing could not find
+a 'Regular' weight or width.
+
=item I<2023-12-30>
Bugfix: font info parsing now works for Junicode 2.
Modified: trunk/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@
use List::Util @List::Util::EXPORT_OK;
use Pod::Usage;
-my $VERSION = "20231230";
+my $VERSION = "20250107";
our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
@@ -835,7 +835,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -858,7 +858,7 @@
=head1 VERSION
-This document describes B<ot2kpx> version 20231230.
+This document describes B<ot2kpx> version 20250107.
=head1 RECENT CHANGES
Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,6 +1,6 @@
#!/usr/bin/env wish
-# Copyright 2017-2024 Siep Kroonenberg
+# Copyright 2017-2025 Siep Kroonenberg
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -873,7 +873,7 @@
wm title .loading [__ "Loading"]
# wallpaper
- pack [ttk::frame .loading.bg -padding 3pt] -fill both -expand 1
+ pack [ttk::frame .loading.bg -padding 3p] -fill both -expand 1
set lbl [__ \
"If loading takes too long, press Abort and choose another repository."]
@@ -1357,10 +1357,10 @@
### add/remove tlcontrib ###
ttk::label .tlr.contribt -text [__ "tlcontrib additional repository"] \
-font bfont
- pack .tlr.contribt -in .tlr.bg -anchor w -padx 3pt -pady [list 10pt 3pt]
- pack [ttk::label .tlr.contribl] -in .tlr.bg -anchor w -padx 3pt -pady 3pt
+ pack .tlr.contribt -in .tlr.bg -anchor w -padx 3p -pady [list 10p 3p]
+ pack [ttk::label .tlr.contribl] -in .tlr.bg -anchor w -padx 3p -pady 3p
ttk::checkbutton .tlr.contribb -variable ::toggle_contrib
- pack .tlr.contribb -in .tlr.bg -anchor w -padx 3pt -pady [list 3pt 10pt]
+ pack .tlr.contribb -in .tlr.bg -anchor w -padx 3p -pady [list 3p 10p]
set ::toggle_contrib 0
set has_contrib 0
foreach nm [array names ::repos] {
@@ -1379,7 +1379,7 @@
}
# two ways to close the dialog
- pack [ttk::frame .tlr.closebuttons] -pady [list 10pt 0pt] -in .tlr.bg -fill x
+ pack [ttk::frame .tlr.closebuttons] -pady [list 10p 0p] -in .tlr.bg -fill x
ttk::button .tlr.save -text [__ "Save and Load"] -command save_load_repo
ppack .tlr.save -in .tlr.closebuttons -side right
dis_enable_reposave
@@ -2787,7 +2787,7 @@
# with the default ttk::frame color, which seems to work
# everywhere.
pack [ttk::frame .bg] -expand 1 -fill both
- .bg configure -padding 5pt
+ .bg configure -padding 5p
# bottom of main window
pack [ttk::frame .endbuttons] -in .bg -side bottom -fill x
@@ -2820,7 +2820,7 @@
pack [ttk::frame .toprepo] -in .topfl -side top -anchor w
# various info (left frame)
- pack [ttk::frame .topfll] -in .topfl -side top -anchor nw -pady {6pt 0pt}
+ pack [ttk::frame .topfll] -in .topfl -side top -anchor nw -pady {6p 0p}
ttk::label .topfll.lluptodate -text [__ "TL Manager up to date?"] -anchor w
pgrid .topfll.lluptodate -row 2 -column 0 -sticky w
ttk::label .topfll.luptodate -text [__ "Unknown"] -anchor w
@@ -2844,7 +2844,7 @@
pack [ttk::label .topfr.lshell] -side top -anchor e
pack [ttk::separator .sp -orient horizontal] \
- -in .bg -side top -fill x -pady 3pt
+ -in .bg -side top -fill x -pady 3p
# controls frame, between info frame and package list
pack [ttk::frame .middle] -in .bg -side top -fill x
@@ -2854,17 +2854,17 @@
# package list display options
ttk::label .lpack -text [string toupper [__ "Package list"]] \
-font hfont
- pack .lpack -in .pkcontrol -side top -padx 3pt -pady {6pt 6pt} -anchor w
+ pack .lpack -in .pkcontrol -side top -padx 3p -pady {6p 6p} -anchor w
- pack [ttk::frame .pkfilter -relief groove -borderwidth 2 -padding 3pt] \
+ pack [ttk::frame .pkfilter -relief groove -borderwidth 2 -padding 3p] \
-in .pkcontrol -side top -anchor nw
# on my current linux, groove works only with a dimensionless borderwidth
# separator columns
- grid columnconfigure .pkfilter 1 -minsize 20pt
+ grid columnconfigure .pkfilter 1 -minsize 20p
grid [ttk::separator .pkfilter.sep1 -orient vertical] \
-column 1 -row 0 -rowspan 5 -sticky ns
- grid columnconfigure .pkfilter 3 -minsize 20pt
+ grid columnconfigure .pkfilter 3 -minsize 20p
grid [ttk::separator .pkfilter.sep3 -orient vertical] \
-column 3 -row 0 -rowspan 5 -sticky ns
@@ -2887,7 +2887,7 @@
if {! $::have_remote} get_packages_info_remote
collect_and_display_filtered
}
- grid .pkfilter.lstat -column 0 -row 0 -sticky w -padx {3pt 50pt}
+ grid .pkfilter.lstat -column 0 -row 0 -sticky w -padx {3p 50p}
pgrid .pkfilter.inst -column 0 -row 1 -sticky w
pgrid .pkfilter.notins -column 0 -row 2 -sticky w
pgrid .pkfilter.alls -column 0 -row 3 -sticky w
@@ -2947,14 +2947,14 @@
# marking all/none
pack [ttk::frame .pksel] \
- -in .bg -pady 6pt -side top -fill x
+ -in .bg -pady 6p -side top -fill x
pack [ttk::button .mrk_all -text [__ "Mark all displayed"] \
-command mark_displayed] -in .pksel -side left
pack [ttk::button .mrk_none -text [__ "Mark none"] -command unmark_all] \
- -in .pksel -padx 6pt -side left
+ -in .pksel -padx 6p -side left
ttk::label .binwarn \
-text [__ "Only packages for installed platforms are displayed"]
- pack .binwarn -in .pksel -padx 3pt -side right -anchor s
+ pack .binwarn -in .pksel -padx 3p -side right -anchor s
# packages list itself
pack [ttk::frame .fpkg] -in .bg -side top -fill both -expand 1
Modified: trunk/Master/texmf-dist/doc/man/man1/afm2afm.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/afm2afm.1 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/man/man1/afm2afm.1 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,5 +1,5 @@
.\" -*- mode: troff; coding: utf-8 -*-
-.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -55,7 +55,7 @@
.\" ========================================================================
.\"
.IX Title "AFM2AFM 1"
-.TH AFM2AFM 1 2023-12-30 fontools "Marc Penninga"
+.TH AFM2AFM 1 2025-01-07 fontools "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -128,7 +128,7 @@
Marc Penninga <marcpenninga at gmail.com>
.SH COPYRIGHT
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2023 Marc Penninga.
+Copyright (C) 2005\-2025 Marc Penninga.
.SH LICENSE
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -145,7 +145,7 @@
See the GNU General Public License for more details.
.SH VERSION
.IX Header "VERSION"
-This document describes \fBafm2afm\fR version 20231230.
+This document describes \fBafm2afm\fR version 20250107.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source code for the rest of the story.)
Modified: trunk/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/autoinst.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/autoinst.1 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/man/man1/autoinst.1 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,5 +1,5 @@
.\" -*- mode: troff; coding: utf-8 -*-
-.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -55,7 +55,7 @@
.\" ========================================================================
.\"
.IX Title "AUTOINST 1"
-.TH AUTOINST 1 2023-12-30 fontools "Marc Penninga"
+.TH AUTOINST 1 2025-01-07 fontools "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -751,7 +751,7 @@
don't paraphase.
.SH COPYRIGHT
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2023 Marc Penninga.
+Copyright (C) 2005\-2025 Marc Penninga.
.SH LICENSE
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -768,10 +768,24 @@
GNU General Public License for more details.
.SH VERSION
.IX Header "VERSION"
-This document describes \fBautoinst\fR version 20231230.
+This document describes \fBautoinst\fR version 20250107.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source for the full story, all the way back to 2005.)
+.IP \fI2025\-01\-07\fR 12
+.IX Item "2025-01-07"
+The 'fix' in font metadata parsing that we introduced
+for Source Serif 4 was biting Libertinus Serif Display
+(and maybe other fonts as well),
+so we now test if the family is actually Source Serif 4
+before applying that fix.
+.IP \fI2024\-01\-04\fR 12
+.IX Item "2024-01-04"
+We take a more generic approach to font metadata parsing;
+this should work better for fonts with unusually named weights
+or widths.
+We now also warn in font metadata parsing could not find
+a 'Regular' weight or width.
.IP \fI2023\-12\-30\fR 12
.IX Item "2023-12-30"
Bugfix: font info parsing now works for Junicode 2.
Modified: trunk/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/ot2kpx.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/ot2kpx.1 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/man/man1/ot2kpx.1 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,5 +1,5 @@
.\" -*- mode: troff; coding: utf-8 -*-
-.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -55,7 +55,7 @@
.\" ========================================================================
.\"
.IX Title "OT2KPX 1"
-.TH OT2KPX 1 2023-12-30 fontools "Marc Penninga"
+.TH OT2KPX 1 2025-01-07 fontools "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -133,7 +133,7 @@
Marc Penninga <marcpenninga at gmail.com>
.SH COPYRIGHT
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2023 Marc Penninga.
+Copyright (C) 2005\-2025 Marc Penninga.
.SH LICENSE
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -150,7 +150,7 @@
See the GNU General Public License for more details.
.SH VERSION
.IX Header "VERSION"
-This document describes \fBot2kpx\fR version 20231230.
+This document describes \fBot2kpx\fR version 20250107.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source code for the rest of the story.)
Modified: trunk/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/support/fontools/GPLv2.txt
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/GPLv2.txt 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/support/fontools/GPLv2.txt 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,341 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Added: trunk/Master/texmf-dist/doc/support/fontools/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/LICENSE (rev 0)
+++ trunk/Master/texmf-dist/doc/support/fontools/LICENSE 2025-01-07 21:07:24 UTC (rev 73356)
@@ -0,0 +1,341 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Deleted: trunk/Master/texmf-dist/doc/support/fontools/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/README 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/support/fontools/README 2025-01-07 21:07:24 UTC (rev 73356)
@@ -1,84 +0,0 @@
-
- -=- FONTOOLS -=-
-
-
-This package provides tools to simplify using OpenType fonts with LaTeX.
-
-By far the most important program in this bundle is autoinst:
-
- AUTOINST - a wrapper script around Eddie Kohler's LCDF TypeTools.
- Autoinst aims to automate the installation of OpenType fonts in LaTeX
- by calling the LCDF TypeTools (with the correct options) for all fonts
- you wish to install, and generating the necessary .fd and .sty files.
-
-In addition, this bundle contains a few other, less important utilities:
-
- AFM2AFM - re-encode .afm files
-
- OT2KPX - extract kerning pairs from OpenType fonts
-
- SPLITTTC - split an OpenType Collection file (ttc or otc) into
- individual fonts
-
-
-
-PREREQUISITES
-=============
-
-Perl
-
- The Fontools are written in Perl; any remotely recent version should work.
- Perl is usually installed on Linux and Unix systems;
- for Windows, try ActivePerl (http://www.activestate.com)
- or Strawberry Perl (http://strawberryperl.com).
-
-LCDF TypeTools and T1Utils
- Of course, Autoinst needs the LCDF TypeTools and T1Utils
- (available from www.lcdf.org/type, and also on CTAN and in TeXLive);
- these should be installed in a directory on your PATH.
-
-Kpathsea
- Automatically installing the fonts into a suitable TEXMF tree
- (as Autoinst does by default) requires a TeX-installation that uses
- the kpathsea library; with TeX distributions that implement their
- own directory searching (such as MiKTeX), Autoinst will complain that
- it cannot find the kpsewhich program and install all generated files
- into subdirectories of the current directory.
-
- If you use such a TeX distribution, either move these files to their
- destinations by hand, or use the -target command line option
- (please see the manual for more information).
-
-
-Installation
-------------
-When installing manually, the encoding files in the "share/" directory
-should be moved to a "standard" location where otftotfm can find them.
-What this location is depends on your TeX installation;
-in TeXLive, it should be $TEXMFLOCAL/fonts/enc/dvips/fontools/ or,
-if you don't have write permissions in $TEXMFLOCAL,
-$TEXMFHOME/fonts/enc/dvips/fontools/.
-
-The scripts in the "bin/" directory should be placed in a directory
-on your PATH (or else you have to call them with their full path name).
-
-Of course, when using a package manager (such as tlmgr) to do
-the installation, all files will automatically be put in the right
-location.
-
-
-DISCLAIMER
-==========
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-
-
-LICENSE & COPYRIGHT
-===================
-
-This software is copyright (C) 2005-2023 Marc Penninga.
-It is released under the terms of the GNU General Public Licence;
-see the file GPLv2.txt for the license conditions.
Added: trunk/Master/texmf-dist/doc/support/fontools/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/support/fontools/README.md 2025-01-07 21:07:24 UTC (rev 73356)
@@ -0,0 +1,93 @@
+FONTOOLS
+========
+
+This package provides tools to simplify the use of OpenType fonts with pdftex.
+
+By far the most important program in this bundle is autoinst:
+
+ * **autoinst**
+
+ a wrapper script around Eddie Kohler's LCDF TypeTools.
+ Autoinst aims to automate the installation of OpenType fonts in LaTeX
+ by calling the LCDF TypeTools (with the correct options) for all fonts
+ you wish to install, and generating the necessary .fd and .sty files.
+
+In addition, this bundle contains a few other, less important utilities:
+
+* **afm2afm**
+
+ re-encode .afm files
+
+* **ot2kpx**
+
+ extract kerning pairs from OpenType fonts
+
+* **splitttc**
+
+ split an OpenType Collection file (ttc or otc) into individual fonts
+
+
+Prerequisites
+-------------
+
+### Perl
+
+The Fontools are written in Perl; any remotely recent version should work.
+Perl is usually installed on Linux and Unix systems;
+for Windows, try [ActivePerl](http://www.activestate.com)
+or [Strawberry Perl](http://strawberryperl.com).
+
+### LCDF TypeTools and T1Utils
+
+Of course, Autoinst needs the LCDF TypeTools and T1Utils
+(available from <www.lcdf.org/type>, and also on [CTAN](https://ctan.org/pkg/lcdf-typetools)
+and as part of TeXLive);
+these should be installed in a directory on your PATH.
+
+### Kpathsea
+
+Automatically installing the fonts into a suitable TEXMF tree
+(as Autoinst does by default) requires a TeX-installation that uses
+the kpathsea library; with TeX distributions that implement their
+own directory searching (such as MiKTeX), Autoinst will complain that
+it cannot find the kpsewhich program and install all generated files
+into subdirectories of the current directory.
+
+If you use such a TeX distribution, either move these files to their
+destinations by hand, or use the -target command line option
+(please see the manual for more information).
+
+
+Installation
+------------
+
+When installing manually, the encoding files in the `share` directory
+should be moved to a "standard" location where otftotfm can find them.
+What this location is depends on your TeX installation;
+in TeXLive, it should be `$TEXMFLOCAL/fonts/enc/dvips/fontools` or,
+if you don't have write permissions in `$TEXMFLOCAL`,
+`$TEXMFHOME/fonts/enc/dvips/fontools`.
+
+The scripts in the `bin` directory should be placed in a directory
+on your PATH (or else you have to call them with their full path name).
+
+Of course, when using a package manager (such as tlmgr) to do
+the installation, all files will automatically be put in the right
+location.
+
+
+LICENSE & COPYRIGHT
+-------------------
+
+This software is copyright (C) 2005-2025 Marc Penninga.
+It is released under the terms of the GNU General Public Licence;
+see the file LICENSE for the license conditions.
+
+
+DISCLAIMER
+----------
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
Property changes on: trunk/Master/texmf-dist/doc/support/fontools/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/support/fontools/splitttc
===================================================================
--- trunk/Master/texmf-dist/doc/support/fontools/splitttc 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/doc/support/fontools/splitttc 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2023 Marc Penninga.
+ Copyright (C) 2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20231230";
+my $VERSION = "20250107";
parse_commandline();
@@ -280,7 +280,7 @@
=head1 COPYRIGHT
-Copyright (C) 2019-2023 Marc Penninga.
+Copyright (C) 2019-2025 Marc Penninga.
=head1 LICENSE
@@ -303,7 +303,7 @@
=head1 VERSION
-This document describes B<splitttc> version 20231230.
+This document describes B<splitttc> version 20250107.
=head1 RECENT CHANGES
Modified: trunk/Master/texmf-dist/scripts/fontools/afm2afm
===================================================================
--- trunk/Master/texmf-dist/scripts/fontools/afm2afm 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/scripts/fontools/afm2afm 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
use Getopt::Long;
use Pod::Usage;
-my $VERSION = "20231230";
+my $VERSION = "20250107";
parse_commandline();
@@ -398,7 +398,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -421,7 +421,7 @@
=head1 VERSION
-This document describes B<afm2afm> version 20231230.
+This document describes B<afm2afm> version 20250107.
=head1 RECENT CHANGES
Modified: trunk/Master/texmf-dist/scripts/fontools/autoinst
===================================================================
--- trunk/Master/texmf-dist/scripts/fontools/autoinst 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/scripts/fontools/autoinst 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@
use Pod::Usage ();
use POSIX ();
-my $VERSION = '20231230';
+my $VERSION = '20250107';
my ($d, $m, $y) = (localtime time)[3 .. 5];
my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d;
@@ -168,7 +168,6 @@
comp => 'compressed',
cond => 'condensed',
demi => 'demibold',
- exp => 'expanded',
extcond => 'extracondensed',
hair => 'hairline',
incline => 'inclined',
@@ -285,7 +284,7 @@
c => [ qw( condensed ) ],
sc => [ qw( semicondensed narrow ) ],
'' => [ qw( regular ) ],
- sx => [ qw( semiextended semiexpanded wide ) ],
+ sx => [ qw( semiextended semiexpanded wide) ],
x => [ qw( extended expanded ) ],
ex => [],
ux => [],
@@ -321,6 +320,57 @@
=begin Comment
+ The next two tables, DEFAULT_WEIGHT and DEFAULT_WIDTH, map
+ weight_class and width_class indicators (from a font's OS/2 table)
+ to default weight and width names. We use these names as a last resort
+ if font metadata parsing fails.
+
+ The mapping from weight_class and width_class to weight or width names
+ is taken from the OpenType specification (see 5.2.8.3 and 5.2.8.4).
+
+=end Comment
+
+=cut
+
+my %DEFAULT_WEIGHT = (
+ 100 => 'thin',
+ 200 => 'extralight',
+ 300 => 'light',
+ 400 => 'regular',
+ 500 => 'medium',
+ 600 => 'semibold',
+ 700 => 'bold',
+ 800 => 'extrabold',
+ 900 => 'black',
+);
+
+sub get_default_weight {
+ my $weight_class = shift;
+
+ return $DEFAULT_WEIGHT{$weight_class};
+}
+
+my %DEFAULT_WIDTH = (
+ 1 => 'ultracondensed',
+ 2 => 'extracondensed',
+ 3 => 'condensed',
+ 4 => 'semicondensed',
+ 5 => 'regular',
+ 6 => 'semiexpanded',
+ 7 => 'expanded',
+ 8 => 'extraexpanded',
+ 9 => 'ultraexpanded',
+);
+
+sub get_default_width {
+ my $width_class = shift;
+
+ return $DEFAULT_WIDTH{$width_class};
+}
+
+
+=begin Comment
+
The SHAPE table maps various shape names to NFSS codes.
Like in the other * tables, entries may be added to teach autoinst
@@ -530,6 +580,22 @@
$from_nfss->{width}{$nfsswidth} = [];
}
+ # Warn if we (still) don't have a regular weight or width
+ if (!@{$from_nfss->{weight}{''}}) {
+ warn <<"END_NO_REGULAR_WEIGHT";
+[WARNING] I could not find a 'Regular' weight;
+ consider using the '-nfssweight=m=...' option
+ (see the documentation).
+END_NO_REGULAR_WEIGHT
+ }
+ if (!@{$from_nfss->{width}{''}}) {
+ warn <<"END_NO_REGULAR_WIDTH";
+[WARNING] I could not find a 'Regular' width;
+ consider using the '-nfsswidth=m=...' option
+ (see the documentation).
+END_NO_REGULAR_WIDTH
+ }
+
# Reverse the %from_nfss mapping to get %to_nfss
my %to_nfss;
NFSSWEIGHT:
@@ -592,9 +658,9 @@
my $metadata = _get_metadata($filename);
+ $self->_get_missing_metadata($filename);
+
$self->_parse_metadata($metadata)
- ->_parse_cffdata()
- ->_parse_os2data()
->_parse_featuredata()
->_parse_sizedata()
->_parse_nfss_classification()
@@ -627,6 +693,87 @@
# --------------------------------------------------------------------------
+# Get some missing metadata from the font file.
+#
+# otfinfo doesn't extract all the metadata we need, so we parse some of
+# the raw tables from the font file ourselves to get the missing metadata.
+# --------------------------------------------------------------------------
+sub _get_missing_metadata {
+ my ($self, $filename) = @_;
+
+ my $tables;
+ eval {
+ my $cmd = qq(otfinfo --tables "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $tables = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ # We need the cff_name because cfftot1 uses that instead of
+ # the font's PostScript name.
+ $self->{cff_name} = '';
+ if (index($tables, 'CFF') > -1) {
+ my $cff_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "CFF" "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $cff_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my ($name_index) = unpack '@8C/Z', $cff_table;
+
+ $self->{cff_name} = $name_index;
+ }
+
+ # WeightClass and WidthClass contain (numerical) indications
+ # of the font's weight and width
+ $self->{weight_class} = 400;
+ $self->{width_class} = 5;
+ if (index($tables, 'OS/2') > -1) {
+ my $os2_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "OS/2" "$filename");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $os2_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table;
+
+ $self->{weight_class} = $weight_class;
+ $self->{width_class} = $width_class;
+ }
+
+ # isFixedPitch does (or at least should) indicate whether
+ # the font is fixed-pitch (i.e., monospaced).
+ if (index($tables, 'post') > -1) {
+ my $post_table;
+ eval {
+ my $cmd = qq(otfinfo --dump-table "post" "$self->{filename}");
+ open my $otfinfo, '-|:raw', $cmd
+ or die "could not fork(): $!";
+ $post_table = do { local $/; <$otfinfo> };
+ close $otfinfo
+ or die "'$cmd' failed";
+ } or warn "[WARNING] $@";
+
+ my $is_fixed_pitch = unpack '@12N', $post_table;
+
+ $self->{is_fixed_pitch} = $is_fixed_pitch;
+ }
+
+ return $self;
+}
+
+
+# --------------------------------------------------------------------------
# Processes the basic metadata for this font.
# --------------------------------------------------------------------------
sub _parse_metadata {
@@ -662,11 +809,18 @@
$data->{subfamily} =~ s/\A (?: ST | T | SD | D)//xms;
}
- # move Adobe's optical size from family to subfamily
- for my $optical (qw(Caption SmText SmallText Subhead Display)) {
- if ($data->{family} =~ s/$optical\z//xms) {
- $data->{subfamily} .= $optical;
- last;
+ # Adobe's Source Serif 4 family name contains the name of the optical master;
+ # we don't want this, as all these fonts should be part of the same family,
+ # with different values for the optical size range.
+ # We therefore move the optical master name from the family to the subfamily.
+ # We don't discard this information entirely, since we need it later on
+ # in _parse_sizedata().
+ if ($data->{family} =~ m/SourceSerifFour/xmsi) {
+ for my $optical (qw(Caption SmText SmallText Subhead Display)) {
+ if ($data->{family} =~ s/$optical\z//xms) {
+ $data->{subfamily} .= $optical;
+ last;
+ }
}
}
@@ -802,6 +956,31 @@
$self->{basicshape} = Attr::to_nfss($self->{shape});
+ # Work around a bug(?) in League Mono: the Regular width has
+ # a WidthClass of 6 instead of 5; that would cause our test below
+ # to (mis)classify it as SemiCondensed.
+ if ($self->{family} eq 'LeagueMono'
+ and $self->{width} eq 'regular'
+ and $self->{width_class} == 6) {
+ $self->{width_class} = 5;
+ }
+
+ # A last-resort approach: if we couldn't parse weight or width,
+ # we use the WeightClass and WidthClass indicators to derive
+ # a default value for weight or width.
+ # The reason we only use this as a last resort is that some fonts
+ # contain non-standard or otherwise non-meaningful values
+ # for these indicators.
+ if ($self->{weight} eq 'regular'
+ and $self->{weight_class} != 400) {
+ $self->{weight} = Attr::get_default_weight($self->{weight_class}) // 'regular';
+ }
+
+ if ($self->{width} eq 'regular'
+ and $self->{width_class} != 5) {
+ $self->{width} = Attr::get_default_width($self->{width_class}) // 'regular';
+ }
+
# We define 'series' as 'weight + width'. This matches NFSS,
# but contradicts how most fonts are named (which is 'width + weight').
$self->{series}
@@ -810,77 +989,13 @@
: $self->{weight} . $self->{width}
;
- return $self;
-}
+ $self->{cff_name} ||= $self->{name};
-
-# --------------------------------------------------------------------------
-# Reads the 'Name INDEX' entry from the CFF table, if that exists.
-#
-# We need this entry only because cfftot1 uses it instead of
-# --------------------------------------------------------------------------
-sub _parse_cffdata {
- my $self = shift;
-
- my $tables;
- eval {
- my $cmd = qq(otfinfo --tables "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $tables = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- if (index($tables, 'CFF') == -1) {
- $self->{cff_name} = $self->{name};
- return $self;
- }
-
- my $cff_table;
- eval {
- my $cmd = qq(otfinfo --dump-table "CFF" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $cff_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- my ($name_index) = unpack '@8C/Z', $cff_table;
-
- $self->{cff_name} = $name_index;
-
return $self;
}
# --------------------------------------------------------------------------
-# Parses usWeightClass and usWidthClass from the OS/2 table.
-# --------------------------------------------------------------------------
-sub _parse_os2data {
- my $self = shift;
-
- my $os2_table;
- eval {
- my $cmd = qq(otfinfo --dump-table "OS/2" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- $os2_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
- } or warn "[WARNING] $@";
-
- my ($weight_class, $width_class) = unpack '@4n @6n', $os2_table;
-
- $self->{weight_class} = $weight_class;
- $self->{width_class} = $width_class;
-
- return $self;
-}
-
-
-# --------------------------------------------------------------------------
# Returns a list of features that this font supports.
# We include 'kern' in this list even if there is only a 'kern' table
# (but no feature), since otftotfm can also use the (legacy) table.
@@ -952,6 +1067,10 @@
&& $minsize == 8.9 && $maxsize == 13.9) {
($minsize, $maxsize) = (23, 72);
}
+ # Adobe's Source Serif 4 follows the latest version of the OpenType
+ # spec and keeps its optical size info in the STAT (Style Attributes)
+ # table rather than in the OS/2 table. This isn't (yet?) supported
+ # by otfinfo, so we add the missing size info here.
elsif ($self->{family} eq 'SourceSerifFour'
&& $minsize == 0 && $maxsize == 0) {
if ($self->{subfamily} eq 'Caption') {
@@ -986,24 +1105,12 @@
sub _parse_nfss_classification {
my $self = shift;
- my $classification;
- eval {
- my $cmd = qq(otfinfo --dump-table "post" "$self->{filename}");
- open my $otfinfo, '-|:raw', $cmd
- or die "could not fork(): $!";
- my $post_table = do { local $/; <$otfinfo> };
- close $otfinfo
- or die "'$cmd' failed";
+ $self->{nfss} = $self->{is_fixed_pitch} ? 'tt'
+ : $self->{filename} =~ m/mono(?!type)/xmsi ? 'tt'
+ : $self->{filename} =~ m/sans/xmsi ? 'sf'
+ : 'rm'
+ ;
- my $is_fixed_pitch = unpack '@12N', $post_table;
-
- $self->{nfss} = $is_fixed_pitch ? 'tt'
- : $self->{filename} =~ m/mono(?!type)/xmsi ? 'tt'
- : $self->{filename} =~ m/sans/xmsi ? 'sf'
- : 'rm'
- ;
- } or warn "[WARNING] $@";
-
return $self;
}
@@ -4279,7 +4386,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -4302,7 +4409,7 @@
=head1 VERSION
-This document describes B<autoinst> version 20231230.
+This document describes B<autoinst> version 20250107.
=head1 RECENT CHANGES
@@ -4311,6 +4418,22 @@
=over 12
+=item I<2025-01-07>
+
+The 'fix' in font metadata parsing that we introduced
+for Source Serif 4 was biting Libertinus Serif Display
+(and maybe other fonts as well),
+so we now test if the family is actually Source Serif 4
+before applying that fix.
+
+=item I<2024-01-04>
+
+We take a more generic approach to font metadata parsing;
+this should work better for fonts with unusually named weights
+or widths.
+We now also warn in font metadata parsing could not find
+a 'Regular' weight or width.
+
=item I<2023-12-30>
Bugfix: font info parsing now works for Junicode 2.
Modified: trunk/Master/texmf-dist/scripts/fontools/ot2kpx
===================================================================
--- trunk/Master/texmf-dist/scripts/fontools/ot2kpx 2025-01-07 21:06:47 UTC (rev 73355)
+++ trunk/Master/texmf-dist/scripts/fontools/ot2kpx 2025-01-07 21:07:24 UTC (rev 73356)
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
- Copyright (C) 2005-2023 Marc Penninga.
+ Copyright (C) 2005-2025 Marc Penninga.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@
use List::Util @List::Util::EXPORT_OK;
use Pod::Usage;
-my $VERSION = "20231230";
+my $VERSION = "20250107";
our ($NUM_GLYPHS, $UNITS_PER_EM, %kern);
@@ -835,7 +835,7 @@
=head1 COPYRIGHT
-Copyright (C) 2005-2023 Marc Penninga.
+Copyright (C) 2005-2025 Marc Penninga.
=head1 LICENSE
@@ -858,7 +858,7 @@
=head1 VERSION
-This document describes B<ot2kpx> version 20231230.
+This document describes B<ot2kpx> version 20250107.
=head1 RECENT CHANGES
More information about the tex-live-commits
mailing list.