diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/minim')
-rw-r--r-- | Master/texmf-dist/tex/luatex/minim/minim-doc.sty | 36 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/minim/minim-pdfresources.lua | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/minim/minim-pdfresources.tex | 1 |
3 files changed, 35 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/luatex/minim/minim-doc.sty b/Master/texmf-dist/tex/luatex/minim/minim-doc.sty index 97b173beac0..93d807f16a3 100644 --- a/Master/texmf-dist/tex/luatex/minim/minim-doc.sty +++ b/Master/texmf-dist/tex/luatex/minim/minim-doc.sty @@ -9,6 +9,7 @@ %\decompressedpdf \pdfalevel 3a +\pdfualevel 1 \overfullrule = 0pt % 1 page layout @@ -124,8 +125,22 @@ endfig;} % page artifacts \edef\tmp{\markartifact{Pagination /Subtype/Footer}{\the\footline}} \footline\expandafter{\tmp} -\def\footnoterule{\markartifact{Layout}{\kern-3\p@ - \hrule width 2truein \kern 2.6\p@}} % the \hrule is .4pt high + +% footnotes +\edef\footnoterule{\markartifact{Layout}\footnoterule} +\catcode`\@=11 +\def\footnote#1{\let\@sf\empty % parameter #2 (the text) is read later + \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi + \marknoteref{#1}\@sf\vfootnote{#1}} +\def\vfootnote#1{% + \insert\footins\bgroup + \interlinepenalty\interfootnotelinepenalty + \splittopskip\ht\strutbox % top baseline for broken footnotes + \splitmaxdepth\dp\strutbox \floatingpenalty\@MM + \leftskip\z@skip \rightskip\z@skip \spaceskip\z@skip \xspaceskip\z@skip + \nextpartag{}\marknotelbl{#1}\enspace\startelement{P}% + \footstrut\futurelet\next\fo@t} +\catcode`\@=12 % \startlist \item x. ... \stoplist \def\listskip{\vskip 3pt plus 2pt\vskip-\parskip} @@ -141,22 +156,26 @@ endfig;} \protected\def\chapter#1 \par{% \vfil\break \ensurestopelement{Section}% - \startelement{Chapter}% + \global\advance\chapterno1 \global\sectionno0 + \startelement title{Chapter \the\chapterno}{Chapter}% \outline open {#1}% \addtotoc{\chapter{#1}{\lastdestinationname}}% \nextpartag{H}\quitvmode \red{\Title#1\hfill\copy\notehead}\bigskip\nobreak} +\newcount \chapterno % \section Title \par \addstructuretype Sect Section \protected\def\section#1 \par{% \bigskip\penalty-50\relax - \startelement{Section}% + \global\advance\sectionno1 + \startelement title{Section \the\chapterno.\the\sectionno}{Section}% \outline closed {#1}% \addtotoc{\section{#1}{\lastdestinationname}}% \nextpartag{H}\quitvmode \red{\title#1}% \par\nobreak} +\newcount \sectionno % table of contents \newtoks\toc \newif\iftoc \toctrue @@ -186,7 +205,9 @@ endfig;} \tocfalse \chapter \getmetadata title \hfill \tenrm version \getmetadata version \par\endgroup - \marktableaslist \halign {\strut + \marktableaslist + \tagattribute List ListNumbering /None + \halign {\strut \qquad##\quad&##\hfil\cr author&\getmetadata author\cr contact&{\def\tmp{@}\def\TMP{.}% @@ -207,8 +228,9 @@ Licence (EUPL) version 1.2 or later. An english version of this licence has been included as an attachment to this file; copies in other languages can be obtained at \stopformulatagging$$\hbox -{\hyperlink url {https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12}% -https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12\endlink}$$\startformulatagging} +{\hyperlink alt{Link to the website of the EUPL.} + url {https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12}% + https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12\endlink}$$\startformulatagging} % for identifying which file we are typesetting \edef\thejobname{\expandafter\scantextokens\expandafter{\jobname}} diff --git a/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.lua b/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.lua index e6a06e783e1..468da03b485 100644 --- a/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.lua +++ b/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.lua @@ -50,7 +50,7 @@ function M.use_resource(kind, name) return res._entry_ end --- global resources are mainly for pgf compatibility: contains adds entries to +-- global resources are mainly for pgf compatibility: it contains entries to -- the resource dictionaries that will be added for every page. -- local global_resources = init_resources() -- name ↦ '/Key <value>' @@ -87,6 +87,10 @@ function M.use_resource_node(kind, name) return n end +alloc.luadef('withpdfresource', function() + node.write(M.use_resource_node(token.scan_string(), token.scan_string())) +end, 'protected') + -- construction and caching of resource dictionaries. -- local previous_dicts = init_resources() -- pdf dict ↦ objnum diff --git a/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.tex b/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.tex index 6b8dc29577f..57e9d8f012f 100644 --- a/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.tex +++ b/Master/texmf-dist/tex/luatex/minim/minim-pdfresources.tex @@ -13,6 +13,7 @@ % 1 pgf compatibility % this ballet inserts our fix directly at the end of pgfsys-luatex.def +% (see the \ProvidesFile redefinition in minim-alloc.tex) \expandafter\def\csname minim:intercept:pgfsys-luatex.def\endcsname {\wlog{minim: applying pgf patches...}\newtoks\minim:pgf:fix:toks \minim:pgf:fix:toks\csname pgfutil@everybye\endcsname |