Skip to content

Commit

Permalink
Remove support for TeX Live 2022
Browse files Browse the repository at this point in the history
  • Loading branch information
Witiko committed Nov 21, 2024
1 parent 4d42af3 commit da85e01
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 94 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "libraries/lua-tinyyaml"]
path = libraries/lua-tinyyaml
url = https://github.com/api7/lua-tinyyaml
[submodule "contributions/pandoc-to-markdown"]
path = contributions/pandoc-to-markdown
url = https://github.com/drehak/pandoc-to-markdown.git
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ mkdir -p ${INSTALL_DIR}/tex/
cp ${BUILD_DIR}/markdown.lua ${INSTALL_DIR}/tex/luatex/markdown/
cp ${BUILD_DIR}/markdown-parser.lua ${INSTALL_DIR}/tex/luatex/markdown/
cp ${BUILD_DIR}/markdown-unicode-data.lua ${INSTALL_DIR}/tex/luatex/markdown/
cp ${BUILD_DIR}/libraries/markdown-tinyyaml.lua ${INSTALL_DIR}/tex/luatex/markdown/
mkdir -p ${INSTALL_DIR}/scripts/markdown/
cp ${BUILD_DIR}/markdown-cli.lua ${INSTALL_DIR}/scripts/markdown/
mkdir -p ${INSTALL_DIR}/tex/generic/markdown/
Expand Down
21 changes: 7 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ HTML_USER_MANUAL=markdown.html markdown.css
USER_MANUAL=$(MARKDOWN_USER_MANUAL) $(HTML_USER_MANUAL)
DOCUMENTATION=$(TECHNICAL_DOCUMENTATION) $(HTML_USER_MANUAL) $(ROOT_README) $(VERSION_FILE) \
$(CHANGES_FILE) $(DEPENDENCIES)
LIBRARIES=libraries/markdown-tinyyaml.lua
INSTALLABLES=markdown.lua markdown-parser.lua markdown-cli.lua markdown-unicode-data.lua \
markdown.tex markdown.sty t-markdown.tex \
markdownthemewitiko_markdown_defaults.tex \
Expand All @@ -56,7 +55,7 @@ EXTRACTABLES=$(INSTALLABLES) $(MARKDOWN_USER_MANUAL) $(TECHNICAL_DOCUMENTATION_R
MAKEABLES=$(TECHNICAL_DOCUMENTATION) $(USER_MANUAL) $(INSTALLABLES) $(EXAMPLES) $(DEPENDENCIES)
RESOURCES=$(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(EXAMPLES) \
$(MAKES) $(READMES) $(INSTALLER) $(DTXARCHIVE) $(TESTS)
EVERYTHING=$(RESOURCES) $(INSTALLABLES) $(LIBRARIES)
EVERYTHING=$(RESOURCES) $(INSTALLABLES)
GITHUB_PAGES=gh-pages

ifeq ($(NO_DOCUMENTATION), true)
Expand Down Expand Up @@ -89,9 +88,8 @@ PANDOC_INPUT_FORMAT=markdown+tex_math_single_backslash-raw_tex
all: $(MAKEABLES)
$(MAKE) clean

# This pseudo-target extracts the source files out of the DTX archive and
# produces external Lua libraries.
base: $(INSTALLABLES) $(LIBRARIES)
# This pseudo-target extracts the source files out of the DTX archive.
base: $(INSTALLABLES)
$(MAKE) clean

# This pseudo-target builds a witiko/markdown Docker image.
Expand Down Expand Up @@ -151,10 +149,6 @@ $(DEPENDENCIES): $(RAW_DEPENDENCIES)
$(VERSION_FILE): force
printf '%s (%s)\n' $(VERSION) $(LASTMODIFIED) > $@

# This target produces external Lua libraries.
$(LIBRARIES): force
$(MAKE) -C libraries $(notdir $@)

# This target typesets the manual.
$(TECHNICAL_DOCUMENTATION): $(DTXARCHIVE) $(TECHNICAL_DOCUMENTATION_RESOURCES)
latexmk -silent $< || (cat $(basename $@).log 1>&2; exit 1)
Expand Down Expand Up @@ -224,11 +218,11 @@ dist: implode
$(MAKE) clean

# This target produces the TeX directory structure archive.
$(TDSARCHIVE): $(DTXARCHIVE) $(INSTALLER) $(INSTALLABLES) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(LIBRARIES)
$(TDSARCHIVE): $(DTXARCHIVE) $(INSTALLER) $(INSTALLABLES) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES)
@# Installing the macro package.
mkdir -p tex/generic/markdown tex/luatex/markdown tex/latex/markdown \
tex/context/third/markdown scripts/markdown
cp markdown.lua markdown-parser.lua markdown-unicode-data.lua $(LIBRARIES) \
cp markdown.lua markdown-parser.lua markdown-unicode-data.lua \
tex/luatex/markdown/
cp markdown-cli.lua scripts/markdown/
cp markdown.tex markdownthemewitiko_markdown_defaults.tex tex/generic/markdown/
Expand All @@ -255,9 +249,9 @@ $(DISTARCHIVE): $(EVERYTHING) $(TDSARCHIVE)
rm -f markdown

# This target produces the CTAN archive.
$(CTANARCHIVE): $(DTXARCHIVE) $(INSTALLER) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(LIBRARIES) $(TDSARCHIVE)
$(CTANARCHIVE): $(DTXARCHIVE) $(INSTALLER) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(TDSARCHIVE)
-ln -s . markdown
zip -MM -r -v -nw --symlinks $@ $(addprefix markdown/,$(DTXARCHIVE) $(INSTALLER) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES) $(LIBRARIES)) $(TDSARCHIVE)
zip -MM -r -v -nw --symlinks $@ $(addprefix markdown/,$(DTXARCHIVE) $(INSTALLER) $(DOCUMENTATION) $(EXAMPLES_RESOURCES) $(EXAMPLES_SOURCES)) $(TDSARCHIVE)
rm -f markdown

