Skip to content

Commit

Permalink
Merge branch 'develop' into lab-review-02
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrike Fischer committed Jul 18, 2023
2 parents b0dc6b3 + 2793892 commit 1149553
Show file tree
Hide file tree
Showing 37 changed files with 1,116 additions and 1,070 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/cache.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ jobs:
- module: required/latex-lab
config: config-graphic
- module: required/latex-lab
config: config-minipage
config: config-minipage
- module: required/latex-lab
config: config-float
- module: required/latex-lab
config: config-bib
config: config-bib
- module: required/tools
name: "Tests: ${{ matrix.module }}${{ matrix.config && format(' - {0}', matrix.config) || ''}}${{ matrix.engine && format(' - {0}', matrix.engine) || ''}}"
needs: texlive-cache
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
name: Send notifications
runs-on: ubuntu-20.04
# Run after the `l3build` job in order to be able to react to it's output.
needs:
needs:
- l3build
- docs
# Only run if the tests failed, we don't want to get notifications for every run.
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/pretest.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Automated testing with TeX Live pretest

# Currently we run in two situations:
# We only run when manually triggered
on:
workflow_dispatch:

Expand All @@ -23,7 +23,7 @@ jobs:
# different workflows.
package_file: .github/tl_packages
repository: https://pretest.math.hamburg/
cache_version: 0-2023
cache_version: 0-pretest
# The l3build job contains the actual work. We misuse the matrix mechanism to
# create three jobs which only differ in minimal elements.
# For tags we do not run this since we run the release job instead.
Expand Down Expand Up @@ -79,11 +79,21 @@ jobs:
- module: required/latex-lab
config: config-OR-luatex
- module: required/latex-lab
config: config-sec-tagging
config: config-sec
- module: required/latex-lab
config: config-toc-tagging
config: config-toc
- module: required/latex-lab
config: config-block-tagging
- module: required/latex-lab
config: config-LM-tagging
- module: required/latex-lab
config: config-graphic
- module: required/latex-lab
config: config-minipage
- module: required/latex-lab
config: config-float
- module: required/latex-lab
config: config-bib
- module: required/tools
name: "Tests: ${{ matrix.module }}${{ matrix.config && format(' - {0}', matrix.config) || ''}}${{ matrix.engine && format(' - {0}', matrix.engine) || ''}}"
needs: texlive-cache
Expand Down
5 changes: 5 additions & 0 deletions base/changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================

2023-07-10 Yukai Chou <muzimuzhi@gmail.com>

* ltfilehook.dtx (subsection{Declaring a file substitution}):
Drop a redundant \ExplSyntaxOff

2023-06-12 Joseph Wright <Joseph.Wright@latex-project.org>

* usrguide.tex
Expand Down
2 changes: 1 addition & 1 deletion base/doc/lb2.err
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\newcommand\erratafiledate{2014-09-30}
\newcommand\erratafiledate{2014/09/30}

\def\comando#1{\texttt{\string#1}}

Expand Down
2 changes: 1 addition & 1 deletion base/doc/lgc2.err
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\newcommand\erratafiledate{2008-06-13}
\newcommand\erratafiledate{2008/06/13}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% To produce a printed version of this errata file run this file through
Expand Down
2 changes: 1 addition & 1 deletion base/doc/tlc2.err
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\newcommand\erratafiledate{2023-01-08}
\newcommand\erratafiledate{2023/01/08}

\def\comando#1{\texttt{\string#1}}

Expand Down
36 changes: 29 additions & 7 deletions base/doc/tlc3.err
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\newcommand\erratafiledate{2023-05-30}
\newcommand\erratafiledate{2023/07/18}

\def\comando#1{\texttt{\string#1}}

Expand Down Expand Up @@ -358,11 +358,11 @@ you own by changing the configuration in the file \texttt{\jobname.cfg}.

