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 rev. 7308 .
Browse files Browse the repository at this point in the history
git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7309 0b2b3880-5936-4365-a048-eb17d2e5a6bf
  • Loading branch information
luigiScarso committed Mar 13, 2020
1 parent 2b723bb commit ecae8aa
Show file tree
Hide file tree
Showing 69 changed files with 3,478 additions and 4,649 deletions.
6 changes: 3 additions & 3 deletions manual/luatex-backend.tex
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@

\stopsubsection

\startsubsection[title={\type {getsize}, \type {getversion}, \type {getnofobjects}, \type {getnofpages}}]
\startsubsection[title={\type {getsize}, \type {getversion}, \type {getnofobjects}, \type {getnofpages}, \type{getmemoryusage}}]

\libindex {getsize}
\libindex {getversion}
Expand All @@ -641,7 +641,7 @@
major, minor = getversion(<pdfe document>)
n = getnofobjects(<pdfe document>)
n = getnofpages(<pdfe document>)
bytes, waste = getnofpages(<pdfe document>)
bytes, waste = getmemoryusage(<pdfe document>)
\stoptyping

\stopsubsection
Expand Down Expand Up @@ -797,7 +797,7 @@
\DB type \BC meaning \BC value \BC detail \NC \NR
\NC \type {0} \NC none \NC nil \NC \NC \NR
\NC \type {1} \NC null \NC nil \NC \NC \NR
\NC \type {2} \NC boolean \NC boolean \NC \NC \NR
\NC \type {2} \NC boolean \NC 1 or 0 \NC \NC \NR
\NC \type {3} \NC integer \NC integer \NC \NC \NR
\NC \type {4} \NC number \NC float \NC \NC \NR
\NC \type {5} \NC name \NC string \NC \NC \NR
Expand Down
2 changes: 1 addition & 1 deletion manual/luatex-callbacks.tex
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ \subsection{\type {append_to_vlist_filter}}
It is ok to return nothing in which case you also need to flush the box or deal
with it yourself. The prevdepth is also optional. Locations are \type {box},
\type {alignment}, \type {equation}, \type {equation_number} and \type
{post_linebreak}.
{post_linebreak}. You can pass \type {nil} instead of a node.

\subsection{\cbk {post_linebreak_filter}}

Expand Down
2 changes: 1 addition & 1 deletion manual/luatex-math.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ \subsection{Script commands \lpr {Unosuperscript} and \lpr {Unosubscript}}
$
\stopbuffer
\typebuffer
\typebuffer[script]
results in \inlinebuffer[script].
Expand Down
7 changes: 4 additions & 3 deletions manual/luatex-tex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1957,15 +1957,16 @@ \subsubsection{\type {getlocallevel}}
\libindex{write}
\startfunctioncall
texio.write(<string> target, <string> s, ...)
texio.write(<string> target | <integer> stream, <string> s, ...)
texio.write(<string> s, ...)
\stopfunctioncall
Without the \type {target} argument, writes all given strings to the same
location(s) \TEX\ writes messages to at this moment. If \prm {batchmode} is in
effect, it writes only to the log, otherwise it writes to the log and the
terminal. The optional \type {target} can be one of three possibilities: \type
{term}, \type {log} or \type {term and log}.
terminal. The optional \type {target} can be one of four possibilities: \type
{term}, \type {log}, \type {term and log} or a valid integer of a stream
opened for writing.
Note: If several strings are given, and if the first of these strings is or might
be one of the targets above, the \type {target} must be specified explicitly to
Expand Down
Binary file modified manual/luatex.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion manual/luatex.tex
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
\startdocument
[manual=Lua\TeX,
status=stable,
version=1.10]
version=1.12]

\startnotmode[*export]
\component luatex-titlepage
Expand Down
4 changes: 4 additions & 0 deletions source/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2020-03-06 Karl Berry <[email protected]>

* .travis.yml: attempt to reenable musl build on github.

2020-01-31 Karl Berry <[email protected]>

* Makefile.am (texlinks_dir): now texk/texlive/tl_support
Expand Down
19 changes: 13 additions & 6 deletions source/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 53479 2020-01-21 17:56:03Z karl $
$Id: README 54144 2020-03-06 23:51:39Z karl $
Public domain. Originally written 2005 by Karl Berry.

For a high-level overview of building TeX Live, see
Expand Down Expand Up @@ -33,15 +33,22 @@ aarch64-linux:
./Build --enable-arm-neon=check

i386-netbsd, amd64-netbsd:
gcc version 4.5.3 (NetBSD nb2 20110806)
NetBSD/amd64 6.1.3
TL_MAKE=gmake CC=gcc CXX=g++ CFLAGS=-D_NETBSD_SOURCE \
LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \
NetBSD/amd64 9.0
gcc version 7.4.0 (nb3 20190319)
TL_MAKE=gmake CC=gcc CXX=g++ \
CFLAGS=-D_NETBSD_SOURCE \
CXXFLAGS='-D_NETBSD_SOURCE -std=c++11' \
LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \
./Build --enable-xindy CLISP=/usr/local/bin/clisp
Except that we take Nelson's asy build.

