TeX : nfssext : partial update for Karl (fnt prefix -> fntbuild for t…

…emplates)

arkandis/arkandis-manifest.lua

@@ -1,9 +1,9 @@
--- $Id: arkandis-manifest.lua 10753 2025-02-03 06:48:38Z cfrees $
+-- $Id: arkandis-manifest.lua 10787 2025-02-09 18:55:34Z cfrees $
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
 -- local derivedfiles = derivedfiles or {"*.cls","*.enc","*.fd","*.map","*.sty","*.tfm","*.vf"}
 -- local arkandisfiles = arkandisfiles or {"*.afm","*.otf","*.pfb",".pfm","*.ttf","NOTICE.txt","COPYING"}
--- local fnttestfiles = fnttestfiles or {"fnt-tests.tex", "fnt-test.lvt"} 
+-- local fnttestfiles = fnttestfiles or {"fntbuild-regression-test.tex", "fntbuild-test.lvt"} 
 -- local buildscripts = buildscripts or  {"*.lua", "Makefile", "../arkandis/*.lua", "../../fntbuild.lua"}
 -- local fnttestdir = fnttestdir or maindir .. "/fnt-tests"
 -- local testfiles = testfiles or {"*.lvt","*.pvt","*.tlg","*.lve","*.tpf"}
@@ -18,8 +18,8 @@
 ----------------------------------------------------------------------
 ----------------------------------------------------------------------
 local arkandis = arkandis or {}
-local fnttestfiles = fnt.testfiles or "* fnt-tests.tex\n* fnt-test.lvt"
-local fnttablestemplate = fnt.tablestemplate or "\n* fnt-tables.tex"
+local fnttestfiles = fnt.testfiles or "* fntbuild-regression-test.tex\n* fntbuild-test.lvt"
+local fnttablestemplate = fnt.tablestemplate or "\n* fntbuild-tables.tex"
 local sourcefiledir = sourcefiledir or "."
 local builddir = builddir or maindir .. "/build"
 local unpackdir = unpackdir or builddir .. "/unpacked"
@@ -246,7 +246,7 @@ function manifest_setup ()
       name = "Development files",
       dir = testfiledir,
       files = {"*" .. lvtext, "*" .. lveext, "*" .. tlgext, "*" .. pvtext, "*" .. tpfext},
-      description = "Note that tests containing '-auto' are automatically generated by l3build from fnt-test.lvt.\n\n" ..  fnttestfiles .. buildscripts .. bullets(m_fntmkfiles,1) .. fnttablestemplate, 
+      description = "Note that tests containing '-auto' are automatically generated by l3build from fntbuild-test.lvt.\n\n" ..  fnttestfiles .. buildscripts .. bullets(m_fntmkfiles,1) .. fnttablestemplate, 
       exclude = {"*-auto-test" .. lvtext, "*-auto-test-ly1" .. lvtext},
     },
     {
@@ -286,7 +286,7 @@ function manifest_setup ()
       exclude = {".",".."},
       -- dir = unpackdir,
       -- rename = {"%.%w+$",".pdf"},
-      description = "Note that font tables are automatically generated by l3build from fnt-tables.tex.\n",
+      description = "Note that font tables are automatically generated by l3build from fntbuild-tables.tex.\n",
     },
   }
   return groups

fnt-manifest.lua

@@ -1,14 +1,14 @@
--- $Id: fnt-manifest.lua 10757 2025-02-03 15:37:47Z cfrees $
+-- $Id: fnt-manifest.lua 10787 2025-02-09 18:55:34Z cfrees $
 ---------------------------------------------------------------------
 -- local derivedfiles = derivedfiles or {"*.cls","*.enc","*.fd","*.map","*.sty","*.tfm","*.vf"}
 -- local origfntfiles = origfntfiles or {"*.afm","*.otf","*.pfb",".pfm","*.ttf","NOTICE.txt","COPYING"}