Any mistake found and reported is a gain for all readers of our book.
For this reason Addison-Wesley and the authors offer a prize (for 5
periods) to the eligible person who finds the largest
number of bugs during that period (in case of a draw a random choice
will be made between all those with the largest number of findings).
A person can receive at most one prize, ever; errors found by any of
the authors do not count.
periods) to the eligible person who finds the largest number of bugs
during that period (more precisely, it is a lottery among the people
with the 5 top-most findings up to that point). A person can receive
at most one prize, ever; errors found by any of the authors do not
count.

Each prize is a free choice of any single computing book found on the
Addison-Wesley/Pearson web site:
Expand Down Expand Up @@ -541,6 +541,14 @@ section.
Some corrections result in index changes. These are not tracked here;
the index is always fully regenerated for new printings.

\erroronpage{}{}{MJo}{2023/07/07}{}

There are a dozen occurances of the word \u{rôle} throughout the book,
which is more commonly spelled \u{role}. However, this is not wrong,
but the somewhat dated form used mostly in British
English. Personally, I prefer the version with accent (as does Don
Knuth) so it is deliberate and will not change.

\CHAPTER{Chapter 1 --- Introduction}

\erroronpage{I-5}{para 4, l.4}{kb}{2023/04/04}{s}
Expand Down Expand Up @@ -570,6 +578,9 @@ Situation is the same in the 2023 distributions; listing output updated.

\CHAPTER{Chapter 3 --- Basic Formatting Tools -- Paragraph \ldots}

\erroronpage{I-160}{para -2, l.1}{BeB}{2023/07/14}{s}
Repeated word: keys \u{keys} \> keys


\CHAPTER{Chapter 4 --- Basic Formatting Tools -- Larger \ldots}

Expand All @@ -595,11 +606,20 @@ is then made even lighter through \texttt{!20}). So it is better to
start from full red, i.e., \> \verb*/left color=red/ instead.
\\ Already corrected in the digital version.


\erroronpage{I-644}{syntaxbox for \cs{foreach}}{BeB}{2023/07/14}{s}
superfluous 'in': \ldots\{\textsl{commands}\} \u{in} \> \ldots\{\textsl{commands}\}



\CHAPTER{Chapter 9 --- Font Selection and Encodings}

\erroronpage{I-669}{exa 9-3-11}{FMi}{2023/04/04}{s}
Changed line breaks in example.

\erroronpage{I-681}{para 2, l.1}{BeB}{2023/07/14}{s}
Missing space: Theproblem \> The problem

\erroronpage{I-708}{listing}{FMi}{2023/05/14}{s}
Situation is the same in the 2023 distributions; listing output updated.
\\ Already corrected in the digital version.
Expand Down Expand Up @@ -803,8 +823,10 @@ Appendix title not properly capitalized.

\begin{multicols}{3}[Thanks to all who have found errors or
omissions. Listed are the people who found an errata entry first.]
\contributor{bb}{Barbara Beeton}
\contributor{BeB}{Bernd Burkhardt}
\contributor{FMi}{Frank Mittelbach}
\contributor{MJo}{Maciej Jończyk}
\contributor{bb}{Barbara Beeton}
\contributor{kb}{Karl Berry}
\end{multicols}

Expand Down
3 changes: 1 addition & 2 deletions base/ltfilehook.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
%
% \begin{macrocode}
\providecommand\ltfilehookversion{v1.0o}
\providecommand\ltfilehookdate{2023/04/02}
\providecommand\ltfilehookdate{2023/07/10}
% \end{macrocode}
%
%<*driver>
Expand Down Expand Up @@ -1043,7 +1043,6 @@
%
% \begin{macrocode}
%<@@=>
\ExplSyntaxOff
% \end{macrocode}
%
% \subsection{Selecting a file (\cs{set@curr@file})}
Expand Down
2 changes: 1 addition & 1 deletion base/testfiles/github-0944.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ LaTeX Warning: Reference `unknown' on page 1 undefined on input line ....
] (github-0944.aux)
***********
-formatname- <-formatversion-> pre-release-2 (-release-version-test- branch)
L3 programming layer <2023-06-16>
L3 programming layer <2023-06-30>
***********
*File List*
-show the file list here-
Expand Down

0 comments on commit 1149553

Please sign in to comment.