pdftex[889] branches/stable/source/src: sync from tl 65595
commits+karl at tug.org
commits+karl at tug.org
Fri Jan 20 17:39:46 CET 2023
Revision: 889
http://tug.org/svn/pdftex?view=revision&revision=889
Author: karl
Date: 2023-01-20 17:39:45 +0100 (Fri, 20 Jan 2023)
Log Message:
-----------
sync from tl 65595
Modified Paths:
--------------
branches/stable/source/src/build-aux/ar-lib
branches/stable/source/src/build-aux/compile
branches/stable/source/src/build-aux/config.guess
branches/stable/source/src/build-aux/config.sub
branches/stable/source/src/build-aux/depcomp
branches/stable/source/src/build-aux/texinfo.tex
branches/stable/source/src/libs/README
branches/stable/source/src/libs/libpng/ChangeLog
branches/stable/source/src/libs/libpng/README
branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
branches/stable/source/src/libs/libpng/configure
branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
branches/stable/source/src/libs/libpng/libpng-src/AUTHORS
branches/stable/source/src/libs/libpng/libpng-src/CHANGES
branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
branches/stable/source/src/libs/libpng/libpng-src/INSTALL
branches/stable/source/src/libs/libpng/libpng-src/README
branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
branches/stable/source/src/libs/libpng/libpng-src/configure.ac
branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/android-ndk.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux-auxv.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/pngtopng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux_aux.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/checksum-icc.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/cvtcolor.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/intgamma.sh
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/makesRGB.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/png-fix-itxt.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/sRGB.h
branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
branches/stable/source/src/libs/libpng/libpng-src/libpng.3
branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
branches/stable/source/src/libs/libpng/libpng-src/png.c
branches/stable/source/src/libs/libpng/libpng-src/png.h
branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
branches/stable/source/src/libs/libpng/libpng-src/pngread.c
branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
branches/stable/source/src/libs/libpng/libpng-src/scripts/checksym.awk
branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk
branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/intprefix.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos
branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
branches/stable/source/src/libs/libpng/libpng-src/scripts/prefix.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/sym.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.c
branches/stable/source/src/libs/libpng/libpng-src/scripts/vers.c
branches/stable/source/src/libs/libpng/version.ac
branches/stable/source/src/texk/README
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
branches/stable/source/src/texk/kpathsea/win32/mktexfmt.c
branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/ac/web2c.ac
branches/stable/source/src/texk/web2c/am/web.am
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/configure.ac
branches/stable/source/src/texk/web2c/cwebboot.cin
branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
branches/stable/source/src/texk/web2c/cwebdir/common.c
branches/stable/source/src/texk/web2c/cwebdir/common.w
branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweave.w
branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/refsort.ch
branches/stable/source/src/texk/web2c/cwebdir/twinx.ch
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/Makefile.am
branches/stable/source/src/texk/web2c/lib/Makefile.in
branches/stable/source/src/texk/web2c/lib/printversion.c
branches/stable/source/src/texk/web2c/lib/texmfmp.c
branches/stable/source/src/texk/web2c/man/Makefile.in
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/NEWS
branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c
branches/stable/source/src/texk/web2c/synctexdir/synctex_parser.c
branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_readme.md
branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_utils.c
Added Paths:
-----------
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt.sh
branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
branches/stable/source/src/texk/web2c/pdftexdir/wcfname.test
branches/stable/source/src/texk/web2c/tests/fn-euc.txt
branches/stable/source/src/texk/web2c/tests/fn-generate.perl
branches/stable/source/src/texk/web2c/tests/fn-sjis.txt
branches/stable/source/src/texk/web2c/tests/fn-utf8.txt
Removed Paths:
-------------
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest
Modified: branches/stable/source/src/build-aux/ar-lib
===================================================================
--- branches/stable/source/src/build-aux/ar-lib 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/ar-lib 2023-01-20 16:39:45 UTC (rev 889)
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2019-07-04.01; # UTC
-# Copyright (C) 2010-2022 Free Software Foundation, Inc.
+# Copyright (C) 2010-2023 Free Software Foundation, Inc.
# Written by Peter Rosin <peda at lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/compile 2023-01-20 16:39:45 UTC (rev 889)
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2022 Free Software Foundation, Inc.
+# Copyright (C) 1999-2023 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/config.guess 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2022 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-09-17'
+timestamp='2023-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/config.sub 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2022 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-09-17'
+timestamp='2023-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/depcomp 2023-01-20 16:39:45 UTC (rev 889)
@@ -3,7 +3,7 @@
scriptversion=2022-09-18.14; # UTC
-# Copyright (C) 1999-2022 Free Software Foundation, Inc.
+# Copyright (C) 1999-2023 Free Software Foundation, Inc.
# 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
Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/build-aux/texinfo.tex 2023-01-20 16:39:45 UTC (rev 889)
@@ -3,9 +3,9 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2022-11-12.22}
+\def\texinfoversion{2023-01-02.21}
%
-% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -58,12 +58,6 @@
\message{Loading texinfo [version \texinfoversion]:}
-% If in a .fmt file, print the version number
-% and turn on active characters that we couldn't do earlier because
-% they might have appeared in the input file name.
-\everyjob{\message{[Texinfo version \texinfoversion]}%
- \catcode`+=\active \catcode`\_=\active}
-
% LaTeX's \typeout. This ensures that the messages it is used for
% are identical in format to the corresponding ones from latex/pdflatex.
\def\typeout{\immediate\write17}%
@@ -530,7 +524,7 @@
% ... but they get defined via ``\envdef\foo{...}'':
\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
-\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
+\long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
% Check whether we're in the right environment:
\def\checkenv#1{%
@@ -591,6 +585,9 @@
% @/ allows a line break.
\let\/=\allowbreak
+% @- allows explicit insertion of hyphenation points
+\def\-{\discretionary{\normaldash}{}{}}%
+
% @. is an end-of-sentence period.
\def\.{.\spacefactor=\endofsentencespacefactor\space}
@@ -1197,13 +1194,17 @@
%
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
+ \def\curcolor{0 0 0}%
\def\setcolor#1{%
- \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
- \domark
- \pdfsetcolor{#1}%
+ \ifx#1\curcolor\else
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \domark
+ \pdfsetcolor{#1}%
+ \xdef\curcolor{#1}%
+ \fi
}
%
- \def\maincolor{\rgbBlack}
+ \let\maincolor\rgbBlack
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
\def\currentcolordefs{}
@@ -1359,7 +1360,7 @@
%
% by default, use black for everything.
\def\urlcolor{\rgbBlack}
- \def\linkcolor{\rgbBlack}
+ \let\linkcolor\rgbBlack
\def\endlink{\setcolor{\maincolor}\pdfendlink}
%
% Adding outlines to PDF; macros for calculating structure of outlines
@@ -1537,9 +1538,10 @@
\next}
\def\makelink{\addtokens{\toksB}%
{\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
- \def\pdflink#1{%
+ \def\pdflink#1{\pdflinkpage{#1}{#1}}%
+ \def\pdflinkpage#1#2{%
\startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
- \setcolor{\linkcolor}#1\endlink}
+ \setcolor{\linkcolor}#2\endlink}
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\else
% non-pdf mode
@@ -1786,10 +1788,11 @@
\next}
\def\makelink{\addtokens{\toksB}%
{\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
- \def\pdflink#1{%
+ \def\pdflink#1{\pdflinkpage{#1}{#1}}%
+ \def\pdflinkpage#1#2{%
\special{pdf:bann << /Border [0 0 0]
/Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}%
- \setcolor{\linkcolor}#1\endlink}
+ \setcolor{\linkcolor}#2\endlink}
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
%
%
@@ -2134,6 +2137,11 @@
\pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
}%
\fi\fi
+%
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+%
+% (end of cmaps)
% Set the font macro #1 to the font named \fontprefix#2.
@@ -2149,11 +2157,10 @@
\def\setfont#1#2#3#4#5{%
\font#1=\fontprefix#2#3 scaled #4
\csname cmap#5\endcsname#1%
+ \ifx#2\ttshape\hyphenchar#1=-1 \fi
+ \ifx#2\ttbshape\hyphenchar#1=-1 \fi
+ \ifx#2\ttslshape\hyphenchar#1=-1 \fi
}
-% This is what gets called when #5 of \setfont is empty.
-\let\cmap\gobble
-%
-% (end of cmaps)
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
@@ -2674,6 +2681,7 @@
\gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright}
\gdef\setregularquotes{\let`\lq \let'\rq}
}
+\setregularquotes
% Allow an option to not use regular directed right quote/apostrophe
% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
@@ -2815,13 +2823,6 @@
% @sansserif, explicit sans.
\def\sansserif#1{{\sf #1}}
-% We can't just use \exhyphenpenalty, because that only has effect at
-% the end of a paragraph. Restore normal hyphenation at the end of the
-% group within which \nohyphenation is presumably called.
-%
-\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
-\def\restorehyphenation{\hyphenchar\font = `- }
-
\newif\iffrenchspacing
\frenchspacingfalse
@@ -2890,12 +2891,9 @@
% Switch to typewriter.
\tt
%
- % But `\ ' produces the large typewriter interword space.
+ % `\ ' produces the large typewriter interword space.
\def\ {{\spaceskip = 0pt{} }}%
%
- % Turn off hyphenation.
- \nohyphenation
- %
\plainfrenchspacing
#1%
}%
@@ -2902,15 +2900,20 @@
\null % reset spacefactor to 1000
}
-% We *must* turn on hyphenation at `-' and `_' in @code.
-% (But see \codedashfinish below.)
+% This is for LuaTeX: It is not sufficient to disable hyphenation at
+% explicit dashes by setting `\hyphenchar` to -1.
+\def\dashnobreak{%
+ \normaldash
+ \penalty 10000 }
+
+% We must turn on hyphenation at `-' and `_' in @code.
% Otherwise, it is too hard to avoid overfull hboxes
% in the Emacs manual, the Library manual, etc.
+% We explicitly allow hyphenation at these characters
+% using \discretionary.
%
-% Unfortunately, TeX uses one parameter (\hyphenchar) to control
-% both hyphenation at - and hyphenation within words.
-% We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash. -- rms.
+% Hyphenation at - and hyphenation within words was turned off
+% by default for the tt fonts using the \hyphenchar parameter of TeX.
{
\catcode`\-=\active \catcode`\_=\active
\catcode`\'=\active \catcode`\`=\active
@@ -2923,7 +2926,7 @@
\let-\codedash
\let_\codeunder
\else
- \let-\normaldash
+ \let-\dashnobreak
\let_\realunder
\fi
% Given -foo (with a single dash), we do not want to allow a break
@@ -3200,7 +3203,7 @@
% definition of @key with no lozenge.
%
-\def\key#1{{\setregularquotes \nohyphenation \tt #1}\null}
+\def\key#1{{\setregularquotes \tt #1}\null}
% @clicksequence{File @click{} Open ...}
\def\clicksequence#1{\begingroup #1\endgroup}
@@ -3740,13 +3743,14 @@
want the contents after the title page.}}%
\parseargdef\shorttitlepage{%
- \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
- \endgroup\page\hbox{}\page}
+ {\headingsoff \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+ \endgroup\page\hbox{}\page}\pageone}
\envdef\titlepage{%
% Open one extra group, as we want to close it in the middle of \Etitlepage.
\begingroup
\parindent=0pt \textfonts
+ \headingsoff
% Leave some space at the very top of the page.
\vglue\titlepagetopglue
% No rule at page bottom unless we print one at the top with @title.
@@ -3774,11 +3778,9 @@
% If we use the new definition of \page, we always get a blank page
% after the title page, which we certainly don't want.
\oldpage
+ \pageone
\endgroup
%
- % Need this before the \...aftertitlepage checks so that if they are
- % in effect the toc pages will come out with page numbers.
- \HEADINGSon
}
\def\finishtitlepage{%
@@ -3947,7 +3949,6 @@
}
\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
-\HEADINGSoff % it's the default
% When we turn headings on, set the page number to 1.
\def\pageone{
@@ -3971,7 +3972,7 @@
\pageone
\HEADINGSsinglex
}
-\def\HEADINGSon{\HEADINGSdouble}
+% \def\HEADINGSon{\HEADINGSdouble} % defined by \CHAPPAGon
\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
\let\HEADINGSdoubleafter=\HEADINGSafter
@@ -4793,21 +4794,6 @@
\def\docodeindexxxx #1{\docind{\indexname}{#1}}
-% Used for the aux, toc and index files to prevent expansion of Texinfo
-% commands.
-%
-\def\atdummies{%
- \definedummyletter\@%
- \definedummyletter\ %
- \definedummyletter\{%
- \definedummyletter\}%
- \definedummyletter\&%
- %
- % Do the redefinitions.
- \definedummies
- \otherbackslash
-}
-
% \definedummyword defines \#1 as \string\#1\space, thus effectively
% preventing its expansion. This is used only for control words,
% not control letters, because the \space would be incorrect for
@@ -4823,110 +4809,91 @@
%
\def\definedummyword #1{\def#1{\string#1\space}}%
\def\definedummyletter#1{\def#1{\string#1}}%
-\let\definedummyaccent\definedummyletter
-% Called from \atdummies to prevent the expansion of commands.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands. Most of the commands are controlled through the
+% \ifdummies conditional.
%
-\def\definedummies{%
+\def\atdummies{%
+ \dummiestrue
%
- \let\commondummyword\definedummyword
- \let\commondummyletter\definedummyletter
- \let\commondummyaccent\definedummyaccent
- \commondummiesnofonts
+ \definedummyletter\@%
+ \definedummyletter\ %
+ \definedummyletter\{%
+ \definedummyletter\}%
+ \definedummyletter\&%
%
\definedummyletter\_%
\definedummyletter\-%
%
- % Non-English letters.
- \definedummyword\AA
- \definedummyword\AE
- \definedummyword\DH
- \definedummyword\L
- \definedummyword\O
- \definedummyword\OE
- \definedummyword\TH
- \definedummyword\aa
- \definedummyword\ae
- \definedummyword\dh
- \definedummyword\exclamdown
- \definedummyword\l
- \definedummyword\o
- \definedummyword\oe
- \definedummyword\ordf
- \definedummyword\ordm
- \definedummyword\questiondown
- \definedummyword\ss
- \definedummyword\th
- %
- % Although these internal commands shouldn't show up, sometimes they do.
- \definedummyword\bf
- \definedummyword\gtr
- \definedummyword\hat
- \definedummyword\less
- \definedummyword\sf
- \definedummyword\sl
- \definedummyword\tclose
- \definedummyword\tt
- %
- \definedummyword\LaTeX
- \definedummyword\TeX
- %
- % Assorted special characters.
- \definedummyword\ampchar
- \definedummyword\atchar
- \definedummyword\arrow
- \definedummyword\backslashchar
- \definedummyword\bullet
- \definedummyword\comma
- \definedummyword\copyright
- \definedummyword\registeredsymbol
- \definedummyword\dots
- \definedummyword\enddots
- \definedummyword\entrybreak
- \definedummyword\equiv
- \definedummyword\error
- \definedummyword\euro
- \definedummyword\expansion
- \definedummyword\geq
- \definedummyword\guillemetleft
- \definedummyword\guillemetright
- \definedummyword\guilsinglleft
- \definedummyword\guilsinglright
- \definedummyword\lbracechar
- \definedummyword\leq
- \definedummyword\mathopsup
- \definedummyword\minus
- \definedummyword\ogonek
- \definedummyword\pounds
- \definedummyword\point
- \definedummyword\print
- \definedummyword\quotedblbase
- \definedummyword\quotedblleft
- \definedummyword\quotedblright
- \definedummyword\quoteleft
- \definedummyword\quoteright
- \definedummyword\quotesinglbase
- \definedummyword\rbracechar
- \definedummyword\result
- \definedummyword\sub
- \definedummyword\sup
- \definedummyword\textdegree
- %
\definedummyword\subentry
%
% We want to disable all macros so that they are not expanded by \write.
+ \let\commondummyword\definedummyword
\macrolist
\let\value\dummyvalue
%
- \normalturnoffactive
+ \turnoffactive
}
-% \commondummiesnofonts: common to \definedummies and \indexnofonts.
-% Define \commondummyletter, \commondummyaccent and \commondummyword before
-% using. Used for accents, font commands, and various control letters.
-%
-\def\commondummiesnofonts{%
- % Control letters and accents.
+\newif\ifdummies
+\newif\ifindexnofonts
+
+\def\commondummyletter#1{%
+ \expandafter\let\csname\string#1:impl\endcsname#1%
+ \edef#1{%
+ \noexpand\ifindexnofonts
+ % empty expansion
+ \noexpand\else
+ \noexpand\ifdummies\string#1%
+ \noexpand\else
+ \noexpand\jumptwofi % dispose of the \fi
+ \expandafter\noexpand\csname\string#1:impl\endcsname
+ \noexpand\fi
+ \noexpand\fi}%
+}
+
+\def\commondummyaccent#1{%
+ \expandafter\let\csname\string#1:impl\endcsname#1%
+ \edef#1{%
+ \noexpand\ifindexnofonts
+ \noexpand\expandafter % dispose of \else ... \fi
+ \noexpand\asis
+ \noexpand\else
+ \noexpand\ifdummies\string#1%
+ \noexpand\else
+ \noexpand\jumptwofi % dispose of the \fi
+ \expandafter\noexpand\csname\string#1:impl\endcsname
+ \noexpand\fi
+ \noexpand\fi}%
+}
+
+% Like \commondummyaccent but add a \space at the end of the dummy expansion
+% #2 is the expansion used for \indexnofonts. #2 is always followed by
+% \asis to remove a pair of following braces.
+\def\commondummyword#1#2{%
+ \expandafter\let\csname\string#1:impl\endcsname#1%
+ \expandafter\def\csname\string#1:ixnf\endcsname{#2\asis}%
+ \edef#1{%
+ \noexpand\ifindexnofonts
+ \noexpand\expandafter % dispose of \else ... \fi
+ \expandafter\noexpand\csname\string#1:ixnf\endcsname
+ \noexpand\else
+ \noexpand\ifdummies\string#1\space
+ \noexpand\else
+ \noexpand\jumptwofi % dispose of the \fi \fi
+ \expandafter\noexpand\csname\string#1:impl\endcsname
+ \noexpand\fi
+ \noexpand\fi}%
+}
+\def\jumptwofi#1\fi\fi{\fi\fi#1}
+
+% For \atdummies and \indexnofonts. \atdummies sets
+% \dummiestrue and \indexnofonts sets \indexnofontstrue.
+\def\definedummies{
+ % @-sign is always an escape character when reading auxiliary files
+ \escapechar = `\@
+ %
\commondummyletter\!%
\commondummyaccent\"%
\commondummyaccent\'%
@@ -4940,58 +4907,123 @@
\commondummyaccent\^%
\commondummyaccent\`%
\commondummyaccent\~%
- \commondummyword\u
- \commondummyword\v
- \commondummyword\H
- \commondummyword\dotaccent
- \commondummyword\ogonek
- \commondummyword\ringaccent
- \commondummyword\tieaccent
- \commondummyword\ubaraccent
- \commondummyword\udotaccent
- \commondummyword\dotless
%
+ % Control letters and accents.
+ \commondummyword\u {}%
+ \commondummyword\v {}%
+ \commondummyword\H {}%
+ \commondummyword\dotaccent {}%
+ \commondummyword\ogonek {}%
+ \commondummyword\ringaccent {}%
+ \commondummyword\tieaccent {}%
+ \commondummyword\ubaraccent {}%
+ \commondummyword\udotaccent {}%
+ \commondummyword\dotless {}%
+ %
% Texinfo font commands.
- \commondummyword\b
- \commondummyword\i
- \commondummyword\r
- \commondummyword\sansserif
- \commondummyword\sc
- \commondummyword\slanted
- \commondummyword\t
+ \commondummyword\b {}%
+ \commondummyword\i {}%
+ \commondummyword\r {}%
+ \commondummyword\sansserif {}%
+ \commondummyword\sc {}%
+ \commondummyword\slanted {}%
+ \commondummyword\t {}%
%
% Commands that take arguments.
- \commondummyword\abbr
- \commondummyword\acronym
- \commondummyword\anchor
- \commondummyword\cite
- \commondummyword\code
- \commondummyword\command
- \commondummyword\dfn
- \commondummyword\dmn
- \commondummyword\email
- \commondummyword\emph
- \commondummyword\env
- \commondummyword\file
- \commondummyword\image
- \commondummyword\indicateurl
- \commondummyword\inforef
- \commondummyword\kbd
- \commondummyword\key
- \commondummyword\math
- \commondummyword\option
- \commondummyword\pxref
- \commondummyword\ref
- \commondummyword\samp
- \commondummyword\strong
- \commondummyword\tie
- \commondummyword\U
- \commondummyword\uref
- \commondummyword\url
- \commondummyword\var
- \commondummyword\verb
- \commondummyword\w
- \commondummyword\xref
+ \commondummyword\abbr {}%
+ \commondummyword\acronym {}%
+ \commondummyword\anchor {}%
+ \commondummyword\cite {}%
+ \commondummyword\code {}%
+ \commondummyword\command {}%
+ \commondummyword\dfn {}%
+ \commondummyword\dmn {}%
+ \commondummyword\email {}%
+ \commondummyword\emph {}%
+ \commondummyword\env {}%
+ \commondummyword\file {}%
+ \commondummyword\image {}%
+ \commondummyword\indicateurl{}%
+ \commondummyword\inforef {}%
+ \commondummyword\kbd {}%
+ \commondummyword\key {}%
+ \commondummyword\math {}%
+ \commondummyword\option {}%
+ \commondummyword\pxref {}%
+ \commondummyword\ref {}%
+ \commondummyword\samp {}%
+ \commondummyword\strong {}%
+ \commondummyword\tie {}%
+ \commondummyword\U {}%
+ \commondummyword\uref {}%
+ \commondummyword\url {}%
+ \commondummyword\var {}%
+ \commondummyword\verb {}%
+ \commondummyword\w {}%
+ \commondummyword\xref {}%
+ %
+ \commondummyword\AA {AA}%
+ \commondummyword\AE {AE}%
+ \commondummyword\DH {DZZ}%
+ \commondummyword\L {L}%
+ \commondummyword\O {O}%
+ \commondummyword\OE {OE}%
+ \commondummyword\TH {TH}%
+ \commondummyword\aa {aa}%
+ \commondummyword\ae {ae}%
+ \commondummyword\dh {dzz}%
+ \commondummyword\exclamdown {!}%
+ \commondummyword\l {l}%
+ \commondummyword\o {o}%
+ \commondummyword\oe {oe}%
+ \commondummyword\ordf {a}%
+ \commondummyword\ordm {o}%
+ \commondummyword\questiondown {?}%
+ \commondummyword\ss {ss}%
+ \commondummyword\th {th}%
+ %
+ \commondummyword\LaTeX {LaTeX}%
+ \commondummyword\TeX {TeX}%
+ %
+ % Assorted special characters.
+ \commondummyword\ampchar {\normalamp}%
+ \commondummyword\atchar {\@}%
+ \commondummyword\arrow {->}%
+ \commondummyword\backslashchar {}%
+ \commondummyword\bullet {bullet}%
+ \commondummyword\comma {,}%
+ \commondummyword\copyright {copyright}%
+ \commondummyword\dots {...}%
+ \commondummyword\enddots {...}%
+ \commondummyword\entrybreak {}%
+ \commondummyword\equiv {===}%
+ \commondummyword\error {error}%
+ \commondummyword\euro {euro}%
+ \commondummyword\expansion {==>}%
+ \commondummyword\geq {>=}%
+ \commondummyword\guillemetleft {<<}%
+ \commondummyword\guillemetright {>>}%
+ \commondummyword\guilsinglleft {<}%
+ \commondummyword\guilsinglright {>}%
+ \commondummyword\lbracechar {\{}%
+ \commondummyword\leq {<=}%
+ \commondummyword\mathopsup {sup}%
+ \commondummyword\minus {-}%
+ \commondummyword\pounds {pounds}%
+ \commondummyword\point {.}%
+ \commondummyword\print {-|}%
+ \commondummyword\quotedblbase {"}%
+ \commondummyword\quotedblleft {"}%
+ \commondummyword\quotedblright {"}%
+ \commondummyword\quoteleft {`}%
+ \commondummyword\quoteright {'}%
+ \commondummyword\quotesinglbase {,}%
+ \commondummyword\rbracechar {\}}%
+ \commondummyword\registeredsymbol {R}%
+ \commondummyword\result {=>}%
+ \commondummyword\sub {}%
+ \commondummyword\sup {}%
+ \commondummyword\textdegree {o}%
}
\let\indexlbrace\relax
@@ -5042,19 +5074,8 @@
% would be for a given command (usually its argument).
%
\def\indexnofonts{%
- % Accent commands should become @asis.
- \def\commondummyaccent##1{\let##1\asis}%
- % We can just ignore other control letters.
- \def\commondummyletter##1{\let##1\empty}%
- % All control words become @asis by default; overrides below.
- \let\commondummyword\commondummyaccent
- \commondummiesnofonts
+ \indexnofontstrue
%
- % Don't no-op \tt, since it isn't a user-level command
- % and is used in the definitions of the active chars like <, >, |, etc.
- % Likewise with the other plain tex font commands.
- %\let\tt=\asis
- %
\def\ { }%
\def\@{@}%
\def\_{\normalunderscore}%
@@ -5065,66 +5086,7 @@
\let\lbracechar\{%
\let\rbracechar\}%
%
- % Non-English letters.
- \def\AA{AA}%
- \def\AE{AE}%
- \def\DH{DZZ}%
- \def\L{L}%
- \def\OE{OE}%
- \def\O{O}%
- \def\TH{TH}%
- \def\aa{aa}%
- \def\ae{ae}%
- \def\dh{dzz}%
- \def\exclamdown{!}%
- \def\l{l}%
- \def\oe{oe}%
- \def\ordf{a}%
- \def\ordm{o}%
- \def\o{o}%
- \def\questiondown{?}%
- \def\ss{ss}%
- \def\th{th}%
%
- \let\do\indexnofontsdef
- %
- \do\LaTeX{LaTeX}%
- \do\TeX{TeX}%
- %
- % Assorted special characters.
- \do\atchar{@}%
- \do\arrow{->}%
- \do\bullet{bullet}%
- \do\comma{,}%
- \do\copyright{copyright}%
- \do\dots{...}%
- \do\enddots{...}%
- \do\equiv{==}%
- \do\error{error}%
- \do\euro{euro}%
- \do\expansion{==>}%
- \do\geq{>=}%
- \do\guillemetleft{<<}%
- \do\guillemetright{>>}%
- \do\guilsinglleft{<}%
- \do\guilsinglright{>}%
- \do\leq{<=}%
- \do\lbracechar{\{}%
- \do\minus{-}%
- \do\point{.}%
- \do\pounds{pounds}%
- \do\print{-|}%
- \do\quotedblbase{"}%
- \do\quotedblleft{"}%
- \do\quotedblright{"}%
- \do\quoteleft{`}%
- \do\quoteright{'}%
- \do\quotesinglbase{,}%
- \do\rbracechar{\}}%
- \do\registeredsymbol{R}%
- \do\result{=>}%
- \do\textdegree{o}%
- %
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
% makeinfo does not expand macros in the argument to @deffn, which ends up
@@ -5135,17 +5097,14 @@
% to take a single TeX argument. The case of a macro invocation that
% goes to end-of-line is not handled.
%
+ \def\commondummyword##1{\let##1\asis}%
\macrolist
\let\value\indexnofontsvalue
}
-% Give the control sequence a definition that removes the {} that follows
-% its use, e.g. @AA{} -> AA
-\def\indexnofontsdef#1#2{\def#1##1{#2}}%
-
% #1 is the index name, #2 is the entry text.
\def\doind#1#2{%
\iflinks
@@ -5616,6 +5575,11 @@
\newdimen\entryrightmargin
\entryrightmargin=0pt
+% for PDF output, whether to make the text of the entry a link to the page
+% number. set for @contents and @shortcontents where there is only one
+% page number.
+\newif\iflinkentrytext
+
% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
% then page number (#2) flushed to the right margin. It is used for index
% and table of contents entries. The paragraph is indented by \leftskip.
@@ -5642,7 +5606,7 @@
}
\def\entrybreak{\unskip\space\ignorespaces}%
\def\doentry{%
- % Save the text of the entry
+ % Save the text of the entry in \boxA
\global\setbox\boxA=\hbox\bgroup
\bgroup % Instead of the swallowed brace.
\noindent
@@ -5652,12 +5616,21 @@
% with catcodes occurring.
}
{\catcode`\@=11
+% #1 is the page number
\gdef\finishentry#1{%
- \egroup % end box A
+ \egroup % end \boxA
\dimen@ = \wd\boxA % Length of text of entry
+ % add any leaders and page number to \boxA.
\global\setbox\boxA=\hbox\bgroup
- \unhbox\boxA
- % #1 is the page number.
+ \ifpdforxetex
+ \iflinkentrytext
+ \pdflinkpage{#1}{\unhbox\boxA}%
+ \else
+ \unhbox\boxA
+ \fi
+ \else
+ \unhbox\boxA
+ \fi
%
% Get the width of the page numbers, and only use
% leaders if they are present.
@@ -5676,6 +5649,8 @@
\fi
\fi
\egroup % end \boxA
+ %
+ % now output
\ifdim\wd\boxB = 0pt
\noindent\unhbox\boxA\par
\nobreak
@@ -6375,7 +6350,7 @@
\fi
}
-\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
+\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname\HEADINGSon}
\def\CHAPPAGoff{%
\global\let\contentsalignmacro = \chappager
@@ -6392,7 +6367,7 @@
\global\let\pchapsepmacro=\chapoddpage
\global\def\HEADINGSon{\HEADINGSdouble}}
-\CHAPPAGon
+\setchapternewpage on
% \chapmacro - Chapter opening.
%
@@ -6772,6 +6747,7 @@
\def\thistitle{}% no title in double-sided headings
% Record where the Roman numerals started.
\ifnum\romancount=0 \global\romancount=\pagecount \fi
+ \linkentrytexttrue
}
% \raggedbottom in plain.tex hardcodes \topskip so override it
@@ -6899,7 +6875,7 @@
% Chapters, in the short toc.
% See comments in \dochapentry re vbox and related settings.
\def\shortchapentry#1#2#3#4{%
- \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
+ \tocentry{\shortchaplabel{#2}\labelspace #1}{#4}%
}
% Appendices, in the main contents.
@@ -6914,7 +6890,7 @@
% Unnumbered chapters.
\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
-\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
+\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{#4}}
% Sections.
\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
@@ -6946,7 +6922,7 @@
% Move the page numbers slightly to the right
\advance\entryrightmargin by -0.05em
\chapentryfonts
- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+ \tocentry{#1}{#2}%
\endgroup
\nobreak\vskip .25\baselineskip plus.1\baselineskip
}
@@ -6953,17 +6929,17 @@
\def\dosecentry#1#2{\begingroup
\secentryfonts \leftskip=\tocindent
- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+ \tocentry{#1}{#2}%
\endgroup}
\def\dosubsecentry#1#2{\begingroup
\subsecentryfonts \leftskip=2\tocindent
- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+ \tocentry{#1}{#2}%
\endgroup}
\def\dosubsubsecentry#1#2{\begingroup
\subsubsecentryfonts \leftskip=3\tocindent
- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+ \tocentry{#1}{#2}%
\endgroup}
% We use the same \entry macro as for the index entries.
@@ -6972,9 +6948,6 @@
% Space between chapter (or whatever) number and the title.
\def\labelspace{\hskip1em \relax}
-\def\dopageno#1{{\rm #1}}
-\def\doshortpageno#1{{\rm #1}}
-
\def\chapentryfonts{\secfonts \rm}
\def\secentryfonts{\textfonts}
\def\subsecentryfonts{\textfonts}
@@ -7119,8 +7092,7 @@
\newdimen\cartouter\newdimen\cartinner
\newskip\normbskip\newskip\normpskip\newskip\normlskip
-
-\envdef\cartouche{%
+\envparseargdef\cartouche{%
\cartouchefontdefs
\ifhmode\par\fi % can't be in the midst of a paragraph.
\startsavinginserts
@@ -7150,16 +7122,19 @@
\baselineskip=0pt\parskip=0pt\lineskip=0pt
\carttop
\hbox\bgroup
- \hskip\lskip
- \vrule\kern3pt
- \vbox\bgroup
- \kern3pt
- \hsize=\cartinner
- \baselineskip=\normbskip
- \lineskip=\normlskip
- \parskip=\normpskip
- \vskip -\parskip
- \comment % For explanation, see the end of def\group.
+ \hskip\lskip
+ \vrule\kern3pt
+ \vbox\bgroup
+ \hsize=\cartinner
+ \baselineskip=\normbskip
+ \lineskip=\normlskip
+ \parskip=\normpskip
+ \def\arg{#1}%
+ \ifx\arg\empty\else
+ \centerV{\hfil \bf #1 \hfil}%
+ \fi
+ \kern3pt
+ \vskip -\parskip
}
\def\Ecartouche{%
\ifhmode\par\fi
@@ -7410,7 +7385,7 @@
\endgroup
%
\def\setupverb{%
- \tt % easiest (and conventionally used) font for verbatim
+ \tt
\def\par{\leavevmode\endgraf}%
\setcodequotes
\tabeightspaces
@@ -7587,32 +7562,28 @@
\exdentamount=\defbodyindent
}
-\def\dodefunx#1{%
- % First, check whether we are in the right environment:
- \checkenv#1%
- %
- % As above, allow line break if we have multiple x headers in a row.
- % It's not a great place, though.
- \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
- %
- % And now, it's time to reuse the body of the original defun:
- \expandafter\gobbledefun#1%
-}
-\def\gobbledefun#1\startdefun{}
+\newtoks\defidx
+\newtoks\deftext
-% \printdefunline \deffnheader{text}
+\def\useindex#1{\defidx={#1}\ignorespaces}
+
+% Called as \printdefunline \deffooheader{text}
%
\def\printdefunline#1#2{%
\begingroup
\plainfrenchspacing
- % call \deffnheader:
+ % call \deffooheader:
#1#2 \endheader
+ % create the index entry
+ \defcharsdefault
+ \edef\temp{\noexpand\doind{\the\defidx}{\the\deftext}}%
+ \temp
% common ending:
\interlinepenalty = 10000
\advance\rightskip by 0pt plus 1fil\relax
\endgraf
\nobreak\vskip -\parskip
- \penalty\defunpenalty % signal to \startdefun and \dodefunx
+ \penalty\defunpenalty % signal to \startdefun and \deffoox
% Some of the @defun-type tags do not enable magic parentheses,
% rendering the following check redundant. But we don't optimize.
\checkparencounts
@@ -7621,7 +7592,7 @@
\def\Edefun{\endgraf\medbreak}
-% \makedefun{deffoo}{ (definition of \deffooheader) }
+% \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) }
%
% Define \deffoo, \deffoox \Edeffoo and \deffooheader.
\def\makedefun#1{%
@@ -7636,8 +7607,18 @@
\doingtypefnfalse % distinguish typed functions from all else
\parseargusing\activeparens{\printdefunline#3}%
}%
- \def#2{\dodefunx#1}%
- \def#3%
+ \def#2{%
+ % First, check whether we are in the right environment:
+ \checkenv#1%
+ %
+ % As in \startdefun, allow line break if we have multiple x headers
+ % in a row. It's not a great place, though.
+ \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
+ %
+ \doingtypefnfalse % distinguish typed functions from all else
+ \parseargusing\activeparens{\printdefunline#3}%
+ }%
+ \def#3% definition of \deffooheader follows
}
\newif\ifdoingtypefn % doing typed function?
@@ -7662,11 +7643,16 @@
\fi\fi
}
+\def\defind#1#2{
+ \defidx={#1}%
+ \deftext={#2}%
+}
+
% Untyped functions:
% @deffn category name args
\makedefun{deffn}#1 #2 #3\endheader{%
- \doind{fn}{\code{#2}}%
+ \defind{fn}{\code{#2}}%
\defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
}
@@ -7673,7 +7659,7 @@
% @defop category class name args
\makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}}
\def\defopheaderx#1#2 #3 #4\endheader{%
- \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}%
+ \defind{fn}{\code{#3}\space\putwordon\ \code{#2}}%
\defname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
}
@@ -7681,7 +7667,7 @@
% @deftypefn category type name args
\makedefun{deftypefn}#1 #2 #3 #4\endheader{%
- \doind{fn}{\code{#3}}%
+ \defind{fn}{\code{#3}}%
\doingtypefntrue
\defname{#1}{#2}{#3}\defunargs{#4\unskip}%
}
@@ -7689,7 +7675,7 @@
% @deftypeop category class type name args
\makedefun{deftypeop}#1 {\deftypeopheaderx{#1\ \putwordon}}
\def\deftypeopheaderx#1#2 #3 #4 #5\endheader{%
- \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}%
+ \defind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}%
\doingtypefntrue
\defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
}
@@ -7698,7 +7684,7 @@
% @deftypevr category type var args
\makedefun{deftypevr}#1 #2 #3 #4\endheader{%
- \doind{vr}{\code{#3}}%
+ \defind{vr}{\code{#3}}%
\defname{#1}{#2}{#3}\defunargs{#4\unskip}%
}
@@ -7705,7 +7691,7 @@
% @deftypecv category class type var args
\makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}}
\def\deftypecvheaderx#1#2 #3 #4 #5\endheader{%
- \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}%
+ \defind{vr}{\code{#4}\space\putwordof\ \code{#2}}%
\defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
}
@@ -7722,7 +7708,7 @@
% @deftp category name args
\makedefun{deftp}#1 #2 #3\endheader{%
- \doind{tp}{\code{#2}}%
+ \defind{tp}{\code{#2}}%
\defname{#1}{}{#2}\defunargs{#3\unskip}%
}
@@ -7831,10 +7817,12 @@
% Print arguments. Use slanted for @def*, typewriter for @deftype*.
\def\defunargs#1{%
- \df \ifdoingtypefn \tt \else \sl \fi
- \ifflagclear{txicodevaristt}{}%
- {\def\var##1{{\setregularquotes \ttsl ##1}}}%
- #1%
+ \bgroup
+ \df \ifdoingtypefn \tt \else \sl \fi
+ \ifflagclear{txicodevaristt}{}%
+ {\def\var##1{{\setregularquotes \ttsl ##1}}}%
+ #1%
+ \egroup
}
% We want ()&[] to print specially on the defun line.
@@ -9873,12 +9861,10 @@
% For native Unicode handling (XeTeX and LuaTeX)
\nativeunicodechardefs
\else
- % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX)
+ % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX).
+ % Since we already invoke \utfeightchardefs at the top level,
+ % making non-ascii chars active is sufficient.
\setnonasciicharscatcode\active
- % since we already invoked \utfeightchardefs at the top level
- % (below), do not re-invoke it, otherwise our check for duplicated
- % definitions gets triggered. Making non-ascii chars active is
- % sufficient.
\fi
%
\else
@@ -9903,7 +9889,6 @@
\fi
}
-% emacs-page
% A message to be logged when using a character that isn't available
% the default font encoding (OT1).
%
@@ -9912,12 +9897,6 @@
% Take account of \c (plain) vs. \, (Texinfo) difference.
\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
-% First, make active non-ASCII characters in order for them to be
-% correctly categorized when TeX reads the replacement text of
-% macros containing the character definitions.
-\setnonasciicharscatcode\active
-%
-
\def\gdefchar#1#2{%
\gdef#1{%
\ifpassthroughchars
@@ -9927,8 +9906,14 @@
\fi
}}
+\begingroup
+
+% Make non-ASCII characters active for defining the character definition
+% macros.
+\setnonasciicharscatcode\active
+
% Latin1 (ISO-8859-1) character definitions.
-\def\latonechardefs{%
+\gdef\latonechardefs{%
\gdefchar^^a0{\tie}
\gdefchar^^a1{\exclamdown}
\gdefchar^^a2{{\tcfont \char162}} % cent
@@ -10033,7 +10018,7 @@
}
% Latin9 (ISO-8859-15) encoding character definitions.
-\def\latninechardefs{%
+\gdef\latninechardefs{%
% Encoding is almost identical to Latin1.
\latonechardefs
%
@@ -10048,7 +10033,7 @@
}
% Latin2 (ISO-8859-2) character definitions.
-\def\lattwochardefs{%
+\gdef\lattwochardefs{%
\gdefchar^^a0{\tie}
\gdefchar^^a1{\ogonek{A}}
\gdefchar^^a2{\u{}}
@@ -10152,6 +10137,8 @@
\gdefchar^^ff{\dotaccent{}}
}
+\endgroup % active chars
+
% UTF-8 character definitions.
%
% This code to support UTF-8 is based on LaTeX's utf8.def, with some
@@ -10489,7 +10476,7 @@
\DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}%
\DeclareUnicodeCharacter{00AF}{\={ }}%
%
- \DeclareUnicodeCharacter{00B0}{\textdegree}
+ \DeclareUnicodeCharacter{00B0}{\textdegree}%
\DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
\DeclareUnicodeCharacter{00B2}{$^2$}%
\DeclareUnicodeCharacter{00B3}{$^3$}%
@@ -11204,8 +11191,7 @@
\relax
}
-% Define all Unicode characters we know about. This makes UTF-8 the default
-% input encoding and allows @U to work.
+% Define all Unicode characters we know about
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
@@ -11212,6 +11198,7 @@
\utfeightchardefs
\fi
+
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11539,7 +11526,7 @@
\fi
}
-\microtypeON
+\microtypeOFF
\parseargdef\microtype{%
\def\txiarg{#1}%
@@ -11556,6 +11543,9 @@
\message{and turning on texinfo input format.}
+% Make UTF-8 the default encoding.
+\documentencodingzzz{UTF-8}
+
\def^^L{\par} % remove \outer, so ^L can appear in an @comment
\catcode`\^^K = 10 % treat vertical tab as whitespace
@@ -11618,23 +11608,32 @@
% Used sometimes to turn off (effectively) the active characters even after
% parsing them.
\def\turnoffactive{%
- \normalturnoffactive
+ \passthroughcharstrue
+ \let-=\normaldash
+ \let"=\normaldoublequote
+ \let$=\normaldollar %$ font-lock fix
+ \let+=\normalplus
+ \let<=\normalless
+ \let>=\normalgreater
+ \let^=\normalcaret
+ \let_=\normalunderscore
+ \let|=\normalverticalbar
+ \let~=\normaltilde
\otherbackslash
+ \setregularquotes
+ \unsepspaces
}
-\catcode`\@=0
+% If a .fmt file is being used, characters that might appear in a file
+% name cannot be active until we have parsed the command line.
+% So turn them off again, and have \loadconf turn them back on.
+\catcode`+=\other \catcode`\_=\other
+
% \backslashcurfont outputs one backslash character in current font,
% as in \char`\\.
\global\chardef\backslashcurfont=`\\
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef at realbackslash{\}}
-
-% In Texinfo, backslash is an active character; it prints the backslash
-% in fixed width font.
-\catcode`\\=\active % @ for escape char from now on.
-
% Print a typewriter backslash. For math mode, we can't simply use
% \backslashcurfont: the story here is that in math mode, the \char
% of \backslashcurfont ends up printing the roman \ from the math symbol
@@ -11644,109 +11643,120 @@
% ignored family value; char position "5C). We can't use " for the
% usual hex value because it has already been made active.
- at def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
- at let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
+\def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}}
+\let\backslashchar = \ttbackslash % \backslashchar{} is for user documents.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
- at gdef@otherbackslash{@let\=@realbackslash}
+% These are made active for url-breaking, so need
+% active definitions as the normal characters.
+\def\normaldot{.}
+\def\normalquest{?}
+\def\normalslash{/}
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
+% \newlinesloadsconf - call \loadconf as soon as possible in the
+% file, e.g. at the first newline.
%
-{@catcode`- = @active
- @gdef at normalturnoffactive{%
- @passthroughcharstrue
- @let-=@normaldash
- @let"=@normaldoublequote
- @let$=@normaldollar %$ font-lock fix
- @let+=@normalplus
- @let<=@normalless
- @let>=@normalgreater
- @let^=@normalcaret
- @let_=@normalunderscore
- @let|=@normalverticalbar
- @let~=@normaltilde
- @let\=@ttbackslash
- @setregularquotes
- @unsepspaces
- }
+{\catcode`\^=7
+\catcode`\^^M=13
+\gdef\newlineloadsconf{%
+ \catcode`\^^M=13 %
+ \newlineloadsconfzz%
}
-
-% If a .fmt file is being used, characters that might appear in a file
-% name cannot be active until we have parsed the command line.
-% So turn them off again, and have @fixbackslash turn them back on.
- at catcode`+=@other @catcode`@_=@other
-
-% \enablebackslashhack - allow file to begin `\input texinfo'
-%
-% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
-% That is what \eatinput is for; after that, the `\' should revert to printing
-% a backslash.
-% If the file did not have a `\input texinfo', then it is turned off after
-% the first line; otherwise the first `\' in the file would cause an error.
-% This is used on the very last line of this file, texinfo.tex.
-% We also use @c to call @fixbackslash, in case ends of lines are hidden.
-{
- at catcode`@^=7
- at catcode`@^^M=13 at gdef@enablebackslashhack{%
- @global at let\ = @eatinput%
- @catcode`@^^M=13%
- @def at c{@fixbackslash at c}%
- % Definition for the newline at the end of this file.
- @def ^^M{@let^^M at secondlinenl}%
- % Definition for a newline in the main Texinfo file.
- @gdef @secondlinenl{@fixbackslash}%
+\gdef\newlineloadsconfzz#1^^M{%
+ \def\c{\loadconf\c}%
+ % Definition for the first newline read in the file
+ \def ^^M{\loadconf}%
% In case the first line has a whole-line command on it
- @let at originalparsearg@parsearg
- @def at parsearg{@fixbackslash at originalparsearg}
+ \let\originalparsearg\parsearg%
+ \def\parsearg{\loadconf\originalparsearg}%
}}
-{@catcode`@^=7 @catcode`@^^M=13%
- at gdef@eatinput input texinfo#1^^M{@fixbackslash}}
% Emergency active definition of newline, in case an active newline token
% appears by mistake.
-{@catcode`@^=7 @catcode13=13%
- at gdef@enableemergencynewline{%
- @gdef^^M{%
- @par%
- %<warning: active newline>@par%
+{\catcode`\^=7 \catcode13=13%
+\gdef\enableemergencynewline{%
+ \gdef^^M{%
+ \par%
+ %<warning: active newline>\par%
}}}
- at gdef@fixbackslash{%
- @ifx\@eatinput @let\ = @ttbackslash @fi
- @catcode13=5 % regular end of line
- @enableemergencynewline
- @let at c=@comment
- @let at parsearg@originalparsearg
+% \loadconf gets called at the beginning of every Texinfo file.
+% If texinfo.cnf is present on the system, read it. Useful for site-wide
+% @afourpaper, etc. Not opening texinfo.cnf directly in texinfo.tex
+% makes it possible to make a format file for Texinfo.
+%
+\gdef\loadconf{%
+ \relax % Terminate the filename if running as "tex '&texinfo' FILE.texi".
+ %
+ % Turn off the definitions that trigger \loadconf
+ \everyjobreset
+ \catcode13=5 % regular end of line
+ \enableemergencynewline
+ \let\c=\comment
+ \let\parsearg\originalparsearg
+ %
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
- @catcode`+=@active
- @catcode`@_=@active
+ \catcode`+=\active
+ \catcode`\_=\active
%
- % If texinfo.cnf is present on the system, read it.
- % Useful for site-wide @afourpaper, etc. This macro, @fixbackslash, gets
- % called at the beginning of every Texinfo file. Not opening texinfo.cnf
- % directly in this file, texinfo.tex, makes it possible to make a format
- % file for Texinfo.
- %
- @openin 1 texinfo.cnf
- @ifeof 1 @else @input texinfo.cnf @fi
- @closein 1
+ \openin 1 texinfo.cnf
+ \ifeof 1 \else \input texinfo.cnf \fi
+ \closein 1
}
+% Redefine some control sequences to be controlled by the \ifdummies
+% and \ifindexnofonts switches. Do this at the end so that the control
+% sequences are all defined.
+\definedummies
+
+
+
+\catcode`\@=0
+
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef at realbackslash{\}}
+
+% In Texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active % @ for escape char from now on.
+
+ at let\ = @ttbackslash
+
+% If in a .fmt file, print the version number.
+% \eatinput stops the `\input texinfo' from showing up.
+% After that, `\' should revert to printing a backslash.
+% Turn on active characters that we couldn't do earlier because
+% they might have appeared in the input file name.
+%
+ at everyjob{@message{[Texinfo version @texinfoversion]}%
+ @global at let\ = @eatinput
+ @catcode`+=@active @catcode`@_=@active}
+
+{@catcode`@^=7 @catcode`@^^M=13%
+ at gdef@eatinput input texinfo#1^^M{@loadconf}}
+
+ at def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi}
+
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+ at gdef@otherbackslash{@let\=@realbackslash}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+%
+{@catcode`- = @active
+ @gdef at normalturnoffactive{%
+ @turnoffactive
+ @let\=@ttbackslash
+ }
+}
+
% Say @foo, not \foo, in error messages.
@escapechar = `@@
-% These (along with & and #) are made active for url-breaking, so need
-% active definitions as the normal characters.
- at def@normaldot{.}
- at def@normalquest{?}
- at def@normalslash{/}
-
% These look ok in all fonts, so just make them not special.
% @hashchar{} gets its own user-level command, because of #line.
@catcode`@& = @other @def at normalamp{&}
@@ -11761,15 +11771,11 @@
@c Do this last of all since we use ` in the previous @catcode assignments.
@catcode`@'=@active
@catcode`@`=@active
- at setregularquotes
@c Local variables:
@c eval: (add-hook 'before-save-hook 'time-stamp nil t)
@c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}"
- at c page-delimiter: "^\\\\message\\|emacs-page"
+ at c page-delimiter: "^\\\\message"
@c End:
- at c vim:sw=2:
-
- at enablebackslashhack
-
+ at newlineloadsconf
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/README 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-$Id: README 64898 2022-11-02 21:16:57Z kakuto $
+$Id: README 65526 2023-01-12 04:40:09Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -25,8 +25,8 @@
http://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)
-harfbuzz 5.3.1 - checked 20oct22
- https://github.com/harfbuzz/harfbuzz/releases/tag/5.3.1
+harfbuzz 6.0.0 - checked 18dec22
+ https://github.com/harfbuzz/harfbuzz/releases/tag/6.0.0
icu 70.1 - checked 16jan22
https://github.com/unicode-org/icu/releases/
@@ -34,7 +34,7 @@
libpaper 1.1.28 - checked 10sep22
http://ftp.debian.org/debian/pool/main/libp/libpaper/
-libpng 1.6.38 - checked 16sep22
+libpng 1.6.39 - checked 11nov22
https://sourceforge.net/projects/libpng/files/ - used by many
lua 5.2.4 - checked 11mar15
@@ -46,7 +46,7 @@
luajit 2.1.0-beta3 - checked 20jun17
http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
-mpfr 4.1.0 - checked 12jul20
+mpfr 4.2.0 - checked 12jan23
http://ftp.gnu.org/gnu/mpfr/
pixman 0.42.2 - checked 03nov22
Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,8 @@
+2022-11-21 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ Import libpng-1.6.39.
+ * version.ac: Adjust.
+
2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Import libpng-1.6.38.
Modified: branches/stable/source/src/libs/libpng/README
===================================================================
--- branches/stable/source/src/libs/libpng/README 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/README 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
- Building libpng-1.6.38 as part of the TL tree
+ Building libpng-1.6.39 as part of the TL tree
=============================================
This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library
@@ -14,4 +14,4 @@
=============================
2009-07-23 Peter Breitenlohner <peb at mppmu.mpg.de>
-2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+2022-11-21 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Modified: branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/TLpatches/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,7 @@
+2022-11-21 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ Import libpng-1.6.39.
+
2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Import libpng-1.6.38.
Modified: branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/TL-Changes 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/TLpatches/TL-Changes 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.6.38/ tree as obtained from:
- https://sourceforge.net/projects/libpng/files/libpng16/1.6.38/
+Changes applied to the libpng-1.6.39/ tree as obtained from:
+ https://sourceforge.net/projects/libpng/files/libpng16/1.6.39/
Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/configure 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libpng (TeX Live) 1.6.38.
+# Generated by GNU Autoconf 2.71 for libpng (TeX Live) 1.6.39.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -611,8 +611,8 @@
# Identity of this package.
PACKAGE_NAME='libpng (TeX Live)'
PACKAGE_TARNAME='libpng--tex-live-'
-PACKAGE_VERSION='1.6.38'
-PACKAGE_STRING='libpng (TeX Live) 1.6.38'
+PACKAGE_VERSION='1.6.39'
+PACKAGE_STRING='libpng (TeX Live) 1.6.39'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1337,7 +1337,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpng (TeX Live) 1.6.38 to adapt to many kinds of systems.
+\`configure' configures libpng (TeX Live) 1.6.39 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.38:";;
+ short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.39:";;
esac
cat <<\_ACEOF
@@ -1525,7 +1525,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng (TeX Live) configure 1.6.38
+libpng (TeX Live) configure 1.6.39
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1843,7 +1843,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpng (TeX Live) $as_me 1.6.38, which was
+It was created by libpng (TeX Live) $as_me 1.6.39, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4386,7 +4386,7 @@
# Define the identity of the package.
PACKAGE='libpng--tex-live-'
- VERSION='1.6.38'
+ VERSION='1.6.39'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7236,7 +7236,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpng (TeX Live) $as_me 1.6.38, which was
+This file was extended by libpng (TeX Live) $as_me 1.6.39, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7304,7 +7304,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-libpng (TeX Live) config.status 1.6.38
+libpng (TeX Live) config.status 1.6.39
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,5 +1,5 @@
-libpng 1.6.38 - September 14, 2022
-==================================
+libpng 1.6.39 - November 20, 2022
+=================================
This is a public release of libpng, intended for use in production code.
@@ -9,13 +9,13 @@
Source files with LF line endings (for Unix/Linux):
- * libpng-1.6.38.tar.xz (LZMA-compressed, recommended)
- * libpng-1.6.38.tar.gz
+ * libpng-1.6.39.tar.xz (LZMA-compressed, recommended)
+ * libpng-1.6.39.tar.gz
Source files with CRLF line endings (for Windows):
- * lp1638.7z (LZMA-compressed, recommended)
- * lp1638.zip
+ * lpng1639.7z (LZMA-compressed, recommended)
+ * lpng1639.zip
Other information:
@@ -25,13 +25,19 @@
* TRADEMARK.md
-Changes since the previous public release (version 1.6.37)
-----------------------------------------------------------
+Changes from version 1.6.38 to version 1.6.39
+---------------------------------------------
- * Added configurations and scripts for continuous integration.
- * Fixed various errors in the handling of tRNS, hIST and eXIf.
- * Implemented many stability improvements across all platforms.
- * Updated the internal documentation.
+ * Changed the error handler of oversized chunks (i.e. larger than
+ PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error.
+ * Fixed a buffer overflow error in contrib/tools/pngfix.
+ * Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp.
+ * Disabled the ARM Neon optimizations by default in the CMake file,
+ following the default behavior of the configure script.
+ * Allowed configure.ac to work with the trunk version of autoconf.
+ * Removed the support for "install" targets from the legacy makefiles;
+ removed the obsolete makefile.cegcc.
+ * Cleaned up the code and updated the internal documentation.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Modified: branches/stable/source/src/libs/libpng/libpng-src/AUTHORS
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/AUTHORS 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/AUTHORS 2023-01-20 16:39:45 UTC (rev 889)
@@ -35,9 +35,10 @@
* Arm Holdings
- Richard Townsend
* Google Inc.
+ - Dan Field
+ - Leon Scroggins III
- Matt Sarett
- Mike Klein
- - Dan Field
- Sami Boukortt
The build projects, the build scripts, the test scripts, and other
Modified: branches/stable/source/src/libs/libpng/libpng-src/CHANGES
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2023-01-20 16:39:45 UTC (rev 889)
@@ -4052,7 +4052,7 @@
(in fact this is harmless, but the PNG data produced may be sub-optimal).
Version 1.6.0beta17 [March 10, 2012]
- Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
+ Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
Reject all iCCP chunks after the first, even if the first one is invalid.
Deflate/inflate was reworked to move common zlib calls into single
functions [rw]util.c. A new shared keyword check routine was also added
@@ -4962,7 +4962,7 @@
Changed "if defined(__ARM_NEON__)" to
"if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu).
Fixed clang no-warning builds: png_digit was defined but never used.
-
+
Version 1.6.13beta02 [July 21, 2014]
Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32
(bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11.
@@ -5453,7 +5453,7 @@
Version 1.6.21beta02 [December 14, 2015]
Moved png_check_keyword() from pngwutil.c to pngset.c
Removed LE/BE dependencies in pngvalid, to 'fix' the current problem
- in the BigEndian tests by not testing it, making the BE code the same
+ in the BigEndian tests by not testing it, making the BE code the same
as the LE version.
Fixes to pngvalid for various reduced build configurations (eliminate unused
statics) and a fix for the case in rgb_to_gray when the digitize option
@@ -5517,7 +5517,7 @@
Added a common-law trademark notice and export control information
to the LICENSE file, png.h, and the man page.
Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
- were accidentally removed from libpng-1.6.17.
+ were accidentally removed from libpng-1.6.17.
Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
(Robert C. Seacord).
Removed dubious "#if INT_MAX" test from png.h that was added to
@@ -5950,7 +5950,7 @@
Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation,
no longer using deprecated cmake LOCATION feature (Clifford Yapp).
Fixed five-byte error in the calculation of IDAT maximum possible size.
-
+
Version 1.6.32beta10 [August 5, 2017]
Moved chunk-length check into a png_check_chunk_length() private
function (Suggested by Max Stepin).
@@ -6109,6 +6109,18 @@
Implemented many stability improvements across all platforms.
Updated the internal documentation.
+Version 1.6.39 [November 20, 2022]
+ Changed the error handler of oversized chunks (i.e. larger than
+ PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error.
+ Fixed a buffer overflow error in contrib/tools/pngfix.
+ Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp.
+ Disabled the ARM Neon optimizations by default in the CMake file,
+ following the default behavior of the configure script.
+ Allowed configure.ac to work with the trunk version of autoconf.
+ Removed the support for "install" targets from the legacy makefiles;
+ removed the obsolete makefile.cegcc.
+ Cleaned up the code and updated the internal documentation.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Subscription is required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Modified: branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -19,6 +19,7 @@
# Revised by Owen Rudge, 2020
# Revised by Gleb Mazovetskiy, 2021
# Revised by Christopher Sean Morrison, 2022
+# Revised by Martin Storsjo, 2022
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
@@ -32,7 +33,7 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
-set(PNGLIB_REVISION 38)
+set(PNGLIB_REVISION 39)
set(PNGLIB_SUBREVISION 0)
#set(PNGLIB_SUBREVISION "git")
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
@@ -98,8 +99,8 @@
CACHE STRING "Enable ARM NEON optimizations: on|off; on is default")
else()
set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
- set(PNG_ARM_NEON "check"
- CACHE STRING "Enable ARM NEON optimizations: check|on|off; check is default")
+ set(PNG_ARM_NEON "off"
+ CACHE STRING "Enable ARM NEON optimizations: check|on|off; off is default")
endif()
set_property(CACHE PNG_ARM_NEON
PROPERTY STRINGS ${PNG_ARM_NEON_POSSIBLE_VALUES})
Modified: branches/stable/source/src/libs/libpng/libpng-src/INSTALL
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2023-01-20 16:39:45 UTC (rev 889)
@@ -192,11 +192,11 @@
Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare
your output with the result shown in contrib/pngsuite/README.
-Most of the makefiles will allow you to run "make install" to
-put the library in its final resting place (if you want to
-do that, run "make install" in the zlib directory first if necessary).
-Some also allow you to run "make test-installed" after you have
-run "make install".
+Most of the makefiles used to allow you to run "make install" to put
+the library in its final resting place, but that feature is no longer
+supported. The only tested and supported manners to install libpng are
+the conventional build and install procedures driven by the configure
+script or by the CMake file.
VIII. Configuring for DOS and other 16-bit platforms
Modified: branches/stable/source/src/libs/libpng/libpng-src/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/README 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/README 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-README for libpng version 1.6.38
+README for libpng version 1.6.39
================================
See the note about version numbers near the top of png.h.
@@ -106,73 +106,74 @@
Files in this distribution:
- ANNOUNCE => Announcement of this version, with recent changes
- AUTHORS => List of contributing authors
- CHANGES => Description of changes between libpng versions
- KNOWNBUG => List of known bugs and deficiencies
- LICENSE => License to use and redistribute libpng
- README => This file
- TODO => Things not implemented in the current library
- TRADEMARK => Trademark information
- example.c => Example code for using libpng functions
- libpng.3 => manual page for libpng (includes libpng-manual.txt)
- libpng-manual.txt => Description of libpng and its functions
- libpngpf.3 => manual page for libpng's private functions
- png.5 => manual page for the PNG format
- png.c => Basic interface functions common to library
- png.h => Library function and interface declarations (public)
- pngpriv.h => Library function and interface declarations (private)
- pngconf.h => System specific library configuration (public)
- pngstruct.h => png_struct declaration (private)
- pnginfo.h => png_info struct declaration (private)
- pngdebug.h => debugging macros (private)
- pngerror.c => Error/warning message I/O functions
- pngget.c => Functions for retrieving info from struct
- pngmem.c => Memory handling functions
- pngbar.png => PNG logo, 88x31
- pngnow.png => PNG logo, 98x31
- pngpread.c => Progressive reading functions
- pngread.c => Read data/helper high-level functions
- pngrio.c => Lowest-level data read I/O functions
- pngrtran.c => Read data transformation functions
- pngrutil.c => Read data utility functions
- pngset.c => Functions for storing data into the info_struct
- pngtest.c => Library test program
- pngtest.png => Library test sample image
- pngtrans.c => Common data transformation functions
- pngwio.c => Lowest-level write I/O functions
- pngwrite.c => High-level write functions
- pngwtran.c => Write data transformations
- pngwutil.c => Write utility functions
- arm => Contains optimized code for the ARM platform
- powerpc => Contains optimized code for the PowerPC platform
- contrib => Contributions
- arm-neon => Optimized code for ARM-NEON platform
- powerpc-vsx => Optimized code for POWERPC-VSX platform
- examples => Example programs
- gregbook => source code for PNG reading and writing, from
- Greg Roelofs' "PNG: The Definitive Guide",
- O'Reilly, 1999
- libtests => Test programs
- mips-msa => Optimized code for MIPS-MSA platform
- pngminim => Minimal decoder, encoder, and progressive decoder
- programs demonstrating use of pngusr.dfa
- pngminus => Simple pnm2png and png2pnm programs
- pngsuite => Test images
- testpngs
- tools => Various tools
- visupng => Contains a MSVC workspace for VisualPng
- intel => Optimized code for INTEL-SSE2 platform
- mips => Optimized code for MIPS platform
- projects => Contains project files and workspaces for
- building a DLL
- owatcom => Contains a WATCOM project for building libpng
- visualc71 => Contains a Microsoft Visual C++ (MSVC)
- workspace for building libpng and zlib
- vstudio => Contains a Microsoft Visual C++ (MSVC)
- workspace for building libpng and zlib
- scripts => Directory containing scripts for building libpng:
- (see scripts/README.txt for the list of scripts)
+ ANNOUNCE => Announcement of this version, with recent changes
+ AUTHORS => List of contributing authors
+ CHANGES => Description of changes between libpng versions
+ INSTALL => Instructions to install libpng
+ LICENSE => License to use and redistribute libpng
+ README => This file
+ TODO => Things not implemented in the current library
+ TRADEMARK => Trademark information
+ example.c => Example code for using libpng functions
+ libpng.3 => Manual page for libpng (includes libpng-manual.txt)
+ libpng-manual.txt => Description of libpng and its functions
+ libpngpf.3 => Manual page for libpng's private functions (deprecated)
+ png.5 => Manual page for the PNG format
+ png.c => Basic interface functions common to library
+ png.h => Library function and interface declarations (public)
+ pngpriv.h => Library function and interface declarations (private)
+ pngconf.h => System specific library configuration (public)
+ pngstruct.h => png_struct declaration (private)
+ pnginfo.h => png_info struct declaration (private)
+ pngdebug.h => debugging macros (private)
+ pngerror.c => Error/warning message I/O functions
+ pngget.c => Functions for retrieving info from struct
+ pngmem.c => Memory handling functions
+ pngbar.png => PNG logo, 88x31
+ pngnow.png => PNG logo, 98x31
+ pngpread.c => Progressive reading functions
+ pngread.c => Read data/helper high-level functions
+ pngrio.c => Lowest-level data read I/O functions
+ pngrtran.c => Read data transformation functions
+ pngrutil.c => Read data utility functions
+ pngset.c => Functions for storing data into the info_struct
+ pngtest.c => Library test program
+ pngtest.png => Library test sample image
+ pngtrans.c => Common data transformation functions
+ pngwio.c => Lowest-level write I/O functions
+ pngwrite.c => High-level write functions
+ pngwtran.c => Write data transformations
+ pngwutil.c => Write utility functions
+ arm/ => Optimized code for the ARM platform
+ intel/ => Optimized code for the INTEL-SSE2 platform
+ mips/ => Optimized code for the MIPS platform
+ powerpc/ => Optimized code for the PowerPC platform
+ ci/ => Scripts for continuous integration
+ contrib/ => External contributions
+ arm-neon/ => Optimized code for the ARM-NEON platform
+ mips-msa/ => Optimized code for the MIPS-MSA platform
+ powerpc-vsx/ => Optimized code for the POWERPC-VSX platform
+ examples/ => Example programs
+ gregbook/ => Source code for PNG reading and writing, from
+ "PNG: The Definitive Guide" by Greg Roelofs,
+ O'Reilly, 1999
+ libtests/ => Test programs
+ oss-fuzz/ => Files used by the OSS-Fuzz project for fuzz-testing
+ libpng
+ pngminim/ => Minimal decoder, encoder, and progressive decoder
+ programs demonstrating the use of pngusr.dfa
+ pngminus/ => Simple pnm2png and png2pnm programs
+ pngsuite/ => Test images
+ testpngs/ => Test images
+ tools/ => Various tools
+ visupng/ => VisualPng, a Windows viewer for PNG images
+ projects/ => Project files and workspaces for various IDEs
+ owatcom/ => OpenWatcom project
+ visualc71/ => Microsoft Visual C++ 7.1 workspace
+ vstudio/ => Microsoft Visual Studio workspace
+ scripts/ => Scripts and makefiles for building libpng
+ (see scripts/README.txt for the complete list)
+ tests/ => Test scripts
Good luck, and happy coding!
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -36,7 +36,10 @@
#ifndef PNG_ARM_NEON_FILE
# if defined(__aarch64__) || defined(_M_ARM64)
/* ARM Neon is expected to be unconditionally available on ARM64. */
-# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this platform"
+# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on ARM64"
+# elif defined(__ARM_NEON__) || defined(__ARM_NEON)
+ /* ARM Neon is expected to be available on the target CPU architecture. */
+# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
# elif defined(__linux__)
# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
# else
Modified: branches/stable/source/src/libs/libpng/libpng-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2023-01-20 16:39:45 UTC (rev 889)
@@ -25,7 +25,7 @@
dnl Version number stuff here:
-AC_INIT([libpng],[1.6.38],[png-mng-implement at lists.sourceforge.net])
+AC_INIT([libpng],[1.6.39],[png-mng-implement at lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
@@ -46,10 +46,10 @@
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
-PNGLIB_VERSION=1.6.38
+PNGLIB_VERSION=1.6.39
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
-PNGLIB_RELEASE=38
+PNGLIB_RELEASE=39
dnl End of version number stuff
@@ -138,7 +138,8 @@
AC_C_RESTRICT
# Checks for library functions.
-AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)))
+AC_CHECK_FUNCS([pow], ,
+ [AC_CHECK_LIB([m], [pow], , [AC_MSG_ERROR([cannot find pow])])])
# Some later POSIX 1003.1 functions are required for test programs, failure
# here is soft (the corresponding test program is not built).
@@ -150,8 +151,9 @@
[prefix that may have been used in installed zlib]),
[ZPREFIX=${withval}],
[ZPREFIX='z_'])
-AC_CHECK_LIB(z, zlibVersion, ,
- AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, , AC_MSG_ERROR(zlib not installed)))
+AC_CHECK_LIB([z], [zlibVersion], ,
+ [AC_CHECK_LIB([z], [${ZPREFIX}zlibVersion], ,
+ [AC_MSG_ERROR([zlib not installed])])])
# The following is for pngvalid, to ensure it catches FP errors even on
# platforms that don't enable FP exceptions, the function appears in the math
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/android-ndk.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/android-ndk.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/android-ndk.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,7 +2,6 @@
*
* Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Bowler, 2014.
- * Last changed in libpng 1.6.10 [March 6, 2014]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -24,6 +23,7 @@
* has been compiled only, not linked: no version of the library has been found,
* only the header files exist in the NDK.
*/
+
#include <cpu-features.h>
static int
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux-auxv.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux-auxv.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux-auxv.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,7 +2,6 @@
*
* Copyright (c) 2014 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.10 [March 6, 2014]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -22,6 +21,7 @@
* This generic __linux__ implementation requires reading /proc/self/auxv and
* looking at each element for one that records NEON capabilities.
*/
+
#include <unistd.h> /* for POSIX 1003.1 */
#include <errno.h> /* for EINTR */
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/arm-neon/linux.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,5 @@
/* contrib/arm-neon/linux.c
*
- * Last changed in libpng 1.6.31 [July 27, 2017]
* Copyright (c) 2014, 2017 Glenn Randers-Pehrson
* Written by John Bowler, 2014, 2017.
*
@@ -19,6 +18,7 @@
* This code is strict ANSI-C and is probably moderately portable; it does
* however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
*/
+
#include <stdio.h>
static int
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/pngtopng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/pngtopng.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/examples/pngtopng.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -5,8 +5,6 @@
* related or neighboring rights to this work. This work is published from:
* United States.
*
- * Last changed in libpng 1.6.29 [March 16, 2017]
- *
* Read a PNG and write it out in a fixed format, using the 'simplified API'
* that was introduced in libpng-1.6.0.
*
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,3 @@
-Last changed in libpng 1.6.33 [September 28, 2017]
Copyright (c) 2017 Glenn Randers-Pehrson
This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,5 @@
#!/bin/bash -eu
+
# Copyright 2017-2018 Glenn Randers-Pehrson
# Copyright 2016 Google Inc.
#
@@ -14,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Last changed in libpng 1.6.35 [July 15, 2018]
-#
# Revisions by Glenn Randers-Pehrson, 2017:
# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
# "make -j$(nproc) libpng16.la").
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc 2023-01-20 16:39:45 UTC (rev 889)
@@ -5,8 +5,6 @@
// Use of this source code is governed by a BSD-style license that may
// be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE
-// Last changed in libpng 1.6.35 [July 15, 2018]
-
// The modifications in 2017 by Glenn Randers-Pehrson include
// 1. addition of a PNG_CLEANUP macro,
// 2. setting the option to ignore ADLER32 checksums,
@@ -17,6 +15,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <stdlib.h>
#include <string.h>
#include <vector>
@@ -60,7 +59,7 @@
png_free(png_ptr, row_ptr);
if (end_info_ptr)
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr);
- else if (info_ptr)
+ else if (info_ptr)
png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
else
png_destroy_read_struct(&png_ptr, nullptr, nullptr);
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,7 +2,6 @@
*
* Copyright (c) 2017 Glenn Randers-Pehrson
* Written by Vadim Barkov, 2017.
- * Last changed in libpng 1.6.29 [March 16, 2017]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -12,7 +11,7 @@
* BUG REPORTS: png-mng-implement at sourceforge.net
*
* png_have_vsx implemented for Linux by reading the widely available
- * pseudo-file /proc/cpuinfo.
+ * pseudo-file /proc/cpuinfo.
*
* This code is strict ANSI-C and is probably moderately portable; it does
* however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux_aux.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux_aux.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/powerpc-vsx/linux_aux.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,7 +2,6 @@
*
* Copyright (c) 2017 Glenn Randers-Pehrson
* Written by Vadim Barkov, 2017.
- * Last changed in libpng 1.6.29 [March 16, 2017]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/testpngs/makepngs.sh 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,12 +1,10 @@
#!/bin/sh
-#
+
# Make a set of test PNG files, MAKEPNG is the name of the makepng executable
# built from contrib/libtests/makepng.c
# Copyright (c) 2015 John Cunningham Bowler
-# Last changed in libpng 1.6.20 [December 3, 2015]
-
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/checksum-icc.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/checksum-icc.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/checksum-icc.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,8 +2,6 @@
*
* Copyright (c) 2013 John Cunningham Bowler
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -11,8 +9,8 @@
* Generate crc32 and adler32 checksums of the given input files, used to
* generate check-codes for use when matching ICC profiles within libpng.
*/
+
#include <stdio.h>
-
#include <zlib.h>
static int
Deleted: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,144 +0,0 @@
-#!/bin/sh
-
-# chkfmt
-#
-# COPYRIGHT: Written by John Cunningham Bowler, 2010.
-# To the extent possible under law, the author has waived all copyright and
-# related or neighboring rights to this work. This work is published from:
-# United States.
-#
-# Check the format of the source files in the current directory - checks for a
-# line length of 80 characters max and no tab characters.
-#
-# Optionally arguments are files or directories to check.
-#
-# -v: output the long lines (makes fixing them easier)
-# -e: spawn an editor for each file that needs a change ($EDITOR must be
-# defined). When using -e the script MUST be run from an interactive
-# command line.
-verbose=
-edit=
-vers=
-test "$1" = "-v" && {
- shift
- verbose=yes
-}
-test "$1" = "-e" && {
- shift
- if test -n "$EDITOR"
- then
- edit=yes
-
- # Copy the standard streams for the editor
- exec 3>&0 4>&1 5>&2
- else
- echo "chkfmt -e: EDITOR must be defined" >&2
- exit 1
- fi
-}
-
-# Function to edit a single file - if the file isn't changed ask the user
-# whether or not to continue. This stuff only works if the script is run from
-# the command line (otherwise, don't specify -e or you will be sorry).
-doed(){
- cp "$file" "$file".orig
- "$EDITOR" "$file" 0>&3 1>&4 2>&5 3>&- 4>&- 5>&- || exit 1
- if cmp -s "$file".orig "$file"
- then
- rm "$file".orig
- echo -n "$file: file not changed, type anything to continue: " >&5
- read ans 0>&3
- test -n "$ans" || return 1
- fi
- return 0
-}
-
-# In beta versions the version string which appears in files can be a little
-# long and cause spuriously overlong lines. To avoid this substitute the version
-# string with a 'standard' version a.b.cc before checking for long lines.
-if test -r png.h
-then
- vers="`sed -n -e \
- 's/^#define PNG_LIBPNG_VER_STRING .\([0-9]\.[0-9]\.[0-9][0-9a-z]*\).$/\1/p' \
- png.h`"
- echo "chkfmt: checking version $vers"
-fi
-if test -z "$vers"
-then
- echo "chkfmt: png.h not found, ignoring version number" >&2
-fi
-
-test -n "$1" || set -- .
-find "$@" \( -type d \( -name '.git' -o -name '.libs' -o -name 'projects' \) \
- -prune \) -o \( -type f \
- ! -name '*.[oa]' ! -name '*.l[oa]' ! -name '*.png' ! -name '*.out' \
- ! -name '*.jpg' ! -name '*.patch' ! -name '*.obj' ! -name '*.exe' \
- ! -name '*.com' ! -name '*.tar.*' ! -name '*.zip' ! -name '*.ico' \
- ! -name '*.res' ! -name '*.rc' ! -name '*.mms' ! -name '*.rej' \
- ! -name '*.dsp' ! -name '*.orig' ! -name '*.dfn' ! -name '*.swp' \
- ! -name '~*' ! -name '*.3' \
- ! -name 'missing' ! -name 'mkinstalldirs' ! -name 'depcomp' \
- ! -name 'aclocal.m4' ! -name 'install-sh' ! -name 'Makefile.in' \
- ! -name 'ltmain.sh' ! -name 'config*' -print \) | {
- st=0
- while read file
- do
- case "$file" in
- *.mak|*[Mm]akefile.*|*[Mm]akefile)
- # Makefiles require tabs, dependency lines can be this long.
- check_tabs=
- line_length=100;;
- *.awk)
- # Includes literal tabs
- check_tabs=
- # The following is arbitrary
- line_length=132;;
- *contrib/*/*.[ch])
- check_tabs=yes
- line_length=96;;
- *)
- check_tabs=yes
- line_length=80;;
- esac
-
- # Note that vers can only contain 0-9, . and a-z
- if test -n "$vers"
- then
- sed -e "s/$vers/a.b.cc/g" "$file" >"$file".$$
- else
- cp "$file" "$file".$$
- fi
- splt="`fold -$line_length "$file".$$ | diff -c "$file".$$ -`"
- rm "$file".$$
-
- if test -n "$splt"
- then
- echo "$file: lines too long"
- st=1
- if test -n "$EDITOR" -a -n "$edit"
- then
- doed "$file" || exit 1
- elif test -n "$verbose"
- then
- echo "$splt"
- fi
- fi
- if test -n "$check_tabs"
- then
- tab="`tr -c -d '\t' <"$file"`"
- if test -n "$tab"
- then
- echo "$file: file contains tab characters"
- st=1
- if test -n "$EDITOR" -a -n "$edit"
- then
- doed "$file" || exit 1
- elif test -n "$verbose"
- then
- echo "$splt"
- fi
- fi
- fi
- done
- exit $st
-}
Added: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt.sh (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt.sh 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# chkfmt.sh
+#
+# COPYRIGHT:
+# Written by John Cunningham Bowler, 2010.
+# Revised by Cosmin Truta, 2022.
+# To the extent possible under law, the author has waived all copyright and
+# related or neighboring rights to this work. The author published this work
+# from the United States.
+#
+# Check the format of the source files in the current directory:
+#
+# * The lines should not exceed a predefined maximum length.
+# * Tab characters should appear only where necessary (e.g. in makefiles).
+#
+# Optionally arguments are files or directories to check.
+#
+# -v: output the long lines (makes fixing them easier)
+# -e: spawn an editor for each file that needs a change ($EDITOR must be
+# defined). When using -e the script MUST be run from an interactive
+# command line.
+
+script_name=`basename "$0"`
+
+verbose=
+edit=
+vers=
+test "$1" = "-v" && {
+ shift
+ verbose=yes
+}
+test "$1" = "-e" && {
+ shift
+ if test -n "$EDITOR"
+ then
+ edit=yes
+
+ # Copy the standard streams for the editor
+ exec 3>&0 4>&1 5>&2
+ else
+ echo "$script_name -e: EDITOR must be defined" >&2
+ exit 1
+ fi
+}
+
+# Function to edit a single file - if the file isn't changed ask the user
+# whether or not to continue. This stuff only works if the script is run
+# from the command line (otherwise, don't specify -e or you will be sorry).
+doed(){
+ cp "$file" "$file".orig
+ "$EDITOR" "$file" 0>&3 1>&4 2>&5 3>&- 4>&- 5>&- || exit 1
+ if cmp -s "$file".orig "$file"
+ then
+ rm "$file".orig
+ echo -n "$file: file not changed, type anything to continue: " >&5
+ read ans 0>&3
+ test -n "$ans" || return 1
+ fi
+ return 0
+}
+
+# In beta versions, the version string which appears in files can be a little
+# long and cause spuriously overlong lines. To avoid this, substitute the
+# version string with a placeholder string "a.b.cc" before checking for long
+# lines.
+# (Starting from libpng version 1.6.36, we switched to a conventional Git
+# workflow, and we are no longer publishing beta versions.)
+if test -r png.h
+then
+ vers="`sed -n -e \
+ 's/^#define PNG_LIBPNG_VER_STRING .\([0-9]\.[0-9]\.[0-9][0-9a-z]*\).$/\1/p' \
+ png.h`"
+ echo "$script_name: checking version $vers"
+fi
+if test -z "$vers"
+then
+ echo "$script_name: png.h not found, ignoring version number" >&2
+fi
+
+test -n "$1" || set -- .
+find "$@" \( -type d \( -name '.git' -o -name '.libs' -o -name 'projects' \) \
+ -prune \) -o \( -type f \
+ ! -name '*.[oa]' ! -name '*.l[oa]' ! -name '*.png' ! -name '*.out' \
+ ! -name '*.jpg' ! -name '*.patch' ! -name '*.obj' ! -name '*.exe' \
+ ! -name '*.com' ! -name '*.tar.*' ! -name '*.zip' ! -name '*.ico' \
+ ! -name '*.res' ! -name '*.rc' ! -name '*.mms' ! -name '*.rej' \
+ ! -name '*.dsp' ! -name '*.orig' ! -name '*.dfn' ! -name '*.swp' \
+ ! -name '~*' ! -name '*.3' \
+ ! -name 'missing' ! -name 'mkinstalldirs' ! -name 'depcomp' \
+ ! -name 'aclocal.m4' ! -name 'install-sh' ! -name 'Makefile.in' \
+ ! -name 'ltmain.sh' ! -name 'config*' -print \) | {
+ st=0
+ while read file
+ do
+ case "$file" in
+ *.mak|*[Mm]akefile.*|*[Mm]akefile)
+ # Makefiles require tabs, dependency lines can be this long.
+ check_tabs=
+ line_length=100;;
+ *.awk)
+ # Allow literal tabs.
+ check_tabs=
+ # Mainframe line printer, anyone?
+ line_length=132;;
+ */ci_*.sh)
+ check_tabs=yes
+ line_length=100;;
+ *contrib/*/*.[ch])
+ check_tabs=yes
+ line_length=100;;
+ *)
+ check_tabs=yes
+ line_length=80;;
+ esac
+
+ # Note that vers can only contain 0-9, . and a-z
+ if test -n "$vers"
+ then
+ sed -e "s/$vers/a.b.cc/g" "$file" >"$file".$$
+ else
+ cp "$file" "$file".$$
+ fi
+ splt="`fold -$line_length "$file".$$ | diff -c "$file".$$ -`"
+ rm "$file".$$
+
+ if test -n "$splt"
+ then
+ echo "$file: lines too long"
+ st=1
+ if test -n "$EDITOR" -a -n "$edit"
+ then
+ doed "$file" || exit 1
+ elif test -n "$verbose"
+ then
+ echo "$splt"
+ fi
+ fi
+ if test -n "$check_tabs"
+ then
+ tab="`tr -c -d '\t' <"$file"`"
+ if test -n "$tab"
+ then
+ echo "$file: file contains tab characters"
+ st=1
+ if test -n "$EDITOR" -a -n "$edit"
+ then
+ doed "$file" || exit 1
+ elif test -n "$verbose"
+ then
+ echo "$splt"
+ fi
+ fi
+ fi
+ done
+ exit $st
+}
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/chkfmt.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/cvtcolor.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/cvtcolor.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/cvtcolor.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,8 +1,5 @@
-/*-
- * convert.c
+/* convert.c
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- *
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
@@ -10,6 +7,7 @@
*
* Convert 8-bit sRGB or 16-bit linear values to another format.
*/
+
#define _ISOC99_SOURCE 1
#include <stdlib.h>
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-/*- genpng
+/* genpng
*
* COPYRIGHT: Written by John Cunningham Bowler, 2015.
* Revised by Glenn Randers-Pehrson, 2017, to add buffer-size check.
@@ -69,6 +69,7 @@
* joins are mitres; the outside of the lines are continued to the point of
* intersection.
*/
+
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/intgamma.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/intgamma.sh 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/intgamma.sh 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,13 +1,11 @@
#!/bin/sh
-#
+
# intgamma.sh
#
-# Last changed in libpng 1.6.0 [February 14, 2013]
-#
# COPYRIGHT: Written by John Cunningham Bowler, 2013.
# To the extent possible under law, the author has waived all copyright and
-# related or neighboring rights to this work. This work is published from:
-# United States.
+# related or neighboring rights to this work. The author published this work
+# from the United States.
#
# Shell script to generate png.c 8-bit and 16-bit log tables (see the code in
# png.c for details).
@@ -17,10 +15,10 @@
# (0..255) value and a similar table for the exponent calculation.
#
# "bc" must be on the path when the script is executed, and the math library
-# (-lm) must be available
-#
-# function to print out a list of numbers as integers; the function truncates
-# the integers which must be one-per-line
+# (-lm) must be available.
+
+# Function to print out a list of numbers as integers; the function truncates
+# the integers which must be one-per-line.
function print(){
awk 'BEGIN{
str = ""
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/makesRGB.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/makesRGB.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/makesRGB.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,5 @@
/* makesRGB.c -- build sRGB-to-linear and linear-to-sRGB conversion tables
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- *
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
@@ -14,6 +12,7 @@
* approximation to the 8-bit sRGB encoded value. Calculate the error in these
* tables and display it.
*/
+
#define _C99_SOURCE 1
#include <stdio.h>
#include <math.h>
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/png-fix-itxt.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/png-fix-itxt.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/png-fix-itxt.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,8 +1,6 @@
-
-/* png-fix-itxt version 1.0.0
+/* png-fix-itxt
*
* Copyright 2015 Glenn Randers-Pehrson
- * Last changed in libpng 1.6.18 [July 23, 2015]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -10,7 +8,7 @@
*
* Usage:
*
- * png-fix-itxt.exe < bad.png > good.png
+ * png-fix-itxt < bad.png > good.png
*
* Fixes a PNG file written with libpng-1.6.0 or 1.6.1 that has one or more
* uncompressed iTXt chunks. Assumes that the actual length is greater
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,9 +1,7 @@
/* pngcp.c
*
- * Copyright (c) 2016 John Cunningham Bowler
+ * Copyright (c) 2016,2022 John Cunningham Bowler
*
- * Last changed in libpng 1.6.24 [August 4, 2016]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -14,7 +12,12 @@
*
* For a more extensive example that uses the transforms see
* contrib/libtests/pngimage.c in the libpng distribution.
+ *
+ * This code is not intended for installation in a release system; the command
+ * line options are not documented and most of the behavior is intended for
+ * testing libpng performance, both speed and compression.
*/
+
#include "pnglibconf.h" /* To find how libpng was configured. */
#ifdef PNG_PNGCP_TIMING_SUPPORTED
@@ -503,10 +506,10 @@
}
static void
-display_clean_read(struct display *dp)
+display_clean_read(struct display *dp, int freeinfo)
{
if (dp->read_pp != NULL)
- png_destroy_read_struct(&dp->read_pp, NULL, NULL);
+ png_destroy_read_struct(&dp->read_pp, freeinfo ? &dp->ip : NULL, NULL);
if (dp->fp != NULL)
{
@@ -517,7 +520,7 @@
}
static void
-display_clean_write(struct display *dp)
+display_clean_write(struct display *dp, int freeinfo)
{
if (dp->fp != NULL)
{
@@ -527,14 +530,14 @@
}
if (dp->write_pp != NULL)
- png_destroy_write_struct(&dp->write_pp, dp->tsp > 0 ? NULL : &dp->ip);
+ png_destroy_write_struct(&dp->write_pp, freeinfo ? &dp->ip : NULL);
}
static void
display_clean(struct display *dp)
{
- display_clean_read(dp);
- display_clean_write(dp);
+ display_clean_read(dp, 1/*freeinfo*/);
+ display_clean_write(dp, 1/*freeinfo*/);
dp->output_file = NULL;
# if PNG_LIBPNG_VER < 10700 && defined PNG_TEXT_SUPPORTED
@@ -778,7 +781,7 @@
set_opt_string(struct display *dp, unsigned int sp)
/* Add the appropriate option string to dp->curr. */
{
- dp->stack[sp].opt_string_end = set_opt_string_(dp, sp, dp->stack[sp].opt,
+ dp->stack[sp].opt_string_end = set_opt_string_(dp, sp, dp->stack[sp].opt,
options[dp->stack[sp].opt].values[dp->stack[sp].entry].name);
}
@@ -1745,7 +1748,17 @@
static void
read_png(struct display *dp, const char *filename)
{
- display_clean_read(dp); /* safety */
+ /* This is an assumption of the code; it may happen if a previous write fails
+ * and there is a bug in the cleanup handling below (look for setjmp).
+ * Passing freeinfo==1 to display_clean_read below avoids a second error
+ * on dp->ip != NULL below.
+ */
+ if (dp->read_pp != NULL)
+ {
+ display_log(dp, APP_FAIL, "unexpected png_read_struct");
+ display_clean_read(dp, 1/*freeinfo*/); /* recovery */
+ }
+
display_start_read(dp, filename);
dp->read_pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, dp,
@@ -1769,6 +1782,13 @@
png_set_check_for_invalid_index(dp->read_pp, -1/*off completely*/);
# endif /* IGNORE_INDEX */
+ if (dp->ip != NULL)
+ {
+ /* UNEXPECTED: some problem in the display_clean function calls! */
+ display_log(dp, APP_FAIL, "read_png: freeing old info struct");
+ png_destroy_info_struct(dp->read_pp, &dp->ip);
+ }
+
/* The png_read_png API requires us to make the info struct, but it does the
* call to png_read_info.
*/
@@ -1848,7 +1868,14 @@
}
#endif /* FIX_INDEX */
- display_clean_read(dp);
+ /* NOTE: dp->ip is where all the information about the PNG that was just read
+ * is stored. It can be used to write and write again a single PNG file,
+ * however be aware that prior to libpng 1.7 text chunks could only be
+ * written once; this is a bug which would require a significant code rewrite
+ * to fix, it has been there in several versions of libpng (it was introduced
+ * to fix another bug involving duplicate writes of the text chunks.)
+ */
+ display_clean_read(dp, 0/*freeiinfo*/);
dp->operation = "none";
}
@@ -1975,7 +2002,21 @@
static void
write_png(struct display *dp, const char *destname)
{
- display_clean_write(dp); /* safety */
+ /* If this test fails png_write_png would fail *silently* below; this
+ * is not helpful, so catch the problem now and give up:
+ */
+ if (dp->ip == NULL)
+ display_log(dp, INTERNAL_ERROR, "missing png_info");
+
+ /* This is an assumption of the code; it may happen if a previous
+ * write fails and there is a bug in the cleanup handling below.
+ */
+ if (dp->write_pp != NULL)
+ {
+ display_log(dp, APP_FAIL, "unexpected png_write_struct");
+ display_clean_write(dp, 0/*!freeinfo*/);
+ }
+
display_start_write(dp, destname);
dp->write_pp = png_create_write_struct(PNG_LIBPNG_VER_STRING, dp,
@@ -2073,10 +2114,6 @@
destname == NULL ? "stdout" : destname, strerror(errno));
}
- /* Clean it on the way out - if control returns to the caller then the
- * written_file contains the required data.
- */
- display_clean_write(dp);
dp->operation = "none";
}
@@ -2243,6 +2280,10 @@
/* Loop to find the best option. */
do
{
+ /* Clean before each write_png; this just removes *dp->write_pp which
+ * cannot be reused.
+ */
+ display_clean_write(dp, 0/*!freeinfo*/);
write_png(dp, tmpname);
/* And compare the sizes (the write function makes sure write_size
@@ -2272,6 +2313,8 @@
/* Do this for the 'sizes' option so that it reports the correct size. */
dp->write_size = dp->best_size;
}
+
+ display_clean_write(dp, 1/*freeinfo*/);
}
static int
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,5 @@
/* pngfix.c
*
- * Last changed in libpng 1.6.31 [July 27, 2017]
* Copyright (c) 2014-2017 John Cunningham Bowler
*
* This code is released under the libpng license.
@@ -10,6 +9,7 @@
* Tool to check and fix the zlib inflate 'too far back' problem.
* See the usage message for more information.
*/
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -3961,6 +3961,14 @@
{
size_t outlen = strlen(*argv);
+ if (outlen > FILENAME_MAX)
+ {
+ fprintf(stderr, "%s: output file name too long: %s%s%s\n",
+ prog, prefix, *argv, suffix ? suffix : "");
+ global.status_code |= WRITE_ERROR;
+ continue;
+ }
+
if (outfile == NULL) /* else this takes precedence */
{
/* Consider the prefix/suffix options */
@@ -4046,4 +4054,3 @@
return 77;
}
#endif /* PNG_SETJMP_SUPPORTED */
-
Deleted: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/reindent 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# reindent a libpng C source
-
-# COPYRIGHT: Written by Glenn Randers-Pehrson, 2016.
-# To the extent possible under law, the author has waived all copyright and
-# related or neighboring rights to this work. This work is published from:
-# United States.
-
-# Usage:
-# reindent inputtabsize outputtabsize inputcontinuestring outputcontinuestring
-#
-# Assumes that continued lines begin with indentation plus one space, and
-# that continued comments begin with indentation plus " *".
-#
-# eg, to change libpng coding style from 3-space indentation with 4-space
-# continuations to 4-space indentation with 2-space continuations:
-#
-# reindent 3 4 "\t " " " < example.c > example.c_4_2
-# and to restore the file back to libpng coding style
-# reindent 4 3 " " " " < example.c_4_2 > example.c_3_4
-
-unexpand --first-only --t $1 | \
- sed -e "/^ *$3[^\*]/{s/$3/$4/}" | \
- expand -t $2
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/sRGB.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/sRGB.h 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/sRGB.h 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,8 +1,5 @@
-/*-
- * sRGB.h
+/* sRGB.h
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- *
* COPYRIGHT: Written by John Cunningham Bowler, 2013.
* To the extent possible under law, the author has waived all copyright and
* related or neighboring rights to this work. This work is published from:
@@ -16,6 +13,7 @@
* (in fact the source of the numbers is the wikipedia article at
* https://en.wikipedia.org/wiki/SRGB).
*/
+
static double
sRGB_from_linear(double l)
{
Modified: branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/intel/filter_sse2_intrinsics.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -259,7 +259,7 @@
a = d; d = _mm_unpacklo_epi8(load4(row ), zero);
/* (p-a) == (a+b-c - a) == (b-c) */
-
+
pa = _mm_sub_epi16(b,c);
/* (p-b) == (a+b-c - b) == (a-c) */
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -9,7 +9,7 @@
Based on:
- libpng version 1.6.36, December 2018, through 1.6.38 - September 2022
+ libpng version 1.6.36, December 2018, through 1.6.39 - November 2022
Updated and distributed by Cosmin Truta
Copyright (c) 2018-2022 Cosmin Truta
@@ -877,7 +877,7 @@
color channels). Note that PNG files always contain non-associated color
channels; png_set_alpha_mode() with one of the modes causes the decoder to
convert the pixels to an associated form before returning them to your
-application.
+application.
Since it is not necessary to perform arithmetic on opaque color values so
long as they are not to be resampled and are in the final color space it is
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 14, 2022"
+.TH LIBPNG 3 "November 20, 2022"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.39
.SH SYNOPSIS
\fB#include <png.h>\fP
@@ -528,7 +528,7 @@
Based on:
- libpng version 1.6.36, December 2018, through 1.6.38 - September 2022
+ libpng version 1.6.36, December 2018, through 1.6.39 - November 2022
Updated and distributed by Cosmin Truta
Copyright (c) 2018-2022 Cosmin Truta
@@ -1396,7 +1396,7 @@
color channels). Note that PNG files always contain non-associated color
channels; png_set_alpha_mode() with one of the modes causes the decoder to
convert the pixels to an associated form before returning them to your
-application.
+application.
Since it is not necessary to perform arithmetic on opaque color values so
long as they are not to be resampled and are in the final color space it is
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 14, 2022"
+.TH LIBPNGPF 3 "November 20, 2022"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.39
(private functions)
.SH SYNOPSIS
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38;
+typedef png_libpng_version_1_6_39 Your_png_h_is_not_version_1_6_39;
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
@@ -815,7 +815,7 @@
return PNG_STRING_COPYRIGHT
#else
return PNG_STRING_NEWLINE \
- "libpng version 1.6.38" PNG_STRING_NEWLINE \
+ "libpng version 1.6.39" PNG_STRING_NEWLINE \
"Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
@@ -2710,7 +2710,7 @@
int /* PRIVATE */
png_check_fp_number(png_const_charp string, size_t size, int *statep,
- png_size_tp whereami)
+ size_t *whereami)
{
int state = *statep;
size_t i = *whereami;
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.h 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.h 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.38 - September 14, 2022
+ * libpng version 1.6.39 - November 20, 2022
*
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -15,7 +15,7 @@
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
* Glenn Randers-Pehrson
- * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022:
+ * libpng versions 1.6.36, December 2018, through 1.6.39, November 2022:
* Cosmin Truta
* See also "Contributing Authors", below.
*/
@@ -239,7 +239,7 @@
* ...
* 1.5.30 15 10530 15.so.15.30[.0]
* ...
- * 1.6.38 16 10638 16.so.16.38[.0]
+ * 1.6.39 16 10639 16.so.16.39[.0]
*
* Henceforth the source version will match the shared-library major and
* minor numbers; the shared-library major version number will be used for
@@ -278,8 +278,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.38"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n"
+#define PNG_LIBPNG_VER_STRING "1.6.39"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.39 - November 20, 2022\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -287,7 +287,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 38
+#define PNG_LIBPNG_VER_RELEASE 39
/* This should be zero for a public release, or non-zero for a
* development version. [Deprecated]
@@ -318,7 +318,7 @@
* From version 1.0.1 it is:
* XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
-#define PNG_LIBPNG_VER 10638 /* 1.6.38 */
+#define PNG_LIBPNG_VER 10639 /* 1.6.39 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -428,7 +428,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_38;
+typedef char* png_libpng_version_1_6_39;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,7 @@
/* pngconf.h - machine-configurable file for libpng
*
- * libpng version 1.6.38
+ * libpng version 1.6.39
*
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
Modified: branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
/* pnglibconf.h - library build configuration */
-/* libpng version 1.6.38 */
+/* libpng version 1.6.39 */
/* Copyright (c) 2018-2022 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2023-01-20 16:39:45 UTC (rev 889)
@@ -1946,7 +1946,7 @@
* the problem character.) This has not been tested within libpng.
*/
PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
- size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
+ size_t size, int *statep, size_t *whereami),PNG_EMPTY);
/* This is the same but it checks a complete string and returns true
* only if it just contains a floating point number. As of 1.5.4 this
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -3762,13 +3762,13 @@
mode = PNG_ALPHA_PNG;
output_gamma = PNG_DEFAULT_sRGB;
}
-
+
if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0)
{
mode = PNG_ALPHA_OPTIMIZED;
change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;
}
-
+
/* If 'do_local_background' is set check for the presence of gamma
* correction; this is part of the work-round for the libpng bug
* described above.
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -3186,7 +3186,7 @@
{
png_debug2(0," length = %lu, limit = %lu",
(unsigned long)length,(unsigned long)limit);
- png_chunk_error(png_ptr, "chunk data is too large");
+ png_benign_error(png_ptr, "chunk data is too large");
}
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -2155,4 +2155,4 @@
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38;
+typedef png_libpng_version_1_6_39 Your_png_h_is_not_version_1_6_39;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -75,10 +75,10 @@
* library. If you have a new chunk to add, make a function to write it,
* and put it in the correct location here. If you want the chunk written
* after the image data, put it in png_write_end(). I strongly encourage
- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
- * the chunk, as that will keep the code from breaking if you want to just
- * write a plain PNG file. If you have long comments, I suggest writing
- * them in png_write_end(), and compressing them.
+ * you to supply a PNG_INFO_<chunk> flag, and check info_ptr->valid before
+ * writing the chunk, as that will keep the code from breaking if you want
+ * to just write a plain PNG file. If you have long comments, I suggest
+ * writing them in png_write_end(), and compressing them.
*/
void PNGAPI
png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwutil.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -1747,7 +1747,7 @@
{
png_uint_32 purpose_len;
size_t units_len, total_len;
- png_size_tp params_len;
+ size_t *params_len;
png_byte buf[10];
png_byte new_purpose[80];
int i;
@@ -1769,7 +1769,7 @@
png_debug1(3, "pCAL units length = %d", (int)units_len);
total_len = purpose_len + units_len + 10;
- params_len = (png_size_tp)png_malloc(png_ptr,
+ params_len = (size_t *)png_malloc(png_ptr,
(png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t))));
/* Find the length of each parameter, making sure we don't count the
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -13,7 +13,7 @@
makefile.atari => Atari makefile
makefile.bc32 => 32-bit Borland C++ (all modules compiled in C mode)
makefile.beos => BeOS makefile
- makefile.cegcc => minge32ce for Windows CE makefile
+ makefile.clang => Generic clang makefile
makefile.darwin => Darwin makefile, for macOS (formerly Mac OS X)
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/checksym.awk
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/checksym.awk 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/checksym.awk 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,5 @@
#!/bin/awk -f
+
# Check a list of symbols against the master definition
# (official) list. Arguments:
#
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,8 +1,7 @@
#!/bin/awk -f
+
# scripts/dfn.awk - process a .dfn file
#
-# last changed in libpng version 1.5.19 - August 21, 2014
-#
# Copyright (c) 2013-2014 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/genout.cmake.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -20,7 +20,7 @@
set(PNGLIB_MAJOR "@PNGLIB_MAJOR@")
set(PNGLIB_MINOR "@PNGLIB_MINOR@")
set(PNGLIB_VERSION "@PNGLIB_VERSION@")
-set(ZLIBINCDIR "@ZLIB_INCLUDE_DIR@")
+set(ZLIBINCDIR "@ZLIB_INCLUDE_DIRS@")
set(PLATFORM_C_FLAGS)
if(APPLE)
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/intprefix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/intprefix.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/intprefix.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,6 @@
/* intprefix.c - generate an unprefixed internal symbol list
*
- * Last changed in libpng version 1.6.16 [December 22, 2014]
* Copyright (c) 2013-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.38
+version=1.6.39
prefix=""
libdir=""
libs=""
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.6.38
+Version: 1.6.39
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu 2023-01-20 16:39:45 UTC (rev 889)
@@ -4,7 +4,7 @@
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-
+#
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
@@ -11,13 +11,11 @@
# Library name:
LIBNAME=libpng16
-PNGMAJ = 16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=cc
@@ -30,10 +28,6 @@
SUN_CC_FLAGS=-fast -xtarget=ultra
SUN_LD_FLAGS=-fast -xtarget=ultra
-# where make install puts libpng.a, libpng16.so and libpng16/png.h
-prefix=/a
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
# Changing these to ../zlib poses a security risk. If you want
# to have zlib in an adjacent directory, specify the full path instead of "..".
@@ -50,26 +44,6 @@
CFLAGS=$(SUN_CC_FLAGS) # $(WARNMORE) -g
LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
@@ -84,7 +58,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -KPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
include scripts/pnglibconf.mak
DELETE = $(RM_F)
@@ -94,26 +68,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-R$(LIBPATH)\"; \
- echo ccopts=\"-fast -xtarget=ultra\"; \
- echo ldopts=\"-fast -xtarget=ultra\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -139,86 +93,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) $(SUN_CC_FLAGS) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(SUN_CC_FLAGS) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)*
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu 2023-01-20 16:39:45 UTC (rev 889)
@@ -4,7 +4,7 @@
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-
+#
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
@@ -11,13 +11,11 @@
# Library name:
LIBNAME=libpng16
-PNGMAJ = 16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=cc
@@ -30,10 +28,6 @@
SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9
-# where make install puts libpng.a, libpng16.so and libpng16/png.h
-prefix=/a
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
# Changing these to ../zlib poses a security risk. If you want
# to have zlib in an adjacent directory, specify the full path instead of "..".
@@ -50,26 +44,6 @@
CFLAGS= $(SUN_CC_FLAGS) # $(WARNMORE) -g
LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
@@ -84,7 +58,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -KPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
include scripts/pnglibconf.mak
DELETE = $(RM_F)
@@ -94,26 +68,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-R$(LIBPATH)\"; \
- echo ccopts=\"-fast -xtarget=ultra -xarch=v9\"; \
- echo ldopts=\"-fast -xtarget=ultra -xarch=v9\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -139,86 +93,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) $(SUN_CC_FLAGS) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(SUN_CC_FLAGS) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)*
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix 2023-01-20 16:39:45 UTC (rev 889)
@@ -19,28 +19,10 @@
RANLIB = ranlib
MKDIR_P = mkdir -p
RM_F = rm -f
-LN_SF = ln -f -s
LIBNAME = libpng16
PNGMAJ = 16
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-
WARNMORE =
CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
CFLAGS = -O2 -Wall -Wextra -Wundef # $(WARNMORE) -g
@@ -55,7 +37,7 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-all: $(LIBNAME).a pngtest$(E)
+all: $(LIBNAME).a pngtest
include scripts/pnglibconf.mak
REMOVE = $(RM_F)
@@ -65,34 +47,15 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-test: pngtest$(E)
- ./pngtest$(E)
+test: pngtest
+ ./pngtest
-pngtest$(E): pngtest.o $(LIBNAME).a
+pngtest: pngtest.o $(LIBNAME).a
$(LD) -o $@ pngtest.o $(LDFLAGS)
-install: $(LIBNAME).a
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DI)/$(LIBNAME)/png.h
- -@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h
- -@$(RM_F) $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h
- -@$(RM_F) $(DI)/pngconf.h
- -@$(RM_F) $(DI)/pnglibconf.h
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h \
- $(DI)/$(LIBNAME)/pngconf.h \
- $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) -r $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
- -@$(RM_F) $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- cp $(LIBNAME).a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
- (cd $(DI); $(LN_SF) libpng/* .;)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
clean:
$(RM_F) *.o $(LIBNAME).a pngtest pngout.png pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2022 Cosmin Truta
# Copyright (C) 2002, 2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -9,26 +10,11 @@
# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default
# rules for library management
#
-CPPFLAGS = -I..\zlib
+CPPFLAGS = -I../zlib
CFLAGS = -O
LBR = png.lib
-LDFLAGS = -L. -L..\zlib -lpng -lz -lm
+LDFLAGS = -L. -L../zlib -lpng -lz -lm
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -54,18 +40,6 @@
pngtest.ttp: pngtest.o $(LBR)
$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o
-install: libpng.a
- - at mkdir $(DESTDIR)$(INCPATH)
- - at mkdir $(DESTDIR)$(INCPATH)/libpng
- - at mkdir $(DESTDIR)$(LIBPATH)
- - at rm -f $(DESTDIR)$(INCPATH)/png.h
- - at rm -f $(DESTDIR)$(INCPATH)/pngconf.h
- - at rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h
- cp png.h $(DESTDIR)$(INCPATH)/libpng
- cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
- cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
- (cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \
- ln -f -s $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos 2023-01-20 16:39:45 UTC (rev 889)
@@ -11,13 +11,11 @@
# Library name:
LIBNAME=libpng16
-PNGMAJ = 16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=gcc
@@ -47,29 +45,6 @@
# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz # -g
-# where make install puts libpng.a, libpng16.so*, and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -85,7 +60,7 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -94,28 +69,13 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo libs=\"-lpng16 -lz \"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
cp $(LIBSO)* /boot/home/config/lib
$(LIBSOMAJ): $(OBJSDLL)
- $(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \
- $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
+ $(CC) -nostart -Wl,-soname,$(LIBSOMAJ) \
+ -o $(LIBSOMAJ) $(OBJSDLL) $(LDFLAGS)
pngtest: pngtest.o $(LIBSO)
$(CC) -L$(ZLIBLIB) -L. -lz -lpng16 -o pngtest pngtest.o
@@ -123,84 +83,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) $(CFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- $(CC) $(CPPFLAGS) $(CFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
- $(LIBSO) $(LIBSOMAJ)* pngtesti \
- pnglibconf.h libpng.pc
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Deleted: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.cegcc 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,116 +0,0 @@
-# Makefile for creating Windows CE release archives, with the
-# mingw32ce compiler.
-
-# Last updated: 22-Jul-2008
-
-# Copyright (C) 2008 Vincent Torri
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# To get some help, type
-#
-# make help
-#
-# To create the archives
-#
-# make
-#
-# To remove everything, type:
-#
-# make clean
-
-VERMAJ = 1
-VERMIN = 6
-VERMIC = 37
-VER = $(VERMAJ).$(VERMIN).$(VERMIC)
-NAME = libpng
-PACKAGE = $(NAME)-$(VER)
-
-BIN = libpng16-0.dll
-LIB = libpng16.a libpng16.dll.a libpng.a libpng.dll.a
-INCLUDE = png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-PC = libpng16.pc libpng.pc
-
-MANIFESTVERBIN = "Libpng-$(VER): Binary files"
-MANIFESTVERDEV = "Libpng-$(VER): Developer files"
-MANIFESTVERDESC = "Libpng: the official PNG reference library"
-
-all: $(NAME)
-
-$(NAME): remove-old copy-src compilation copy manifest archive
- @echo " * Removal of the directories"
- @rm -rf $(PACKAGE)/ $(PACKAGE)-bin/ $(PACKAGE)-dev/
-
-remove-old:
- @echo " * Removal of the old files"
- @rm -rf $(PACKAGE)-bin*
- @rm -rf $(PACKAGE)-dev*
-
-copy-src:
- @echo " * Copy of source files"
- @cp -R ../src/$(PACKAGE) .
- @echo " * Creation of directories and files"
- @mkdir -p $(PACKAGE)-bin/bin
- @mkdir -p $(PACKAGE)-bin/manifest
- @mkdir -p $(PACKAGE)-dev/lib/pkgconfig
- @mkdir -p $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN)
- @mkdir -p $(PACKAGE)-dev/manifest
- @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.mft
- @touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.ver
- @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.mft
- @touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.ver
-
-compilation:
- @echo " * Compilation of $(PACKAGE)"
- cd $(PACKAGE) && CPPFLAGS="$(CPPFLAGS) -DPNG_CONSOLE_IO_SUPPORTED -D_WIN32_WCE=0x0420" \
- CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" \
- LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" \
- ./configure --prefix=/opt/wince --host=arm-mingw32ce && make
-
-copy:
- @echo " * Copy of binary and development files"
- @for i in $(BIN); do \
- cp $(PACKAGE)/.libs/$$i $(PACKAGE)-bin/bin; \
- done
- @for i in $(LIB); do \
- cp $(PACKAGE)/.libs/$$i $(PACKAGE)-dev/lib; \
- done
- @for i in $(INCLUDE); do \
- cp $(PACKAGE)/$$i $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN); \
- done
- @for i in $(PC); do \
- cp $(PACKAGE)/$$i $(PACKAGE)-dev/lib/pkgconfig; \
- done
-
-manifest:
- @echo " * Creation of the manifest"
- @cd $(PACKAGE)-bin && find * >> manifest/$(PACKAGE)-bin.mft
- @cd $(PACKAGE)-bin && \
- echo $(MANIFESTVERBIN) >> manifest/$(PACKAGE)-bin.ver && \
- echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-bin.ver
- @cd $(PACKAGE)-dev && find * >> manifest/$(PACKAGE)-dev.mft
- @cd $(PACKAGE)-dev && \
- echo $(MANIFESTVERDEV) >> manifest/$(PACKAGE)-dev.ver && \
- echo $(MANIFESTVERDESC) >> manifest/$(PACKAGE)-dev.ver
-
-archive:
- @echo " * Creation of the archives"
- @tar cf $(PACKAGE)-bin.tar $(PACKAGE)-bin
- @bzip2 -9 $(PACKAGE)-bin.tar
- @tar cf $(PACKAGE)-dev.tar $(PACKAGE)-dev
- @bzip2 -9 $(PACKAGE)-dev.tar
-
-clean:
- @echo " * Cleaning"
- @rm -rf $(PACKAGE)*
-
-help:
- @echo
- @echo "To create the archives, type:"
- @echo " make"
- @echo
- @echo "To remove everything, type:"
- @echo " make clean"
- @echo
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin 2023-01-20 16:39:45 UTC (rev 889)
@@ -10,26 +10,17 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# where "make install" puts libpng.a, libpng16.dylib, png.h, pngconf.h,
-# and pnglibconf.h
-
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
ZLIBLIB=/usr/lib
ZLIBINC=/usr/include
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-RELEASE = 38
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).dylib
LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib
-LIBSOREL=$(LIBNAME).$(PNGMAJ).$(RELEASE).dylib
-OLDSO=libpng.dylib
# Utilities:
CC=cc
@@ -47,26 +38,6 @@
CFLAGS=-O3 -funroll-loops -Wall -Wextra -Wundef
LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -86,7 +57,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -fno-common -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -95,28 +66,11 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(OBJSDLL)
$(CC) -dynamiclib \
- -install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 16 -compatibility_version 16 \
-o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
@@ -127,84 +81,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- $(RANLIB) $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOMAJ)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)
- chmod 755 $(DL)/$(LIBSOMAJ)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- $(CC) $(CPPFLAGS) $(CFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
- libpng.pc $(LIBNAME).*dylib pngtesti pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBNAME).*dylib pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,5 @@
# makefile for libpng on DEC Alpha Unix
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2000-2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -7,14 +8,12 @@
# and license in png.h
# Library name:
-PNGMAJ = 16
-LIBNAME = libpng16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=cc
@@ -25,29 +24,6 @@
CP=cp
RM_F=/bin/rm -f
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
@@ -69,7 +45,7 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config
+all: $(LIBSO) libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -78,29 +54,11 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"-std\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
$(LIBSOMAJ): $(OBJS)
- $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \
- -soname $(LIBSOMAJ)
+ $(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) -soname $(LIBSOMAJ)
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -108,86 +66,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@/bin/rm -f $(DI)/libpng
- (cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@/bin/rm -f $(DL)/libpng.a
- (cd $(DL); $(LN_SF)(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@/bin/rm -f $(DM)/man3/libpng.3
- -@/bin/rm -f $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@/bin/rm -f $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@/bin/rm -f $(DB)/libpng-config
- -@/bin/rm -f $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF)(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -w1 -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) -w1 $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -R$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,12 +7,6 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# where make install will put libpng.a and png.h
-#prefix=/usr/local
-prefix=.
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
CC=gcc
CPPFLAGS=-I../zlib -DPNG_NO_SNPRINTF
CFLAGS=-O
@@ -47,6 +41,11 @@
test: pngtest
./pngtest
+
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
+
clean:
$(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,28 +7,11 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-PREFIX?= /usr/local
-SHLIB_VER?= 16
-
LIB= png
+SHLIB_VER= 16
SHLIB_MAJOR= ${SHLIB_VER}
SHLIB_MINOR= 0
-NO_PROFILE= YES
-NO_OBJ= YES
-# where make install puts libpng.a and png.h
-DESTDIR= ${PREFIX}
-LIBDIR= /lib
-INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-INCSDIR= /include/libpng
-INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk
-MAN= libpng.3 libpngpf.3 png.5
-MANDIR= /man/man
-SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
- libpng/pngconf.h ${INCSDIR}/../pngconf.h \
- libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
-
-# where make install finds libz.a and zlib.h
ZLIBLIB= /usr/lib
ZLIBINC= /usr/include
@@ -39,7 +22,10 @@
CPPFLAGS+= -I. -I${ZLIBINC}
CFLAGS+= -Wall -Wextra -Wundef
+LDFLAGS+= -L. -L${ZLIBLIB}
+CLEANFILES+= pngtest pngtest.o pngout.png
+
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
@@ -49,18 +35,19 @@
pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
.c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ ${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $<
-pngtest: pngtest.o libpng.a
- ${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -L${ZLIBLIB} \
- -lpng ${LDADD}
+pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
+ cp ${PNGLIBCONF_H_PREBUILT} $@
-CLEANFILES= pngtest pngtest.o pngout.png
+pngtest: pngtest.o libpng.a
+ ${CC} ${LDFLAGS} -static -o pngtest pngtest.o -lpng ${LDADD}
-test: pngtest
+test: pngtest
./pngtest
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- cp $(PNGLIBCONF_H_PREBUILT) $@
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
.include <bsd.lib.mk>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64 2023-01-20 16:39:45 UTC (rev 889)
@@ -20,14 +20,12 @@
# SHAREDLIB=libz.sl
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.sl
# Utilities:
CC=cc
@@ -46,29 +44,6 @@
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-# where make install puts libpng.a, libpng16.sl, and png.h
-prefix=/opt/libpng
-exec_prefix=$(prefix)
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -87,7 +62,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) +z -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -96,23 +71,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"-O -Ae -Wl,+vnocompatwarnings +DD64 +Z\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -126,86 +84,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) $(CCFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) $(CCFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc 2023-01-20 16:39:45 UTC (rev 889)
@@ -10,14 +10,12 @@
# and license in png.h
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.sl
# Utilities:
CC=gcc
@@ -29,11 +27,6 @@
CP=cp
RM_F=/bin/rm -f
-# where "make install" puts libpng.a, $(OLDSO)*, png.h, pngconf.h
-# and pnglibconf.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
ZLIBLIB=/opt/zlib/lib
ZLIBINC=/opt/zlib/include
@@ -54,26 +47,6 @@
#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm # -g
LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm # -g
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
@@ -88,27 +61,12 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -122,87 +80,21 @@
test: pngtest
./pngtest
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux 2023-01-20 16:39:45 UTC (rev 889)
@@ -21,14 +21,12 @@
# SHAREDLIB=libz.sl
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.sl
# Utilities:
CC=cc
@@ -38,14 +36,6 @@
LN_SF=ln -sf
RM_F=/bin/rm -f
-# where make install puts libpng.a, libpng16.sl, and png.h
-prefix=/opt/libpng
-exec_prefix=$(prefix)
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
CPPFLAGS=-I$(ZLIBINC)
CFLAGS=-O -Ae +DA1.1 +DS2.0
# Caution: be sure you have built zlib with the same CFLAGS.
@@ -52,21 +42,6 @@
CCFLAGS=-O -Ae +DA1.1 +DS2.0
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -85,7 +60,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) +z -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -94,23 +69,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"-O -Ae +DA1.1 +DS2.0\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -124,86 +82,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) $(CCFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) $(CCFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2023-01-20 16:39:45 UTC (rev 889)
@@ -9,15 +9,12 @@
# and license in png.h
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-RELEASE = 38
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=gcc
@@ -28,12 +25,6 @@
CP=cp
RM_F=rm -f
-# where "make install" puts libpng16.a, libpng16.so*,
-# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
-# Prefix must be a full pathname.
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located.
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
@@ -52,26 +43,6 @@
LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm # -g
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm # -g
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -91,7 +62,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest pngtest-static
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -100,23 +71,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -139,87 +93,22 @@
@echo ""
./pngtest-static
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
$(RM_F) $(OBJS) $(OBJSDLL) libpng.a
- $(RM_F) pngtest*.o pngtest pngtesti pngtest-static pngout.png
- $(RM_F) $(LIBSO) $(LIBSOMAJ)*
- $(RM_F) libpng.pc pnglibconf.h libpng-config
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
+ $(RM_F) pngtest*.o pngtest pngtest-static pngout.png
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,21 +7,6 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
CC=cc
CPPFLAGS=-I../zlib -DSYSV -Dmips
CFLAGS=-O -systype sysv -w
@@ -28,11 +13,10 @@
#CFLAGS=-O
LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
+AR_RC=ar rc
#RANLIB=ranlib
RANLIB=echo
-CP=cp
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -47,10 +31,10 @@
all: libpng.a pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $(PNGLIBCONF_H_PREBUILT) $@
+ cp $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ $(AR_RC) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
@@ -59,22 +43,9 @@
test: pngtest
./pngtest
-install: libpng.a
- - at mkdir $(DESTDIR)$(INCPATH)
- - at mkdir $(DESTDIR)$(INCPATH)/libpng
- - at mkdir $(DESTDIR)$(LIBPATH)
- - at rm -f $(DESTDIR)$(INCPATH)/png.h
- - at rm -f $(DESTDIR)$(INCPATH)/pngconf.h
- - at rm -f $(DESTDIR)$(INCPATH)/pnglibconf.h
- cp png.h $(DESTDIR)$(INCPATH)/libpng
- cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
- cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
- (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
- cp libpng.a $(DESTDIR)$(LIBPATH)
- chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
clean:
rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2023-01-20 16:39:45 UTC (rev 889)
@@ -12,20 +12,14 @@
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# # # # # # # # # # # # # # # # #
-prefix=/usr/local
-exec_prefix=$(prefix)
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-RELEASE = 38
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).dll
LIBSOMAJ=$(LIBNAME).dll.$(PNGMAJ)
-LIBSOREL=$(PNGMAJ).$(RELEASE)
-OLDSO=libpng.dll
# Where the zlib library and include files are located.
#ZLIBLIB=../zlib
@@ -51,26 +45,6 @@
# File extensions
EXEEXT=.exe
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -104,70 +78,18 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
-
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSO) $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
test: pngtest$(EXEEXT)
./pngtest$(EXEEXT)
@@ -176,9 +98,8 @@
clean:
$(RM_F) $(OBJS) libpng.a
+ $(RM_F) $(LIBSO) $(LIBSOMAJ) pnglibconf.h
$(RM_F) pngtest*.o pngtest$(EXEEXT) pngout.png
- $(RM_F) $(LIBSO) $(LIBSOMAJ)
- $(RM_F) libpng.pc pnglibconf.h libpng-config
png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,20 +1,14 @@
-# makefile for libpng for NetBSD for the standard
-# make obj && make depend && make && make test
-# make includes && make install
+# makefile for libpng on NetBSD
+# Copyright (C) 2020-2022 Cosmin Truta
+# Copyright (C) 2007-2009, 2014 Glenn Randers-Pehrson
# Copyright (C) 2002 Patrick R.L. Welche
-# Copyright (C) 2007-2009, 2014 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-LOCALBASE?=/usr/local
-LIBDIR= ${LOCALBASE}/lib
-MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include
-
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.38
+SHLIB_MINOR= 0
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
@@ -21,10 +15,12 @@
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c \
pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
INCS= png.h pngconf.h pnglibconf.h
-MAN= libpng.3 libpngpf.3 png.5
-CPPFLAGS+=-I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}
+CFLAGS+= -Wall -Wextra -Wundef
+CLEANFILES+= pngtest.o pngtest pnglibconf.h
+
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
@@ -35,12 +31,10 @@
# MKLINT= no
# .endif
-CLEANFILES+=pngtest.o pngtest pnglibconf.h
-
.c.o:
${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $<
-pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
+pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
cp ${PNGLIBCONF_H_PREBUILT} $@
pngtest.o: pngtest.c
@@ -50,6 +44,10 @@
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -lz -lm
test: pngtest
- cd ${.CURDIR} && ${.OBJDIR}/pngtest
+ ./pngtest
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
+
.include <bsd.lib.mk>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,12 +7,8 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-PREFIX?= /usr/local
-LIBDIR= ${PREFIX}/lib
-MANDIR= ${PREFIX}/man/cat
-
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.38
+SHLIB_MINOR= 0
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
@@ -19,17 +15,12 @@
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c \
pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
HDRS= png.h pngconf.h pnglibconf.h
-MAN= libpng.3 libpngpf.3 png.5
-DOCS= ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO \
- libpng-manual.txt
-CFLAGS+= -Wall -Wextra -Wundef
-CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}
+CFLAGS+= -Wall -Wextra -Wundef
-NOPROFILE= Yes
+CLEANFILES+= pngtest.o pngtest pnglibconf.h
-CLEANFILES+= pngtest.o pngtest pnglibconf.h
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
@@ -37,7 +28,7 @@
.c.o:
${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $<
-pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
+pnglibconf.h: ${PNGLIBCONF_H_PREBUILT}
cp ${PNGLIBCONF_H_PREBUILT} $@
pngtest.o: pngtest.c
@@ -47,41 +38,10 @@
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
test: pngtest
- cd ${.OBJDIR} && env \
- LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
+ env LD_LIBRARY_PATH="${.OBJDIR}" ./pngtest
-beforeinstall:
- if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
- fi
- if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
- fi
- if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \
- fi
- if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \
- fi
- if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
- fi
- if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \
- fi
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-afterinstall:
- @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
- @rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
- @rm -f ${DESTDIR}${PREFIX}/include/png.h
- @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
- @rm -f ${DESTDIR}${PREFIX}/include/pnglibconf.h
- @rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
- ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
- -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
- ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
- -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
- ${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
- -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
-
.include <bsd.lib.mk>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2023-01-20 16:39:45 UTC (rev 889)
@@ -11,14 +11,12 @@
# and license in png.h
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=cc
@@ -29,10 +27,6 @@
CP=cp
RM_F=/bin/rm -f
-# where make install puts libpng.a, $(OLDSO)*, and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
@@ -43,26 +37,6 @@
CFLAGS= -dy -belf -O3
LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -81,7 +55,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -KPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -90,23 +64,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"-belf\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -120,87 +77,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- -@$(RM_F) $(DI)/png.h
- -@$(RM_F) $(DI)/pngconf.h
- -@$(RM_F) $(DI)/pnglibconf.h
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- $(CC) $(CPPFLAGS) $(CFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
- $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
- pnglibconf.h libpng.pc
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pngtest-static pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc 2023-01-20 16:39:45 UTC (rev 889)
@@ -9,13 +9,11 @@
# Library name:
LIBNAME=libpng16
-PNGMAJ = 16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=gcc
@@ -26,12 +24,6 @@
CP=cp
RM_F=/bin/rm -f
-# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
-# Prefix must be a full pathname.
-
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib32
#ZLIBINC=/usr/local/include
@@ -52,27 +44,6 @@
-set_version sgi$(PNGMAJ).0
# See "man dso" for info about shared objects
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-#LIBPATH=$(exec_prefix)/lib32
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -84,7 +55,7 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-all: libpng.a pngtest shared libpng.pc libpng-config
+all: libpng.a pngtest shared
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -95,26 +66,6 @@
shared: $(LIBSOMAJ)
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"$(ABI)\"; \
- echo cppflags=\"\"; \
- echo ldopts=\"$(ABI)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -130,87 +81,21 @@
echo Testing local static library.
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -rpath $(ZLIBLIB):$(DL) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \
- so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
+ $(RM_F) libpng.a pngtest pngout.png
+ $(RM_F) so_locations $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi 2023-01-20 16:39:45 UTC (rev 889)
@@ -9,13 +9,11 @@
# Library name:
LIBNAME=libpng16
-PNGMAJ = 16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=cc
@@ -26,12 +24,6 @@
CP=cp
RM_F=/bin/rm -f
-# Where make install puts libpng.a, libpng16.so, and libpng16/png.h
-# Prefix must be a full pathname.
-
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib32
#ZLIBINC=/usr/local/include
@@ -55,27 +47,6 @@
-set_version sgi$(PNGMAJ).0
# See "man dso" for info about shared objects
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-#LIBPATH=$(exec_prefix)/lib32
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -87,7 +58,7 @@
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-all: libpng.a pngtest shared libpng.pc libpng-config
+all: libpng.a pngtest shared
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -96,25 +67,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"$(ABI)\"; \
- echo ldopts=\"$(ABI)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -130,88 +82,21 @@
echo Testing local static library.
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) \
- -rpath $(ZLIBLIB):$(DL) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) \
- -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
- $(LIBSO) $(LIBSOMAJ)* \
- so_locations pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* so_locations pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9 2023-01-20 16:39:45 UTC (rev 889)
@@ -11,14 +11,12 @@
# and license in png.h
# Library name:
-PNGMAJ = 16
-LIBNAME = libpng16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
# gcc 2.95 doesn't work.
@@ -30,10 +28,6 @@
CP=cp
RM_F=/bin/rm -f
-# Where make install puts libpng.a, $(OLDSO)*, and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
# Changing these to ../zlib poses a security risk. If you want
# to have zlib in an adjacent directory, specify the full path instead of "..".
@@ -49,26 +43,6 @@
CFLAGS=-O3
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -87,7 +61,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -KPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -96,23 +70,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-R$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -138,86 +95,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris 2023-01-20 16:39:45 UTC (rev 889)
@@ -10,14 +10,12 @@
# and license in png.h
# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
+LIBNAME=libpng16
+PNGMAJ=16
# Shared library names:
LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
# Utilities:
CC=gcc
@@ -28,10 +26,6 @@
CP=cp
RM_F=/bin/rm -f
-# Where make install puts libpng.a, libpng16.so*, and png.h
-prefix=/usr/local
-exec_prefix=$(prefix)
-
# Where the zlib library and include files are located
# Changing these to ../zlib poses a security risk. If you want
# to have zlib in an adjacent directory, specify the full path instead of "..".
@@ -48,26 +42,6 @@
CFLAGS=-O -Wall -Wextra -Wundef # $(WARNMORE) -g
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm # -g
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
@@ -86,7 +60,7 @@
.c.pic.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
@@ -95,24 +69,6 @@
$(AR_RC) $@ $(OBJS)
$(RANLIB) $@
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cppflags=\"\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-R$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
$(LIBSO): $(LIBSOMAJ)
$(LN_SF) $(LIBSOMAJ) $(LIBSO)
@@ -138,86 +94,21 @@
test: pngtest
./pngtest
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+install-static:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
+install-shared:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)
- ./pngtestd pngtest.png
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \
- -L$(ZLIBLIB) -R$(ZLIBLIB)
- ./pngtesti pngtest.png
-
clean:
- $(RM_F) *.o libpng.a pngtest pngtesti pngout.png \
- libpng-config $(LIBSO) $(LIBSOMAJ)* \
- libpng.pc pnglibconf.h
+ $(RM_F) *.o libpng.a pngtest pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
# DO NOT DELETE THIS LINE -- make depend depends on it.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,21 +7,6 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
@@ -34,8 +19,6 @@
AR_RC = ar rc
RANLIB = ranlib
MKDIR_P = mkdir
-LN_SF = ln -sf
-CP = cp
MV_F = mv -f
RM_F = rm -f
AWK = awk
@@ -92,22 +75,9 @@
test: pngtest
./pngtest
-install: libpng.a pnglibconf.h
- -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
- -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
- -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
- -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
- -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
- -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h
- cp png.h $(DESTDIR)$(INCPATH)/libpng
- cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
- cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
- (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
- cp libpng.a $(DESTDIR)$(LIBPATH)
- chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
clean:
$(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,21 +7,6 @@
# For conditions of distribution and use, see the disclaimer
# and license in png.h
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
# Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
@@ -32,7 +17,6 @@
AR_RC=ar rc
RANLIB=ranlib
MKDIR_P=mkdir -p
-LN_SF=ln -f -s
CP=cp
RM_F=/bin/rm -f
@@ -66,22 +50,9 @@
test: pngtest
./pngtest
-install: libpng.a
- -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
- -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
- -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
- -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
- -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
- -@$(RM_F) $(DESTDIR)$(INCPATH)/pnglibconf.h
- cp png.h $(DESTDIR)$(INCPATH)/libpng
- cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
- cp pnglibconf.h $(DESTDIR)$(INCPATH)/libpng
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pnglibconf.h
- (cd $(DESTDIR)$(INCPATH); $(LN_SF) libpng/* .)
- cp libpng.a $(DESTDIR)$(LIBPATH)
- chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
+install:
+ @echo "The $@ target is no longer supported by this makefile."
+ @false
clean:
$(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/options.awk 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,8 +1,7 @@
#!/bin/awk -f
+
# scripts/options.awk - library build configuration control
#
-# last changed in libpng version 1.6.11 - June 5, 2014
-#
# Copyright (c) 1998-2014 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
@@ -243,7 +242,7 @@
# option NAME ( (requires|enables|if) NAME* | on | off | disabled |
# sets SETTING VALUE+ )*
-#
+#
# Declares an option 'NAME' and describes its default setting (disabled)
# and its relationship to other options. The option is disabled
# unless *all* the options listed after 'requires' are set and at
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
/* pnglibconf.h - library build configuration */
-/* libpng version 1.6.38 */
+/* libpng version 1.6.39 */
/* Copyright (c) 2018-2022 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/prefix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/prefix.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/prefix.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,6 @@
/* prefix.c - generate an unprefixed symbol list
*
- * Last changed in libpng version 1.6.16 [December 22, 2014]
* Copyright (c) 2013-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/sym.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/sym.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/sym.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,6 @@
/* sym.c - define format of libpng.sym
*
- * Last changed in libpng version 1.6.16 [December 22, 2014]
* Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/symbols.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,6 @@
/* symbols.c - find all exported symbols
*
- * Last changed in libpng version 1.6.16 [December 22, 2014]
* Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/vers.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/vers.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/vers.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,6 @@
/* vers.c - define format of libpng.vers
*
- * Last changed in libpng version 1.6.16 [December 22, 2014]
* Copyright (c) 2011-2014 Glenn Randers-Pehrson
*
* This code is released under the libpng license.
Added: branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# Usage:
+#
+# tests/pngstest gamma alpha
+#
+# Run ./pngstest on the PNG files in $srcdir/contrib/testpngs which have the
+# given gamma and opacity:
+#
+# gamma: one of; linear, 1.8, sRGB, none.
+# alpha: one of; opaque, tRNS, alpha, none. 'none' is equivalent to !alpha
+#
+# NOTE: the temporary files pngstest generates have the base name gamma-alpha to
+# avoid issues with make -j
+#
+gamma="$1"
+shift
+alpha="$1"
+shift
+args=
+LC_ALL="C" # fix glob sort order to ASCII:
+for f in "${srcdir}/contrib/testpngs/"*.png
+do
+ g=
+ case "$f" in
+ *-linear[.-]*)
+ test "$gamma" = "linear" && g="$f";;
+
+ *-sRGB[.-]*)
+ test "$gamma" = "sRGB" && g="$f";;
+
+ *-1.8[.-]*)
+ test "$gamma" = "1.8" && g="$f";;
+
+ *)
+ test "$gamma" = "none" && g="$f";;
+ esac
+
+ case "$g" in
+ "")
+ :;;
+
+ *-alpha[-.]*)
+ test "$alpha" = "alpha" && args="$args $g";;
+
+ *-tRNS[-.]*)
+ test "$alpha" = "tRNS" -o "$alpha" = "none" && args="$args $g";;
+
+ *)
+ test "$alpha" = "opaque" -o "$alpha" = "none" && args="$args $g";;
+ esac
+done
+# This only works if the arguments don't contain spaces; they don't.
+exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $args
Deleted: branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngtest --strict ${srcdir}/pngtest.png
Modified: branches/stable/source/src/libs/libpng/version.ac
===================================================================
--- branches/stable/source/src/libs/libpng/version.ac 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/libs/libpng/version.ac 2023-01-20 16:39:45 UTC (rev 889)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.6.38])
+m4_define([libpng_version], [1.6.39])
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/README 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,5 +1,5 @@
-$Id: README 64953 2022-11-06 22:15:26Z karl $
-Copyright 2006-2022 TeX Users Group.
+$Id: README 65276 2022-12-15 12:41:31Z hironobu $
+Copyright 2006-2023 TeX Users Group.
You may freely use, modify and/or distribute this file.
This TeX Live directory contains the programs that use the kpathsea
@@ -25,7 +25,7 @@
bibtex-x - maintained here, contains
bibtex8, bibtexu
-chktex 1.7.6 - checked 15mar20
+chktex 1.7.8 - checked 15dec22
http://mirror.ctan.org/support/chktex/
http://download.savannah.gnu.org/releases/chktex/
@@ -63,7 +63,7 @@
dvipsk - maintained here, by us
-dvisvgm 2.14 - checked 29aug22
+dvisvgm 3.0.1 - checked 19jan23
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
@@ -108,7 +108,7 @@
ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
-upmendex 1.05 - by Takuji Tanaka
+upmendex 1.07 - by Takuji Tanaka
https://ctan.org/pkg/upmendex
https://github.com/t-tk/upmendex-package
@@ -127,8 +127,7 @@
hitex - https://hint.userweb.mwn.de/hint/hitex.html
mflua[jit] - https://serveur-svn.lri.fr/svn/modhel/mflua
also: http://www.luatex.org/download.html
- mplibdir - http://tug.org/metapost/
- also: http://www.luatex.org/download.html
+ mplibdir - https://tug.org/metapost/
luatex - http://luatex.org/
pdftex - http://pdftex.org/
[u]pmpost - nothing current, see README for old info
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,8 @@
+2022-12-20 Karl Berry <karl at freefriends.org>
+
+ * doc/kpathsea.texi (Supported file formats): add .lua (LUAINPUTS).
+ Report from Werner Lemberg.
+
2022-11-05 Sam James <sam at gentoo.org>
* configure.ac (Ghostscript version): #include <stdlib.h>
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.info
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.info 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,9 +1,9 @@
-This is kpathsea.info, produced by makeinfo version 5.1 from
+This is kpathsea.info, produced by makeinfo version 7.0.1 from
kpathsea.texi.
This file documents the Kpathsea library for path searching.
- Copyright (C) 1996-2022 Karl Berry & Olaf Weber.
+ Copyright © 1996–2022 Karl Berry & Olaf Weber.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -37,7 +37,7 @@
****************
This manual documents the Kpathsea library for path searching. It
-corresponds to version 6.3.4, released in January 2022.
+corresponds to version 6.3.4, released in December 2022.
* Menu:
@@ -62,9 +62,9 @@
**************
This manual corresponds to version 6.3.4 of the Kpathsea library,
-released in January 2022.
+released in December 2022.
- The library's fundamental purpose is to return a filename from a list
+ The library’s fundamental purpose is to return a filename from a list
of directories specified by the user, similar to what shells do when
looking up program names to execute.
@@ -71,11 +71,11 @@
The following software, all of which is maintained in parallel, uses
this library:
- * Dviljk (see the 'dvilj' man page)
- * Dvipsk (*note (dvips)::)
- * GNU font utilities (*note (fontu)::)
- * Web2c (*note (web2c)::)
- * Xdvik (see the 'xdvi' man page)
+ • Dviljk (see the ‘dvilj’ man page)
+ • Dvipsk (*note (dvips)::)
+ • GNU font utilities (*note (fontu)::)
+ • Web2c (*note (web2c)::)
+ • Xdvik (see the ‘xdvi’ man page)
Other software that we do not maintain also uses it.
@@ -98,8 +98,8 @@
<https://gnu.org/licenses>.
If you know enough about TeX to be reading this manual, then you (or
-your institution) should consider joining the TeX Users Group (if you're
-already a member, thanks!). TUG produces the periodical 'TUGboat',
+your institution) should consider joining the TeX Users Group (if you’re
+already a member, thanks!). TUG produces the periodical ‘TUGboat’,
sponsors an annual meeting and publishes the proceedings, and arranges
courses on TeX for all levels of users throughout the world. See
<https://tug.org> for information.
@@ -116,8 +116,8 @@
This section is for those people who are curious about how the library
came about. If you like to read historical accounts of software, we
-urge you to seek out the GNU Autoconf manual and the "Errors of TeX"
-paper by Don Knuth, published in his book 'Digital Typography', among
+urge you to seek out the GNU Autoconf manual and the “Errors of TeX”
+paper by Don Knuth, published in his book ‘Digital Typography’, among
other places.
[Karl writes.] My first ChangeLog entry for Web2c seems to be
@@ -125,32 +125,32 @@
Tim Morgan and I were jointly maintaining it for a time. (I should
mention here that Tim had made Web2c into a real distribution long
before I had ever used it or even heard of it, and Tom Rokicki did the
-original implementation. When I started, I was using 'pxp' and 'pc' on
-VAX 11/750's and the hot new Sun 2 machines.)
+original implementation. When I started, I was using ‘pxp’ and ‘pc’ on
+VAX 11/750’s and the hot new Sun 2 machines.)
It must have been later in 1990 and 1991 that I started working on
-'TeX for the Impatient'. Dvips, Xdvi, Web2c, and the GNU fontutils
+‘TeX for the Impatient’. Dvips, Xdvi, Web2c, and the GNU fontutils
(which I was also writing at the time) all used different environment
variables, and, more importantly, had different bugs in their path
searching. This became extremely painful, as I was stressing everything
to the limit working on the book. I also desperately wanted to
-implement subdirectory searching, since I couldn't stand putting
-everything in one big directory, and also couldn't stand having to
-explicitly specify 'cm', 'pandora', ... in a path.
+implement subdirectory searching, since I couldn’t stand putting
+everything in one big directory, and also couldn’t stand having to
+explicitly specify ‘cm’, ‘pandora’, ... in a path.
In the first incarnation, I just hacked separately on each
-program--that was the original subdirectory searching code in both Xdvi
+program—that was the original subdirectory searching code in both Xdvi
and Dvips. That is, I tried to go with the flow in each program, rather
-than changing the program's calling sequences to conform to new
+than changing the program’s calling sequences to conform to new
routines.
Then, as bugs inevitably appeared, I found I was fixing the same
thing three times (Web2c and fontutils were already sharing code, since
-I maintained both of those--there was no Dvipsk or Xdvik or Dviljk at
+I maintained both of those—there was no Dvipsk or Xdvik or Dviljk at
this point). After a while, I finally started sharing source files.
-They weren't yet a library, though. I just kept things up to date with
+They weren’t yet a library, though. I just kept things up to date with
shell scripts. (I was developing on a 386 running ISC 2.2 at the time,
-and so didn't have symbolic links. An awful experience.)
+and so didn’t have symbolic links. An awful experience.)
The ChangeLogs for Xdvik and Dvipsk record initial releases of those
distributions in May and June 1992. I think it was because I was tired
@@ -159,7 +159,7 @@
MacKenzie and others, and I was adapting it to TeX and friends.
I started to make a separate library that other programs could link
-with on my birthday in April 1993, according to the ChangeLog. I don't
+with on my birthday in April 1993, according to the ChangeLog. I don’t
remember exactly why I finally took the time to make it a separate
library; a conversation with david zuhn initiated it. Just seemed like
it was time.
@@ -166,7 +166,7 @@
Dviljk got started in March 1994 after I bought a Laserjet 4.
(Kpathsea work got suspended while Norm Walsh and I, with Gustaf
-Neumann's help, implemented a way for TeX to get at all those neat
+Neumann’s help, implemented a way for TeX to get at all those neat
builtin LJ4 fonts ... such a treat to have something to typeset in
besides Palatino!)
@@ -175,11 +175,11 @@
initial goals by Thomas Esser and others. I then started to integrate
Web2c with Kpathsea. After the release of a stable Web2c, I hope to be
able to stop development, and turn most of my attention back to making
-fonts for GNU. (Always assuming Micros**t hasn't completely obliterated
-Unix by then, or that software patents haven't stopped software
+fonts for GNU. (Always assuming Micros**t hasn’t completely obliterated
+Unix by then, or that software patents haven’t stopped software
development by anybody smaller than a company with a
million-dollar-a-year legal budget. Which is actually what I think is
-likely to happen, but that's another story...)
+likely to happen, but that’s another story...)
[Olaf writes.] At the end of 1997, Unix is still alive and kicking,
individuals still develop software, and Web2c development still
@@ -186,7 +186,7 @@
continues. Karl had been looking for some time for someone to take up
part of the burden, and I volunteered.
- [Karl writes again.] Indeed, time goes on. As of 2006 or so, Olaf's
+ [Karl writes again.] Indeed, time goes on. As of 2006 or so, Olaf’s
available time for Kpathsea was reduced, and I started taking overall
care of it again, although I did not do any significant new development.
In 2009, Taco Hoekwater implemented a major rearrangement to make the
@@ -198,7 +198,7 @@
File: kpathsea.info, Node: unixtex.ftp, Next: Security, Prev: Introduction, Up: Top
-2 'unixtex.ftp': Obtaining TeX
+2 ‘unixtex.ftp’: Obtaining TeX
******************************
This is <ftp://tug.org/tex/unixtex.ftp>, a.k.a.
@@ -216,13 +216,13 @@
part of TeX Live.
The host ftp.cs.stanford.edu is the original source for the files for
-which Donald Knuth is directly responsible: 'tex.web', 'plain.tex', etc.
+which Donald Knuth is directly responsible: ‘tex.web’, ‘plain.tex’, etc.
However, unless you want to undertake the project of building your TeX
system from scratch, it is more reliable and less work to retrieve these
files as part of a larger package.
In any case, the Stanford ftp site is not the canonical source for
-anything except what was created as part of Knuth's original TeX, so do
+anything except what was created as part of Knuth’s original TeX, so do
not rely on any other files available there being up-to-date. The best
place to check for up-to-date files is CTAN (the Comprehensive TeX
Archive Network), <https://ctan.org>.
@@ -234,25 +234,25 @@
**********
None of the programs in the TeX system require any special system
-privileges, so there's no first-level security concern of people gaining
+privileges, so there’s no first-level security concern of people gaining
illegitimate root access.
A TeX document, however, can write to arbitrary files, e.g.,
-'~/.rhosts', and thus an unwitting user who runs TeX on a random
+‘~/.rhosts’, and thus an unwitting user who runs TeX on a random
document is vulnerable to a trojan horse attack. This loophole is
closed by default, but you can be permissive if you so desire in
-'texmf.cnf'. *Note (web2c)tex invocation::. MetaPost has the same
+‘texmf.cnf’. *Note (web2c)tex invocation::. MetaPost has the same
issue.
Dvips, Xdvi, and TeX can also execute shell commands under some
-circumstances. To disable this, see the '-R' option in *note
+circumstances. To disable this, see the ‘-R’ option in *note
(dvips)Option details::, the xdvi man page, and *note (web2c)tex
invocation::, respectively.
- Another security issue arises because it's very useful--almost
-necessary--to make arbitrary fonts on user demand with 'mktexpk' and
-friends. Where do these files get installed? By default, the 'mktexpk'
-distributed with Kpathsea assumes a world-writable '/var/tmp' directory;
+ Another security issue arises because it’s very useful—almost
+necessary—to make arbitrary fonts on user demand with ‘mktexpk’ and
+friends. Where do these files get installed? By default, the ‘mktexpk’
+distributed with Kpathsea assumes a world-writable ‘/var/tmp’ directory;
this is a simple and convenient approach, but it may not suit your
situation because it means that a local cache of fonts is created on
every machine.
@@ -259,27 +259,27 @@
To avoid this duplication, many people consider a shared, globally
writable font tree desirable, in spite of the potential security
-problems. To do this you should change the value of 'VARTEXFONTS' in
-'texmf.cnf' to refer to some globally known directory. *Note mktex
+problems. To do this you should change the value of ‘VARTEXFONTS’ in
+‘texmf.cnf’ to refer to some globally known directory. *Note mktex
configuration::.
The first restriction you can apply is to make newly-created
-directories under 'texmf' be append-only with an option in 'mktex.cnf'.
+directories under ‘texmf’ be append-only with an option in ‘mktex.cnf’.
*Note mktex configuration::.
Another approach is to establish a group (or user) for TeX files,
-make the 'texmf' tree writable only to that group (or user), and make
-'mktexpk' et al. setgid to that group (or setuid to that user). Then
-users must invoke the scripts to install things. (If you're worried
+make the ‘texmf’ tree writable only to that group (or user), and make
+‘mktexpk’ et al. setgid to that group (or setuid to that user). Then
+users must invoke the scripts to install things. (If you’re worried
about the inevitable security holes in scripts, then you could write a C
wrapper to exec the script.)
- The 'mktex...' scripts install files with the same read and write
+ The ‘mktex...’ scripts install files with the same read and write
permissions as the directory they are installed in. The executable,
sgid, suid, and sticky bits are always cleared.
- Any directories created by the 'mktex...' scripts have the same
-permissions as their parent directory, unless the 'appendonlydir'
+ Any directories created by the ‘mktex...’ scripts have the same
+permissions as their parent directory, unless the ‘appendonlydir’
feature is used, in which case the sticky bit is always set.
@@ -298,53 +298,53 @@
In short, here is a skeleton of the default directory structure,
extracted from the TDS document:
- PREFIX/ installation root ('/usr/local' by default)
+ PREFIX/ installation root (‘/usr/local’ by default)
bin/ executables
man/ man pages
include/ C header files
info/ GNU info files
- lib/ libraries ('libkpathsea.*')
+ lib/ libraries (‘libkpathsea.*’)
share/ architecture-independent files
texmf/ TDS root
bibtex/ BibTeX input files
bib/ BibTeX databases
- base/ base distribution (e.g., 'xampl.bib')
+ base/ base distribution (e.g., ‘xampl.bib’)
misc/ single-file databases
PKG/ name of a package
bst/ BibTeX style files
- base/ base distribution (e.g., 'plain.bst', 'acm.bst')
+ base/ base distribution (e.g., ‘plain.bst’, ‘acm.bst’)
misc/ single-file styles
PKG/ name of a package
doc/ additional documentation
- dvips/ '.pro', '.ps', 'psfonts.map'
+ dvips/ ‘.pro’, ‘.ps’, ‘psfonts.map’
fonts/ font-related files
- TYPE/ file type (e.g., 'tfm', 'pk')
- MODE/ type of output device (types 'pk' and 'gf' only)
- SUPPLIER/ name of a font supplier (e.g., 'public')
- TYPEFACE/ name of a typeface (e.g., 'cm')
- dpiNNN/ font resolution (types 'pk' and 'gf' only)
+ TYPE/ file type (e.g., ‘tfm’, ‘pk’)
+ MODE/ type of output device (types ‘pk’ and ‘gf’ only)
+ SUPPLIER/ name of a font supplier (e.g., ‘public’)
+ TYPEFACE/ name of a typeface (e.g., ‘cm’)
+ dpiNNN/ font resolution (types ‘pk’ and ‘gf’ only)
metafont/ Metafont (non-font) input files
- base/ base distribution (e.g., 'plain.mf')
- misc/ single-file packages (e.g., 'modes.mf')
- PKG/ name of a package (e.g., 'mfpic')
+ base/ base distribution (e.g., ‘plain.mf’)
+ misc/ single-file packages (e.g., ‘modes.mf’)
+ PKG/ name of a package (e.g., ‘mfpic’)
metapost/ MetaPost input files
- base/ base distribution (e.g., 'plain.mp')
+ base/ base distribution (e.g., ‘plain.mp’)
misc/ single-file packages
PKG/ name of a package
- support/ support files for MetaPost-related utilities (e.g., 'trfonts.map')
- mft/ 'MFT' inputs (e.g., 'plain.mft')
+ support/ support files for MetaPost-related utilities (e.g., ‘trfonts.map’)
+ mft/ ‘MFT’ inputs (e.g., ‘plain.mft’)
tex/ TeX input files
- FORMAT/ name of a format (e.g., 'plain')
- base/ base distribution for FORMAT (e.g., 'plain.tex')
- misc/ single-file packages (e.g., 'webmac.tex')
+ FORMAT/ name of a format (e.g., ‘plain’)
+ base/ base distribution for FORMAT (e.g., ‘plain.tex’)
+ misc/ single-file packages (e.g., ‘webmac.tex’)
local/ local additions to or local configuration files for FORMAT
- PKG/ name of a package (e.g., 'graphics', 'mfnfss')
+ PKG/ name of a package (e.g., ‘graphics’, ‘mfnfss’)
generic/ format-independent packages
- hyphen/ hyphenation patterns (e.g., 'hyphen.tex')
+ hyphen/ hyphenation patterns (e.g., ‘hyphen.tex’)
images/ image input files (e.g., Encapsulated PostScript)
- misc/ single-file format-independent packages (e.g., 'null.tex').
- PKG/ name of a package (e.g., 'babel')
- web2c/ implementation-dependent files ('.pool', '.fmt', 'texmf.cnf', etc.)
+ misc/ single-file format-independent packages (e.g., ‘null.tex’).
+ PKG/ name of a package (e.g., ‘babel’)
+ web2c/ implementation-dependent files (‘.pool’, ‘.fmt’, ‘texmf.cnf’, etc.)
Some concrete examples for most file types:
@@ -395,16 +395,16 @@
5.1 Searching overview
======================
-A "search path" is a colon-separated list of "path elements", which are
+A “search path” is a colon-separated list of “path elements”, which are
directory names with a few extra frills. A search path can come from (a
-combination of) many sources; see below. To look up a file 'foo' along
-a path '.:/dir', Kpathsea checks each element of the path in turn: first
-'./foo', then '/dir/foo', returning the first match (or possibly all
+combination of) many sources; see below. To look up a file ‘foo’ along
+a path ‘.:/dir’, Kpathsea checks each element of the path in turn: first
+‘./foo’, then ‘/dir/foo’, returning the first match (or possibly all
matches).
- The "colon" and "slash" mentioned here aren't necessarily ':' and '/'
+ The “colon” and “slash” mentioned here aren’t necessarily ‘:’ and ‘/’
on non-Unix systems. Kpathsea tries to adapt to other operating
-systems' conventions.
+systems’ conventions.
To check a particular path element E, Kpathsea first sees if a
prebuilt database (*note Filename database::) applies to E, i.e., if the
@@ -413,7 +413,7 @@
If the database does not exist, or does not apply to this path
element, or contains no matches, the filesystem is searched (if this was
-not forbidden by the specification with '!!' and if the file being
+not forbidden by the specification with ‘!!’ and if the file being
searched for must exist). Kpathsea constructs the list of directories
that correspond to this path element, and then checks in each for the
file being searched for. (To help speed future lookups of files in the
@@ -420,10 +420,10 @@
same directory, the directory in which a file is found is floated to the
top of the directory list.)
- The "file must exist" condition comes into play with VF files and
-input files read by the TeX '\openin' command. These files might very
-well not exist (consider 'cmr10.vf'), and so it would be wrong to search
-the disk for them. Therefore, if you fail to update 'ls-R' when you
+ The “file must exist” condition comes into play with VF files and
+input files read by the TeX ‘\openin’ command. These files might very
+well not exist (consider ‘cmr10.vf’), and so it would be wrong to search
+the disk for them. Therefore, if you fail to update ‘ls-R’ when you
install a new VF file, it will not be found.
Each path element is checked in turn: first the database, then the
@@ -435,20 +435,20 @@
On Unix-like systems, if no match is found by any of the above, and
the path element allows checking the filesystem (per the above), a final
check is made for a case-insensitive match. Thus, looking for a name
-like './FooBar.TeX' will match a file './foobar.tex', and vice versa.
+like ‘./FooBar.TeX’ will match a file ‘./foobar.tex’, and vice versa.
This is not done on Windows. *Note Casefolding search::.
Although the simplest and most common path element is a directory
name, Kpathsea supports additional features in search paths: layered
-default values, environment variable names, config file values, users'
+default values, environment variable names, config file values, users’
home directories, and recursive subdirectory searching. Thus, we say
-that Kpathsea "expands" a path element, meaning transforming all the
+that Kpathsea “expands” a path element, meaning transforming all the
magic specifications into the basic directory name or names. This
process is described in the sections below. It happens in the same
order as the sections.
Exception to all of the above: If the filename being searched for is
-absolute or explicitly relative, i.e., starts with '/' or './' or '../',
+absolute or explicitly relative, i.e., starts with ‘/’ or ‘./’ or ‘../’,
Kpathsea simply checks if that file exists, with a fallback to a
casefolding match if needed and enabled, as described above.
@@ -455,12 +455,12 @@
Ordinarily, if Kpathsea tries to access a file or directory that
cannot be read, it gives a warning. This is so you will be alerted to
directories or files that accidentally lack any read permission (for
-example, a 'lost+found' directory). If you prefer not to see these
-warnings, include the value 'readable' in the 'TEX_HUSH' environment
+example, a ‘lost+found’ directory). If you prefer not to see these
+warnings, include the value ‘readable’ in the ‘TEX_HUSH’ environment
variable or config file value.
This generic path searching algorithm is implemented in
-'kpathsea/pathsearch.c'. It is employed by a higher-level algorithm
+‘kpathsea/pathsearch.c’. It is employed by a higher-level algorithm
when searching for a file of a particular type (*note File lookup::, and
*note Glyph lookup::).
@@ -473,21 +473,21 @@
A search path or other configuration value can come from many sources.
In the order in which Kpathsea looks for them:
- 1. A command-line option such as '--cnf-line', available in
- 'kpsewhich' and most TeX engines. *Note Path searching options::.
+ 1. A command-line option such as ‘--cnf-line’, available in
+ ‘kpsewhich’ and most TeX engines. *Note Path searching options::.
- A user-set environment variable, e.g., 'TEXINPUTS'. Environment
+ A user-set environment variable, e.g., ‘TEXINPUTS’. Environment
variables with an underscore and the program name appended
- override; for example, 'TEXINPUTS_latex' overrides 'TEXINPUTS' if
- the program being run is named 'latex'.
+ override; for example, ‘TEXINPUTS_latex’ overrides ‘TEXINPUTS’ if
+ the program being run is named ‘latex’.
- 2. A program-specific configuration file, e.g., an 'S /a:/b' line in
- Dvips' 'config.ps' (*note (dvips)Config files::).
+ 2. A program-specific configuration file, e.g., an ‘S /a:/b’ line in
+ Dvips’ ‘config.ps’ (*note (dvips)Config files::).
- 3. A line in a Kpathsea configuration file 'texmf.cnf', e.g.,
- 'TEXINPUTS=/c:/d' (see below).
+ 3. A line in a Kpathsea configuration file ‘texmf.cnf’, e.g.,
+ ‘TEXINPUTS=/c:/d’ (see below).
- 4. The compile-time default (specified in 'kpathsea/paths.h').
+ 4. The compile-time default (specified in ‘kpathsea/paths.h’).
You can see each of these values for a given search path by using the
debugging options (*note Debugging::).
@@ -497,7 +497,7 @@
* Menu:
-* Config files:: Kpathsea's runtime config files (texmf.cnf).
+* Config files:: Kpathsea’s runtime config files (texmf.cnf).
File: kpathsea.info, Node: Config files, Up: Path sources
@@ -505,73 +505,73 @@
5.2.1 Config files
------------------
-As mentioned above, Kpathsea reads "runtime configuration files" named
-'texmf.cnf' for search path and other definitions. The search path used
-to look for these configuration files is named 'TEXMFCNF', and is
+As mentioned above, Kpathsea reads “runtime configuration files” named
+‘texmf.cnf’ for search path and other definitions. The search path used
+to look for these configuration files is named ‘TEXMFCNF’, and is
constructed in the usual way, as described above, except that
configuration files cannot be used to define the path, naturally; also,
-an 'ls-R' database is not used to search for them.
+an ‘ls-R’ database is not used to search for them.
- Kpathsea reads _all_ 'texmf.cnf' files in the search path, not just
+ Kpathsea reads _all_ ‘texmf.cnf’ files in the search path, not just
the first one found; definitions in earlier files override those in
-later files. Thus, if the search path is '.:$TEXMF', values from
-'./texmf.cnf' override those from '$TEXMF/texmf.cnf'.
+later files. Thus, if the search path is ‘.:$TEXMF’, values from
+‘./texmf.cnf’ override those from ‘$TEXMF/texmf.cnf’.
- If Kpathsea cannot find any 'texmf.cnf' file, it reports a warning
-including all the directories it checked. If you don't want to see this
-warning, set the environment variable 'KPATHSEA_WARNING' to the single
-character '0' (zero, not oh).
+ If Kpathsea cannot find any ‘texmf.cnf’ file, it reports a warning
+including all the directories it checked. If you don’t want to see this
+warning, set the environment variable ‘KPATHSEA_WARNING’ to the single
+character ‘0’ (zero, not oh).
While (or instead of) reading this description, you may find it
-helpful to look at the distributed 'texmf.cnf', which uses or at least
-mentions most features. The format of 'texmf.cnf' files follows:
+helpful to look at the distributed ‘texmf.cnf’, which uses or at least
+mentions most features. The format of ‘texmf.cnf’ files follows:
- * Comments start with '%' or '#', either at the beginning of a line
+ • Comments start with ‘%’ or ‘#’, either at the beginning of a line
or preceded by whitespace, and continue to the end of the line.
That is, similar to most shells, a comment character in the
- "middle" of a value does not start a comment. Examples:
+ “middle” of a value does not start a comment. Examples:
% this is a comment
var = a%b % but the value of var will be "a%b"
- * Blank lines are ignored.
+ • Blank lines are ignored.
- * A '\' at the end of a line acts as a continuation character, i.e.,
+ • A ‘\’ at the end of a line acts as a continuation character, i.e.,
the next line is appended. Whitespace at the beginning of
continuation lines is not ignored.
- * Each remaining line will look like:
+ • Each remaining line will look like:
VARIABLE [. PROGNAME] [=] VALUE
- where the '=' and surrounding whitespace is optional.
+ where the ‘=’ and surrounding whitespace is optional.
- * The VARIABLE name may contain any character other than whitespace,
- '=', or '.', but sticking to 'A-Za-z_' is safest.
+ • The VARIABLE name may contain any character other than whitespace,
+ ‘=’, or ‘.’, but sticking to ‘A-Za-z_’ is safest.
- * If '.PROGNAME' is present (preceding spaces are ignored), the
+ • If ‘.PROGNAME’ is present (preceding spaces are ignored), the
definition only applies if the program that is running is named
- (i.e., the last component of 'argv[0]' is) PROGNAME or
- 'PROGNAME.{exe,bat,cmd,...}'. Most notably, this allows different
+ (i.e., the last component of ‘argv[0]’ is) PROGNAME or
+ ‘PROGNAME.{exe,bat,cmd,...}’. Most notably, this allows different
flavors of TeX to have different search paths. The PROGNAME value
is used literally, without variable or other expansions.
- * Considered as strings, VALUE may contain any character. However,
- in practice most 'texmf.cnf' values are related to path expansion,
+ • Considered as strings, VALUE may contain any character. However,
+ in practice most ‘texmf.cnf’ values are related to path expansion,
and since various special characters are used in expansion, such as
braces and commas, they cannot be used in directory names.
- The '$VAR.PROG' feature is not available on the right-hand side;
+ The ‘$VAR.PROG’ feature is not available on the right-hand side;
instead, you must use an additional variable (see below for
example).
- A ';' in VALUE is translated to ':' if running under Unix, in order
- to have a single 'texmf.cnf' that can support both Unix and Windows
+ A ‘;’ in VALUE is translated to ‘:’ if running under Unix, in order
+ to have a single ‘texmf.cnf’ that can support both Unix and Windows
systems. This translation happens with any value, not just search
- paths, but fortunately in practice ';' is not needed in other
+ paths, but fortunately in practice ‘;’ is not needed in other
values.
- * All definitions are read before anything is expanded, so you can
+ • All definitions are read before anything is expanded, so you can
use variables before they are defined (like Make, unlike most other
programs).
@@ -585,26 +585,26 @@
TEXINPUTS.latex2e = $latex2e_inputs
TEXINPUTS.latex = $latex2e_inputs
- The combination of spaces being ignored before the '.' of a program
-name qualifer and the optional '=' for the assignment has an unexpected
-consequence: if the value begins with a literal '.' and the '=' is
+ The combination of spaces being ignored before the ‘.’ of a program
+name qualifer and the optional ‘=’ for the assignment has an unexpected
+consequence: if the value begins with a literal ‘.’ and the ‘=’ is
omitted, the intended value is interpreted as a program name. For
-example, a line 'var .;/some/path' is taken as an empty value for 'var'
-running under the program named ';/some/path'. To diagnose this,
+example, a line ‘var .;/some/path’ is taken as an empty value for ‘var’
+running under the program named ‘;/some/path’. To diagnose this,
Kpathsea warns if the program name contains a path separator or other
special character. The simplest way to avoid the problem is to use the
-'='.
+‘=’.
Exactly when a character will be considered special or act as itself
depends on the context in which it is used. The rules are inherent in
the multiple levels of interpretation of the configuration (parsing,
expansion, search, ...) and so cannot be concisely stated,
-unfortunately. There is no general escape mechanism; in particular, '\'
-is not an "escape character" in 'texmf.cnf' files. When it comes
+unfortunately. There is no general escape mechanism; in particular, ‘\’
+is not an “escape character” in ‘texmf.cnf’ files. When it comes
choosing directory names for installation, it is safest to avoid them
all.
- The implementation of all this is in 'kpathsea/cnf.c'.
+ The implementation of all this is in ‘kpathsea/cnf.c’.
File: kpathsea.info, Node: Path expansion, Next: Casefolding search, Prev: Path sources, Up: Path searching
@@ -614,9 +614,9 @@
Kpathsea recognizes certain special characters and constructions in
search paths, similar to that in shells. As a general example:
-'~$USER/{foo,bar}//baz' expands to all subdirectories under directories
-'foo' and 'bar' in $USER's home directory that contain a directory or
-file 'baz'.
+‘~$USER/{foo,bar}//baz’ expands to all subdirectories under directories
+‘foo’ and ‘bar’ in $USER’s home directory that contain a directory or
+file ‘baz’.
These expansions are explained in the sections below.
@@ -636,7 +636,7 @@
-----------------------
If the highest-priority search path (*note Path sources::) contains an
-"extra colon" (i.e., leading, trailing, or doubled), Kpathsea inserts at
+“extra colon” (i.e., leading, trailing, or doubled), Kpathsea inserts at
that point the next-highest-priority search path that is defined. If
that inserted path has an extra colon, the same happens with the
next-highest. (An extra colon in the compile-time default value has
@@ -646,7 +646,7 @@
setenv TEXINPUTS /home/karl:
-and a 'TEXINPUTS' value from 'texmf.cnf' of
+and a ‘TEXINPUTS’ value from ‘texmf.cnf’ of
.:$TEXMF//tex
@@ -654,9 +654,9 @@
/home/karl:.:$TEXMF//tex
- Put another way, default expansion works on "formats" (search paths),
+ Put another way, default expansion works on “formats” (search paths),
and not directly on environment variables. Example, showing the
-trailing ':' ignored in the first case and expanded in the second:
+trailing ‘:’ ignored in the first case and expanded in the second:
$ env TTFONTS=/tmp: kpsewhich --expand-path '$TTFONTS'
/tmp
@@ -664,21 +664,21 @@
/tmp:.:/home/olaf/texmf/fonts/truetype//:...
Since Kpathsea looks for multiple configuration files, it would be
-natural to expect that (for example) an extra colon in './texmf.cnf'
-would expand to the path in '$TEXMF/texmf.cnf'. Or, with Dvips'
-configuration files, that an extra colon in 'config.$PRINTER' would
-expand to the path in 'config.ps'. This doesn't happen. It's not clear
+natural to expect that (for example) an extra colon in ‘./texmf.cnf’
+would expand to the path in ‘$TEXMF/texmf.cnf’. Or, with Dvips’
+configuration files, that an extra colon in ‘config.$PRINTER’ would
+expand to the path in ‘config.ps’. This doesn’t happen. It’s not clear
this would be desirable in all cases, and trying to devise a way to
specify the path to which the extra colon should expand seemed truly
baroque.
Technicality: Since it would be useless to insert the default value
-in more than one place, Kpathsea changes only one extra ':' and leaves
+in more than one place, Kpathsea changes only one extra ‘:’ and leaves
any others in place (they will eventually be ignored). Kpathsea checks
-first for a leading ':', then a trailing ':', then a doubled ':'.
+first for a leading ‘:’, then a trailing ‘:’, then a doubled ‘:’.
- You can trace this by debugging "paths" (*note Debugging::). Default
-expansion is implemented in the source file 'kpathsea/kdefault.c'.
+ You can trace this by debugging “paths” (*note Debugging::). Default
+expansion is implemented in the source file ‘kpathsea/kdefault.c’.
File: kpathsea.info, Node: Variable expansion, Next: Tilde expansion, Prev: Default expansion, Up: Path expansion
@@ -686,34 +686,34 @@
5.3.2 Variable expansion
------------------------
-'$foo' or '${foo}' in a path element is replaced by (1) the value of an
-environment variable 'foo' (if defined); (2) the value of 'foo' from
-'texmf.cnf' (if defined); (3) the empty string.
+‘$foo’ or ‘${foo}’ in a path element is replaced by (1) the value of an
+environment variable ‘foo’ (if defined); (2) the value of ‘foo’ from
+‘texmf.cnf’ (if defined); (3) the empty string.
- If the character after the '$' is alphanumeric or '_', the variable
+ If the character after the ‘$’ is alphanumeric or ‘_’, the variable
name consists of all consecutive such characters. If the character
-after the '$' is a '{', the variable name consists of everything up to
-the next '}' (braces may not be nested around variable names).
-Otherwise, Kpathsea gives a warning and ignores the '$' and its
+after the ‘$’ is a ‘{’, the variable name consists of everything up to
+the next ‘}’ (braces may not be nested around variable names).
+Otherwise, Kpathsea gives a warning and ignores the ‘$’ and its
following character.
- You must quote the $'s and braces as necessary for your shell.
+ You must quote the $’s and braces as necessary for your shell.
_Shell_ variable values cannot be seen by Kpathsea, i.e., ones defined
-by 'set' in C shells and without 'export' in Bourne shells.
+by ‘set’ in C shells and without ‘export’ in Bourne shells.
For example, given
setenv tex /home/texmf
setenv TEXINPUTS .:$tex:${tex}prev
-the final 'TEXINPUTS' path is the three directories:
+the final ‘TEXINPUTS’ path is the three directories:
.:/home/texmf:/home/texmfprev
- The '.PROGNAME' suffix on variables and '_PROGNAME' on environment
+ The ‘.PROGNAME’ suffix on variables and ‘_PROGNAME’ on environment
variable names are not implemented for general variable expansions.
These are only recognized when search paths are initialized (*note Path
sources::).
Variable expansion is implemented in the source file
-'kpathsea/variable.c'.
+‘kpathsea/variable.c’.
File: kpathsea.info, Node: Tilde expansion, Next: Brace expansion, Prev: Variable expansion, Up: Path expansion
@@ -721,26 +721,26 @@
5.3.3 Tilde expansion
---------------------
-A leading '~' in a path element is replaced by the value of the
-environment variable 'HOME', or '.' if 'HOME' is not set. On Windows,
-the environment variable 'USERPROFILE' is checked instead of 'HOME'.
+A leading ‘~’ in a path element is replaced by the value of the
+environment variable ‘HOME’, or ‘.’ if ‘HOME’ is not set. On Windows,
+the environment variable ‘USERPROFILE’ is checked instead of ‘HOME’.
- A leading '~USER' in a path element is replaced by USER's home
-directory from the system 'passwd' database.
+ A leading ‘~USER’ in a path element is replaced by USER’s home
+directory from the system ‘passwd’ database.
For example,
setenv TEXINPUTS ~/mymacros:
-will prepend a directory 'mymacros' in your home directory to the
+will prepend a directory ‘mymacros’ in your home directory to the
default path.
- As a special case, if a home directory ends in '/', the trailing
-slash is dropped, to avoid inadvertently creating a '//' construct in
-the path. For example, if the home directory of the user 'root' is '/',
-the path element '~root/mymacros' expands to just '/mymacros', not
-'//mymacros'.
+ As a special case, if a home directory ends in ‘/’, the trailing
+slash is dropped, to avoid inadvertently creating a ‘//’ construct in
+the path. For example, if the home directory of the user ‘root’ is ‘/’,
+the path element ‘~root/mymacros’ expands to just ‘/mymacros’, not
+‘//mymacros’.
- Tilde expansion is implemented in the source file 'kpathsea/tilde.c'.
+ Tilde expansion is implemented in the source file ‘kpathsea/tilde.c’.
File: kpathsea.info, Node: Brace expansion, Next: KPSE_DOT expansion, Prev: Tilde expansion, Up: Path expansion
@@ -748,38 +748,38 @@
5.3.4 Brace expansion
---------------------
-'x{A,B}y' expands to 'xAy:xBy'. For example:
+‘x{A,B}y’ expands to ‘xAy:xBy’. For example:
foo/{1,2}/baz
-expands to 'foo/1/baz:foo/2/baz'. ':' is the path separator on the
-current system; e.g., on a Windows system, it's ';'.
+expands to ‘foo/1/baz:foo/2/baz’. ‘:’ is the path separator on the
+current system; e.g., on a Windows system, it’s ‘;’.
- Braces can be nested; for example, 'x{A,B{1,2}}y' expands to
-'xAy:xB1y:xB2y'.
+ Braces can be nested; for example, ‘x{A,B{1,2}}y’ expands to
+‘xAy:xB1y:xB2y’.
Multiple non-nested braces are expanded from right to left; for
-example, 'x{A,B}{1,2}y' expands to 'x{A,B}1y:x{A,B}2y', which expands to
-'xA1y:xB1y:xA2y:xB2y'.
+example, ‘x{A,B}{1,2}y’ expands to ‘x{A,B}1y:x{A,B}2y’, which expands to
+‘xA1y:xB1y:xA2y:xB2y’.
This feature can be used to implement multiple TeX hierarchies, by
-assigning a brace list to '$TEXMF', as mentioned in 'texmf.in'.
+assigning a brace list to ‘$TEXMF’, as mentioned in ‘texmf.in’.
You can also use the path separator instead of the comma. The last
-example could have been written 'x{A:B}{1:2}y' (on Unix).
+example could have been written ‘x{A:B}{1:2}y’ (on Unix).
Brace expansion is implemented in the source file
-'kpathsea/expand.c'.
+‘kpathsea/expand.c’.
File: kpathsea.info, Node: KPSE_DOT expansion, Next: Subdirectory expansion, Prev: Brace expansion, Up: Path expansion
-5.3.5 'KPSE_DOT' expansion
+5.3.5 ‘KPSE_DOT’ expansion
--------------------------
-When 'KPSE_DOT' is defined in the environment, it names a directory that
+When ‘KPSE_DOT’ is defined in the environment, it names a directory that
should be considered the current directory for the purpose of looking up
-files in the search paths. This feature is needed by the 'mktex...'
+files in the search paths. This feature is needed by the ‘mktex...’
scripts *note mktex scripts::, because these change the working
directory. You should not ever define it yourself.
@@ -793,16 +793,16 @@
D is replaced by all subdirectories of D: first those subdirectories
directly under D, then the subsubdirectories under those, and so on. At
each level, the order in which the directories are searched is
-unspecified. (It's "directory order", and definitely not alphabetical.)
+unspecified. (It’s “directory order”, and definitely not alphabetical.)
- If you specify any filename components after the '//', only
+ If you specify any filename components after the ‘//’, only
subdirectories which match those components are included. For example,
-'/a//b' would expand into directories '/a/1/b', '/a/2/b', '/a/1/1/b',
-and so on, but not '/a/b/c' or '/a/1'.
+‘/a//b’ would expand into directories ‘/a/1/b’, ‘/a/2/b’, ‘/a/1/1/b’,
+and so on, but not ‘/a/b/c’ or ‘/a/1’.
- You can include multiple '//' constructs in the path.
+ You can include multiple ‘//’ constructs in the path.
- '//' at the beginning of a path is ignored; you didn't really want to
+ ‘//’ at the beginning of a path is ignored; you didn’t really want to
search every directory on the system, did you?
I should mention one related implementation trick, which I took from
@@ -811,28 +811,28 @@
The trick is that in every real Unix implementation (as opposed to
the POSIX specification), a directory which contains no subdirectories
-will have exactly two links (namely, one for '.' and one for '..').
-That is to say, the 'st_nlink' field in the 'stat' structure will be
-two. Thus, we don't have to stat everything in the bottom-level (leaf)
-directories--we can just check 'st_nlink', notice it's two, and do no
+will have exactly two links (namely, one for ‘.’ and one for ‘..’).
+That is to say, the ‘st_nlink’ field in the ‘stat’ structure will be
+two. Thus, we don’t have to stat everything in the bottom-level (leaf)
+directories—we can just check ‘st_nlink’, notice it’s two, and do no
more work.
But if you have a directory that contains a single subdirectory and
-500 regular files, 'st_nlink' will be 3, and Kpathsea has to stat every
+500 regular files, ‘st_nlink’ will be 3, and Kpathsea has to stat every
one of those 501 entries. Therein lies slowness.
- You can disable the trick by undefining 'ST_NLINK_TRICK' in
-'kpathsea/config.h'. (It is undefined by default except under Unix.)
+ You can disable the trick by undefining ‘ST_NLINK_TRICK’ in
+‘kpathsea/config.h’. (It is undefined by default except under Unix.)
- Unfortunately, in some cases files in leaf directories are 'stat''d:
-if the path specification is, say, '$TEXMF/fonts//pk//', then files in a
-subdirectory '.../pk', even if it is a leaf, are checked. The reason
+ Unfortunately, in some cases files in leaf directories are ‘stat’’d:
+if the path specification is, say, ‘$TEXMF/fonts//pk//’, then files in a
+subdirectory ‘.../pk’, even if it is a leaf, are checked. The reason
cannot be explained without reference to the implementation, so read
-'kpathsea/elt-dirs.c' (search for 'may descend') if you are curious.
+‘kpathsea/elt-dirs.c’ (search for ‘may descend’) if you are curious.
And if you find a way to solve the problem, please let me know.
Subdirectory expansion is implemented in the source file
-'kpathsea/elt-dirs.c'.
+‘kpathsea/elt-dirs.c’.
File: kpathsea.info, Node: Casefolding search, Next: Filename database, Prev: Path expansion, Up: Path searching
@@ -847,8 +847,8 @@
for a case-insensitive match.
This is enabled at compile-time on Unix systems, and enabled at
-runtime by setting the configuration variable 'texmf_casefold_search',
-to a true value, e.g., '1'; this is done by default in TeX Live.
+runtime by setting the configuration variable ‘texmf_casefold_search’,
+to a true value, e.g., ‘1’; this is done by default in TeX Live.
* Menu:
@@ -866,9 +866,9 @@
ones. In particular, Apple decided to make the default filesystem on
Macs be case-insensitive some years ago, and this has exacerbated a
problem of people creating documents that use, say, an image under the
-name 'foo.jpg', while the actual file is named 'foo.JPG' or 'Foo.jpg'.
+name ‘foo.jpg’, while the actual file is named ‘foo.JPG’ or ‘Foo.jpg’.
It works on the Mac but if the document is transferred and run on a
-standard case-sensitive Unix (file)system, the file can't be found, due
+standard case-sensitive Unix (file)system, the file can’t be found, due
only to differences in case.
This same problematic scenario has always existed on Windows, but for
@@ -880,7 +880,7 @@
Windows, where (for practical purposes) all file names are
case-insensitive at the kernel level, and so the normal search will
already have definitively matched or not. Therefore, search results in
-unusual cases can be different on Windows and Unix--but this has always
+unusual cases can be different on Windows and Unix—but this has always
been true.
@@ -900,60 +900,60 @@
to case thus even more rare, the hope is that it will not cause
difficulties in practice.
- If it's desirable in a given situation to have the exact same search
+ If it’s desirable in a given situation to have the exact same search
behavior as previously, that can be accomplished by setting the
-configuration variable 'texmf_casefold_search' to '0' (*note Path
+configuration variable ‘texmf_casefold_search’ to ‘0’ (*note Path
sources::).
Some examples to illustrate the new behavior follow.
- Example #1: suppose the file './foobar.tex' exists. Now, searching
-for './FooBar.TeX' (or any other case variation) will succeed, returning
-'./foobar.tex'--the name as stored on disk. In previous releases, or if
-'texmf_casefold_search' is false, the search would fail.
+ Example #1: suppose the file ‘./foobar.tex’ exists. Now, searching
+for ‘./FooBar.TeX’ (or any other case variation) will succeed, returning
+‘./foobar.tex’—the name as stored on disk. In previous releases, or if
+‘texmf_casefold_search’ is false, the search would fail.
Example #2: suppose we are using a case-sensitive (file)system, and
-the search path is '.:/somedir', and the files './foobar.tex' and
-'/somedir/FooBar.TeX' both exist. Both now and previously, searching
-for 'foobar.tex' returns './foobar.tex'. However, searching for
-'FooBar.TeX' now returns './foobar.tex' instead of
-'/somedir/FooBar.TeX'; this is the incompatibility mentioned above.
-Also (as expected), searching for 'FOOBAR.TEX' (or whatever variation)
-will now return './foobar.tex', whereas before it would fail. Searching
-for all ('kpsewhich --all') 'foobar.tex' will return both matches.
+the search path is ‘.:/somedir’, and the files ‘./foobar.tex’ and
+‘/somedir/FooBar.TeX’ both exist. Both now and previously, searching
+for ‘foobar.tex’ returns ‘./foobar.tex’. However, searching for
+‘FooBar.TeX’ now returns ‘./foobar.tex’ instead of
+‘/somedir/FooBar.TeX’; this is the incompatibility mentioned above.
+Also (as expected), searching for ‘FOOBAR.TEX’ (or whatever variation)
+will now return ‘./foobar.tex’, whereas before it would fail. Searching
+for all (‘kpsewhich --all’) ‘foobar.tex’ will return both matches.
Example #3: same as example #2, but on a case-insensitive
-(file)system: both now and previously, searching for 'FooBar.TeX'
-returns './foobar.tex', since the system considers that a match. The
+(file)system: both now and previously, searching for ‘FooBar.TeX’
+returns ‘./foobar.tex’, since the system considers that a match. The
Kpathsea casefolding never comes into play.
Example #4: if we have (on a case-sensitive system) both
-'./foobar.tex' and './FOOBAR.TEX', searching with the exact case returns
-that exact match, now and previously. Searching for 'FooBar.tex' will
+‘./foobar.tex’ and ‘./FOOBAR.TEX’, searching with the exact case returns
+that exact match, now and previously. Searching for ‘FooBar.tex’ will
now return one or the other (chosen arbitrarily), rather than failing.
-Perhaps unexpectedly, searching for all 'foobar.tex' or 'FooBar.tex'
+Perhaps unexpectedly, searching for all ‘foobar.tex’ or ‘FooBar.tex’
will also return only one or the other, not both (see more below).
- Example #5: the font file 'STIX-Regular.otf' is included in TeX Live
-in the system directory 'texmf-dist/fonts/opentype/public/stix'.
+ Example #5: the font file ‘STIX-Regular.otf’ is included in TeX Live
+in the system directory ‘texmf-dist/fonts/opentype/public/stix’.
Because Kpathsea never searches the disk in the big system directory,
-the casefolding is not done, and a search for 'stix-regular.otf' will
+the casefolding is not done, and a search for ‘stix-regular.otf’ will
fail (on case-sensitive systems), as it always has.
The caveat about not searching the disk amounts to saying that
-casefolding does not happen in the trees specified with '!!' (*note
-ls-R::), that is, where only database ('ls-R') searching is done. In
-TeX Live, that is the 'texmf-local' and 'texmf-dist' trees (also
-'$TEXMFSYSCONFIG' and '$TEXMFSYSVAR', but those are rarely noticed).
+casefolding does not happen in the trees specified with ‘!!’ (*note
+ls-R::), that is, where only database (‘ls-R’) searching is done. In
+TeX Live, that is the ‘texmf-local’ and ‘texmf-dist’ trees (also
+‘$TEXMFSYSCONFIG’ and ‘$TEXMFSYSVAR’, but those are rarely noticed).
The rationale for this is that in practice, case mangling happens with
user-created files, not with packages distributed as part of the TeX
system.
- One more caveat: the purpose of 'kpsewhich' is to exercise the path
+ One more caveat: the purpose of ‘kpsewhich’ is to exercise the path
searching in Kpathsea as it is actually done. Therefore, as shown
-above, 'kpsewhich --all' will not return all matches regardless of case
+above, ‘kpsewhich --all’ will not return all matches regardless of case
within a given path element. If you want to find all matches in all
-directories, 'find' is the best tool, although the setup takes a couple
+directories, ‘find’ is the best tool, although the setup takes a couple
steps:
kpsewhich -show-path=tex >/tmp/texpath # search path specification
@@ -961,23 +961,23 @@
tr ':' '\n' </tmp/texdirs >/tmp/texdirlist # colons to newlines
find `cat /tmp/texdirlist` -iname somefile.tex -print </tmp/texdirlist
- Sorry that it's annoyingly lengthy, but implementing this inside
+ Sorry that it’s annoyingly lengthy, but implementing this inside
Kpathsea would be a lot of error-prone trouble for something that is
-only useful for debugging. If your 'find' does not support '-iname',
+only useful for debugging. If your ‘find’ does not support ‘-iname’,
you can get GNU Find from <https://gnu.org/software/findutils>.
The casefolding search is implemented in the source file
-'kpathsea/pathsearch.c'. Two implementation points:
+‘kpathsea/pathsearch.c’. Two implementation points:
- * Kpathsea never tries to check if a given directory resides on a
+ • Kpathsea never tries to check if a given directory resides on a
case-insensitive filesystem, because there is no efficient and
portable way to do so. All it does is try to see if a potential
- file name is a readable normal file (with, usually, the 'access'
+ file name is a readable normal file (with, usually, the ‘access’
system call).
- * Kpathsea does not do any case-insensitive matching of the
- directories along the path. It's not going to find
- '/Some/Random/file.tex' when looking for '/some/random/file.tex'.
+ • Kpathsea does not do any case-insensitive matching of the
+ directories along the path. It’s not going to find
+ ‘/Some/Random/file.tex’ when looking for ‘/some/random/file.tex’.
The casefolding only happens with the elements of the leaf
directory.
@@ -984,7 +984,7 @@
File: kpathsea.info, Node: Filename database, Next: Invoking kpsewhich, Prev: Casefolding search, Up: Path searching
-5.5 Filename database ('ls-R')
+5.5 Filename database (‘ls-R’)
==============================
Kpathsea goes to some lengths to minimize disk accesses for searches
@@ -992,15 +992,15 @@
every possible directory in typical TeX installations takes an
excessively long time.
- Therefore, Kpathsea can use an externally-built "filename database"
-file named 'ls-R' that maps files to directories, thus avoiding the need
+ Therefore, Kpathsea can use an externally-built “filename database”
+file named ‘ls-R’ that maps files to directories, thus avoiding the need
to exhaustively search the disk.
- A second database file 'aliases' allows you to give additional names
-to the files listed in 'ls-R'.
+ A second database file ‘aliases’ allows you to give additional names
+to the files listed in ‘ls-R’.
- The 'ls-R' and 'aliases' features are implemented in the source file
-'kpathsea/db.c'.
+ The ‘ls-R’ and ‘aliases’ features are implemented in the source file
+‘kpathsea/db.c’.
* Menu:
@@ -1011,77 +1011,77 @@
File: kpathsea.info, Node: ls-R, Next: Filename aliases, Up: Filename database
-5.5.1 'ls-R'
+5.5.1 ‘ls-R’
------------
-As mentioned above, you must name the main filename database 'ls-R'.
+As mentioned above, you must name the main filename database ‘ls-R’.
You can put one at the root of each TeX installation hierarchy you wish
-to search ('$TEXMF' by default, which expands to a braced list of
+to search (‘$TEXMF’ by default, which expands to a braced list of
several hierarchies in TeX Live).
- Kpathsea looks for 'ls-R' files along the 'TEXMFDBS' path. It is
-best for this to contain all and only those hierarchies from '$TEXMF'
-which are specified with '!!'--and also to specify them with '!!' in
-'TEXMFDBS'. (See the end of this section for more on '!!'.)
+ Kpathsea looks for ‘ls-R’ files along the ‘TEXMFDBS’ path. It is
+best for this to contain all and only those hierarchies from ‘$TEXMF’
+which are specified with ‘!!’—and also to specify them with ‘!!’ in
+‘TEXMFDBS’. (See the end of this section for more on ‘!!’.)
- The recommended way to create and maintain 'ls-R' is to run the
-'mktexlsr' script, which is installed in '$(bindir)' ('/usr/local/bin'
+ The recommended way to create and maintain ‘ls-R’ is to run the
+‘mktexlsr’ script, which is installed in ‘$(bindir)’ (‘/usr/local/bin’
by default). That script goes to some trouble to follow symbolic links
-as necessary, etc. It's also invoked by the distributed 'mktex...'
+as necessary, etc. It’s also invoked by the distributed ‘mktex...’
scripts.
- At its simplest, though, you can build 'ls-R' with the command
+ At its simplest, though, you can build ‘ls-R’ with the command
cd /YOUR/TEXMF/ROOT && ls -LAR ./ >ls-R
-presuming your 'ls' produces the right output format (see the section
-below). GNU 'ls', for example, outputs in this format. Also presuming
-your 'ls' hasn't been aliased in a system file (e.g., '/etc/profile') to
-something problematic, e.g., 'ls --color=tty'. In that case, you will
-have to disable the alias before generating 'ls-R'. For the precise
+presuming your ‘ls’ produces the right output format (see the section
+below). GNU ‘ls’, for example, outputs in this format. Also presuming
+your ‘ls’ hasn’t been aliased in a system file (e.g., ‘/etc/profile’) to
+something problematic, e.g., ‘ls --color=tty’. In that case, you will
+have to disable the alias before generating ‘ls-R’. For the precise
definition of the file format, see *note Database format::.
Regardless of whether you use the supplied script or your own, you
-will almost certainly want to invoke it via 'cron', so when you make
+will almost certainly want to invoke it via ‘cron’, so when you make
changes in the installed files (say if you install a new LaTeX package),
-'ls-R' will be automatically updated. However, for those using TeX Live
-or system distributions, the package managers should run 'mktexlsr' as
+‘ls-R’ will be automatically updated. However, for those using TeX Live
+or system distributions, the package managers should run ‘mktexlsr’ as
needed.
- The '-A' option to 'ls' includes files beginning with '.' (except for
-'.' and '..'), such as the file '.tex' included with the LaTeX tools
-package. (On the other hand, _directories_ whose names begin with '.'
+ The ‘-A’ option to ‘ls’ includes files beginning with ‘.’ (except for
+‘.’ and ‘..’), such as the file ‘.tex’ included with the LaTeX tools
+package. (On the other hand, _directories_ whose names begin with ‘.’
are always ignored.)
- If your system does not support symbolic links, omit the '-L'.
+ If your system does not support symbolic links, omit the ‘-L’.
- 'ls -LAR /YOUR/TEXMF/ROOT' will also work. But using './' avoids
+ ‘ls -LAR /YOUR/TEXMF/ROOT’ will also work. But using ‘./’ avoids
embedding absolute pathnames, so the hierarchy can be easily
transported. It also avoids possible trouble with automounters or other
network filesystem conventions.
- Kpathsea warns you if it finds an 'ls-R' file, but the file does not
-contain any usable entries. The usual culprit is running plain 'ls -R'
-instead of 'ls -LR ./' or 'ls -R /YOUR/TEXMF/ROOT'. Another possibility
-is some system directory name starting with a '.' (perhaps if you are
+ Kpathsea warns you if it finds an ‘ls-R’ file, but the file does not
+contain any usable entries. The usual culprit is running plain ‘ls -R’
+instead of ‘ls -LR ./’ or ‘ls -R /YOUR/TEXMF/ROOT’. Another possibility
+is some system directory name starting with a ‘.’ (perhaps if you are
using AFS); Kpathsea ignores everything under such directories.
- If a particular path element begins with '!!', _only_ the database
+ If a particular path element begins with ‘!!’, _only_ the database
will be searched for that element, never the disk; and if the database
does not exist, nothing at all will be searched. In TeX Live, most of
-the trees are specified with '!!'.
+the trees are specified with ‘!!’.
- For path elements that do not begin with '!!', if the database
+ For path elements that do not begin with ‘!!’, if the database
exists, it will be used, and the disk will not be searched. However, in
this case, if the database does not exist, the disk will be searched.
-In TeX Live, the most notable case of this is the 'TEXMFHOME' tree, to
+In TeX Live, the most notable case of this is the ‘TEXMFHOME’ tree, to
allow users to add and remove files from their own tree without having
-to worry about 'ls-R'.
+to worry about ‘ls-R’.
- (Aside: there are uncommon cases where a '!!' tree will be searched
-on disk even if the 'ls-R' file exists; they are too obscure to try to
-explain here. See 'pathsearch.c' in the source if you need to know.)
+ (Aside: there are uncommon cases where a ‘!!’ tree will be searched
+on disk even if the ‘ls-R’ file exists; they are too obscure to try to
+explain here. See ‘pathsearch.c’ in the source if you need to know.)
- To sum up: do not create an 'ls-R' file unless you also take care to
+ To sum up: do not create an ‘ls-R’ file unless you also take care to
keep it up to date. Otherwise newly-installed files will not be found.
@@ -1092,24 +1092,24 @@
In some circumstances, you may wish to find a file under several names.
For example, suppose a TeX document was created using a DOS system and
-tries to read 'longtabl.sty'. But now it's being run on a Unix system,
-and the file has its original name, 'longtable.sty'. The file won't be
-found. You need to give the actual file 'longtable.sty' an alias
-'longtabl.sty'.
+tries to read ‘longtabl.sty’. But now it’s being run on a Unix system,
+and the file has its original name, ‘longtable.sty’. The file won’t be
+found. You need to give the actual file ‘longtable.sty’ an alias
+‘longtabl.sty’.
- You can handle this by creating a file 'aliases' as a companion to
-the 'ls-R' for the hierarchy containing the file in question. (You must
-have an 'ls-R' for the alias feature to work.)
+ You can handle this by creating a file ‘aliases’ as a companion to
+the ‘ls-R’ for the hierarchy containing the file in question. (You must
+have an ‘ls-R’ for the alias feature to work.)
- The format of 'aliases' is simple: two whitespace-separated words per
-line; the first is the real name 'longtable.sty', and second is the
-alias ('longtabl.sty'). These must be base filenames, with no directory
-components. 'longtable.sty' must be in the sibling 'ls-R'.
+ The format of ‘aliases’ is simple: two whitespace-separated words per
+line; the first is the real name ‘longtable.sty’, and second is the
+alias (‘longtabl.sty’). These must be base filenames, with no directory
+components. ‘longtable.sty’ must be in the sibling ‘ls-R’.
- Also, blank lines and lines starting with '%' or '#' are ignored in
-'aliases', to allow for comments.
+ Also, blank lines and lines starting with ‘%’ or ‘#’ are ignored in
+‘aliases’, to allow for comments.
- If a real file 'longtabl.sty' exists, it is used regardless of any
+ If a real file ‘longtabl.sty’ exists, it is used regardless of any
aliases.
@@ -1118,22 +1118,22 @@
5.5.3 Database format
---------------------
-The "database" read by Kpathsea is a line-oriented file of plain text.
-The format is that generated by GNU (and most other) 'ls' programs given
-the '-R' option, as follows.
+The “database” read by Kpathsea is a line-oriented file of plain text.
+The format is that generated by GNU (and most other) ‘ls’ programs given
+the ‘-R’ option, as follows.
- * Blank lines are ignored.
+ • Blank lines are ignored.
- * If a line begins with '/' or './' or '../' and ends with a colon,
- it's the name of a directory. ('../' lines aren't useful, however,
+ • If a line begins with ‘/’ or ‘./’ or ‘../’ and ends with a colon,
+ it’s the name of a directory. (‘../’ lines aren’t useful, however,
and should not be generated.)
- * All other lines define entries in the most recently seen directory.
- /'s in such lines will produce possibly-strange results.
+ • All other lines define entries in the most recently seen directory.
+ /’s in such lines will produce possibly-strange results.
- * Files with no preceding directory line are ignored.
+ • Files with no preceding directory line are ignored.
- For example, here's the first few lines of 'ls-R' (which totals about
+ For example, here’s the first few lines of ‘ls-R’ (which totals about
30K bytes) on my system:
bibtex
@@ -1158,14 +1158,14 @@
File: kpathsea.info, Node: Invoking kpsewhich, Prev: Filename database, Up: Path searching
-5.6 'kpsewhich': Standalone path searching
+5.6 ‘kpsewhich’: Standalone path searching
==========================================
The Kpsewhich program exercises the path searching functionality
independent of any particular application. This can also be useful as a
-sort of 'find' program to locate files in your TeX hierarchies, perhaps
+sort of ‘find’ program to locate files in your TeX hierarchies, perhaps
in administrative scripts. It is used heavily in the distributed
-'mktex...' scripts.
+‘mktex...’ scripts.
Synopsis:
@@ -1172,7 +1172,7 @@
kpsewhich OPTION... FILENAME...
The options and filename(s) to look up can be intermixed. Options
-can start with either '-' or '--', and any unambiguous abbreviation is
+can start with either ‘-’ or ‘--’, and any unambiguous abbreviation is
accepted.
* Menu:
@@ -1180,7 +1180,7 @@
* Path searching options:: Changing the mode, resolution, etc.
* Specially-recognized files:: Default formats for texmf.cnf, etc.
* Auxiliary tasks:: Path and variable expansion, etc.
-* Standard options:: '--help' and '--version'.
+* Standard options:: ‘--help’ and ‘--version’.
File: kpathsea.info, Node: Path searching options, Next: Specially-recognized files, Up: Invoking kpsewhich
@@ -1193,80 +1193,80 @@
Various options alter the path searching behavior:
-'--all'
+‘--all’
Report all matches found, one per line. By default, if there is
more than one match, just one will be reported (chosen effectively
- at random). Exception: with the glyph formats ('pk', 'gf'), this
+ at random). Exception: with the glyph formats (‘pk’, ‘gf’), this
option has no effect and only the first match is returned.
-'--casefold-search'
-'--no-casefold-search'
+‘--casefold-search’
+‘--no-casefold-search’
Explicitly enable or disable the fallback to a case-insensitive
search on Unix platforms (*note Casefolding search::); no effect on
- Windows. The default is enabled, set in 'texmf.cnf'. Disabling
- ('--no-casefold-search') does not mean that searches magically
+ Windows. The default is enabled, set in ‘texmf.cnf’. Disabling
+ (‘--no-casefold-search’) does not mean that searches magically
become case-sensitive when the underlying (file)system is
case-insensitive, it merely means that Kpathsea does not do any
casefolding itself.
-'--cnf-line=STR'
- Parse STR as if it were a line in the 'texmf.cnf' configuration
+‘--cnf-line=STR’
+ Parse STR as if it were a line in the ‘texmf.cnf’ configuration
file (*note Config files::), overriding settings in the actual
configuration files, and also in the environment (*note Path
sources::). This is implemented by making any settings from STR in
the environment, overwriting any value already there. Thus, an
- extra colon in a '--cnf-line' value will refer to the value from a
+ extra colon in a ‘--cnf-line’ value will refer to the value from a
configuration file, not a user-set environment variable.
Furthermore, any variable set from STR will also be set with the
- program name suffix. For example, 'pdftex
- --cnf-line=TEXINPUTS=/foo:' will set both 'TEXINPUTS' and
- 'TEXINPUTS_pdftex' in the environment (and the value will be '/foo'
- followed by the setting from 'texmf.cnf', ignoring any user-set
- 'TEXINPUTS').
+ program name suffix. For example, ‘pdftex
+ --cnf-line=TEXINPUTS=/foo:’ will set both ‘TEXINPUTS’ and
+ ‘TEXINPUTS_pdftex’ in the environment (and the value will be ‘/foo’
+ followed by the setting from ‘texmf.cnf’, ignoring any user-set
+ ‘TEXINPUTS’).
This behavior is desirable because, in practice, many variables in
- the distributed 'texmf.cnf' are program-specific, and the intuitive
- behavior is for values set on the command line with '--cnf-line' to
+ the distributed ‘texmf.cnf’ are program-specific, and the intuitive
+ behavior is for values set on the command line with ‘--cnf-line’ to
override them.
-'--dpi=NUM'
- Set the resolution to NUM; this only affects 'gf' and 'pk' lookups.
- '-D' is a synonym, for compatibility with Dvips. Default is 600.
+‘--dpi=NUM’
+ Set the resolution to NUM; this only affects ‘gf’ and ‘pk’ lookups.
+ ‘-D’ is a synonym, for compatibility with Dvips. Default is 600.
-'--engine=NAME'
+‘--engine=NAME’
Set the engine name to NAME. By default it is not set. The engine
name is used in some search paths to allow files with the same name
but used by different engines to coexist.
- In particular, since the memory dump files ('.fmt'/'.base'/'.mem')
- are now stored in subdirectories named for the engine ('tex',
- 'pdftex', 'xetex', etc.), you must specify an engine name in order
- to find them. For example, 'cont-en.fmt' typically exists for both
- 'pdftex' and 'xetex'. With the default path settings, you can use
- '--engine=/' to look for any dump file, regardless of engine; if a
- dump file exists for more than one engine, it's indeterminate which
- one is returned. (The '/' ends up specifying a normal recursive
+ In particular, since the memory dump files (‘.fmt’/‘.base’/‘.mem’)
+ are now stored in subdirectories named for the engine (‘tex’,
+ ‘pdftex’, ‘xetex’, etc.), you must specify an engine name in order
+ to find them. For example, ‘cont-en.fmt’ typically exists for both
+ ‘pdftex’ and ‘xetex’. With the default path settings, you can use
+ ‘--engine=/’ to look for any dump file, regardless of engine; if a
+ dump file exists for more than one engine, it’s indeterminate which
+ one is returned. (The ‘/’ ends up specifying a normal recursive
search along the path where the dumps are stored, namely
- '$TEXMF/web2c{/$engine,}'.)
+ ‘$TEXMF/web2c{/$engine,}’.)
-'--format=NAME'
+‘--format=NAME’
Set the format for lookup to NAME. By default, the format is
- guessed from the filename, with 'tex' being used if nothing else
+ guessed from the filename, with ‘tex’ being used if nothing else
fits. The recognized filename extensions (including any leading
- '.') are also allowable NAMEs.
+ ‘.’) are also allowable NAMEs.
All formats also have a name, which is the only way to specify
formats with no associated suffix. For example, for Dvips
- configuration files you can use '--format="dvips config"'. (The
+ configuration files you can use ‘--format="dvips config"’. (The
quotes are for the sake of the shell.)
- Here's the current list of recognized names and the associated
+ Here’s the current list of recognized names and the associated
suffixes. *Note Supported file formats::, for more information on
each of these.
The strings in parentheses are abbreviations recognized only by
- 'kpsewhich' (not the underlying library calls). They are provided
+ ‘kpsewhich’ (not the underlying library calls). They are provided
when it would otherwise require an argument containing a space to
specify the format, to simplify quoting of calls from shells.
@@ -1317,7 +1317,7 @@
enc files: .enc
cmap files (cmap):
subfont definition files: .sfd
- opentype fonts: .otf
+ opentype fonts: .otf .OTF
pdftex config (pdftexconfig):
lig files: .lig
texmfscripts:
@@ -1330,43 +1330,43 @@
ris: .ris
bltxml: .bltxml
- This option and '--path' are mutually exclusive.
+ This option and ‘--path’ are mutually exclusive.
-'--interactive'
+‘--interactive’
After processing the command line, read additional filenames to
look up from standard input.
-'--mktex=FILETYPE'
-'--no-mktex=FILETYPE'
- Turn on or off the 'mktex' script associated with FILETYPE. Usual
- values for FILETYPE are 'pk', 'mf', 'tex', and 'tfm'. By default,
+‘--mktex=FILETYPE’
+‘--no-mktex=FILETYPE’
+ Turn on or off the ‘mktex’ script associated with FILETYPE. Usual
+ values for FILETYPE are ‘pk’, ‘mf’, ‘tex’, and ‘tfm’. By default,
all are off in Kpsewhich, even if they are enabled for TeX. This
- option implies setting '--must-exist'. *Note mktex scripts::.
+ option implies setting ‘--must-exist’. *Note mktex scripts::.
-'--mode=STRING'
- Set the mode name to STRING; this also only affects 'gf' and 'pk'
+‘--mode=STRING’
+ Set the mode name to STRING; this also only affects ‘gf’ and ‘pk’
lookups. No default: any mode will be found. *Note mktex script
arguments::.
-'--must-exist'
+‘--must-exist’
Do everything possible to find the files, notably including
- searching the disk and running the 'mktex' scripts. By default,
- only the 'ls-R' database is checked, in the interest of efficiency.
+ searching the disk and running the ‘mktex’ scripts. By default,
+ only the ‘ls-R’ database is checked, in the interest of efficiency.
-'--path=STRING'
+‘--path=STRING’
Search along the path STRING (colon-separated as usual), instead of
- guessing the search path from the filename. '//' and all the usual
+ guessing the search path from the filename. ‘//’ and all the usual
expansions are supported (*note Path expansion::). This option and
- '--format' are mutually exclusive. To output the complete
+ ‘--format’ are mutually exclusive. To output the complete
directory expansion of a path, instead of doing a one-shot lookup,
- see '--expand-path' and '--show-path' in the following section.
+ see ‘--expand-path’ and ‘--show-path’ in the following section.
-'--progname=NAME'
- Set the program name to NAME; default is 'kpsewhich'. This can
- affect the search paths via the '.PROGNAM' feature in configuration
+‘--progname=NAME’
+ Set the program name to NAME; default is ‘kpsewhich’. This can
+ affect the search paths via the ‘.PROGNAM’ feature in configuration
files (*note Config files::).
-'--subdir=STRING'
+‘--subdir=STRING’
Report only those matches whose directory part _ends_ with STRING
(compared literally, except case is ignored on a case-insensitive
operating system). For example, suppose there are two matches for
@@ -1373,108 +1373,108 @@
a given name:
kpsewhich foo.sty
- => /some/where/foo.sty
+ ⇒ /some/where/foo.sty
/another/place/foo.sty
Then we can narrow the result to what we are interested in with
- '--subdir':
+ ‘--subdir’:
kpsewhich --subdir=where foo.sty
- => /some/where/foo.sty
+ ⇒ /some/where/foo.sty
kpsewhich --subdir=place foo.sty
- => /another/place/foo.sty
+ ⇒ /another/place/foo.sty
The string to match must be at the end of the directory part of the
match, and it is taken literally, with no pattern matching:
kpsewhich --subdir=another foo.sty
- =>
+ ⇒
The string to match may cross directory components:
kpsewhich --subdir=some/where foo.sty
- => /some/where/foo.sty
+ ⇒ /some/where/foo.sty
- '--subdir' implies '--all'; if there is more than one match, they
- will all be reported (in our example, both 'where' and 'place' end
- in 'e'):
+ ‘--subdir’ implies ‘--all’; if there is more than one match, they
+ will all be reported (in our example, both ‘where’ and ‘place’ end
+ in ‘e’):
kpsewhich --subdir=e
- => /some/where/foo.sty
+ ⇒ /some/where/foo.sty
/another/place/foo.sty
- Because of the above rules, the presence of a leading '/' is
- important, since it "anchors" the match to a full component name:
+ Because of the above rules, the presence of a leading ‘/’ is
+ important, since it “anchors” the match to a full component name:
kpsewhich --subdir=/lace foo.sty
- =>
+ ⇒
- However, a trailing '/' is immaterial (and ignored), since the
+ However, a trailing ‘/’ is immaterial (and ignored), since the
match always takes place at the end of the directory part:
kpsewhich --subdir=lace/ foo.sty
- => /another/place/foo.sty
+ ⇒ /another/place/foo.sty
The purpose of these rules is to make it convenient to find results
only within a particular area of the tree. For instance, a given
- script named 'foo.lua' might exist within both
- 'texmf-dist/scripts/pkg1/' and 'texmf-dist/scripts/pkg2/'. By
- specifying, say, '--subdir=/pkg1', you can be sure of getting the
+ script named ‘foo.lua’ might exist within both
+ ‘texmf-dist/scripts/pkg1/’ and ‘texmf-dist/scripts/pkg2/’. By
+ specifying, say, ‘--subdir=/pkg1’, you can be sure of getting the
one you are interested in.
We only match at the end because a site might happen to install TeX
- in '/some/coincidental/pkg1/path/', and we wouldn't want to match
- 'texmf-dist/scripts/pkg2/' that when searching for '/pkg1'.
+ in ‘/some/coincidental/pkg1/path/’, and we wouldn’t want to match
+ ‘texmf-dist/scripts/pkg2/’ that when searching for ‘/pkg1’.
File: kpathsea.info, Node: Specially-recognized files, Next: Auxiliary tasks, Prev: Path searching options, Up: Invoking kpsewhich
-5.6.2 Specially-recognized files for 'kpsewhich'
+5.6.2 Specially-recognized files for ‘kpsewhich’
------------------------------------------------
-'kpsewhich' recognizes a few special filenames on the command line and
-defaults to using the 'known' file formats for them, merely to save the
+‘kpsewhich’ recognizes a few special filenames on the command line and
+defaults to using the ‘known’ file formats for them, merely to save the
time and trouble of specifying the format. This is only a feature of
-'kpsewhich'; when using the Kpathsea library itself, none of these
-special filenames are recognized, and it's still up to the caller to
+‘kpsewhich’; when using the Kpathsea library itself, none of these
+special filenames are recognized, and it’s still up to the caller to
specify the desired format.
- Here is the list of special filenames to 'kpsewhich', along with
+ Here is the list of special filenames to ‘kpsewhich’, along with
their corresponding format:
-'config.ps'
- 'dvips config'
+‘config.ps’
+ ‘dvips config’
-'dvipdfmx.cfg'
- 'other text files'
+‘dvipdfmx.cfg’
+ ‘other text files’
-'fmtutil.cnf'
- 'web2c files'
+‘fmtutil.cnf’
+ ‘web2c files’
-'glyphlist.txt'
- 'map'
+‘glyphlist.txt’
+ ‘map’
-'mktex.cnf'
- 'web2c files'
+‘mktex.cnf’
+ ‘web2c files’
-'pdfglyphlist.txt'
- 'map'
+‘pdfglyphlist.txt’
+ ‘map’
-'pdftex.cfg'
- 'pdftex config' (although 'pdftex.cfg' is not used any more; look
- for the file 'pdftexconfig.tex' instead.)
+‘pdftex.cfg’
+ ‘pdftex config’ (although ‘pdftex.cfg’ is not used any more; look
+ for the file ‘pdftexconfig.tex’ instead.)
-'texmf.cnf'
- 'cnf'
+‘texmf.cnf’
+ ‘cnf’
-'XDvi'
- 'other text files'
+‘XDvi’
+ ‘other text files’
A user-specified format will override the above defaults.
- Another useful configuration file in this regard is 'tcfmgr.map',
-found in 'texmf/texconfig/tcfmgr.map', which records various information
+ Another useful configuration file in this regard is ‘tcfmgr.map’,
+found in ‘texmf/texconfig/tcfmgr.map’, which records various information
about the above configuration files (among others).
@@ -1485,84 +1485,84 @@
Kpsewhich provides some features in addition to path lookup as such:
-'--debug=NUM'
+‘--debug=NUM’
Set debugging options to NUM. *Note Debugging::.
-'--expand-braces=STRING'
+‘--expand-braces=STRING’
Output variable, tilde, and brace expansion of STRING, which is
assumed to be a single path element. *Note Path expansion::.
-'--expand-path=STRING'
+‘--expand-path=STRING’
Output the complete expansion of STRING, with each element
- separated by the usual path separator on the current system (';' on
- Windows, ':' otherwise). This may be useful to construct a custom
+ separated by the usual path separator on the current system (‘;’ on
+ Windows, ‘:’ otherwise). This may be useful to construct a custom
search path for a format not otherwise supported. To retrieve the
search path for a format that is already supported, see
- '--show-path'.
+ ‘--show-path’.
Nonexistent directories are culled from the output:
$ kpsewhich --expand-path '/tmp'
- => /tmp
+ ⇒ /tmp
$ kpsewhich --expand-path '/nonesuch'
- =>
+ ⇒
For one-shot uses of an arbitrary (not built in to Kpathsea) path,
- see '--path' (*note Path searching options::).
+ see ‘--path’ (*note Path searching options::).
-'--expand-var=STRING'
+‘--expand-var=STRING’
Output the variable and tilde expansion of STRING. For example,
- with the usual 'texmf.cnf', 'kpsewhich --expand-var='$TEXMF''
+ with the usual ‘texmf.cnf’, ‘kpsewhich --expand-var='$TEXMF'’
returns the TeX system hierarchy root(s). *Note Path expansion::.
The specified STRING can contain anything, though, not just
- variable references. This calls 'kpse_var_expand' (*note
+ variable references. This calls ‘kpse_var_expand’ (*note
Programming with config files::).
-'--help-formats'
+‘--help-formats’
Output information about each supported format (*note Supported
file formats::), including the names and abbreviations, variables
looked for, and the original path.
-'--safe-in-name=NAME'
-'--safe-out-name=NAME'
+‘--safe-in-name=NAME’
+‘--safe-out-name=NAME’
Exit successfully if NAME is safe to open for reading or writing,
respectively, else unsuccessfully. No output is written. These
tests take account of the related Kpathsea configuration settings
(*note Calling sequence::).
-'--show-path=NAME'
+‘--show-path=NAME’
Show the path that would be used for file lookups of file type
- NAME. Either a filename extension ('pk', '.vf', etc.) or an
- integer can be used, just as with '--format', described in the
+ NAME. Either a filename extension (‘pk’, ‘.vf’, etc.) or an
+ integer can be used, just as with ‘--format’, described in the
previous section.
-'--var-brace-value=VARIABLE'
- Like '--var-value' (next), but also expands '{...}' constructs.
+‘--var-brace-value=VARIABLE’
+ Like ‘--var-value’ (next), but also expands ‘{...}’ constructs.
(*note Brace expansion::). Thus, the value is assumed to possibly
- be several path elements, and '~' is expanded at the beginning of
+ be several path elements, and ‘~’ is expanded at the beginning of
each. The path separator is changed to that of the current system
in the expansion.
- Example: 'FOO='.;~' kpsewhich --var-brace-value=FOO' outputs (on a
- Unix-ish system) '.:/home/karl', supposing the latter is the
- current user's home directory. Note that the ';' in the source
- value, as commonly used in 'texmf.cnf', has changed to a ':', as
+ Example: ‘FOO='.;~' kpsewhich --var-brace-value=FOO’ outputs (on a
+ Unix-ish system) ‘.:/home/karl’, supposing the latter is the
+ current user’s home directory. Note that the ‘;’ in the source
+ value, as commonly used in ‘texmf.cnf’, has changed to a ‘:’, as
the normal path separator on the current system. On a Windows-ish
- system, the ';' would remain.
+ system, the ‘;’ would remain.
-'--var-value=VARIABLE'
+‘--var-value=VARIABLE’
Outputs the value of VARIABLE (a simple identifier like
- 'TEXMFDIST', with no '$' or other constructs), expanding '$' (*note
- Variable expansion::) and '~' (*note Tilde expansion::) constructs
- in the value. '~' expansion happens at the beginning of the
+ ‘TEXMFDIST’, with no ‘$’ or other constructs), expanding ‘$’ (*note
+ Variable expansion::) and ‘~’ (*note Tilde expansion::) constructs
+ in the value. ‘~’ expansion happens at the beginning of the
overall value and at the beginning of a variable expansion, but not
arbitrarily within the string. Braces are not expanded.
- Example: '--var-value=texmf_casefold_search' outputs (if the
- default is not changed) '1'.
+ Example: ‘--var-value=texmf_casefold_search’ outputs (if the
+ default is not changed) ‘1’.
- Example to contrast with '--var-brace-value': 'FOO='.;~' kpsewhich
- --var-value=FOO' outputs '.;~', i.e., the same as the input value,
+ Example to contrast with ‘--var-brace-value’: ‘FOO='.;~' kpsewhich
+ --var-value=FOO’ outputs ‘.;~’, i.e., the same as the input value,
on all systems.
@@ -1573,10 +1573,10 @@
Kpsewhich accepts the standard GNU options:
- * '--help' prints a help message on standard output and exits
+ • ‘--help’ prints a help message on standard output and exits
successfully.
- * '--version' prints the Kpathsea version number and exits
+ • ‘--version’ prints the Kpathsea version number and exits
successfully.
@@ -1599,8 +1599,8 @@
Kpathsea provides a standard way to search for files of any of the
supported file types; glyph fonts are a bit different than all the rest.
-Searches are based solely on names of files, not their contents--if a GF
-file is (mis)named 'cmr10.600pk', it will be found as a PK file.
+Searches are based solely on names of files, not their contents—if a GF
+file is (mis)named ‘cmr10.600pk’, it will be found as a PK file.
* Menu:
@@ -1623,249 +1623,253 @@
suffixes, and/or a program to be run to create missing files on the fly.
Since environment variables containing periods, such as
-'TEXINPUTS.latex', are not allowed on some systems, Kpathsea looks for
-environment variables with an underscore, e.g., 'TEXINPUTS_latex' (*note
+‘TEXINPUTS.latex’, are not allowed on some systems, Kpathsea looks for
+environment variables with an underscore, e.g., ‘TEXINPUTS_latex’ (*note
Config files::).
The following table lists the above information. You can also get
-the list by giving the '--help-formats' option to 'kpsewhich' (*note
+the list by giving the ‘--help-formats’ option to ‘kpsewhich’ (*note
Auxiliary tasks::).
-'afm'
- (Adobe font metrics, *note (dvips)Metric files::) 'AFMFONTS';
- suffix '.afm'.
+‘afm’
+ (Adobe font metrics, *note (dvips)Metric files::) ‘AFMFONTS’;
+ suffix ‘.afm’.
-'base'
- (Metafont memory dump, *note (web2c)Memory dumps::) 'MFBASES',
- 'TEXMFINI'; suffix '.base'.
+‘base’
+ (Metafont memory dump, *note (web2c)Memory dumps::) ‘MFBASES’,
+ ‘TEXMFINI’; suffix ‘.base’.
-'bib'
+‘bib’
(BibTeX bibliography source, *note (web2c)bibtex invocation::)
- 'BIBINPUTS', 'TEXBIB'; suffix '.bib'.
+ ‘BIBINPUTS’, ‘TEXBIB’; suffix ‘.bib’.
-'bltxml'
+‘bltxml’
(BibLaTeXML bibliography files for Biber,
- <https://ctan.org/pkg/biber>) 'BLTXMLINPUTS' suffix '.bltxml'.
+ <https://ctan.org/pkg/biber>) ‘BLTXMLINPUTS’ suffix ‘.bltxml’.
-'bst'
+‘bst’
(BibTeX style, *note Basic BibTeX style files: (web2c)Basic BibTeX
- style files.) 'BSTINPUTS'; suffix '.bst'.
+ style files.) ‘BSTINPUTS’; suffix ‘.bst’.
-'clua'
+‘clua’
(dynamic libraries for Lua, <https://ctan.org/pkg/luatex>)
- 'CLUAINPUTS' suffixes '.dll' and '.so'.
+ ‘CLUAINPUTS’ suffixes ‘.dll’ and ‘.so’.
-'cmap'
- (character map files) 'CMAPFONTS'; suffix '.cmap'.
+‘cmap’
+ (character map files) ‘CMAPFONTS’; suffix ‘.cmap’.
-'cnf'
- (Runtime configuration files, *note Config files::) 'TEXMFCNF';
- suffix '.cnf'.
+‘cnf’
+ (Runtime configuration files, *note Config files::) ‘TEXMFCNF’;
+ suffix ‘.cnf’.
-'cweb'
- (CWEB input files) 'CWEBINPUTS'; suffixes '.w', '.web'; additional
- suffix '.ch'.
+‘cweb’
+ (CWEB input files) ‘CWEBINPUTS’; suffixes ‘.w’, ‘.web’; additional
+ suffix ‘.ch’.
-'dvips config'
- (Dvips 'config.*' files, such as 'config.ps', *note (dvips)Config
- files::) 'TEXCONFIG'.
+‘dvips config’
+ (Dvips ‘config.*’ files, such as ‘config.ps’, *note (dvips)Config
+ files::) ‘TEXCONFIG’.
-'enc files'
- (encoding vectors) 'ENCFONTS'; suffix '.enc'.
+‘enc files’
+ (encoding vectors) ‘ENCFONTS’; suffix ‘.enc’.
-'fmt'
- (TeX memory dump, *note (web2c)Memory dumps::) 'TEXFORMATS',
- 'TEXMFINI'; suffix '.fmt'.
+‘fmt’
+ (TeX memory dump, *note (web2c)Memory dumps::) ‘TEXFORMATS’,
+ ‘TEXMFINI’; suffix ‘.fmt’.
-'font cid map'
- (CJK mapping) 'FONTCIDMAPS' suffix '.cid'.
+‘font cid map’
+ (CJK mapping) ‘FONTCIDMAPS’ suffix ‘.cid’.
-'font feature files'
- (primarily for OpenType font features) 'FONTFEATURES' suffix
- '.fea'.
+‘font feature files’
+ (primarily for OpenType font features) ‘FONTFEATURES’ suffix
+ ‘.fea’.
-'gf'
- (generic font bitmap, *note (dvips)Glyph files::) 'PROGRAMFONTS',
- 'GFFONTS', 'GLYPHFONTS', 'TEXFONTS'; suffix 'gf'.
+‘gf’
+ (generic font bitmap, *note (dvips)Glyph files::) ‘PROGRAMFONTS’,
+ ‘GFFONTS’, ‘GLYPHFONTS’, ‘TEXFONTS’; suffix ‘gf’.
-'graphic/figure'
+‘graphic/figure’
(Encapsulated PostScript figures, *note (dvips)PostScript
- figures::) 'TEXPICTS', 'TEXINPUTS'; additional suffixes: '.eps',
- '.epsi'.
+ figures::) ‘TEXPICTS’, ‘TEXINPUTS’; additional suffixes: ‘.eps’,
+ ‘.epsi’.
-'ist'
- (makeindex style files) 'TEXINDEXSTYLE', 'INDEXSTYLE'; suffix
- '.ist'.
+‘ist’
+ (makeindex style files) ‘TEXINDEXSTYLE’, ‘INDEXSTYLE’; suffix
+ ‘.ist’.
-'lig files'
- (ligature definition files) 'LIGFONTS'; suffix '.lig'.
+‘lig files’
+ (ligature definition files) ‘LIGFONTS’; suffix ‘.lig’.
-'ls-R'
- (Filename databases, *note Filename database::) 'TEXMFDBS'.
+‘ls-R’
+ (Filename databases, *note Filename database::) ‘TEXMFDBS’.
-'map'
- (Fontmaps, *note Fontmap::) 'TEXFONTMAPS'; suffix '.map'.
+‘lua’
+ (Lua scripts, <https://ctan.org/pkg/luatex>) ‘LUAINPUTS’ suffixes
+ ‘.lua’, ‘.luatex’, ‘.luc’, ‘.luctex’, ‘.texlua’, ‘.texluc’, ‘.tlu’.
-'mem'
- (MetaPost memory dump, *note (web2c)Memory dumps::) 'MPMEMS',
- 'TEXMFINI'; suffix '.mem'.
+‘map’
+ (Fontmaps, *note Fontmap::) ‘TEXFONTMAPS’; suffix ‘.map’.
-'MetaPost support'
+‘mem’
+ (MetaPost memory dump, *note (web2c)Memory dumps::) ‘MPMEMS’,
+ ‘TEXMFINI’; suffix ‘.mem’.
+
+‘MetaPost support’
(MetaPost support files, used by DMP; *note (web2c)dmp
- invocation::) 'MPSUPPORT'.
+ invocation::) ‘MPSUPPORT’.
-'mf'
- (Metafont source, *note (web2c)mf invocation::) 'MFINPUTS'; suffix
- '.mf'; dynamic creation program: 'mktexmf'.
+‘mf’
+ (Metafont source, *note (web2c)mf invocation::) ‘MFINPUTS’; suffix
+ ‘.mf’; dynamic creation program: ‘mktexmf’.
-'mfpool'
+‘mfpool’
(Metafont program strings, *note (web2c)pooltype invocation::)
- 'MFPOOL', 'TEXMFINI'; suffix '.pool'.
+ ‘MFPOOL’, ‘TEXMFINI’; suffix ‘.pool’.
-'mft'
- ('MFT' style file, *note (web2c)mft invocation::) 'MFTINPUTS';
- suffix '.mft'.
+‘mft’
+ (‘MFT’ style file, *note (web2c)mft invocation::) ‘MFTINPUTS’;
+ suffix ‘.mft’.
-'misc fonts'
- (font-related files that don't fit the other categories)
- 'MISCFONTS'
+‘misc fonts’
+ (font-related files that don’t fit the other categories)
+ ‘MISCFONTS’
-'mlbib'
- (MlBibTeX bibliography source) 'MLBIBINPUTS', 'BIBINPUTS',
- 'TEXBIB'; suffixes '.mlbib', '.mlbib'.
+‘mlbib’
+ (MlBibTeX bibliography source) ‘MLBIBINPUTS’, ‘BIBINPUTS’,
+ ‘TEXBIB’; suffixes ‘.mlbib’, ‘.mlbib’.
-'mlbst'
- (MlBibTeX style) 'MLBSTINPUTS', 'BSTINPUTS'; suffixes '.mlbst',
- '.bst'.
+‘mlbst’
+ (MlBibTeX style) ‘MLBSTINPUTS’, ‘BSTINPUTS’; suffixes ‘.mlbst’,
+ ‘.bst’.
-'mp'
- (MetaPost source, *note (web2c)mpost invocation::) 'MPINPUTS';
- suffix '.mp'.
+‘mp’
+ (MetaPost source, *note (web2c)mpost invocation::) ‘MPINPUTS’;
+ suffix ‘.mp’.
-'mppool'
+‘mppool’
(MetaPost program strings, *note (web2c)pooltype invocation::)
- 'MPPOOL', 'TEXMFINI'; suffix '.pool'.
+ ‘MPPOOL’, ‘TEXMFINI’; suffix ‘.pool’.
-'ocp'
- (Omega compiled process files) 'OCPINPUTS';
- suffix '.ocp'; dynamic creation program: 'MakeOmegaOCP'.
+‘ocp’
+ (Omega compiled process files) ‘OCPINPUTS’;
+ suffix ‘.ocp’; dynamic creation program: ‘MakeOmegaOCP’.
-'ofm'
- (Omega font metrics) 'OFMFONTS', 'TEXFONTS';
- suffixes '.ofm', '.tfm'; dynamic creation program: 'MakeOmegaOFM'.
+‘ofm’
+ (Omega font metrics) ‘OFMFONTS’, ‘TEXFONTS’;
+ suffixes ‘.ofm’, ‘.tfm’; dynamic creation program: ‘MakeOmegaOFM’.
-'opentype fonts'
- (OpenType fonts) 'OPENTYPEFONTS'.
+‘opentype fonts’
+ (OpenType fonts) ‘OPENTYPEFONTS’.
-'opl'
- (Omega property lists) 'OPLFONTS', 'TEXFONTS'; suffix '.opl'.
+‘opl’
+ (Omega property lists) ‘OPLFONTS’, ‘TEXFONTS’; suffix ‘.opl’.
-'otp'
- (Omega translation process files) 'OTPINPUTS'; suffix '.otp'.
+‘otp’
+ (Omega translation process files) ‘OTPINPUTS’; suffix ‘.otp’.
-'ovf'
- (Omega virtual fonts) 'OVFFONTS', 'TEXFONTS'; suffix '.ovf'.
+‘ovf’
+ (Omega virtual fonts) ‘OVFFONTS’, ‘TEXFONTS’; suffix ‘.ovf’.
-'ovp'
- (Omega virtual property lists) 'OVPFONTS', 'TEXFONTS'; suffix
- '.ovp'.
+‘ovp’
+ (Omega virtual property lists) ‘OVPFONTS’, ‘TEXFONTS’; suffix
+ ‘.ovp’.
-'pdftex config'
- (PDFTeX-specific configuration files) 'PDFTEXCONFIG'.
+‘pdftex config’
+ (PDFTeX-specific configuration files) ‘PDFTEXCONFIG’.
-'pk'
- (packed bitmap fonts, *note (dvips)Glyph files::) 'PROGRAMFONTS'
- (PROGRAM being 'XDVI', etc.), 'PKFONTS', 'TEXPKS', 'GLYPHFONTS',
- 'TEXFONTS'; suffix 'pk'; dynamic creation program: 'mktexpk'.
+‘pk’
+ (packed bitmap fonts, *note (dvips)Glyph files::) ‘PROGRAMFONTS’
+ (PROGRAM being ‘XDVI’, etc.), ‘PKFONTS’, ‘TEXPKS’, ‘GLYPHFONTS’,
+ ‘TEXFONTS’; suffix ‘pk’; dynamic creation program: ‘mktexpk’.
-'PostScript header'
+‘PostScript header’
(downloadable PostScript, *note (dvips)Header files::)
- 'TEXPSHEADERS', 'PSHEADERS'; additional suffix '.pro'.
+ ‘TEXPSHEADERS’, ‘PSHEADERS’; additional suffix ‘.pro’.
-'ris'
+‘ris’
(RIS bibliography files, primarily for Biber,
- <https://ctan.org/pkg/biber>) 'RISINPUTS' suffix '.ris'.
+ <https://ctan.org/pkg/biber>) ‘RISINPUTS’ suffix ‘.ris’.
-'subfont definition files'
- (subfont definition files) 'SFDFONTS' suffix '.sfd'.
+‘subfont definition files’
+ (subfont definition files) ‘SFDFONTS’ suffix ‘.sfd’.
-'tex'
- (TeX source, *note (web2c)tex invocation::) 'TEXINPUTS'; suffix
- '.tex'; additional suffixes: none, because such a list cannot be
- complete; dynamic creation program: 'mktextex'.
+‘tex’
+ (TeX source, *note (web2c)tex invocation::) ‘TEXINPUTS’; suffix
+ ‘.tex’; additional suffixes: none, because such a list cannot be
+ complete; dynamic creation program: ‘mktextex’.
-'TeX system documentation'
- (Documentation files for the TeX system) 'TEXDOCS'.
+‘TeX system documentation’
+ (Documentation files for the TeX system) ‘TEXDOCS’.
-'TeX system sources'
- (Source files for the TeX system) 'TEXSOURCES'.
+‘TeX system sources’
+ (Source files for the TeX system) ‘TEXSOURCES’.
-'texmfscripts'
+‘texmfscripts’
(Architecture-independent executables distributed in the texmf
- trees) 'TEXMFSCRIPTS'.
+ trees) ‘TEXMFSCRIPTS’.
-'texpool'
+‘texpool’
(TeX program strings, *note (web2c)pooltype invocation::)
- 'TEXPOOL', 'TEXMFINI'; suffix '.pool'.
+ ‘TEXPOOL’, ‘TEXMFINI’; suffix ‘.pool’.
-'tfm'
- (TeX font metrics, *note (dvips)Metric files::) 'TFMFONTS',
- 'TEXFONTS'; suffix '.tfm'; dynamic creation program: 'mktextfm'.
+‘tfm’
+ (TeX font metrics, *note (dvips)Metric files::) ‘TFMFONTS’,
+ ‘TEXFONTS’; suffix ‘.tfm’; dynamic creation program: ‘mktextfm’.
-'Troff fonts'
+‘Troff fonts’
(Troff fonts, used by DMP; *note (web2c)DMP invocation::)
- 'TRFONTS'.
+ ‘TRFONTS’.
-'truetype fonts'
- (TrueType outline fonts) 'TTFONTS'; suffixes '.ttf' and '.TTF',
- '.ttc' and '.TTC', '.dfont'.
+‘truetype fonts’
+ (TrueType outline fonts) ‘TTFONTS’; suffixes ‘.ttf’ and ‘.TTF’,
+ ‘.ttc’ and ‘.TTC’, ‘.dfont’.
-'type1 fonts'
+‘type1 fonts’
(Type 1 PostScript outline fonts, *note (dvips)Glyph files::)
- 'T1FONTS', 'T1INPUTS', 'TEXPSHEADERS', 'DVIPSHEADERS'; suffixes
- '.pfa', '.pfb'.
+ ‘T1FONTS’, ‘T1INPUTS’, ‘TEXPSHEADERS’, ‘DVIPSHEADERS’; suffixes
+ ‘.pfa’, ‘.pfb’.
-'type42 fonts'
- (Type 42 PostScript outline fonts) 'T42FONTS'.
+‘type42 fonts’
+ (Type 42 PostScript outline fonts) ‘T42FONTS’.
-'vf'
- (virtual fonts, *note (dvips)Virtual fonts::) 'VFFONTS',
- 'TEXFONTS'; suffix '.vf'.
+‘vf’
+ (virtual fonts, *note (dvips)Virtual fonts::) ‘VFFONTS’,
+ ‘TEXFONTS’; suffix ‘.vf’.
-'web'
- (WEB input files) 'WEBINPUTS'; suffix '.web'; additional suffix
- '.ch'.
+‘web’
+ (WEB input files) ‘WEBINPUTS’; suffix ‘.web’; additional suffix
+ ‘.ch’.
-'web2c files'
- (files specific to the web2c implementation) 'WEB2C'.
+‘web2c files’
+ (files specific to the web2c implementation) ‘WEB2C’.
There are two special cases, because the paths and environment
variables always depend on the name of the program: the variable name is
constructed by converting the program name to upper case, and then
-appending 'INPUTS'. Assuming the program is called 'foo', this gives us
+appending ‘INPUTS’. Assuming the program is called ‘foo’, this gives us
the following table.
-'other text files'
- (text files used by 'foo') 'FOOINPUTS'.
+‘other text files’
+ (text files used by ‘foo’) ‘FOOINPUTS’.
-'other binary files'
- (binary files used by 'foo') 'FOOINPUTS'.
+‘other binary files’
+ (binary files used by ‘foo’) ‘FOOINPUTS’.
If an environment variable by these names are set, the corresponding
-'texmf.cnf' definition won't be looked at (unless, as usual, the
-environment variable value has an extra ':'). *Note Default
+‘texmf.cnf’ definition won’t be looked at (unless, as usual, the
+environment variable value has an extra ‘:’). *Note Default
expansion::.
For the font variables, the intent is that:
- * 'TEXFONTS' is the default for everything.
+ • ‘TEXFONTS’ is the default for everything.
- * 'GLYPHFONTS' is the default for bitmap (or, more precisely,
+ • ‘GLYPHFONTS’ is the default for bitmap (or, more precisely,
non-metric) files.
- * Each font format has a variable of its own.
+ • Each font format has a variable of its own.
- * Each program has its own font override path as well; e.g.,
- 'DVIPSFONTS' for Dvipsk. Again, this is for bitmaps, not metrics.
+ • Each program has its own font override path as well; e.g.,
+ ‘DVIPSFONTS’ for Dvipsk. Again, this is for bitmaps, not metrics.
File: kpathsea.info, Node: File lookup, Next: Glyph lookup, Prev: Supported file formats, Up: TeX support
@@ -1881,31 +1885,31 @@
1. If the file format defines default suffixes, and the suffix of NAME
name is not already a known suffix for that format, try the name
with each default appended, and use alternative names found in the
- fontmaps if necessary. Example: given 'foo.bar', look for
- 'foo.bar.tex'.
+ fontmaps if necessary. Example: given ‘foo.bar’, look for
+ ‘foo.bar.tex’.
2. Search for NAME, and if necessary for alternative names found in
- the fontmaps. Example: given 'foo.bar', we also look for
- 'foo.bar'.
+ the fontmaps. Example: given ‘foo.bar’, we also look for
+ ‘foo.bar’.
3. If the file format defines a program to invoke to create missing
files, run it (*note mktex scripts::).
- The order in which we search for "suffixed" name (item 1) or the
-"as-is" name (item 2) is controlled by the 'try_std_extension_first'
-configuration value. The default set in 'texmf.cnf' is true, since
-common suffixes are already recognized: 'babel.sty' will only look for
-'babel.sty', not 'babel.sty.tex', regardless of this setting.
+ The order in which we search for “suffixed” name (item 1) or the
+“as-is” name (item 2) is controlled by the ‘try_std_extension_first’
+configuration value. The default set in ‘texmf.cnf’ is true, since
+common suffixes are already recognized: ‘babel.sty’ will only look for
+‘babel.sty’, not ‘babel.sty.tex’, regardless of this setting.
- When the suffix is unknown (e.g., 'foo.bar'), both names are always
+ When the suffix is unknown (e.g., ‘foo.bar’), both names are always
tried; the difference is the order in which they are tried.
- 'try_std_extension_first' only affects names being looked up which
-*already* have an extension. A name without an extension (e.g., 'tex
-story') will always have an extension added first.
+ ‘try_std_extension_first’ only affects names being looked up which
+*already* have an extension. A name without an extension (e.g., ‘tex
+story’) will always have an extension added first.
- This algorithm is implemented in the function 'kpathsea_find_file' in
-the source file 'kpathsea/tex-file.c'. You can watch it in action with
+ This algorithm is implemented in the function ‘kpathsea_find_file’ in
+the source file ‘kpathsea/tex-file.c’. You can watch it in action with
the debugging options (*note Debugging::).
@@ -1915,7 +1919,7 @@
================
This section describes how Kpathsea searches for a bitmap font in GF or
-PK format (or either) given a font name (e.g., 'cmr10') and a resolution
+PK format (or either) given a font name (e.g., ‘cmr10’) and a resolution
(e.g., 600).
Here is an outline of the search strategy (details in the sections
@@ -1926,16 +1930,16 @@
format(s).
2. If NAME is an alias for a file F in the fontmap file
- 'texfonts.map', look for F.DPI.
+ ‘texfonts.map’, look for F.DPI.
- 3. Run an external program (typically named 'mktexpk') to generate the
+ 3. Run an external program (typically named ‘mktexpk’) to generate the
font (*note mktex scripts::)
4. Look for FALLBACK.DPI, where FALLBACK is some last-resort font
- (typically 'cmr10').
+ (typically ‘cmr10’).
- This is implemented in 'kpathsea_find_glyph' in
-'kpathsea/tex-glyph.c'.
+ This is implemented in ‘kpathsea_find_glyph’ in
+‘kpathsea/tex-glyph.c’.
* Menu:
@@ -1951,16 +1955,16 @@
When Kpathsea looks for a bitmap font NAME at resolution DPI in a format
FORMAT, it first checks each directory in the search path for a file
-'NAME.DPIFORMAT'; for example, 'cmr10.600pk'. Kpathsea looks for a PK
+‘NAME.DPIFORMAT’; for example, ‘cmr10.600pk’. Kpathsea looks for a PK
file first, then a GF file.
- If that fails, Kpathsea looks for 'dpiDPI/NAME.FORMAT'; for example,
-'dpi600/cmr10.pk'. This is how fonts are typically stored on
+ If that fails, Kpathsea looks for ‘dpiDPI/NAME.FORMAT’; for example,
+‘dpi600/cmr10.pk’. This is how fonts are typically stored on
filesystems (such as DOS) that permit only three-character extensions.
If that fails, Kpathsea looks for a font with a close-enough DPI.
-"Close enough" is defined by the macro 'KPSE_BITMAP_TOLERANCE' in
-'kpathsea/tex-glyph.h' to be 'DPI / 500 + 1'. This is slightly more
+“Close enough” is defined by the macro ‘KPSE_BITMAP_TOLERANCE’ in
+‘kpathsea/tex-glyph.h’ to be ‘DPI / 500 + 1’. This is slightly more
than the 0.2% minimum allowed by the DVI standard
(<CTAN:/dviware/driv-standard/level-0>).
@@ -1971,51 +1975,51 @@
-------------
If a bitmap font or metric file is not found with the original name (see
-the previous section), Kpathsea looks through any "fontmap" files for an
-"alias" for the original font name. These files are named
-'texfonts.map' and searched for along the 'TEXFONTMAPS'
-environment/config file variable. All 'texfonts.map' files that are
+the previous section), Kpathsea looks through any “fontmap” files for an
+“alias” for the original font name. These files are named
+‘texfonts.map’ and searched for along the ‘TEXFONTMAPS’
+environment/config file variable. All ‘texfonts.map’ files that are
found are read; earlier definitions override later ones.
This feature is intended to help in two respects:
1. An alias name is limited in length only by available memory, not by
- your filesystem. Therefore, if you want to ask for 'Times-Roman'
- instead of 'ptmr', you can (you get 'ptmr8r').
+ your filesystem. Therefore, if you want to ask for ‘Times-Roman’
+ instead of ‘ptmr’, you can (you get ‘ptmr8r’).
2. A few fonts have historically had multiple names: specifically,
- LaTeX's "circle font" has variously been known as 'circle10',
- 'lcircle10', and 'lcirc10'. Aliases can make all the names
+ LaTeX’s “circle font” has variously been known as ‘circle10’,
+ ‘lcircle10’, and ‘lcirc10’. Aliases can make all the names
equivalent, so that it no longer matters what the name of the
installed file is; TeX documents will find their favorite name.
The format of fontmap files:
- * Comments start with the last '%' on a line and continue to the end
+ • Comments start with the last ‘%’ on a line and continue to the end
of the line. (This provides for names that include a %,
ill-advised as that may be.)
- * Blank lines are ignored.
+ • Blank lines are ignored.
- * Each nonblank line is broken up into a series of "words": a
+ • Each nonblank line is broken up into a series of “words”: a
sequence of non-whitespace characters.
- * If the first word is 'include', the second word is used as a
+ • If the first word is ‘include’, the second word is used as a
filename, and it is searched for and read.
- * Otherwise, the first word on each line is the true filename;
+ • Otherwise, the first word on each line is the true filename;
- * the second word is the alias;
+ • the second word is the alias;
- * subsequent words are ignored.
+ • subsequent words are ignored.
If an alias has an extension, it matches only those files with that
extension; otherwise, it matches anything with the same root, regardless
-of extension. For example, an alias 'foo.tfm' matches only when
-'foo.tfm' is being searched for; but an alias 'foo' matches 'foo.vf',
-'foo.600pk', etc.
+of extension. For example, an alias ‘foo.tfm’ matches only when
+‘foo.tfm’ is being searched for; but an alias ‘foo’ matches ‘foo.vf’,
+‘foo.600pk’, etc.
- As an example, here is an excerpt from the 'texfonts.map' in the
+ As an example, here is an excerpt from the ‘texfonts.map’ in the
Web2c distribution. It makes the old and new names of the LaTeX circle
fonts equivalent.
@@ -2027,7 +2031,7 @@
lcirc10 lcircle10
...
- Fontmaps are implemented in the file 'kpathsea/fontmap.c'. The
+ Fontmaps are implemented in the file ‘kpathsea/fontmap.c’. The
Fontname distribution has much more information on font naming (*note
(fontname)::).
@@ -2038,17 +2042,17 @@
-------------------
If a bitmap font cannot be found or created at the requested size,
-Kpathsea looks for the font at a set of "fallback resolutions". You
+Kpathsea looks for the font at a set of “fallback resolutions”. You
specify these resolutions as a colon-separated list (like search paths).
Kpathsea looks first for a program-specific environment variable (e.g.,
-'DVIPSSIZES' for Dvipsk), then the environment variable 'TEXSIZES', then
+‘DVIPSSIZES’ for Dvipsk), then the environment variable ‘TEXSIZES’, then
a default specified at compilation time (the Make variable
-'default_texsizes'). You can set this list to be empty if you prefer to
+‘default_texsizes’). You can set this list to be empty if you prefer to
find fonts at their stated size or not at all.
Finally, if the font cannot be found even at the fallback
-resolutions, Kpathsea looks for a fallback font, typically 'cmr10'.
-Programs must enable this feature by calling 'kpathsea_init_prog' (*note
+resolutions, Kpathsea looks for a fallback font, typically ‘cmr10’.
+Programs must enable this feature by calling ‘kpathsea_init_prog’ (*note
Calling sequence::); the default is no fallback font.
@@ -2061,52 +2065,52 @@
this is useful at large sites where most users are not administrators,
and thus the warnings are merely a source of confusion, not a help. To
do this, you set the environment variable or configuration file value
-'TEX_HUSH' to a colon-separated list of values. Here are the
+‘TEX_HUSH’ to a colon-separated list of values. Here are the
possibilities:
-'all'
+‘all’
Suppress everything possible.
-'checksum'
+‘checksum’
Suppress mismatched font checksum warnings.
-'lostchar'
+‘lostchar’
Suppress warnings when a character is missing from a font that a
DVI or VF file tries to typeset.
-'none'
- Don't suppress any warnings.
+‘none’
+ Don’t suppress any warnings.
-'readable'
+‘readable’
Suppress warnings about attempts to access a file whose permissions
render it unreadable.
-'special'
- Suppresses warnings about an unimplemented or unparsable '\special'
+‘special’
+ Suppresses warnings about an unimplemented or unparsable ‘\special’
command.
-'tex-hush.c' defines the function that checks the variable value. Each
+‘tex-hush.c’ defines the function that checks the variable value. Each
driver implements its own checks where appropriate.
File: kpathsea.info, Node: mktex scripts, Prev: Suppressing warnings, Up: TeX support
-6.5 'mktex' scripts
+6.5 ‘mktex’ scripts
===================
If Kpathsea cannot otherwise find a file, for some file types it is
configured by default to invoke an external program to create it
dynamically (*note mktex configuration::). These are collectively known
-as "'mktex' scripts", since most of them are named 'mktex...'.
+as “‘mktex’ scripts”, since most of them are named ‘mktex...’.
- For example, this is useful for fonts (bitmaps, TFM's, and
+ For example, this is useful for fonts (bitmaps, TFM’s, and
arbitrarily-sizable Metafont sources such as the Sauter and EC fonts),
since any given document can use fonts never before referenced.
Building all fonts in advance is therefore impractical, if not
impossible.
- It is also useful for the TeX '.fmt' (and Metafont '.base' and
-Metapost '.mem' files, *note (Web2c)Memory dumps::), where
+ It is also useful for the TeX ‘.fmt’ (and Metafont ‘.base’ and
+Metapost ‘.mem’ files, *note (Web2c)Memory dumps::), where
pre-generating every format consumes a lot of both time and space.
The script is passed the name of the file to create and possibly
@@ -2123,13 +2127,13 @@
File: kpathsea.info, Node: mktex configuration, Next: mktex script names, Up: mktex scripts
-6.5.1 'mktex' configuration
+6.5.1 ‘mktex’ configuration
---------------------------
The list of file types and program names that can run an external
program to create missing files is listed in the next section. In the
-absence of 'configure' options specifying otherwise, everything but
-'mktextex' will be enabled by default. The 'configure' options to
+absence of ‘configure’ options specifying otherwise, everything but
+‘mktextex’ will be enabled by default. The ‘configure’ options to
change the defaults are:
--without-mktexfmt-default
@@ -2140,186 +2144,186 @@
--without-mktextfm-default
--with-mktextex-default
- The 'configure' setting is overridden if the environment variable or
-configuration file value named for the script is set; e.g., 'MKTEXPK'
+ The ‘configure’ setting is overridden if the environment variable or
+configuration file value named for the script is set; e.g., ‘MKTEXPK’
(*note mktex script arguments::).
- 'mktexfmt' reads a file 'fmtutil.cnf', typically located in
-'texmf/web2c/' to glean its configuration information. The rest of the
+ ‘mktexfmt’ reads a file ‘fmtutil.cnf’, typically located in
+‘texmf/web2c/’ to glean its configuration information. The rest of the
files and features in this section are primarily intended for the font
generation scripts.
- As distributed, all the scripts source a file 'texmf/web2c/mktex.cnf'
-if it exists, so you can override various defaults. See 'mktex.opt',
+ As distributed, all the scripts source a file ‘texmf/web2c/mktex.cnf’
+if it exists, so you can override various defaults. See ‘mktex.opt’,
for instance, which defines the default mode, resolution, some special
directory names, etc. If you prefer not to change the distributed
-scripts, you can simply create 'mktex.cnf' with the appropriate
+scripts, you can simply create ‘mktex.cnf’ with the appropriate
definitions (you do not need to create it if you have nothing to put in
-it). 'mktex.cnf' has no special syntax; it's an arbitrary Bourne shell
-script. The distribution contains a sample 'mktex.cnf' for you to copy
+it). ‘mktex.cnf’ has no special syntax; it’s an arbitrary Bourne shell
+script. The distribution contains a sample ‘mktex.cnf’ for you to copy
and modify as you please (it is not installed anywhere).
In addition, you can configure a number of features with the
-'MT_FEATURES' variable, which you can define:
+‘MT_FEATURES’ variable, which you can define:
- * in 'mktex.opt', as just mentioned;
+ • in ‘mktex.opt’, as just mentioned;
- * by editing the file 'mktex.opt', either before 'make install' (in
+ • by editing the file ‘mktex.opt’, either before ‘make install’ (in
the source hierarchy) or after (in the installed hierarchy);
- * or in the environment.
+ • or in the environment.
- If none of the options below are enabled, 'mktexpk', 'mktextfm', and
-'mktexmf' follow the following procedure to decide where fonts should be
-installed. Find the tree where the font's sources are, and test the
-permissions of the 'fonts' directory of that tree to determine whether
+ If none of the options below are enabled, ‘mktexpk’, ‘mktextfm’, and
+‘mktexmf’ follow the following procedure to decide where fonts should be
+installed. Find the tree where the font’s sources are, and test the
+permissions of the ‘fonts’ directory of that tree to determine whether
it is writable. If it is, put the files in the tree in appropriate
-locations. If it isn't writable, see whether the tree is a system tree
-(named in 'SYSTEXMF'). If so, the 'VARTEXFONTS' tree is used. In all
+locations. If it isn’t writable, see whether the tree is a system tree
+(named in ‘SYSTEXMF’). If so, the ‘VARTEXFONTS’ tree is used. In all
other cases the working directory is used.
- The 'appendonlydir' option is enabled by default.
+ The ‘appendonlydir’ option is enabled by default.
-'appendonlydir'
- Tell 'mktexdir' to create directories append-only, i.e., set their
+‘appendonlydir’
+ Tell ‘mktexdir’ to create directories append-only, i.e., set their
sticky bit (*note (coreutils)Mode Structure::). This feature is
silently ignored on non-Unix platforms (e.g. Windows/NT and
- MS-DOS) which don't support similar functionality. This feature is
+ MS-DOS) which don’t support similar functionality. This feature is
enabled by default.
-'dosnames'
- Use 8.3 names; e.g., 'dpi600/cmr10.pk' instead of 'cmr10.600pk'.
+‘dosnames’
+ Use 8.3 names; e.g., ‘dpi600/cmr10.pk’ instead of ‘cmr10.600pk’.
Note that this feature only affects filenames that would otherwise
- clash with other TeX-related filenames; 'mktex' scripts do nothing
+ clash with other TeX-related filenames; ‘mktex’ scripts do nothing
about filenames which exceed the 8+3 MS-DOS limits but remain
unique when truncated (by the OS) to these limits, and nether do
- the scripts care about possible clashes with files which aren't
- related with TeX. For example, 'cmr10.600pk' would clash with
- 'cmr10.600gf' and is therefore changed when 'dosnames' is in
- effect, but 'mf.pool' and 'mp.base' don't clash with any
+ the scripts care about possible clashes with files which aren’t
+ related with TeX. For example, ‘cmr10.600pk’ would clash with
+ ‘cmr10.600gf’ and is therefore changed when ‘dosnames’ is in
+ effect, but ‘mf.pool’ and ‘mp.base’ don’t clash with any
TeX-related files and are therefore unchanged.
This feature is turned on by default on MS-DOS. If you do not wish
- 'dosnames' to be set on an MS-DOS platform, you need to set the
- 'MT_FEATURES' environment variable to a value that doesn't include
- 'dosnames'. You can also change the default setting by editing
- 'mktex.opt', but only if you use the 'mktex' shell scripts; the
- emulation programs don't consult 'mktex.opt'.
+ ‘dosnames’ to be set on an MS-DOS platform, you need to set the
+ ‘MT_FEATURES’ environment variable to a value that doesn’t include
+ ‘dosnames’. You can also change the default setting by editing
+ ‘mktex.opt’, but only if you use the ‘mktex’ shell scripts; the
+ emulation programs don’t consult ‘mktex.opt’.
-'fontmaps'
+‘fontmaps’
Instead of deriving the location of a font in the destination tree
from the location of the sources, the aliases and directory names
from the Fontname distribution are used. (*note Introduction:
(fontname)Top.).
-'nomfdrivers'
+‘nomfdrivers’
Let mktexpk and mktextfm create metafont driver files in a
temporary directory. These will be used for just one metafont run
and not installed permanently.
-'nomode'
+‘nomode’
Omit the directory level for the mode name; this is fine as long as
you generate fonts for only one mode.
-'stripsupplier'
+‘stripsupplier’
Omit the font supplier name directory level.
-'striptypeface'
+‘striptypeface’
Omit the font typeface name directory level.
-'strip'
+‘strip’
Omit the font supplier and typeface name directory levels. This
- feature is deprecated in favour of 'stripsupplier' and
- 'striptypeface'.
+ feature is deprecated in favour of ‘stripsupplier’ and
+ ‘striptypeface’.
-'varfonts'
+‘varfonts’
When this option is enabled, fonts that would otherwise be written
- in system texmf tree go to the 'VARTEXFONTS' tree instead. The
- default value in 'kpathsea/Makefile.in' is '/var/tmp/texfonts'.
- The 'Linux File System Standard' recommends '/var/tex/fonts'.
+ in system texmf tree go to the ‘VARTEXFONTS’ tree instead. The
+ default value in ‘kpathsea/Makefile.in’ is ‘/var/tmp/texfonts’.
+ The ‘Linux File System Standard’ recommends ‘/var/tex/fonts’.
- The 'varfonts' setting in 'MT_FEATURES' is overridden by the
- 'USE_VARTEXFONTS' environment variable: if set to '1', the feature
- is enabled, and if set to '0', the feature is disabled.
+ The ‘varfonts’ setting in ‘MT_FEATURES’ is overridden by the
+ ‘USE_VARTEXFONTS’ environment variable: if set to ‘1’, the feature
+ is enabled, and if set to ‘0’, the feature is disabled.
-'texmfvar'
+‘texmfvar’
Force generated files that would go into a system tree (as defined
- by 'SYSTEXMF') into 'TEXMFVAR'. Starting with teTeX-3.0, the
- variable 'TEXMFVAR' is always set. The 'varfonts' feature takes
+ by ‘SYSTEXMF’) into ‘TEXMFVAR’. Starting with teTeX-3.0, the
+ variable ‘TEXMFVAR’ is always set. The ‘varfonts’ feature takes
precedence if also set.
- The 'texmfvar' setting in 'MT_FEATURES' is overridden by the
- 'USE_TEXMFVAR' environment variable: if set to '1', the feature is
- enabled, and if set to '0', the feature is disabled.
+ The ‘texmfvar’ setting in ‘MT_FEATURES’ is overridden by the
+ ‘USE_TEXMFVAR’ environment variable: if set to ‘1’, the feature is
+ enabled, and if set to ‘0’, the feature is disabled.
File: kpathsea.info, Node: mktex script names, Next: mktex script arguments, Prev: mktex configuration, Up: mktex scripts
-6.5.2 'mktex' script names
+6.5.2 ‘mktex’ script names
--------------------------
The following table shows the default name of the script for each of the
file types which support runtime generation.
-'mktexfmt'
- ('.fmt', '.base', '.mem') TeX/Metafont/MetaPost formats. This
- script is also named 'fmtutil', and reads 'fmtutil.cnf' for
+‘mktexfmt’
+ (‘.fmt’, ‘.base’, ‘.mem’) TeX/Metafont/MetaPost formats. This
+ script is also named ‘fmtutil’, and reads ‘fmtutil.cnf’ for
configuration information.
-'mktexmf'
- ('.mf') Metafont input files.
+‘mktexmf’
+ (‘.mf’) Metafont input files.
-'mkocp'
- ('.ocp') Omega compiled process files.
+‘mkocp’
+ (‘.ocp’) Omega compiled process files.
-'mkofm'
- ('.ofm') Omega font metric files.
+‘mkofm’
+ (‘.ofm’) Omega font metric files.
-'mktexpk'
- ('pk') Glyph fonts.
+‘mktexpk’
+ (‘pk’) Glyph fonts.
-'mktextex'
- ('.tex') TeX input files (disabled by default).
+‘mktextex’
+ (‘.tex’) TeX input files (disabled by default).
-'mktextfm'
- ('.tfm') TFM files.
+‘mktextfm’
+ (‘.tfm’) TFM files.
These names can be overridden by an environment variable specific to the
-program--for example, 'DVIPSMAKEPK' for Dvipsk.
+program—for example, ‘DVIPSMAKEPK’ for Dvipsk.
- If a 'mktex...' script fails, the invocation is appended to a file
-'missfont.log' (by default) in the current directory. You can then
+ If a ‘mktex...’ script fails, the invocation is appended to a file
+‘missfont.log’ (by default) in the current directory. You can then
execute the log file to create the missing files after fixing the
problem.
If the current directory is not writable and the environment variable
-or configuration file value 'TEXMFOUTPUT' is set, its value is used.
-Otherwise, nothing is written. The name 'missfont.log' is overridden by
-the 'MISSFONT_LOG' environment variable or configuration file value.
+or configuration file value ‘TEXMFOUTPUT’ is set, its value is used.
+Otherwise, nothing is written. The name ‘missfont.log’ is overridden by
+the ‘MISSFONT_LOG’ environment variable or configuration file value.
File: kpathsea.info, Node: mktex script arguments, Prev: mktex script names, Up: mktex scripts
-6.5.3 'mktex' script arguments
+6.5.3 ‘mktex’ script arguments
------------------------------
-The first argument to a 'mktex' script is always the name of the file to
+The first argument to a ‘mktex’ script is always the name of the file to
be created.
- In the default 'mktexpk' implementation, additional arguments may
+ In the default ‘mktexpk’ implementation, additional arguments may
also be passed:
-'--dpi NUM'
+‘--dpi NUM’
Sets the resolution of the generated font to NUM.
-'--mfmode NAME'
+‘--mfmode NAME’
Sets the Metafont mode to NAME.
-'--bdpi NUM'
- Sets the "base dpi" for the font. This must match the mode being
+‘--bdpi NUM’
+ Sets the “base dpi” for the font. This must match the mode being
used.
-'--mag STRING'
- A "magstep" string suitable for the Metafont 'mag' variable. This
+‘--mag STRING’
+ A “magstep” string suitable for the Metafont ‘mag’ variable. This
must match the combination of BDPI and DPI being used.
-'--destdir STRING'
+‘--destdir STRING’
A directory name. If the directory is absolute, it is used as-is.
Otherwise, it is appended to the root destination directory set in
the script.
@@ -2360,7 +2364,7 @@
When looking at these program sources, you should know that previous
versions of the library had a different programming interface; the
current interface supports re-entrancy. Historically, the library
-function names were prefixed with 'kpse_' instead of 'kpathsea_', and
+function names were prefixed with ‘kpse_’ instead of ‘kpathsea_’, and
they did not need an instance variable as first argument. This change
was made in 2009. The old functions will never disappear, and can
reliably continue to be used when they suffice, as they do for the
@@ -2367,27 +2371,27 @@
programs above. The main application using the re-entrant API is the
MetaPost library used by MetaPost and LuaTeX.
- Beyond these examples, the '.h' files in the Kpathsea source describe
-the interfaces and functionality (and of course the '.c' files define
+ Beyond these examples, the ‘.h’ files in the Kpathsea source describe
+the interfaces and functionality (and of course the ‘.c’ files define
the actual routines, which are the ultimate documentation).
-'pathsearch.h' declares the basic searching routine. 'tex-file.h' and
-'tex-glyph.h' define the interfaces for looking up particular kinds of
+‘pathsearch.h’ declares the basic searching routine. ‘tex-file.h’ and
+‘tex-glyph.h’ define the interfaces for looking up particular kinds of
files. In view of the way the headers depend on each other, it is
-recommended to use '#include <kpathsea/kpathsea.h>', which includes
+recommended to use ‘#include <kpathsea/kpathsea.h>’, which includes
every Kpathsea header.
If you want to include only specific headers, you should still
-consider including 'kpathsea/config.h' before including any other
+consider including ‘kpathsea/config.h’ before including any other
Kpathsea header, as it provides symbols used in the other headers. Note
-that 'kpathsea/config.h' includes 'kpathsea/c-auto.h', which is
+that ‘kpathsea/config.h’ includes ‘kpathsea/c-auto.h’, which is
generated by Autoconf.
The library provides no way for an external program to register new
-file types: 'tex-file.[ch]' must be modified to do this. For example,
+file types: ‘tex-file.[ch]’ must be modified to do this. For example,
Kpathsea has support for looking up Dvips config files, even though no
program other than Dvips will likely ever want to do so. I felt this
was acceptable, since along with new file types should also come new
-defaults in 'texmf.cnf' (and its descendant 'paths.h'), since it's
+defaults in ‘texmf.cnf’ (and its descendant ‘paths.h’), since it’s
simplest for users if they can modify one configuration file for all
kinds of paths.
@@ -2405,51 +2409,51 @@
The typical way to use Kpathsea in your program goes something like
this:
- 1. Call 'kpathsea_new' to create a new library instance. This
+ 1. Call ‘kpathsea_new’ to create a new library instance. This
variable must be passed as the first argument to all the following
- library functions. The rest of this manual will be using 'kpse' as
+ library functions. The rest of this manual will be using ‘kpse’ as
a placeholder for the name of this variable.
- 2. Call 'kpathsea_set_program_name' with 'argv[0]' as the second
- argument; the third argument is a string or 'NULL'. The third
- argument is used by Kpathsea as the program name for the '.PROGRAM'
+ 2. Call ‘kpathsea_set_program_name’ with ‘argv[0]’ as the second
+ argument; the third argument is a string or ‘NULL’. The third
+ argument is used by Kpathsea as the program name for the ‘.PROGRAM’
feature of config files (*note Config files::). If the third
- argument is 'NULL', the value of the second argument is used. This
+ argument is ‘NULL’, the value of the second argument is used. This
function must be called before any other use of the Kpathsea
library.
- 'kpathsea_set_program_name' always sets the variables
- 'kpse->invocation_name' and 'kpse->invocation_short_name'. These
+ ‘kpathsea_set_program_name’ always sets the variables
+ ‘kpse->invocation_name’ and ‘kpse->invocation_short_name’. These
variables are used in the error message macros defined in
- 'kpathsea/lib.h'. It sets the variable 'kpse->program_name' to the
+ ‘kpathsea/lib.h’. It sets the variable ‘kpse->program_name’ to the
program name it uses.
It also initializes debugging options based on the environment
- variable 'KPATHSEA_DEBUG' (if that is set).
+ variable ‘KPATHSEA_DEBUG’ (if that is set).
- Finally, it sets the environment variables 'SELFAUTOLOC',
- 'SELFAUTODIR' and 'SELFAUTOPARENT' to the location, parent and
- grandparent directory of the executable, removing '.' and '..' path
+ Finally, it sets the environment variables ‘SELFAUTOLOC’,
+ ‘SELFAUTODIR’ and ‘SELFAUTOPARENT’ to the location, parent and
+ grandparent directory of the executable, removing ‘.’ and ‘..’ path
elements and resolving symbolic links. These are used in the
default configuration file to allow people to invoke TeX from
- anywhere. You can use 'kpsewhich --expand-var=\$SELFAUTOLOC',
+ anywhere. You can use ‘kpsewhich --expand-var=\$SELFAUTOLOC’,
etc., to see the values.
- 3. Set debugging options. *Note Debugging::. If your program doesn't
+ 3. Set debugging options. *Note Debugging::. If your program doesn’t
have a debugging option already, you can define one and set
- 'kpse->debug' to the number that the user supplies (as in Dviljk
+ ‘kpse->debug’ to the number that the user supplies (as in Dviljk
and Web2c), or you can just omit this altogether (people can always
- set 'KPATHSEA_DEBUG'). If you do have runtime debugging already,
- you need to merge Kpathsea's options with yours (as in Dvipsk and
+ set ‘KPATHSEA_DEBUG’). If you do have runtime debugging already,
+ you need to merge Kpathsea’s options with yours (as in Dvipsk and
Xdvik).
4. If your program has its own configuration files that can define
- search paths, you should assign those paths to the 'client_path'
- member in the appropriate element of the 'kpse->format_info' array.
- (This array is indexed by file type; see 'tex-file.h'.) See
- 'resident.c' in Dvipsk for an example.
+ search paths, you should assign those paths to the ‘client_path’
+ member in the appropriate element of the ‘kpse->format_info’ array.
+ (This array is indexed by file type; see ‘tex-file.h’.) See
+ ‘resident.c’ in Dvipsk for an example.
- 5. Call 'kpathsea_init_prog' (see 'proginit.c'). It's useful for the
+ 5. Call ‘kpathsea_init_prog’ (see ‘proginit.c’). It’s useful for the
DVI drivers, at least, but for other programs it may be simpler to
extract the parts of it that actually apply. This does not
initialize any paths, it just looks for (and sets) certain
@@ -2459,61 +2463,61 @@
BibTeX search paths in a DVI driver.)
6. The routine to actually find a file of type FORMAT is
- 'kpathsea_find_file'. You can call 'kpathsea_find_file' after
+ ‘kpathsea_find_file’. You can call ‘kpathsea_find_file’ after
doing only the first and second of the initialization steps
- above--Kpathsea automatically reads the 'texmf.cnf' generic config
+ above—Kpathsea automatically reads the ‘texmf.cnf’ generic config
files, looks for environment variables, and does expansions at the
first lookup.
7. To find PK and/or GF bitmap fonts, the routine is
- 'kpathsea_find_glyph', defined in 'tex-glyph.h'. This returns a
+ ‘kpathsea_find_glyph’, defined in ‘tex-glyph.h’. This returns a
structure in addition to the resultant filename, because fonts can
be found in so many ways. See the documentation in the source.
8. To actually open a file, not just return a filename, call
- 'kpathsea_open_file'. This function takes the name to look up and
- a Kpathsea file format as arguments, and returns the usual 'FILE
- *'. It always assumes the file must exist, and thus will search
- the disk if necessary (unless the search path specified '!!',
+ ‘kpathsea_open_file’. This function takes the name to look up and
+ a Kpathsea file format as arguments, and returns the usual ‘FILE
+ *’. It always assumes the file must exist, and thus will search
+ the disk if necessary (unless the search path specified ‘!!’,
etc.). In other words, if you are looking up a VF or some other
- file that need not exist, don't use this.
+ file that need not exist, don’t use this.
- 9. TeX can write output files, via the '\openout' primitive; this
+ 9. TeX can write output files, via the ‘\openout’ primitive; this
opens a security hole vulnerable to Trojan horse attack: an
unwitting user could run a TeX program that overwrites, say,
- '~/.rhosts'. Analogous security holes exist for many other
+ ‘~/.rhosts’. Analogous security holes exist for many other
programs. To alleviate this, there is a configuration variable
- 'openout_any', which selects one of three levels of security. When
- it is set to 'a' (for "any"), no restrictions are imposed. When it
- is set to 'r' (for "restricted"), filenames beginning with '.' are
- disallowed (except '.tex' because LaTeX needs it). When it is set
- to 'p' (for "paranoid") additional restrictions are imposed: an
+ ‘openout_any’, which selects one of three levels of security. When
+ it is set to ‘a’ (for “any”), no restrictions are imposed. When it
+ is set to ‘r’ (for “restricted”), filenames beginning with ‘.’ are
+ disallowed (except ‘.tex’ because LaTeX needs it). When it is set
+ to ‘p’ (for “paranoid”) additional restrictions are imposed: an
absolute filename must refer to a file in (a subdirectory) of
- 'TEXMFOUTPUT', and any attempt to go up a directory level is
- forbidden (that is, paths may not contain a '..' component). The
- paranoid setting is the default. (For backwards compatibility, 'y'
- and '1' are synonyms of 'a', while 'n' and '0' are synonyms for
- 'r'.) The function 'kpathsea_out_name_ok', with a filename as
- second argument, returns 'true' if that filename is acceptable to
- be opend for output or 'false' otherwise.
+ ‘TEXMFOUTPUT’, and any attempt to go up a directory level is
+ forbidden (that is, paths may not contain a ‘..’ component). The
+ paranoid setting is the default. (For backwards compatibility, ‘y’
+ and ‘1’ are synonyms of ‘a’, while ‘n’ and ‘0’ are synonyms for
+ ‘r’.) The function ‘kpathsea_out_name_ok’, with a filename as
+ second argument, returns ‘true’ if that filename is acceptable to
+ be opend for output or ‘false’ otherwise.
- 10. Similarly, the function 'kpathsea_in_name_ok', with a filename as
- second argument, returns 'true' if that filename is acceptable to
- be opend for input or 'false' otherwise, depending on the value of
- the configuration variable 'openin_any' (with 'a' as default).
+ 10. Similarly, the function ‘kpathsea_in_name_ok’, with a filename as
+ second argument, returns ‘true’ if that filename is acceptable to
+ be opend for input or ‘false’ otherwise, depending on the value of
+ the configuration variable ‘openin_any’ (with ‘a’ as default).
11. To close the kpathsea library instance you are using, call
- 'kpathsea_finish'. This function closes any open log files and
+ ‘kpathsea_finish’. This function closes any open log files and
frees the memory used by the instance.
Kpathsea also provides many utility routines. Some are generic: hash
tables, memory allocation, string concatenation and copying, string
lists, reading input lines of arbitrary length, etc. Others are
-filename-related: default path, tilde, and variable expansion, 'stat'
-calls, etc. (Perhaps someday I'll move the former to a separate
+filename-related: default path, tilde, and variable expansion, ‘stat’
+calls, etc. (Perhaps someday I’ll move the former to a separate
library.)
- The 'c-*.h' header files can also help your program adapt to many
+ The ‘c-*.h’ header files can also help your program adapt to many
different systems. You will almost certainly want to use Autoconf and
probably Automake for configuring and building your software if you use
Kpathsea; I strongly recommend using Autoconf and Automake regardless.
@@ -2529,17 +2533,17 @@
contains some support to make it easy to place them in their own
directories. The Standard TeX directory structure (*note Introduction:
(tds)Top.), specifies that such files should go into a subdirectory
-named after the program, like 'texmf/ttf2pk'.
+named after the program, like ‘texmf/ttf2pk’.
- Two formats, 'kpse_program_text_format' and
-'kpse_program_binary_format', use '.:$TEXMF/PROGRAM//' as their
+ Two formats, ‘kpse_program_text_format’ and
+‘kpse_program_binary_format’, use ‘.:$TEXMF/PROGRAM//’ as their
compiled-in search path. To override this default, you can use the
-variable 'PROGRAMINPUTS' in the environment and/or 'texmf.cnf'. That is
+variable ‘PROGRAMINPUTS’ in the environment and/or ‘texmf.cnf’. That is
to say, the name of the variable is constructed by converting the name
-of the program to upper case, and appending 'INPUTS'.
+of the program to upper case, and appending ‘INPUTS’.
The only difference between these two formats is whether
-'kpathsea_open_file' will open the files it finds in text or binary
+‘kpathsea_open_file’ will open the files it finds in text or binary
mode.
@@ -2548,30 +2552,30 @@
7.4 Programming with config files
=================================
-You can (and probably should) use the same 'texmf.cnf' configuration
+You can (and probably should) use the same ‘texmf.cnf’ configuration
file that Kpathsea uses for your program. This helps installers by
keeping all configuration in one place.
To retrieve a value for a configuration variable VAR, the best way is
-to call 'kpathsea_var_value' on the string 'VAR'. This will look first
+to call ‘kpathsea_var_value’ on the string ‘VAR’. This will look first
for an environment variable VAR, then a config file value. The result
-will be the value found or 'NULL'. This function is declared in
-'kpathsea/variable.h'. For an example, see the 'shell_escape' code in
-'web2c/lib/texmfmp.c'.
+will be the value found or ‘NULL’. This function is declared in
+‘kpathsea/variable.h’. For an example, see the ‘shell_escape’ code in
+‘web2c/lib/texmfmp.c’.
The routine to do full variable and tilde expansion of an arbitrary
string in the context of a search path (as opposed to simply retrieving
-a value) is 'kpathsea_var_expand', also declared in
-'kpathsea/variable.h'. However, it's generally only necessary to set
+a value) is ‘kpathsea_var_expand’, also declared in
+‘kpathsea/variable.h’. However, it’s generally only necessary to set
the search path structure components as explained in the previous
section instead of using this directly. Because of its usage with any
-input string, undefined '$FOO' constructs in the argument to
-'kpathsea_var_expand' are returned literally ('"$FOO"'), while undefined
-'${FOO}' constructs are expanded to the empty string.
+input string, undefined ‘$FOO’ constructs in the argument to
+‘kpathsea_var_expand’ are returned literally (‘"$FOO"’), while undefined
+‘${FOO}’ constructs are expanded to the empty string.
If for some reason you want to retrieve a value _only_ from a config
file, not automatically looking for a corresponding environment
-variable, call 'kpathsea_cnf_get' (declared in 'kpathsea/cnf.h') with
+variable, call ‘kpathsea_cnf_get’ (declared in ‘kpathsea/cnf.h’) with
the string VAR.
No initialization calls are needed.
@@ -2603,7 +2607,7 @@
8.1 Bug checklist
=================
-Before reporting a bug, please check below to be sure it isn't already
+Before reporting a bug, please check below to be sure it isn’t already
known (*note Common problems::).
Bug reports should be sent via electronic mail to <tex-k at tug.org>.
@@ -2612,53 +2616,53 @@
information necessary for reproduction. Therefore, to enable
investigation, your report should include the following:
- * The version number(s) of the program(s) involved, and of Kpathsea
- itself. You can get the former by giving a sole option '--version'
- to the program, and the latter by running 'kpsewhich --version'.
- The 'NEWS' and 'ChangeLog' files also contain the version number.
+ • The version number(s) of the program(s) involved, and of Kpathsea
+ itself. You can get the former by giving a sole option ‘--version’
+ to the program, and the latter by running ‘kpsewhich --version’.
+ The ‘NEWS’ and ‘ChangeLog’ files also contain the version number.
- * The hardware, operating system (including version), compiler, and
- 'make' program you are using (the output of 'uname -a' is a start
+ • The hardware, operating system (including version), compiler, and
+ ‘make’ program you are using (the output of ‘uname -a’ is a start
on the first two, though incomplete).
- * Any options you gave to 'configure'. This is recorded in the
- 'config.status' files.
+ • Any options you gave to ‘configure’. This is recorded in the
+ ‘config.status’ files.
- If you are reporting a bug in 'configure' itself, it's probably
+ If you are reporting a bug in ‘configure’ itself, it’s probably
system-dependent, and it will be unlikely the maintainers can do
anything useful if you merely report that thus-and-such is broken.
Therefore, you need to do some additional work: for some bugs, you
- can look in the file 'config.log' where the test that failed should
+ can look in the file ‘config.log’ where the test that failed should
appear, along with the compiler invocation and source program in
question. You can then compile it yourself by hand, and discover
- why the test failed. Other 'configure' bugs do not involve the
+ why the test failed. Other ‘configure’ bugs do not involve the
compiler; in that case, the only recourse is to inspect the
- 'configure' shell script itself, or the Autoconf macros that
- generated 'configure'.
+ ‘configure’ shell script itself, or the Autoconf macros that
+ generated ‘configure’.
- * The log of all debugging output, if the bug is in path searching.
+ • The log of all debugging output, if the bug is in path searching.
You can get this by setting the environment variable
- 'KPATHSEA_DEBUG' to '-1' before running the program. Please look
+ ‘KPATHSEA_DEBUG’ to ‘-1’ before running the program. Please look
at the log yourself to make sure the behavior is really a bug
- before reporting it; perhaps "old" environment variable settings
+ before reporting it; perhaps “old” environment variable settings
are causing files not to be found, for example.
- * The contents of any input files necessary to reproduce the bug.
+ • The contents of any input files necessary to reproduce the bug.
For bugs in DVI-reading programs, for example, this generally means
- a DVI file (and any EPS or other files it uses)--TeX source files
- are helpful, but the DVI file is required, because that's the
+ a DVI file (and any EPS or other files it uses)—TeX source files
+ are helpful, but the DVI file is required, because that’s the
actual program input.
- * If you are sending a patch (do so if you can!), please do so in the
- form of a context diff ('diff -c') against the original
+ • If you are sending a patch (do so if you can!), please do so in the
+ form of a context diff (‘diff -c’) against the original
distribution source. Any other form of diff is either not as
complete or harder for me to understand. Please also include a
- 'ChangeLog' entry.
+ ‘ChangeLog’ entry.
- * If the bug involved is an actual crash (i.e., core dump), it is
+ • If the bug involved is an actual crash (i.e., core dump), it is
easy and useful to include a stack trace from a debugger (I
recommend the GNU debugger GDB (<https://gnu.org/software/gdb>).
- If the cause is apparent (a 'NULL' value being dereferenced, for
+ If the cause is apparent (a ‘NULL’ value being dereferenced, for
example), please send the details along. If the program involved
is TeX or Metafont, and the crash is happening at apparently-sound
code, however, the bug may well be in the compiler, rather than in
@@ -2665,7 +2669,7 @@
the program or the library (*note TeX or Metafont failing: TeX or
Metafont failing.).
- * Any additional information that will be helpful in reproducing,
+ • Any additional information that will be helpful in reproducing,
diagnosing, or fixing the bug.
@@ -2695,22 +2699,22 @@
Kpathsea provides a number of runtime debugging options, detailed below
by their names and corresponding numeric values. When the files you
-expect aren't being found, the thing to do is enable these options and
+expect aren’t being found, the thing to do is enable these options and
examine the output.
- You can set these with some runtime argument (e.g., '-d') to the
+ You can set these with some runtime argument (e.g., ‘-d’) to the
program; in that case, you should use the numeric values described in
-the program's documentation (which, for Dvipsk and Xdvik, are different
-than those below). It's best to give the '-d' (or whatever) option
+the program’s documentation (which, for Dvipsk and Xdvik, are different
+than those below). It’s best to give the ‘-d’ (or whatever) option
first, for maximal output. Dvipsk and Xdvik have additional
program-specific debugging options as well.
- You can also set the environment variable 'KPATHSEA_DEBUG'; in this
+ You can also set the environment variable ‘KPATHSEA_DEBUG’; in this
case, you should use the numbers below. If you run the program under a
-debugger and set the instance variable 'kpse->debug', also use the
+debugger and set the instance variable ‘kpse->debug’, also use the
numbers below.
- In any case, by far the simplest value to use is '-1', which will
+ In any case, by far the simplest value to use is ‘-1’, which will
turn on all debugging output. This is usually better than guessing
which particular values will yield the output you need.
@@ -2722,81 +2726,81 @@
(*note Invoking kpsewhich::), instead of the original program.
In any case, you cannot use the names below; you must always use
-somebody's numbers. (Sorry.) To set more than one option, just sum the
+somebody’s numbers. (Sorry.) To set more than one option, just sum the
corresponding numbers.
-'KPSE_DEBUG_STAT (1)'
- Report 'stat'(2) calls. This is useful for verifying that your
+‘KPSE_DEBUG_STAT (1)’
+ Report ‘stat’(2) calls. This is useful for verifying that your
directory structure is not forcing Kpathsea to do many additional
file tests (*note Slow path searching::, and *note Subdirectory
- expansion::). If you are using an up-to-date 'ls-R' database
+ expansion::). If you are using an up-to-date ‘ls-R’ database
(*note Filename database::), this should produce no output unless a
nonexistent file that must exist is searched for.
-'KPSE_DEBUG_HASH (2)'
- Report lookups in all hash tables: 'ls-R' and 'aliases' (*note
+‘KPSE_DEBUG_HASH (2)’
+ Report lookups in all hash tables: ‘ls-R’ and ‘aliases’ (*note
Filename database::); font aliases (*note Fontmap::); and config
file values (*note Config files::). Useful when expected values
are not being found, e.g.., file searches are looking at the disk
- instead of using 'ls-R'.
+ instead of using ‘ls-R’.
-'KPSE_DEBUG_FOPEN (4)'
+‘KPSE_DEBUG_FOPEN (4)’
Report file openings and closings. Especially useful when your
- system's file table is full, for seeing which files have been
+ system’s file table is full, for seeing which files have been
opened but never closed. In case you want to set breakpoints in a
- debugger: this works by redefining 'fopen' ('fclose') to be
- 'kpse_fopen_trace' ('kpse_fclose_trace').
+ debugger: this works by redefining ‘fopen’ (‘fclose’) to be
+ ‘kpse_fopen_trace’ (‘kpse_fclose_trace’).
-'KPSE_DEBUG_PATHS (8)'
+‘KPSE_DEBUG_PATHS (8)’
Report general path information for each file type Kpathsea is
asked to search. This is useful when you are trying to track down
- how a particular path got defined--from 'texmf.cnf', 'config.ps',
- an environment variable, the compile-time default, etc. This is
- the contents of the 'kpse_format_info_type' structure defined in
- 'tex-file.h'.
+ how a particular path got defined—from ‘texmf.cnf’, ‘config.ps’, an
+ environment variable, the compile-time default, etc. This is the
+ contents of the ‘kpse_format_info_type’ structure defined in
+ ‘tex-file.h’.
-'KPSE_DEBUG_EXPAND (16)'
+‘KPSE_DEBUG_EXPAND (16)’
Report the directory list corresponding to each path element
Kpathsea searches. This is only relevant when Kpathsea searches
- the disk, since 'ls-R' searches don't look through directory lists
+ the disk, since ‘ls-R’ searches don’t look through directory lists
in this way.
-'KPSE_DEBUG_SEARCH (32)'
+‘KPSE_DEBUG_SEARCH (32)’
Report on each file search: the name of the file searched for, the
path searched in, whether or not the file must exist (when drivers
- search for 'cmr10.vf', it need not exist), and whether or not we
+ search for ‘cmr10.vf’, it need not exist), and whether or not we
are collecting all occurrences of the file in the path (as with,
- e.g., 'texmf.cnf' and 'texfonts.map'), or just the first (as with
+ e.g., ‘texmf.cnf’ and ‘texfonts.map’), or just the first (as with
most lookups). This can help you correlate what Kpathsea is doing
with what is in your input file.
-'KPSE_DEBUG_VARS (64)'
+‘KPSE_DEBUG_VARS (64)’
Report the value of each variable Kpathsea looks up. This is
useful for verifying that variables do indeed obtain their correct
values.
-'GSFTOPK_DEBUG (128)'
- Activates debugging printout specific to 'gsftopk' program.
+‘GSFTOPK_DEBUG (128)’
+ Activates debugging printout specific to ‘gsftopk’ program.
-'MAKETEX_DEBUG (512)'
- If you use the optional 'mktex' programs instead of the traditional
+‘MAKETEX_DEBUG (512)’
+ If you use the optional ‘mktex’ programs instead of the traditional
shell scripts, this will report the name of the site file
- ('mktex.cnf' by default) which is read, directories created by
- 'mktexdir', the full path of the 'ls-R' database built by
- 'mktexlsr', font map searches, 'MT_FEATURES' in effect, parameters
- from 'mktexnam', filenames added by 'mktexupd', and some subsidiary
+ (‘mktex.cnf’ by default) which is read, directories created by
+ ‘mktexdir’, the full path of the ‘ls-R’ database built by
+ ‘mktexlsr’, font map searches, ‘MT_FEATURES’ in effect, parameters
+ from ‘mktexnam’, filenames added by ‘mktexupd’, and some subsidiary
commands run by the programs.
-'MAKETEX_FINE_DEBUG (1024)'
- When the optional 'mktex' programs are used, this will print
+‘MAKETEX_FINE_DEBUG (1024)’
+ When the optional ‘mktex’ programs are used, this will print
additional debugging info from functions internal to these
programs.
Debugging output from Kpathsea is always written to standard error,
-and begins with the string 'kdebug:'. (Except for hash table buckets,
+and begins with the string ‘kdebug:’. (Except for hash table buckets,
which just start with the number, but you can only get that output
-running under a debugger. See comments at the 'hash_summary_only'
-variable in 'kpathsea/db.c'.)
+running under a debugger. See comments at the ‘hash_summary_only’
+variable in ‘kpathsea/db.c’.)
File: kpathsea.info, Node: Logging, Next: Common problems, Prev: Debugging, Up: Reporting bugs
@@ -2809,18 +2813,18 @@
your filesystem is full, or in discovering usage patterns at your site.
To do this, define the environment or config file variable
-'TEXMFLOG'. The value is the name of the file to append the information
-to. The file is created if it doesn't exist, and appended to if it
+‘TEXMFLOG’. The value is the name of the file to append the information
+to. The file is created if it doesn’t exist, and appended to if it
does.
Each successful search turns into one line in the log file: two words
separated by a space. The first word is the time of the search, as the
-integer number of seconds since "the epoch", i.e., UTC midnight 1
-January 1970 (more precisely, the result of the 'time' system call).
+integer number of seconds since “the epoch”, i.e., UTC midnight 1
+January 1970 (more precisely, the result of the ‘time’ system call).
The second word is the filename.
- For example, after 'setenv TEXMFLOG /tmp/log', running Dvips on
-'story.dvi' appends the following lines:
+ For example, after ‘setenv TEXMFLOG /tmp/log’, running Dvips on
+‘story.dvi’ appends the following lines:
774455887 /usr/local/share/texmf/dvips/config.ps
774455887 /usr/local/share/texmf/dvips/psfonts.map
@@ -2833,13 +2837,13 @@
Only filenames that are absolute are recorded, to preserve some
semblance of privacy.
- In addition to this Kpathsea-specific logging, 'pdftex' provides an
-option '-recorder' to write the names of all files accessed during a run
-to the file 'BASEFILE.fls'.
+ In addition to this Kpathsea-specific logging, ‘pdftex’ provides an
+option ‘-recorder’ to write the names of all files accessed during a run
+to the file ‘BASEFILE.fls’.
Finally, most systems provide a general tool to output each system
call, thus including opening and closing files. It might be named
-'strace', 'truss', 'struss', or something else.
+‘strace’, ‘truss’, ‘struss’, or something else.
File: kpathsea.info, Node: Common problems, Prev: Logging, Up: Reporting bugs
@@ -2852,7 +2856,7 @@
* Menu:
-* Unable to find files:: If your program can't find fonts (or whatever).
+* Unable to find files:: If your program can’t find fonts (or whatever).
* Slow path searching:: If it takes forever to find anything.
* Unable to generate fonts:: If mktexpk fails.
* TeX or Metafont failing:: Likely compiler bugs.
@@ -2867,21 +2871,21 @@
of several things might be wrong. In any case, you may find the
debugging options helpful. *Note Debugging::.
- * Perhaps you simply haven't installed all the necessary files; the
+ • Perhaps you simply haven’t installed all the necessary files; the
basic fonts and input files are distributed separately from the
programs. *Note unixtex.ftp::.
- * You have (perhaps unknowingly) told Kpathsea to use search paths
- that don't reflect where the files actually are. One common cause
+ • You have (perhaps unknowingly) told Kpathsea to use search paths
+ that don’t reflect where the files actually are. One common cause
is having environment variables set from a previous installation,
- thus overriding what you carefully set in 'texmf.cnf' (*note
- Supported file formats::). System '/etc/profile' or other files
+ thus overriding what you carefully set in ‘texmf.cnf’ (*note
+ Supported file formats::). System ‘/etc/profile’ or other files
such may be the culprit.
- * Your files reside in a directory that is only pointed to via a
- symbolic link, in a leaf directory and is not listed in 'ls-R'.
+ • Your files reside in a directory that is only pointed to via a
+ symbolic link, in a leaf directory and is not listed in ‘ls-R’.
- Unfortunately, Kpathsea's subdirectory searching has an
+ Unfortunately, Kpathsea’s subdirectory searching has an
irremediable deficiency: If a directory D being searched for
subdirectories contains plain files and symbolic links to other
directories, but no true subdirectories, D will be considered a
@@ -2892,21 +2896,21 @@
subdirectory in D. Then D will no longer be a leaf, and the
symlinks will be followed.
- The directory immediately followed by the '//' in the path
+ The directory immediately followed by the ‘//’ in the path
specification, however, is always searched for subdirectories, even
if it is a leaf. Presumably you would not have asked for the
- directory to be searched for subdirectories if you didn't want it
+ directory to be searched for subdirectories if you didn’t want it
to be.
- * If the fonts (or whatever) don't already exist, 'mktexpk' (or
- 'mktexmf' or 'mktextfm') will try to create them. If these rather
- complicated shell scripts fail, you'll eventually get an error
- message saying something like 'Can't find font FONTNAME'. The best
- solution is to fix (or at least report) the bug in 'mktexpk'; the
+ • If the fonts (or whatever) don’t already exist, ‘mktexpk’ (or
+ ‘mktexmf’ or ‘mktextfm’) will try to create them. If these rather
+ complicated shell scripts fail, you’ll eventually get an error
+ message saying something like ‘Can't find font FONTNAME’. The best
+ solution is to fix (or at least report) the bug in ‘mktexpk’; the
workaround is to generate the necessary fonts by hand with
Metafont, or to grab them from a CTAN site (*note unixtex.ftp::).
- * There is a bug in the library. *Note Reporting bugs::.
+ • There is a bug in the library. *Note Reporting bugs::.
File: kpathsea.info, Node: Slow path searching, Next: Unable to generate fonts, Prev: Unable to find files, Up: Common problems
@@ -2918,20 +2922,20 @@
input files, but does eventually succeed, here are some possible
culprits:
- * Most likely, you just have a lot of directories to search, and that
+ • Most likely, you just have a lot of directories to search, and that
takes a noticeable time. The solution is to create and maintain a
- separate 'ls-R' file that lists all the files in your main TeX
- hierarchy. *Note Filename database::. Kpathsea always uses 'ls-R'
- if it's present; there's no need to recompile or reconfigure any of
+ separate ‘ls-R’ file that lists all the files in your main TeX
+ hierarchy. *Note Filename database::. Kpathsea always uses ‘ls-R’
+ if it’s present; there’s no need to recompile or reconfigure any of
the programs.
- * Your recursively-searched directories (e.g.,
- '/usr/local/share/texmf/fonts//'), contain a mixture of files and
+ • Your recursively-searched directories (e.g.,
+ ‘/usr/local/share/texmf/fonts//’), contain a mixture of files and
directories. This prevents Kpathsea from using a useful
optimization (*note Subdirectory expansion::).
- It is best to have only directories (and perhaps a 'README') in the
- upper levels of the directory structure, and it's very important to
+ It is best to have only directories (and perhaps a ‘README’) in the
+ upper levels of the directory structure, and it’s very important to
have _only_ files, and no subdirectories, in the leaf directories
where the dozens of TFM, PK, or whatever files reside.
@@ -2951,17 +2955,17 @@
generate these on the fly when they are needed, but this generation may
fail in several cases.
- If 'mktexpk' runs, but fails with this error:
+ If ‘mktexpk’ runs, but fails with this error:
mktexpk: Can't guess mode for NNN dpi devices.
mktexpk: Use a config file to specify the mode, or update me.
you need to ensure the resolution and mode match; just specifying the
-resolution, as in '-D 360', is not enough.
+resolution, as in ‘-D 360’, is not enough.
- You can specify the mode name with the '-mode' option on the Dvips
+ You can specify the mode name with the ‘-mode’ option on the Dvips
command line, or in a Dvips configuration file (*note (dvips)Config
-files::), such as 'config.ps' in your document directory, '~/.dvipsrc'
+files::), such as ‘config.ps’ in your document directory, ‘~/.dvipsrc’
in your home directory, or in a system directory (again named
-'config.ps'). (Other drivers use other files, naturally.)
+‘config.ps’). (Other drivers use other files, naturally.)
For example, if you need 360dpi fonts, you could include this in a
configuration file:
@@ -2969,7 +2973,7 @@
M lqmed
If Metafont runs, but generates fonts at the wrong resolution or for
-the wrong device, most likely 'mktexpk''s built-in guess for the mode is
+the wrong device, most likely ‘mktexpk’’s built-in guess for the mode is
wrong, and you should override it as above.
See <https://ctan.org/pkg/modes> for a list of resolutions and mode
@@ -2978,19 +2982,19 @@
If Metafont runs but generates fonts at a resolution of 2602dpi (and
prints out the name of each character as well as just a character
number, and maybe tries to display the characters), then your Metafont
-base file probably hasn't been made properly. (It's using the default
-'proof' mode, instead of an actual device mode.) To make a proper
-'plain.base', assuming the local mode definitions are contained in a
-file 'modes.mf', run the following command (assuming Unix):
+base file probably hasn’t been made properly. (It’s using the default
+‘proof’ mode, instead of an actual device mode.) To make a proper
+‘plain.base’, assuming the local mode definitions are contained in a
+file ‘modes.mf’, run the following command (assuming Unix):
inimf "plain; input modes; dump"
-Then copy the 'plain.base' file from the current directory to where the
-base files are stored on your system ('/usr/local/share/texmf/web2c' by
-default), and make a link (either hard or soft) from 'plain.base' to
-'mf.base' in that directory. *Note (web2c)inimf invocation::.
+Then copy the ‘plain.base’ file from the current directory to where the
+base files are stored on your system (‘/usr/local/share/texmf/web2c’ by
+default), and make a link (either hard or soft) from ‘plain.base’ to
+‘mf.base’ in that directory. *Note (web2c)inimf invocation::.
- If 'mf' is a command not found at all by 'mktexpk', then you need to
+ If ‘mf’ is a command not found at all by ‘mktexpk’, then you need to
install Metafont (*note unixtex.ftp::).
@@ -3005,9 +3009,9 @@
passed, problems may lurk. Optimization occasionally causes trouble in
programs other than TeX and Metafont themselves, too.
- For a workaround, if you enabled any optimization flags, it's best to
+ For a workaround, if you enabled any optimization flags, it’s best to
omit optimization entirely. In any case, the way to find the facts is
-to run the program under the debugger and see where it's failing.
+to run the program under the debugger and see where it’s failing.
Also, if you have trouble with a system C compiler, I advise trying
the GNU C compiler. And vice versa, unfortunately; but in that case I
@@ -3017,7 +3021,7 @@
To report compiler bugs effectively requires perseverance and
perspicacity: you must find the miscompiled line, and that usually
involves delving backwards in time from the point of error, checking
-through TeX's (or whatever program's) data structures. Good luck.
+through TeX’s (or whatever program’s) data structures. Good luck.
File: kpathsea.info, Node: Index, Prev: Reporting bugs, Up: Top
@@ -3031,7 +3035,7 @@
* !! and casefolding: Casefolding examples.
(line 57)
* !! in path specifications: ls-R. (line 57)
-* !! in 'TEXMFDBS': ls-R. (line 11)
+* !! in TEXMFDBS: ls-R. (line 11)
* $ expansion: Variable expansion. (line 6)
* --all: Path searching options.
(line 12)
@@ -3039,7 +3043,7 @@
(line 19)
* --cnf-line: Path searching options.
(line 28)
-* '--cnf-line', source for path: Path sources. (line 9)
+* --cnf-line, source for path: Path sources. (line 9)
* --color=tty: ls-R. (line 25)
* --debug=NUM: Auxiliary tasks. (line 9)
* --dpi=NUM: Path searching options.
@@ -3085,12 +3089,12 @@
* --without-mktexpk-default: mktex configuration. (line 12)
* --without-mktextfm-default: mktex configuration. (line 12)
* -1 debugging value: Debugging. (line 23)
-* -A option to 'ls': ls-R. (line 39)
+* -A option to ls: ls-R. (line 39)
* -D NUM: Path searching options.
(line 49)
* -iname, find predicate: Casefolding examples.
(line 78)
-* -L option to 'ls': ls-R. (line 44)
+* -L option to ls: ls-R. (line 44)
* . directories, ignored: ls-R. (line 39)
* . files: ls-R. (line 39)
* .2602gf: Unable to generate fonts.
@@ -3127,71 +3131,85 @@
(line 84)
* .lig: Supported file formats.
(line 88)
+* .lua: Supported file formats.
+ (line 94)
+* .luatex: Supported file formats.
+ (line 94)
+* .luc: Supported file formats.
+ (line 94)
+* .luctex: Supported file formats.
+ (line 94)
* .map: Supported file formats.
- (line 94)
+ (line 98)
* .mem: Supported file formats.
- (line 97)
+ (line 101)
* .mf: Supported file formats.
- (line 105)
+ (line 109)
* .mft: Supported file formats.
- (line 113)
+ (line 117)
* .mlbib: Supported file formats.
- (line 121)
+ (line 125)
* .mlbst: Supported file formats.
- (line 125)
+ (line 129)
* .mp: Supported file formats.
- (line 129)
+ (line 133)
* .ocp: Supported file formats.
- (line 137)
+ (line 141)
* .ofm: Supported file formats.
- (line 141)
+ (line 145)
* .opl: Supported file formats.
- (line 148)
+ (line 152)
* .otp: Supported file formats.
- (line 151)
+ (line 155)
* .ovf: Supported file formats.
- (line 154)
+ (line 158)
* .ovp: Supported file formats.
- (line 157)
+ (line 161)
* .pfa: Supported file formats.
- (line 211)
+ (line 215)
* .pfb: Supported file formats.
- (line 211)
+ (line 215)
* .pk: Supported file formats.
- (line 164)
+ (line 168)
* .pool: Supported file formats.
- (line 109)
+ (line 113)
* .pool <1>: Supported file formats.
- (line 133)
+ (line 137)
* .pool <2>: Supported file formats.
- (line 195)
+ (line 199)
* .pro: Supported file formats.
- (line 169)
-* .PROGNAME qualifier in 'texmf.cnf': Config files. (line 50)
+ (line 173)
+* .PROGNAME qualifier in texmf.cnf: Config files. (line 50)
* .rhosts, writable by TeX: Security. (line 10)
* .ris: Supported file formats.
- (line 173)
+ (line 177)
* .sfd: Supported file formats.
- (line 177)
+ (line 181)
* .so: Supported file formats.
(line 42)
* .tex: Supported file formats.
- (line 180)
-* .tex file, included in 'ls-R': ls-R. (line 39)
+ (line 184)
+* .tex file, included in ls-R: ls-R. (line 39)
+* .texlua: Supported file formats.
+ (line 94)
+* .texluc: Supported file formats.
+ (line 94)
* .tfm: Supported file formats.
- (line 199)
+ (line 203)
+* .tlu: Supported file formats.
+ (line 94)
* .ttc: Supported file formats.
- (line 207)
+ (line 211)
* .ttf: Supported file formats.
- (line 207)
+ (line 211)
* .vf: Supported file formats.
- (line 219)
+ (line 223)
* .w: Supported file formats.
(line 53)
* .web: Supported file formats.
(line 53)
* .web <1>: Supported file formats.
- (line 223)
+ (line 227)
* / may not be /: Searching overview. (line 13)
* /, trailing in home directory: Tilde expansion. (line 19)
* //: Subdirectory expansion.
@@ -3205,9 +3223,9 @@
* 8.3 filenames, using: mktex configuration. (line 68)
* : may not be :: Searching overview. (line 13)
* :: expansion: Default expansion. (line 6)
-* ; translated to ':' in 'texmf.cnf': Config files. (line 66)
-* = omitted in 'texmf.cnf' and misparsing: Config files. (line 86)
-* \, line continuation in 'texmf.cnf': Config files. (line 37)
+* ; translated to : in texmf.cnf: Config files. (line 66)
+* = omitted in texmf.cnf and misparsing: Config files. (line 86)
+* \, line continuation in texmf.cnf: Config files. (line 37)
* \openin: Searching overview. (line 31)
* \special, suppressing warnings about: Suppressing warnings.
(line 31)
@@ -3230,15 +3248,15 @@
* announcement mailing list: Mailing lists. (line 6)
* API, re-entrant: Programming overview.
(line 16)
-* append-only directories and 'mktexpk': Security. (line 36)
+* append-only directories and mktexpk: Security. (line 36)
* appendonlydir: mktex configuration. (line 60)
* Apple filesystem, case-insensitive: Casefolding rationale.
(line 6)
-* arguments to 'mktex': mktex script arguments.
+* arguments to mktex: mktex script arguments.
(line 6)
* argv[0]: Calling sequence. (line 14)
* autoconf, recommended: Calling sequence. (line 117)
-* automounter, and 'ls-R': ls-R. (line 46)
+* automounter, and ls-R: ls-R. (line 46)
* auxiliary tasks: Auxiliary tasks. (line 6)
* Bach, Johann Sebastian: Default expansion. (line 41)
* backslash-newline: Config files. (line 37)
@@ -3247,8 +3265,8 @@
* BIBINPUTS: Supported file formats.
(line 30)
* BIBINPUTS <1>: Supported file formats.
- (line 121)
-* blank lines, in 'texmf.cnf': Config files. (line 35)
+ (line 125)
+* blank lines, in texmf.cnf: Config files. (line 35)
* BLTXMLINPUTS: Supported file formats.
(line 34)
* brace expansion: Brace expansion. (line 6)
@@ -3256,7 +3274,7 @@
* BSTINPUTS: Supported file formats.
(line 38)
* BSTINPUTS <1>: Supported file formats.
- (line 125)
+ (line 129)
* bug address: Reporting bugs. (line 6)
* bug checklist: Bug checklist. (line 6)
* bug mailing list: Mailing lists. (line 6)
@@ -3276,7 +3294,7 @@
* checksum: Suppressing warnings.
(line 16)
* circle fonts: Fontmap. (line 19)
-* client_path in 'kpse->format_info': Calling sequence. (line 47)
+* client_path in kpse->format_info: Calling sequence. (line 47)
* CLUAINPUTS: Supported file formats.
(line 42)
* CMAPFONTS: Supported file formats.
@@ -3287,7 +3305,7 @@
* cnf.h: Programming with config files.
(line 27)
* comments, in fontmap files: Fontmap. (line 27)
-* comments, in 'texmf.cnf': Config files. (line 27)
+* comments, in texmf.cnf: Config files. (line 27)
* comments, making: Introduction. (line 29)
* common features in glyph lookup: Basic glyph lookup. (line 6)
* common problems: Common problems. (line 6)
@@ -3312,9 +3330,8 @@
* config.status: Bug checklist. (line 27)
* configuration bugs: Bug checklist. (line 27)
* configuration file, source for path: Path sources. (line 20)
-* configuration of 'mktex' scripts: mktex configuration. (line 6)
-* 'configure' options for 'mktex' scripts: mktex configuration.
- (line 12)
+* configuration of mktex scripts: mktex configuration. (line 6)
+* configure options for mktex scripts: mktex configuration. (line 12)
* context diff: Bug checklist. (line 52)
* continuation character: Config files. (line 37)
* core dumps, reporting: Bug checklist. (line 58)
@@ -3338,12 +3355,12 @@
* directory permissions: Security. (line 51)
* directory structure, for TeX files: TeX directory structure.
(line 6)
-* disabling 'mktex' scripts: mktex configuration. (line 6)
+* disabling mktex scripts: mktex configuration. (line 6)
* disk search: Searching overview. (line 22)
* disk searching, avoiding: ls-R. (line 57)
* disk usage, reducing: Logging. (line 6)
* doc files: Supported file formats.
- (line 185)
+ (line 189)
* DOS compatible names: mktex configuration. (line 68)
* dosnames: mktex configuration. (line 67)
* dot files: ls-R. (line 39)
@@ -3354,9 +3371,9 @@
* dvipdfmx.cfg: Specially-recognized files.
(line 19)
* DVIPSFONTS: Supported file formats.
- (line 254)
+ (line 258)
* DVIPSHEADERS: Supported file formats.
- (line 211)
+ (line 215)
* DVIPSMAKEPK: mktex script names. (line 32)
* DVIPSSIZES: Fallback font. (line 6)
* dynamic creation of files: mktex scripts. (line 6)
@@ -3365,7 +3382,7 @@
(line 41)
* elt-dirs.c <1>: Subdirectory expansion.
(line 48)
-* enabling 'mktex' scripts: mktex configuration. (line 6)
+* enabling mktex scripts: mktex configuration. (line 6)
* ENCFONTS: Supported file formats.
(line 61)
* engine name: Path searching options.
@@ -3394,7 +3411,7 @@
* extensions, filename: File lookup. (line 24)
* externally-built filename database: Filename database. (line 6)
* extra colons: Default expansion. (line 6)
-* failed 'mktex...' script invocation: mktex script names. (line 35)
+* failed mktex... script invocation: mktex script names. (line 35)
* fallback font: Fallback font. (line 6)
* fallback resolutions: Fallback font. (line 6)
* FAQ, Kpathsea: Common problems. (line 6)
@@ -3437,9 +3454,9 @@
* fontname: mktex configuration. (line 87)
* fontnames, arbitrary length: Fontmap. (line 15)
* FOOINPUTS: Supported file formats.
- (line 236)
+ (line 240)
* FOOINPUTS <1>: Supported file formats.
- (line 239)
+ (line 243)
* fopen, redefined: Debugging. (line 54)
* format of external database: Database format. (line 6)
* ftp.cs.stanford.edu: unixtex.ftp. (line 20)
@@ -3456,7 +3473,7 @@
* GLYPHFONTS: Supported file formats.
(line 75)
* GLYPHFONTS <1>: Supported file formats.
- (line 164)
+ (line 168)
* glyphlist.txt: Specially-recognized files.
(line 25)
* GNU C compiler bugs: TeX or Metafont failing.
@@ -3480,7 +3497,7 @@
(line 151)
* interface, not frozen: Introduction. (line 29)
* introduction: Introduction. (line 6)
-* 'kdebug:': Debugging. (line 105)
+* kdebug:: Debugging. (line 105)
* kdefault.c: Default expansion. (line 48)
* Knuth, Donald E.: History. (line 6)
* Knuth, Donald E., archive of programs by: unixtex.ftp. (line 20)
@@ -3491,7 +3508,7 @@
(line 27)
* KPATHSEA_DEBUG: Calling sequence. (line 28)
* KPATHSEA_DEBUG <1>: Debugging. (line 18)
-* kpathsea_find_file: File lookup. (line 38)
+* kpathsea_find_file: File lookup. (line 37)
* kpathsea_find_file <1>: Calling sequence. (line 62)
* kpathsea_find_glyph: Glyph lookup. (line 26)
* kpathsea_finish: Calling sequence. (line 106)
@@ -3546,6 +3563,8 @@
(line 91)
* ls-R database file: ls-R. (line 6)
* ls-R, simplest build: ls-R. (line 22)
+* LUAINPUTS: Supported file formats.
+ (line 94)
* Mac filesystem, case-insensitive: Casefolding rationale.
(line 6)
* MacKenzie, David: History. (line 44)
@@ -3568,13 +3587,13 @@
* MFBASES: Supported file formats.
(line 26)
* MFINPUTS: Supported file formats.
- (line 105)
+ (line 109)
* MFPOOL: Supported file formats.
- (line 109)
+ (line 113)
* MFTINPUTS: Supported file formats.
- (line 113)
+ (line 117)
* MISCFONTS: Supported file formats.
- (line 117)
+ (line 121)
* mismatched checksum warnings: Suppressing warnings.
(line 17)
* missfont.log: mktex script names. (line 35)
@@ -3583,9 +3602,9 @@
(line 20)
* mkocp: mktex script names. (line 18)
* mkofm: mktex script names. (line 21)
-* 'mktex' script configuration: mktex configuration. (line 6)
-* 'mktex' script names: mktex script names. (line 6)
-* 'mktex' scripts: mktex scripts. (line 6)
+* mktex script configuration: mktex configuration. (line 6)
+* mktex script names: mktex script names. (line 6)
+* mktex scripts: mktex scripts. (line 6)
* mktex.cnf: Specially-recognized files.
(line 28)
* mktex.cnf <1>: mktex configuration. (line 29)
@@ -3595,30 +3614,30 @@
* mktexfmt: mktex script names. (line 10)
* mktexmf: mktex script names. (line 15)
* mktexpk: mktex script names. (line 24)
-* 'mktexpk' can't guess mode: Unable to generate fonts.
+* mktexpk can’t guess mode: Unable to generate fonts.
(line 12)
* mktextex: mktex script names. (line 27)
* mktextfm: mktex script names. (line 30)
* MLBIBINPUTS: Supported file formats.
- (line 121)
+ (line 125)
* MLBSTINPUTS: Supported file formats.
- (line 125)
+ (line 129)
* mode directory, omitting: mktex configuration. (line 98)
* Morgan, Tim: History. (line 12)
* MPINPUTS: Supported file formats.
- (line 129)
+ (line 133)
* MPMEMS: Supported file formats.
- (line 97)
+ (line 101)
* MPPOOL: Supported file formats.
- (line 133)
+ (line 137)
* MPSUPPORT: Supported file formats.
- (line 101)
+ (line 105)
* MT_FEATURES: mktex configuration. (line 39)
* multiple TeX hierarchies: Brace expansion. (line 20)
* must exist: Searching overview. (line 31)
-* names for 'mktex' scripts: mktex script names. (line 6)
+* names for mktex scripts: mktex script names. (line 6)
* Neumann, Gustaf: History. (line 56)
-* NFS and 'ls-R': ls-R. (line 46)
+* NFS and ls-R: ls-R. (line 46)
* nomfdrivers: mktex configuration. (line 92)
* nomode: mktex configuration. (line 97)
* none: Suppressing warnings.
@@ -3627,25 +3646,25 @@
* numeric debugging values: Debugging. (line 34)
* obtaining TeX: unixtex.ftp. (line 6)
* OCPINPUTS: Supported file formats.
- (line 137)
+ (line 141)
* OFMFONTS: Supported file formats.
- (line 141)
+ (line 145)
* online Metafont display, spurious: Unable to generate fonts.
(line 36)
* OPENTYPEFONTS: Supported file formats.
- (line 145)
+ (line 149)
* optimization caveat: TeX or Metafont failing.
(line 12)
* options for debugging: Debugging. (line 6)
* OTPINPUTS: Supported file formats.
- (line 151)
+ (line 155)
* overview of path searching: Searching overview. (line 6)
* overview of programming with Kpathsea: Programming overview.
(line 6)
* OVFFONTS: Supported file formats.
- (line 154)
+ (line 158)
* OVPFONTS: Supported file formats.
- (line 157)
+ (line 161)
* path expansion: Path expansion. (line 6)
* path searching: Path searching. (line 6)
* path searching options: Path searching options.
@@ -3661,7 +3680,7 @@
* pdftex.cfg: Specially-recognized files.
(line 34)
* PDFTEXCONFIG: Supported file formats.
- (line 161)
+ (line 165)
* pdftexconfig.tex: Specially-recognized files.
(line 34)
* permission denied: Searching overview. (line 63)
@@ -3668,7 +3687,7 @@
* permissions, directory: Security. (line 51)
* permissions, file: Security. (line 47)
* PKFONTS: Supported file formats.
- (line 164)
+ (line 168)
* plain.base: Unable to generate fonts.
(line 46)
* privacy, semblance of: Logging. (line 32)
@@ -3685,7 +3704,7 @@
* proof mode: Unable to generate fonts.
(line 36)
* PSHEADERS: Supported file formats.
- (line 169)
+ (line 173)
* pxp Pascal preprocessor: History. (line 12)
* quoting variable values: Variable expansion. (line 17)
* rationale for casefolding fallback: Casefolding rationale.
@@ -3705,7 +3724,7 @@
* retrieving TeX: unixtex.ftp. (line 6)
* right-hand side of variable assignments: Config files. (line 57)
* RISINPUTS: Supported file formats.
- (line 173)
+ (line 177)
* Rokicki, Tom: History. (line 12)
* root user: Tilde expansion. (line 19)
* runtime configuration files: Config files. (line 6)
@@ -3726,16 +3745,16 @@
* sending patches: Bug checklist. (line 52)
* setgid scripts: Security. (line 40)
* SFDFONTS: Supported file formats.
- (line 177)
+ (line 181)
* shell variables: Variable expansion. (line 17)
* shell_escape, example for code: Programming with config files.
(line 10)
-* site overrides for 'mktex...': mktex configuration. (line 29)
+* site overrides for mktex...: mktex configuration. (line 29)
* skeleton TeX directory: TeX directory structure.
(line 6)
* slow startup time: Slow path searching. (line 6)
* source files: Supported file formats.
- (line 188)
+ (line 192)
* sources for search paths: Path sources. (line 6)
* special: Suppressing warnings.
(line 30)
@@ -3765,7 +3784,7 @@
(line 6)
* symbolic links not found: Unable to find files.
(line 21)
-* symbolic links, and 'ls-R': ls-R. (line 44)
+* symbolic links, and ls-R: ls-R. (line 44)
* symlinks, resolving: Calling sequence. (line 31)
* system C compiler bugs: TeX or Metafont failing.
(line 16)
@@ -3772,11 +3791,11 @@
* system-dependent casefolding behavior: Casefolding rationale.
(line 6)
* T1FONTS: Supported file formats.
- (line 211)
+ (line 215)
* T1INPUTS: Supported file formats.
- (line 211)
+ (line 215)
* T42FONTS: Supported file formats.
- (line 216)
+ (line 220)
* tcfmgr.map: Specially-recognized files.
(line 46)
* TDS: TeX directory structure.
@@ -3790,8 +3809,8 @@
* TeX file lookup: File lookup. (line 6)
* TeX glyph lookup: Glyph lookup. (line 6)
* TeX support: TeX support. (line 6)
-* TeX Users Group: Introduction. (line 43)
-* tex-file.c: File lookup. (line 38)
+* TeX Users Group: Introduction. (line 42)
+* tex-file.c: File lookup. (line 37)
* tex-file.h: Programming overview.
(line 26)
* tex-glyph.c: Glyph lookup. (line 26)
@@ -3803,21 +3822,21 @@
* TEXBIB: Supported file formats.
(line 30)
* TEXBIB <1>: Supported file formats.
- (line 121)
+ (line 125)
* TEXCONFIG: Supported file formats.
(line 57)
* TEXDOCS: Supported file formats.
- (line 185)
+ (line 189)
* TEXFONTMAPS: Supported file formats.
- (line 94)
+ (line 98)
* TEXFONTS: Supported file formats.
(line 75)
* TEXFONTS <1>: Supported file formats.
- (line 164)
+ (line 168)
* TEXFONTS <2>: Supported file formats.
- (line 199)
+ (line 203)
* TEXFONTS <3>: Supported file formats.
- (line 219)
+ (line 223)
* texfonts.map: Fontmap. (line 6)
* TEXFORMATS: Supported file formats.
(line 64)
@@ -3826,12 +3845,12 @@
* TEXINPUTS: Supported file formats.
(line 79)
* TEXINPUTS <1>: Supported file formats.
- (line 180)
+ (line 184)
* TEXMF: TeX directory structure.
(line 6)
* texmf.cnf: Specially-recognized files.
(line 38)
-* 'texmf.cnf' missing, warning about: Config files. (line 18)
+* texmf.cnf missing, warning about: Config files. (line 18)
* texmf.cnf, and variable expansion: Variable expansion. (line 6)
* texmf.cnf, definition for: Config files. (line 6)
* texmf.cnf, source for path: Path sources. (line 20)
@@ -3846,11 +3865,11 @@
* TEXMFINI <1>: Supported file formats.
(line 64)
* TEXMFINI <2>: Supported file formats.
- (line 97)
+ (line 101)
* TEXMFLOG: Logging. (line 10)
* TEXMFOUTPUT: mktex script names. (line 40)
* TEXMFSCRIPTS: Supported file formats.
- (line 191)
+ (line 195)
* texmfvar: mktex configuration. (line 122)
* TEXMFVAR: mktex configuration. (line 123)
* texmf_casefold_search: Casefolding search. (line 12)
@@ -3857,37 +3876,37 @@
* TEXPICTS: Supported file formats.
(line 79)
* TEXPKS: Supported file formats.
- (line 164)
+ (line 168)
* TEXPOOL: Supported file formats.
- (line 195)
+ (line 199)
* TEXPSHEADERS: Supported file formats.
- (line 169)
+ (line 173)
* TEXPSHEADERS <1>: Supported file formats.
- (line 211)
+ (line 215)
* TEXSIZES: Fallback font. (line 6)
* TEXSOURCES: Supported file formats.
- (line 188)
+ (line 192)
* TEX_HUSH: Searching overview. (line 63)
* TEX_HUSH <1>: Suppressing warnings.
(line 6)
* TFMFONTS: Supported file formats.
- (line 199)
+ (line 203)
* tilde expansion: Tilde expansion. (line 6)
* tilde.c: Tilde expansion. (line 25)
* time system call: Logging. (line 15)
* tolerance for glyph lookup: Basic glyph lookup. (line 15)
-* trailing '/' in home directory: Tilde expansion. (line 19)
+* trailing / in home directory: Tilde expansion. (line 19)
* trailing colons: Default expansion. (line 6)
* translations, of path searching description: Path searching.
(line 10)
* TRFONTS: Supported file formats.
- (line 203)
+ (line 207)
* trick for detecting leaf directories: Subdirectory expansion.
(line 22)
* trojan horse attack: Security. (line 10)
* try_std_extension_first: File lookup. (line 24)
* TTFONTS: Supported file formats.
- (line 207)
+ (line 211)
* tug.org: unixtex.ftp. (line 6)
* typeface directory, omitting: mktex configuration. (line 105)
* typeface directory, omitting <1>: mktex configuration. (line 108)
@@ -3902,7 +3921,7 @@
* unreadable file warnings: Suppressing warnings.
(line 27)
* unreadable files: Searching overview. (line 63)
-* unusable 'ls-R' warning: ls-R. (line 51)
+* unusable ls-R warning: ls-R. (line 51)
* usage patterns, finding: Logging. (line 6)
* USERPROFILE, as ~ expansion: Tilde expansion. (line 6)
* USE_TEXMFVAR: mktex configuration. (line 128)
@@ -3917,19 +3936,19 @@
* version numbers, determining: Bug checklist. (line 15)
* VF files, not found: Searching overview. (line 31)
* VFFONTS: Supported file formats.
- (line 219)
+ (line 223)
* Vojta, Paul: History. (line 30)
* Walsh, Norman: History. (line 56)
-* warning about unusable 'ls-R': ls-R. (line 51)
-* warning, about missing 'texmf.cnf': Config files. (line 18)
+* warning about unusable ls-R: ls-R. (line 51)
+* warning, about missing texmf.cnf: Config files. (line 18)
* warnings, file access: Searching overview. (line 63)
* warnings, suppressing: Suppressing warnings.
(line 6)
* WEB2C: Supported file formats.
- (line 227)
+ (line 231)
* Weber, Olaf: History. (line 73)
* WEBINPUTS: Supported file formats.
- (line 223)
+ (line 227)
* whitespace, in fontmap files: Fontmap. (line 31)
* whitespace, not ignored on continuation lines: Config files.
(line 37)
@@ -3939,7 +3958,7 @@
* XDvi: Specially-recognized files.
(line 41)
* XDVIFONTS: Supported file formats.
- (line 254)
+ (line 258)
* XDVIMAKEPK: mktex script names. (line 32)
* XDVISIZES: Fallback font. (line 6)
* zuhn, david: History. (line 50)
@@ -3947,62 +3966,67 @@
Tag Table:
-Node: Top1480
-Node: Introduction2262
-Node: History4331
-Node: unixtex.ftp8927
-Node: Security10397
-Node: TeX directory structure12901
-Node: Path searching16940
-Node: Searching overview17898
-Node: Path sources21717
-Node: Config files22943
-Node: Path expansion27815
-Node: Default expansion28768
-Node: Variable expansion30838
-Node: Tilde expansion32239
-Node: Brace expansion33219
-Node: KPSE_DOT expansion34158
-Node: Subdirectory expansion34671
-Node: Casefolding search37019
-Node: Casefolding rationale37788
-Node: Casefolding examples39134
-Node: Filename database44180
-Node: ls-R45162
-Node: Filename aliases48838
-Node: Database format50016
-Node: Invoking kpsewhich51029
-Node: Path searching options51984
-Node: Specially-recognized files61582
-Node: Auxiliary tasks62937
-Node: Standard options66662
-Node: TeX support67018
-Node: Supported file formats68372
-Node: File lookup76040
-Node: Glyph lookup77789
-Node: Basic glyph lookup78913
-Node: Fontmap79793
-Node: Fallback font82303
-Node: Suppressing warnings83215
-Node: mktex scripts84342
-Node: mktex configuration85557
-Node: mktex script names91360
-Node: mktex script arguments92746
-Node: Programming93625
-Node: Programming overview94198
-Node: Calling sequence97059
-Node: Program-specific files103588
-Node: Programming with config files104611
-Node: Reporting bugs106198
-Node: Bug checklist106876
-Node: Mailing lists110345
-Node: Debugging111022
-Node: Logging116099
-Node: Common problems117966
-Node: Unable to find files118443
-Node: Slow path searching120853
-Node: Unable to generate fonts122228
-Node: TeX or Metafont failing124700
-Node: Index125902
+Node: Top1483
+Node: Introduction2266
+Node: History4362
+Node: unixtex.ftp9012
+Node: Security10496
+Node: TeX directory structure13068
+Node: Path searching17243
+Node: Searching overview18201
+Node: Path sources22126
+Node: Config files23400
+Node: Path expansion28458
+Node: Default expansion29429
+Node: Variable expansion31565
+Node: Tilde expansion33036
+Node: Brace expansion34086
+Node: KPSE_DOT expansion35083
+Node: Subdirectory expansion35608
+Node: Casefolding search38063
+Node: Casefolding rationale38840
+Node: Casefolding examples40201
+Node: Filename database45430
+Node: ls-R46444
+Node: Filename aliases50321
+Node: Database format51567
+Node: Invoking kpsewhich52628
+Node: Path searching options53611
+Node: Specially-recognized files63552
+Node: Auxiliary tasks65017
+Node: Standard options68902
+Node: TeX support69270
+Node: Supported file formats70629
+Node: File lookup79384
+Node: Glyph lookup81197
+Node: Basic glyph lookup82345
+Node: Fontmap83257
+Node: Fallback font85871
+Node: Suppressing warnings86807
+Node: mktex scripts87972
+Node: mktex configuration89217
+Node: mktex script names95326
+Node: mktex script arguments96813
+Node: Programming97736
+Node: Programming overview98309
+Node: Calling sequence101228
+Node: Program-specific files108028
+Node: Programming with config files109083
+Node: Reporting bugs110732
+Node: Bug checklist111410
+Node: Mailing lists114978
+Node: Debugging115655
+Node: Logging120925
+Node: Common problems122838
+Node: Unable to find files123317
+Node: Slow path searching125785
+Node: Unable to generate fonts127186
+Node: TeX or Metafont failing129728
+Node: Index130938
End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
Modified: branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/kpathsea/doc/kpathsea.texi 2023-01-20 16:39:45 UTC (rev 889)
@@ -3,7 +3,7 @@
@settitle Kpathsea: A library for path searching
@set version 6.3.4
- at set month-year January 2022
+ at set month-year December 2022
@copying
This file documents the Kpathsea library for path searching.
@@ -1619,7 +1619,7 @@
enc files: .enc
cmap files (cmap):
subfont definition files: .sfd
-opentype fonts: .otf
+opentype fonts: .otf .OTF
pdftex config (pdftexconfig):
lig files: .lig
texmfscripts:
@@ -2151,6 +2151,20 @@
(Filename databases, @pxref{Filename database})
@code{TEXMFDBS}.
+ at item lua
+ at flindex .lua
+ at flindex .luatex
+ at flindex .luc
+ at flindex .luctex
+ at flindex .texlua
+ at flindex .texluc
+ at flindex .tlu
+ at vindex LUAINPUTS
+(Lua scripts, @url{https://ctan.org/pkg/luatex})
+ at code{LUAINPUTS}
+suffixes @samp{.lua}, @samp{.luatex}, @samp{.luc}, @samp{.luctex},
+ at samp{.texlua}, @samp{.texluc}, @samp{.tlu}.
+
@item map
@flindex .map
@vindex TEXFONTMAPS
Modified: branches/stable/source/src/texk/kpathsea/win32/mktexfmt.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/mktexfmt.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/kpathsea/win32/mktexfmt.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,6 +1,6 @@
/* mktexfmt.c
- Copyright 2000, 2017 Akira Kakuto.
+ Copyright 2000, 2022 Akira Kakuto.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
*/
#include <kpathsea/kpathsea.h>
-#define VERSION "0.2"
+#define VERSION "0.3"
int main(int ac, char **av)
{
@@ -50,12 +50,14 @@
p = kpse_program_name;
if(ac != 2) {
fprintf(stderr,"%s : Usage %s formatname\n", p, p);
- fprintf(stderr,"formatname : (foo.fmt, foo.base, foo.mem)\n");
+ fprintf(stderr,"formatname : foo.fmt, foo.base\n");
+ fprintf(stderr," extension can be omitted\n");
return 1;
}
if(!strncmp(av[1], "-h", 2) || !strncmp(av[1], "--h", 3)) {
fprintf(stderr,"%s : Usage %s formatname\n", p, p);
- fprintf(stderr,"formatname : (foo.fmt, foo.base, foo.mem)\n");
+ fprintf(stderr,"formatname : foo.fmt, foo.base\n");
+ fprintf(stderr," extension can be omitted\n");
return 0;
}
if(!strncmp(av[1], "-v", 2) || !strncmp(av[1], "--v", 3)) {
@@ -83,17 +85,15 @@
strcpy(orgname, av[1]);
p = strrchr(av[1], '.');
- if(!p) {
- fprintf(stderr, "formatname needs a suffix.\n");
- return 1;
- }
- if(stricmp(p, ".fmt") && stricmp(p, ".base") && stricmp(p, ".mem")) {
- fprintf(stderr, "%s : unknown format type.\n", av[1]);
- return 1;
- }
+ if (p) {
+ if(stricmp(p, ".fmt") && stricmp(p, ".base") && stricmp(p, ".mem")) {
+ fprintf(stderr, "%s : unknown format type.\n", av[1]);
+ return 1;
+ }
*p = '\0';
+ }
/* save stdout and stdin */
savo = _dup(fileno(stdout));
@@ -131,10 +131,5 @@
/* close nul device */
fclose(fnul);
- fmtname = kpse_find_file(orgname , kpse_fmt_format, 0);
- if(fmtname) {
- printf("%s\n", fmtname);
- free(fmtname);
- }
return 0;
}
Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2023-01-20 16:39:45 UTC (rev 889)
@@ -7,7 +7,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 63645 $';
+my $svnrev = '$Revision: 64503 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -145,10 +145,11 @@
@::ddebug_hook = @::ddebug_hook;
@::dddebug_hook = @::dddebug_hook;
@::info_hook = @::info_hook;
+ @::install_packages_hook = @::install_packages_hook;
+ @::installation_failed_packages = @::installation_failed_packages;
@::warn_hook = @::warn_hook;
$::checksum_method = $::checksum_method;
$::gui_mode = $::gui_mode;
- @::install_packages_hook = @::install_packages_hook;
$::machinereadable = $::machinereadable;
$::no_execute_actions = $::no_execute_actions;
$::regenerate_all_formats = $::regenerate_all_formats;
@@ -3711,8 +3712,8 @@
=cut
sub debug {
+ return if ($::opt_verbosity < 1);
my $str = "D:" . join("", @_);
- return if ($::opt_verbosity < 1);
logit(\*STDERR, 1, $str);
for my $i (@::debug_hook) {
&{$i}($str);
@@ -3732,8 +3733,8 @@
=cut
sub ddebug {
+ return if ($::opt_verbosity < 2);
my $str = "DD:" . join("", @_);
- return if ($::opt_verbosity < 2);
logit(\*STDERR, 2, $str);
for my $i (@::ddebug_hook) {
&{$i}($str);
@@ -3756,8 +3757,8 @@
=cut
sub dddebug {
+ return if ($::opt_verbosity < 3);
my $str = "DDD:" . join("", @_);
- return if ($::opt_verbosity < 3);
logit(\*STDERR, 3, $str);
for my $i (@::dddebug_hook) {
&{$i}($str);
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,20 @@
+2023-01-15 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * configure.ac, ac/web2c.ac (ptex, uptex):
+ Remove binaries of (u)pTeX (ptex, uptex). Now we use alias
+ of e-upTeX (eptex, euptex) for (u)pTeX (ptex, uptex).
+ https://github.com/texjporg/tex-jp-build/issues/32
+
+2023-01-08 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin: C++ has removed 'register' storage class.
+
+2022-12-28 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * tests/fn-generate.perl, tests/fn-{utf8,euc,sjis}.txt,
+ Makefile.in:
+ Tests for file names with wide characters & {pdf,Xe,p,up}TeX.
+
2022-09-28 Karl Berry <karl at freefriends.org>
* tex.ch (halting_on_error_p): new variable, set when we start to
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -95,41 +95,38 @@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \
mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
- pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
- $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
- euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
- pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \
+ uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \
+ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
- $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
- $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
- $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \
- $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \
- $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
- $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
- $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
+ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+ $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+ $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+ $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
+ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+ $(am__EXEEXT_29)
+noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
$(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \
- $(am__EXEEXT_33)
-noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
- $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
- $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) \
- $(am__EXEEXT_43) $(am__EXEEXT_44)
-TESTS = tangle.test $(am__EXEEXT_47) ctiedir/ctie.test \
+ $(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \
+ $(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38) \
+ $(am__EXEEXT_39) $(am__EXEEXT_40)
+TESTS = tangle.test $(am__EXEEXT_43) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_16) $(am__append_25) $(am__append_34) \
$(am__append_42) $(am__append_55) $(am__append_56) \
- $(am__append_58) $(am__append_63) $(am__append_66) \
- $(am__append_68) $(am__append_73) $(am__append_76) \
- $(am__append_78) $(am__append_83) $(am__append_86) \
- $(am__append_107) $(am__append_108) $(am__append_109) \
- $(am__append_110) $(am__append_118) $(am__append_120) \
- $(am__append_122) $(am__append_157) libmd5/md5.test
+ $(am__append_58) $(am__append_63) $(am__append_67) \
+ $(am__append_70) $(am__append_75) $(am__append_78) \
+ $(am__append_99) $(am__append_100) $(am__append_101) \
+ $(am__append_102) $(am__append_110) $(am__append_112) \
+ $(am__append_114) $(am__append_141) libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@TEX_TRUE at am__append_3 = tex
@@ -194,68 +191,70 @@
@ETEX_TRUE at am__append_58 = $(etex_tests)
@ETEX_TRUE at am__append_59 = etrip.diffs
@ETEX_TRUE at am__append_60 = etrip-clean
- at PTEX_TRUE@am__append_61 = ptex
- at PWEB_TRUE@am__append_62 = $(pweb_programs)
- at PTEX_TRUE@am__append_63 = $(ptex_tests)
- at PTEX_TRUE@am__append_64 = ptrip.diffs
- at PTEX_TRUE@am__append_65 = ptrip-clean
- at PWEB_TRUE@am__append_66 = $(pweb_tests)
- at EPTEX_TRUE@am__append_67 = eptex
- at EPTEX_TRUE@am__append_68 = $(eptex_tests)
- at EPTEX_TRUE@am__append_69 = eptrip.diffs
- at EPTEX_TRUE@am__append_70 = eptrip-clean
- at UPTEX_TRUE@am__append_71 = uptex
- at UPWEB_TRUE@am__append_72 = $(upweb_programs)
- at UPTEX_TRUE@am__append_73 = $(uptex_tests)
- at UPTEX_TRUE@am__append_74 = uptrip.diffs
- at UPTEX_TRUE@am__append_75 = uptrip-clean
- at UPWEB_TRUE@am__append_76 = $(upweb_tests)
- at EUPTEX_TRUE@am__append_77 = euptex
- at EUPTEX_TRUE@am__append_78 = $(euptex_tests)
- at EUPTEX_TRUE@am__append_79 = euptrip.diffs
- at EUPTEX_TRUE@am__append_80 = euptrip-clean
- at HITEX_TRUE@am__append_81 = hitex hishrink histretch
- at HITEX_TRUE@am__append_82 = himktables
- at HITEX_TRUE@am__append_83 = $(hitex_tests)
- at MINGW32_TRUE@am__append_84 = \
+ at EPTEX_TRUE@am__append_61 = eptex
+ at EPTEX_TRUE@am__append_62 = eptex$(EXEEXT):ptex
+ at EPTEX_TRUE@am__append_63 = $(eptex_tests)
+ at EPTEX_TRUE@am__append_64 = eptrip.diffs
+ at EPTEX_TRUE@am__append_65 = eptrip-clean
+
+#if UPTEX
+#bin_PROGRAMS += uptex
+#endif UPTEX
+ at UPWEB_TRUE@am__append_66 = $(upweb_programs)
+
+#if UPTEX
+#TESTS += $(uptex_tests)
+#TRIPTRAP += uptrip.diffs
+#TRIPTRAP_CLEAN += uptrip-clean
+#endif UPTEX
+ at UPWEB_TRUE@am__append_67 = $(upweb_tests)
+ at EUPTEX_TRUE@am__append_68 = euptex
+ at EUPTEX_TRUE@am__append_69 = euptex$(EXEEXT):uptex
+ at EUPTEX_TRUE@am__append_70 = $(euptex_tests)
+ at EUPTEX_TRUE@am__append_71 = euptrip.diffs
+ at EUPTEX_TRUE@am__append_72 = euptrip-clean
+ at HITEX_TRUE@am__append_73 = hitex hishrink histretch
+ at HITEX_TRUE@am__append_74 = himktables
+ at HITEX_TRUE@am__append_75 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_76 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_77 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_78 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_87 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_90 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_92 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_95 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_79 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_80 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_81 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_82 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_83 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_84 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_85 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_86 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_87 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_96 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_97 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_100 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_101 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_102 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_105 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_88 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_89 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_90 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_91 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_92 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_93 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_94 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_95 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_96 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_97 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_106 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_107 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_108 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_109 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_110 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_111 = xetex
- at XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_113 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_116 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_98 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_99 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_100 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_101 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_102 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_103 = xetex
+ at XETEX_MACOSX_TRUE@am__append_104 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_105 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_106 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_107 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_108 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -262,106 +261,84 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_117 = \
+ at XETEX_MACOSX_FALSE@am__append_109 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_118 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_119 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_121 = aleph
- at ALEPH_TRUE@am__append_122 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_123 = synctex
- at SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_128 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_110 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_111 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_112 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_113 = aleph
+ at ALEPH_TRUE@am__append_114 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_115 = synctex
+ at SYNCTEX_TRUE@am__append_116 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_117 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_118 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_119 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_120 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_132 = \
+ at TEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_124 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
- at ETEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_136 = \
+ at ETEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_128 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
- at PTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
- at PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
- at PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_140 = \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-
- at UPTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
- at UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
- at UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_144 = \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
-
- at EPTEX_SYNCTEX_TRUE@am__append_145 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_148 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_132 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_151 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_152 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_136 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
- at PDFTEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_154 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_138 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
- at XETEX_SYNCTEX_TRUE@am__append_155 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_156 = \
+ at XETEX_SYNCTEX_TRUE@am__append_140 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
- at SYNCTEX_TRUE@am__append_157 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_141 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -425,60 +402,55 @@
patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT) twill$(EXEEXT)
-am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
- ptftopl$(EXEEXT)
-am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
+am__EXEEXT_2 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
uptftopl$(EXEEXT)
-am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
+am__EXEEXT_3 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
wovp2ovf$(EXEEXT)
- at WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
- at TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
- at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_7 = initex$(EXEEXT)
- at MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
- at MFN_TRUE@@MF_TRUE at am__EXEEXT_9 = mf-nowin$(EXEEXT)
- at MFLUA_TRUE@am__EXEEXT_10 = mflua$(EXEEXT)
- at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_11 = mflua-nowin$(EXEEXT)
- at MFLUAJIT_TRUE@am__EXEEXT_12 = mfluajit$(EXEEXT)
- at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_13 = \
+ at WEB_TRUE@am__EXEEXT_4 = $(am__EXEEXT_1)
+ at TEX_TRUE@am__EXEEXT_5 = tex$(EXEEXT)
+ at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_6 = initex$(EXEEXT)
+ at MF_TRUE@am__EXEEXT_7 = mf$(EXEEXT)
+ at MFN_TRUE@@MF_TRUE at am__EXEEXT_8 = mf-nowin$(EXEEXT)
+ at MFLUA_TRUE@am__EXEEXT_9 = mflua$(EXEEXT)
+ at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_10 = mflua-nowin$(EXEEXT)
+ at MFLUAJIT_TRUE@am__EXEEXT_11 = mfluajit$(EXEEXT)
+ at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_12 = \
@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@ mfluajit-nowin$(EXEEXT)
- at MP_TRUE@am__EXEEXT_14 = mpost$(EXEEXT)
- at PMP_TRUE@am__EXEEXT_15 = pmpost$(EXEEXT)
- at UPMP_TRUE@am__EXEEXT_16 = upmpost$(EXEEXT)
- at ETEX_TRUE@am__EXEEXT_17 = etex$(EXEEXT)
- at PTEX_TRUE@am__EXEEXT_18 = ptex$(EXEEXT)
- at PWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2)
- at EPTEX_TRUE@am__EXEEXT_20 = eptex$(EXEEXT)
- at UPTEX_TRUE@am__EXEEXT_21 = uptex$(EXEEXT)
- at UPWEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_3)
- at EUPTEX_TRUE@am__EXEEXT_23 = euptex$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_24 = hitex$(EXEEXT) hishrink$(EXEEXT) \
+ at MP_TRUE@am__EXEEXT_13 = mpost$(EXEEXT)
+ at PMP_TRUE@am__EXEEXT_14 = pmpost$(EXEEXT)
+ at UPMP_TRUE@am__EXEEXT_15 = upmpost$(EXEEXT)
+ at ETEX_TRUE@am__EXEEXT_16 = etex$(EXEEXT)
+ at EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
+ at UPWEB_TRUE@am__EXEEXT_18 = $(am__EXEEXT_2)
+ at EUPTEX_TRUE@am__EXEEXT_19 = euptex$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_20 = hitex$(EXEEXT) hishrink$(EXEEXT) \
@HITEX_TRUE@ histretch$(EXEEXT)
- at PDFTEX_TRUE@am__EXEEXT_25 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ at PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
- at LUATEX_TRUE@am__EXEEXT_26 = luatex$(EXEEXT)
- at LUAHBTEX_TRUE@am__EXEEXT_27 = luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@am__EXEEXT_28 = luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@am__EXEEXT_29 = luajithbtex$(EXEEXT)
- at XETEX_TRUE@am__EXEEXT_30 = xetex$(EXEEXT)
- at OTANGLE_TRUE@am__EXEEXT_31 = $(am__EXEEXT_4)
- at ALEPH_TRUE@am__EXEEXT_32 = aleph$(EXEEXT)
- at SYNCTEX_TRUE@am__EXEEXT_33 = synctex$(EXEEXT)
+ at LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@am__EXEEXT_23 = luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@am__EXEEXT_24 = luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@am__EXEEXT_25 = luajithbtex$(EXEEXT)
+ at XETEX_TRUE@am__EXEEXT_26 = xetex$(EXEEXT)
+ at OTANGLE_TRUE@am__EXEEXT_27 = $(am__EXEEXT_3)
+ at ALEPH_TRUE@am__EXEEXT_28 = aleph$(EXEEXT)
+ at SYNCTEX_TRUE@am__EXEEXT_29 = synctex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(syncincludedir)"
- at MF_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mf$(EXEEXT)
- at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mflua$(EXEEXT)
- at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_mfluajit$(EXEEXT)
- at MP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_mpost$(EXEEXT)
- at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_pmpost$(EXEEXT)
- at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_upmpost$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_40 = himktables$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_44 = \
+ at MF_TRUE@@WIN32_TRUE at am__EXEEXT_30 = call_mf$(EXEEXT)
+ at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_31 = call_mflua$(EXEEXT)
+ at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mfluajit$(EXEEXT)
+ at MP_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mpost$(EXEEXT)
+ at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_pmpost$(EXEEXT)
+ at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_upmpost$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_36 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = \
@LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -1524,11 +1496,6 @@
patgen_OBJECTS = $(nodist_patgen_OBJECTS)
patgen_LDADD = $(LDADD)
patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am_pbibtex_OBJECTS =
-nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
-pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
-am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \
pdftexdir/etex_version.h synctexdir/synctex.c \
@@ -1541,7 +1508,7 @@
am__objects_46 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
nodist_pdftex_OBJECTS = $(am__objects_46) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a
pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \
@@ -1551,9 +1518,6 @@
pdftosrc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftosrc_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_pdvitype_OBJECTS =
-nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
-pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -1590,28 +1554,12 @@
pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am_ppltotf_OBJECTS =
-nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
-ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
-am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h synctexdir/synctex.c \
- synctexdir/synctex.h synctexdir/synctex-common.h \
- synctexdir/synctex-ptex.h
- at PTEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_57)
-am__objects_58 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_58) ptex-ptex-pool.$(OBJEXT)
-ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
- at PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
-am_ptftopl_OBJECTS =
-nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
-ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
-am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- at MINGW32_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
-synctex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_14)
+am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at MINGW32_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+synctex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_12)
nodist_tangle_OBJECTS = tangle.$(OBJEXT)
tangle_OBJECTS = $(nodist_tangle_OBJECTS)
tangle_LDADD = $(LDADD)
@@ -1622,14 +1570,14 @@
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_59 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_59)
-am__objects_60 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_60) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_57)
+am__objects_58 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_58) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
- at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+ at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_15)
+ $(am__DEPENDENCIES_13)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -1648,48 +1596,40 @@
am_upbibtex_OBJECTS =
nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_16 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_updvitype_OBJECTS =
nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
$(nodist_updvitype_OBJECTS)
-am__objects_61 = upmpost-pmp.$(OBJEXT)
-am__objects_62 = upmpost-pmpmath.$(OBJEXT)
-am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_66 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_67 = upmpost-pmpxout.$(OBJEXT)
-am__objects_68 = upmpost-ppngout.$(OBJEXT)
-am__objects_69 = upmpost-ppsout.$(OBJEXT)
-am__objects_70 = upmpost-psvgout.$(OBJEXT)
-am__objects_71 = $(am__objects_61) $(am__objects_62) $(am__objects_63) \
- $(am__objects_64) $(am__objects_65) upmpost-pmpost.$(OBJEXT) \
- $(am__objects_66) $(am__objects_67) $(am__objects_68) \
- $(am__objects_69) $(am__objects_70) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_71)
+am__objects_59 = upmpost-pmp.$(OBJEXT)
+am__objects_60 = upmpost-pmpmath.$(OBJEXT)
+am__objects_61 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_62 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_63 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_64 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_65 = upmpost-pmpxout.$(OBJEXT)
+am__objects_66 = upmpost-ppngout.$(OBJEXT)
+am__objects_67 = upmpost-ppsout.$(OBJEXT)
+am__objects_68 = upmpost-psvgout.$(OBJEXT)
+am__objects_69 = $(am__objects_59) $(am__objects_60) $(am__objects_61) \
+ $(am__objects_62) $(am__objects_63) upmpost-pmpost.$(OBJEXT) \
+ $(am__objects_64) $(am__objects_65) $(am__objects_66) \
+ $(am__objects_67) $(am__objects_68) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_69)
upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_17)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_15)
am_uppltotf_OBJECTS =
nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
-am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \
- uptexdir/uptexextra.h uptexdir/uptex_version.h \
- synctexdir/synctex.c synctexdir/synctex.h \
- synctexdir/synctex-common.h synctexdir/synctex-uptex.h
- at UPTEX_SYNCTEX_TRUE@am__objects_72 = \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/uptex-synctex.$(OBJEXT)
-dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
- $(am__objects_72)
-am__objects_73 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_73) uptex-uptex-pool.$(OBJEXT)
+dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT)
+am__objects_70 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_70) uptex-uptex-pool.$(OBJEXT)
uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
- at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
am_uptftopl_OBJECTS =
nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
@@ -1726,20 +1666,20 @@
xetexdir/xetex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_74 = \
+ at XETEX_SYNCTEX_TRUE@am__objects_71 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
- $(am__objects_74)
-am__objects_75 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_75) xetex-xetex-pool.$(OBJEXT)
+ $(am__objects_71)
+am__objects_72 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_72) xetex-xetex-pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
- at XETEX_MACOSX_FALSE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_20 = $(libxetex) $(am__DEPENDENCIES_1) \
+ at XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_19)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_20) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_16)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -1822,13 +1762,11 @@
./$(DEPDIR)/ofm2opl.Po ./$(DEPDIR)/opl2ofm.Po \
./$(DEPDIR)/otangle.Po ./$(DEPDIR)/ovf2ovp.Po \
./$(DEPDIR)/ovp2ovf.Po ./$(DEPDIR)/patgen.Po \
- ./$(DEPDIR)/pbibtex-pbibtex.Po ./$(DEPDIR)/pdftex-dummy.Po \
- ./$(DEPDIR)/pdftex-pdftex-pool.Po \
+ ./$(DEPDIR)/pdftex-dummy.Po ./$(DEPDIR)/pdftex-pdftex-pool.Po \
./$(DEPDIR)/pdftex-pdftex0.Po ./$(DEPDIR)/pdftex-pdftexini.Po \
- ./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pdvitype-pdvitype.Po \
- ./$(DEPDIR)/pktogf.Po ./$(DEPDIR)/pktype.Po \
- ./$(DEPDIR)/pltotf.Po ./$(DEPDIR)/pmpost-pmp.Po \
- ./$(DEPDIR)/pmpost-pmpmath.Po \
+ ./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pktogf.Po \
+ ./$(DEPDIR)/pktype.Po ./$(DEPDIR)/pltotf.Po \
+ ./$(DEPDIR)/pmpost-pmp.Po ./$(DEPDIR)/pmpost-pmpmath.Po \
./$(DEPDIR)/pmpost-pmpmathbinary.Po \
./$(DEPDIR)/pmpost-pmpmathdecimal.Po \
./$(DEPDIR)/pmpost-pmpmathdouble.Po \
@@ -1836,14 +1774,11 @@
./$(DEPDIR)/pmpost-pmpxout.Po ./$(DEPDIR)/pmpost-ppngout.Po \
./$(DEPDIR)/pmpost-ppsout.Po ./$(DEPDIR)/pmpost-psvgout.Po \
./$(DEPDIR)/pmpost-ptfmin.Po ./$(DEPDIR)/pooltype.Po \
- ./$(DEPDIR)/ppltotf-ppltotf.Po ./$(DEPDIR)/ptex-ptex-pool.Po \
- ./$(DEPDIR)/ptex-ptex0.Po ./$(DEPDIR)/ptex-ptexini.Po \
- ./$(DEPDIR)/ptftopl-ptftopl.Po ./$(DEPDIR)/tangle.Po \
- ./$(DEPDIR)/tangleboot.Po ./$(DEPDIR)/tex-tex-pool.Po \
- ./$(DEPDIR)/tex-tex0.Po ./$(DEPDIR)/tex-texextra.Po \
- ./$(DEPDIR)/tex-texini.Po ./$(DEPDIR)/tftopl.Po \
- ./$(DEPDIR)/tie-tie.Po ./$(DEPDIR)/twill.Po \
- ./$(DEPDIR)/upbibtex-upbibtex.Po \
+ ./$(DEPDIR)/tangle.Po ./$(DEPDIR)/tangleboot.Po \
+ ./$(DEPDIR)/tex-tex-pool.Po ./$(DEPDIR)/tex-tex0.Po \
+ ./$(DEPDIR)/tex-texextra.Po ./$(DEPDIR)/tex-texini.Po \
+ ./$(DEPDIR)/tftopl.Po ./$(DEPDIR)/tie-tie.Po \
+ ./$(DEPDIR)/twill.Po ./$(DEPDIR)/upbibtex-upbibtex.Po \
./$(DEPDIR)/updvitype-updvitype.Po ./$(DEPDIR)/upmpost-pmp.Po \
./$(DEPDIR)/upmpost-pmpmath.Po \
./$(DEPDIR)/upmpost-pmpmathbinary.Po \
@@ -2404,7 +2339,6 @@
pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po \
ptexdir/$(DEPDIR)/libkanji_a-kanji.Po \
ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po \
- ptexdir/$(DEPDIR)/ptex-ptexextra.Po \
synctexdir/$(DEPDIR)/eptex-synctex.Po \
synctexdir/$(DEPDIR)/etex-synctex.Po \
synctexdir/$(DEPDIR)/euptex-synctex.Po \
@@ -2415,10 +2349,8 @@
synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo \
synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo \
synctexdir/$(DEPDIR)/pdftex-synctex.Po \
- synctexdir/$(DEPDIR)/ptex-synctex.Po \
synctexdir/$(DEPDIR)/synctex-synctex_main.Po \
synctexdir/$(DEPDIR)/tex-synctex.Po \
- synctexdir/$(DEPDIR)/uptex-synctex.Po \
synctexdir/$(DEPDIR)/xetex-synctex.Po \
uptexdir/$(DEPDIR)/libukanji_a-kanji.Po \
uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po \
@@ -2551,31 +2483,27 @@
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
$(nodist_otangle_SOURCES) $(nodist_patgen_SOURCES) \
- $(pbibtex_SOURCES) $(nodist_pbibtex_SOURCES) \
$(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
$(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
- $(nodist_EXTRA_pdftosrc_SOURCES) $(pdvitype_SOURCES) \
- $(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \
+ $(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
$(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \
- $(ppltotf_SOURCES) $(nodist_ppltotf_SOURCES) \
- $(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \
- $(nodist_ptftopl_SOURCES) $(synctex_SOURCES) \
- $(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
- $(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
- $(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
- $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(nodist_twill_SOURCES) $(upbibtex_SOURCES) \
- $(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \
- $(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \
- $(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \
- $(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \
- $(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \
- $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
- $(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \
- $(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \
- $(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \
- $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
+ $(synctex_SOURCES) $(nodist_tangle_SOURCES) \
+ $(nodist_tangleboot_SOURCES) $(dist_tex_SOURCES) \
+ $(nodist_tex_SOURCES) $(nodist_tftopl_SOURCES) \
+ $(nodist_tie_SOURCES) $(ttf2afm_SOURCES) \
+ $(EXTRA_ttf2afm_SOURCES) $(nodist_twill_SOURCES) \
+ $(upbibtex_SOURCES) $(nodist_upbibtex_SOURCES) \
+ $(updvitype_SOURCES) $(nodist_updvitype_SOURCES) \
+ $(nodist_upmpost_SOURCES) $(uppltotf_SOURCES) \
+ $(nodist_uppltotf_SOURCES) $(dist_uptex_SOURCES) \
+ $(nodist_uptex_SOURCES) $(uptftopl_SOURCES) \
+ $(nodist_uptftopl_SOURCES) $(nodist_vftovp_SOURCES) \
+ $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
+ $(nodist_wofm2opl_SOURCES) $(nodist_wopl2ofm_SOURCES) \
+ $(nodist_wovf2ovp_SOURCES) $(nodist_wovp2ovf_SOURCES) \
+ $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
+ $(nodist_EXTRA_xetex_SOURCES)
DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(libluaharfbuzz_a_SOURCES) $(libluajitharfbuzz_a_SOURCES) \
$(dist_libluajittex_a_SOURCES) $(dist_libluatex_a_SOURCES) \
@@ -2591,13 +2519,11 @@
$(gftodvi_SOURCES) himktables.c $(md5main_SOURCES) \
$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
- $(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
- $(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
- $(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
+ $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
$(upbibtex_SOURCES) $(updvitype_SOURCES) $(uppltotf_SOURCES) \
- $(am__dist_uptex_SOURCES_DIST) $(uptftopl_SOURCES) \
+ $(dist_uptex_SOURCES) $(uptftopl_SOURCES) \
$(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -2804,14 +2730,14 @@
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_45 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_41 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test twill.test
-am__EXEEXT_46 = $(am__EXEEXT_45) tests/bibtex-openout-test.pl \
+am__EXEEXT_42 = $(am__EXEEXT_41) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_47 = $(am__EXEEXT_46)
+ at WEB_TRUE@am__EXEEXT_43 = $(am__EXEEXT_42)
TEST_SUITE_LOG = test-suite.log
am__test_logs1 = $(TESTS:=.log)
am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -3038,7 +2964,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_113)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_105)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3185,8 +3111,8 @@
libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_125)
-lib_LTLIBRARIES = $(am__append_124)
+lib_LIBRARIES = $(am__append_117)
+lib_LTLIBRARIES = $(am__append_116)
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
@@ -3203,14 +3129,16 @@
tests/bibtex-bigauth.aux tests/bibtex-bigauth.bib \
tests/bibtex-bigauth.tex tests/auxinclude.aux \
tests/auxinclude.bbl tests/auxinclude.bib tests/auxinclude.tex \
- tests/auxinclude2.aux tests/auxinclude2.tex tests/allbib.aux \
- tests/allbib.tex tests/apalike.bst tests/badpl.pl \
- tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \
- tests/badvpl.vpl tests/batch.tex tests/check.log \
- tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \
- tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \
- tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \
- tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \
+ tests/auxinclude2.aux tests/auxinclude2.tex \
+ tests/fn-generate.perl tests/fn-utf8.txt tests/fn-euc.txt \
+ tests/fn-sjis.txt tests/allbib.aux tests/allbib.tex \
+ tests/apalike.bst tests/badpl.pl tests/badtfm.tfm \
+ tests/badvf.tfm tests/badvf.vf tests/badvpl.vpl \
+ tests/batch.tex tests/check.log tests/cmr10.600gf \
+ tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \
+ tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \
+ tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \
+ tests/exampl.aux tests/exampl.tex tests/gray.tfm \
tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \
tests/label.mpx tests/logo8.tfm tests/longline.aux \
tests/longline.bib tests/longline.tex tests/longtfm.tex \
@@ -3269,23 +3197,27 @@
etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in $(ptex_web_srcs) $(ptex_ch_srcs) \
- ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
- ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
- ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
- ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
- $(ptex_tests) $(pweb_tests) ptexdir/tests/nissya_bib.aux \
- ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
- tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib \
- tests/enc-sjis.bib tests/enc-euc.bib tests/enc-utf8.bib \
- tests/enc-utf8a.bib tests/enc-utf8b.bib tests/enc-amb0.bib \
- tests/enc-amb1.bib tests/enc-amb2.bib tests/enc.aux \
- tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
+ ptexdir/ptex.defines ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
+ ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
+ ptexdir/README.txt ptexdir/tests/nissya.bst \
+ ptexdir/tests/sample.bib tests/testfield.bst tests/enc-asc.bib \
+ tests/enc-jis.bib tests/enc-sjis.bib tests/enc-euc.bib \
+ tests/enc-utf8.bib tests/enc-utf8a.bib tests/enc-utf8b.bib \
+ tests/enc-amb0.bib tests/enc-amb1.bib tests/enc-amb2.bib \
+ tests/enc.aux tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl \
tests/enc-up.bbl tests/memdata1.bst tests/memdata2.bst \
- tests/memdata3.bst ptexdir/tests/goth10.tfm \
+ tests/memdata3.bst ptexdir/tests/ptex3.tex \
+ ptexdir/tests/ptex3.dvi ptexdir/tests/ptex4.tex \
+ ptexdir/tests/ptex4.dvi ptexdir/tests/ptex3a-jis.typ \
+ ptexdir/tests/ptex3a-utf8.typ ptexdir/tests/ptex4a-jis.typ \
+ ptexdir/tests/ptex4a-utf8.typ ptexdir/tests/goth10.tfm \
ptexdir/tests/sample.dvi ptexdir/tests/samplea.typ \
ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
+ ptexdir/tests/chcode.pl ptexdir/tests/chcode-jis.pl \
+ ptexdir/tests/chcode.tfm ptexdir/tests/chcode-utf8.pl \
+ ptexdir/tests/chcode-euc.pl ptexdir/tests/chcode-sjis.pl \
ptexdir/tests/skipjfmp.pl ptexdir/tests/skipjfmp.tfm \
ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
$(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \
@@ -3295,13 +3227,15 @@
eptexdir/eptrip/texmf.cnf eptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
eptexdir/tests/pdfprimitive-eptex.log $(uptex_web_srcs) \
- $(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \
- uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \
- ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \
+ $(uptex_ch_srcs) uptexdir/uptex.defines uptexdir/upbibtex.ch \
+ uptexdir/updvitype.ch uptexdir/uppltotf.ch \
uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \
uptexdir/ChangeLog $(uptex_tests) $(upweb_tests) \
tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl \
- tests/enc-uu.bbl uptexdir/tests/umin10.pl \
+ tests/enc-uu.bbl uptexdir/tests/uptex3.tex \
+ uptexdir/tests/uptex3.dvi uptexdir/tests/uptex4.tex \
+ uptexdir/tests/uptex4.dvi uptexdir/tests/uptex3a.typ \
+ uptexdir/tests/uptex4a.typ uptexdir/tests/umin10.pl \
uptexdir/tests/umin10.tfm uptexdir/tests/utmin10.pl \
uptexdir/tests/utmin10.tfm uptexdir/tests/testnewu.pl \
uptexdir/tests/testnewu.tfm uptexdir/tests/uparse.pl \
@@ -3576,9 +3510,7 @@
synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \
synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
- synctexdir/synctex-e-rec.ch0 synctexdir/synctex-p-mem.ch0 \
- synctexdir/synctex-p-mem.ch1 synctexdir/synctex-p-rec.ch0 \
- synctexdir/synctex-p-rec.ch1 synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-ep-mem.ch0 \
synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-ep-rec.ch0 \
synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
$(synctex_tests) libmd5/md5.test
@@ -3619,38 +3551,40 @@
$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \
$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
- ptex.pool ptex-tangle $(pweb_programs:=.c) \
- $(pweb_programs:=.h) $(pweb_programs:=.p) \
- $(pweb_programs:=-web2c) $(pweb_programs:=.web) \
- ptests/nissya_bib.* ptests/xexampl.aux ptests/xexampl.bbl \
- ptests/xexampl.blg ptests/xenc*.* ptests/memtest.bib \
- ptests/memtest?.* ptests/xstory.dvityp ptests/xpagenum.typ \
- ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample.typ \
- ptests/x*min10.* ptests/xskipjfmp.* ptrip.diffs \
- $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
- eptex.pool eptex-tangle eptrip.diffs pdfprimitive-eptex.* \
- $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
- uptex.pool uptex-tangle $(upweb_programs:=.c) \
- $(upweb_programs:=.h) $(upweb_programs:=.p) \
- $(upweb_programs:=-web2c) $(upweb_programs:=.web) \
+ ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \
+ ptests/xexampl.bbl ptests/xexampl.blg ptests/xenc*.* \
+ ptests/fn*.* ptests/memtest.bib ptests/memtest?.* \
+ ptests/xstory.dvityp ptests/xpagenum.typ ptests/xptex[34]*.typ \
+ ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample*.typ \
+ ptests/x*min10.* ptests/xchcode*.* ptests/xskipjfmp.* \
+ ptrip.diffs $(nodist_eptex_SOURCES) eptex.web eptex.ch \
+ eptex-web2c eptex.p eptex.pool eptex-tangle eptrip.diffs \
+ pdfprimitive-eptex.* $(nodist_uptex_SOURCES) uptex.web \
+ uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
+ $(upweb_programs:=.c) $(upweb_programs:=.h) \
+ $(upweb_programs:=.p) $(upweb_programs:=-web2c) \
+ $(upweb_programs:=.web) uptests/nissya_bib.* \
uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
- uptests/xenc*.* uptests/xstory.dvityp uptests/xpagenum.typ \
- uptests/xcmr10.tfm uptests/xcmr10.pl uptests/x*min10.* \
+ uptests/xenc*.* uptests/fn*.* uptests/memtest.bib \
+ uptests/memtest?.* uptests/xstory.dvityp uptests/xpagenum.typ \
+ uptests/x*ptex[34]*.typ uptests/xcmr10.tfm uptests/xcmr10.pl \
+ uptests/xsample*.typ uptests/x*min10.* uptests/xchcode*.* \
uptests/xtestnewu.* uptests/xuparse.* uptests/yuparse.* \
- uptests/ygkhuge*.* uptrip.diffs $(nodist_euptex_SOURCES) \
- euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \
- euptex-tangle euptrip.diffs pdfprimitive-euptex.* \
- $(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \
- $(nodist_histretch_SOURCES) hiformat-tangle hitex-tangle \
- hello.log rule.log $(nodist_pdftex_SOURCES) pdftex-final.ch \
- pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
- pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
- cnfline.log partoken-ok.log partoken-xfail.log postV3.afm \
+ uptests/ygkhuge*.* uptests/xskipjfmp.* uptrip.diffs \
+ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+ euptex.p euptex.pool euptex-tangle euptrip.diffs \
+ pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
+ $(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
+ hiformat-tangle hitex-tangle hello.log rule.log \
+ $(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
+ pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
+ pdfimage.log pdfimage.pdf expanded.log cnfline.log \
+ partoken-ok.log partoken-xfail.log pdftests/fn*.* postV3.afm \
postV7.afm test-13.pdf test-13.xref test-15.pdf test-15.xref \
$(nodist_libluatex_sources) luaimage.* luajitimage.* \
$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
- bug73.tex filedump.log filedump.out filedump.tex \
+ bug73.tex filedump.log filedump.out filedump.tex xetests/fn*.* \
$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
@@ -3673,24 +3607,25 @@
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
$(am__append_36) $(am__append_44) $(am__append_60) \
- $(am__append_65) $(am__append_70) $(am__append_75) \
- $(am__append_80)
+ $(am__append_65) $(am__append_72)
TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \
$(am__append_35) $(am__append_43) $(am__append_59) \
- $(am__append_64) $(am__append_69) $(am__append_74) \
- $(am__append_79)
+ $(am__append_64) $(am__append_71)
bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
$(am__append_24) $(am__append_33) $(am__append_41) \
- $(am__append_49) $(am__append_54) $(am__append_91) \
- $(am__append_96) $(am__append_101) $(am__append_106)
+ $(am__append_49) $(am__append_54) $(am__append_62) \
+ upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+ uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+ $(am__append_69) $(am__append_83) $(am__append_88) \
+ $(am__append_93) $(am__append_98)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_89) $(am__append_94) $(am__append_99) \
- $(am__append_104)
+ $(am__append_81) $(am__append_86) $(am__append_91) \
+ $(am__append_96)
uninstall_exe_links = $(am__append_13) $(am__append_23) \
$(am__append_32) $(am__append_40) $(am__append_48) \
- $(am__append_53) $(am__append_90) $(am__append_95) \
- $(am__append_100) $(am__append_105)
+ $(am__append_53) $(am__append_82) $(am__append_87) \
+ $(am__append_92) $(am__append_97)
NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \
cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \
@@ -3866,18 +3801,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_121)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_130)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_122)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_132)
+dist_tex_SOURCES = texextra.c $(am__append_124)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_131)
+tex_prereq = texd.h $(am__append_123)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4373,10 +4308,10 @@
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_133)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_125)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_134)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_126)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4383,11 +4318,11 @@
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_136)
+ etexdir/etex_version.h $(am__append_128)
# We must create etexd.h and etexdir/etex_version.h before building the
# etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_135)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_127)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4411,25 +4346,13 @@
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
-p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
-pweb_programs = pbibtex pdvitype ppltotf ptftopl
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_137)
+ptex_CPPFLAGS = $(ptex_cppflags)
-# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_138)
-ptex_DEPENDENCIES = $(ptex_dependencies)
-
-# pTeX C sources
-ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
-nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
-dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h $(am__append_140)
-
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_139)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
ptex_web_srcs = \
tex.web \
tex.ch \
@@ -4442,42 +4365,12 @@
$(ptex_ch_synctex) \
tex-binpool.ch
-nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
-pbibtex_SOURCES = ptexdir/kanji.h
-pbibtex_CPPFLAGS = $(ptex_cppflags)
-pbibtex_LDADD = $(ptex_ldadd)
-pbibtex_DEPENDENCIES = $(ptex_dependencies)
-nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
-pdvitype_SOURCES = ptexdir/kanji.h
-pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
-pdvitype_LDADD = $(ptex_ldadd)
-pdvitype_DEPENDENCIES = $(ptex_dependencies)
-nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
-ppltotf_SOURCES = ptexdir/kanji.h
-ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
-ppltotf_LDADD = $(ptex_ldadd)
-ppltotf_DEPENDENCIES = $(ptex_dependencies)
-nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
-ptftopl_SOURCES = ptexdir/kanji.h
-ptftopl_CPPFLAGS = $(ptex_cppflags)
-ptftopl_LDADD = $(ptex_ldadd)
-ptftopl_DEPENDENCIES = $(ptex_dependencies)
-
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
-pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
- ptexdir/ppltotf.test ptexdir/ptftopl.test \
- ptexdir/pbibtex-openout-test.pl \
- ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
- ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
- ptexdir/skipjfmp.test
eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_145)
+ $(ZLIB_INCLUDES) $(am__append_129)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_146)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_130)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-pTeX C sources
@@ -4484,11 +4377,11 @@
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- eptexdir/eptex_version.h $(am__append_148)
+ eptexdir/eptex_version.h $(am__append_132)
# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
- eptexdir/eptex_version.h $(am__append_147)
+ eptexdir/eptex_version.h $(am__append_131)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4516,7 +4409,7 @@
# e-pTeX Tests
#
-eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test
+eptex_tests = eptexdir/eptriptest.test eptexdir/pdfprimitive.test eptexdir/epver.test eptexdir/wcfname.test
uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
@@ -4524,21 +4417,19 @@
upweb_programs = upbibtex updvitype uppltotf uptftopl
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_141)
+uptex_CPPFLAGS = $(uptex_cppflags)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_142)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
-dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- uptexdir/uptex_version.h $(am__append_144)
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h
# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
-uptex_prereq = uptexd.h ptexdir/ptex_version.h \
- uptexdir/uptex_version.h $(am__append_143)
+uptex_prereq = uptexd.h ptexdir/ptex_version.h uptexdir/uptex_version.h
uptex_web_srcs = \
tex.web \
tex.ch \
@@ -4572,26 +4463,20 @@
uptftopl_CPPFLAGS = $(uptex_cppflags)
uptftopl_LDADD = $(uptex_ldadd)
uptftopl_DEPENDENCIES = $(uptex_dependencies)
-
-# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test
-upweb_tests = \
- uptexdir/upbibtex.test \
- uptexdir/updvitype.test \
- uptexdir/uppltotf.test \
- uptexdir/uptftopl.test \
- uptexdir/yokotate.test \
- uptexdir/newjfm.test \
- uptexdir/uparse.test \
- uptexdir/gkhuge.test \
- uptexdir/upkcat.test
-
+# uppPLtoTF/upTFtoPL
+upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
+ uptexdir/uppltotf.test uptexdir/uptftopl.test \
+ uptexdir/upbibtex-openout-test.pl \
+ uptexdir/upbibtex-longline-test.pl uptexdir/upbibtex-mem.test \
+ uptexdir/nissya.test uptexdir/sample.test \
+ uptexdir/yokotate.test uptexdir/skipjfmp.test \
+ uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_149)
+ -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_133)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_150)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_134)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-upTeX C sources
@@ -4598,12 +4483,12 @@
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_152)
+ $(am__append_136)
# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
ptexdir/ptex_version.h eptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_151)
+ uptexdir/uptex_version.h $(am__append_135)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4635,7 +4520,7 @@
# e-upTeX Tests
#
-euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
+euptex_tests = euptexdir/euptriptest.test euptexdir/eptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test euptexdir/wcfname.test
# At the moment, these are the only man pages handled in the
# conglomerated web2c/Makefile[.am]. (All the others are in man/.)
@@ -4644,7 +4529,7 @@
@HITEX_TRUE@ hitexdir/man/hitex.man
hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \
- -DINIT -DSTAT
+ -DINIT -DSTAT -DWEB2CVERSION="\"${WEB2CVERSION}\""
# -DDEBUG drops into an interactive debugging session.
hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a libmd5.a
hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
@@ -4715,7 +4600,7 @@
pdftexdir/writejbig2.c pdftexdir/writejpg.c \
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
- $(am__append_84)
+ $(am__append_76)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4731,7 +4616,7 @@
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_153)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_137)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4744,7 +4629,7 @@
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_154)
+ $(am__append_138)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -4767,7 +4652,8 @@
#
pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test \
pdftexdir/pdfimage.test pdftexdir/expanded.test \
- pdftexdir/tests/cnfline.test pdftexdir/tests/partoken.test
+ pdftexdir/tests/cnfline.test pdftexdir/tests/partoken.test \
+ pdftexdir/wcfname.test
ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir
ttf2afm_SOURCES = pdftexdir/ttf2afm.c
@@ -5420,18 +5306,18 @@
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
- $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_112) \
- $(am__append_114)
+ $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_104) \
+ $(am__append_106)
xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
- $(am__append_115)
+ $(am__append_107)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
$(PPLIB_DEPEND) libmd5.a
@XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_155)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_139)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5440,7 +5326,7 @@
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_156)
+ $(am__append_140)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5472,7 +5358,7 @@
xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
xetexdir/image/mfileio.h xetexdir/image/numbers.c \
xetexdir/image/numbers.h xetexdir/image/pngimage.c \
- xetexdir/image/pngimage.h $(am__append_116) $(am__append_117)
+ xetexdir/image/pngimage.h $(am__append_108) $(am__append_109)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5482,7 +5368,8 @@
xetex_tests = \
xetexdir/xetex-filedump.test \
xetexdir/xetex-bug73.test \
- xetexdir/xetex.test
+ xetexdir/xetex.test \
+ xetexdir/wcfname.test
omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
@@ -5576,13 +5463,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_126)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_127)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_118)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_119)
libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_128)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_120)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -5614,28 +5501,6 @@
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0
- at PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
- at PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
-
- at UPTEX_SYNCTEX_TRUE@uptex_ch_synctex = \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
- at UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
-
@EPTEX_SYNCTEX_TRUE at eptex_ch_synctex = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
@@ -8298,10 +8163,6 @@
patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
@rm -f patgen$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
-
-pbibtex$(EXEEXT): $(pbibtex_OBJECTS) $(pbibtex_DEPENDENCIES) $(EXTRA_pbibtex_DEPENDENCIES)
- @rm -f pbibtex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pbibtex_OBJECTS) $(pbibtex_LDADD) $(LIBS)
pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
pdftexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
@@ -8317,10 +8178,6 @@
@rm -f pdftosrc$(EXEEXT)
$(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
-pdvitype$(EXEEXT): $(pdvitype_OBJECTS) $(pdvitype_DEPENDENCIES) $(EXTRA_pdvitype_DEPENDENCIES)
- @rm -f pdvitype$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pdvitype_OBJECTS) $(pdvitype_LDADD) $(LIBS)
-
pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
@rm -f pktogf$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
@@ -8340,22 +8197,6 @@
pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
@rm -f pooltype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
-
-ppltotf$(EXEEXT): $(ppltotf_OBJECTS) $(ppltotf_DEPENDENCIES) $(EXTRA_ppltotf_DEPENDENCIES)
- @rm -f ppltotf$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ppltotf_OBJECTS) $(ppltotf_LDADD) $(LIBS)
-ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
- ptexdir/$(DEPDIR)/$(am__dirstamp)
-synctexdir/ptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
- synctexdir/$(DEPDIR)/$(am__dirstamp)
-
-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
- @rm -f ptex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
-
-ptftopl$(EXEEXT): $(ptftopl_OBJECTS) $(ptftopl_DEPENDENCIES) $(EXTRA_ptftopl_DEPENDENCIES)
- @rm -f ptftopl$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ptftopl_OBJECTS) $(ptftopl_LDADD) $(LIBS)
synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -8414,8 +8255,6 @@
$(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
uptexdir/$(DEPDIR)/$(am__dirstamp)
-synctexdir/uptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
- synctexdir/$(DEPDIR)/$(am__dirstamp)
uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
@rm -f uptex$(EXEEXT)
@@ -8625,13 +8464,11 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovf2ovp.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovp2ovf.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/patgen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pbibtex-pbibtex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-dummy.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex-pool.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex0.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftexini.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftosrc-dummy.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdvitype-pdvitype.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktogf.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktype.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltotf.Po at am__quote@ # am--include-marker
@@ -8648,11 +8485,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-psvgout.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ptfmin.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pooltype.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ppltotf-ppltotf.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex-pool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptexini.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptftopl-ptftopl.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangle.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangleboot.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex-pool.Po at am__quote@ # am--include-marker
@@ -9233,7 +9065,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/ptex-ptexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/eptex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/etex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/euptex-synctex.Po at am__quote@ # am--include-marker
@@ -9244,10 +9075,8 @@
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/pdftex-synctex.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/ptex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/synctex-synctex_main.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/tex-synctex.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/uptex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/xetex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po at am__quote@ # am--include-marker
@@ -17940,20 +17769,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi`
-pbibtex-pbibtex.o: pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.o -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
-
-pbibtex-pbibtex.obj: pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.obj -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
-
pdftexdir/pdftex-pdftexextra.o: pdftexdir/pdftexextra.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/pdftex-pdftexextra.o -MD -MP -MF pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftexdir/pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
@@ -18024,20 +17839,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex-pool.obj `if test -f 'pdftex-pool.c'; then $(CYGPATH_W) 'pdftex-pool.c'; else $(CYGPATH_W) '$(srcdir)/pdftex-pool.c'; fi`
-pdvitype-pdvitype.o: pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.o -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
-
-pdvitype-pdvitype.obj: pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.obj -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
-
pmpost-pmp.o: pmp.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.o -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po
@@ -18206,104 +18007,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
-ppltotf-ppltotf.o: ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
-
-ppltotf-ppltotf.obj: ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.obj -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
-
-ptexdir/ptex-ptexextra.o: ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.o -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
-
-ptexdir/ptex-ptexextra.obj: ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.obj -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
-
-synctexdir/ptex-synctex.o: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
-
-synctexdir/ptex-synctex.obj: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
-
-ptex-ptexini.o: ptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
-
-ptex-ptexini.obj: ptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.obj -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
-
-ptex-ptex0.o: ptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.o -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
-
-ptex-ptex0.obj: ptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.obj -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
-
-ptex-ptex-pool.o: ptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.o -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
-
-ptex-ptex-pool.obj: ptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.obj -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
-
-ptftopl-ptftopl.o: ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.o -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
-
-ptftopl-ptftopl.obj: ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.obj -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
-
synctexdir/synctex-synctex_main.o: synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/synctex-synctex_main.o -MD -MP -MF synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo -c -o synctexdir/synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo synctexdir/$(DEPDIR)/synctex-synctex_main.Po
@@ -18654,20 +18357,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
-synctexdir/uptex-synctex.o: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
-
-synctexdir/uptex-synctex.obj: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
-
uptex-uptexini.o: uptexini.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.o -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
@@ -20012,13 +19701,11 @@
-rm -f ./$(DEPDIR)/ovf2ovp.Po
-rm -f ./$(DEPDIR)/ovp2ovf.Po
-rm -f ./$(DEPDIR)/patgen.Po
- -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
-rm -f ./$(DEPDIR)/pdftex-dummy.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
-rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
-rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
- -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
-rm -f ./$(DEPDIR)/pktogf.Po
-rm -f ./$(DEPDIR)/pktype.Po
-rm -f ./$(DEPDIR)/pltotf.Po
@@ -20035,11 +19722,6 @@
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
- -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
- -rm -f ./$(DEPDIR)/ptex-ptex0.Po
- -rm -f ./$(DEPDIR)/ptex-ptexini.Po
- -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -20620,7 +20302,6 @@
-rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
- -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
-rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
@@ -20631,10 +20312,8 @@
-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
-rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
- -rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
-rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
- -rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
@@ -20796,13 +20475,11 @@
-rm -f ./$(DEPDIR)/ovf2ovp.Po
-rm -f ./$(DEPDIR)/ovp2ovf.Po
-rm -f ./$(DEPDIR)/patgen.Po
- -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
-rm -f ./$(DEPDIR)/pdftex-dummy.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
-rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
-rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
- -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
-rm -f ./$(DEPDIR)/pktogf.Po
-rm -f ./$(DEPDIR)/pktype.Po
-rm -f ./$(DEPDIR)/pltotf.Po
@@ -20819,11 +20496,6 @@
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
- -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
- -rm -f ./$(DEPDIR)/ptex-ptex0.Po
- -rm -f ./$(DEPDIR)/ptex-ptexini.Po
- -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -21404,7 +21076,6 @@
-rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
- -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
-rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
@@ -21415,10 +21086,8 @@
-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
-rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
- -rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
-rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
- -rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
@@ -22136,47 +21805,6 @@
# Generate ptex.ch
ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
$(tie_c) ptex.web $(ptex_ch_srcs)
-pbibtex.c pbibtex.h: pbibtex-web2c
- @$(web2c) pbibtex
-pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
- @$(web2c) pbibtex
-pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
- $(p_tangle) pbibtex pbibtex
-pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
- $(tie_m) bibtex.web bibtex.ch
-pdvitype.c pdvitype.h: pdvitype-web2c
- @$(web2c) pdvitype
-pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) pdvitype
-pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
- $(p_tangle) pdvitype pdvitype
-pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
- $(tie_m) dvitype.web dvitype.ch
-ppltotf.c ppltotf.h: ppltotf-web2c
- @$(web2c) ppltotf
-ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ppltotf
-ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
- $(p_tangle) ppltotf ppltotf
-ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
- $(tie_m) pltotf.web pltotf.ch
-ptftopl.c ptftopl.h: ptftopl-web2c
- @$(web2c) ptftopl
-ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ptftopl
-ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
- $(p_tangle) ptftopl ptftopl
-ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
- $(tie_m) tftopl.web tftopl.ch
-ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-ptexdir/pver.log: ptex$(EXEEXT)
-ptexdir/pbibtex.log ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
- ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
-ptexdir/pdvitype.log ptexdir/sample.log: pdvitype$(EXEEXT)
-ptexdir/ppltotf.log: ppltotf$(EXEEXT)
-ptexdir/ptftopl.log: ptftopl$(EXEEXT)
-ptexdir/yokotate.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
-ptexdir/skipjfmp.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: ptrip-clean
@@ -22214,7 +21842,7 @@
$(tie_c) eptex.web $(eptex_ch_srcs)
eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
eptexdir/pdfprimitive.log: eptex$(EXEEXT)
-eptexdir/epver.log: eptex$(EXEEXT)
+eptexdir/epver.log eptexdir/wcfname.log: eptex$(EXEEXT)
eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: eptrip-clean
@@ -22256,8 +21884,8 @@
@$(web2c) upbibtex
upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
$(up_tangle) upbibtex upbibtex
-upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch ptexdir/pbibtex.ch
- $(tie_m) bibtex.web bibtex.ch ptexdir/pbibtex.ch
+upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
+ $(tie_m) bibtex.web bibtex.ch
updvitype.c updvitype.h: updvitype-web2c
@$(web2c) updvitype
updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
@@ -22264,8 +21892,8 @@
@$(web2c) updvitype
updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch
$(up_tangle) updvitype updvitype
-updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch
- $(tie_m) dvitype.web dvitype.ch ptexdir/pdvitype.ch
+updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
+ $(tie_m) dvitype.web dvitype.ch
uppltotf.c uppltotf.h: uppltotf-web2c
@$(web2c) uppltotf
uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
@@ -22272,8 +21900,8 @@
@$(web2c) uppltotf
uppltotf.p: tangle$(EXEEXT) uppltotf.web uptexdir/uppltotf.ch
$(up_tangle) uppltotf uppltotf
-uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch ptexdir/ppltotf.ch
- $(tie_m) pltotf.web pltotf.ch ptexdir/ppltotf.ch
+uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
+ $(tie_m) pltotf.web pltotf.ch
uptftopl.c uptftopl.h: uptftopl-web2c
@$(web2c) uptftopl
uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
@@ -22280,18 +21908,22 @@
@$(web2c) uptftopl
uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
$(up_tangle) uptftopl uptftopl
-uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
- $(tie_m) tftopl.web tftopl.ch ptexdir/ptftopl.ch
+uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
+ $(tie_m) tftopl.web tftopl.ch
+
+# upTeX Tests
+#uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-uptexdir/upver.log: uptex$(EXEEXT)
+uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log: uptex$(EXEEXT)
uptexdir/upbibtex.log: upbibtex$(EXEEXT)
uptexdir/updvitype.log: updvitype$(EXEEXT)
uptexdir/uppltotf.log: uppltotf$(EXEEXT)
uptexdir/uptftopl.log: uptftopl$(EXEEXT)
-uptexdir/yokotate.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
-uptexdir/newjfm.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
-uptexdir/uparse.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
-uptexdir/gkhuge.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
+uptexdir/upbibtex-openout-test.log uptexdir/upbibtex-longline-test.log \
+ uptexdir/upbibtex-mem.log uptexdir/nissya.log: upbibtex$(EXEEXT)
+uptexdir/sample.log: updvitype$(EXEEXT)
+uptexdir/yokotate.log uptexdir/skipjfmp.log \
+ uptexdir/newjfm.log uptexdir/uparse.log uptexdir/gkhuge.log: uppltotf$(EXEEXT) uptftopl$(EXEEXT)
uptrip.diffs: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: uptrip-clean
@@ -22322,9 +21954,9 @@
# Generate euptex.ch
euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
$(tie_c) euptex.web $(euptex_ch_srcs)
-euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+euptexdir/euptriptest.log euptexdir/eptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/eupver.log: euptex$(EXEEXT)
+euptexdir/eupver.log euptexdir/wcfname.log: euptex$(EXEEXT)
euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: euptrip-clean
@@ -22400,7 +22032,8 @@
pdftexdir/wprob.log pdftexdir/pdftex.log \
pdftexdir/pdfimage.log pdftexdir/expanded.log \
- pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log: pdftex$(EXEEXT)
+ pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log \
+ pdftexdir/wcfname.log: pdftex$(EXEEXT)
# (end of pdftex.am)
pdftexdir/ttf2afm.log: ttf2afm$(EXEEXT)
@@ -22543,7 +22176,8 @@
xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs)
$(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
-xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log \
+ xetexdir/wcfname.log: xetex$(EXEEXT)
# (end of xetex.am)
odvicopy.c odvicopy.h: odvicopy-web2c
Modified: branches/stable/source/src/texk/web2c/ac/web2c.ac
===================================================================
--- branches/stable/source/src/texk/web2c/ac/web2c.ac 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/ac/web2c.ac 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-dnl $Id: web2c.ac 64168 2022-08-22 21:33:05Z lscarso $
+dnl $Id: web2c.ac 65543 2023-01-15 05:09:14Z takuji $
# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
dnl
dnl Copyright 2015-2021 Karl Berry <tex-live at tug.org>
@@ -31,9 +31,7 @@
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
[[etex], [no], [yes], [e-TeX], [zlib]],
-[[ptex], [yes], [yes], [pTeX], [ptexenc zlib]],
[[eptex], [yes], [yes], [e-pTeX], [ptexenc zlib]],
-[[uptex], [yes], [yes], [upTeX], [ptexenc zlib]],
[[euptex], [yes], [yes], [e-upTeX], [ptexenc zlib]],
[[aleph], [yes], [], [Aleph], []],
[[hitex], [yes], [], [HiTeX], [zlib]],
Modified: branches/stable/source/src/texk/web2c/am/web.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/web.am 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/am/web.am 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-## $Id: web.am 63239 2022-05-06 08:08:17Z takuji $
+## $Id: web.am 65380 2022-12-28 08:09:52Z takuji $
## texk/web2c/am/web.am: Makefile fragment for the standard web programs --
## except tangle.
##
@@ -237,6 +237,9 @@
DISTCLEANFILES += badvpl.* tests/yptmr*.*
## weave.test
DISTCLEANFILES += pooltype.tex
+## {pdftexdir,xetexdir,ptexdir,uptexdir}/wcfname.test
+EXTRA_DIST += tests/fn-generate.perl
+EXTRA_DIST += tests/fn-utf8.txt tests/fn-euc.txt tests/fn-sjis.txt
## Test data
##
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/configure 2023-01-20 16:39:45 UTC (rev 889)
@@ -834,18 +834,10 @@
EUPTEX_SYNCTEX_TRUE
EUPTEX_FALSE
EUPTEX_TRUE
-UPTEX_SYNCTEX_FALSE
-UPTEX_SYNCTEX_TRUE
-UPTEX_FALSE
-UPTEX_TRUE
EPTEX_SYNCTEX_FALSE
EPTEX_SYNCTEX_TRUE
EPTEX_FALSE
EPTEX_TRUE
-PTEX_SYNCTEX_FALSE
-PTEX_SYNCTEX_TRUE
-PTEX_FALSE
-PTEX_TRUE
ETEX_SYNCTEX_FALSE
ETEX_SYNCTEX_TRUE
ETEX_FALSE
@@ -1042,12 +1034,8 @@
enable_tex_synctex
enable_etex
enable_etex_synctex
-enable_ptex
-enable_ptex_synctex
enable_eptex
enable_eptex_synctex
-enable_uptex
-enable_uptex_synctex
enable_euptex
enable_euptex_synctex
enable_aleph
@@ -1785,12 +1773,8 @@
--enable-tex-synctex build TeX with SyncTeX support
--enable-etex compile and install e-TeX
--disable-etex-synctex build e-TeX without SyncTeX support
- --disable-ptex do not compile and install pTeX
- --disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
- --disable-uptex do not compile and install upTeX
- --disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
--disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
@@ -19728,28 +19712,6 @@
test "x$enable_web2c:$enable_etex" = xyes:yes && {
need_zlib=yes
}
-# Check whether --enable-ptex was given.
-if test ${enable_ptex+y}
-then :
- enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_ptex=yes ;;
-esac
-
-# Check whether --enable-ptex-synctex was given.
-if test ${enable_ptex_synctex+y}
-then :
- enableval=$enable_ptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-eptex was given.
if test ${enable_eptex+y}
then :
@@ -19772,28 +19734,6 @@
need_ptexenc=yes
need_zlib=yes
}
-# Check whether --enable-uptex was given.
-if test ${enable_uptex+y}
-then :
- enableval=$enable_uptex;
-fi
-case $enable_uptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_uptex=yes ;;
-esac
-
-# Check whether --enable-uptex-synctex was given.
-if test ${enable_uptex_synctex+y}
-then :
- enableval=$enable_uptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_uptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-euptex was given.
if test ${enable_euptex+y}
then :
@@ -22436,35 +22376,6 @@
ETEX_SYNCTEX_TRUE='#'
ETEX_SYNCTEX_FALSE=
fi
- if test "x$enable_ptex" = xyes; then
- PTEX_TRUE=
- PTEX_FALSE='#'
-else
- PTEX_TRUE='#'
- PTEX_FALSE=
-fi
-
-case $enable_native_texlive_build:$enable_ptex_synctex in #(
- yes:yes | no:yes | no:no) :
- ;; #(
- *) :
- if test -z "$enable_ptex_synctex"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ptex-synctex=yes'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-ptex-synctex=yes'" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5
-printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;}
-fi
- enable_ptex_synctex=yes ;;
-esac
- if test "x$enable_ptex_synctex" = xyes; then
- PTEX_SYNCTEX_TRUE=
- PTEX_SYNCTEX_FALSE='#'
-else
- PTEX_SYNCTEX_TRUE='#'
- PTEX_SYNCTEX_FALSE=
-fi
if test "x$enable_eptex" = xyes; then
EPTEX_TRUE=
EPTEX_FALSE='#'
@@ -22494,35 +22405,6 @@
EPTEX_SYNCTEX_TRUE='#'
EPTEX_SYNCTEX_FALSE=
fi
- if test "x$enable_uptex" = xyes; then
- UPTEX_TRUE=
- UPTEX_FALSE='#'
-else
- UPTEX_TRUE='#'
- UPTEX_FALSE=
-fi
-
-case $enable_native_texlive_build:$enable_uptex_synctex in #(
- yes:yes | no:yes | no:no) :
- ;; #(
- *) :
- if test -z "$enable_uptex_synctex"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-uptex-synctex=yes'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-uptex-synctex=yes'" >&6;}
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&5
-printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&2;}
-fi
- enable_uptex_synctex=yes ;;
-esac
- if test "x$enable_uptex_synctex" = xyes; then
- UPTEX_SYNCTEX_TRUE=
- UPTEX_SYNCTEX_FALSE='#'
-else
- UPTEX_SYNCTEX_TRUE='#'
- UPTEX_SYNCTEX_FALSE=
-fi
if test "x$enable_euptex" = xyes; then
EUPTEX_TRUE=
EUPTEX_FALSE='#'
@@ -23738,7 +23620,7 @@
fi
-if test "x$enable_ptex:$enable_eptex" = xno:no
+if test "x$enable_eptex" = xno:no
then :
enable_pweb_progs=no
else $as_nop
@@ -23753,7 +23635,7 @@
fi
-if test "x$enable_uptex:$enable_euptex" = xno:no
+if test "x$enable_euptex" = xno:no
then :
enable_upweb_progs=no
else $as_nop
@@ -28418,14 +28300,6 @@
as_fn_error $? "conditional \"ETEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${PTEX_TRUE}" && test -z "${PTEX_FALSE}"; then
- as_fn_error $? "conditional \"PTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${PTEX_SYNCTEX_TRUE}" && test -z "${PTEX_SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"PTEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${EPTEX_TRUE}" && test -z "${EPTEX_FALSE}"; then
as_fn_error $? "conditional \"EPTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28434,14 +28308,6 @@
as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then
- as_fn_error $? "conditional \"UPTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${UPTEX_SYNCTEX_TRUE}" && test -z "${UPTEX_SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"UPTEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${EUPTEX_TRUE}" && test -z "${EUPTEX_FALSE}"; then
as_fn_error $? "conditional \"EUPTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Modified: branches/stable/source/src/texk/web2c/configure.ac
===================================================================
--- branches/stable/source/src/texk/web2c/configure.ac 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/configure.ac 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 64168 2022-08-22 21:33:05Z lscarso $
+dnl $Id: configure.ac 65543 2023-01-15 05:09:14Z takuji $
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
dnl Copyright 2018-2019 Karl Berry <tex-live at tug.org>
@@ -206,12 +206,12 @@
AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno])
-AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no],
+AS_IF([test "x$enable_eptex" = xno:no],
[enable_pweb_progs=no],
[enable_pweb_progs=$enable_web_progs])
AM_CONDITIONAL([PWEB], [test "x$enable_pweb_progs" != xno])
-AS_IF([test "x$enable_uptex:$enable_euptex" = xno:no],
+AS_IF([test "x$enable_euptex" = xno:no],
[enable_upweb_progs=no],
[enable_upweb_progs=$enable_web_progs])
AM_CONDITIONAL([UPWEB], [test "x$enable_upweb_progs" != xno])
Modified: branches/stable/source/src/texk/web2c/cwebboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/cwebboot.cin 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebboot.cin 2023-01-20 16:39:45 UTC (rev 889)
@@ -621,8 +621,8 @@
static boolean input_ln(
FILE*fp)
{
-register int c= EOF;
-register char*k;
+int c= EOF;
+char*k;
if(feof(fp))return false;
limit= k= buffer;
while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n')
@@ -1412,7 +1412,7 @@
{
char*dot_pos;
char*name_pos;
-register char*s;
+char*s;
boolean found_web= false,found_change= false,found_out= false;
Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,22 @@
+2023-01-08 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-mac.ch,
+ * common.c,
+ * common.w,
+ * ctwill-w2c.ch,
+ * refsort.ch,
+ * twinx.ch: C++17 has removed 'register' storage class.
+
+2022-11-22 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebmac.tex: Fix border case 'reflect.w'.
+
+2022-11-21 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch,
+ * cweave.w: Fix an issue with math macros.
+ * cwebmac.tex: Provide backward compatibility for \ifacro.
+
2022-08-21 Andreas Scherer <https://ascherer.github.io>
* ctang-w2c.ch,
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2023-01-20 16:39:45 UTC (rev 889)
@@ -18,8 +18,8 @@
static boolean input_ln( /* copies a line into |buffer| or returns |false| */
FILE *fp) /* what file to read from */
{
- register int c=EOF; /* character read; initialized so some compilers won't complain */
- register char *k; /* where next character goes */
+ int c=EOF; /* character read; initialized so some compilers won't complain */
+ char *k; /* where next character goes */
if (feof(fp)) return false; /* we have hit end-of-file */
limit = k = buffer; /* beginning of buffer */
while (k<=buffer_end && (c=getc(fp)) != EOF && c!='\n')
@@ -46,8 +46,8 @@
static boolean input_ln( /* copies a line into |buffer| or returns |false| */
FILE *fp) /* what file to read from */
{
- register int c=EOF; /* character read; initialized so some compilers won't complain */
- register char *k; /* where next character goes */
+ int c=EOF; /* character read; initialized so some compilers won't complain */
+ char *k; /* where next character goes */
if (feof(fp)) return false; /* we have hit end-of-file */
limit = k = buffer; /* beginning of buffer */
while (true) {
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -453,8 +453,8 @@
static boolean input_ln(
FILE*fp)
{
-register int c= EOF;
-register char*k;
+int c= EOF;
+char*k;
if(feof(fp))return false;
limit= k= buffer;
while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n')
@@ -1169,7 +1169,7 @@
{
char*dot_pos;
char*name_pos;
-register char*s;
+char*s;
boolean found_web= false,found_change= false,found_out= false;
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.w 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.w 2023-01-20 16:39:45 UTC (rev 889)
@@ -157,8 +157,8 @@
static boolean input_ln( /* copies a line into |buffer| or returns |false| */
FILE *fp) /* what file to read from */
{
- register int c=EOF; /* character read; initialized so some compilers won't complain */
- register char *k; /* where next character goes */
+ int c=EOF; /* character read; initialized so some compilers won't complain */
+ char *k; /* where next character goes */
if (feof(fp)) return false; /* we have hit end-of-file */
limit = k = buffer; /* beginning of buffer */
while (k<=buffer_end && (c=getc(fp)) != EOF && c!='\n')
@@ -1160,7 +1160,7 @@
{
char *dot_pos; /* position of |'.'| in the argument */
char *name_pos; /* file name beginning, sans directory */
- register char *s; /* register for scanning strings */
+ char *s; /* pointer for scanning strings */
boolean found_web=false,found_change=false,found_out=false;
/* have these names been seen? */
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2023-01-20 16:39:45 UTC (rev 889)
@@ -1087,12 +1087,12 @@
@x
@.Improper macro definition@>
else {
- app_cur_id(false);
+ app('$'); app_cur_id(false);
@y
@.Improper macro definition@>
else {
id_being_defined=id_lookup(id_first,id_loc,normal);
- app_cur_id(false);
+ app('$'); app_cur_id(false);
def_diff=(*loc!='(');
@z
@@ -1918,7 +1918,7 @@
@c static sixteen_bits title_lookup(void)
{
char *first=loc,*last; /* boundaries */
- register name_pointer *p;
+ name_pointer *p;
if (*loc=='"') {
while (++loc<=limit && *loc!='"') if (*loc=='\\') loc++;
} else if (*loc=='{') {
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2023-01-20 16:39:45 UTC (rev 889)
@@ -4350,9 +4350,8 @@
err_print("! Improper macro definition");
@.Improper macro definition@>
else {
- app_cur_id(false);
+ app('$'); app_cur_id(false);
if (*loc=='(') {
- app('$');
reswitch: switch (next_control=get_next()) {
case '(': case ',': app(next_control); goto reswitch;
case identifier: app_cur_id(false); goto reswitch;
@@ -4364,10 +4363,9 @@
} @=/* otherwise fall through */@>@;
default: err_print("! Improper macro definition"); break;
}
- app('$');
}
else next_control=get_next();
- app(break_space);
+ app_str("$ "); app(break_space);
app_scrap(dead,no_math); /* scrap won't take part in the parsing */
}
}
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2023-01-20 16:39:45 UTC (rev 889)
@@ -13,6 +13,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
+\let\ifacro=\ifpdf
\newif\ifacrohint \ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
\let\:=\. % preserve a way to get the dot accent
@@ -422,7 +423,7 @@
\vfill#1}} % parameter #1 is the page itself
\global\advance\pageno by1}
-\gtitle={\.{CWEB} output} % this running head is reset by starred sections
+\gtitle={{\tentex CWEB} output} % this running head is reset by starred sections
\mark{\noexpand\nullsec0{\the\gtitle}}
\def\title{\expandafter\uppercase\expandafter{\jobname}}
\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
Modified: branches/stable/source/src/texk/web2c/cwebdir/refsort.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/refsort.ch 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/refsort.ch 2023-01-20 16:39:45 UTC (rev 889)
@@ -27,6 +27,16 @@
int main()
@z
+ at x 'register' removed in C++17.
+ register char *p,*q;
+ register int n; /* current number of items */
+ register item *x, **y;
+ at y
+ char *p,*q;
+ int n; /* current number of items */
+ item *x, **y;
+ at z
+
@x variable not used
{ register int k;
@y
@@ -33,6 +43,18 @@
{
@z
+ at x 'register' removed in C++17
+{ register int toggle=0;
+ at y
+{ int toggle=0;
+ at z
+
+ at x 'register' removed in C++17
+{ register int toggle=0;
+ at y
+{ int toggle=0;
+ at z
+
@x add 'Index.' section
for (;*p;p++) *q++=*p;
}
Modified: branches/stable/source/src/texk/web2c/cwebdir/twinx.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/twinx.ch 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/cwebdir/twinx.ch 2023-01-20 16:39:45 UTC (rev 889)
@@ -60,6 +60,12 @@
@<Scan file |f|...@>=
@z
+ at x l.56 C++17 removed 'register' storage class.
+ if (strncmp(buf,"\\def\\title\{",11)==0) {@+register char *p,*q;
+ at y
+ if (strncmp(buf,"\\def\\title\{",11)==0) {@+char *p,*q;
+ at z
+
@x l.57 FIX: Fetch only the first word from the '\title'.
for (p=buf+11,q=title;*p && *p!='}';p++) *q++=*p;
@y
@@ -92,6 +98,12 @@
char *s)
@z
+ at x l.118 C++17 removed 'register' storage class.
+ register char *p,*q; register int l;
+ at y
+ char *p,*q; int l;
+ at z
+
Section 6.
@x l.145
@@ -100,6 +112,24 @@
node *new_node(void)
@z
+ at x l.181 C++17 removed 'register' storage class.
+register node* main_node; /* current end of main list */
+ at y
+node* main_node; /* current end of main list */
+ at z
+
+ at x l.195 C++17 removed 'register' storage class.
+while (1) {@+register node *cur_node;
+ at y
+while (1) {@+node *cur_node;
+ at z
+
+ at x l.213 C++17 removed 'register' storage class.
+{@+register char *p,*q;@+register int bal=1;
+ at y
+{@+char *p,*q;@+int bal=1;
+ at z
+
Section 11.
@x l.216 FIX: Don't count masked braces.
@@ -113,6 +143,23 @@
}
@z
+ at x l.289 C++17 removed 'register' storage class.
+while (1) {@+register node *p,*q,*r,*s,*t;
+ at y
+while (1) {@+node *p,*q,*r,*s,*t;
+ at z
+
+ at x l.308 C++17 removed 'register' storage class.
+do at +{@+register int d;
+ at y
+do at +{@+int d;
+ at z
+
+ at x l.323 C++17 removed 'register' storage class.
+do at +{@+register int d;
+ at y
+do at +{@+int d;
+ at z
Section 17.
@x l.347
@@ -123,8 +170,21 @@
node *p, node *q)
@z
+
+ at x l.349 C++17 removed 'register' storage class.
+{@+register unsigned char *pp,*qq;
+ at y
+{@+unsigned char *pp,*qq;
+ at z
+
Section 19.
+ at x l.378 C++17 removed 'register' storage class.
+{@+register int j;
+ at y
+{@+int j;
+ at z
+
@x l.379 Compiler warning.
for (j=1;collate[j];j++) ord[collate[j]]=j;
@y
@@ -141,12 +201,24 @@
node *p, node *q)
@z
+ at x l.392 C++17 removed 'register' storage class.
+{@+register node *x;
+ at y
+{@+node *x;
+ at z
+
+ at x l.403 C++17 removed 'register' storage class.
+{@+register node *x;
+ at y
+{@+node *x;
+ at z
+
Section 22.
@x l.414 Compiler warning.
{@+register char *p=x->id;
@y
-{@+register const char *p=x->id;
+{@+const char *p=x->id;
@z
@x l.434 FIX: Don't mask already masked underscore.
@@ -154,3 +226,11 @@
@y
if (*p=='_'&&*(p-1)!='\\') putchar('\\');
@z
+
+ at x l.441 C++17 removed 'register' storage class.
+{@+register node *y=x->data.n,*z=NULL;
+ while (y) {@+register node *w;
+ at y
+{@+node *y=x->data.n,*z=NULL;
+ while (y) {@+node *w;
+ at z
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,14 @@
+2023-01-01 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ * printversion.c: Update copyright year.
+
+2022-12-22 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * texmfmp.c:
+ Accept file names with JIS X 0208 characters
+ in `(e)(u)ptex --kanji-internal={euc,sjis}`.
+ https://github.com/texjporg/tex-jp-build/issues/136
+
2022-06-12 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* texmfmp.c:
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.am 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.am 2023-01-20 16:39:45 UTC (rev 889)
@@ -10,9 +10,9 @@
@KPATHSEA_RULE@
noinst_LIBRARIES = lib.a
-if PTEX
+if EPTEX
noinst_LIBRARIES += libp.a
-endif PTEX
+endif EPTEX
EXTRA_LIBRARIES = libp.a
## We don't compile `texmfmp.c'; this file is included from 'texextra.c'
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -88,7 +88,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at PTEX_TRUE@am__append_1 = libp.a
+ at EPTEX_TRUE@am__append_1 = libp.a
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
Modified: branches/stable/source/src/texk/web2c/lib/printversion.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/printversion.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/lib/printversion.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -56,7 +56,7 @@
#endif
if (copyright_holder) {
- printf ("Copyright 2022 %s.\n", copyright_holder);
+ printf ("Copyright 2023 %s.\n", copyright_holder);
if (!author)
author = copyright_holder;
}
Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -849,14 +849,11 @@
enc = kpse_var_value("command_line_encoding");
get_command_line_args_utf8(enc, &argc, &argv);
#endif
-#if IS_pTeX && !IS_upTeX && !defined(WIN32)
- ptenc_get_command_line_args(&argc, &argv);
-#endif
/* If the user says --help or --version, we need to notice early. And
since we want the --ini option, have to do it before getting into
the web (which would read the base file, etc.). */
-#if ((IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)) || (IS_pTeX && !IS_upTeX && !defined(WIN32))
+#if ((IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32))
parse_options (argc, argv);
#else
parse_options (ac, av);
@@ -1016,7 +1013,14 @@
/* If run like `tex \&foo', reasonable to guess "foo" as the fmt name. */
if (!main_input_file) {
if (argv[1] && *argv[1] == '&') {
+#if IS_pTeX && !defined(WIN32)
+ string new_arg;
+ is_terminalUTF8(); /* To call get_terminal_enc(). return value is not used */
+ new_arg = ptenc_from_utf8_string_to_internal_enc(argv[1]);
+ dump_name = argv[1] + 1; argv[1] = new_arg;
+#else
dump_name = argv[1] + 1;
+#endif
}
}
@@ -1056,12 +1060,25 @@
unsigned ext_len = strlen (DUMP_EXT);
/* Provide extension if not there already. */
+#if IS_pTeX && !defined(WIN32)
+ string new_dump_name;
+ is_terminalUTF8(); /* To call get_terminal_enc(). return value is not used */
+ new_dump_name = ptenc_from_utf8_string_to_internal_enc(dump_name);
+ if (!new_dump_name) new_dump_name = (string)dump_name;
if (name_len > ext_len
&& FILESTRCASEEQ (dump_name + name_len - ext_len, DUMP_EXT)) {
+ with_ext = new_dump_name;
+ } else {
+ with_ext = concat(new_dump_name, DUMP_EXT);
+ }
+#else
+ if (name_len > ext_len
+ && FILESTRCASEEQ (dump_name + name_len - ext_len, DUMP_EXT)) {
with_ext = dump_name;
} else {
with_ext = concat (dump_name, DUMP_EXT);
}
+#endif
DUMP_VAR = concat (" ", with_ext); /* adjust array for Pascal */
DUMP_LENGTH_VAR = strlen (DUMP_VAR + 1);
} else {
@@ -3095,7 +3112,16 @@
{
strnumber ret = name; int i, l, p;
if (c_job_name != NULL)
+#if IS_pTeX && !defined(WIN32)
+ {
+ string new_job_name;
+ is_terminalUTF8();
+ new_job_name = ptenc_from_utf8_string_to_internal_enc(c_job_name);
+ ret = maketexstring(new_job_name? new_job_name : c_job_name);
+ }
+#else
ret = maketexstring(c_job_name);
+#endif
#if IS_pTeX
i = strstart[ret]; l = strstart[ret+1];
while (i<l)
Modified: branches/stable/source/src/texk/web2c/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/man/Makefile.in 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/man/Makefile.in 2023-01-20 16:39:45 UTC (rev 889)
@@ -97,10 +97,10 @@
@ETEX_TRUE at am__append_8 = etex.man
@PDFTEX_TRUE at am__append_9 = $(pdftex_man_sources)
@PDFTEX_TRUE at am__append_10 = pdftex:pdflatex
- at PTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
- at PTEX_TRUE@ pbibtex.man
- at PTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
- at PTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
+ at EPTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
+ at EPTEX_TRUE@ pbibtex.man
+ at EPTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
+ at EPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
@LUATEX_TRUE at am__append_13 = luatex.man
@LUATEX_TRUE at am__append_14 = luatex:texlua luatex:texluac \
@LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,32 @@
+2022-12-28 Thanh Han The <hanthethanh at gmail.com>
+
+ * pdftex.web (Display the whatsit...) <pdf_dest_node>: indicate
+ if a pdfdest is a struct (pdftex r888). Report from Ulrike Fischer,
+ https://tug.org/pipermail/pdftex/2022-December/009315.html
+
+2022-12-28 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * wcfname.test, am/pdftex.am:
+ Add tests for file names with UTF-8 characters.
+
+2022-12-21 Thanh Han The <hanthethanh at gmail.com>
+
+ * pdftex.web (pdf_omit_info_procset_code),
+ (pdf_omit_procset): new parameter \pdfomitprocset.
+ (Put each...): add it.
+ (Generate ProcSet if desired): rename from <Generate ProcSet>;
+ output /ProcSet if the parameter is negative,
+ or if the parameter is zero and we are generating PDF 1.x (not 2.x).
+ Request by Ross,
+ https://tug.org/pipermail/pdftex/2022-December/009310.html
+
+2022-11-30 Thanh Han The <hanthethanh at gmail.com>
+
+ * pdftex.web (Finish the PDF file): omit call to pdf_print_info
+ if pdf_omit_info_dict = 0. Report from Ulrike,
+ https://tug.org/pipermail/pdftex/2022-November/009308.html
+ (from pdftex r885)
+
2022-05-23 Thanh Han The <hanthethanh at gmail.com>
* writettf.c (ttf_write_OS2): don't complain about v4 of OS/2
@@ -8,7 +37,7 @@
2022-04-17 Thanh Han The <hanthethanh at gmail.com>
* pdftex.web (pdf_omit_info_dict_code),
- (pdf_omit_info_dict):new parameter.
+ (pdf_omit_info_dict): new parameter \pdfomitinfodict.
(Put each...): add it.
(Output the cross-reference stream dictionary),
(Output the trailer): omit /Info if parameter is nonzero.
Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,7 +1,13 @@
pdfTeX 3.141592653-2.6-1.40.25
- changes:
- - new primitive \pdfomitinfodict to omit /Info dictionary completely.
+ - new primitive \pdfinfoomitdict to omit /Info dictionary completely.
+ - new primitive \pdfomitprocset to control omitting /ProcSet array;
+ /ProcSet is included if this parameter is negative, or if this
+ parameter is zero and pdftex is generating PDF 1.x output.
+- bugfixes:
+ - finish omission of /Info dict when \pdfomitinfodict is not 0.
+
pdfTeX 3.141592653-2.6-1.40.24 (TeX Live 2022)
- changes:
- new primitive \showstream to redirect \show output.
Modified: branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/pdftexdir/am/pdftex.am 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,4 +1,4 @@
-## $Id: pdftex.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: pdftex.am 65380 2022-12-28 08:09:52Z takuji $
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
## Copyright 2016-2022 Karl Berry <tex-live at tug.org>
@@ -105,11 +105,13 @@
#
pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test \
pdftexdir/pdfimage.test pdftexdir/expanded.test \
- pdftexdir/tests/cnfline.test pdftexdir/tests/partoken.test
+ pdftexdir/tests/cnfline.test pdftexdir/tests/partoken.test \
+ pdftexdir/wcfname.test
pdftexdir/wprob.log pdftexdir/pdftex.log \
pdftexdir/pdfimage.log pdftexdir/expanded.log \
- pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log: pdftex$(EXEEXT)
+ pdftexdir/tests/cnfline.log pdftexdir/tests/partoken.log \
+ pdftexdir/wcfname.log: pdftex$(EXEEXT)
EXTRA_DIST += $(pdftex_tests)
@@ -138,4 +140,7 @@
EXTRA_DIST += tests/partoken-ok.tex tests/partoken-xfail.tex
DISTCLEANFILES += partoken-ok.log partoken-xfail.log
+## wcfname.test
+DISTCLEANFILES += pdftests/fn*.*
+
# (end of pdftex.am)
Added: branches/stable/source/src/texk/web2c/pdftexdir/wcfname.test
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/wcfname.test (rev 0)
+++ branches/stable/source/src/texk/web2c/pdftexdir/wcfname.test 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1,36 @@
+#! /bin/sh -vx
+#
+# Copyright 2022 Japanese TeX Development Community <issue at texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+test -d pdftests || mkdir -p pdftests
+rm -f pdftests/fn*.log pdftests/fn*.txt pdftests/fn*.tex fn*.tex
+
+rc=0
+
+TEXMFCNF=$srcdir/../kpathsea
+TEXINPUTS=pdftests:.
+export TEXMFCNF TEXINPUTS
+
+perl $srcdir/tests/fn-generate.perl || exit 128
+mv fn*-utf8.tex pdftests/; rm -f fn*.tex
+
+if [ "$COMSPEC" != "" ]; then
+ echo "*** We guess OS is Windows."
+ command_line_encoding=utf8
+ export command_line_encoding
+fi
+
+fenc="utf8"
+for doc in fn-$fenc fn£¥µÆÇñß-$fenc fnさざ波-$fenc; do
+
+ echo '>>> Document:'$doc ' File Encoding:'$fenc
+ ./pdftex -ini -interaction nonstopmode -jobname=$doc --shell-escape $doc.tex >pdftests/$doc-term.log || rc=1
+ mv $doc.txt $doc.log fn*-tmp.tex pdftests/
+## It does not work.
+## diff pdftests/$doc.txt $srcdir/tests/fn-$enc.txt || rc=2
+
+done
+
+
+exit $rc
Property changes on: branches/stable/source/src/texk/web2c/pdftexdir/wcfname.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2023-01-20 16:39:45 UTC (rev 889)
@@ -1,3 +1,32 @@
+2023-01-19 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ Comparing TL r55094 (by JL) and GH 2020 branch.
+
+ * Changed files (on https://github.com/jlaurens/synctex):
+ synctex_main.c
+ synctex_parser.c
+ synctex_parser_readme.md
+ synctex_parser_utils.c
+
+ - Fix compilation with clang with -Wformat-nonliteral.
+ https://github.com/jlaurens/synctex/pull/38
+ - Fix build when compiling with -Werror=implicit-function-declaration.
+ https://github.com/jlaurens/synctex/pull/39
+ - More explanations.
+ - Remove recursion form _synctex_free_handle_old.
+ - Fix a Bug in post scriptum parser y_offset.
+ https://github.com/jlaurens/synctex/issues/50
+ - Fix a Memory leak when opening files.
+ https://github.com/jlaurens/synctex/issues/49
+ - Fix memleaks when a file cannot be parsed.
+ https://github.com/jlaurens/synctex/issues/48
+ - Fix memleaks when freeing iterators
+ https://github.com/jlaurens/synctex/issues/55
+
+2023-01-15 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * am/synctex.am: Remove ptex and uptex.
+
2022-08-30 Karl Berry <karl at freefriends.org>
* man1/synctex.1,
Modified: branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2023-01-20 16:39:45 UTC (rev 889)
@@ -151,72 +151,6 @@
synctexdir/synctex-e-mem.ch1 \
synctexdir/synctex-e-rec.ch0
-## SyncTeX infrastructure: pTeX
-
-if PTEX_SYNCTEX
-
-ptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-
-ptex_LDADD += $(ZLIB_LIBS)
-ptex_prereq += $(ZLIB_DEPEND)
-
-ptex_ch_synctex = \
- synctexdir/synctex-def.ch0 \
- synctexdir/synctex-p-mem.ch0 \
- synctexdir/synctex-mem.ch0 \
- synctexdir/synctex-p-mem.ch1 \
- synctexdir/synctex-p-rec.ch0 \
- synctexdir/synctex-rec.ch0 \
- synctexdir/synctex-rec.ch1 \
- synctexdir/synctex-rec.ch2 \
- synctexdir/synctex-p-rec.ch1
-
-dist_ptex_SOURCES += \
- synctexdir/synctex.c \
- synctexdir/synctex.h \
- synctexdir/synctex-common.h \
- synctexdir/synctex-ptex.h
-
-ptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-
-endif PTEX_SYNCTEX
-
-EXTRA_DIST += \
- synctexdir/synctex-p-mem.ch0 \
- synctexdir/synctex-p-mem.ch1 \
- synctexdir/synctex-p-rec.ch0 \
- synctexdir/synctex-p-rec.ch1
-
-## SyncTeX infrastructure: upTeX
-
-if UPTEX_SYNCTEX
-
-uptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-
-uptex_LDADD += $(ZLIB_LIBS)
-uptex_prereq += $(ZLIB_DEPEND)
-
-uptex_ch_synctex = \
- synctexdir/synctex-def.ch0 \
- synctexdir/synctex-p-mem.ch0 \
- synctexdir/synctex-mem.ch0 \
- synctexdir/synctex-p-mem.ch1 \
- synctexdir/synctex-p-rec.ch0 \
- synctexdir/synctex-rec.ch0 \
- synctexdir/synctex-rec.ch1 \
- synctexdir/synctex-rec.ch2 \
- synctexdir/synctex-p-rec.ch1
-
-dist_uptex_SOURCES += \
- synctexdir/synctex.c \
- synctexdir/synctex.h \
- synctexdir/synctex-common.h \
- synctexdir/synctex-uptex.h
-
-uptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-
-endif UPTEX_SYNCTEX
-
## SyncTeX infrastructure: e-pTeX
if EPTEX_SYNCTEX
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex_main.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -526,6 +526,7 @@
puts("SyncTeX result end");
}
}
+ synctex_scanner_free(scanner);
}
return 0;
}
@@ -790,6 +791,7 @@
}
}
}
+ synctex_scanner_free(scanner);
return 0;
}
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex_parser.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex_parser.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex_parser.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -83,6 +83,11 @@
* First level objects are sheets and forms, containing boxes, glues, kerns...
* The third tree allows to browse leaves according to tag and line.
*/
+/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is
+ * defined in this file
+ */
+#define _GNU_SOURCE
+
# if defined(SYNCTEX_USE_LOCAL_HEADER)
# include "synctex_parser_local.h"
# else
@@ -361,7 +366,7 @@
static synctex_bool_t _synctex_tree_has_##WHAT(synctex_node_p node) {\
if (node) {\
if (node->class_->navigator->WHAT>=0) {\
- return synctex_YES; \
+ return synctex_YES; \
} else {\
printf("WARNING: NO tree %s for %s\n", #WHAT, synctex_node_isa(node));\
}\
@@ -369,9 +374,9 @@
return synctex_NO;\
}
#else
-#define SYNCTEX_PARAMETER_ASSERT(WHAT)
-#define DEFINE_SYNCTEX_TREE_HAS(WHAT) \
-static synctex_bool_t _synctex_tree_has_##WHAT(synctex_node_p node) {\
+# define SYNCTEX_PARAMETER_ASSERT(WHAT)
+# define DEFINE_SYNCTEX_TREE_HAS(WHAT) \
+SYNCTEX_INLINE static synctex_bool_t _synctex_tree_has_##WHAT(synctex_node_p node) {\
return (node && (node->class_->navigator->WHAT>=0));\
}
#endif
@@ -382,7 +387,7 @@
}
# define DEFINE_SYNCTEX_TREE_GET(WHAT) \
DEFINE_SYNCTEX_TREE__GET(WHAT) \
-static synctex_node_p _synctex_tree_##WHAT(synctex_node_p node) {\
+SYNCTEX_INLINE static synctex_node_p _synctex_tree_##WHAT(synctex_node_p node) {\
if (_synctex_tree_has_##WHAT(node)) {\
return __synctex_tree_##WHAT(node);\
}\
@@ -438,10 +443,31 @@
* The return value of _synctex_tree_set_child and
* _synctex_tree_set_sibling must be released somehow.
*/
+/* The next macro call creates:
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_sibling(synctex_node_p node)
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_set_sibling(synctex_node_p node, synctex_node_p new_value)
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_reset_sibling(synctex_node_p node)
+ */
DEFINE_SYNCTEX_TREE__GETSETRESET(sibling)
+/* The next macro call creates:
+ SYNCTEX_INLINE static synctex_bool_t _synctex_tree_has_parent(synctex_node_p node);
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_parent(synctex_non_null_node_p node);
+ SYNCTEX_INLINE static synctex_node_p _synctex_tree_parent(synctex_node_p node);
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_set_parent(synctex_node_p node, synctex_node_p new_value);
+ SYNCTEX_INLINE static synctex_node_p _synctex_tree_set_parent(synctex_node_p node, synctex_node_p new_value);
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_reset_parent(synctex_node_p node);
+ SYNCTEX_INLINE static synctex_node_p _synctex_tree_reset_parent(synctex_node_p node);
+ */
DEFINE_SYNCTEX_TREE_GETSETRESET(parent)
DEFINE_SYNCTEX_TREE_GETSETRESET(child)
DEFINE_SYNCTEX_TREE_GETSETRESET(friend)
+/* The next macro call creates:
+ SYNCTEX_INLINE static synctex_bool_t _synctex_tree_has_last(synctex_node_p node);
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_last(synctex_non_null_node_p node);
+ SYNCTEX_INLINE static synctex_node_p _synctex_tree_last(synctex_node_p node);
+ SYNCTEX_INLINE static synctex_node_p __synctex_tree_set_last(synctex_node_p node, synctex_node_p new_value);
+ SYNCTEX_INLINE static synctex_node_p _synctex_tree_set_last(synctex_node_p node, synctex_node_p new_value);
+ */
DEFINE_SYNCTEX_TREE_GETSET(last)
DEFINE_SYNCTEX_TREE_GETSET(next_hbox)
DEFINE_SYNCTEX_TREE_GETSET(arg_sibling)
@@ -470,7 +496,7 @@
#define SYNCTEX_HAS_CHILDREN(NODE) (NODE && _synctex_tree_child(NODE))
# ifdef __SYNCTEX_WORK__
-# include "/usr/include/zlib.h"
+# include "/usr/local/include/node/zlib.h"
# else
# include <zlib.h>
# endif
@@ -892,13 +918,39 @@
* It is not owned by its parent, unless it is its first child.
* This destructor is for all handles.
*/
+static void _synctex_free_handle_old(synctex_node_p handle) {
+ if (handle) {
+ _synctex_free_handle_old(__synctex_tree_sibling(handle));
+ _synctex_free_handle_old(_synctex_tree_child(handle));
+ _synctex_free(handle);
+ }
+ return;
+}
static void _synctex_free_handle(synctex_node_p handle) {
- if (handle) {
- _synctex_free_handle(__synctex_tree_sibling(handle));
- _synctex_free_handle(_synctex_tree_child(handle));
- _synctex_free(handle);
+ if (handle) {
+ synctex_node_p n = handle;
+ synctex_node_p nn;
+ __synctex_tree_set_parent(n, NULL);
+ down:
+ while ((nn = _synctex_tree_child(n))) {
+ __synctex_tree_set_parent(nn, n);
+ n = nn;
+ };
+ right:
+ nn = __synctex_tree_sibling(n);
+ if (nn) {
+ _synctex_free(n);
+ n = nn;
+ goto down;
}
- return;
+ nn = __synctex_tree_parent(n);
+ _synctex_free(n);
+ if (nn) {
+ n = nn;
+ goto right;
+ }
+ }
+ return;
}
/**
@@ -4510,7 +4562,7 @@
_synctex_error("Problem with Y offset in the Post Scriptum.");
return fs.status;
}
- scanner->x_offset = fs.value;
+ scanner->y_offset = fs.value;
goto next_line;
} else if (status<SYNCTEX_STATUS_EOF){
goto report_record_problem;
@@ -6006,11 +6058,12 @@
_synctex_error("malloc problem");
return NULL;
}
- if ((scanner->reader = synctex_reader_init_with_output_file(scanner->reader, output, build_directory))) {
+ if (synctex_reader_init_with_output_file(scanner->reader, output, build_directory)) {
return parse? synctex_scanner_parse(scanner):scanner;
}
// don't warn to terminal if no file is present, this is a library.
// _synctex_error("No file?");
+ synctex_scanner_free(scanner);
return NULL;
}
@@ -6019,10 +6072,6 @@
int synctex_scanner_free(synctex_scanner_p scanner) {
int node_count = 0;
if (scanner) {
- if (SYNCTEX_FILE) {
- gzclose(SYNCTEX_FILE);
- SYNCTEX_FILE = NULL;
- }
synctex_node_free(scanner->sheet);
synctex_node_free(scanner->form);
synctex_node_free(scanner->input);
@@ -6054,17 +6103,6 @@
scanner->x_offset = scanner->y_offset = 6.027e23f;
scanner->reader->line_number = 1;
- SYNCTEX_START = (char *)malloc(SYNCTEX_BUFFER_SIZE+1); /* one more character for null termination */
- if (NULL == SYNCTEX_START) {
- _synctex_error("! malloc error in synctex_scanner_parse.");
- bailey:
-#ifdef SYNCTEX_DEBUG
- return scanner;
-#else
- synctex_scanner_free(scanner);
- return NULL;
-#endif
- }
synctex_scanner_set_display_switcher(scanner, 1000);
SYNCTEX_END = SYNCTEX_START+SYNCTEX_BUFFER_SIZE;
/* SYNCTEX_END always points to a null terminating character.
@@ -6078,7 +6116,13 @@
status = _synctex_scan_preamble(scanner);
if (status<SYNCTEX_STATUS_OK) {
_synctex_error("Bad preamble\n");
- goto bailey;
+ bailey:
+#ifdef SYNCTEX_DEBUG
+ return scanner;
+#else
+ synctex_scanner_free(scanner);
+ return NULL;
+#endif
}
status = _synctex_scan_content(scanner);
if (status<SYNCTEX_STATUS_OK) {
@@ -8390,6 +8434,7 @@
int length; /* the number of chars appended */
};
+__attribute__((__format__ (__printf__, 2, 3)))
static int _synctex_updater_print(synctex_updater_p updater, const char * format, ...) {
int result = 0;
if (updater) {
@@ -8426,6 +8471,7 @@
/**
* gzvprintf is not available until OSX 10.10
*/
+__attribute__((__format__ (__printf__, 2, 3)))
static int _synctex_updater_print_gz(synctex_updater_p updater, const char * format, ...) {
int result = 0;
if (updater) {
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_readme.md
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_readme.md 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_readme.md 2023-01-20 16:39:45 UTC (rev 889)
@@ -2,15 +2,20 @@
This file is part of the __SyncTeX__ package.
-[//]: # (Version: 1.21)
-[//]: # (Date: Sun Oct 15 15:09:55 UTC 2017)
+[//]: # (Version: 1.22)
+[//]: # (Date: Mon May 11 16:05:02 UTC 2020)
## Important
+* Changes in version `1.22`
+
+ * Typos fixed in code and printed comments
+ * Code cleaning (`static` keyword added)
+ * Bug fixed (Missing `va_end`)
+
* Changes in version `1.21`
- * Display query returns more results (as much as `1.18`)
- * Remove a `\` character from the name of 2 test files.
+ * Remove a `\` character from the name ot 2 test files.
* Change variable name `class` to `class_` because the former is a reserved keyword in C++.
* Adding a more portable unused variable management.
* Various cosmetic changes in the source code, including explicit declaration of `void` in forward function declaration.
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_utils.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_utils.c 2022-12-28 09:33:15 UTC (rev 888)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex_parser_utils.c 2023-01-20 16:39:45 UTC (rev 889)
@@ -86,6 +86,7 @@
# include <syslog.h>
#endif
+__attribute__((__format__ (__printf__, 3, 0)))
static int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) {
int result;
# ifdef SYNCTEX_RECENT_WINDOWS
@@ -132,6 +133,7 @@
return result;
}
+__attribute__((__format__ (__printf__, 1, 2)))
int _synctex_error(const char * reason,...) {
va_list arg;
int result;
@@ -145,6 +147,7 @@
return result;
}
+__attribute__((__format__ (__printf__, 1, 2)))
int _synctex_debug(const char * reason,...) {
va_list arg;
int result;
Added: branches/stable/source/src/texk/web2c/tests/fn-euc.txt
===================================================================
--- branches/stable/source/src/texk/web2c/tests/fn-euc.txt (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/fn-euc.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1 @@
+abc \xA6\xC1\xA6¦\xC3 \xA7ѧҧ\xD3 \xA4\xA2\xA5\xA2\xA2\xA8\xA1\xEF ŷ\xC3Ͽ\xCD
Property changes on: branches/stable/source/src/texk/web2c/tests/fn-euc.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/fn-generate.perl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/fn-generate.perl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/fn-generate.perl 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1,73 @@
+#!/usr/bin/env perl
+#
+# Copyright 2022 Japanese TeX Development Community <issue at texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+use strict;
+use warnings;
+use 5.010;
+use Encode;
+
+foreach $_ (<DATA>) {
+ chomp;
+ my ($encname, $fname0, $fname1) = split ' ', $_;
+
+ my $src = &make_str($encname, $fname0, $fname1);
+
+ open(my $ofh, '>', $fname0) or die "Cannot open $fname0:$!";
+ print $ofh $src;
+}
+
+
+sub make_str ($$;$) {
+ my ($encname, $fname0, $fname1) = @_;
+ my ($src);
+
+ my ($fnameT) = $fname0;
+ $fnameT =~ s/\.tex$/-tmp.tex/;
+
+$src = <<END;
+\% $fname0
+\% $encname encoding
+\\catcode`\\{=1
+\\catcode`\\}=2
+
+\\immediate\\write16{JOB[\\jobname] :: We are in $fname0}
+
+\\immediate\\openout0=\\jobname.txt
+\\immediate\\write0{abc αβγ абв あア※￥ 天地人}
+\\immediate\\closeout0
+
+\\immediate\\openout1=$fnameT
+\\immediate\\write1{\\relax}
+\\immediate\\closeout1
+
+% current directory
+\\input "|cat $fnameT"
+\\input $fnameT
+END
+
+$src .= <<END if $fname1;
+
+% vir kpathsearch
+\\immediate\\write16{JOB[\\jobname] :: Search $fname1}
+\\input $fname1
+END
+
+$src .= <<END;
+
+\\relax\\end
+END
+
+ Encode::from_to($src, 'utf8', $encname) if ($encname !~ /UTF.*8/i);
+ return ($src);
+
+}
+
+__DATA__
+UTF-8 fn±×÷§¶-utf8.tex
+UTF-8 fn-utf8.tex fn±×÷§¶-utf8.tex
+UTF-8 fn£¥µÆÇñß-utf8.tex fn±×÷§¶-utf8.tex
+UTF-8 fnさざ波-utf8.tex fn±×÷§¶-utf8.tex
+EUC-JP fnさざ波-euc.tex fn±×÷§¶-utf8.tex
+Shift_JIS fnさざ波-sjis.tex fn±×÷§¶-utf8.tex
Property changes on: branches/stable/source/src/texk/web2c/tests/fn-generate.perl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/fn-sjis.txt
===================================================================
--- branches/stable/source/src/texk/web2c/tests/fn-sjis.txt (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/fn-sjis.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1 @@
+abc \x83\xBF\x83\xC0\x83\xC1 \x84p\x84q\x84r \x82\xA0\x83A\x81\xA6\x81\x8F \x93V\x92n\x90l
Property changes on: branches/stable/source/src/texk/web2c/tests/fn-sjis.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/fn-utf8.txt
===================================================================
--- branches/stable/source/src/texk/web2c/tests/fn-utf8.txt (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/fn-utf8.txt 2023-01-20 16:39:45 UTC (rev 889)
@@ -0,0 +1 @@
+abc αβγ абв あア※￥ 天地人
Property changes on: branches/stable/source/src/texk/web2c/tests/fn-utf8.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
More information about the pdftex-commits
mailing list.