summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-08-17 21:30:10 +0000
committerKarl Berry <karl@freefriends.org>2024-08-17 21:30:10 +0000
commit66ec48f99a224aa93ed3bd48c77d723e0f7dc226 (patch)
tree27b8725819c55043d335a0ae3bde51f64f490fbc
parent92fd1cc44457817fafd1e7bec1de3a5ed1e0c673 (diff)
gridset (17aug24)
git-svn-id: svn://tug.org/texlive/trunk@72056 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/gridset/LICENSE.md2
-rw-r--r--Master/texmf-dist/doc/latex/gridset/README.md51
-rw-r--r--Master/texmf-dist/doc/latex/gridset/gridset.pdfbin223385 -> 244186 bytes
-rw-r--r--Master/texmf-dist/doc/latex/gridset/gridsetexample.tex108
-rw-r--r--Master/texmf-dist/source/latex/gridset/gridset.dtx61
-rw-r--r--Master/texmf-dist/source/latex/gridset/gridset.ins38
-rw-r--r--Master/texmf-dist/tex/latex/gridset/gridset.sty6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
8 files changed, 230 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/gridset/LICENSE.md b/Master/texmf-dist/doc/latex/gridset/LICENSE.md
index 99a6973749b..1863f2f61a2 100644
--- a/Master/texmf-dist/doc/latex/gridset/LICENSE.md
+++ b/Master/texmf-dist/doc/latex/gridset/LICENSE.md
@@ -13,7 +13,7 @@ Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
Version 1.3c oder später ist Teil aller Verteilungen von LaTeX 2005/12/01
-oder später. Dieses Werk hat den LPPL-Verwaltungs-Status „maintained”
+oder später. Dieses Werk hat den LPPL-Verwaltungs-Status „maintained”.
Der aktuelle Verwalter und Autor dieses Werks ist Markus Kohm.
----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/gridset/README.md b/Master/texmf-dist/doc/latex/gridset/README.md
index 0a1963d1ebd..a27c928e922 100644
--- a/Master/texmf-dist/doc/latex/gridset/README.md
+++ b/Master/texmf-dist/doc/latex/gridset/README.md
@@ -4,10 +4,14 @@ An experimental LaTeX package for semi-manual grid (a.k.a. in-register) setting
------------------------------------------------------------------------------
-LaTeX package `gridset`
-Copyright (c) 2008—2020 Markus Kohm
-Release: 2020-02-12 v0.3
-License: LPPL 1.3c (see LICENSE.md)
+LaTeX package `gridset`
+
+Copyright (c) 2008—2024 Markus Kohm
+
+Release: 2024-08-17 v0.4
+
+License: LPPL 1.3c (see LICENSE.md)
+
CTAN Location: https://ctan.org/pkg/gridset
------------------------------------------------------------------------------
@@ -32,9 +36,31 @@ The package is part of [TeX Live](https://tug.org/texlive) (and therefore
also [MacTeX](https://tug.org/mactex)) and [MiKTeX](http://miktex.org). Users
should use the packages provided by their TeX distribution.
-However, manual extraction can be used to try out the developer version.
+------------------------------------------------------------------------------
+
+For a semi-manual installation you can first create a local clone
+if the repository:
+
+```bash
+git clone https://github.com/komascript/gridset.git
+```
+
+Then enter the directory created while cloning the repository:
+
+```bash
+cd gridset
+```
+
+Last, but not least use `l3build` to install it locally:
+
+```bash
+l3build install --full
+```
+
+------------------------------------------------------------------------------
-To extract the package use:
+To do a completely manual installation, download `gridset.dtx`. Then extract
+it using:
```bash
tex gridset.dtx
@@ -48,3 +74,16 @@ mkindex gridset
pdflatex gridset.dtx
pdflatex gridset.dtx
```
+
+Now, you can either install it in the proper directory or copy `gridset.sty`
+to your document directory.
+
+------------------------------------------------------------------------------
+
+# How to Say Thank You for my Work
+
+Hey, I'm doing this as a hobby. So no need to say thank you. But I'm a vain
+fop, so I'm certainly up for a quick thank you by email. On komascript.de you
+can find an [explanation of my wishes](https://komascript.de/wunschliste) if
+you want to give more. If you don't understand German, just click to links at
+that page.
diff --git a/Master/texmf-dist/doc/latex/gridset/gridset.pdf b/Master/texmf-dist/doc/latex/gridset/gridset.pdf
index 3f6a39a8e92..a2af21f2053 100644
--- a/Master/texmf-dist/doc/latex/gridset/gridset.pdf
+++ b/Master/texmf-dist/doc/latex/gridset/gridset.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/gridset/gridsetexample.tex b/Master/texmf-dist/doc/latex/gridset/gridsetexample.tex
new file mode 100644
index 00000000000..7b7f9a1556a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/gridset/gridsetexample.tex
@@ -0,0 +1,108 @@
+%%
+%% This is file `gridsetexample.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gridset.dtx (with options: `example')
+%%
+%% IMPORTANT NOTE:
+%%
+%% This is a generated file and you are not allowed to distribute it
+%% without the source ot the work. See below about more informations
+%% about the files the work consists of.
+%%
+%% Copyright (C) 2008-2024 Markus Kohm
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The author and current maintainer of this work is
+%% Markus Kohm <komascript@gmx.info>.
+%%
+%% This work consists of the files gridset.dtx and README.md.
+%%
+%% Important Recommendation:
+%% The LPPL requires that distributions of the Work contain all the files of
+%% the Work (see ``Important Recommendations'' at lppl.txt).
+%%
+\ProvidesFile{gridsetexample.tex}
+ [2024-08-17 v0.4 grid - a.k.a. in-register - setting]
+\documentclass[a4paper,12pt]{article}
+\usepackage{gridset}
+\usepackage{blindtext}
+\raggedbottom
+
+\pagestyle{myheadings}
+
+\begin{document}
+\markright{gridbase=\gridbase, gridinterval=\gridinterval\ without move down}%
+\newcounter{Zeile}%
+\makeatletter
+\@whilenum \value{Zeile}<40\do {%
+ \stepcounter{Zeile}%
+ \theZeile. Zeile:
+ \SavePos{\thepage.\theZeile}\thegridinfo{\thepage.\theZeile}\par
+}%
+\makeatother
+\clearpage
+\setcounter{Zeile}{0}
+\makeatletter
+\@whilenum \value{Zeile}<20\do {%
+ \stepcounter{Zeile}%
+ \theZeile. Zeile:
+ \SavePos{\thepage.\theZeile}\theposinfo{\thepage.\theZeile}\par
+}%
+\makeatother
+\clearpage
+\parskip=.5\baselineskip
+\setcounter{Zeile}{0}
+\makeatletter
+\@whilenum \value{Zeile}<20\do {%
+ \stepcounter{Zeile}%
+ \theZeile. Zeile:
+ \SavePos{\thepage.\theZeile}\theposinfo{\thepage.\theZeile}\par
+}%
+\makeatother
+\clearpage
+\markright{gridbase=\gridbase, gridinterval=\gridinterval\ with real move down
+at vmode}%
+\parskip=.5\baselineskip
+\setcounter{Zeile}{0}
+\makeatletter
+\@whilenum \value{Zeile}<25\do {%
+ \stepcounter{Zeile}%
+ \vskipnextgrid\theZeile. Zeile: \theposinfo{vp!\thegridcnt}\par
+}%
+\makeatother
+\clearpage
+\markright{gridbase=\gridbase, gridinterval=\gridinterval\ with real move down
+at hmode}%
+\parskip=.5\baselineskip
+\setcounter{Zeile}{0}
+\makeatletter
+\@whilenum \value{Zeile}<25\do {%
+ \stepcounter{Zeile}%
+ \theZeile. Zeile: \vskipnextgrid\theposinfo{vp!\thegridcnt}\par
+}%
+\makeatother
+\clearpage
+\parskip=0pt
+\blindtext
+\begin{itemize}
+\item Test
+\item Test
+\end{itemize}
+\vskipnextgrid\theposinfo{vp!\thegridcnt}\blindtext
+
+\end{document}
+\endinput
+%%
+%% End of file `gridsetexample.tex'.
diff --git a/Master/texmf-dist/source/latex/gridset/gridset.dtx b/Master/texmf-dist/source/latex/gridset/gridset.dtx
index 68b251db558..29818473fb5 100644
--- a/Master/texmf-dist/source/latex/gridset/gridset.dtx
+++ b/Master/texmf-dist/source/latex/gridset/gridset.dtx
@@ -2,7 +2,7 @@
%
% gridset.dtx
%
-%% Copyright (C) 2008-2020 Markus Kohm
+%% Copyright (C) 2008-2024 Markus Kohm
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,37 +25,17 @@
%%
%
%<*dtx>
-\def\FmtName{LaTeX2e}
-\ifx\FmtName\fmtname
- % Give me the package or the documentation
- \ifnum \catcode`\@=12\relax
- % Give me the documentation
- \ProvidesFile{gridset.dtx}
+\ifx\ProvidesFile\undfined\def\ProvidesFile#1[#2]{}\fi
+\ProvidesFile{gridset.dtx}
%</dtx>
%<*dtx|package|example>
%<package>\ProvidesPackage{gridset}
%<example>\ProvidesFile{gridsetexample.tex}
- [2020-02-12 v0.3 grid - a.k.a. in-register - setting]
+ [2024-08-17 v0.4 grid - a.k.a. in-register - setting]
%</dtx|package|example>
%<*dtx>
- \documentclass{ltxdoc}
- \begin{document}
- \RecordChanges
- \GetFileInfo{gridset.dtx}
- \DocInput{gridset.dtx}
-%</dtx>
-%<*dtx>
- \expandafter\expandafter\expandafter\enddocument
- \fi
-\else
- % Make the package
- \def\batchfile{gridset.dtx}
- \let\batchendinput\endinput
-%</dtx>
-%<*ins>
-%<ins>\def\batchfile{gridset.ins}
+\ifx\documentclass\undefined
\input docstrip.tex
-
\keepsilent
\askforoverwritefalse
\usedir{tex/latex/gridset}
@@ -98,12 +78,16 @@ about the files the work consists of.
\Msg{*}
\Msg{*********************************************************************}
}
-
-%</ins>
-%<*dtx>
+\else
+ \let\endbatchfile\relax
\fi
-\csname fi\endcsname
-\csname batchendinput\endcsname
+\endbatchfile
+\documentclass{ltxdoc}
+\begin{document}
+\RecordChanges
+\GetFileInfo{gridset.dtx}
+\DocInput{gridset.dtx}
+\end{document}
%</dtx>
% \fi ^^A meta-comment
%
@@ -313,6 +297,12 @@ about the files the work consists of.
% \item the x-coordinate of the absolute position,
% \item the y-coordinate of the absolute position.
% \end{itemize}
+% \begin{description}
+% \item[Todo:] Currently we use our own command \cs{newpos} to store the
+% position information in the \texttt{aux}-file. But with the extended
+% reference mechanism of \LaTeX{} since 2023-11-01 this should be replaced
+% by the new properties.
+% \end{description}
% \begin{macrocode}
\newcommand*{\SavePos}[1]{%
\begingroup
@@ -411,8 +401,17 @@ about the files the work consists of.
that won't be reported!}%
\fi
}
+% \end{macrocode}
+% \changes{0.4}{2024/08/17}{fix deactivation of
+% \cs{grid@unique@test}
+% (\href{https://github.com/komascript/gridset/issues/1}{Issue \#1})}
+% The test should be done only, when reading the \texttt{aux} file at
+% |\begin{document}|, but not later (e.g. at |\end{document}|). So we
+% deactivate the test after reading the \texttt{aux} file in
+% |\begin{document}|.
+% \begin{macrocode}
\AtBeginDocument{%
- \global\let\grid@unique@test\@gobble
+ \global\let\grid@unique@test\@gobbletwo
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/gridset/gridset.ins b/Master/texmf-dist/source/latex/gridset/gridset.ins
new file mode 100644
index 00000000000..de5fbe835e7
--- /dev/null
+++ b/Master/texmf-dist/source/latex/gridset/gridset.ins
@@ -0,0 +1,38 @@
+%%
+%% This is file `gridset.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gridset.dtx (with options: `ins')
+%%
+%% IMPORTANT NOTE:
+%%
+%% This is a generated file and you are not allowed to distribute it
+%% without the source ot the work. See below about more informations
+%% about the files the work consists of.
+%%
+%% Copyright (C) 2008-2024 Markus Kohm
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The author and current maintainer of this work is
+%% Markus Kohm <komascript@gmx.info>.
+%%
+%% This work consists of the files gridset.dtx and README.md.
+%%
+%% Important Recommendation:
+%% The LPPL requires that distributions of the Work contain all the files of
+%% the Work (see ``Important Recommendations'' at lppl.txt).
+%%
+\endinput
+%%
+%% End of file `gridset.ins'.
diff --git a/Master/texmf-dist/tex/latex/gridset/gridset.sty b/Master/texmf-dist/tex/latex/gridset/gridset.sty
index 00a11c2c83e..30ed1443293 100644
--- a/Master/texmf-dist/tex/latex/gridset/gridset.sty
+++ b/Master/texmf-dist/tex/latex/gridset/gridset.sty
@@ -12,7 +12,7 @@
%% without the source ot the work. See below about more informations
%% about the files the work consists of.
%%
-%% Copyright (C) 2008-2020 Markus Kohm
+%% Copyright (C) 2008-2024 Markus Kohm
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -34,7 +34,7 @@
%% the Work (see ``Important Recommendations'' at lppl.txt).
%%
\ProvidesPackage{gridset}
- [2020-02-12 v0.3 grid - a.k.a. in-register - setting]
+ [2024-08-17 v0.4 grid - a.k.a. in-register - setting]
\newcommand*{\gridset@luaorpdf}[1]{%
\expandafter\newcommand\csname gridset@#1\endcsname{}%
\ifcsname pdf#1\endcsname
@@ -137,7 +137,7 @@
\fi
}
\AtBeginDocument{%
- \global\let\grid@unique@test\@gobble
+ \global\let\grid@unique@test\@gobbletwo
}
\newcommand*\grid@ReRunMessage{}
\AtBeginDocument{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 6dafc17dc63..cb96ec3bb01 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3317,7 +3317,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'grading-scheme' => 'etex-answer-y',
'graphics-pln' => "env TEXINPUTS=$Master/texmf-dist/source/latex/base: latex",
'grffile' => 'tex',
- 'gridset' => 'etex',
+ 'gridset' => 'tex',
'halloweenmath' => 'latex', # requires interaction
'hamnosys' => 'etex-answer-y',
'hanzibox' => 'etex',
@@ -4558,10 +4558,10 @@ sub runins {
&runjob ("$invoke_insrunner $_");
# bbold.dtx generates bbold.ins, and then does "low level hacks" to
- # run the .ins itself. mathfont.dtx generates mathfont.ins to no
- # purpose (and it doesn't work). We don't want to do anything in
- # either case.
- next if $package =~ /^(bbold|mathfont)$/;
+ # run the .ins itself. mathfont.dtx and gridset.dtx generate
+ # .ins files to no purpose (and they don't work). We don't want to
+ # do anything in these cases.
+ next if $package =~ /^(bbold|mathfont|gridset)$/;
# in the case of fullblck (et al.), the .dtx creates the .ins (so the
# .ins is not in @filenames), and the .ins creates the .sty.