Skip to content
This repository has been archived by the owner on Mar 6, 2023. It is now read-only.

Commit

Permalink
sync with experimental revision 7087.
Browse files Browse the repository at this point in the history
git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7088 0b2b3880-5936-4365-a048-eb17d2e5a6bf
  • Loading branch information
luigiScarso committed Feb 22, 2019
1 parent 756f6b6 commit 3894e6f
Show file tree
Hide file tree
Showing 77 changed files with 4,723 additions and 1,495 deletions.
31 changes: 17 additions & 14 deletions source/build-aux/texinfo.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
\def\texinfoversion{2019-01-03-15}
\def\texinfoversion{2019-02-16.14}

%
% Copyright 1985, 1986, 1988, 1990-2018 Free Software Foundation, Inc.
% Copyright 1985, 1986, 1988, 1990-2019 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
Expand Down Expand Up @@ -5872,7 +5872,9 @@
\divide\doublecolumnhsize by 2
\hsize = \doublecolumnhsize
%
% Double the \vsize as well.
% Get the available space for the double columns -- the normal
% (undoubled) page height minus any material left over from the
% previous page.
\advance\vsize by -\ht\partialpage
\vsize = 2\vsize
%
Expand All @@ -5886,16 +5888,13 @@
\def\doublecolumnout{%
%
\splittopskip=\topskip \splitmaxdepth=\maxdepth
% Get the available space for the double columns -- the normal
% (undoubled) page height minus any material left over from the
% previous page.
\dimen@ = \vsize
\divide\dimen@ by 2
%
% box0 will be the left-hand column, box2 the right.
\setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@
\global\advance\vsize by 2\ht\partialpage
\onepageout\pagesofar
\onepageout\pagesofar % empty except for the first time we are called
\unvbox\PAGE
\penalty\outputpenalty
}
Expand Down Expand Up @@ -5978,13 +5977,14 @@
\def\balancecolumns{%
\setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120.
\dimen@ = \ht0
\advance\dimen@ by \topskip
\advance\dimen@ by-\baselineskip
\ifdim\dimen@<5\baselineskip
\ifdim\dimen@<7\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
\global\setbox\balancedcolumns=\vbox{\pagesofar}%
\else
% double the leading vertical space
\advance\dimen@ by \topskip
\advance\dimen@ by-\baselineskip
\divide\dimen@ by 2 % target to split to
\dimen@ii = \dimen@
\splittopskip = \topskip
Expand Down Expand Up @@ -7515,7 +7515,7 @@
\nonfillstart
\tt % easiest (and conventionally used) font for verbatim
% The \leavevmode here is for blank lines. Otherwise, we would
% never \starttabox and the \egroup would end verbatim mode.
% never \starttabbox and the \egroup would end verbatim mode.
\def\par{\leavevmode\egroup\box\verbbox\endgraf}%
\tabexpand
\setupmarkupstyle{verbatim}%
Expand Down Expand Up @@ -7578,9 +7578,12 @@
{%
\makevalueexpandable
\setupverbatim
\indexnofonts % Allow `@@' and other weird things in file names.
\wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
\input #1
{%
\indexnofonts % Allow `@@' and other weird things in file names.
\wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
\edef\tmp{\noexpand\input #1 }
\expandafter
}\tmp
\afterenvbreak
}%
}
Expand Down
4 changes: 2 additions & 2 deletions source/configure
Original file line number Diff line number Diff line change
Expand Up @@ -22479,11 +22479,11 @@ msg_compiling="$msg_compiling
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
** Configuration summary for $PACKAGE_STRING (2019/dev$with_banner_add):
** Configuration summary for $PACKAGE_STRING (2019$with_banner_add):

$msg_compiling" >&5
$as_echo "
** Configuration summary for $PACKAGE_STRING (2019/dev$with_banner_add):
** Configuration summary for $PACKAGE_STRING (2019$with_banner_add):

$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
Expand Down
4 changes: 2 additions & 2 deletions source/doc/build-tools.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.16.1
bison (GNU Bison) 3.2.3
bison (GNU Bison) 3.3.1
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
m4 (GNU M4) 1.4.18
makeinfo (GNU texinfo) 6.5
makeinfo (GNU texinfo) 6.6
2 changes: 1 addition & 1 deletion source/doc/tlbuild-incl/install-tl.texi
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ the current system are present. The installation will continue as
usual, but at the end all files from @emph{path} are copied over to
@code{bin/custom/} under your installation directory and this @code{bin/custom/}
directory is what will be added to the path for the post-install
actions. To install multiple custom binary sets, manully rename
actions. To install multiple custom binary sets, manually rename
@code{custom} before doing each.

For more information on custom binaries, see
Expand Down
Loading

0 comments on commit 3894e6f

Please sign in to comment.