Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid writing tex for #1412 #1466

Merged
merged 9 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions base/doc/ltnews40.tex
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,15 @@ \section{Extend support for \cs{dots}}

\section{Changes to packages in the \pkg{tools} category}

\subsection{Modification to generation of the \file{.tex} from \pkg{fileerr}}

The \pkg{fileerr} extraction has been modified to write \texttt{rename-to-empty-base.tex}
rather than \texttt{.tex} to comply with an expected security change in texlive 2025.
\texttt{build.lua} has been modified to rename \texttt{rename-to-empty-base.tex} to \texttt{.tex}
after unpacking. However if using \textsf{docstrip} directly rather than using \textsf{l3build}
or the unpacked zip file from \CTAN{}, the user must now rename the file and install as \texttt{.tex}.
%
\githubissue{1412}

\subsection{\pkg{array}: Tagging support for \cs{cline}}

Expand Down
20 changes: 20 additions & 0 deletions required/tools/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,23 @@ checkconfigs = {"build","config-TU","config-legacy","config-search"}

-- Load the common settings for the LaTeX2e repo
dofile (maindir .. "/build-config.lua")

-- special code to handle .tex
oldbundleunpack=bundleunpack
function bundleunpack(sourcedirs, sources)
errorlevel = oldbundleunpack(sourcedirs, sources)
if errorlevel ~= 0 then
return errorlevel
end
if module == "tools" then
print(" * Renaming rename-to-empty-base.tex to .tex")
errorlevel = ren(unpackdir,"rename-to-empty-base.tex",".tex")
if errorlevel ~= 0 then
return errorlevel
end
end
return 0
end
davidcarlisle marked this conversation as resolved.
Show resolved Hide resolved

-- update function binding
target_list.bundleunpack.func = bundleunpack
7 changes: 7 additions & 0 deletions required/tools/changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2024-09-12 David Carlisle <David.Carlisle@latex-project.org>

* build.lua, tools.ins:
Modify fileerr extraction to write rename-to-empty-base.tex rather than .tex
to comply with expected security change in texlive 2025
build.lua modified to rename rename-to-empty-base.tex to .tex after unpacking.

2024-08-13 Ulrike Fischer <Ulrike.Fischer@latex-project.org>

* longtable.dtx:
Expand Down
16 changes: 4 additions & 12 deletions required/tools/tools.ins
Original file line number Diff line number Diff line change
Expand Up @@ -195,30 +195,22 @@ given in the file `manifest.txt'.
\file{r.tex}{\from{fileerr.dtx}{run}}
\file{x.tex}{\from{fileerr.dtx}{exit}}}

\generate{\file{rename-to-empty-base.tex}{\from{fileerr.dtx}{return}}}


\Msg{***********************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the following}
\Msg{* files into a directory searched by TeX:}
\Msg{*}
\Msg{* All the files with extension `.sty' and `.tex'}
\Msg{* Note there also may be a file .tex which is `invisible'}
\Msg{* on some operating systems.}
\Msg{* TeX may be blocked from writing .tex so writing rename-to-empty-base.tex}
\Msg{* Rename that file to .tex after the docstrip generation.}
davidcarlisle marked this conversation as resolved.
Show resolved Hide resolved
\Msg{*}
\Msg{* To produce the documentation run the .dtx files through LaTeX.}
\Msg{*}
\Msg{* Happy TeXing}
\Msg{***********************************************************}


\Msg{}
\Msg{* Finally trying to make a file `.tex'.}
\Msg{* (Placed at the end of this run, as this}
\Msg{* may fail on some operating systems.)}

\let\oldopenout\openout
\def\openout{\batchmode\immediate\oldopenout}

\generate{\file{.tex}{\from{fileerr.dtx}{return}}}

\endbatchfile