diff --git a/source/build-aux/ar-lib b/source/build-aux/ar-lib
index 54c6bdbf7f1b314721a3af9996f6ed6dd7091619..17de55e79c4c00039b551efe4f3472cb95424646 100755
--- a/source/build-aux/ar-lib
+++ b/source/build-aux/ar-lib
@@ -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@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/source/build-aux/compile b/source/build-aux/compile
index dfc9465939ffe7a7eff66d341975d3c8579cbc67..ba883b54aac2c9f7f537816d98d751f9bbb49e06 100644
--- a/source/build-aux/compile
+++ b/source/build-aux/compile
@@ -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@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 980b020838151f3cd3421a4eae2d5c564db1a33d..69188da73d74371bc500cc82b4d00a583e21ef3d 100755
--- a/source/build-aux/config.guess
+++ b/source/build-aux/config.guess
@@ -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 @@ version="\
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."
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index baf1512b3c03ab5cb251c77fafbfae5ccf220a53..d6731d655c08e5e8d1c87eacc94aeffbd213d470 100755
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -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 @@ Report bugs and patches to <config-patches@gnu.org>."
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."
diff --git a/source/build-aux/depcomp b/source/build-aux/depcomp
index 703eed2750de3a8eeadb096cc44f9078d9ecfd84..ce5c2f7bcb390d2a48bfc1abe070c6ad77385973 100755
--- a/source/build-aux/depcomp
+++ b/source/build-aux/depcomp
@@ -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
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index cfe83359f655d03fc7c5d2c05fb232951f3cfff0..3cccf01d95824f559fa54807f6525b40c44dca4e 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -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-12-19.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{%
@@ -1200,13 +1194,17 @@ output) for that.)}
%
% 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{}
@@ -1362,7 +1360,7 @@ output) for that.)}
%
% 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
@@ -2683,6 +2681,7 @@ end
\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).
@@ -3744,8 +3743,8 @@ $$%
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.
@@ -4795,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
@@ -4825,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
-}
-
-% \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.
+ \turnoffactive
+}
+
+\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\'%
@@ -4942,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
@@ -5044,18 +5074,7 @@ $$%
% 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
- %
- % 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
+ \indexnofontstrue
%
\def\ { }%
\def\@{@}%
@@ -5067,65 +5086,6 @@ $$%
\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.
@@ -5137,14 +5097,11 @@ $$%
% 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}}%
-
@@ -7135,8 +7092,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\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
@@ -7166,16 +7122,19 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\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
@@ -7858,10 +7817,12 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% 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.
@@ -9900,12 +9861,10 @@ directory should work if nowhere else does.}
% 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
@@ -9930,7 +9889,6 @@ directory should work if nowhere else does.}
\fi
}
-% emacs-page
% A message to be logged when using a character that isn't available
% the default font encoding (OT1).
%
@@ -9939,12 +9897,6 @@ directory should work if nowhere else does.}
% 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
@@ -9954,8 +9906,14 @@ directory should work if nowhere else does.}
\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
@@ -10060,7 +10018,7 @@ directory should work if nowhere else does.}
}
% Latin9 (ISO-8859-15) encoding character definitions.
-\def\latninechardefs{%
+\gdef\latninechardefs{%
% Encoding is almost identical to Latin1.
\latonechardefs
%
@@ -10075,7 +10033,7 @@ directory should work if nowhere else does.}
}
% Latin2 (ISO-8859-2) character definitions.
-\def\lattwochardefs{%
+\gdef\lattwochardefs{%
\gdefchar^^a0{\tie}
\gdefchar^^a1{\ogonek{A}}
\gdefchar^^a2{\u{}}
@@ -10179,6 +10137,8 @@ directory should work if nowhere else does.}
\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
@@ -11231,14 +11191,14 @@ directory should work if nowhere else does.}
\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
\utfeightchardefs
\fi
+
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11566,7 +11526,7 @@ directory should work if nowhere else does.}
\fi
}
-\microtypeON
+\microtypeOFF
\parseargdef\microtype{%
\def\txiarg{#1}%
@@ -11583,6 +11543,9 @@ directory should work if nowhere else does.}
\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
@@ -11645,23 +11608,32 @@ directory should work if nowhere else does.}
% 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@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
@@ -11671,109 +11643,120 @@ directory should work if nowhere else does.}
% ignored family value; char position "5C). We can't use " for the
% usual hex value because it has already been made active.
-@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.
-@gdef@otherbackslash{@let\=@realbackslash}
-
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-{@catcode`- = @active
- @gdef@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
- }
-}
+\def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}}
+\let\backslashchar = \ttbackslash % \backslashchar{} is for user documents.
-% 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.
-@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.
-{
-@catcode`@^=7
-@catcode`@^^M=13@gdef@enablebackslashhack{%
- @global@let\ = @eatinput%
- @catcode`@^^M=13%
- @def@c{@fixbackslash@c}%
- % Definition for the newline at the end of this file.
- @def ^^M{@let^^M@secondlinenl}%
- % Definition for a newline in the main Texinfo file.
- @gdef @secondlinenl{@fixbackslash}%
+% These are made active for url-breaking, so need
+% active definitions as the normal characters.
+\def\normaldot{.}
+\def\normalquest{?}
+\def\normalslash{/}
+
+% \newlinesloadsconf - call \loadconf as soon as possible in the
+% file, e.g. at the first newline.
+%
+{\catcode`\^=7
+\catcode`\^^M=13
+\gdef\newlineloadsconf{%
+ \catcode`\^^M=13 %
+ \newlineloadsconfzz%
+}
+\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@originalparsearg@parsearg
- @def@parsearg{@fixbackslash@originalparsearg}
+ \let\originalparsearg\parsearg%
+ \def\parsearg{\loadconf\originalparsearg}%
}}
-{@catcode`@^=7 @catcode`@^^M=13%
-@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%
-@gdef@enableemergencynewline{%
- @gdef^^M{%
- @par%
- %<warning: active newline>@par%
+{\catcode`\^=7 \catcode13=13%
+\gdef\enableemergencynewline{%
+ \gdef^^M{%
+ \par%
+ %<warning: active newline>\par%
}}}
-@gdef@fixbackslash{%
- @ifx\@eatinput @let\ = @ttbackslash @fi
- @catcode13=5 % regular end of line
- @enableemergencynewline
- @let@c=@comment
- @let@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
- %
- % 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.
+ \catcode`+=\active
+ \catcode`\_=\active
%
- @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@realbackslash{\}}
+
+% In Texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active % @ for escape char from now on.
+
+@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.
+%
+@everyjob{@message{[Texinfo version @texinfoversion]}%
+ @global@let\ = @eatinput
+ @catcode`+=@active @catcode`@_=@active}
+
+{@catcode`@^=7 @catcode`@^^M=13%
+@gdef@eatinput input texinfo#1^^M{@loadconf}}
+
+@def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi}
+
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+@gdef@otherbackslash{@let\=@realbackslash}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+%
+{@catcode`- = @active
+ @gdef@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.
-@def@normaldot{.}
-@def@normalquest{?}
-@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@normalamp{&}
@@ -11788,15 +11771,11 @@ directory should work if nowhere else does.}
@c Do this last of all since we use ` in the previous @catcode assignments.
@catcode`@'=@active
@catcode`@`=@active
-@setregularquotes
@c Local variables:
@c eval: (add-hook 'before-save-hook 'time-stamp nil t)
@c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}"
-@c page-delimiter: "^\\\\message\\|emacs-page"
+@c page-delimiter: "^\\\\message"
@c End:
-@c vim:sw=2:
-
-@enablebackslashhack
-
+@newlineloadsconf
diff --git a/source/libs/README b/source/libs/README
index a48d4c02c62faf27ec9f9c30729004ff83404240..834af5f351142f5d2becae35abc9fa4c43d52618 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 65304 2022-12-18 01:06:39Z 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.
@@ -46,7 +46,7 @@ lua 5.3.6 - checked 04oct20
luajit 2.1.0-beta3 - checked 20jun17
http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
-mpfr 4.1.1 - checked 18nov22
+mpfr 4.2.0 - checked 12jan23
http://ftp.gnu.org/gnu/mpfr/
pixman 0.42.2 - checked 03nov22
diff --git a/source/libs/configure b/source/libs/configure
index c496221300223da2c42c61352670092df2ea6b8c..4f1e9e1316545689aff4600058c5ab7b6f7202db 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -739,12 +739,8 @@ enable_tex
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
@@ -1453,12 +1449,8 @@ Optional Features:
--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
@@ -3952,28 +3944,6 @@ fi
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 :
@@ -3996,28 +3966,6 @@ test "x$enable_web2c:$enable_eptex" = xyes:yes && {
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 :
diff --git a/source/texk/configure b/source/texk/configure
index f69a56318d474d57770bbefdc3e7ca0ca060acca..97ee9a1368005be308407a0eb10128d758ee0a2f 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -739,12 +739,8 @@ enable_tex
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
@@ -1453,12 +1449,8 @@ Optional Features:
--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
@@ -3952,28 +3944,6 @@ fi
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 :
@@ -3996,28 +3966,6 @@ test "x$enable_web2c:$enable_eptex" = xyes:yes && {
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 :
diff --git a/source/texk/texlive/linked_scripts/Makefile.am b/source/texk/texlive/linked_scripts/Makefile.am
index 3b25c3a64ae3f33371cf8416f1bd0197b17e8106..a9eef4d0f02b2f994e563dff9c87742c95f91f86 100644
--- a/source/texk/texlive/linked_scripts/Makefile.am
+++ b/source/texk/texlive/linked_scripts/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 65325 2022-12-21 20:56:12Z karl $
+## $Id: Makefile.am 65465 2023-01-04 23:22:48Z karl $
## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/
##
## Copyright 2016-2022 Karl Berry <tex-live@tug.org>
@@ -99,6 +99,7 @@ texmf_shell_scripts = \
tikztosvg/tikztosvg \
typeoutfileinfo/typeoutfileinfo.sh \
wordcount/wordcount.sh \
+ xput/xput \
xput/xputserver
texmf_other_scripts = \
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index 693d1e23dfdafeabda101f0be92e1bc7e4542570..506b66d3f19c5507bfe1c72a8d51cda57823ab4a 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -313,6 +313,7 @@ texmf_shell_scripts = \
tikztosvg/tikztosvg \
typeoutfileinfo/typeoutfileinfo.sh \
wordcount/wordcount.sh \
+ xput/xput \
xput/xputserver
texmf_other_scripts = \
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index ae04242326cbbe7e8cffdd704b91c41b30c1cf37..749a3c9c1481cc5de0197a68312ffd05ad94ff15 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,20 @@
+2023-01-15 TANAKA Takuji <ttk@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@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@freefriends.org>
* tex.ch (halting_on_error_p): new variable, set when we start to
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 8c504af22ad9faf5a7889109942ae056e3ae1bb2..f7881a2e61b56c599ca6e239d19a4234dae5fa57 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -112,22 +112,21 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
$(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_30) $(am__EXEEXT_31)
+ $(am__EXEEXT_29)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_32) $(am__EXEEXT_33) $(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)
-TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
+ $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \
+ $(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_62) $(am__EXEEXT_46) \
- $(am__append_67) $(am__append_72) $(am__append_75) \
- $(am__append_77) $(am__append_82) $(am__append_85) \
- $(am__append_106) $(am__append_107) $(am__append_108) \
- $(am__append_109) $(am__append_117) $(am__append_119) \
- $(am__append_121) $(am__append_156) 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@am__append_1 = $(web_programs)
@WEB_TRUE@am__append_2 = $(web_tests)
@TEX_TRUE@am__append_3 = tex
@@ -192,173 +191,154 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
@ETEX_TRUE@am__append_58 = $(etex_tests)
@ETEX_TRUE@am__append_59 = etrip.diffs
@ETEX_TRUE@am__append_60 = etrip-clean
-@PTEX_TRUE@am__append_61 = ptex
-@PTEX_TRUE@am__append_62 = $(ptex_tests)
-@PTEX_TRUE@am__append_63 = ptrip.diffs
-@PTEX_TRUE@am__append_64 = ptrip-clean
-@PWEB_TRUE@am__append_65 = $(pweb_tests)
-@EPTEX_TRUE@am__append_66 = eptex
-@EPTEX_TRUE@am__append_67 = $(eptex_tests)
-@EPTEX_TRUE@am__append_68 = eptrip.diffs
-@EPTEX_TRUE@am__append_69 = eptrip-clean
-@UPTEX_TRUE@am__append_70 = uptex
-@UPWEB_TRUE@am__append_71 = $(upweb_programs)
-@UPTEX_TRUE@am__append_72 = $(uptex_tests)
-@UPTEX_TRUE@am__append_73 = uptrip.diffs
-@UPTEX_TRUE@am__append_74 = uptrip-clean
-@UPWEB_TRUE@am__append_75 = $(upweb_tests)
-@EUPTEX_TRUE@am__append_76 = euptex
-@EUPTEX_TRUE@am__append_77 = $(euptex_tests)
-@EUPTEX_TRUE@am__append_78 = euptrip.diffs
-@EUPTEX_TRUE@am__append_79 = euptrip-clean
-@HITEX_TRUE@am__append_80 = hitex hishrink histretch
-@HITEX_TRUE@am__append_81 = himktables
-@HITEX_TRUE@am__append_82 = $(hitex_tests)
-@MINGW32_TRUE@am__append_83 = \
+@EPTEX_TRUE@am__append_61 = eptex
+@EPTEX_TRUE@am__append_62 = eptex$(EXEEXT):ptex
+@EPTEX_TRUE@am__append_63 = $(eptex_tests)
+@EPTEX_TRUE@am__append_64 = eptrip.diffs
+@EPTEX_TRUE@am__append_65 = eptrip-clean
+
+#if UPTEX
+#bin_PROGRAMS += uptex
+#endif UPTEX
+@UPWEB_TRUE@am__append_66 = $(upweb_programs)
+
+#if UPTEX
+#TESTS += $(uptex_tests)
+#TRIPTRAP += uptrip.diffs
+#TRIPTRAP_CLEAN += uptrip-clean
+#endif UPTEX
+@UPWEB_TRUE@am__append_67 = $(upweb_tests)
+@EUPTEX_TRUE@am__append_68 = euptex
+@EUPTEX_TRUE@am__append_69 = euptex$(EXEEXT):uptex
+@EUPTEX_TRUE@am__append_70 = $(euptex_tests)
+@EUPTEX_TRUE@am__append_71 = euptrip.diffs
+@EUPTEX_TRUE@am__append_72 = euptrip-clean
+@HITEX_TRUE@am__append_73 = hitex hishrink histretch
+@HITEX_TRUE@am__append_74 = himktables
+@HITEX_TRUE@am__append_75 = $(hitex_tests)
+@MINGW32_TRUE@am__append_76 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
-@PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
+@PDFTEX_TRUE@am__append_77 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_78 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
-@LUATEX_TRUE@am__append_86 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUAHBTEX_TRUE@am__append_91 = luahbtex
-@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_92 = call_luahbtex
-@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_93 = install-luahbtex-links
-@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_94 = uninstall-luahbtex-links
+@LUATEX_TRUE@am__append_79 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_80 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_81 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_82 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_83 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUAHBTEX_TRUE@am__append_84 = luahbtex
+@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_85 = call_luahbtex
+@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_86 = install-luahbtex-links
+@LUAHBTEX_TRUE@@WIN32_TRUE@am__append_87 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
-@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
-@LUAJITTEX_TRUE@am__append_96 = luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_97 = call_luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_98 = install-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_99 = uninstall-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
-@LUAJITHBTEX_TRUE@am__append_101 = luajithbtex
-@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_102 = call_luajithbtex
-@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_103 = install-luajithbtex-links
-@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_104 = uninstall-luajithbtex-links
+@LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE@am__append_88 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+@LUAJITTEX_TRUE@am__append_89 = luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_90 = call_luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_91 = install-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = uninstall-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_93 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+@LUAJITHBTEX_TRUE@am__append_94 = luajithbtex
+@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_95 = call_luajithbtex
+@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_96 = install-luajithbtex-links
+@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__append_97 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
-@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
-@LUATEX_TRUE@am__append_106 = $(luatex_tests)
-@LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests)
-@LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests)
-@LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests)
-@XETEX_TRUE@am__append_110 = xetex
-@XETEX_MACOSX_TRUE@am__append_111 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_112 = -std=c++11
-@XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_TRUE@am__append_115 = \
+@LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE@am__append_98 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+@LUATEX_TRUE@am__append_99 = $(luatex_tests)
+@LUAHBTEX_TRUE@am__append_100 = $(luahbtex_tests)
+@LUAJITTEX_TRUE@am__append_101 = $(luajittex_tests)
+@LUAJITHBTEX_TRUE@am__append_102 = $(luajithbtex_tests)
+@XETEX_TRUE@am__append_103 = xetex
+@XETEX_MACOSX_TRUE@am__append_104 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_105 = -std=c++11
+@XETEX_MACOSX_FALSE@am__append_106 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_107 = $(FONTCONFIG_LIBS)
+@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 \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
-@XETEX_MACOSX_FALSE@am__append_116 = \
+@XETEX_MACOSX_FALSE@am__append_109 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
-@XETEX_TRUE@am__append_117 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_118 = $(omegaware_programs)
-@OTANGLE_TRUE@am__append_119 = $(OTANGLE_tests) $(OMFONTS_tests)
-@ALEPH_TRUE@am__append_120 = aleph
-@ALEPH_TRUE@am__append_121 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_122 = synctex
-@SYNCTEX_TRUE@am__append_123 = $(LTLIBSYNCTEX)
-@SYNCTEX_TRUE@am__append_124 = $(LIBSYNCTEX)
-@MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES)
-@MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS)
-@MINGW32_TRUE@am__append_127 = -lshlwapi
-@TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_110 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_111 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_112 = $(OTANGLE_tests) $(OMFONTS_tests)
+@ALEPH_TRUE@am__append_113 = aleph
+@ALEPH_TRUE@am__append_114 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_115 = synctex
+@SYNCTEX_TRUE@am__append_116 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_117 = $(LIBSYNCTEX)
+@MINGW32_TRUE@am__append_118 = $(KPATHSEA_INCLUDES)
+@MINGW32_TRUE@am__append_119 = -lshlwapi $(KPATHSEA_LIBS)
+@MINGW32_TRUE@am__append_120 = -lshlwapi
+@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\"
-@TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_131 = \
+@TEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
+@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
-@ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
+@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\"
-@ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_135 = \
+@ETEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_DEPEND)
+@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
-@PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
-@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
-@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_139 = \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-
-@UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
-@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
-@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_143 = \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
-
-@EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
+@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\"
-@EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_147 = \
+@EPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+@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
-@EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
+@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\"
-@EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_151 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+@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
-@PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_153 = \
+@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
-@XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_155 = \
+@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
-@SYNCTEX_TRUE@am__append_156 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_141 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -442,38 +422,36 @@ am__EXEEXT_3 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
@PMP_TRUE@am__EXEEXT_14 = pmpost$(EXEEXT)
@UPMP_TRUE@am__EXEEXT_15 = upmpost$(EXEEXT)
@ETEX_TRUE@am__EXEEXT_16 = etex$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_17 = ptex$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_18 = eptex$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_19 = uptex$(EXEEXT)
-@UPWEB_TRUE@am__EXEEXT_20 = $(am__EXEEXT_2)
-@EUPTEX_TRUE@am__EXEEXT_21 = euptex$(EXEEXT)
-@HITEX_TRUE@am__EXEEXT_22 = hitex$(EXEEXT) hishrink$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
+@UPWEB_TRUE@am__EXEEXT_18 = $(am__EXEEXT_2)
+@EUPTEX_TRUE@am__EXEEXT_19 = euptex$(EXEEXT)
+@HITEX_TRUE@am__EXEEXT_20 = hitex$(EXEEXT) hishrink$(EXEEXT) \
@HITEX_TRUE@ histretch$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_23 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_24 = luatex$(EXEEXT)
-@LUAHBTEX_TRUE@am__EXEEXT_25 = luahbtex$(EXEEXT)
-@LUAJITTEX_TRUE@am__EXEEXT_26 = luajittex$(EXEEXT)
-@LUAJITHBTEX_TRUE@am__EXEEXT_27 = luajithbtex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_3)
-@ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
-@SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
+@LUAHBTEX_TRUE@am__EXEEXT_23 = luahbtex$(EXEEXT)
+@LUAJITTEX_TRUE@am__EXEEXT_24 = luajittex$(EXEEXT)
+@LUAJITHBTEX_TRUE@am__EXEEXT_25 = luajithbtex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_26 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_27 = $(am__EXEEXT_3)
+@ALEPH_TRUE@am__EXEEXT_28 = aleph$(EXEEXT)
+@SYNCTEX_TRUE@am__EXEEXT_29 = synctex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(syncincludedir)"
-@MF_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mf$(EXEEXT)
-@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_mflua$(EXEEXT)
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mfluajit$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_mpost$(EXEEXT)
-@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_pmpost$(EXEEXT)
-@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_upmpost$(EXEEXT)
-@HITEX_TRUE@am__EXEEXT_38 = himktables$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_luatex$(EXEEXT)
-@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luahbtex$(EXEEXT)
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luajittex$(EXEEXT)
-@LUAJITHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_42 = \
+@MF_TRUE@@WIN32_TRUE@am__EXEEXT_30 = call_mf$(EXEEXT)
+@MFLUA_TRUE@@WIN32_TRUE@am__EXEEXT_31 = call_mflua$(EXEEXT)
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mfluajit$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_mpost$(EXEEXT)
+@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_pmpost$(EXEEXT)
+@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_upmpost$(EXEEXT)
+@HITEX_TRUE@am__EXEEXT_36 = himktables$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luatex$(EXEEXT)
+@LUAHBTEX_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_luahbtex$(EXEEXT)
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_luajittex$(EXEEXT)
+@LUAJITHBTEX_TRUE@@WIN32_TRUE@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'`;
@@ -1577,24 +1555,12 @@ nodist_pooltype_OBJECTS = pooltype.$(OBJEXT)
pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-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
-@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)
-am__DEPENDENCIES_11 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
-@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
-am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@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)
+@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)
@@ -1605,14 +1571,14 @@ tangleboot_LDADD = $(LDADD)
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
-@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)
+@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)
-@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+@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)
@@ -1631,48 +1597,40 @@ twill_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
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
-@UPTEX_SYNCTEX_TRUE@am__objects_72 = \
-@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)
-@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)
@@ -1709,20 +1667,20 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
xetexdir/xetex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
-@XETEX_SYNCTEX_TRUE@am__objects_74 = \
+@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)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_20 = $(libxetex) $(am__DEPENDENCIES_1) \
+@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) \
@@ -1817,13 +1775,11 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \
./$(DEPDIR)/pmpost-pmpxout.Po ./$(DEPDIR)/pmpost-ppngout.Po \
./$(DEPDIR)/pmpost-ppsout.Po ./$(DEPDIR)/pmpost-psvgout.Po \
./$(DEPDIR)/pmpost-ptfmin.Po ./$(DEPDIR)/pooltype.Po \
- ./$(DEPDIR)/ptex-ptex-pool.Po ./$(DEPDIR)/ptex-ptex0.Po \
- ./$(DEPDIR)/ptex-ptexini.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 \
@@ -2384,7 +2340,6 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \
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 \
@@ -2395,10 +2350,8 @@ am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \
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 \
@@ -2536,22 +2489,22 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
$(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \
- $(dist_ptex_SOURCES) $(nodist_ptex_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) \
@@ -2568,11 +2521,10 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
- $(am__dist_ptex_SOURCES_DIST) $(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) \
+ $(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
+ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+ $(upbibtex_SOURCES) $(updvitype_SOURCES) $(uppltotf_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 \
@@ -2779,15 +2731,14 @@ am__set_TESTS_bases = \
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_43 = 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_44 = $(am__EXEEXT_43) 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
-@WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
-am__EXEEXT_46 =
+@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@.log=.log)
@@ -3018,7 +2969,7 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_112)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_105)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3165,71 +3116,11 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluaotfcc.a libmfluapotrace.a \
libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_124)
-lib_LTLIBRARIES = $(am__append_123)
+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
-
-#nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
-#pbibtex_SOURCES = ptexdir/kanji.h
-#pbibtex_CPPFLAGS = $(ptex_cppflags)
-#pbibtex_LDADD = $(ptex_ldadd)
-#pbibtex_DEPENDENCIES = $(ptex_dependencies)
-#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
-#EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
-
-#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)
-#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
-#EXTRA_DIST += ptexdir/pdvitype.ch
-
-#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)
-#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
-#EXTRA_DIST += ptexdir/ppltotf.ch
-
-#nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
-#ptftopl_SOURCES = ptexdir/kanji.h
-#ptftopl_CPPFLAGS = $(ptex_cppflags)
-#ptftopl_LDADD = $(ptex_ldadd)
-#ptftopl_DEPENDENCIES = $(ptex_dependencies)
-#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
-#EXTRA_DIST += ptexdir/ptftopl.ch
#
# By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
# this does not work for us, because we want to be able to invoke
@@ -3243,14 +3134,16 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
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 \
@@ -3311,14 +3204,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
etexdir/etrip/trip2.in $(ptex_web_srcs) $(ptex_ch_srcs) \
ptexdir/ptex.defines 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 ptexdir/tests/nissya_bib.bbl \
- 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/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/ptex3.tex \
@@ -3624,9 +3515,7 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
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
@@ -3667,24 +3556,22 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
$(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/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 \
+ 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/memtest.bib uptests/memtest?.* \
- uptests/xstory.dvityp uptests/xpagenum.typ \
+ 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.* \
@@ -3697,12 +3584,12 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
$(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 postV7.afm \
- test-13.pdf test-13.xref test-15.pdf test-15.xref \
+ 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 \
@@ -3725,26 +3612,25 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
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_64) $(am__append_69) $(am__append_74) \
- $(am__append_79)
+ $(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_63) $(am__append_68) $(am__append_73) \
- $(am__append_78)
+ $(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) upbibtex$(EXEEXT):pbibtex \
- updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \
- uptftopl$(EXEEXT):ptftopl $(am__append_90) $(am__append_95) \
- $(am__append_100) $(am__append_105)
+ $(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_88) $(am__append_93) $(am__append_98) \
- $(am__append_103)
+ $(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_89) $(am__append_94) \
- $(am__append_99) $(am__append_104)
+ $(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 \
@@ -3920,18 +3806,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_128)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_121)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_129)
+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_131)
+dist_tex_SOURCES = texextra.c $(am__append_124)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_130)
+tex_prereq = texd.h $(am__append_123)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4427,21 +4313,21 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
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_132)
+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_133)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_126)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
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_135)
+ 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_134)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_127)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4465,30 +4351,13 @@ etex_tests = etexdir/wprob.test etexdir/etriptest.test
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)
-#if PWEB
-#bin_PROGRAMS += $(pweb_programs)
-#endif PWEB
-#EXTRA_PROGRAMS += ptex $(pweb_programs)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_136)
-
-# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_137)
-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_139)
+ptex_CPPFLAGS = $(ptex_cppflags)
# 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_138)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
ptex_web_srcs = \
tex.web \
tex.ch \
@@ -4501,27 +4370,23 @@ ptex_ch_srcs = \
$(ptex_ch_synctex) \
tex-binpool.ch
-
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_144)
+ $(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_145)
+ $(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
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_147)
+ 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_146)
+ eptexdir/eptex_version.h $(am__append_131)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4549,7 +4414,7 @@ eptex_ch_srcs = \
# 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)
@@ -4557,21 +4422,19 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv)
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_140)
+uptex_CPPFLAGS = $(uptex_cppflags)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_141)
+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_143)
+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_142)
+uptex_prereq = uptexd.h ptexdir/ptex_version.h uptexdir/uptex_version.h
uptex_web_srcs = \
tex.web \
tex.ch \
@@ -4605,9 +4468,6 @@ uptftopl_SOURCES = uptexdir/kanji.h
uptftopl_CPPFLAGS = $(uptex_cppflags)
uptftopl_LDADD = $(uptex_ldadd)
uptftopl_DEPENDENCIES = $(uptex_dependencies)
-
-# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test
# uppPLtoTF/upTFtoPL
upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
uptexdir/uppltotf.test uptexdir/uptftopl.test \
@@ -4617,23 +4477,23 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.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_148)
+ -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_149)
+ $(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
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_151)
+ $(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_150)
+ uptexdir/uptex_version.h $(am__append_135)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4665,7 +4525,7 @@ euptex_ch_srcs = \
# 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/.)
@@ -4745,7 +4605,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
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_83)
+ $(am__append_76)
@MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4761,7 +4621,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# 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_152)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_137)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4774,7 +4634,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
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_153)
+ $(am__append_138)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -4797,7 +4657,8 @@ pdftex_ch_srcs = \
#
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
@@ -5450,18 +5311,18 @@ libxetex = libxetex.a
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_111) \
- $(am__append_113)
+ $(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_114)
+ $(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@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_154)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_139)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5470,7 +5331,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
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_155)
+ $(am__append_140)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5502,7 +5363,7 @@ libxetex_a_SOURCES = xetexdir/XeTeXFontInst.cpp \
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_115) $(am__append_116)
+ 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)
@@ -5512,7 +5373,8 @@ libxetex_prereq = xetexd.h $(xetex_dependencies)
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)
@@ -5606,13 +5468,13 @@ aleph_tests = alephdir/aleph.test
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_125)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_126)
+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_127)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_120)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -5644,28 +5506,6 @@ pkgconfigdir = ${libdir}/pkgconfig
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0
-@PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
-@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
-
-@UPTEX_SYNCTEX_TRUE@uptex_ch_synctex = \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
-@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
-
@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
@@ -8370,14 +8210,6 @@ pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDE
pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
@rm -f pooltype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_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)
synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -8436,8 +8268,6 @@ uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf
$(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)
@@ -8668,9 +8498,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-psvgout.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ptfmin.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pooltype.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex-pool.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangle.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangleboot.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tex-tex-pool.Po@am__quote@ # am--include-marker
@@ -9251,7 +9078,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/libkanji_a-kanji.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/ptex-ptexextra.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/eptex-synctex.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/etex-synctex.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/euptex-synctex.Po@am__quote@ # am--include-marker
@@ -9262,10 +9088,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/pdftex-synctex.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/ptex-synctex.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/synctex-synctex_main.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/tex-synctex.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/uptex-synctex.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/xetex-synctex.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@uptexdir/$(DEPDIR)/libukanji_a-kanji.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po@am__quote@ # am--include-marker
@@ -18196,76 +18020,6 @@ pmpost-ptfmin.obj: ptfmin.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@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`
-ptexdir/ptex-ptexextra.o: ptexdir/ptexextra.c
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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`
-
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
@@ -18616,20 +18370,6 @@ uptexdir/uptex-uptexextra.obj: uptexdir/uptexextra.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
-@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`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@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
@@ -19995,9 +19735,6 @@ distclean: distclean-recursive
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
- -rm -f ./$(DEPDIR)/ptex-ptex0.Po
- -rm -f ./$(DEPDIR)/ptex-ptexini.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -20578,7 +20315,6 @@ distclean: distclean-recursive
-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
@@ -20589,10 +20325,8 @@ distclean: distclean-recursive
-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
@@ -20775,9 +20509,6 @@ maintainer-clean: maintainer-clean-recursive
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
- -rm -f ./$(DEPDIR)/ptex-ptex0.Po
- -rm -f ./$(DEPDIR)/ptex-ptexini.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -21358,7 +21089,6 @@ maintainer-clean: maintainer-clean-recursive
-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
@@ -21369,10 +21099,8 @@ maintainer-clean: maintainer-clean-recursive
-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
@@ -22090,29 +21818,6 @@ ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
# Generate ptex.ch
ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
$(tie_c) ptex.web $(ptex_ch_srcs)
-ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-ptexdir/pver.log: ptex$(EXEEXT)
-#pweb_tests = \
-# ptexdir/pbibtex.test \
-# ptexdir/pdvitype.test \
-# ptexdir/ppltotf.test \
-# ptexdir/ptftopl.test
-#pweb_tests += \
-# ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
-# ptexdir/pbibtex-mem.test ptexdir/nissya.test
-#pweb_tests += \
-# ptexdir/sample.test
-# ppPLtoTF/pTFtoPL
-#pweb_tests += \
-# ptexdir/yokotate.test ptexdir/skipjfmp.test
-ptexdir/pbibtex.log: pbibtex$(EXEEXT)
-ptexdir/pdvitype.log: pdvitype$(EXEEXT)
-ptexdir/ppltotf.log: ppltotf$(EXEEXT)
-ptexdir/ptftopl.log: ptftopl$(EXEEXT)
-ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
- ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
-ptexdir/sample.log: pdvitype$(EXEEXT)
-ptexdir/yokotate.log ptexdir/skipjfmp.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
.PHONY: ptrip-clean
@@ -22150,7 +21855,7 @@ eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
$(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
@@ -22218,8 +21923,11 @@ uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
$(up_tangle) uptftopl uptftopl
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 uptexdir/upkcat.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)
@@ -22259,9 +21967,9 @@ euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
# 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
@@ -22337,7 +22045,8 @@ pdftex.tex: $(srcdir)/pdftexdir/pdftex.web
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)
@@ -22480,7 +22189,8 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
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
diff --git a/source/texk/web2c/ac/web2c.ac b/source/texk/web2c/ac/web2c.ac
index 790cf96c67286c4a4be045271046a97d2679c962..2af9023627802c96f749d3e5e5ff91a419645283 100644
--- a/source/texk/web2c/ac/web2c.ac
+++ b/source/texk/web2c/ac/web2c.ac
@@ -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@tug.org>
@@ -31,9 +31,7 @@ dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS]
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]],
diff --git a/source/texk/web2c/am/web.am b/source/texk/web2c/am/web.am
index 8be8b6265483e8bbea689f5f81812cd08c3a4901..4a88f8d0c900596000deb5a5c5b825781f9d98e4 100644
--- a/source/texk/web2c/am/web.am
+++ b/source/texk/web2c/am/web.am
@@ -1,4 +1,4 @@
-## $Id: web.am 65338 2022-12-23 12:57:49Z 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 += badvf.* tests/xptmr*.vpl
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
##
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index 26002e335cb7761aa2bd6b0c8699076bd51412c9..f337967ad61ac808d7293a54cdedab0701ab2478 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -834,18 +834,10 @@ EUPTEX_SYNCTEX_FALSE
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
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 @@ Optional Features:
--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 @@ fi
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 @@ test "x$enable_web2c:$enable_eptex" = xyes:yes && {
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 :
@@ -22435,35 +22375,6 @@ esac
else
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=
@@ -22493,35 +22404,6 @@ esac
else
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=
@@ -23738,7 +23620,7 @@ else
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 @@ else
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 @@ if test -z "${ETEX_SYNCTEX_TRUE}" && test -z "${ETEX_SYNCTEX_FALSE}"; then
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 @@ if test -z "${EPTEX_SYNCTEX_TRUE}" && test -z "${EPTEX_SYNCTEX_FALSE}"; then
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
diff --git a/source/texk/web2c/configure.ac b/source/texk/web2c/configure.ac
index 2f2cb051d6277ed5f10bd67dd102ae705d34257f..383b9d206bf82534398697cc71ede312518f399a 100644
--- a/source/texk/web2c/configure.ac
+++ b/source/texk/web2c/configure.ac
@@ -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@tug.org>
@@ -206,12 +206,12 @@ m4_foreach([Kpse_Win], [kpse_mf_win],
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])
diff --git a/source/texk/web2c/cwebboot.cin b/source/texk/web2c/cwebboot.cin
index 212a8b704c5b9d2a50eea71c3d9b88141520a007..679cd46640c252676e22a127f4c22bb9f8cf40a2 100644
--- a/source/texk/web2c/cwebboot.cin
+++ b/source/texk/web2c/cwebboot.cin
@@ -621,8 +621,8 @@ fatal(_("! Cannot open output file "),tex_file_name);
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 @@ scan_args(void)
{
char*dot_pos;
char*name_pos;
-register char*s;
+char*s;
boolean found_web= false,found_change= false,found_out= false;
diff --git a/source/texk/web2c/cwebdir/ChangeLog b/source/texk/web2c/cwebdir/ChangeLog
index c6f2e58662984c3061b67c5f81ca87b4fd7444a1..1587dc98a6af1126800f7cfc0f2310c299e8d836 100644
--- a/source/texk/web2c/cwebdir/ChangeLog
+++ b/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,12 @@
+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'.
diff --git a/source/texk/web2c/cwebdir/comm-mac.ch b/source/texk/web2c/cwebdir/comm-mac.ch
index 6bad610d1bd0320447c9ecf9ca5171070a4e2128..7bf7151dd237d10b55d62edfc7247e488887d2f3 100644
--- a/source/texk/web2c/cwebdir/comm-mac.ch
+++ b/source/texk/web2c/cwebdir/comm-mac.ch
@@ -18,8 +18,8 @@ support |feof|, |getc|, and |ungetc| you may have to change things here.
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 @@ line endings, so that \.{CWEB} will works with ASCII files stored in
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) {
diff --git a/source/texk/web2c/cwebdir/common.c b/source/texk/web2c/cwebdir/common.c
index 2b5c7c9ccc6191c6d78160a1dc5dbe5b15547a8e..635c4dfaf9b86c23030a30c089ba26a021b4bfac 100644
--- a/source/texk/web2c/cwebdir/common.c
+++ b/source/texk/web2c/cwebdir/common.c
@@ -453,8 +453,8 @@ fatal("! Cannot open output file ",tex_file_name);
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 @@ scan_args(void)
{
char*dot_pos;
char*name_pos;
-register char*s;
+char*s;
boolean found_web= false,found_change= false,found_out= false;
diff --git a/source/texk/web2c/cwebdir/common.w b/source/texk/web2c/cwebdir/common.w
index 4ec17241c3b72a6ab2471d02b9935fc4c3bb0d44..5d7d5f50d01a37096937b53bfe1a51d470378547 100644
--- a/source/texk/web2c/cwebdir/common.w
+++ b/source/texk/web2c/cwebdir/common.w
@@ -157,8 +157,8 @@ support |feof|, |getc|, and |ungetc| you may have to change things here.
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 @@ scan_args(void)
{
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? */
diff --git a/source/texk/web2c/eptexdir/am/eptex.am b/source/texk/web2c/eptexdir/am/eptex.am
index 1d92ac55b38856644782b4590265820832afaa54..286b570bc3fd310ed7db46590086a0d5f0101b09 100644
--- a/source/texk/web2c/eptexdir/am/eptex.am
+++ b/source/texk/web2c/eptexdir/am/eptex.am
@@ -1,4 +1,4 @@
-## $Id: eptex.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: eptex.am 65543 2023-01-15 05:09:14Z takuji $
## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX.
##
## Copyright 2015-2022 Karl Berry <tex-live@tug.org>
@@ -9,6 +9,7 @@
##
if EPTEX
bin_PROGRAMS += eptex
+bin_links += eptex$(EXEEXT):ptex
endif EPTEX
EXTRA_PROGRAMS += eptex
@@ -89,10 +90,10 @@ EXTRA_DIST += \
# 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
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)
EXTRA_DIST += $(eptex_tests)
diff --git a/source/texk/web2c/euptexdir/am/euptex.am b/source/texk/web2c/euptexdir/am/euptex.am
index abaff7dc1e1d9ec963ee6470523fcf263ca9bba1..da74ce71bc2e72e600564a63f512955448283dbc 100644
--- a/source/texk/web2c/euptexdir/am/euptex.am
+++ b/source/texk/web2c/euptexdir/am/euptex.am
@@ -1,4 +1,4 @@
-## $Id: euptex.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: euptex.am 65543 2023-01-15 05:09:14Z takuji $
## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX.
##
## Copyright 2015-2022 Karl Berry <tex-live@tug.org>
@@ -9,6 +9,7 @@
##
if EUPTEX
bin_PROGRAMS += euptex
+bin_links += euptex$(EXEEXT):uptex
endif EUPTEX
EXTRA_PROGRAMS += euptex
@@ -90,10 +91,10 @@ EXTRA_DIST += \
# e-upTeX Tests
#
-euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
-euptexdir/euptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
+euptex_tests = euptexdir/euptriptest.test euptexdir/eptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test euptexdir/wcfname.test
+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)
EXTRA_DIST += $(euptex_tests)
diff --git a/source/texk/web2c/lib/ChangeLog b/source/texk/web2c/lib/ChangeLog
index bd28a2845726d8edd9f2d960cc55d1607ab3b757..954012a8ae0162b2bc4e5e694c779325825e7be3 100644
--- a/source/texk/web2c/lib/ChangeLog
+++ b/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2023-01-01 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
+
+ * printversion.c: Update copyright year.
+
2022-12-22 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* texmfmp.c:
diff --git a/source/texk/web2c/lib/Makefile.am b/source/texk/web2c/lib/Makefile.am
index 927a2d7c9765bd2add31b3e23cadca44d09b5690..cc0f5c789028ab25f2df4b65e878a6fff5007218 100644
--- a/source/texk/web2c/lib/Makefile.am
+++ b/source/texk/web2c/lib/Makefile.am
@@ -10,9 +10,9 @@ AM_CFLAGS = $(WARNING_CFLAGS)
@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'
diff --git a/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in
index f9a9388fb6d56834657954cf2904e64d87cd3f00..23e7fe3239f89b862dadfd777b28ef5e6b143aeb 100644
--- a/source/texk/web2c/lib/Makefile.in
+++ b/source/texk/web2c/lib/Makefile.in
@@ -88,7 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@PTEX_TRUE@am__append_1 = libp.a
+@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 \
diff --git a/source/texk/web2c/lib/printversion.c b/source/texk/web2c/lib/printversion.c
index 7948159f9565af8a95b4bb67427c55c3d1203c91..dda73e70c7d9927278c6807e98aa10af2f7c69c9 100644
--- a/source/texk/web2c/lib/printversion.c
+++ b/source/texk/web2c/lib/printversion.c
@@ -56,7 +56,7 @@ printversionandexit (const_string banner,
#endif
if (copyright_holder) {
- printf ("Copyright 2022 %s.\n", copyright_holder);
+ printf ("Copyright 2023 %s.\n", copyright_holder);
if (!author)
author = copyright_holder;
}
diff --git a/source/texk/web2c/lib/texmfmp.c b/source/texk/web2c/lib/texmfmp.c
index b73403135bedf28a75777e22d01d33117c3ac8f9..5bb7032242b0162a5d462cf6f6c3a2b3d37976a3 100644
--- a/source/texk/web2c/lib/texmfmp.c
+++ b/source/texk/web2c/lib/texmfmp.c
@@ -853,7 +853,7 @@ maininit (int ac, string *av)
/* 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);
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index a42149f4fc9ac0d9ba384ba1ec91541486c975f5..cfbc8af82abfe5cf8345c492c53f913449871890 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1,4 +1,4 @@
#ifndef luatex_svn_revision_h
#define luatex_svn_revision_h
-#define luatex_svn_revision 7555
+#define luatex_svn_revision 7556
#endif
diff --git a/source/texk/web2c/man/Makefile.am b/source/texk/web2c/man/Makefile.am
index 7ba3ae5443682ba029439f397b3bf8af18743a62..ba4bd97ce180164e74feffa3a4b283d9d1cde664 100644
--- a/source/texk/web2c/man/Makefile.am
+++ b/source/texk/web2c/man/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 62186 2022-02-26 17:51:21Z karl $
+## $Id: Makefile.am 65543 2023-01-15 05:09:14Z takuji $
## Makefile.am for the TeX Live subdirectory texk/web2c/man/
##
## Copyright 2015-2022 Karl Berry <tex-live@tug.org>
@@ -54,14 +54,14 @@ endif PDFTEX
pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
EXTRA_DIST += $(pdftex_man_sources)
-if PTEX
+if EPTEX
man_sources += ptex.man
man1_links += ptex:eptex ptex:euptex ptex:uptex
man_sources += ppltotf.man ptftopl.man
man1_links += ppltotf:uppltotf ptftopl:uptftopl
man_sources += pbibtex.man
man1_links += pbibtex:upbibtex
-endif PTEX
+endif EPTEX
EXTRA_DIST += ptex.man ppltotf.man ptftopl.man pbibtex.man
if LUATEX
diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in
index 7122228cf97fe06bd0d057426dea948c8748019d..6ec8fdd61fb65c583fcee5aa0c76fe9488e2a7b1 100644
--- a/source/texk/web2c/man/Makefile.in
+++ b/source/texk/web2c/man/Makefile.in
@@ -97,10 +97,10 @@ host_triplet = @host@
@ETEX_TRUE@am__append_8 = etex.man
@PDFTEX_TRUE@am__append_9 = $(pdftex_man_sources)
@PDFTEX_TRUE@am__append_10 = pdftex:pdflatex
-@PTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
-@PTEX_TRUE@ pbibtex.man
-@PTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
-@PTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
+@EPTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
+@EPTEX_TRUE@ pbibtex.man
+@EPTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
+@EPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
@LUATEX_TRUE@am__append_13 = luatex.man
@LUATEX_TRUE@am__append_14 = luatex:texlua luatex:texluac \
@LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \
diff --git a/source/texk/web2c/pdftexdir/am/pdftex.am b/source/texk/web2c/pdftexdir/am/pdftex.am
index dc70de5469f78262786efcde13b15981a17b85fa..24ef946728a5a55fe659139982cdf65339882c59 100644
--- a/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -1,4 +1,4 @@
-## $Id: pdftex.am 65338 2022-12-23 12:57:49Z takuji $
+## $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@tug.org>
@@ -105,11 +105,13 @@ EXTRA_DIST += \
#
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 @@ DISTCLEANFILES += cnfline.log
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)
diff --git a/source/texk/web2c/ptexdir/am/ptex.am b/source/texk/web2c/ptexdir/am/ptex.am
index f23082d322cfe1b1264e2e33121deb7dc5f981d5..c45a1acd6b76f83a1adba8b2692333656f65128c 100644
--- a/source/texk/web2c/ptexdir/am/ptex.am
+++ b/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,4 +1,4 @@
-## $Id: ptex.am 65338 2022-12-23 12:57:49Z takuji $
+## $Id: ptex.am 65543 2023-01-15 05:09:14Z takuji $
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
## Copyright 2015-2022 Karl Berry <tex-live@tug.org>
@@ -8,9 +8,7 @@
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
## pTeX library
##
@@ -25,27 +23,8 @@ EXTRA_LIBRARIES += libkanji.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-## pTeX
-##
-if PTEX
-bin_PROGRAMS += ptex
-endif PTEX
-#if PWEB
-#bin_PROGRAMS += $(pweb_programs)
-#endif PWEB
-#EXTRA_PROGRAMS += ptex $(pweb_programs)
-
ptex_CPPFLAGS = $(ptex_cppflags)
-# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs)
-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
-
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
ptex_prereq = ptexd.h ptexdir/ptex_version.h
$(ptex_OBJECTS): $(ptex_prereq)
@@ -92,75 +71,7 @@ EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \
ptex.p ptex.pool ptex-tangle
-## pBibTeX
-##
-#nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
-#pbibtex_SOURCES = ptexdir/kanji.h
-#pbibtex_CPPFLAGS = $(ptex_cppflags)
-#pbibtex_LDADD = $(ptex_ldadd)
-#pbibtex_DEPENDENCIES = $(ptex_dependencies)
-#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
-#EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
-
-## pDVItype
-##
-#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)
-#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
-#EXTRA_DIST += ptexdir/pdvitype.ch
-
-## pPLtoTF
-##
-#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)
-#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
-#EXTRA_DIST += ptexdir/ppltotf.ch
-
-## pTFtoPL
-##
-#nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
-#ptftopl_SOURCES = ptexdir/kanji.h
-#ptftopl_CPPFLAGS = $(ptex_cppflags)
-#ptftopl_LDADD = $(ptex_ldadd)
-#ptftopl_DEPENDENCIES = $(ptex_dependencies)
-#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
-#EXTRA_DIST += ptexdir/ptftopl.ch
-
-##
+##
EXTRA_DIST += \
ptexdir/COPYRIGHT \
ptexdir/COPYRIGHT.jis \
@@ -169,53 +80,10 @@ EXTRA_DIST += \
ptexdir/INSTALL.txt \
ptexdir/README.txt
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
-ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-ptexdir/pver.log: ptex$(EXEEXT)
-#pweb_tests = \
-# ptexdir/pbibtex.test \
-# ptexdir/pdvitype.test \
-# ptexdir/ppltotf.test \
-# ptexdir/ptftopl.test
-## pBibTeX
-#pweb_tests += \
-# ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
-# ptexdir/pbibtex-mem.test ptexdir/nissya.test
-## pDviType
-#pweb_tests += \
-# ptexdir/sample.test
-# ppPLtoTF/pTFtoPL
-#pweb_tests += \
-# ptexdir/yokotate.test ptexdir/skipjfmp.test
-ptexdir/pbibtex.log: pbibtex$(EXEEXT)
-ptexdir/pdvitype.log: pdvitype$(EXEEXT)
-ptexdir/ppltotf.log: ppltotf$(EXEEXT)
-ptexdir/ptftopl.log: ptftopl$(EXEEXT)
-ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
- ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
-ptexdir/sample.log: pdvitype$(EXEEXT)
-ptexdir/yokotate.log ptexdir/skipjfmp.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
-
-EXTRA_DIST += $(ptex_tests) $(pweb_tests)
-DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
- $(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
-
-if PTEX
-TESTS += $(ptex_tests)
-TRIPTRAP += ptrip.diffs
-TRIPTRAP_CLEAN += ptrip-clean
-endif PTEX
-if PWEB
-TESTS += $(pweb_tests)
-endif PWEB
-
## Test data and results
##
## ptexdir/nissya.test
-EXTRA_DIST += ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
- ptexdir/tests/nissya_bib.bbl
+EXTRA_DIST += ptexdir/tests/nissya.bst ptexdir/tests/sample.bib
DISTCLEANFILES += ptests/nissya_bib.*
## ptexdir/pbibtex.test
EXTRA_DIST += tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib tests/enc-sjis.bib \
@@ -224,7 +92,7 @@ EXTRA_DIST += tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib tests/enc-
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
DISTCLEANFILES += ptests/xexampl.aux ptests/xexampl.bbl ptests/xexampl.blg \
- ptests/xenc*.*
+ ptests/xenc*.* ptests/fn*.*
## ptexdir/pbibtex-mem.test
EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
DISTCLEANFILES += ptests/memtest.bib ptests/memtest?.*
diff --git a/source/texk/web2c/synctexdir/ChangeLog b/source/texk/web2c/synctexdir/ChangeLog
index 6304c2abce73b233a7b2bb15898e50bf56fca304..ede9fe64547a344dd208f26cee62cfbafdcb50c0 100644
--- a/source/texk/web2c/synctexdir/ChangeLog
+++ b/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2023-01-15 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * am/synctex.am: Remove ptex and uptex.
+
2022-08-30 Karl Berry <karl@freefriends.org>
* man1/synctex.1,
diff --git a/source/texk/web2c/synctexdir/am/synctex.am b/source/texk/web2c/synctexdir/am/synctex.am
index 19c0875a7ac3f171dc9c5cf980d321c1bd642138..fa223285ef853436c1c1f6df0de45279ec759f4d 100644
--- a/source/texk/web2c/synctexdir/am/synctex.am
+++ b/source/texk/web2c/synctexdir/am/synctex.am
@@ -151,72 +151,6 @@ EXTRA_DIST += \
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
diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am
index ef236061c9ec3ade3dbb9445333b5f4721e8e0f6..36182cea17aca39b0ccdfab44109dd9cbca7c831 100644
--- a/source/texk/web2c/uptexdir/am/uptex.am
+++ b/source/texk/web2c/uptexdir/am/uptex.am
@@ -1,4 +1,4 @@
-## $Id: uptex.am 65338 2022-12-23 12:57:49Z takuji $
+## $Id: uptex.am 65543 2023-01-15 05:09:14Z takuji $
## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
##
## Copyright 2016-2022 Karl Berry <tex-live@tug.org>
@@ -20,9 +20,9 @@ libukanji_a_CPPFLAGS = $(uptex_cppflags)
## upTeX
##
-if UPTEX
-bin_PROGRAMS += uptex
-endif UPTEX
+#if UPTEX
+#bin_PROGRAMS += uptex
+#endif UPTEX
if UPWEB
bin_PROGRAMS += $(upweb_programs)
endif UPWEB
@@ -165,9 +165,9 @@ EXTRA_DIST += \
uptexdir/ChangeLog
# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test
+#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 uptexdir/upkcat.log: uptex$(EXEEXT)
+uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log: uptex$(EXEEXT)
upweb_tests = \
uptexdir/upbibtex.test \
uptexdir/updvitype.test \
@@ -198,11 +198,11 @@ EXTRA_DIST += $(uptex_tests) $(upweb_tests)
DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \
$(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web)
-if UPTEX
-TESTS += $(uptex_tests)
-TRIPTRAP += uptrip.diffs
-TRIPTRAP_CLEAN += uptrip-clean
-endif UPTEX
+#if UPTEX
+#TESTS += $(uptex_tests)
+#TRIPTRAP += uptrip.diffs
+#TRIPTRAP_CLEAN += uptrip-clean
+#endif UPTEX
if UPWEB
TESTS += $(upweb_tests)
endif UPWEB
@@ -214,7 +214,7 @@ DISTCLEANFILES += uptests/nissya_bib.*
## uptexdir/upbibtex.test
EXTRA_DIST += tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl tests/enc-uu.bbl
DISTCLEANFILES += uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
- uptests/xenc*.*
+ uptests/xenc*.* uptests/fn*.*
## uptexdir/upbibtex-mem.test
DISTCLEANFILES += uptests/memtest.bib uptests/memtest?.*
## uptexdir/updvitype.test
diff --git a/source/texk/web2c/xetexdir/am/xetex.am b/source/texk/web2c/xetexdir/am/xetex.am
index bdfc3281187b1b182267c1b1ef079dfda670b354..cad6eb4d15c19b1526980feecf7decb76d5a1225 100644
--- a/source/texk/web2c/xetexdir/am/xetex.am
+++ b/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,4 +1,4 @@
-## $Id: xetex.am 65338 2022-12-23 12:57:49Z takuji $
+## $Id: xetex.am 65380 2022-12-28 08:09:52Z takuji $
## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
##
## Copyright 2017-2022 Karl Berry <tex-live@tug.org>
@@ -204,8 +204,10 @@ EXTRA_DIST += \
xetex_tests = \
xetexdir/xetex-filedump.test \
xetexdir/xetex-bug73.test \
- xetexdir/xetex.test
-xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+ xetexdir/xetex.test \
+ xetexdir/wcfname.test
+xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log \
+ xetexdir/wcfname.log: xetex$(EXEEXT)
EXTRA_DIST += $(xetex_tests)
@@ -221,4 +223,7 @@ DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex
EXTRA_DIST += xetexdir/tests/filedump.log xetexdir/tests/filedump.tex
DISTCLEANFILES += filedump.log filedump.out filedump.tex
+## wcfname.test
+DISTCLEANFILES += xetests/fn*.*
+
# (end of xetex.am)
diff --git a/source/utils/configure b/source/utils/configure
index b2189ed330b14bdbc5a5ad35c83eb8cb9d8ea29a..c72c2da3b3628cee42cd0beb36be9a4402d8233b 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -739,12 +739,8 @@ enable_tex
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
@@ -1453,12 +1449,8 @@ Optional Features:
--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
@@ -3952,28 +3944,6 @@ fi
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 :
@@ -3996,28 +3966,6 @@ test "x$enable_web2c:$enable_eptex" = xyes:yes && {
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 :