summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/algpseudocodex/algpseudocodex.pdfbin355352 -> 355364 bytes
-rw-r--r--macros/latex/contrib/algpseudocodex/algpseudocodex.sty6
-rw-r--r--macros/latex/contrib/algpseudocodex/algpseudocodex.tex9
-rw-r--r--macros/latex/contrib/ducksay/README.md2
-rw-r--r--macros/latex/contrib/ducksay/ducksay.dtx280
-rw-r--r--macros/latex/contrib/ducksay/ducksay.pdfbin486578 -> 543677 bytes
-rw-r--r--macros/latex/contrib/gitstatus/LICENSE416
-rw-r--r--macros/latex/contrib/gitstatus/README.md37
-rw-r--r--macros/latex/contrib/gitstatus/example.tex14
-rw-r--r--macros/latex/contrib/gitstatus/gitstatus.dtx169
-rw-r--r--macros/latex/contrib/gitstatus/gitstatus.ins50
-rw-r--r--macros/latex/contrib/gitstatus/gitstatus.pdfbin0 -> 283311 bytes
-rw-r--r--macros/luatex/latex/piton/README.md6
-rw-r--r--macros/luatex/latex/piton/piton-french.pdfbin151584 -> 154819 bytes
-rw-r--r--macros/luatex/latex/piton/piton-french.tex33
-rw-r--r--macros/luatex/latex/piton/piton.dtx1000
-rw-r--r--macros/luatex/latex/piton/piton.lua493
-rw-r--r--macros/luatex/latex/piton/piton.pdfbin227733 -> 308546 bytes
18 files changed, 1700 insertions, 815 deletions
diff --git a/macros/latex/contrib/algpseudocodex/algpseudocodex.pdf b/macros/latex/contrib/algpseudocodex/algpseudocodex.pdf
index 09a3887bca..1f7c2faa6a 100644
--- a/macros/latex/contrib/algpseudocodex/algpseudocodex.pdf
+++ b/macros/latex/contrib/algpseudocodex/algpseudocodex.pdf
Binary files differ
diff --git a/macros/latex/contrib/algpseudocodex/algpseudocodex.sty b/macros/latex/contrib/algpseudocodex/algpseudocodex.sty
index 1b6c53368b..4deb0c80d2 100644
--- a/macros/latex/contrib/algpseudocodex/algpseudocodex.sty
+++ b/macros/latex/contrib/algpseudocodex/algpseudocodex.sty
@@ -1,5 +1,5 @@
%% algpseudocodex.sty
-%% Copyright 2017, 2020-2021 Christian Matt
+%% Copyright 2017, 2020-2022 Christian Matt
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,7 +20,7 @@
% Based on Szasz Janos' algpseudocode.sty
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{algpseudocodex}[2021-12-05 v1.0.1 pseudocode typesetting]
+\ProvidesPackage{algpseudocodex}[2022-10-07 v1.0.2 pseudocode typesetting]
\RequirePackage{kvoptions}
\RequirePackage{algorithmicx}
\RequirePackage{etoolbox}
@@ -465,7 +465,7 @@
\@tikzmarkNow{algpx@indentEnd-\FSTop{algpx@indentStack}}%
\tikz[overlay,remember picture]{%
\pgfextractx{\algpx@indStartX}{\pgfpointanchor{algpx@indentStart-\FSTop{algpx@indentStack}}{center}}%
- \ifbool{algpx@indJustEnded}{%
+ \ifboolexpr{bool{algpx@indJustEnded} and test{\ifstrequal{#1}{0}}}{%
% use same coordinates as for previous end
\pgfextracty{\algpx@indEndY}{\pgfpointanchor{algpx@indentEnd-\thealgpx@justUsedIndentCount}{center}}%
\draw[algpxIndentLine] ($(algpx@indentStart-\FSTop{algpx@indentStack})+(0.12em,-0.8ex)$) -- ($(\algpx@indStartX,\algpx@indEndY)+(0.12em,0ex)$) -- +(0.5em,0);%
diff --git a/macros/latex/contrib/algpseudocodex/algpseudocodex.tex b/macros/latex/contrib/algpseudocodex/algpseudocodex.tex
index 5bbed3e33e..dce6c95ac7 100644
--- a/macros/latex/contrib/algpseudocodex/algpseudocodex.tex
+++ b/macros/latex/contrib/algpseudocodex/algpseudocodex.tex
@@ -1,5 +1,5 @@
%% documentation.tex
-%% Copyright 2020-2021 Christian Matt
+%% Copyright 2020-2022 Christian Matt
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,7 +29,7 @@
\title{\bf{Algpseudocodex Package Documentation}}
\author{Christian Matt \\ \url{https://github.com/chrmatt/algpseudocodex}}
-\date{\today\\v1.0.1}
+\date{\today\\v1.0.2}
\begin{document}
@@ -681,6 +681,11 @@ The following keywords can be customized:
\section{Revision History}
+\subsection*{v1.0.2 (2022-10-07)}
+\begin{itemize}
+ \item Fixed bug with incorrectly ended indent block for nested statements.
+\end{itemize}
+
\subsection*{v1.0.1 (2021-12-05)}
\begin{itemize}
\item Fixed bug regarding alignment of comments after end if, end for etc.
diff --git a/macros/latex/contrib/ducksay/README.md b/macros/latex/contrib/ducksay/README.md
index 1e74c85621..763cea25fb 100644
--- a/macros/latex/contrib/ducksay/README.md
+++ b/macros/latex/contrib/ducksay/README.md
@@ -9,7 +9,7 @@ option) any later version. The latest version of this license is in the file:
This work is "maintained" (as per LPPL maintenance status) by
Jonathan P. Spratte.
-Copyright (C) 2017-2020 by Jonathan P. Spratte
+Copyright (C) 2017-2022 by Jonathan P. Spratte
The package draws ASCII art of animals saying a specified message. The following
macros are available:
diff --git a/macros/latex/contrib/ducksay/ducksay.dtx b/macros/latex/contrib/ducksay/ducksay.dtx
index 0c2704d8da..98700c2b74 100644
--- a/macros/latex/contrib/ducksay/ducksay.dtx
+++ b/macros/latex/contrib/ducksay/ducksay.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: ducksay.dtx Copyright (C) 2017-2020 Jonathan P. Spratte
+% File: ducksay.dtx Copyright (C) 2017-2022 Jonathan P. Spratte
%
% This work may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -27,7 +27,7 @@ Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
--------------------------------------------------------------
-Copyright (C) 2017-2020 Jonathan P. Spratte
+Copyright (C) 2017-2022 Jonathan P. Spratte
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -202,8 +202,8 @@ and the derived files ducksay.pdf
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay@version{2.5a}
-\def\ducksay@date{2020-10-29}
+\def\ducksay@version{2.6}
+\def\ducksay@date{2022-10-08}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
@@ -954,8 +954,11 @@ and the derived files ducksay.pdf
% {%
% \tiny
% \hfill
-% \ducksay[sheep,MSG=\footnotesize,msg-align=c]
-% {I'm woolly,\\I'm fluffy,\\and I'm all new!}
+% \ducksay[platypus,MSG=\footnotesize,msg-align=c]
+% {Quack?}\\
+% \hspace*{1cm}%
+% \ducksay[small-horse,MSG=\footnotesize,msg-align=c,body-mirrored]
+% {Neigh, we're new!}
% }
% The following animals are provided by this package. I did not create them (but
% altered some), they belong to their original creators.
@@ -980,7 +983,9 @@ and the derived files ducksay.pdf
% ,dragon^^A
% ,sodomized^^A
% ,hedgehog^^A
+% ,platypus^^A
% ,kangaroo^^A
+% ,small-horse^^A
% ,dog^^A
% ,sheep^^A
% ,rabbit^^A
@@ -1638,6 +1643,8 @@ and the derived files ducksay.pdf
}
\msg_new:nnn { ducksay } { v1-key-only }
{ The~`\l_keys_key_tl`~key~is~only~available~for~`version=1`. }
+\msg_new:nnn { ducksay } { zero-baselineskip }
+ { Current~ baselineskip~ is~ 0pt. }
% \end{macrocode}
%^^A=<<
%
@@ -2006,138 +2013,175 @@ and the derived files ducksay.pdf
% \begin{macro}[internal]{\ducksay_make_body_bigger:}^^A>>=
% \begin{macrocode}
\cs_new:Npn \ducksay_make_body_bigger:
- {
- \int_step_function:nN \l_ducksay_body_bigger_int
- \ducksay_make_body_bigger_aux:n
- }
+ { \prg_replicate:nn \l_ducksay_body_bigger_int \\ }
% \end{macrocode}
% \end{macro}^^A=<<
%
-% \begin{macro}[internal]{\ducksay_make_body_bigger_aux:n}^^A>>=
+% \begin{macro}[internal]{\ducksay_baselineskip:}^^A>>=
+% This is an overly cautious way to get the current baselineskip. Inside of
+% \env{tabular} the baselineskip is 0pt, so we fall back to
+% \cs[no-index]{normalbaselineskip}, or issue an error and fall back to some
+% arbitrary value not producing an error if that one is also 0pt.
% \begin{macrocode}
-\cs_new:Npn \ducksay_make_body_bigger_aux:n #1
+\cs_new_protected_nopar:Npn \ducksay_baselineskip:
{
- \\
+ \the\dimexpr
+ \ifdim \baselineskip = \c_zero_dim
+ \ifdim \normalbaselineskip = \c_zero_dim
+ \msg_expandable_error:nn { ducksay } { zero-baselineskip } { 12pt }
+ 12pt
+ \else
+ \normalbaselineskip
+ \fi
+ \else
+ \baselineskip
+ \fi
+ \relax
}
% \end{macrocode}
% \end{macro}^^A=<<
%
-% \begin{macro}[internal]{\ducksay_shipout:}^^A>>=
+% \begin{macro}[internal]{\ducksay_measure_msg:}^^A>>=
% \begin{macrocode}
-\cs_new_protected:Npn \ducksay_shipout:
+\cs_new_protected_nopar:Npn \ducksay_measure_msg:
{
- \hcoffin_set:Nn \l_ducksay_msg_coffin { \box_use:N \l_ducksay_msg_box }
- \bool_if:NF \l_ducksay_no_bubble_bool
+ \hbox_set:Nn \l_ducksay_tmpa_box
+ { \l_ducksay_bubble_fount_tl \l_ducksay_bubble_delim_top_tl }
+ \int_set:Nn \l_ducksay_msg_width_int
{
- \hbox_set:Nn \l_ducksay_tmpa_box
- { \l_ducksay_bubble_fount_tl \l_ducksay_bubble_delim_top_tl }
- \int_set:Nn \l_ducksay_msg_width_int
+ \fp_eval:n
+ {
+ ceil
+ ( \box_wd:N \l_ducksay_msg_box / \box_wd:N \l_ducksay_tmpa_box )
+ }
+ }
+ \group_begin:
+ \l_ducksay_bubble_fount_tl
+ \exp_args:NNNx
+ \group_end:
+ \int_set:Nn \l_ducksay_msg_height_int
+ {
+ \int_max:nn
{
\fp_eval:n
{
ceil
(
- \box_wd:N \l_ducksay_msg_box / \box_wd:N \l_ducksay_tmpa_box
+ (
+ \box_ht:N \l_ducksay_msg_box
+ + \box_dp:N \l_ducksay_msg_box
+ )
+ / ( \arraystretch * \ducksay_baselineskip: )
)
}
+ + \l_ducksay_vpad_int
}
- \group_begin:
+ { \l_ducksay_msg_height_int }
+ }
+ }
+% \end{macrocode}
+% \end{macro}^^A=<<
+%
+% \begin{macro}[internal]{\ducksay_set_bubble_coffins:}^^A>>=
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \ducksay_set_bubble_coffins:
+ {
+ \hcoffin_set:Nn \l_ducksay_bubble_open_coffin
+ {
\l_ducksay_bubble_fount_tl
- \exp_args:NNNx
- \group_end:
- \int_set:Nn \l_ducksay_msg_height_int
- {
- \int_max:nn
- {
- \fp_eval:n
- {
- ceil
- (
- (
- \box_ht:N \l_ducksay_msg_box
- + \box_dp:N \l_ducksay_msg_box
- )
- / ( \arraystretch * \baselineskip )
- )
- }
- + \l_ducksay_vpad_int
- }
- { \l_ducksay_msg_height_int }
- }
- \hcoffin_set:Nn \l_ducksay_bubble_open_coffin
- {
- \l_ducksay_bubble_fount_tl
- \begin{tabular}{@{}l@{}}
- \int_compare:nNnTF { \l_ducksay_msg_height_int } = { \c_one_int }
- {
- \l_ducksay_bubble_delim_left_a_tl
- }
- {
- \l_ducksay_bubble_delim_left_b_tl\\
- \int_step_inline:nnn
- { 3 } { \l_ducksay_msg_height_int }
- {
- \kern-\l_ducksay_bubble_side_kern_tl
- \l_ducksay_bubble_delim_left_c_tl
- \\
- }
- \l_ducksay_bubble_delim_left_d_tl
- }
- \end{tabular}
- }
- \hcoffin_set:Nn \l_ducksay_bubble_close_coffin
- {
- \l_ducksay_bubble_fount_tl
- \begin{tabular}{@{}r@{}}
- \int_compare:nNnTF { \l_ducksay_msg_height_int } = { \c_one_int }
+ \begin{tabular}{@{}l@{}}
+ \int_compare:nNnTF { \l_ducksay_msg_height_int } = { \c_one_int }
+ {
+ \l_ducksay_bubble_delim_left_a_tl
+ }
+ {
+ \l_ducksay_bubble_delim_left_b_tl\\
+ \int_step_inline:nnn
+ { 3 } { \l_ducksay_msg_height_int }
{
- \l_ducksay_bubble_delim_right_a_tl
+ \kern-\l_ducksay_bubble_side_kern_tl
+ \l_ducksay_bubble_delim_left_c_tl
+ \\
}
+ \l_ducksay_bubble_delim_left_d_tl
+ }
+ \end{tabular}
+ }
+ \hcoffin_set:Nn \l_ducksay_bubble_close_coffin
+ {
+ \l_ducksay_bubble_fount_tl
+ \begin{tabular}{@{}r@{}}
+ \int_compare:nNnTF { \l_ducksay_msg_height_int } = { \c_one_int }
+ {
+ \l_ducksay_bubble_delim_right_a_tl
+ }
+ {
+ \l_ducksay_bubble_delim_right_b_tl \\
+ \int_step_inline:nnn
+ { 3 } { \l_ducksay_msg_height_int }
{
- \l_ducksay_bubble_delim_right_b_tl \\
- \int_step_inline:nnn
- { 3 } { \l_ducksay_msg_height_int }
- {
- \l_ducksay_bubble_delim_right_c_tl
- \kern-\l_ducksay_bubble_side_kern_tl
- \\
- }
- \l_ducksay_bubble_delim_right_d_tl
+ \l_ducksay_bubble_delim_right_c_tl
+ \kern-\l_ducksay_bubble_side_kern_tl
+ \\
}
- \end{tabular}
- }
- \hcoffin_set:Nn \l_ducksay_bubble_top_coffin
- {
- \l_ducksay_bubble_fount_tl
- \int_step_inline:nn
- { \l_ducksay_msg_width_int + \l_ducksay_hpad_int }
- { \l_ducksay_bubble_delim_top_tl }
- }
- \dim_set:Nn \l_ducksay_hpad_dim
- {
- (
- \coffin_wd:N \l_ducksay_bubble_top_coffin
- - \coffin_wd:N \l_ducksay_msg_coffin
- ) / 2
- }
- \coffin_join:NnnNnnnn
- \l_ducksay_msg_coffin { l } { vc }
- \l_ducksay_bubble_open_coffin { r } { vc }
- { - \l_ducksay_hpad_dim } { \c_zero_dim }
- \coffin_join:NnnNnnnn
- \l_ducksay_msg_coffin { r } { vc }
- \l_ducksay_bubble_close_coffin { l } { vc }
- { \l_ducksay_hpad_dim } { \c_zero_dim }
+ \l_ducksay_bubble_delim_right_d_tl
+ }
+ \end{tabular}
+ }
+ \hcoffin_set:Nn \l_ducksay_bubble_top_coffin
+ {
+ \l_ducksay_bubble_fount_tl
+ \int_step_inline:nn
+ { \l_ducksay_msg_width_int + \l_ducksay_hpad_int }
+ { \l_ducksay_bubble_delim_top_tl }
+ }
+ }
+% \end{macrocode}
+% \end{macro}^^A=<<
+%
+% \begin{macro}[internal]{\ducksay_join_bubble_to_msg_coffin:}^^A>>=
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \ducksay_join_bubble_to_msg_coffin:
+ {
+ \dim_set:Nn \l_ducksay_hpad_dim
+ {
+ (
+ \coffin_wd:N \l_ducksay_bubble_top_coffin
+ - \coffin_wd:N \l_ducksay_msg_coffin
+ ) / 2
+ }
+ \coffin_join:NnnNnnnn
+ \l_ducksay_msg_coffin { l } { vc }
+ \l_ducksay_bubble_open_coffin { r } { vc }
+ { - \l_ducksay_hpad_dim } { \c_zero_dim }
+ \coffin_join:NnnNnnnn
+ \l_ducksay_msg_coffin { r } { vc }
+ \l_ducksay_bubble_close_coffin { l } { vc }
+ { \l_ducksay_hpad_dim } { \c_zero_dim }
+ \coffin_join:NnnNnnnn
+ \l_ducksay_msg_coffin { hc } { t }
+ \l_ducksay_bubble_top_coffin { hc } { b }
+ { \c_zero_dim } { \l_ducksay_bubble_top_kern_dim }
+ \coffin_join:NnnNnnnn
+ \l_ducksay_msg_coffin { hc } { b }
+ \l_ducksay_bubble_top_coffin { hc } { t }
+ { \c_zero_dim } { \l_ducksay_bubble_bottom_kern_dim }
+ }
+% \end{macrocode}
+% \end{macro}^^A=<<
+%
+% \begin{macro}[internal]{\ducksay_shipout:}^^A>>=
+% \begin{macrocode}
+\cs_new_protected:Npn \ducksay_shipout:
+ {
+ \hcoffin_set:Nn \l_ducksay_msg_coffin { \box_use:N \l_ducksay_msg_box }
+ \bool_if:NF \l_ducksay_no_bubble_bool
+ {
+ \ducksay_measure_msg:
+ \ducksay_set_bubble_coffins:
\ducksay_set_bubble_top_kern:
\ducksay_set_bubble_bottom_kern:
- \coffin_join:NnnNnnnn
- \l_ducksay_msg_coffin { hc } { t }
- \l_ducksay_bubble_top_coffin { hc } { b }
- { \c_zero_dim } { \l_ducksay_bubble_top_kern_dim }
- \coffin_join:NnnNnnnn
- \l_ducksay_msg_coffin { hc } { b }
- \l_ducksay_bubble_top_coffin { hc } { t }
- { \c_zero_dim } { \l_ducksay_bubble_bottom_kern_dim }
+ \ducksay_join_bubble_to_msg_coffin:
}
\bool_if:NF \l_ducksay_no_body_bool
{
@@ -2714,6 +2758,20 @@ and the derived files ducksay.pdf
(, ,) ,)
`-_,---_,-'
|| ||}
+%^^A based on joe schmuck (http://www.ascii-art.de/ascii/pqr/platypus.txt)
+\AddAnimal[tail-symbol=s]{platypus}
+| s _.-^~~^^`~-,,,~~''```~-''``~'``~,
+ s ______,' -o :. _ . ; ,'`, `.
+ ( -\.._,.;;'._,( } _`_-_,, `, `,
+ ``~~~~~~' ((/'(((____/~~'(,(,___> `~'|
+\AddAnimal[tail-symbol=s]{small-horse}
+{ s _,_
+ s /._ \\
+ /_/ |_\\ _ __
+ / \\ \\
+ \ _ __ _ /||
+ | | | | ||
+ | | | |}
%</animals>
% \end{macrocode}^^A=<<
%^^A%^^A https://www.asciiart.eu/mythology/fairies
diff --git a/macros/latex/contrib/ducksay/ducksay.pdf b/macros/latex/contrib/ducksay/ducksay.pdf
index dc846e0bf4..6f54d4a73b 100644
--- a/macros/latex/contrib/ducksay/ducksay.pdf
+++ b/macros/latex/contrib/ducksay/ducksay.pdf
Binary files differ
diff --git a/macros/latex/contrib/gitstatus/LICENSE b/macros/latex/contrib/gitstatus/LICENSE
new file mode 100644
index 0000000000..2244313901
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/LICENSE
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % 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.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff --git a/macros/latex/contrib/gitstatus/README.md b/macros/latex/contrib/gitstatus/README.md
new file mode 100644
index 0000000000..729668e29f
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/README.md
@@ -0,0 +1,37 @@
+# gitstatus
+
+This package allows to include information about a git-repository into a document.
+
+## Introduction
+
+If your LaTeX-document is version-controlled with git, you might encounter situations, where you want to include some information of your git-repository into your LaTeX-document - e.g. to keep track on who gave you feedback on which version of your document.
+
+## Options
+
+- *gitdir* - custom git dir (can be relative), (default is ".git/", meaning your LaTeX document is in the top level of your repo)
+- *watermark* - watermark with branch + hash on top of page (default: don't use watermark)
+- *nowatermark* - same as watermark=false
+- *novariables* - disable creation of variables (default: false)
+
+## Variables
+
+Apart from the option to add a watermark at the top of the page that mentions the current commit hash and branch-name, the package also provides variables with the same information for individual use.
+These variables are:
+
+- *\gitdir*
+- *\gitcommit*
+- *\gitbranch*
+
+## About
+
+### Version
+
+The package is currently at version v1.1.
+
+### Maintainer
+
+The code is created and maintained by Maximilian Gruber.
+
+### License
+
+This package is provided under the LaTeX Project Public License (LPPL).
diff --git a/macros/latex/contrib/gitstatus/example.tex b/macros/latex/contrib/gitstatus/example.tex
new file mode 100644
index 0000000000..0e8bbf37e9
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/example.tex
@@ -0,0 +1,14 @@
+\documentclass[openany,ngerman]{book}
+
+\usepackage[watermark]{gitstatus}
+
+
+\begin{document}
+ This is a test.
+
+ \gitdir
+
+ \gitcommit
+
+ \gitbranch
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/gitstatus/gitstatus.dtx b/macros/latex/contrib/gitstatus/gitstatus.dtx
new file mode 100644
index 0000000000..1d8fc04374
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/gitstatus.dtx
@@ -0,0 +1,169 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2022 by Maximilian Gruber
+%
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 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.3 or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
+%
+% \fi
+%
+%
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\ProvidesPackage{gitstatus}
+%<package> [2022/10/06 v1.1 Watermark Git Information Package]
+%
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage[watermark]{gitstatus}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+%\OnlyDescription
+\begin{document}
+ \DocInput{gitstatus.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{0}
+%
+%
+% \changes{v1.1}{2022/10/06}{Initial version}
+%
+% \DoNotIndex{\CatchFileDef, \DeclareBoolOption, \DeclareComplementaryOption, \DeclareStringOption}
+% \DoNotIndex{\\, \def, \else, \fi, \IfFileExists, \iffalse, }
+% \DoNotIndex{\newwatermark, \texttt}
+% \DoNotIndex{\RequirePackage, \PackageWarning, \ProcessKeyvalOptions, \StrBehind, \StrGobbleRight}
+%
+% \GetFileInfo{gitstatus.sty}
+% \title{The \textsf{gitstatus} package\thanks{This document
+% corresponds to \textsf{gitstatus}~\fileversion,
+% dated~\filedate.}}
+% \author{Maximilian Gruber \\ \texttt{m.gruber@mailbox.org}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% This package allows to include information about a git-repository into a document.
+% This information can be included like the watermark in this document or by the use of variables.
+% \end{abstract}
+%
+% \section{Introduction}
+% If your LaTeX-document is version-controlled with git, you might encounter situations, where you want to include some information of your git-repository into your LaTeX-document - e.g. to keep track on who gave you feedback on which version of your document.
+%
+% \section{Options}
+% \DescribeMacro{gitdir}
+% custom git dir (can be relative), (default is ".git/", meaning your LaTeX document is in the top level of your repo)
+%
+% \DescribeMacro{watermark}
+% watermark with branch + hash on top of page (default: don't use watermark)
+%
+% \DescribeMacro{nowatermark}
+% same as watermark=false
+%
+% \DescribeMacro{novariables}
+% disable creation of variables (default: false, hence variables are created)
+%
+%
+% \section{Variables}
+% Apart from the option to add a watermark at the top of the page that mentions the current commit hash and branch-name, the package also provides variables with the same information for individual use.
+% These variables are:
+% \DescribeMacro{\gitdir}
+% The directory of the git repository.
+%
+% \DescribeMacro{\gitcommit}
+% The hash of the most recent commit of the current branch.
+%
+% \DescribeMacro{\gitbranch}
+% The name of the current branch.
+%
+%
+% \StopEventually{\PrintChanges}
+%
+% \section{Implementation}
+%
+% \subsection{Required Packages}
+% The package relies on five other packages. Three are listed here, the other two are only required if a watermark is created.
+% \begin{macrocode}
+\RequirePackage{kvoptions}
+\RequirePackage{catchfile}
+\RequirePackage{xstring}
+% \end{macrocode}
+%
+% \subsection{Options}
+% The options are defined.
+% \begin{macrocode}
+\DeclareStringOption[.git/]{gitdir} % custom git dir (can be relative)
+\DeclareBoolOption[false]{watermark} % watermark with branch + hash on top of page
+\DeclareComplementaryOption{nowatermark}{watermark}
+\DeclareBoolOption[false]{novariables} % disable creation of variables
+\ProcessKeyvalOptions*
+% \end{macrocode}
+%
+%
+% \subsection{Getting Git Information}
+% Git information is read directly from the files within the specified git-directory.
+%
+% \subsubsection{Branch Name}
+% Branch is read from HEAD.
+% \begin{macrocode}
+\def\gitstatus@headpath{\gitstatus@gitdir HEAD}
+\IfFileExists{\gitstatus@headpath}{
+ \CatchFileDef{\gitstatus@headfull}{\gitstatus@headpath}{}
+ \StrGobbleRight{\gitstatus@headfull}{1}[\gitstatus@head]
+ \StrBehind[2]{\gitstatus@head}{/}[\gitstatus@branch]
+}{
+ \def\gitstatus@branch{NOT AVAILABLE}
+ \PackageWarning{gitstatus}{Can't find HEAD (maybe check specified gitdir).}
+}
+% \end{macrocode}
+%
+% \subsubsection{Commit Hash}
+% Commit-Hash is read from refs/heads/<branch-name>.
+% \begin{macrocode}
+\def\gitstatus@branchpath{\gitstatus@gitdir refs/heads/\gitstatus@branch}
+\IfFileExists{\gitstatus@branchpath}{
+ \CatchFileDef{\gitstatus@commit}{\gitstatus@branchpath}{}
+}{
+ \def\gitstatus@commit{NOT AVAILABLE}
+ \PackageWarning{gitstatus}{Can't read commit hash (maybe check specified gitdir).}
+}
+% \end{macrocode}
+%
+% \subsection{Defining Local Variables}
+% Make directory, branch and hash available outside of package
+% \begin{macrocode}
+\ifgitstatus@novariables
+\else
+ \def\gitdir{\gitstatus@gitdir}
+ \def\gitbranch{\gitstatus@branch}
+ \def\gitcommit{\gitstatus@commit}
+\fi
+% \end{macrocode}
+%
+% \subsection{Creating Watermark}
+% Include git information as watermark.
+% \begin{macrocode}
+\ifgitstatus@watermark
+ \RequirePackage{xcolor}
+ \RequirePackage[printwatermark]{xwatermark}
+ \newwatermark
+ [allpages,color=black!20,angle=0,scale=0.5,align=left,xpos=-2cm,ypos=13cm]
+ {On branch: \texttt{\gitstatus@branch}\\ Commit: \texttt{\gitstatus@commit}}
+\fi
+% \end{macrocode}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/macros/latex/contrib/gitstatus/gitstatus.ins b/macros/latex/contrib/gitstatus/gitstatus.ins
new file mode 100644
index 0000000000..475345a3eb
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/gitstatus.ins
@@ -0,0 +1,50 @@
+%%
+%% Copyright (C) 2022 by Maximilian Gruber
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 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.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+
+\input docstrip.tex
+\keepsilent
+\usedir{tex/latex/gitstatus}
+
+\preamble
+Copyright (C) 2022 by Maximilian Gruber
+
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 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.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+\endpreamble
+
+\generate{\file{gitstatus.sty}{\from{gitstatus.dtx}{package}}}
+
+\obeyspaces
+\Msg{****************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the *}
+\Msg{* following file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* gitstatus.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file *}
+\Msg{* gitstatus.dtx through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{****************************************************}
+
+\endbatchfile \ No newline at end of file
diff --git a/macros/latex/contrib/gitstatus/gitstatus.pdf b/macros/latex/contrib/gitstatus/gitstatus.pdf
new file mode 100644
index 0000000000..4a2267d733
--- /dev/null
+++ b/macros/latex/contrib/gitstatus/gitstatus.pdf
Binary files differ
diff --git a/macros/luatex/latex/piton/README.md b/macros/luatex/latex/piton/README.md
index c9ad487bcc..3dd557ecaa 100644
--- a/macros/luatex/latex/piton/README.md
+++ b/macros/luatex/latex/piton/README.md
@@ -15,6 +15,7 @@ The LaTeX package `piton` provides a command `\piton` and an environment `{Piton
## Installation
+The package `piton` is present in the distributions MiKTeX, TeXLive and MacTeX.
For a manual installation:
@@ -23,4 +24,7 @@ For a manual installation:
The file `piton.sty` will be generated.
-The file `piton.sty` is *not* the only file necessary to use the extension `piton`. The file `piton.lua` is also required. You have to put both in the same directory as your document or (best) in a `texmf` tree.
+The file `nicematrix.sty` is the only file necessary to use the extension `nicematrix`.
+You have to put it in the same directory as your document or (best) in a `texmf` tree.
+
+
diff --git a/macros/luatex/latex/piton/piton-french.pdf b/macros/luatex/latex/piton/piton-french.pdf
index 5356daa678..fe034629ee 100644
--- a/macros/luatex/latex/piton/piton-french.pdf
+++ b/macros/luatex/latex/piton/piton-french.pdf
Binary files differ
diff --git a/macros/luatex/latex/piton/piton-french.tex b/macros/luatex/latex/piton/piton-french.tex
index 3e70890e23..1b9854cb15 100644
--- a/macros/luatex/latex/piton/piton-french.tex
+++ b/macros/luatex/latex/piton/piton-french.tex
@@ -111,12 +111,11 @@ def arctan(x,n=10):
\end{Piton}
+\bigskip
-\section{Installation}
-
-L'extension \pkg{piton} est composée de deux fichiers : |piton.sty| et |piton.lua| (le fichier LaTeX |piton.sty|
-chargé par |\usepackage| va à son tour charger le fichier |piton.lua|). Les deux fichiers doivent être présents
-dans un répertoire où LaTeX pourra les trouver. Le mieux est de les installer dans une arborescence |texmf|.
+L'extension LaTeX \pkg{piton} est entièrement contenue dans le fichier |piton.sty|. Ce
+fichier peut être placé dans le répertoire courant ou dans une arborescence |texmf|. Le mieux reste néanmoins
+d'installer \pkg{piton} avec une distribution TeX comme MiKTeX, TeX~Live ou MacTeX.
\section{Utilisation de l'extension}
@@ -148,7 +147,8 @@ caractères |##| eux-mêmes ne seront pas imprimés et les espaces qui les suive
\subsection{La commande \textbackslash PitonOptions}
-La commande |\PitonOptions| propose cinq clés : |gobble|, |auto-gobble|, |env-gobble|, |line-numbers| et |all-line-numbers|.
+La commande |\PitonOptions| prend en argument une liste de couples \textsl{clé=valeur}. La portée des réglages
+effectués par cette commande est le groupe TeX courant.
\begin{itemize}
\item La clé |gobble| peut comme valeur un entier positif $n$ : les $n$ premiers caractères de chaque ligne sont
@@ -158,13 +158,28 @@ alors retirés (avant formatage du code) dans les environnements |{Piton}|.
d'espaces successifs débutant chaque ligne (non vide) de l'environnment |{Piton}| et applique |gobble| avec cette
valeur de~$n$.
-* Quand la clé |env-gobble| est activée, \pkg{piton} applique la clé |gobble| avec une valeur de $n$ égale au
+\item Quand la clé |env-gobble| est activée, \pkg{piton} applique la clé |gobble| avec une valeur de $n$ égale au
nombre d'espaces sur la ligne précédant le |\end{Piton}| (si cette ligne ne comporte que des espaces).
\item Avec la clé |line-numbers|, les lignes \emph{non vides} sont numérotées dans les environnements \verb|{Piton}|
et dans les listings produits par la commande |\PitonInputFile|.
\item Avec la clé |all-line-numbers|, \emph{toutes} les lignes sont numérotées, y compris les lignes vides.
+
+\item \colorbox{yellow!50}{\textbf{Nouveau 0.7}}\enskip Avec la clé |resume|, le compteur de lignes n'est pas remis à
+zéro comme il l'est normalement au début d'un environnement |{Piton}| ou bien au début d'un listing produit par
+|\PitonInputFile|.
+
+\item \colorbox{yellow!50}{\textbf{Nouveau 0.7}}\enskip La clé |splittable| autorise un saut de page
+dans les environnements |{Piton}| et les listings produits par |\PitonInputFile|.
+
+\item \colorbox{yellow!50}{\textbf{Nouveau 0.7}}\enskip La clé |background-color| fixe la couleur de fond des
+environnements |{Piton}| et des listings produits par |\PitonInputFile| (ce fond a une largeur égale à la valeur
+courante de |\linewidth|). Même avec une couleur de fond, les sauts de page sont possibles, à partir du moment où
+la clé |splittable| est utilisée.\footnote{Un environnement |{Piton}| est sécable même dans un environnement de
+ \pkg{tcolorbox}, à patir du moment où la clé |breakable| de \pkg{tcolorbox} est utilisée. On précise cela parce
+ que, en revanche, un environnement de \pkg{tcolorbox} inclus dans un autre environnement de \pkg{tcolorbox} n'est
+ pas sécable, même quand les deux utilisent la clé |breakable|.}
\end{itemize}
\bigskip
@@ -172,7 +187,7 @@ et dans les listings produits par la commande |\PitonInputFile|.
\begingroup
\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
\begin{Verbatim}
-~emphase&\PitonOptions{line-numbers,auto-gobble}@
+~emphase&\PitonOptions{line-numbers,auto-gobble,background-color = gray!15}@
\begin{Piton}
from math import pi
@@ -194,7 +209,7 @@ et dans les listings produits par la commande |\PitonInputFile|.
\endgroup
\begingroup
-\PitonOptions{line-numbers,auto-gobble}
+\PitonOptions{line-numbers,auto-gobble,background-color = gray!15}
\begin{Piton}
from math import pi
diff --git a/macros/luatex/latex/piton/piton.dtx b/macros/luatex/latex/piton/piton.dtx
index d7180b9fa3..4aeabac72b 100644
--- a/macros/luatex/latex/piton/piton.dtx
+++ b/macros/luatex/latex/piton/piton.dtx
@@ -1,3 +1,4 @@
+% \iffalse -*- coding: utf-8 ; -*- \fi
% \iffalse meta-comment
%
% Copyright (C) 2022 by F. Pantigny
@@ -15,8 +16,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{0.6a}
-\def\myfiledate{2022/09/19}
+\def\myfileversion{0.7}
+\def\myfiledate{2022/10/08}
%
%
%<*batchfile>
@@ -72,7 +73,7 @@ def arctan(x,n=10):
return -arctan(-x) # recursive call
elif x > 1:
return pi/2 - arctan(1/x)
- ## (we have used that $\arctan(x)+\arctan(1/x)=\frac{\pi}{2}$ for $x>0$)\footnote{This LaTeX escape has been done by beginning the comment by \ttfamily\#\#}
+ ## (we have used that $\arctan(x)+\arctan(1/x)=\frac{\pi}{2}$ for $x>0$)\footnote{This LaTeX escape has been done by beginning the comment by \ttfamily\#\#.}
else
s = 0
for k in range(n):
@@ -128,12 +129,12 @@ def fact(n):
% \PitonInputFile{Example1.txt}
%
%
-% \section{Installation}
+% \bigskip
%
-% The package \pkg{piton} is contained in two files: |piton.sty| and
-% |piton.lua| (the LaTeX file |piton.sty| loaded by |\usepackage| will load the
-% Lua file |piton.lua|). Both files must be in a repertory where LaTeX will be
-% able to find them. The best way is to install them in a |texmf| tree.
+% The package \pkg{piton} is entirely contained in the file
+% |piton.sty|. This file may be put in the current directory or in a
+% |texmf| tree. However, the best is to install \pkg{piton} with a TeX
+% distribution such as MiKTeX, TeX Live or MacTeX.
%
%
% \section{Use of the package}
@@ -166,12 +167,13 @@ def fact(n):
%
% \subsection{The command \textbackslash PitonOptions}
%
-% The command |\PitonOptions| provides five keys: |gobble|, |auto-gobble|,
-% |env-gobble|, |line-numbers| and |all-line-numbers|.
+% The command |\PitonOptions| takes in as argument a comma-separated list of
+% \textsl{key=value} pairs. The scope of the settings done by that command is
+% the current TeX group.
%
% \begin{itemize}
% \item The key |gobble| takes in as value a positive integer~$n$: the first $n$
-% characters are discarded (before the process of hightlighning of the code) for
+% characters are discarded (before the process of highlightning of the code) for
% each line of the environment |{Piton}|.
%
% \item Then the key |auto-gobble| is in force, the extension \pkg{piton} computes
@@ -181,7 +183,9 @@ def fact(n):
%
% \item When the key |env-gobble| is in force, \pkg{piton} applies |gobble| with
% a value of $n$ equal to the number of spaces before |\end{Piton}| on the last
-% line (if that line contains only spaces).
+% line (if that line contains only spaces). The name of that key comes from
+% \emph{environment gobble}: the effect of gobble is set by the position of the
+% commands |\begin{Piton}| and |\end{Piton}| which delimit the current environment.
%
% \item With the key |line-numbers|, the \emph{non empty} lines are numbered in
% the environments |{Piton}| and in the listings resulting from the use of
@@ -189,6 +193,24 @@ def fact(n):
%
% \item With the key |all-line-numbers|, \emph{all} the lines are numbered,
% including the empty ones.
+%
+% \item \colorbox{yellow!50}{\textbf{New 0.7}}\enskip By default, the counter of
+% lines is set to zero at the beginning of each environment |{Piton}| or use of
+% |\PitonInputFile|. With the key |resume|, that reinitialisation is not done.
+%
+% \item \colorbox{yellow!50}{\textbf{New 0.7}}\enskip The key |splittable| allows
+% pages breaks within the environments |{Piton}| and the listings produced by
+% |\PitonInputFile|.
+%
+% \item \colorbox{yellow!50}{\textbf{New 0.7}}\enskip The key |background-color|
+% sets the background color of the environments |{Piton}| and the listings
+% produced by |\PitonInputFile| (that background has a width of |\linewidth|).
+% Even with a background color, the pages breaks are allowed, as soon as the key
+% |splittable| is in force.\footnote{The environments \texttt{\{Piton\}} are breakable,
+% even whithin a breakable environment of \pkg{tcolorbox}. Remind that an
+% environment of \pkg{tcolorbox} included in another environment of
+% \pkg{tcolorbox} is \emph{not} breakable, even when both environments use the
+% key |breakable| of \pkg{tcolorbox}.}
% \end{itemize}
%
% \bigskip
@@ -196,7 +218,7 @@ def fact(n):
% \begingroup
% \fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
% \begin{Verbatim}
-% ~emphase&\PitonOptions{line-numbers,auto-gobble}@
+% ~emphase&\PitonOptions{line-numbers,auto-gobble,background-color = gray!15}@
% \begin{Piton}
% from math import pi
%
@@ -207,7 +229,7 @@ def fact(n):
% return -arctan(-x) # recursive call
% elif x > 1:
% return pi/2 - arctan(1/x)
-% ## (on a utilisé le fait que $\arctan(x)+\arctan(1/x)=\frac{\pi}{2}$ pour $x>0$)
+% ## (we have used that $\arctan(x)+\arctan(1/x)=\frac{\pi}{2}$ pour $x>0$)
% else
% s = 0
% for k in range(n):
@@ -219,17 +241,17 @@ def fact(n):
%
%
% \begingroup
-% \PitonOptions{line-numbers,auto-gobble}
+% \PitonOptions{line-numbers,auto-gobble,background-color = gray!15}
% \PitonInputFile{Example1.txt}
% \endgroup
%
-% \subsection{The option escape-inside}
+% \subsection{The key escape-inside}
%
-% The option |escape-inside| must be used when loading the package \pkg{piton}
+% The key |escape-inside| must be used when loading the package \pkg{piton}
% (that is to say in the instruction |\usepackage|). For technical reasons, it
% can't be used in the command |\PitonOptions|. That option takes in as value
% two characters which will be used to delimit pieces of code which will
-% composed in LaTeX.
+% thrown directly to LaTeX (and composed by LaTeX).e
%
% \medskip
% In the following example, we assume that the extension \pkg{piton} has been
@@ -292,7 +314,7 @@ def fact(n):
%
% In that example, |\colorbox{yellow!50}| must be considered as the name of a
% LaTeX command which takes in exactly one argument, since, usually, it is used
-% with the syntax |\colorbox{yellow!50}{text}|.
+% with the syntax |\colorbox{yellow!50}{...}|.
%
% \medskip
% \begingroup
@@ -324,7 +346,7 @@ def fact(n):
% is to say the characters \texttt{\{}, \texttt{\}} and \texttt{:}) \\
% Operator & the following operators : \texttt{!= == << >> - \~{} + / * \% = < > \& .} \verb+|+ \verb|@|\\
% Operator.Word & the following operators : \texttt{in}, \texttt{is},
-% \texttt{and}, \texttt{or} et \texttt{not} \\
+% \texttt{and}, \texttt{or} and \texttt{not} \\
% Name.Builtin & the predefined functions of Python \\
% Name.Function & the name of the functions defined by the user, at the point of
% their definition (that is to say after the keyword |def|) \\
@@ -368,8 +390,8 @@ def fact(n):
% \verb|\NewPitonEnvironment{Python}{}{}{}|
%
% \bigskip
-% If on wished to format Python code in a box in a box of \pkg{tcolorbox}, it's
-% possible to define an environment |{Python}| with the following code:
+% If one wishes to format Python code in a box of \pkg{tcolorbox}, it's possible
+% to define an environment |{Python}| with the following code:
%
%\begin{verbatim}
% \NewPitonEnvironment{Python}{}
@@ -405,11 +427,12 @@ def fact(n):
% \end{macrocode}
%
% \bigskip
-% We define a set of keys |piton/package| for these options.
+% We define a set of keys for the options at load-time.
% \begin{macrocode}
\keys_define:nn { piton / package }
{
escape-inside .tl_set:N = \c_@@_escape_inside_tl ,
+ escape-inside .initial:n = ,
unknown .code:n = \msg_error:nn { piton } { unknown~key~for~package }
}
% \end{macrocode}
@@ -417,19 +440,16 @@ def fact(n):
% \begin{macrocode}
\msg_new:nnn { piton } { unknown~key~for~package }
{
- Unknown~key\\
+ Unknown~key.\\
You~have~used~the~key~'\l_keys_key_str'~but~the~only~key~available~here~
- is~the~key~'escape-inside'.\\
+ is~the~key~'escape-inside'.~Other~keys~are~available~in~\token_to_str:N
+ \PitonOptions.\\
That~key~will~be~ignored.
}
% \end{macrocode}
%
% \bigskip
-% \begin{macrocode}
-\tl_clear_new:N \c_@@_escape_inside_tl
-% \end{macrocode}
-%
-% We process the options when the package is loaded (with |\usepackage|).
+% We process the options provided by the user at load-time.
% \begin{macrocode}
\ProcessKeysOptions { piton / package }
% \end{macrocode}
@@ -439,8 +459,8 @@ def fact(n):
\begingroup
\cs_new_protected:Npn \@@_set_escape_char:nn #1 #2
{
- \directlua { begin_escape = "#1" }
- \directlua { end_escape = "#2" }
+ \lua_now:n { begin_escape = "#1" }
+ \lua_now:n { end_escape = "#2" }
}
\cs_generate_variant:Nn \@@_set_escape_char:nn { x x }
\@@_set_escape_char:xx
@@ -452,7 +472,7 @@ def fact(n):
%
% \bigskip
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\@ifpackageloaded { xcolor }
{ }
@@ -469,125 +489,110 @@ def fact(n):
}
% \end{macrocode}
%
-% \bigskip
-% \begin{macrocode}
-\msg_new:nnn { piton } { piton.lua~not~found }
- {
- The~file~'piton.lua'~can't~be~found.\\
- The package~'piton'~won't be loaded.
- }
-% \end{macrocode}
%
-% \bigskip
-% \begin{macrocode}
-\file_if_exist:nF { piton.lua }
- { \msg_critical:nn { piton } { piton.lua~not~found} }
-% \end{macrocode}
%
-% \begin{macrocode}
-\lua_now:e { require("piton.lua") }
-% \end{macrocode}
-%
-% \bigskip
-% The following function has not a name with the conventions of L3 because it
-% will be used in the Lua code.
-% \begin{macrocode}
-\cs_new:Npn \pitonEOL
- {
- \par \leavevmode
- \@@_print_number:
- }
-% \end{macrocode}
-%
% \medskip
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_print_number:
- {
- \bool_if:NT \l_@@_line_numbers_bool
- { \@@_actually_print_number: }
- }
-% \end{macrocode}
+% \subsection{Parameters}
%
% \medskip
+% The following flag corresponds to the key |splittable| of |\PitonOptions|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_actually_print_number:
- {
-% \end{macrocode}
-% The empty lines in the code are not numbered.
-% \begin{macrocode}
- \bool_if:NF \l_@@_all_line_numbers_bool
- { \peek_meaning:NF \pitonEOL }
- \@@_actually_print_number_i:
- }
+\bool_new:N \l_@@_splittable_bool
% \end{macrocode}
%
+% \medskip
+% The following string corresponds to the key |background-color|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_actually_print_number_i:
- {
- \int_incr:N \l_@@_lineno_int
- \hbox_overlap_left:n
- {
- { \color{gray} \footnotesize \int_to_arabic:n \l_@@_lineno_int }
- \quad
- }
- }
+\str_new:N \l_@@_background_color_str
% \end{macrocode}
%
-% \bigskip
-% The following counter will be used to count the lines in the code when the
-% user requires the numbers of the lines to be printed.
-% \begin{macrocode}
-\int_new:N \l_@@_lineno_int
-% \end{macrocode}
%
-% \bigskip
+% \subsection{The gobbling mechanism}
+%
+% \medskip
% The following integer is the number of characters to gobble on the left side
% of the Python listings. Of course, the initial value is $0$.
% \begin{macrocode}
\int_new:N \l_@@_gobble_int
% \end{macrocode}
%
-%
-% \bigskip
+% \medskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_define_gobble_syntax:n #1
{ \lua_now:n { define_gobble_syntax(#1) } }
% \end{macrocode}
+%
+% \medskip
+% \subsection{Treatment of a line of code}
%
-% \bigskip
+% In the contents provided by Lua, each line of the Python code will be
+% surrounded by |\@@_begin_line:| and |\@@_end_line:|.
+%
% \begin{macrocode}
-\NewDocumentCommand { \piton } { v }
- {
- \group_begin:
- \ttfamily
- \lua_now:e { Parse(token.scan_argument()) } { #1 }
- \group_end:
- }
+\cs_set_protected:Npn \@@_begin_line: #1 \@@_end_line:
+ {
% \end{macrocode}
-%
-% \bigskip
+% Be careful: the following |\hbox_set:Nn| et |\hbox_set_to_wd:Nnn| take in an
+% argument by curryfication.
% \begin{macrocode}
-\NewDocumentCommand { \PitonInputFile } { m }
- {
- \group_begin:
- \ttfamily
- \bool_if:NT \l_@@_line_numbers_bool
- {
- \@@_actually_print_number:
- \vspace{-\baselineskip}
- }
- \lua_now:e { ParseFile(token.scan_argument()) } { #1 }
- \group_end:
+ \str_if_empty:NTF \l_@@_background_color_str
+ { \hbox_set:Nn \l_tmpa_box }
+ { \hbox_set_to_wd:Nnn \l_tmpa_box \linewidth }
+ {
+ \bool_if:NT \l_@@_line_numbers_bool
+ {
+ \bool_if:NF \l_@@_all_line_numbers_bool
+ { \tl_if_empty:nF { #1 } }
+ \@@_print_number:
+ }
+ \strut
+ \str_if_empty:NF \l_@@_background_color_str \space
+ #1 \hfill
+ }
+ \box_set_dp:Nn \l_tmpa_box { \box_dp:N \l_tmpa_box + 1 pt }
+ \box_set_ht:Nn \l_tmpa_box { \box_ht:N \l_tmpa_box + 1.5 pt }
+ \tl_if_empty:NTF \l_@@_background_color_str
+ { \box_use_drop:N \l_tmpa_box }
+ {
+ \vbox_top:n
+ {
+ \hbox_to_wd:nn \linewidth
+ {
+ \exp_args:NV \color \l_@@_background_color_str
+ \vrule height \box_ht:N \l_tmpa_box
+ depth \box_dp:N \l_tmpa_box
+ width \linewidth
+ }
+ \skip_vertical:n { - \box_ht_plus_dp:N \l_tmpa_box }
+ \box_use_drop:N \l_tmpa_box
+ }
+ }
+ \vspace { - 2.5 pt }
}
% \end{macrocode}
%
+%
+% \medskip
% \subsection{PitonOptions}
%
+% \medskip
+% The following parameters correspond to the keys |line-numbers| and
+% |all-line-numbers|.
% \begin{macrocode}
\bool_new:N \l_@@_line_numbers_bool
\bool_new:N \l_@@_all_line_numbers_bool
% \end{macrocode}
%
+% \medskip
+% The following flag corresponds to the key |resume|.
+% \begin{macrocode}
+\bool_new:N \l_@@_resume_bool
+% \end{macrocode}
+%
+% \bigskip
+% Be careful! The name of the following set of keys must be considered as
+% public! Hence, it should \emph{not} be changed.
+%
% \begin{macrocode}
\keys_define:nn { PitonOptions }
{
@@ -603,6 +608,12 @@ def fact(n):
\bool_set_true:N \l_@@_line_numbers_bool
\bool_set_true:N \l_@@_all_line_numbers_bool ,
all-line-numbers .value_forbidden:n = true ,
+ resume .bool_set:N = \l_@@_resume_bool ,
+ resume .value_forbidden:n = true ,
+ splittable .bool_set:N = \l_@@_splittable_bool ,
+ splittable .default:n = true ,
+ background-color .str_set:N = \l_@@_background_color_str ,
+ background-color .value_required:n = true ,
unknown .code:n =
\msg_error:nn { piton } { Unknown~key~for~PitonOptions }
}
@@ -612,69 +623,132 @@ def fact(n):
% \begin{macrocode}
\msg_new:nnn { piton } { Unknown~key~for~PitonOptions }
{
- Unknown~key \\
+ Unknown~key. \\
The~key~'\l_keys_key_str'~is~unknown~for~\token_to_str:N \PitonOptions.~The~
- available~keys~are:~all-line-numbers,~auto-gobble,~env-gobble,~gobble~and~
- line-numbers.\\
+ available~keys~are:~all-line-numbers,~auto-gobble,~env-gobble,~gobble,~
+ line-numbers,~resume~and~splittable.\\
If~you~go~on,~that~key~will~be~ignored.
}
% \end{macrocode}
%
% \bigskip
-% The argument of |\PitonOptions| is provided by currification.
+% The argument of |\PitonOptions| is provided by curryfication.
+% \begin{macrocode}
+\NewDocumentCommand \PitonOptions { } { \keys_set:nn { PitonOptions } }
+% \end{macrocode}
+%
+% \medskip
+% \subsection{The numbers of the lines}
+%
+% \medskip
+% The following counter will be used to count the lines in the code when the
+% user requires the numbers of the lines to be printed.
+% \begin{macrocode}
+\int_new:N \g_@@_line_int
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_print_number:
+ {
+ \int_gincr:N \g_@@_line_int
+ \hbox_overlap_left:n
+ {
+ { \color { gray } \footnotesize \int_to_arabic:n \g_@@_line_int }
+ \quad
+ }
+ }
+% \end{macrocode}
+%
+%
+%
+% \medskip
+% \subsection{The main commands and environments for the final user}
+%
+% \begin{macrocode}
+\NewDocumentCommand { \piton } { v }
+ {
+ \group_begin:
+ \ttfamily
+ \cs_set_protected:Npn \@@_begin_line: { }
+ \cs_set_protected:Npn \@@_end_line: { }
+ \lua_now:n { Parse(token.scan_argument()) } { #1 }
+ \group_end:
+ }
+% \end{macrocode}
+%
+% \medskip
+% The command |\@@_piton:n| does \emph{not} take in its argument verbatim.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_piton:n #1
+ {
+ \group_begin:
+ \cs_set_protected:Npn \@@_begin_line: { }
+ \cs_set_protected:Npn \@@_end_line: { }
+ \lua_now:e { Parse(token.scan_argument()) } { #1 }
+ \group_end:
+ }
+% \end{macrocode}
+%
+%
+% \bigskip
% \begin{macrocode}
-\NewDocumentCommand \PitonOptions { }
- { \keys_set:nn { PitonOptions } }
+\NewDocumentCommand { \PitonInputFile } { m }
+ {
+ \bool_if:NF \l_@@_resume_bool { \int_gzero:N \g_@@_line_int }
+ \group_begin:
+ \dim_set_eq:NN \parindent \c_zero_dim
+ \ttfamily
+ \lua_now:e { ParseFile(token.scan_argument()) } { #1 }
+ \group_end:
+ }
% \end{macrocode}
+%
%
% \bigskip
% \begin{macrocode}
\NewDocumentCommand { \NewPitonEnvironment } { m m m m }
{
% \end{macrocode}
-% We construct a TeX macro which will catch as its argument all the tokens
-% until \textsl{\texttt{newline}} + |\end{Piton}| with, in that
-% \textsl{\texttt{newline}}| + \end{Piton}|, the catcode of
-% \textsl{\texttt{newline}}, |\|, |{| and |}| equal to 12 (``\texttt{other}'').
-% The latter explains why the definition of that function is a bit complicated.
+% We construct a TeX macro which will catch as argument all the tokens until
+% |\end{|\texttt{\textsl{name_env}}|}| with, in that
+% |\end{|\texttt{\textsl{name_env}}|}|, the catcodes of |\|, |{| and |}| equal to
+% 12 (``\texttt{other}''). The latter explains why the definition of that
+% function is a bit complicated.
% \begin{macrocode}
\use:x
{
\cs_set_protected:Npn
- \use:c { __piton_collect_ #1 :w }
+ \use:c { _@@_collect_ #1 :w }
####1
\c_backslash_str end \c_left_brace_str #1 \c_right_brace_str
}
{
\group_end:
- \par \addvspace { 0.5 em }
- {
- \dim_set_eq:NN \parindent \c_zero_dim
- \ttfamily
- \bool_if:NT \l_@@_line_numbers_bool
- {
- \@@_actually_print_number:
- \vspace{-\baselineskip}
- }
- \int_case:nnF \l_@@_gobble_int
- {
- 0
-% \end{macrocode}
-% Be careful: the last argument is provided by currification.
-% \begin{macrocode}
- { \lua_now:e { Parse(token.scan_argument()) } }
- { -1 }
- { \lua_now:e { AutoGobbleParse(token.scan_argument()) } }
- { -2 }
- { \lua_now:e { EnvGobbleParse(token.scan_argument()) } }
- }
- {
- \exp_args:NV \@@_define_gobble_syntax:n \l_@@_gobble_int
- \lua_now:e { GobbleParse(token.scan_argument()) }
- }
- { ##1 }
- }
- \par \addvspace { 0.5 em }
+ \mode_if_vertical:TF \mode_leave_vertical: \newline
+ \bool_if:NF \l_@@_splittable_bool \vbox_top:n
+ {
+ \ttfamily
+ \dim_zero:N \lineskip
+ \int_case:nnF \l_@@_gobble_int
+ {
+ 0
+% \end{macrocode}
+% Be careful: the last argument is provided by curryfication.
+% \begin{macrocode}
+ { \lua_now:n { Parse(token.scan_argument()) } }
+ { -1 }
+ { \lua_now:n { AutoGobbleParse(token.scan_argument()) } }
+ { -2 }
+ { \lua_now:n { EnvGobbleParse(token.scan_argument()) } }
+ }
+ {
+ \exp_args:NV \@@_define_gobble_syntax:n \l_@@_gobble_int
+ \lua_now:n { GobbleParse(token.scan_argument()) }
+ }
+ { ##1 }
+ \vspace { 2.5 pt }
+ }
% \end{macrocode}
% The following |\end{#1}| is only for the groups and the stack of
% environments of LaTeX.
@@ -686,48 +760,65 @@ def fact(n):
%
% \bigskip
% We can now define the new environment.
+%
+% We are still in the definition of the command |\NewPitonEnvironment|...
% \begin{macrocode}
\NewDocumentEnvironment { #1 } { #2 }
{
#3
+ \bool_if:NF \l_@@_resume_bool { \int_gzero:N \g_@@_line_int }
\group_begin:
+ \box_clear:N \l_tmpa_box
\tl_map_function:nN
{ \ \\ \{ \} \$ \& \# \^ \_ \% \~ }
\char_set_catcode_other:N
- \use:c { __piton_collect_ #1 :w }
+ \use:c { _@@_collect_ #1 :w }
}
{ #4 }
% \end{macrocode}
%
+% \medskip
+% The following code is for technical reasons. We want to change the catcode of
+% |^^M| before catching the arguments of the new environment we are defining.
+% Indeed, if not, we will have problems if there is a final optional argument in
+% our environment (if that final argument is not used by the user in an
+% instance of the environment, a spurious space is inserted, probably because
+% the |^^M| is converted to space).
% \begin{macrocode}
\AddToHook { env / #1 / begin } { \char_set_catcode_other:N \^^M }
}
% \end{macrocode}
+% This is the end of the definition of the command |\NewPitonEnvironment|.
%
% \bigskip
% \begin{macrocode}
\NewPitonEnvironment { Piton } { } { } { }
% \end{macrocode}
-%
-% \bigskip
%
+% \bigskip
+% \subsection{The styles}
+%
+% \medskip
+% The following command is fundamental: it will be used by the Lua code.
% \begin{macrocode}
-\NewDocumentCommand { \PitonStyle } { m } { \csname pitonStyle#1\endcsname }
+\NewDocumentCommand { \PitonStyle } { m } { \use:c { pitonStyle #1 } }
% \end{macrocode}
%
-% \bigskip
+% \medskip
+% The following command takes in its argument by curryfication.
% \begin{macrocode}
-\NewDocumentCommand { \SetPitonStyle } { } { \keys_set:nn { piton } }
+\NewDocumentCommand { \SetPitonStyle } { } { \keys_set:nn { piton / Styles } }
% \end{macrocode}
%
+% \medskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_math_scantokens:n #1
{ \normalfont \scantextokens { $#1$ } }
% \end{macrocode}
%
-% \bigskip
+% \medskip
% \begin{macrocode}
-\keys_define:nn { piton }
+\keys_define:nn { piton / Styles }
{
String.Interpol .tl_set:c = pitonStyle String.Interpol ,
String.Interpol .value_required:n = true ,
@@ -779,40 +870,48 @@ def fact(n):
Exception .value_required:n = true ,
Comment.LaTeX .tl_set:c = pitonStyle Comment.LaTeX ,
Comment.LaTeX .value_required:n = true ,
- unknown .code:n = \msg_error:nn { piton }{ Unknown~key~for~SetPitonStyle }
+ unknown .code:n =
+ \msg_error:nn { piton } { Unknown~key~for~SetPitonStyle }
}
% \end{macrocode}
%
%
% \bigskip
% \begin{macrocode}
-\msg_new:nnn { piton } { Unknown~key~for~SetPitonStyle } {
- The~style~'\l_keys_key_str'~is~unknown.\\
- This~key~will~be~ignored.\\
- The~available~styles~are~(in~alphabetic~order):~
- Comment,~
- Comment.LaTeX,~
- Dict.Value,~
- Exception,~
- InitialValues,~
- Keyword,~
- Keyword.Constant,~
- Name.Builtin,~
- Name.Class,~
- Name.Decorator,~
- Name.Function,~
- Name.Namespace,~
- Number,~
- Operator,~
- Operator.Word,~
- String,~
- String.Doc,~
- String.Long,~
- String.Short,~and~
- String.Interpol. }
+\msg_new:nnn { piton } { Unknown~key~for~SetPitonStyle }
+ {
+ The~style~'\l_keys_key_str'~is~unknown.\\
+ This~key~will~be~ignored.\\
+ The~available~styles~are~(in~alphabetic~order):~
+ Comment,~
+ Comment.LaTeX,~
+ Dict.Value,~
+ Exception,~
+ InitialValues,~
+ Keyword,~
+ Keyword.Constant,~
+ Name.Builtin,~
+ Name.Class,~
+ Name.Decorator,~
+ Name.Function,~
+ Name.Namespace,~
+ Number,~
+ Operator,~
+ Operator.Word,~
+ String,~
+ String.Doc,~
+ String.Long,~
+ String.Short,~and~
+ String.Interpol.
+ }
% \end{macrocode}
%
-% \bigskip
+%
+% \subsection{The initial style}
+%
+% The initial style is inspired by the style ``manni'' of Pygments.
+%
+% \medskip
% \begin{macrocode}
\SetPitonStyle
{
@@ -833,17 +932,528 @@ def fact(n):
String.Interpol = \color[HTML]{AA0000} ,
Comment.LaTeX = \normalfont \color[rgb]{.468,.532,.6} ,
Name.Type = \color[HTML]{336666} ,
- InitialValues = \piton ,
- Dict.Value = \piton ,
- Post.Function = \piton ,
- Interpol.Inside = \color{black}\piton ,
+ InitialValues = \@@_piton:n ,
+ Dict.Value = \@@_piton:n ,
+ Post.Function = \@@_piton:n ,
+ Interpol.Inside = \color{black}\@@_piton:n ,
}
% \end{macrocode}
%
+% \subsection{Security}
+%
+% \begin{macrocode}
+\AddToHook { env / piton / begin }
+ { \msg_fatal:nn { piton } { No~environment~piton } }
+
+\msg_new:nnn { piton } { No~environment~piton }
+ {
+ There~is~no~environment~piton!\\
+ There~is~an~environment~{Piton}~and~a~command~
+ \token_to_str:N \piton\ but~there~is~no~environment~
+ {piton}.~This~error~is~fatal.
+ }
+% \end{macrocode}
+%
%
+% \bigskip
+% \subsection{The Lua code}
+%
+% \medskip
+% \begin{macrocode}
+\ExplSyntaxOff
+\RequirePackage{luacode}
+% \end{macrocode}
+%
% \vspace{1cm}
-% \tableofcontents
+% \begin{macrocode}
+\begin{luacode*}
+local P, S, V , C , Ct, Cc, Cf = lpeg.P, lpeg.S, lpeg.V, lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.Cf
+
+
+--[[ By convention, a capture which provides as value a table (and not a string), provides, in fact,
+a string (the first element of the table) which is a formatting LaTeX instruction (it will be
+thrown back to TeX with normal catcodes (ant not ``other'' catcode for everybody).]]
+
+local function L(string)
+ return Cc ( { string } )
+end
+
+local function K(pattern, style)
+ return
+ L ( "{\\PitonStyle{" .. style .. "}{" )
+ * C(pattern)
+ * L ( "}}" )
+end
+
+
+--[[ The text in "escape" (between begin_escape and end_escape) is captured
+and put in a table (with only one component). Indeed, we have decided that a capture
+which is encapsulated in a table must be transmitted to TeX with the normal TeX catcodes.]]
+
+local Escape = P(begin_escape)
+ * Ct ( C ( ( 1 - P(end_escape) ) ^ 1 ) )
+ * P(end_escape)
+
+
+lpeg.locale(lpeg) -- mandatory
+
+local alpha , digit , space , punct = lpeg.alpha , lpeg.digit , lpeg.space , lpeg.punct
+
+local letter = alpha + S"âàçéèêëïîôûüÂÀÇÉÈÊËÏÎÔÛÜ_"
+
+local alphanum = letter + digit
+
+local identifier = letter * alphanum ^ 0
+
+local Identifier = C ( identifier )
+
+local Space = C ( ( space - P "\r" ) ^ 1 )
+
+local SkipSpace = C ( ( space - P "\r" ) ^ 0 )
+
+local Punct = C ( punct )
+
+
+local EOL = ( P "\r" )
+ *
+ (
+ ( space^0 * -1 )
+ +
+ Cc (
+ {
+ luatexbase.catcodetables.expl ,
+ '\\__piton_end_line: \\bool_if:NT \\l__piton_splittable_bool \\newline \\__piton_begin_line:'
+ }
+ )
+ )
+
+
+local Number =
+ K (
+ ( digit^1 * P "." * digit^0 + digit^0 * P "." * digit^1 + digit^1 )
+ * ( S "eE" * S "+-" ^ -1 * digit^1 ) ^ -1
+ + digit^1
+ , 'Number' )
+
+
+local Word = C ( ( ( 1 - space ) - S "'\"\r[()]" - digit ) ^ 1 )
+
+if begin_escape ~= ''
+then Word = C ( ( ( 1 - space - P(begin_escape) - P(end_escape) ) - S "'\"\r[()]" - digit ) ^ 1 )
+end
+
+local Delim = C ( S "[()]" )
+
+
+local Keyword =
+ K ( P "assert" + P "break" + P "case" + P "continue" + P "del"
+ + P "elif" + P "else" + P "except" + P "exec" + P "finally" + P "for" + P "from"
+ + P "global" + P "if" + P "import" + P "lambda" + P "non local"
+ + P "pass" + P "return" + P "try" + P "while"
+ + P "with" + P "yield" + P "yield from" ,
+ 'Keyword' )
+ + K ( P "True" + P "False" + P "None" , 'Keyword.Constant' )
+
+
+local Builtin =
+ K ( P "__import__" + P "abs" + P "all" + P "any" + P "bin" + P "bool" + P "bytearray"
+ + P "bytes" + P "chr" + P "classmethod" + P "compile" + P "complex" + P "delattr"
+ + P "dict" + P "dir" + P "divmod" + P "enumerate" + P "eval" + P "filter"
+ + P "float" + P "format" + P "frozenset" + P "getattr" + P "globals" + P "hasattr"
+ + P "hash" + P "hex" + P "id" + P "input" + P "int" + P "isinstance" + P "issubclass"
+ + P "iter" + P "len" + P "list" + P "locals" + P "map" + P "max" + P "memoryview" + P "min"
+ + P "next" + P "object" + P "oct" + P "open" + P "ord" + P "pow" + P "print" + P "property"
+ + P "range" + P "repr" + P "reversed" + P "round" + P "set" + P "setattr" + P "slice"
+ + P "sorted" + P "staticmethod" + P "str" + P "sum" + P "super" + P "tuple" + P "type"
+ + P "vars" + P "zip" ,
+ 'Name.Builtin' )
+
+
+local Exception =
+ K ( "ArithmeticError" + P "AssertionError" + P "AttributeError"
+ + P "BaseException" + P "BufferError" + P "BytesWarning" + P "DeprecationWarning"
+ + P "EOFError" + P "EnvironmentError" + P "Exception" + P "FloatingPointError"
+ + P "FutureWarning" + P "GeneratorExit" + P "IOError" + P "ImportError"
+ + P "ImportWarning" + P "IndentationError" + P "IndexError" + P "KeyError"
+ + P "KeyboardInterrupt" + P "LookupError" + P "MemoryError" + P "NameError"
+ + P "NotImplementedError" + P "OSError" + P "OverflowError"
+ + P "PendingDeprecationWarning" + P "ReferenceError" + P "ResourceWarning"
+ + P "RuntimeError" + P "RuntimeWarning" + P "StopIteration"
+ + P "SyntaxError" + P "SyntaxWarning" + P "SystemError" + P "SystemExit"
+ + P "TabError" + P "TypeError" + P "UnboundLocalError" + P "UnicodeDecodeError"
+ + P "UnicodeEncodeError" + P "UnicodeError" + P "UnicodeTranslateError"
+ + P "UnicodeWarning" + P "UserWarning" + P "ValueError" + P "VMSError"
+ + P "Warning" + P "WindowsError" + P "ZeroDivisionError"
+ + P "BlockingIOError" + P "ChildProcessError" + P "ConnectionError"
+ + P "BrokenPipeError" + P "ConnectionAbortedError" + P "ConnectionRefusedError"
+ + P "ConnectionResetError" + P "FileExistsError" + P "FileNotFoundError"
+ + P "InterruptedError" + P "IsADirectoryError" + P "NotADirectoryError"
+ + P "PermissionError" + P "ProcessLookupError" + P "TimeoutError"
+ + P "StopAsyncIteration" + P "ModuleNotFoundError" + P "RecursionError" ,
+ 'Exception' )
+
+local RaiseException = K ( P "raise" , 'Keyword' ) * SkipSpace * Exception * C ( P "(" )
+
+local ExceptionInConsole = Exception * C ( ( 1 - P "\r" ) ^ 0 ) * EOL
+
+
+local Namespace =
+ K ( P "from" , 'Keyword' ) * Space * K ( alphanum^1 , 'Name.Namespace' )
+ * ( Space * K ( P "import" , 'Keyword' ) ) ^ -1
+
+
+local ImportAs = K ( P "import" , 'Keyword' )
+ * Space
+ * K ( identifier , 'Name.Namespace' )
+ * ( SkipSpace * C ( P "," ) * SkipSpace * K ( identifier , 'Name.Namespace' ) ) ^ 0
+ * (
+ Space * K ( P "as" , 'Keyword' ) * Space * K ( identifier , 'Name.Namespace' )
+ ) ^ 0
+
+local Class = K ( P "class" , 'Keyword' )
+ * ( Space * K ( identifier , 'Name.Class' ) ) ^ -1
+
+local Decorator = K ( P "@" * letter^1 , 'Name.Decorator' )
+
+local SingleShortInterpol =
+ K ( P "{" , 'String.Interpol')
+ * K ( ( 1 - S "}':" ) ^ 0 , 'Interpol.Inside' )
+ * C ( P ":" * (1 - S "}:'") ^ 0 ) ^ -1
+ * K ( P "}" , 'String.Interpol' )
+
+local DoubleShortInterpol =
+ K ( P "{" , 'String.Interpol' )
+ * K ( ( 1 - S "}\":" ) ^ 0 , 'Interpol.Inside' )
+ * ( K ( P ":" , 'String.Interpol' ) * C ( (1 - S "}:\"") ^ 0 ) ) ^ -1
+ * K ( P "}" , 'String.Interpol' )
+
+local SingleLongInterpol =
+ K ( P "{" , 'String.Interpol' )
+ * K ( ( 1 - S "}:\r" - P "'''" ) ^ 0 , 'Interpol.Inside' )
+ * C ( P ":" * (1 - S "}:\r" - P "'''" ) ^ 0 ) ^ -1
+ * K ( P "}" , 'String.Interpol' )
+
+local DoubleLongInterpol =
+ K ( P "{" , 'String.Interpol' )
+ * K ( ( 1 - S "}:\r" - P "\"\"\"" ) ^ 0 , 'Interpol.Inside' )
+ * C ( P ":" * (1 - S "}:\r" - P "\"\"\"" ) ^ 0 ) ^ -1
+ * K ( P "}" , 'String.Interpol' )
+
+local SingleShortPureString = C ( ( P "\\'" + P "{{" + P "}}" + 1 - S "{}'" ) ^ 1 )
+
+local DoubleShortPureString = C ( ( P "\\\"" + P "{{" + P "}}" + 1 - S "{}\"" ) ^ 1 )
+
+local SingleLongPureString = C ( ( 1 - P "'''" - S "{}'\r" ) ^ 1 )
+
+local DoubleLongPureString = C ( ( 1 - P "\"\"\"" - S "{}\"\r" ) ^ 1 )
+
+local SingleShortString =
+ L ( "{\\PitonStyle{String.Short}{" )
+ * (
+ C ( P "f'" + P "F'" )
+ * ( SingleShortInterpol + SingleShortPureString ) ^ 0
+ * C ( P "'" )
+ +
+ C ( ( P "'" + P "r'" + P "R'" ) * ( P "\\'" + 1 - S "'\r" ) ^ 0 * P "'" )
+ )
+ * L ( "}}" )
+
+local DoubleShortString =
+ L ( "{\\PitonStyle{String.Short}{" )
+ * (
+ C ( P "f\"" + P "F\"" )
+ * ( DoubleShortInterpol + DoubleShortPureString ) ^ 0
+ * C ( P "\"" )
+ +
+ C ( ( P "\"" + P "r\"" + P "R\"" ) * ( P "\\\"" + 1 - S "\"\r" ) ^ 0 * P "\"" )
+ )
+ * L ( "}}" )
+
+
+local ShortString = SingleShortString + DoubleShortString
+
+
+local SingleLongString =
+ L "{\\PitonStyle{String.Long}{"
+ * (
+ C ( S "fF" * P "'''" )
+ * ( SingleLongInterpol + SingleLongPureString ) ^ 0
+ * L "}}"
+ * (
+ EOL
+ +
+ L "{\\PitonStyle{String.Long}{"
+ * ( SingleLongInterpol + SingleLongPureString ) ^ 0
+ * L "}}"
+ * EOL
+ ) ^ 0
+ * L "{\\PitonStyle{String.Long}{"
+ * ( SingleLongInterpol + SingleLongPureString ) ^ 0
+ +
+ C ( ( S "rR" ) ^ -1 * P "'''" * ( 1 - P "'''" - P "\r" ) ^ 0 )
+ * L "}}"
+ * (
+ L "{\\PitonStyle{String.Long}{"
+ * C ( ( 1 - P "'''" - P "\r" ) ^ 0 )
+ * L "}}"
+ * EOL
+ ) ^ 0
+ * L "{\\PitonStyle{String.Long}{"
+ * C ( ( 1 - P "'''" - P "\r" ) ^ 0 )
+ )
+ * C ( P "'''" )
+ * L "}}"
+
+
+local DoubleLongString =
+ L "{\\PitonStyle{String.Long}{"
+ * (
+ C ( S "fF" * P "\"\"\"" )
+ * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
+ * L "}}"
+ * (
+ EOL
+ +
+ L "{\\PitonStyle{String.Long}{"
+ * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
+ * L "}}"
+ * EOL
+ ) ^ 0
+ * L "{\\PitonStyle{String.Long}{"
+ * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
+ +
+ C ( ( S "rR" ) ^ -1 * P "\"\"\"" * ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
+ * L "}}"
+ * (
+ L "{\\PitonStyle{String.Long}{"
+ * C ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
+ * L "}}"
+ * EOL
+ ) ^ 0
+ * L "{\\PitonStyle{String.Long}{"
+ * C ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
+ )
+ * C ( P "\"\"\"" )
+ * L "}}"
+
+
+
+local LongString = SingleLongString + DoubleLongString
+
+
+local Expression =
+ P { "E" ,
+ E = ( 1 - S "{}()[]\r," ) ^ 0
+ * (
+ ( P "{" * V "F" * P "}"
+ + P "(" * V "F" * P ")"
+ + P "[" * V "F" * P "]" ) * ( 1 - S "{}()[]\r," ) ^ 0
+ ) ^ 0 ,
+ F = ( 1 - S "{}()[]\r\"'" ) ^ 0
+ * ( (
+ P "'" * (P "\\'" + 1 - S"'\r" )^0 * P "'"
+ + P "\"" * (P "\\\"" + 1 - S"\"\r" )^0 * P "\""
+ + P "{" * V "F" * P "}"
+ + P "(" * V "F" * P ")"
+ + P "[" * V "F" * P "]"
+ ) * ( 1 - S "{}()[]\r\"'" ) ^ 0 ) ^ 0 ,
+ }
+
+local Param = SkipSpace * K ( identifier , '' ) * SkipSpace
+ * ( K ( P "=" * Expression , 'InitialValues' )
+ + K ( P ":" , '' ) * SkipSpace * K ( letter^1 , 'Name.Type' ))
+ + SkipSpace * K ( alphanum ^ 1 , '' ) * SkipSpace
+
+local Params = Param * ( K ( P "," , '' ) * Param ) ^ 0
+
+local StringDoc = K ( P "\"\"\"" , 'String.Doc' )
+ * ( K ( (1 - P "\"\"\"" - P "\r" ) ^ 0 , 'String.Doc' ) * EOL ) ^ 0
+ * K ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 * P "\"\"\"" , 'String.Doc' )
+ + K ( P "'''" , 'String.Doc' )
+ * ( K ( (1 - P "'''" - P "\r")^0 , 'String.Doc' ) * EOL ) ^ 0
+ * K ( ( 1 - P "'''" - P "\r")^0 * P "'''" , 'String.Doc' )
+
+local CommentMath = P "$" * K ( ( 1 - S "$\r" ) ^ 1 , 'Comment.Math' ) * P "$"
+
+
+local Comment = L ( "{\\PitonStyle{Comment}{" )
+ * C ( P "#" ) * ( CommentMath + C ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0
+ * L ( "}}" )
+ * ( EOL + -1 )
+
+local CommentLaTeX =
+ P "##"
+ * L "{\\PitonStyle{Comment.LaTeX}{\\ignorespaces"
+ * Ct ( C ( ( 1 - P "\r" ) ^ 0 ) )
+ * L "}}"
+ * ( EOL + -1 )
+
+local DefFunction =
+ K ( P "def" , 'Keyword' )
+ * ( Space
+ * K ( identifier , 'Name.Function' )
+ * ( SkipSpace * K ( P "(" , '' ) * Params * K ( P ")" , '' ) ) ^ -1
+ * ( SkipSpace
+ * K ( ( 1 - S ":\r" )^0 , 'Post.Function' )
+ * K ( P ":" , 'Keyword' )
+ * SkipSpace
+ * ( EOL + CommentLaTeX + Comment )
+ * SkipSpace
+ * StringDoc ) ^ -1
+ ) ^ -1
+
+local ItemDict = ShortString * SkipSpace * C ( P ":" ) * K ( Expression , 'Dict.Value' )
+
+local ItemOfSet = SkipSpace * ( ItemDict + ShortString ) * SkipSpace
+
+local Set = C ( P "{" )
+ * ItemOfSet * ( C ( P "," ) * ItemOfSet ) ^ 0
+ * C ( P "}" )
+
+
+local Operator = K ( P "!=" + P "==" + P "<<" + P ">>" + S "-~+/*%=<>&.@|" , 'Operator')
+
+local OperatorWord = K ( P "in" + P "is" + P "and" + P "or" + P "not" , 'Operator.Word')
+
+local SyntaxPython =
+ ( ( space - P "\r" ) ^0 * P "\r" ) ^ -1 *
+ ( ( space^1 * -1 )
+ + EOL
+ + Space
+ + Escape
+ + CommentLaTeX
+ + LongString
+ + Comment
+ + ExceptionInConsole
+ + Set
+ + Delim
+ + Class * ( Space + Punct + EOL )
+ + Namespace * ( Space + Punct + EOL )
+ + ImportAs
+ + RaiseException
+ + Keyword * ( Space + Punct + EOL )
+ + DefFunction
+ + ShortString
+ + Decorator * ( Space + Punct + EOL )
+ + Operator
+ + OperatorWord * ( Space + Punct + EOL )
+ + Builtin * ( Space + Punct + EOL )
+ + Identifier
+ + Number
+ + Word
+ ) ^0 * -1
+
+
+local MinimalSyntax =
+ P { "S" ;
+ S = K ( (1 - P "\r" ) ^ 0 , '') + EOL * S
+ }
+
+
+function Parse(code)
+ local t = Ct(SyntaxPython) : match(code)
+ tex.sprint( luatexbase.catcodetables.expl , '\\__piton_begin_line:' )
+ if t then else t = Ct(MinimalSyntax) : match(code) end
+ for i = 1 , #t do
+ if type(t[i]) == 'string'
+ then
+ tex.sprint(luatexbase.catcodetables.CatcodeTableOther, t[i])
+ else
+ tex.tprint(t[i])
+ end
+ end
+ tex.sprint( luatexbase.catcodetables.expl , '\\__piton_end_line:' )
+end
+
+function ParseFile(name)
+ s = ''
+ for line in io.lines(name) do s = s .. '\r' .. line end
+ Parse(s)
+end
+
+
+function define_gobble_syntax(n)
+ GobbleSyntax = ( 1 - P "\r" ) ^ (-n) * C ( ( 1 - P "\r" ) ^0 )
+ * ( C ( P "\r" )
+ * ( 1 - P "\r" ) ^ (-n)
+ * C ( ( 1 - P "\r" ) ^0 )
+ ) ^ 0
+end
+
+function GobbleParse(code)
+ local t = Ct(GobbleSyntax):match(code)
+ local new_code = ""
+ for i = 1 , #t do
+ new_code = new_code .. t[i]
+ end
+ Parse(new_code)
+end
+
+function add(acc,new_value)
+ return acc + new_value
+end
+
+
+
+
+--[[ The following LPEG returns as capture the minimal number of spaces at
+the beginning of the lines of code]]
+AutoGobbleSyntax =
+ ( space ^ 0 * P "\r" ) ^ -1
+ * Cf (
+ (
+ ( P " " ) ^ 0 * P "\r"
+ +
+ Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add )
+ * ( 1 - P " " ) * ( 1 - P "\r" ) ^ 0 * P "\r"
+ ) ^ 0
+ *
+ ( Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add )
+ * ( 1 - P " " ) * ( 1 - P "\r" ) ^ 0 ) ^ -1 ,
+ math.min
+ )
+
+function AutoGobbleParse(code)
+ local n = AutoGobbleSyntax:match(code)
+ if n==0
+ then Parse(code)
+ else define_gobble_syntax(n)
+ GobbleParse(code)
+ end
+end
+
+
+--[[ The following LPEG returns as capture the number of spaces at the last line,
+that is to say begin the \end{Piton} ]]
+
+EnvGobbleSyntax =
+ ( ( 1 - P "\r" ) ^ 0 * P "\r" ) ^ 0
+ * Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add ) * -1
+
+function EnvGobbleParse(code)
+ local n = EnvGobbleSyntax:match(code)
+ if n==0
+ then Parse(code)
+ else define_gobble_syntax(n)
+ GobbleParse(code)
+ end
+end
+\end{luacode*}
+% \end{macrocode}
+%
+% \vspace{1cm}
+% \section{History}
+%
+%
+% \subsection*{Changes between versions 0.6 and 0.7}
+%
+% New keys |resume|, |splittable| and |background-color| in |\PitonOptions|.
+%
+% The file |piton.lua| has been embedded in the file |piton.sty|. That means
+% that the extension \pkg{piton} is now enterily contained in the file |piton.sty|.
+%
% \end{document}
+%
%
% Local Variables:
% TeX-fold-mode: t
diff --git a/macros/luatex/latex/piton/piton.lua b/macros/luatex/latex/piton/piton.lua
deleted file mode 100644
index 2860246c4c..0000000000
--- a/macros/luatex/latex/piton/piton.lua
+++ /dev/null
@@ -1,493 +0,0 @@
--- -*- coding: utf-8 ; -*-
---
--- This is file 'piton.lua' which is a part of the Latex package 'piton'
--- Copyright (C) 2022 by F. Pantigny
-
--- This file may be distributed and/or modified under the
--- conditions of the Latex Project Public License, either
--- version 1.3 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.3 or later is part of all distributions of
--- Latex version 2005/12/01 or later.
-
-
--- This file is part of the version 0.6a of the package 'piton'
-
-local P, S, V , C , Ct, Cc, Cf = lpeg.P, lpeg.S, lpeg.V, lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.Cf
-
-
---[[ By convention, a capture which provides as value a table (and not a string), provides, in fact,
-a string (the first element of the table) which is a formatting LaTeX instruction (it will be
-thrown back to TeX with normal catcodes (ant not ``other'' catcode for everybody).]]
-
-local function L(string)
- return lpeg.Cc ( { string } )
-end
-
-local function K(pattern, style)
- return
- L ( "{\\PitonStyle{" .. style .. "}{" )
- * lpeg.C(pattern)
- * L ( "}}" )
-end
-
-
---[[ The text in "escape" (between begin_escape and end_escape) is captured
-and put in a table (with only one component). Indeed, we have decided that a capture
-which is encapsulated in a table must be transmitted to TeX with the normal TeX catcodes.]]
-
-local Escape = P(begin_escape)
- * Ct ( C ( ( 1 - P(end_escape) ) ^ 1 ) )
- * P(end_escape)
-
-local EOL = ( P "\r" ) * L ( "\\pitonEOL" )
-
-
-
-lpeg.locale(lpeg) -- mandatory
-
-local alpha , digit , space , punct = lpeg.alpha , lpeg.digit , lpeg.space , lpeg.punct
-
-local letter = alpha + S"âàçéèêëïîôûüÂÀÇÉÈÊËÏÎÔÛÜ_"
-
-local alphanum = letter + digit
-
-local identifier = letter * alphanum ^ 0
-
-local Identifier = C ( identifier )
-
-local Space = C ( ( space - P "\r" ) ^ 1 )
-
-local SkipSpace = C ( ( space - P "\r" ) ^ 0 )
-
-local Punct = C ( punct )
-
-
-local Number =
- K (
- ( digit^1 * P "." * digit^0 + digit^0 * P "." * digit^1 + digit^1 )
- * ( S "eE" * S "+-" ^ -1 * digit^1 ) ^ -1
- + digit^1
- , 'Number' )
-
-local Word = C ( ( ( 1 - space ) - S "'\"\r[()]" - digit ) ^ 1 )
-
-local Delim = C ( S "[()]" )
-
-
-local Keyword =
- K ( P "assert" + P "break" + P "case" + P "continue" + P "del"
- + P "elif" + P "else" + P "except" + P "exec" + P "finally" + P "for" + P "from"
- + P "global" + P "if" + P "import" + P "lambda" + P "non local"
- + P "pass" + P "return" + P "try" + P "while"
- + P "with" + P "yield" + P "yield from" ,
- 'Keyword' )
- + K ( P "True" + P "False" + P "None" , 'Keyword.Constant' )
-
-
-local Builtin =
- K ( P "__import__" + P "abs" + P "all" + P "any" + P "bin" + P "bool" + P "bytearray"
- + P "bytes" + P "chr" + P "classmethod" + P "compile" + P "complex" + P "delattr"
- + P "dict" + P "dir" + P "divmod" + P "enumerate" + P "eval" + P "filter"
- + P "float" + P "format" + P "frozenset" + P "getattr" + P "globals" + P "hasattr"
- + P "hash" + P "hex" + P "id" + P "input" + P "int" + P "isinstance" + P "issubclass"
- + P "iter" + P "len" + P "list" + P "locals" + P "map" + P "max" + P "memoryview" + P "min"
- + P "next" + P "object" + P "oct" + P "open" + P "ord" + P "pow" + P "print" + P "property"
- + P "range" + P "repr" + P "reversed" + P "round" + P "set" + P "setattr" + P "slice"
- + P "sorted" + P "staticmethod" + P "str" + P "sum" + P "super" + P "tuple" + P "type"
- + P "vars" + P "zip" ,
- 'Name.Builtin' )
-
-
-local Exception =
- K ( "ArithmeticError" + P "AssertionError" + P "AttributeError"
- + P "BaseException" + P "BufferError" + P "BytesWarning" + P "DeprecationWarning"
- + P "EOFError" + P "EnvironmentError" + P "Exception" + P "FloatingPointError"
- + P "FutureWarning" + P "GeneratorExit" + P "IOError" + P "ImportError"
- + P "ImportWarning" + P "IndentationError" + P "IndexError" + P "KeyError"
- + P "KeyboardInterrupt" + P "LookupError" + P "MemoryError" + P "NameError"
- + P "NotImplementedError" + P "OSError" + P "OverflowError"
- + P "PendingDeprecationWarning" + P "ReferenceError" + P "ResourceWarning"
- + P "RuntimeError" + P "RuntimeWarning" + P "StopIteration"
- + P "SyntaxError" + P "SyntaxWarning" + P "SystemError" + P "SystemExit"
- + P "TabError" + P "TypeError" + P "UnboundLocalError" + P "UnicodeDecodeError"
- + P "UnicodeEncodeError" + P "UnicodeError" + P "UnicodeTranslateError"
- + P "UnicodeWarning" + P "UserWarning" + P "ValueError" + P "VMSError"
- + P "Warning" + P "WindowsError" + P "ZeroDivisionError"
- + P "BlockingIOError" + P "ChildProcessError" + P "ConnectionError"
- + P "BrokenPipeError" + P "ConnectionAbortedError" + P "ConnectionRefusedError"
- + P "ConnectionResetError" + P "FileExistsError" + P "FileNotFoundError"
- + P "InterruptedError" + P "IsADirectoryError" + P "NotADirectoryError"
- + P "PermissionError" + P "ProcessLookupError" + P "TimeoutError"
- + P "StopAsyncIteration" + P "ModuleNotFoundError" + P "RecursionError" ,
- 'Exception' )
-
-local RaiseException = K ( P "raise" , 'Keyword' ) * SkipSpace * Exception * C ( P "(" )
-
-local ExceptionInConsole = Exception * C ( ( 1 - P "\r" ) ^ 0 ) * EOL
-
-
-local Namespace =
- K ( P "from" , 'Keyword' ) * Space * K ( alphanum^1 , 'Name.Namespace' )
- * ( Space * K ( P "import" , 'Keyword' ) ) ^ -1
-
-
-local ImportAs = K ( P "import" , 'Keyword' )
- * Space
- * K ( identifier , 'Name.Namespace' )
- * ( SkipSpace * C ( P "," ) * SkipSpace * K ( identifier , 'Name.Namespace' ) ) ^ 0
- * (
- Space * K ( P "as" , 'Keyword' ) * Space * K ( identifier , 'Name.Namespace' )
- ) ^ 0
-
-local Class = K ( P "class" , 'Keyword' ) * Space * K ( identifier , 'Name.Class' )
-
-local Decorator = K ( P "@" * letter^1 , 'Name.Decorator' )
-
-local SingleShortInterpol =
- K ( P "{" , 'String.Interpol')
- * K ( ( 1 - S "}':" ) ^ 0 , 'Interpol.Inside' )
- * C ( P ":" * (1 - S "}:'") ^ 0 ) ^ -1
- * K ( P "}" , 'String.Interpol' )
-
-local DoubleShortInterpol =
- K ( P "{" , 'String.Interpol' )
- * K ( ( 1 - S "}\":" ) ^ 0 , 'Interpol.Inside' )
- * ( K ( P ":" , 'String.Interpol' ) * C ( (1 - S "}:\"") ^ 0 ) ) ^ -1
- * K ( P "}" , 'String.Interpol' )
-
-local SingleLongInterpol =
- K ( P "{" , 'String.Interpol' )
- * K ( ( 1 - S "}:\r" - P "'''" ) ^ 0 , 'Interpol.Inside' )
- * C ( P ":" * (1 - S "}:\r" - P "'''" ) ^ 0 ) ^ -1
- * K ( P "}" , 'String.Interpol' )
-
-local DoubleLongInterpol =
- K ( P "{" , 'String.Interpol' )
- * K ( ( 1 - S "}:\r" - P "\"\"\"" ) ^ 0 , 'Interpol.Inside' )
- * C ( P ":" * (1 - S "}:\r" - P "\"\"\"" ) ^ 0 ) ^ -1
- * K ( P "}" , 'String.Interpol' )
-
-local SingleShortPureString = C ( ( P "\\'" + P "{{" + P "}}" + 1 - S "{}'" ) ^ 1 )
-
-local DoubleShortPureString = C ( ( P "\\\"" + P "{{" + P "}}" + 1 - S "{}\"" ) ^ 1 )
-
-local SingleLongPureString = C ( ( 1 - P "'''" - S "{}'\r" ) ^ 1 )
-
-local DoubleLongPureString = C ( ( 1 - P "\"\"\"" - S "{}\"\r" ) ^ 1 )
-
-local SingleShortString =
- L ( "{\\PitonStyle{String.Short}{" )
- * (
- C ( P "f'" + P "F'" )
- * ( SingleShortInterpol + SingleShortPureString ) ^ 0
- * C ( P "'" )
- +
- C ( ( P "'" + P "r'" + P "R'" ) * ( P "\\'" + 1 - S "'\r" ) ^ 0 * P "'" )
- )
- * L ( "}}" )
-
-local DoubleShortString =
- L ( "{\\PitonStyle{String.Short}{" )
- * (
- C ( P "f\"" + P "F\"" )
- * ( DoubleShortInterpol + DoubleShortPureString ) ^ 0
- * C ( P "\"" )
- +
- C ( ( P "\"" + P "r\"" + P "R\"" ) * ( P "\\\"" + 1 - S "\"\r" ) ^ 0 * P "\"" )
- )
- * L ( "}}" )
-
-
-local ShortString = SingleShortString + DoubleShortString
-
-
-local SingleLongString =
- L "{\\PitonStyle{String.Long}{"
- * (
- C ( S "fF" * P "'''" )
- * ( SingleLongInterpol + SingleLongPureString ) ^ 0
- * L "}}"
- * (
- EOL
- +
- L "{\\PitonStyle{String.Long}{"
- * ( SingleLongInterpol + SingleLongPureString ) ^ 0
- * L "}}"
- * EOL
- ) ^ 0
- * L "{\\PitonStyle{String.Long}{"
- * ( SingleLongInterpol + SingleLongPureString ) ^ 0
- +
- C ( ( S "rR" ) ^ -1 * P "'''" * ( 1 - P "'''" - P "\r" ) ^ 0 )
- * L "}}"
- * (
- L "{\\PitonStyle{String.Long}{"
- * C ( ( 1 - P "'''" - P "\r" ) ^ 0 )
- * L "}}"
- * EOL
- ) ^ 0
- * L "{\\PitonStyle{String.Long}{"
- * C ( ( 1 - P "'''" - P "\r" ) ^ 0 )
- )
- * C ( P "'''" )
- * L "}}"
-
-
-local DoubleLongString =
- L "{\\PitonStyle{String.Long}{"
- * (
- C ( S "fF" * P "\"\"\"" )
- * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
- * L "}}"
- * (
- EOL
- +
- L "{\\PitonStyle{String.Long}{"
- * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
- * L "}}"
- * EOL
- ) ^ 0
- * L "{\\PitonStyle{String.Long}{"
- * ( DoubleLongInterpol + DoubleLongPureString ) ^ 0
- +
- C ( ( S "rR" ) ^ -1 * P "\"\"\"" * ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
- * L "}}"
- * (
- L "{\\PitonStyle{String.Long}{"
- * C ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
- * L "}}"
- * EOL
- ) ^ 0
- * L "{\\PitonStyle{String.Long}{"
- * C ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 )
- )
- * C ( P "\"\"\"" )
- * L "}}"
-
-
-
-local LongString = SingleLongString + DoubleLongString
-
-
-local Expression =
- P { "E" ,
- E = ( 1 - S "{}()[]\r," ) ^ 0
- * (
- ( P "{" * V "F" * P "}"
- + P "(" * V "F" * P ")"
- + P "[" * V "F" * P "]" ) * ( 1 - S "{}()[]\r," ) ^ 0
- ) ^ 0 ,
- F = ( 1 - S "{}()[]\r\"'" ) ^ 0
- * ( (
- P "'" * (P "\\'" + 1 - S"'\r" )^0 * P "'"
- + P "\"" * (P "\\\"" + 1 - S"\"\r" )^0 * P "\""
- + P "{" * V "F" * P "}"
- + P "(" * V "F" * P ")"
- + P "[" * V "F" * P "]"
- ) * ( 1 - S "{}()[]\r\"'" ) ^ 0 ) ^ 0 ,
- }
-
-local Param = SkipSpace * K ( identifier , '' ) * SkipSpace
- * ( K ( P "=" * Expression , 'InitialValues' )
- + K ( P ":" , '' ) * SkipSpace * K ( letter^1 , 'Name.Type' ))
- + SkipSpace * K ( alphanum ^ 1 , '' ) * SkipSpace
-
-local Params = Param * ( K ( P "," , '' ) * Param ) ^ 0
-
-local StringDoc = K ( P "\"\"\"" , 'String.Doc' )
- * ( K ( (1 - P "\"\"\"" - P "\r" ) ^ 0 , 'String.Doc' ) * EOL ) ^ 0
- * K ( ( 1 - P "\"\"\"" - P "\r" ) ^ 0 * P "\"\"\"" , 'String.Doc' )
- + K ( P "'''" , 'String.Doc' )
- * ( K ( (1 - P "'''" - P "\r")^0 , 'String.Doc' ) * EOL ) ^ 0
- * K ( ( 1 - P "'''" - P "\r")^0 * P "'''" , 'String.Doc' )
-
-local CommentMath = P "$" * K ( ( 1 - S "$\r" ) ^ 1 , 'Comment.Math' ) * P "$"
-
-
-local Comment = L ( "{\\pitonStyleComment {" )
- * C ( P "#" ) * ( CommentMath + C ( ( 1 - S "$\r" ) ^ 1 ) ) ^ 0
- * L ( "}}" )
- * ( EOL + -1 )
-
-local CommentLaTeX =
- P "##"
- * L "{\\PitonStyle{Comment.LaTeX}{\\ignorespaces"
- * Ct ( C ( ( 1 - P "\r" ) ^ 0 ) )
- * L "}}"
- * ( EOL + -1 )
-
-local DefFunction =
- K ( P "def" , 'Keyword' )
- * Space
- * K ( identifier , 'Name.Function' )
- * ( SkipSpace * K ( P "(" , '' ) * Params * K ( P ")" , '' ) ) ^ -1
- * ( SkipSpace
- * K ( ( 1 - S ":\r" )^0 , 'Post.Function' )
- * K ( P ":" , 'Keyword' )
- * SkipSpace
- * ( EOL + CommentLaTeX + Comment )
- * SkipSpace
- * StringDoc ) ^ -1
-
-local ItemDict = ShortString * SkipSpace * C ( P ":" ) * K ( Expression , 'Dict.Value' )
-
-local ItemOfSet = SkipSpace * ( ItemDict + ShortString ) * SkipSpace
-
-local Set = C ( P "{" )
- * ItemOfSet * ( C ( P "," ) * ItemOfSet ) ^ 0
- * C ( P "}" )
-
-
-local Operator = K ( P "!=" + P "==" + P "<<" + P ">>" + S "-~+/*%=<>&.@|" , 'Operator')
-
-local OperatorWord = K ( P "in" + P "is" + P "and" + P "or" + P "not" , 'Operator.Word')
-
-local SyntaxPython =
- ( ( space - P "\r" ) ^0 * P "\r" ) ^ -1 *
- ( ( space^1 * -1 )
- + EOL
- + Space
- + Escape
- + CommentLaTeX
- + LongString
- + Comment
- + ExceptionInConsole
- + Set
- + Delim
- + Class * ( Space + Punct + EOL )
- + Namespace * ( Space + Punct + EOL )
- + ImportAs
- + RaiseException
- + Keyword * ( Space + Punct + EOL )
- + DefFunction
- + ShortString
- + Decorator * ( Space + Punct + EOL )
- + Operator
- + OperatorWord * ( Space + Punct + EOL )
- + Builtin * ( Space + Punct + EOL )
- + Identifier
- + Number
- + Word
- ) ^0 * -1
-
-
-local MinimalSyntax =
- P { "S" ;
- S = K ( (1 - P "\r" ) ^ 0 , '') + EOL * S
- }
-
-
---- with cctab, all characters including spaces have catcode 12
-local cctab = luatexbase.catcodetables.CatcodeTableOther
-
-function Parse(code)
- local t = Ct(SyntaxPython) : match(code)
- if t then else t = Ct(MinimalSyntax) : match(code) end
- for i = 1 , #t do
- if type(t[i]) == 'string'
- then
- tex.sprint(cctab, t[i])
- else
- tex.sprint( t[i][1] )
- end
- end
-end
-
-
-
-
-function ParseFile(name)
- s = ''
- for line in io.lines(name) do s = s .. '\r' .. line end
- Parse(s)
-end
-
-
-function define_gobble_syntax(n)
- GobbleSyntax = ( 1 - P "\r" ) ^ (-n) * C ( ( 1 - P "\r" ) ^0 )
- * ( C ( P "\r" )
- * ( 1 - P "\r" ) ^ (-n)
- * C ( ( 1 - P "\r" ) ^0 )
- ) ^ 0
-end
-
-function GobbleParse(code)
- local t = Ct(GobbleSyntax):match(code)
- local new_code = ""
- for i = 1 , #t do
- new_code = new_code .. t[i]
- end
- Parse(new_code)
-end
-
-
-function min(x,y)
- if x <= y
- then return x
- else return y
- end
-end
-
-function add(acc,new_value)
- return acc + new_value
-end
-
-
---[[ The following LPEG returns as capture the minimal number of spaces at
-the beginning of the lines of code]]
-AutoGobbleSyntax =
- ( space ^ 0 * P "\r" ) ^ -1
- * Cf (
- (
- ( P " " ) ^ 0 * P "\r"
- +
- Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add )
- * ( 1 - P " " ) * ( 1 - P "\r" ) ^ 0 * P "\r"
- ) ^ 0
- *
- ( Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add )
- * ( 1 - P " " ) * ( 1 - P "\r" ) ^ 0 ) ^ -1 ,
- min
- )
-
-function AutoGobbleParse(code)
- local n = AutoGobbleSyntax:match(code)
- if n==0
- then Parse(code)
- else define_gobble_syntax(n)
- GobbleParse(code)
- end
-end
-
-
---[[ The following LPEG returns as capture the number of spaces at the last line,
-that is to say begin the \end{Piton} ]]
-
-EnvGobbleSyntax =
- ( ( 1 - P "\r" ) ^ 0 * P "\r" ) ^ 0
- * Cf ( Cc(0) * ( P " " * Cc(1) ) ^ 0 , add ) * -1
-
-function EnvGobbleParse(code)
- local n = EnvGobbleSyntax:match(code)
- if n==0
- then Parse(code)
- else define_gobble_syntax(n)
- GobbleParse(code)
- end
-end
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/macros/luatex/latex/piton/piton.pdf b/macros/luatex/latex/piton/piton.pdf
index 924373fc93..13e8b7f729 100644
--- a/macros/luatex/latex/piton/piton.pdf
+++ b/macros/luatex/latex/piton/piton.pdf
Binary files differ