# This pseudo-target removes any existing auxiliary files and directories.
Expand All @@ -271,7 +265,6 @@ clean:
implode: clean
rm -f $(MAKEABLES) $(ARCHIVES)
$(MAKE) -C examples implode
$(MAKE) -C libraries implode

# This pseudo-target checks that the length of lines in the source files.
check-line-length: $(INSTALLABLES)
Expand Down
19 changes: 0 additions & 19 deletions libraries/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions libraries/README.md

This file was deleted.

1 change: 0 additions & 1 deletion libraries/lua-tinyyaml
Submodule lua-tinyyaml deleted from 197632
65 changes: 16 additions & 49 deletions markdown.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ Requirements

The package requires either [our official Docker image][docker], which contains
the latest development version of the Markdown package, or a \TeX{}
distribution: [\TeX{} Live][tl] ≥ 2022 is known to work with the current
distribution: [\TeX{} Live][tl] ≥ 2023 is known to work with the current
version of the Markdown package and so are recent versions of [Mik\TeX{}][mik].
If you are using an older, incomplete, or atypical \TeX{} distribution, please
consult the [technical documentation][techdoc] for a detailed list of
Expand Down Expand Up @@ -1013,7 +1013,6 @@ make base
Either of the two abovelisted approaches should produce the following files:

* `markdown.lua`, `markdown-parser.lua`, and `markdown-unicode-data.lua`: The Lua module
* `libraries/markdown-tinyyaml.lua`: An external library for reading \acro{yaml}
* `markdown-cli.lua`: The Lua command-line interface
* `markdown.tex`: The plain \TeX{} macro package
* `markdown.sty`: The \LaTeX{} package
Expand All @@ -1032,7 +1031,6 @@ placed:
* `⟨TEXMF⟩/tex/luatex/markdown/markdown.lua`
* `⟨TEXMF⟩/tex/luatex/markdown/markdown-parser.lua`
* `⟨TEXMF⟩/tex/luatex/markdown/markdown-unicode-data.lua`
* `⟨TEXMF⟩/tex/luatex/markdown/markdown-tinyyaml.lua`
* `⟨TEXMF⟩/scripts/markdown/markdown-cli.lua`
* `⟨TEXMF⟩/tex/generic/markdown/markdown.tex`
* `⟨TEXMF⟩/tex/generic/markdown/markdownthemewitiko_markdown_defaults.tex`
Expand All @@ -1057,7 +1055,6 @@ This is where the individual files should be placed:
* `./markdown.lua`
* `./markdown-parser.lua`
* `./markdown-unicode-data.lua`
* `./markdown-tinyyaml.lua`
* `./markdown-cli.lua`
* `./markdown/markdown.tex`
* `./markdown.sty`
Expand Down Expand Up @@ -1199,18 +1196,15 @@ local uni_algos = require("lua-uni-algos")
%
%: A library that provides a regex-based recursive descent \acro{yaml}
% (subset) parser that is used to read \acro{yaml} metadata when the
% \Opt{jekyllData} option is enabled. We carry a copy of the library
% in file `markdown-tinyyaml.lua` distributed together with the Markdown
% package. <!-- TODO: Stop carrying the copy of the library in TeX Live
% 2023. -->
% \Opt{jekyllData} option is enabled.
%
% \end{markdown}
% \iffalse
%</lua>
%<*depends>
% \fi
% \begin{macrocode}
# hard lua-tinyyaml # TODO: Uncomment after TeX Live 2022 deprecation.
hard lua-tinyyaml
% \end{macrocode}
% \iffalse
%</depends>
Expand Down Expand Up @@ -1432,11 +1426,10 @@ soft epstopdf-pkg # required by `graphics` and `graphicx`, which load `epsopdf-
% \end{macrocode}
% \begin{markdown}
%
% \pkg{soulutf8} and \pkg{xcolor}
% \pkg{soul} and \pkg{xcolor}
%
%: Packages that are used in the default renderer prototypes for
% strike-throughs and marked text in pdf\TeX.
% <!-- TODO: 1,$s/soulutf8/soul/g in TeX Live 2023. -->
%
% \end{markdown}
% \begin{macrocode}
Expand Down Expand Up @@ -9595,7 +9588,7 @@ following content:
``` tex
\input markdown
\def\markdownOptionStrikeThrough{true}
\input soulutf8.sty
\input soul.sty
\def\markdownRendererStrikeThrough#1{\st{#1}}
\markdownBegin
This is ~~a lunar roving vehicle~~ strike-through text.
Expand All @@ -9618,7 +9611,7 @@ following content:
``` tex
\documentclass{article}
\usepackage[strikeThrough]{markdown}
\usepackage{soulutf8}
\usepackage{soul}
\markdownSetup{
renderers = {
strikeThrough = {\st{#1}},
Expand Down Expand Up @@ -12170,9 +12163,7 @@ For more information, see the examples for the \Opt{finalizeCache} option.
% \Opt{inputTempFileName} macro.
%
% The \mref{markdownOptionOutputDir} macro has been deprecated and will be
% removed in the next major version of the Markdown package. <!-- After the
% macro has been removed, we should remove support for TeX Live 2023 and
% earlier, where the automatic detection does not work. -->
% removed in the next major version of the Markdown package.
%
% \end{markdown}
% \begin{macrocode}
Expand Down Expand Up @@ -19686,7 +19677,7 @@ following content:
``` tex
\input markdown
\def\markdownOptionStrikeThrough{true}
\input soulutf8.sty
\input soul.sty
\def\markdownRendererStrikeThrough#1{\st{#1}}
\markdownBegin
This is ~~a lunar roving vehicle~~ strike-through text.
Expand All @@ -19709,7 +19700,7 @@ following content:
``` tex
\documentclass{article}
\usepackage[strikeThrough]{markdown}
\usepackage{soulutf8}
\usepackage{soul}
\markdownSetup{
renderers = {
strikeThrough = {\st{#1}},
Expand Down Expand Up @@ -21686,11 +21677,6 @@ following text:
\l_tmpa_clist
}
}
% TODO: Remove in TeX Live 2023.
\prg_generate_conditional_variant:Nnn
\prop_get:NnN
{ NeN }
{ TF }
\cs_generate_variant:Nn
\regex_set:Nn
{ NV }
Expand Down Expand Up @@ -34451,8 +34437,7 @@ M.extensions.jekyll_data = function(expect_jekyll_data,
, function(s, i, text) -- luacheck: ignore s i
local data
local ran_ok, _ = pcall(function()
-- TODO: Use `require("tinyyaml")` in TeX Live 2023
local tinyyaml = require("markdown-tinyyaml")
local tinyyaml = require("tinyyaml")
data = tinyyaml.parse(text, {timestamps=false})
end)
if ran_ok and data ~= nil then
Expand Down Expand Up @@ -38685,7 +38670,7 @@ end
% \begin{markdown}
%
%#### Marked Text
% If the \Opt{mark} option is enabled, we will load either the \pkg{soulutf8}
% If the \Opt{mark} option is enabled, we will load either the \pkg{soul}
% package or the \pkg{lua-ul} package and use it to implement marked text.
%
% \end{markdown}
Expand All @@ -38712,17 +38697,8 @@ end
{
\RequirePackage
{ xcolor }
% TODO: Use just package soul after TeX Live 2023.
\IfFormatAtLeastTF
{ 2023-02-18 }
{
\RequirePackage
{ soul }
}
{
\RequirePackage
{ soulutf8 }
}
\RequirePackage
{ soul }
\markdownSetup
{
rendererPrototypes = {
Expand All @@ -38739,7 +38715,7 @@ end
%
%#### Strike-Through
% If the \Opt{strikeThrough} option is enabled, we will load either the
% \pkg{soulutf8} package or the \pkg{lua-ul} package and use it to implement
% \pkg{soul} package or the \pkg{lua-ul} package and use it to implement
% strike-throughs.
%
% \end{markdown}
Expand All @@ -38762,17 +38738,8 @@ end
}
}
{
% TODO: Use just package soul after TeX Live 2023.
\IfFormatAtLeastTF
{ 2023-02-18 }
{
\RequirePackage
{ soul }
}
{
\RequirePackage
{ soulutf8 }
}
\RequirePackage
{ soul }
\markdownSetup
{
rendererPrototypes = {
Expand Down

0 comments on commit da85e01

Please sign in to comment.