--- local fnttestfiles = fnttestfiles or {"fnt-tests.tex", "fnt-test.lvt"} 
+-- local fnttestfiles = fnttestfiles or {"fntbuild-regression-test.tex", "fntbuild-test.lvt"} 
 -- local buildscripts = buildscripts or  {"*.lua", "Makefile", "../vendor/*.lua", "../../fntbuild.lua"}
 -- local fnttestdir = fnttestdir or maindir .. "/fnt-tests"
 -- local testfiles = testfiles or {"*.lvt","*.pvt","*.tlg","*.lve","*.tpf"}
-local fnttestfiles = fnttestfiles or "* fnt-tables.tex\n* fnt-tests.tex\n* fnt-test.lvt"
+local fnttestfiles = fnttestfiles or "* fntbuild-tables.tex\n* fntbuild-regression-test.tex\n* fntbuild-test.lvt"
 local derfntexcfiles = derfntexcfiles or '".",".."'
--- local fnttablestemplate = fnttablestemplate or "* fnt-tables.tex"
+-- local fnttablestemplate = fnttablestemplate or "* fntbuild-tables.tex"
 local function populatescripts()
   -- local vendordir = vendordir or maindir .. "/public"
   local sourcefiledir = sourcefiledir or "."

fontscripts/build.lua

@@ -1,4 +1,4 @@
--- $Id: build.lua 10781 2025-02-08 01:23:14Z cfrees $
+-- $Id: build.lua 10787 2025-02-09 18:55:34Z cfrees $
 -------------------------------------------------------------------------------
 -- This work, which consists of all files listed in manifest.txt, is released 
 -- under the LaTeX Project Public Licence version 1.3c or later. See individual 
@@ -68,7 +68,7 @@ function manifest_setup ()
     {
       name = "Package files",
       dir = unpackdir,
-      files = {"*.cls","*.etx","fnt-test.lvt","*.mtx","*.sty","*.tex","*.txt"},
+      files = {"*.cls","*.etx","fntbuild-test.lvt","*.mtx","*.sty","*.tex","*.txt"},
       exclude = sourcefiles,
       description = "* manifest.txt",
     },
@@ -94,9 +94,9 @@ tdslocations  = {
   "source/latex/fontscripts/*.ins",
   "tex/fontinst/fontscripts/*.etx",
   "tex/fontinst/fontscripts/*.mtx",
-  "tex/latex/fontscripts/fnt-tables.tex",
-  "tex/latex/fontscripts/fnt-test.lvt",
-  "tex/latex/fontscripts/fnt-tests.tex",
+  "tex/latex/fontscripts/fntbuild-tables.tex",
+  "tex/latex/fontscripts/fntbuild-test.lvt",
+  "tex/latex/fontscripts/fntbuild-regression-test.tex",
 }
 unpackexe = "pdflatex"
 --

fontscripts/fntbuild-build.lua

@@ -115,7 +115,7 @@ end
 local function build_fnt (dir,cmd,file)
   file = file or ""
   cmd = cmd or ""
-  dir = dir or unpackdir
+  dir = dir or fnt.fntdir
   local build_fnt_env = fnt.build_fnt_env or {} 
   local build_fnt_envset = ""
   if #build_fnt_env ~= 0 then

fontscripts/fntbuild-vars.lua

@@ -1,4 +1,4 @@
--- $Id: fntbuild-vars.lua 10763 2025-02-04 20:28:32Z cfrees $
+-- $Id: fntbuild-vars.lua 10787 2025-02-09 18:55:34Z cfrees $
 -- fntbuild variables
 -------------------------------------------------
 -------------------------------------------------
@@ -94,7 +94,7 @@ fnt.mapmakers = fnt.mapmakers or {"*-map.tex"}
 -- file containing regression tests
 ---@see check_init() in fntbuild-check.lua
 ---@usage public
-fnt.regress = fnt.regress or "fnt-tests.tex"
+fnt.regress = fnt.regress or "fntbuild-regression-test.tex"
 ---@see fntsubsetter()
 ---@usage public
 ---@boolean
@@ -125,11 +125,11 @@ fnt.subsettemplate = fnt.subsettemplate or
 -- file to use as template for tables
 ---@see doc_init() in fntbuild-doc.lua
 ---@usage public