i386-freebsd, amd64-freebsd:
http://anthesphoria.net/FreeBSD/TeXLive-2018/ has details for 2018.
2019 built on contextgarden, see below.
2019 and forward built on contextgarden (see below).
In 2020: FreeBSD 12.1-RELEASE-p1
(e.g.,
https://build.contextgarden.net/#/builders/56/builds/141/steps/2/logs/build _info
) Except that we take Nelson's asy build.

i386-linux: see travis below.

Expand Down
12 changes: 6 additions & 6 deletions source/README.0overview
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
2 Overview of build system
**************************

The TeX Live build system was redesigned in 2009, consistently using
Autoconf, Automake, and Libtool. Thus
The TeX Live build system was redesigned in 2009 to consistently use
Autoconf, Automake, and Libtool. Thus, running
'configure && make && make check && make install'
or the basically-equivalent top-level 'Build' script suffice to build
or the essentially-equivalent top-level 'Build' script suffices to build
and install the TL programs. The 'make check' clause performs various
tests of the generated programs--not strictly required but strongly
recommended. Running 'configure --help' will display a comprehensive
Expand All @@ -34,7 +34,7 @@ program and library module (or package) specifies its own requirements
and properties, such as required libraries, whether an installed
(system) version of a library can be used, 'configure' options to be
seen at the top level, and more. An explicit list of all available
modules is kept in only one central place, namely 'm4/kpse-pkgs.m4'.
modules is kept in a single central place: 'm4/kpse-pkgs.m4'.

A second, related goal is to configure and build each library before
configuring any other (program or library) module which uses that
Expand All @@ -47,6 +47,6 @@ independently. The corresponding modules use (most of) the distributed
source tree and document any modifications of that source.

All this is for the sake of simplifying both upgrading of modules and
integrating new modules into the TL build system. (Not to say that
either task is trivial.)
integrating new modules into the TL build system. (Despite all efforts,
neither task is easy.)

39 changes: 19 additions & 20 deletions source/README.1prerequisites
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,37 @@
***************

Overall, building the TeX Live programs, when using all libraries from
the TL source tree, requires only C and C++ compilers and GNU 'make'.
(If 'make' from your 'PATH' is not GNU make, you can set 'MAKE' in the
environment to whatever is necessary.)
the TL source tree, requires C and C++11 compilers and GNU 'make'. If
'make' from your 'PATH' is not GNU make, you can set the 'MAKE'
environment variable to whatever is necessary.

GNU 'make' is required only because of some third-party libraries,
notably FreeType; all the TL-maintained directories (and
Automake/Autoconf output in general) should work with any reasonable
'make'.
Automake/Autoconf output in general) work with any reasonable 'make'.

However, a few programs in the tree have additional requirements:
A C++11 compiler is similarly required because of the third-party
libraries ICU and Poppler; the program 'dvisvgm' also requires C++11.
It is possible to build everything else with older compilers, but you
have to remove the C++11-dependent sources. *Note Build one package::.

'dvisvgm'
requires a C++11 compiler, such as gcc 4.8.1 (or later) or clang
3.3 (or later).
A few programs in the tree have additional requirements:

'web2c'
requires 'perl' for some tests run by 'make check'.

'xdvik'
'xpdfopen'
require X11 headers and libraries, often in "development" packages
that are not installed by default.
require X11 headers and libraries, typically in "development"
packages that are not installed by default.

'xetex'
requires 'fontconfig' (again both headers and library), or, for
MacOSX only, the 'ApplicationServices' and 'Cocoa' frameworks.

'xindy'
requires GNU 'clisp' and in addition 'perl', 'latex', and
'pdflatex' to build the rules and/or documentation.
requires GNU 'clisp', 'libsigsegv', and 'libiconv'; additionally,
to build the rules and/or documentation: 'perl', 'latex',
'pdflatex'.

Lacking the required tools, building these programs must avoided, e.g.,
'configure --without-x --disable-xetex --disable-xindy'
Expand All @@ -44,23 +45,21 @@ Lacking the required tools, building these programs must avoided, e.g.,
expect:

* Modification of any '.y' or '.l' source files requires 'bison' or
'flex' to updatete the corresponding C sources.
'flex' to update the corresponding C sources.

* Modification of the sources for '.info' files requires 'makeinfo'.

* Modification of any part of the build system (M4 macros,
'configure.ac', 'Makefile.am', or their fragments) requires GNU M4,
GNU Autoconf, GNU Automake, and GNU Libtool to update the generated
files. *Note Build system tools::.
files. Furthermore, to reliably reproduce the build files, the
original GNU releases of these tools must be used, not any distro
packaging of them. *Note Build system tools::, for more
discussion.

If you haven't modified any source files, and infrastructure tools
such as 'autoconf' or 'makeinfo' are still being run, check your
timestamps--notably, 'use-commit-times' must be set to 'yes' in your
Subversion configuration (*note Build system tools::). Barring buggy
commits, no infrastructure tools are needed to do a normal build.

As an example, on Debian systems the necessary build dependencies can
be installed via:

apt-get install libfontconfig-dev libx11-dev libxmu-dev libxaw7-dev

Loading

0 comments on commit ecae8aa

Please sign in to comment.