diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/latex/contrib/ppt-slides/README.md | 9 | ||||
-rw-r--r-- | macros/latex/contrib/ppt-slides/ppt-slides.dtx | 4 | ||||
-rw-r--r-- | macros/latex/contrib/ppt-slides/ppt-slides.pdf | bin | 935972 -> 935953 bytes | |||
-rw-r--r-- | macros/latex/contrib/spbmark/spbmark.pdf | bin | 95175 -> 95183 bytes | |||
-rw-r--r-- | macros/latex/contrib/spbmark/spbmark.sty | 2 | ||||
-rw-r--r-- | macros/latex/contrib/spbmark/spbmark.tex | 6 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/README.md | 2 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna-doc.pdf | bin | 92180 -> 85036 bytes | |||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna-doc.tex | 8 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna-langno.lua | 3 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna.lua | 19 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna.sty | 2 | ||||
-rw-r--r-- | macros/luatex/generic/luavlna/luavlna.tex | 13 |
13 files changed, 45 insertions, 23 deletions
diff --git a/macros/latex/contrib/ppt-slides/README.md b/macros/latex/contrib/ppt-slides/README.md index f1f92da99d..d742b04bb0 100644 --- a/macros/latex/contrib/ppt-slides/README.md +++ b/macros/latex/contrib/ppt-slides/README.md @@ -1,3 +1,5 @@ +# LaTeX Slidedeck à la PPT + [![make](https://github.com/yegor256/ppt-slides/actions/workflows/l3build.yml/badge.svg)](https://github.com/yegor256/ppt-slides/actions/workflows/l3build.yml) [![CTAN](https://img.shields.io/ctan/v/ppt-slides)](https://ctan.org/pkg/ppt-slides) [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/ppt-slides/blob/master/LICENSE.txt) @@ -8,7 +10,8 @@ but more precise, uniform, and visually strict. Check [this series of lectures](https://github.com/yegor256/ssd16) fully designed with the use of this package. -First, [install it](https://en.wikibooks.org/wiki/LaTeX/Installing_Extra_Packages) +First, +[install it](https://en.wikibooks.org/wiki/LaTeX/Installing_Extra_Packages) from [CTAN](https://ctan.org/pkg/ppt-slides) and then use in preamble: @@ -25,7 +28,9 @@ and then use in preamble: \end{document} ``` -Otherwise, you can download [`ppt-slides.sty`](https://yegor256.github.io/ppt-slides/ppt-slides.sty) and add to your project. +Otherwise, you can download +[`ppt-slides.sty`](https://yegor256.github.io/ppt-slides/ppt-slides.sty) +and add to your project. If you want to contribute yourself, make a fork, then create a branch, then run `l3build ctan` in the root directory. diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.dtx b/macros/latex/contrib/ppt-slides/ppt-slides.dtx index e0618f0a8d..0509442173 100644 --- a/macros/latex/contrib/ppt-slides/ppt-slides.dtx +++ b/macros/latex/contrib/ppt-slides/ppt-slides.dtx @@ -50,7 +50,7 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{ppt-slides} %<*package> -[2024-01-23 0.3.2 Slide Decks a la Power Point] +[2024-05-02 0.3.3 Slide Decks a la Power Point] %</package> %<*driver> \documentclass{ltxdoc} @@ -610,7 +610,7 @@ }% }% &% - ``#3''% + ``#3{}''% \def\param{#4}% \ifx\param\empty\else% \par\vspace*{1em}% diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.pdf b/macros/latex/contrib/ppt-slides/ppt-slides.pdf Binary files differindex 95c1024bff..39b45d9a9a 100644 --- a/macros/latex/contrib/ppt-slides/ppt-slides.pdf +++ b/macros/latex/contrib/ppt-slides/ppt-slides.pdf diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf Binary files differindex c86957a167..b7bbe5392d 100644 --- a/macros/latex/contrib/spbmark/spbmark.pdf +++ b/macros/latex/contrib/spbmark/spbmark.pdf diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index e4c45d13e8..67f5450dea 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -9,7 +9,7 @@ % https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2024/04/24}{1.46f} +\ProvidesExplPackage{spbmark}{2024/05/02}{1.46g} {Customize superscripts and subscripts} \cs_generate_variant:Nn \box_set_ht:Nn { cv } diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index 9bd3057ad4..e1d318026c 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -7,8 +7,8 @@ { package = spbmark, title = the spbmark package, - version = v1.46f, - date = 2024/04/24, + version = v1.46g, + date = 2024/05/02, authors = Qu Yi, info = Customize superscript and subscript, email = toquyi@163.com, @@ -46,7 +46,7 @@ \begin{document} \section{Macro package options} -The following macro package options will redefine the script commands of the \LaTeX{} kernel. If you do not specify the values of boolean options, they default to \code{true}. These options can also be changed in the preamble area and main body using the global control command \cs{sbpset}. +The following macro package options will redefine the script commands of the \LaTeX{} kernel. If you do not specify the values of boolean options, they default to \code{true}. These options can also be changed in the preamble area and main body using the global control command \cs{spbset}. \begin{options} \keychoice{text}{true,\fbox{false}}\newtag[Changed]% \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. At this point, you can use the \cs{defspbstyle} command to define the style \code{textsp} and \code{textsb} to change the format of the text superscript and subscript. diff --git a/macros/luatex/generic/luavlna/README.md b/macros/luatex/generic/luavlna/README.md index 1fe76754d5..aeaf7d2bd0 100644 --- a/macros/luatex/generic/luavlna/README.md +++ b/macros/luatex/generic/luavlna/README.md @@ -1,4 +1,4 @@ -# Luavlna, version 0.1l, 2023-06-21 +# Luavlna, version 0.1m, 2024-05-02 # Introduction diff --git a/macros/luatex/generic/luavlna/luavlna-doc.pdf b/macros/luatex/generic/luavlna/luavlna-doc.pdf Binary files differindex a75499a3c9..7f80b780a7 100644 --- a/macros/luatex/generic/luavlna/luavlna-doc.pdf +++ b/macros/luatex/generic/luavlna/luavlna-doc.pdf diff --git a/macros/luatex/generic/luavlna/luavlna-doc.tex b/macros/luatex/generic/luavlna/luavlna-doc.tex index 470822d4ac..698f46e52d 100644 --- a/macros/luatex/generic/luavlna/luavlna-doc.tex +++ b/macros/luatex/generic/luavlna/luavlna-doc.tex @@ -87,7 +87,7 @@ Podpora iniciál a titulů: M. J. Hegel, Ing. Běháková, Ph.D., Ž. Zíbrt, Ch. Borner. Podpora jednotek: 100,5 MN\cdot{}s, 100.5 kJ, 200 µA, $-1$ dag, -12 MiB, 1 m$^3$/s. +12 MiB. Uvnitř matematiky by mělo být zpracování vypnuté: $k \in \mathbb N$. Pokračujeme v příkladu. @@ -113,7 +113,7 @@ Různé možnosti [v závorkách \textless i jiných znacích Podpora iniciál a titulů: M. J. Hegel, Ing. Běháková, Ph.D., Ž. Zíbrt, Ch. Borner. -Podpora jednotek: 100,5 MN\cdot{}s, 100.5 kJ, 200 µA, $-1$ dag, 12 MiB, 1 m$^3$/s. +Podpora jednotek: 100,5 MN\cdot{}s, 100.5 kJ, 200 µA, $-1$ dag, 12 MiB. Uvnitř matematiky by mělo být zpracování vypnuté: $k \in \mathbb N$. Pokračujeme v příkladu. @@ -298,7 +298,9 @@ File \verb|language.dat| is processed to load language names, aliases and assign local luatex = langno.load_languages(fmt) local t = {} for k, v in pairs(luatex.names) do - t[#t+1]=k + if k and k~="" then + t[#t+1]=k + end end table.sort(t) tex.print(table.concat(t,", ")) diff --git a/macros/luatex/generic/luavlna/luavlna-langno.lua b/macros/luatex/generic/luavlna/luavlna-langno.lua index f703e4328a..7f25d84100 100644 --- a/macros/luatex/generic/luavlna/luavlna-langno.lua +++ b/macros/luatex/generic/luavlna/luavlna-langno.lua @@ -58,7 +58,8 @@ local load_lang_dat = function(start) end local load_lang_dat_lualatex = function() - return load_lang_dat(1) + -- it used to be 1, but it seems that in newer LuaLaTeX versions, we should start at 0 + return load_lang_dat(0) end local load_csplain= function() diff --git a/macros/luatex/generic/luavlna/luavlna.lua b/macros/luatex/generic/luavlna/luavlna.lua index 416ecc5841..3e5f79346f 100644 --- a/macros/luatex/generic/luavlna/luavlna.lua +++ b/macros/luatex/generic/luavlna/luavlna.lua @@ -260,6 +260,15 @@ local is_unit = function(word) return false end +local function handle_unit(word, anchor) + -- insert nbsp between numbers and units + word = cut_off_end_chars(word, false) + if is_unit(word) then + anchor = replace_with_thin_space(anchor) + insert_penalty(anchor.prev) + end +end + local predegrees = Set (require "luavlna-predegrees") local sufdegrees = Set (require "luavlna-sufdegrees") @@ -299,11 +308,7 @@ local function prevent_single_letter (head) if wasnumber then if word ~= "" then wasnumber = false - word = cut_off_end_chars(word, false) - if is_unit(word) then - anchor = replace_with_thin_space(anchor) - insert_penalty(anchor.prev) - end + handle_unit(word, anchor) end elseif is_number(word) then wasnumber = true @@ -356,6 +361,10 @@ local function prevent_single_letter (head) end head = head.next end + -- insert spaces at the end of node list + if wasnumber then + handle_unit(word, anchor) + end return true end diff --git a/macros/luatex/generic/luavlna/luavlna.sty b/macros/luatex/generic/luavlna/luavlna.sty index 9f411c5f9f..b49ef89803 100644 --- a/macros/luatex/generic/luavlna/luavlna.sty +++ b/macros/luatex/generic/luavlna/luavlna.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{luavlna}[2023-06-21 luavlna] +\ProvidesPackage{luavlna}[2024-05-02 luavlna] \ifdefined\directlua\else \PackageWarning{luavlna}{Luavlna needs LuaLaTeX, aborting} diff --git a/macros/luatex/generic/luavlna/luavlna.tex b/macros/luatex/generic/luavlna/luavlna.tex index d678854e9a..ddddf8ab9e 100644 --- a/macros/luatex/generic/luavlna/luavlna.tex +++ b/macros/luatex/generic/luavlna/luavlna.tex @@ -72,10 +72,15 @@ end % we can try to find the language ID from macros first, if it fails % we pass the language name to Lua. it will try to find ID in luanguage.dat and other sources \def\singlecharsgetlang#1{% - \ifcsname lang@#1\endcsname% - \the\csname lang@#1\endcsname% - \else% unknown language macro, let langno library to find it - #1% + \ifcsname l@#1\endcsname% + \the\csname l@#1\endcsname% + \else% + \ifcsname lang@#1\endcsname% + \the\csname lang@#1\endcsname% + \else% + % unknown language macro, let langno library to find it + #1% + \fi% \fi% } |