summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-20 20:01:35 +0000
committerKarl Berry <karl@freefriends.org>2021-09-20 20:01:35 +0000
commit19ab16ae7710544e10ce46301a294595759f781e (patch)
tree79f61da2da9664d814eff0aead9fc75641626e1e /Master/texmf-dist
parentc7b4e57f4a4133452a9aa5272db71da3e68c8d47 (diff)
light-latex-make (20sep21)
git-svn-id: svn://tug.org/texlive/trunk@60558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/man/man1/llmk.12
-rw-r--r--Master/texmf-dist/doc/man/man1/llmk.man1.pdfbin23766 -> 23767 bytes
-rw-r--r--Master/texmf-dist/doc/support/light-latex-make/README.md22
-rw-r--r--Master/texmf-dist/doc/support/light-latex-make/llmk.pdfbin99340 -> 99421 bytes
-rw-r--r--Master/texmf-dist/doc/support/light-latex-make/llmk.tex11
-rwxr-xr-xMaster/texmf-dist/scripts/light-latex-make/llmk.lua7
6 files changed, 22 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/man/man1/llmk.1 b/Master/texmf-dist/doc/man/man1/llmk.1
index 3f1b06ff458..ef5dded3907 100644
--- a/Master/texmf-dist/doc/man/man1/llmk.1
+++ b/Master/texmf-dist/doc/man/man1/llmk.1
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "LLMK" "1" "August 2021" "llmk 1.0.0" "llmk manual"
+.TH "LLMK" "1" "August 2021" "llmk 1.1.0" "llmk manual"
.
.SH "NAME"
\fBllmk\fR \- Light LaTeX Make
diff --git a/Master/texmf-dist/doc/man/man1/llmk.man1.pdf b/Master/texmf-dist/doc/man/man1/llmk.man1.pdf
index 5533c8c5f77..9d9c49e7e76 100644
--- a/Master/texmf-dist/doc/man/man1/llmk.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/llmk.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/light-latex-make/README.md b/Master/texmf-dist/doc/support/light-latex-make/README.md
index 1ff40ffc219..d8cee7d45b5 100644
--- a/Master/texmf-dist/doc/support/light-latex-make/README.md
+++ b/Master/texmf-dist/doc/support/light-latex-make/README.md
@@ -41,7 +41,7 @@ Hello \textsf{llmk}!
Suppose we save this file as `hello.tex`, then run
-```
+```shell
$ llmk hello.tex
```
@@ -60,9 +60,9 @@ latex = "lualatex"
source = "hello.tex"
```
-If you run llmk without any argument, llmk will load `llmk.toml` in the working directory, and compile files specified by `source` key with the settings written in the file.
+If you run llmk without any argument, llmk will load `llmk.toml` in the working directory, and compile files specified by the `source` key with the settings written in the file.
-```
+```shell
$ llmk
```
@@ -72,7 +72,7 @@ A few other magic comment formats that are supported by existing tools are also
The directives supported by [TeXShop](https://pages.uoregon.edu/koch/texshop/) and friends, which typically start with `% !TEX`, can be used instead of `latex` and `bibtex` keys. E.g.,
-```
+```latex
%! TEX TS-program = xelatex
%! BIB TS-program = biber
\documentclass{article}
@@ -80,7 +80,7 @@ The directives supported by [TeXShop](https://pages.uoregon.edu/koch/texshop/) a
is equivalent to:
-```
+```latex
% +++
% latex = "xelatex"
% bibtex = "biber"
@@ -90,14 +90,14 @@ is equivalent to:
Another supported format is shebang-like directive that is supported by [YaTeX mode for Emacs](https://www.yatex.org/). E.g.,
-```
+```latex
%#!pdflatex
\documentclass{article}
```
is equivalent to:
-```
+```latex
% +++
% latex = "pdflatex"
% +++
@@ -115,21 +115,21 @@ Similar to [latexmk](http://personal.psu.edu/jcc8/software/latexmk/), Actions `-
Specifically,
-```
+```shell
$ llmk --clean FILE...
```
-removes files generated by the specified `FILE`s. In case you omit the argument `FILE`, files generated by the `source` files are removed. In both case, the files to remove by these actions can be customized (see the reference manual for the details).
+removes files generated by the specified `FILE`s. In case you omit the argument `FILE`, files generated by the `source` files are removed. In both cases, the files to remove by these actions can be customized (see the reference manual for the details).
## Advanced Usage
### Custom compile sequence
-You can setup custom sequence for processing LaTeX documents; use `sequence` key to specify the order of programs to process the documents and specify the detailed settings for each program.
+You can setup custom sequence for processing LaTeX documents; use `sequence` key to specify the order of programs to process the documents and specify the detailed settings for each program in the `programs` table.
For the simple use, you can specify the command name in the top-level just like `latex = "lualatex"`, which is already shown in the former examples.
-However, it is impossible to specify more detailed settings (e.g., command line options) with this simple manner. If you want to change those settings as well, you have to use tables of TOML; write `[programs.<name>]` and then write the each setting following to that:
+However, it is impossible to specify more detailed settings (e.g., command-line options) with this simple manner. If you want to change those settings as well, you have to use tables of TOML; write `[programs.<name>]` and then write the each setting following to that:
```toml
# custom sequence
diff --git a/Master/texmf-dist/doc/support/light-latex-make/llmk.pdf b/Master/texmf-dist/doc/support/light-latex-make/llmk.pdf
index 596127da866..6693d671be0 100644
--- a/Master/texmf-dist/doc/support/light-latex-make/llmk.pdf
+++ b/Master/texmf-dist/doc/support/light-latex-make/llmk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/light-latex-make/llmk.tex b/Master/texmf-dist/doc/support/light-latex-make/llmk.tex
index f6437172155..61673f016e9 100644
--- a/Master/texmf-dist/doc/support/light-latex-make/llmk.tex
+++ b/Master/texmf-dist/doc/support/light-latex-make/llmk.tex
@@ -4,13 +4,13 @@
% +++
% latex = "xelatex"
% +++
-\documentclass[draft]{llmk-doc}
+\documentclass{llmk-doc}
% Metadata
\title{llmk: Light {\LaTeX} Make}
\author{Takuto Asakura (wtsnjp)}
\subtitle{Reference Manual}
-\date{v1.0.0\quad\today}
+\date{v1.1.0\quad\today}
\keywords{llmk, build-tool, toml, lua, luatex}
\begin{document}
@@ -395,8 +395,8 @@ specifiers are available for this key. The default value is:
\begin{htcode}
[
"%B.aux", "%B.bbl", "%B.bcf", "%B-blx.bib", "%B.blg", "%B.fls",
- "%B.idx", "%B.ilg", "%B.ind", "%B.log", "%B.nav", "%B.out",
- "%B.run.xml", "%B.snm", "%B.toc", "%B.vrb"
+ "%B.idx", "%B.ilg", "%B.ind", "%B.lof", "%B.log", "%B.lot",
+ "%B.nav", "%B.out", "%B.run.xml", "%B.snm", "%B.toc", "%B.vrb"
]
\end{htcode}
\end{confkey}
@@ -429,7 +429,7 @@ ineffective.
[default: \code{[]}]
Extra files to be removed with the cleaning action (\lopt{clean}). By using
this key, you can easily add files to be removed on top of the default
-\ckey{clean\_files}.
+\ckey{clean\_files}. The format specifiers are available for this key.
\end{confkey}
\begin{confkey}{latex}{type: \type{string}}[default: \code{"lualatex"}]
@@ -747,6 +747,7 @@ of the directive is:
\newcommand{\VS}{\textvisiblespace}
\begin{htcode}
\meta{TS prefix}TEX\VS{\OS}program\meta{equals}\meta{command}\OS
+\meta{TS prefix}TeX\VS{\OS}program\meta{equals}\meta{command}\OS
\meta{TS prefix}TEX\VS{\OS}TS-program\meta{equals}\meta{command}\OS
\end{htcode}
\egroup
diff --git a/Master/texmf-dist/scripts/light-latex-make/llmk.lua b/Master/texmf-dist/scripts/light-latex-make/llmk.lua
index 623f45099ef..79264eaeead 100755
--- a/Master/texmf-dist/scripts/light-latex-make/llmk.lua
+++ b/Master/texmf-dist/scripts/light-latex-make/llmk.lua
@@ -39,7 +39,7 @@ local M = {}
-- program information
M.prog_name = 'llmk'
-M.version = '1.0.0'
+M.version = '1.1.0'
M.copyright = 'Copyright 2018-2021'
M.author = 'Takuto ASAKURA (wtsnjp)'
M.llmk_toml = 'llmk.toml'
@@ -57,8 +57,8 @@ M.top_level_spec = {
bibtex = {'string', 'bibtex'},
clean_files = {'[string]', {
'%B.aux', '%B.bbl', '%B.bcf', '%B-blx.bib', '%B.blg', '%B.fls',
- '%B.idx', '%B.ilg', '%B.ind', '%B.log', '%B.nav', '%B.out',
- '%B.run.xml', '%B.snm', '%B.toc', '%B.vrb',
+ '%B.idx', '%B.ilg', '%B.ind', '%B.lof', '%B.log', '%B.lot', '%B.nav',
+ '%B.out', '%B.run.xml', '%B.snm', '%B.toc', '%B.vrb',
}},
clobber_files = {'[string]', {'%B.dvi', '%B.pdf', '%B.ps', '%B.synctex.gz'}},
dvipdf = {'string', 'dvipdfmx'},
@@ -873,6 +873,7 @@ function M.get_toml(fn)
-- 2. TeXShop directives
ts_tmp = string.match(l, '^%s*%%%s*!%s*TEX%s+program%s*=%s*(.-)%s*$') or
+ string.match(l, '^%s*%%%s*!%s*TeX%s+program%s*=%s*(.-)%s*$') or
string.match(l, '^%s*%%%s*!%s*TEX%s+TS%-program%s*=%s*(.-)%s*$')
if ts_tmp then
ts_latex = ts_latex or ts_tmp