diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/latex/contrib/parskip/MANIFEST.md | 127 | ||||
-rw-r--r-- | macros/latex/contrib/parskip/changes.txt | 14 | ||||
-rw-r--r-- | macros/latex/contrib/parskip/parskip-code.pdf | bin | 223578 -> 226081 bytes | |||
-rw-r--r-- | macros/latex/contrib/parskip/parskip.dtx | 47 | ||||
-rw-r--r-- | macros/latex/contrib/parskip/parskip.pdf | bin | 174740 -> 175049 bytes | |||
-rw-r--r-- | macros/luatex/latex/plantuml/CHANGELOG.md | 36 | ||||
-rw-r--r-- | macros/luatex/latex/plantuml/README.md | 8 | ||||
-rw-r--r-- | macros/luatex/latex/plantuml/plantuml.lua | 2 | ||||
-rw-r--r-- | macros/luatex/latex/plantuml/plantuml.pdf | bin | 47151 -> 47782 bytes | |||
-rw-r--r-- | macros/luatex/latex/plantuml/plantuml.sty | 7 |
10 files changed, 216 insertions, 25 deletions
diff --git a/macros/latex/contrib/parskip/MANIFEST.md b/macros/latex/contrib/parskip/MANIFEST.md new file mode 100644 index 0000000000..ec8a0eebe0 --- /dev/null +++ b/macros/latex/contrib/parskip/MANIFEST.md @@ -0,0 +1,127 @@ +# Manifest for parskip + +This file is a listing of all files considered to be part of this package. +It is automatically generated with `texlua build.lua manifest`. + + +## Repository manifest + +The following groups list the files included in the development repository of the package. +Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed +with ‘‡’ are included in both. + +### Source files + +These are source files for a number of purposes, including the `unpack` process which +generates the installation files of the package. Additional files included here will also +be installed for processing such as testing. + +* parskip.dtx ‡ +* parskip.ins ‡ +* parskip-2001-04-09.sty ‡ + +### Typeset documentation source files + +These files are typeset using LaTeX to produce the PDF documentation for the package. + +* parskip-code.tex ‡ +* parskip.tex ‡ + +### Text files + +Plain text files included as documentation or metadata. + +* MANIFEST.md ‡ +* README.md ‡ +* changes.txt ‡ + +### Derived files + +The files created by ‘unpacking’ the package sources. This typically includes +`.sty` and `.cls` files created from DocStrip `.dtx` files. + +* parskip.sty † + +### Typeset documents + +The output files (PDF, essentially) from typesetting the various source, demo, +etc., package files. + +* parskip-code.pdf ‡ +* parskip.pdf ‡ + +### Test files + +These files form the test suite for the package. `.lvt` or `.lte` files are the individual +unit tests, and `.tlg` are the stored output for ensuring changes to the package produce +the same output. These output files are sometimes shared and sometime specific for +different engines (pdfTeX, XeTeX, LuaTeX, etc.). + +* github-0012.lvt +* parskip-000.lvt +* parskip-001.lvt +* parskip-002.lvt +* parskip-003.lvt +* parskip-004.lvt +* parskip-005.lvt +* parskip-006.lvt +* sx-450551.lvt +* github-0012.tlg +* parskip-000.tlg +* parskip-001.tlg +* parskip-002.tlg +* parskip-003.tlg +* parskip-004.tlg +* parskip-005.tlg +* parskip-006.tlg +* sx-450551.tlg + + +## TDS manifest + +The following groups list the files included in the TeX Directory Structure used to install +the package into a TeX distribution. + +### Source files (TDS) + +All files included in the `parskip/source` directory. + +* parskip.dtx +* parskip.ins + +### TeX files (TDS) + +All files included in the `parskip/tex` directory. + +* parskip-2001-04-09.sty +* parskip.sty + +### Doc files (TDS) + +All files included in the `parskip/doc` directory. + +* MANIFEST.md +* README.md +* changes.txt +* parskip-code.pdf +* parskip-code.tex +* parskip.pdf +* parskip.tex + + +## CTAN manifest + +The following group lists the files included in the CTAN package. + +### CTAN files + +* MANIFEST.md +* README.md +* changes.txt +* parskip-2001-04-09.sty +* parskip-code.pdf +* parskip-code.tex +* parskip.dtx +* parskip.ins +* parskip.pdf +* parskip.tex diff --git a/macros/latex/contrib/parskip/changes.txt b/macros/latex/contrib/parskip/changes.txt index 6ada7d93b6..db84ddd38b 100644 --- a/macros/latex/contrib/parskip/changes.txt +++ b/macros/latex/contrib/parskip/changes.txt @@ -1,3 +1,17 @@ +#### placed on CTAN as 2.0e #### + +2020-05-19 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * parskip.dtx (subsubsection{TOCs and similar lists}): + Add tocskip option to set the \parskip value inside \tableofcontents + and similar lists (default is 0pt as before) + +2020-05-18 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * parskip.dtx (subsubsection{TOCs and similar lists}): + Fix space at start of \@starttoc (noticable with large skip= values) + (gh/12) + #### placed on CTAN as 2.0d #### 2020-01-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org> diff --git a/macros/latex/contrib/parskip/parskip-code.pdf b/macros/latex/contrib/parskip/parskip-code.pdf Binary files differindex 1127576e80..becb2250a9 100644 --- a/macros/latex/contrib/parskip/parskip-code.pdf +++ b/macros/latex/contrib/parskip/parskip-code.pdf diff --git a/macros/latex/contrib/parskip/parskip.dtx b/macros/latex/contrib/parskip/parskip.dtx index dd0a6b07df..eea08157f6 100644 --- a/macros/latex/contrib/parskip/parskip.dtx +++ b/macros/latex/contrib/parskip/parskip.dtx @@ -107,6 +107,12 @@ % specify the vertical space between paragraphs. If the option is % not given (or given without a value) then \verb=.5\baselineskip= % plus \texttt{2pt} of stretch is assumed. +% \item[\option{tocskip}] +% By default the \cs{parskip} is zero within \cs{tableofcontents} +% and similar lists, regardless of its value elsewhere. With the +% option \texttt{tocskip} it can be given a different value. If +% used without an explicit value you get the same \cs{parskip} as elsewhere +% within these lists. % \item[\option{indent}] % With the package option \texttt{indent} it is possible to explicitly set % the paragraph indentation. Using this option without a value keeps the @@ -177,7 +183,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesPackage{parskip}[2020-01-22 v2.0d non-zero parskip adjustments] +\ProvidesPackage{parskip}[2020-05-19 v2.0e non-zero parskip adjustments] % \end{macrocode} % % @@ -218,6 +224,14 @@ \DeclareStringOption{skip} % \end{macrocode} % +% The key \option{tocskip} defines the vertical separation inside the lists +% \cs{tableofcontents}, \cs{listoffigures} and \cs{listoftables}. By +% default there is no extra separatation (i.e., \texttt{0pt}). If +% specified without a value the standard \cs{parskip} is used, +% otherwise the given value. +% \begin{macrocode} +\DeclareStringOption[0pt]{tocskip}[\parskip] +% \end{macrocode} % % Execute any package options: % \begin{macrocode} @@ -319,12 +333,39 @@ % Within a table of contents or a list of figures we don't want any % additional vertical spacing just because the individual lines in % such a list are implemented as one-line paragraphs. So we locally -% set the \cs{parskip} to zero. Should be really something that is +% set the \cs{parskip} to zero by default. Should be really something that is % done already in \LaTeX{}. +% \changes{v2.0e}{2020/05/19}{Fix space at start of \cs{@starttoc} (gh/12)} % \begin{macrocode} \patchcmd\@starttoc {\begingroup \makeatletter} - {\begingroup \makeatletter \parskip\z@} + {\begingroup \makeatletter +% \end{macrocode} +% Just setting \cs{parskip} to zero as it was done in the original +% version of the package, does not always work. If the list starts +% out with an ordinary paragraph (and not with \cs{addvspace} as it +% usually does) we will get a zero \cs{parskip} but the heading +% above assumes we get the normal \cs{parskip} and has therefore +% removed that amount from its own vertical skip. As long as the +% parskip value is not too large people didn't notice that heading +% and list moved closer to each other but if you use, say, +% \texttt{[skip=20pt]} you will even see an overlap. +% +% We therefore do the following: we look at the last skip, undo it +% and then issue a skip that is equal to \cs{parskip} + +% \cs{lastskip}. +% This way the skip seen by any following code has the right value +% which is important for \cs{addvspace} calulations. Only then we +% locally set \cs{parskip} to zero or rather to +% \cs{parskip@tocskip}, the parameter that the user can set through +% an option. +% \changes{v2.0e}{2020/05/19}{Add \texttt{tocskip} option} +% \begin{macrocode} + \skip@\lastskip + \advance\skip@\parskip + \vskip-\lastskip + \vskip\skip@ + \parskip\parskip@tocskip} {}{\typeout{Couldn't patch \string\@starttoc}} % \end{macrocode} % diff --git a/macros/latex/contrib/parskip/parskip.pdf b/macros/latex/contrib/parskip/parskip.pdf Binary files differindex 3672f9caf7..bb9dff0260 100644 --- a/macros/latex/contrib/parskip/parskip.pdf +++ b/macros/latex/contrib/parskip/parskip.pdf diff --git a/macros/luatex/latex/plantuml/CHANGELOG.md b/macros/luatex/latex/plantuml/CHANGELOG.md index 0019d588d0..cadb12c9cd 100644 --- a/macros/luatex/latex/plantuml/CHANGELOG.md +++ b/macros/luatex/latex/plantuml/CHANGELOG.md @@ -5,14 +5,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [0.3.0] - 2019-09-23 +## [0.3.1] – 2020-05-19 + +### Fixed + +- Added `-Djava.awt.headless=true` parameter to the call of `plantuml.jar` so it runs silently without interference + the current focus + +## [0.3.0] – 2019-09-23 ## Added - Added support for UTF-8 filenames. -- Added `example-component-diagram.tex`. Refs [#2](https://github.com/latextemplates/plantuml/issues/9). +- Added `example-component-diagram.tex`. Refs [#9](https://github.com/koppor/plantuml/issues/9). -## [0.2.3] - 2018-06-04 +## [0.2.3] – 2018-06-04 ## Added @@ -22,20 +29,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Removed `\usepackage{aeguill}` as 1) PlantUML seems not to rely on it any more and 2) [it is obsolete and should not be used anymore](https://tex.stackexchange.com/a/5901/9075). -## [0.2.2] - 2018-03-22 +## [0.2.2] – 2018-03-22 ## Changed - Added version number in generated `plantuml.pdf`. - Do not strip down `README.md` for CTAN anymore and provide "*.png" for generation of `plantuml.pdf`. -## [0.2.1] - 2018-03-21 +## [0.2.1] – 2018-03-21 ### Fixed - Added short version of `README.md` to CTAN distribution again, because of [CTAN rules](https://mirror.informatik.hs-fulda.de/tex-archive/help/ctan/CTAN-upload-addendum.html#readme). -## [0.2.0] - 2018-03-20 +## [0.2.0] – 2018-03-20 ### Changed @@ -47,13 +54,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - `release.sh` for creating a release. -## 0.1.0 - 2018-03-08 +## 0.1.0 – 2018-03-08 Initial public release -[unreleased]: https://github.com/latextemplates/plantuml/compare/0.3.0...HEAD -[0.3.0]: https://github.com/latextemplates/plantuml/compare/0.2.3...0.3.0 -[0.2.3]: https://github.com/latextemplates/plantuml/compare/0.2.2...0.2.3 -[0.2.2]: https://github.com/latextemplates/plantuml/compare/0.2.1...0.2.2 -[0.2.1]: https://github.com/latextemplates/plantuml/compare/0.2.0...0.2.1 -[0.2.0]: https://github.com/latextemplates/plantuml/compare/0.1.0...0.2.0 +[unreleased]: https://github.com/koppor/plantuml/compare/0.3.1...HEAD +[0.3.1]: https://github.com/koppor/plantuml/compare/0.3.0...0.3.1 +[0.3.0]: https://github.com/koppor/plantuml/compare/0.2.3...0.3.0 +[0.2.3]: https://github.com/koppor/plantuml/compare/0.2.2...0.2.3 +[0.2.2]: https://github.com/koppor/plantuml/compare/0.2.1...0.2.2 +[0.2.1]: https://github.com/koppor/plantuml/compare/0.2.0...0.2.1 +[0.2.0]: https://github.com/koppor/plantuml/compare/0.1.0...0.2.0 + +<!-- markdownlint-disable-file MD024 --> diff --git a/macros/luatex/latex/plantuml/README.md b/macros/luatex/latex/plantuml/README.md index eb0fd1ce84..d655302010 100644 --- a/macros/luatex/latex/plantuml/README.md +++ b/macros/luatex/latex/plantuml/README.md @@ -1,6 +1,6 @@ # plantuml -Version 0.3.0 +Version 0.3.1 > A LuaLaTeX package for PlantUML in LaTeX @@ -8,7 +8,7 @@ Version 0.3.0 This package allows for embedding PlantUML diagrams using the PlantUML source. Currently, this project runs with [lualatex](http://www.luatex.org/) only. -Check [issue #1](https://github.com/latextemplates/plantuml/issues/1) for the current state of affairs for support pdflatex. +Check [issue #1](https://github.com/koppor/plantuml/issues/1) for the current state of affairs for support pdflatex. ## Preconditions @@ -86,7 +86,7 @@ See [the discussion at tex.sx](https://tex.stackexchange.com/q/27982/9075) for t ## Development -The release is built at [CircleCI](http://circleci.com/) using [release.sh](release.sh). +The release is built using [GitHub Actions](https://github.com/features/actions) ([workflow file](https://github.com/koppor/plantuml/blob/master/.github/workflows/build-and-publish.yml)) using [`release.sh`](release.sh). Release prepration: @@ -96,7 +96,7 @@ Release prepration: ## Alternative Solutions -[TikZ-UML](https://perso.ensta-paristech.fr/~kielbasi/tikzuml/) is a very powerful package based in [TikZ](https://www.ctan.org/pkg/pgf). +[TikZ-UML](https://perso.ensta-paristech.fr/~kielbasi/tikzuml/) is a very powerful package based on [TikZ](https://www.ctan.org/pkg/pgf). More alternative solutions are collected at the [CTAN topic UML](https://www.ctan.org/topic/uml). ## License diff --git a/macros/luatex/latex/plantuml/plantuml.lua b/macros/luatex/latex/plantuml/plantuml.lua index 2261c86332..7edb923d6b 100644 --- a/macros/luatex/latex/plantuml/plantuml.lua +++ b/macros/luatex/latex/plantuml/plantuml.lua @@ -22,7 +22,7 @@ function convertPlantUmlToTikz(jobname, mode) end texio.write("Executing PlantUML... ") - local cmd = "java -jar " .. plantUmlJar .. " -charset UTF-8 -t" + local cmd = "java -Djava.awt.headless=true -jar " .. plantUmlJar .. " -charset UTF-8 -t" if (mode == "latex") then cmd = cmd .. "latex:nopreamble" else diff --git a/macros/luatex/latex/plantuml/plantuml.pdf b/macros/luatex/latex/plantuml/plantuml.pdf Binary files differindex b753d7aa01..e81541209d 100644 --- a/macros/luatex/latex/plantuml/plantuml.pdf +++ b/macros/luatex/latex/plantuml/plantuml.pdf diff --git a/macros/luatex/latex/plantuml/plantuml.sty b/macros/luatex/latex/plantuml/plantuml.sty index d2958792bc..89af25689f 100644 --- a/macros/luatex/latex/plantuml/plantuml.sty +++ b/macros/luatex/latex/plantuml/plantuml.sty @@ -3,7 +3,7 @@ %% SPDX-License-Identifier: LPPL-1.3c+ \NeedsTeXFormat{LaTeX2e}\relax \ProvidesPackage{plantuml} - [2018/03/22 v0.2.2 + [2020/05/19 v0.3.1 Embed PlantUML diagrams in latex documents.] % Required by PlantUML LaTeX output @@ -24,9 +24,8 @@ \RequirePackage{adjustbox} -% \jobname has a probrem of encodeing -% if your latex filename include multibyte string -% you need to redefine PlantUMLJobname to fix +% \jobname has an encoding issue if the .tex filename includes a multibyte string. +% One needs to redefine PlantUMLJobname to fix it \def\PlantUMLJobname{\jobname} \ExplSyntaxOn |