-fnt.tablestemp = fnt.tablestemp or "fnt-tables.tex"
+fnt.tablestemp = fnt.tablestemp or "fntbuild-tables.tex"
 -- file to use as template for tests
 ---@see check_init() in fntbuild-check.lua
 ---@usage public
-fnt.testtemp = fnt.testtemp or "fnt-test.lvt"
+fnt.testtemp = fnt.testtemp or "fntbuild-test.lvt"
 -------------------------------------------------
 -- fnt.vendor and module must be specified before tdslocations
 ---@usage public

fontscripts/fontscripts.dtx

@@ -29,7 +29,7 @@
 % \iffalse
 %<*driver>
 \RequirePackage{svn-prov}
-\ProvidesFileSVN{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.2 \revinfo][\filebase DTX: l3build scripts for font installation]
+\ProvidesFileSVN{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.2 \revinfo][\filebase DTX: l3build scripts for font installation]
 \DefineFileInfoSVN[fontscripts]
 \documentclass[10pt,british,lm-default=false]{l3doc}
 % l3doc loads fancyvrb
@@ -618,13 +618,13 @@ require(kpse.lookup("fntbuild.lua"))
 %       fnt.mapfiles\_sys && fnt.mapfiles\_sys or \{\} \\
 %       fnt.mapfiles\_add && fnt.mapfiles\_add or \{\} \\
 %       fnt.pkgbase && fnt.pkgbase or '''' \\
-%       fnt.regress && fnt.regress or ''fnt-tests.tex'' \\
+%       fnt.regress && fnt.regress or ''fntbuild-regression-test.tex'' \\
 %       fnt.subset && false \\
 %       fnt.subsetdefns && fnt.subsetdefns or \{\} \\
 %       fnt.subsetfiles && fnt.subsetfiles or \{\} \\
 %       fnt.subsettemplate && fnt.subsettemplate or ''\textbackslash DeclareEncodingSubset\{TS1\}\{\$FONTFAMILY\}\{\$SUBSET\}'' \\
-%       fnt.tablestemp && fnt.tablestemp or ''fnt-tables.tex'' \\
-%       fnt.testtemp && fnt.testtemp or ''fnt-test.lvt'' \\
+%       fnt.tablestemp && fnt.tablestemp or ''fntbuild-tables.tex'' \\
+%       fnt.testtemp && fnt.testtemp or ''fntbuild-test.lvt'' \\
 %       fnt.vendor && fnt.vendor or ''public''\\
 %     \bottomrule
 %   \end{tabularx}
@@ -731,7 +731,7 @@ require(kpse.lookup("fntbuild.lua"))
 % \DescribelVar{fnt.regress}\texttt{fnt.regress}\isstring{filename} \par\noindent
 %
 % The file containing regression tests for use in auto-generating tests.
-% \file{fnt-tests.tex} provides a set used by default.
+% \file{fntbuild-regression-test.tex} provides a set used by default.
 %
 % \changes{v0.2}{2025-01-25}{New variable: \texttt{fnt.subset}.}
 % \DescribelVar{fnt.subset}\texttt{fnt.subset}\isbool \par\noindent
@@ -799,13 +799,13 @@ fnt.subsetdefns.clms = "lmss"
 % \DescribelVar{fnt.tablestemp}\texttt{fnt.tablestemp}\isstring{filename} \par\noindent
 %
 % The file containing the template to use when auto-generating font tables.
-% \file{fnt-tables.tex} provides the default template.
+% \file{fntbuild-tables.tex} provides the default template.
 %
 % \changes{v0.2}{2025-02-04}{New variable: \texttt{fnt.testtemp}.}
 % \DescribelVar{fnt.testtemp}\texttt{fnt.testtemp}\isstring{filename} \par\noindent
 %
 % The file containing the template to use when auto-generating font tests.
-% \file{fnt-test.lvt} provides the default template.
+% \file{fntbuild-test.lvt} provides the default template.
 %
 % \changes{v0.2}{2025-02-05}{Renamed variable: \texttt{fnt.vendor} (was \texttt{vendor}).}
 % \DescribelVar{fnt.vendor}\texttt{fnt.vendor} \isstring{fnt.vendor}
@@ -848,7 +848,7 @@ fnt.subsetdefns.clms = "lmss"
 % The template is used in \file{fntbuild.lua}'s \texttt{doc\_init()} hook to generate \texttt{tex} files populated with font information from font definition files.
 % This is then compiled by \texttt{l3build doc} to produce font tables.
 %
-% Alternative content may be provided by supplying a local copy of \file{fnt-tables.tex} or specifying an alternative template in \texttt{fnt.tablestemp}. 
+% Alternative content may be provided by supplying a local copy of \file{fntbuild-tables.tex} or specifying an alternative template in \texttt{fnt.tablestemp}. 
 % If \texttt{TABLES} occurs in the template, \file{fntbuild.lua} will replace it with a \env{document} environment containing a series of commands of the form \cs{sampletable}\marg{encoding}\marg{family}\marg{series}\marg{shape}, where \meta{encoding}, \meta{family}, \meta{series} and \meta{shape} are  derived from the font definition files.
 %
 % The default template is listed in \cref{subsubsec:tablestemp}.
@@ -860,16 +860,16 @@ fnt.subsetdefns.clms = "lmss"
 % Certain file patterns are excluded from testing.
 % In particular, separate tests are not generated for \texttt{ts1} \texttt{fd} files because these families are typically better tested along with their \texttt{t1} counterparts.
 %
-% Alternative content may be provided by supplying a local copy of \file{fnt-test.lvt} or specifying an alternative template in \texttt{fnt.testtemp}. 
+% Alternative content may be provided by supplying a local copy of \file{fntbuild-test.lvt} or specifying an alternative template in \texttt{fnt.testtemp}. 
 % If \texttt{SAMP} occurs in the template, \file{fntbuild.lua} will replace it with a series of tests derived from the font definition files.
 % These tests should typically use commands provided explicitly or implicitly by the file specified in \texttt{fnt.regress}.
 % By default, tests utilise a macro \cs{sampler} defined to absorb four arguments of the form \marg{encoding}\marg{family}\marg{series}\marg{shape}.
 % The result is a document containing various pieces supplied by \lpack{fonttable}.
 %
-% A custom test suite may be specified by supplying a local copy of \file{fnt-tests.tex}, giving an alternative in \texttt{fnt.regress} or defining a different set of tests in the template specified by \texttt{fnt.testtemp}.
+% A custom test suite may be specified by supplying a local copy of \file{fntbuild-regression-test.tex}, giving an alternative in \texttt{fnt.regress} or defining a different set of tests in the template specified by \texttt{fnt.testtemp}.
 %
 % \textbf{Note that you MUST supply a custom template if you change \texttt{fnt.regress}.}
-% It is, however, fine to supply a customised \file{fnt-tests.tex} for use with the default template.
+% It is, however, fine to supply a customised \file{fntbuild-regression-test.tex} for use with the default template.
 % Only if you want to use a different filename for the test suite is a custom template required.
 %
 % The default template is listed in \cref{subsubsec:testtemp}.
@@ -922,11 +922,11 @@ fnt.subsetdefns.clms = "lmss"
 % \iffalse
 %<*tables>
 % \fi
-% \begin{template}{fnt-tables.tex}
+% \begin{template}{fntbuild-tables.tex}
 %    \begin{macrocode}
 \pdftracingfonts=1
 \RequirePackage{svn-prov}
-\ProvidesFileSVN[fnt-tables.tex]{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.2 \revinfo][\filebase: font table template]
+\ProvidesFileSVN[fnt-tables.tex]{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.2 \revinfo][\filebase: font table template]
 \DefineFileInfoSVN
 %    \end{macrocode}
 % \iffalse
@@ -955,13 +955,13 @@ TABLES
 % \iffalse
 %<*lvt>
 % \fi
-% \begin{template}{fnt-test.lvt}
+% \begin{template}{fntbuild-test.lvt}
 %    \begin{macrocode}
 \RequirePackage{svn-prov}
-\ProvidesFileSVN[fnt-test.lvt]{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.0 \revinfo][fontscripts: l3build test template]
+\ProvidesFileSVN[fnt-test.lvt]{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.0 \revinfo][fontscripts: l3build test template]
 \listfiles
 \input regression-test.tex\relax
-\input fnt-tests.tex\relax
+\input fntbuild-regression-test.tex\relax
 \setlength{\parindent}{0pt}
 \textheight=250mm
 \textwidth=160mm
@@ -988,11 +988,11 @@ SAMP
 % \iffalse
 %<*tests>
 % \fi
-% \begin{template}{fnt-tests.tex}
+% \begin{template}{fntbuild-regression-test.tex}
 %    \begin{macrocode}
 \pdftracingfonts=1
 \RequirePackage{svn-prov}
-\ProvidesFileSVN[fnt-tests.tex]{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.0 \revinfo][fontscripts: l3build tests]
+\ProvidesFileSVN[fnt-tests.tex]{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.0 \revinfo][fontscripts: l3build tests]
 \documentclass[10pt,a4paper]{article}
 \usepackage{fonttable}
 \usepackage{tracefnt}% infoshow is default; debugshow traces maths fonts, too
@@ -1204,7 +1204,7 @@ SAMP
 \RequirePackage{svn-prov}
 \def\GetFileBaseName#1-#2\nil{#1}
 \edef\MyFileBaseName{\expandafter\GetFileBaseName\jobname\nil}
-\ProvidesFileSVN[\MyFileBaseName doc]{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.0 \revinfo]
+\ProvidesFileSVN[\MyFileBaseName doc]{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.0 \revinfo]
 \DefineFileInfoSVN
 \AddToHook{begindocument}{\OnlyDescription}
 \input{\MyFileBaseName.dtx}
@@ -1215,7 +1215,7 @@ SAMP
 \RequirePackage{svn-prov}
 \def\GetFileBaseName#1-#2\nil{#1}
 \edef\MyFileBaseName{\expandafter\GetFileBaseName\jobname\nil}
-\ProvidesFileSVN[\MyFileBaseName code]{$Id: fontscripts.dtx 10771 2025-02-05 22:55:06Z cfrees $}[v0.0 \revinfo]
+\ProvidesFileSVN[\MyFileBaseName code]{$Id: fontscripts.dtx 10787 2025-02-09 18:55:34Z cfrees $}[v0.0 \revinfo]
 \DefineFileInfoSVN
 \input{\MyFileBaseName.dtx}
 %</doc-code>

fontscripts/fontscripts.ins

@@ -1,4 +1,4 @@
-% $Id: fontscripts.ins 10763 2025-02-04 20:28:32Z cfrees $
+% $Id: fontscripts.ins 10787 2025-02-09 18:55:34Z cfrees $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% fontscripts.ins
 %% Additions and changes Copyright (C) 2024-2025 Clea F. Rees.
@@ -156,9 +156,9 @@ https://www.ctan.org/pkg/\maybenoexpand\basePkgName. See \maybenoexpand\baseFile
 \generate{%
   \file{fontscripts-doc.tex}{\from{fontscripts.dtx}{doc}}
   \file{fontscripts-code.tex}{\from{fontscripts.dtx}{doc-code}}
-  \file{fnt-tables.tex}{\from{fontscripts.dtx}{tables}}
-  \file{fnt-tests.tex}{\from{fontscripts.dtx}{tests}}
-  \file{fnt-test.lvt}{\from{fontscripts.dtx}{lvt}}
+  \file{fntbuild-tables.tex}{\from{fontscripts.dtx}{tables}}
+  \file{fntbuild-regression-test.tex}{\from{fontscripts.dtx}{tests}}
+  \file{fntbuild-test.lvt}{\from{fontscripts.dtx}{lvt}}
   \usepreamble\safonolmtx
   \file{unfakable.mtx}{\from{fontscripts.dtx}{unfakable}}
   \usepreamble\safonolenc

test/testfiles/testadf-xxx.lvt

@@ -2,7 +2,7 @@
 % !TEX encoding = UTF-8 Unicode
 \listfiles
 \input regression-test.tex\relax
-\input fnt-tests.tex\relax
+\input fntbuild-regression-test.tex\relax
 
 \usepackage[T1]{fontenc}
 \pdfmapfile{+xxx.map}