diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-15 20:54:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-15 20:54:13 +0000 |
commit | d514993bbf89481a115b14b40cc967ecabf8f478 (patch) | |
tree | 1141f979066dd2a94306d705c6a6b5038c12c381 | |
parent | 5485dde715d33d248d61bac13e751a472157ef89 (diff) |
letgut (15jan23)
git-svn-id: svn://tug.org/texlive/trunk@65548 c570f23f-e606-0410-a88d-b1316a301751
15 files changed, 136 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/lualatex/letgut/CHANGELOG.md b/Master/texmf-dist/doc/lualatex/letgut/CHANGELOG.md index 54a69778da2..5855908b447 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/CHANGELOG.md +++ b/Master/texmf-dist/doc/lualatex/letgut/CHANGELOG.md @@ -7,6 +7,11 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.9.6] - 2023-01-14 + +### Fixed +Hot fix for the attachment to the Lettre's PDF of its source files. + ## [0.9.5] - 2023-01-13 ### Added @@ -15,6 +20,7 @@ Versioning](https://semver.org/spec/v2.0.0.html). - Starred version of `\inputarticle` that prevents the previous feature. - Boolean option that (un)forces the previous feature. - Plural forms `\lettres` and `\lettresgut` of `\lettre` and `\lettregut`. +- Shortcuts for “(a|A)ssociation GUTenberg”. - Starred versions of `\person` and `\author` that sort the lists of persons/authors in alphabetic order. - Environment for announcements. diff --git a/Master/texmf-dist/doc/lualatex/letgut/README.md b/Master/texmf-dist/doc/lualatex/letgut/README.md index 3dfeea53e4f..13ebf86e3e7 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/README.md +++ b/Master/texmf-dist/doc/lualatex/letgut/README.md @@ -8,7 +8,7 @@ to the newsletter “La Lettre GUTenberg” of GUTenberg, the French TeX User Gr Release ------- -2023-01-13 v0.9.5 +2023-01-14 v0.9.6 Development ----------- diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.pdf b/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.pdf Binary files differindex b1e257cba57..9499196c473 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.pdf +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.pdf diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.tex b/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.tex index fc62cee6f18..b289e3824e0 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.tex +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut-banner-code.tex @@ -1,4 +1,4 @@ -% Created 2023-01-13 ven. 22:57 +% Created 2023-01-14 sam. 20:02 % Intended LaTeX compiler: lualatex \documentclass{letgut} \setmainfont{KpRoman} diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut-code.pdf b/Master/texmf-dist/doc/lualatex/letgut/letgut-code.pdf Binary files differindex 996190401b2..b8f926da80b 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut-code.pdf +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut-code.pdf diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut-code.tex b/Master/texmf-dist/doc/lualatex/letgut/letgut-code.tex index dc5bad146e9..d6ef577a7b0 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut-code.tex +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut-code.tex @@ -1,4 +1,4 @@ -% Created 2023-01-13 ven. 22:57 +% Created 2023-01-14 sam. 20:02 % Intended LaTeX compiler: lualatex \documentclass{letgut} \setmainfont{KpRoman} @@ -90,8 +90,8 @@ Now, we can announce the class name and its version: \begin{lstlisting} \ProvidesExplClass{letgut} -{2023-01-13} -{0.9.5} +{2023-01-14} +{0.9.6} { Class for the newsletter “The GUTenberg Letter” } @@ -1085,12 +1085,8 @@ subparagraphs) detailed or not. \begin{lstlisting} \keys_define:nn { letgut } { - , for-readers .code:n = { - \bool_gset_true:N \g__letgut_for_readers_bool - \bool_gset_false:N \g__letgut_included_files_attached_bool - } + , for-readers .bool_gset:N = \g__letgut_for_readers_bool , for-readers .initial:n = { true } - , for-readers .default:n = { true } , for-authors .bool_gset_inverse:N = \g__letgut_for_readers_bool , draft .bool_gset:N = \g__letgut_draft_bool , draft .initial:n = { true } @@ -1101,9 +1097,10 @@ subparagraphs) detailed or not. \pagecolor[rgb]{\c__letgut_default_pagecolor_paper_clist} \clist_set_eq:NN \g__letgut_pagecolor_clist \c__letgut_default_pagecolor_paper_clist - \bool_gset_false:N \g__letgut_included_files_attached_bool } - , screen .bool_gset_inverse:N = \g__letgut_paper_bool + , screen .code:n = { + \bool_gset_false:N \g__letgut_paper_bool + } , number .int_gset:N = \g__letgut_number_int , date .code:n = { \__letgut_date_parse:n { #1 } } , date .initial:x = {\the\year-\the\month} @@ -1136,9 +1133,26 @@ subparagraphs) detailed or not. , informations .initial:n = { true } , detailedtoc .bool_gset:N = \g__letgut_detailedtoc_bool , detailedtoc .initial:n = { false } - , source-files-attached .bool_gset:N = \g__letgut_force_included_files_attached_bool + , reverse-files-attachement .code:n = { + \AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_false:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_true:N \g__letgut_included_files_attached_bool + } + } + } } \ProcessKeysOptions { letgut } +\AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_true:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_false:N \g__letgut_included_files_attached_bool + } +} \end{lstlisting} \begin{lstlisting} @@ -2990,7 +3004,6 @@ otherwise, use the starred version). \lstset{ style=__letgut_reset_listings_styles } \acresetall% \input{#2}% - % \bool_show:N \g__letgut_included_files_attached_bool \bool_if:NT \g__letgut_included_files_attached_bool { \IfBooleanF {#1}{ \seq_gput_left:Nn \g__letgut_included_files_seq { @@ -3166,16 +3179,6 @@ file to the \pdf{}. } \end{lstlisting} -\begin{lstlisting} -\AddToHook{begindocument/before}{ - \bool_if:NTF \g__letgut_force_included_files_attached_bool { - \bool_gset_true:N \g__letgut_included_files_attached_bool - }{ - \bool_gset_false:N \g__letgut_included_files_attached_bool - } -} -\end{lstlisting} - \subsection{Listings} \label{ImplementationListings-514h55h0jlj0} We define a style for all the listings which resets all the \TeX{} control @@ -3966,7 +3969,7 @@ several purposes: \end{itemize} \begin{lstlisting} -\ProvidesFile{letgut.lbx}[2023-01-13 v0.9.5 letgut localization] +\ProvidesFile{letgut.lbx}[2023-01-14 v0.9.6 letgut localization] \InheritBibliographyExtras{french} \DeclareBibliographyStrings{ inherit = {french}, @@ -3980,7 +3983,7 @@ We create the new bibliography driver \lstinline+bookreview+ (that seems to create the corresponding new entry). \begin{lstlisting} -\ProvidesFile{letgut.dbx}[2023-01-13 v0.9.5 letgut data model macros] +\ProvidesFile{letgut.dbx}[2023-01-14 v0.9.6 letgut data model macros] \DeclareBibliographyDriver{bookreview}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -4035,7 +4038,7 @@ create the corresponding new entry). We provide a specific \lstinline+biblatex+ citation style . \begin{lstlisting} -\ProvidesFile{letgut.cbx}[2023-01-13 v0.9.5 letgut base citation style] +\ProvidesFile{letgut.cbx}[2023-01-14 v0.9.6 letgut base citation style] \RequireCitationStyle{numeric} \end{lstlisting} @@ -4139,6 +4142,14 @@ well\ldots{} % % permet l'option `detailedtoc`. % % , detailedtoc + % + % % Les fichiers sources sont attachés au PDF si et seulement si la Lettre est + % % à la fois en version pour les lecteurs (option `for-readers' activée par + % % défaut) et en sortie écran (option `screen' activée par défaut). L'option + % % `reverse-files-attachement' inverse ce comportement par défaut. + % + % , reverse-files-attachement + % } \setmainfont{TeX Gyre Schola} % Par exemple diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut.pdf b/Master/texmf-dist/doc/lualatex/letgut/letgut.pdf Binary files differindex 3ca15bf9ca2..235ae563832 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut.pdf +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut.pdf diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut.records b/Master/texmf-dist/doc/lualatex/letgut/letgut.records deleted file mode 100644 index 635b87f3043..00000000000 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut.records +++ /dev/null @@ -1 +0,0 @@ -\rebussolution*[2][][] diff --git a/Master/texmf-dist/doc/lualatex/letgut/letgut.tex b/Master/texmf-dist/doc/lualatex/letgut/letgut.tex index 12a3bae3ffd..01fbebb8362 100644 --- a/Master/texmf-dist/doc/lualatex/letgut/letgut.tex +++ b/Master/texmf-dist/doc/lualatex/letgut/letgut.tex @@ -67,7 +67,7 @@ } \author{Association GUTenberg} \date{% - Version 0.9.5 en date du \today% + Version 0.9.6 en date du \today% \texorpdfstring{% \\ \url{https://framagit.org/gutenberg/letgut}% @@ -207,7 +207,7 @@ Les options de la \letgutcls{} peuvent être spécifiées de deux façons : \item informations sur \gut{}\footnote{Ou avertissement si elles ne sont pas trouvées.} (cf. clé \refKey{informations}) ; \item fichiers attachés au \pdf{} produit (cf. clé - \refKey{source-files-attached}). + \refKey{reverse-files-attachement}). \end{itemize} \end{itemize} \end{docKeys} @@ -344,30 +344,31 @@ Les options de la \letgutcls{} peuvent être spécifiées de deux façons : a pour effet que cette table des matières est détaillée au maximum (son niveau de profondeur allant jusqu'aux sous-paragraphes), ce qui peut être utile lors de la conception d'un numéro de la \lettre{}. + + \begin{dbremark}{Tables des matières locales}{} + Chaque article peut contenir une table des matières locale, affichée au + moyen de la commande \docAuxCommand{localtableofcontents} (fournie par le + \package*{etoc} chargé en sous-main par la \letgutcls{}). Le niveau de + profondeur est par défaut celui des sections mais cela peut être modifié en + la faisant précéder de la commande \docAuxCommand{etocsetnexttocdepth} (dont + l'argument est par exemple ™subsection™). + \end{dbremark} \end{docKey} -\begin{docKey}{source-files-attached}{}{\valinitdef[\docValue*{true}][\docValue*{true}]} - En version autre que \enquote{pour auteurs} (cf. \refKey{for-authors}) et en - sortie autre que papier (cf. \refKey{paper}), chacun des fichiers nécessaires - (et suffisants) à la compilation d'un article de la \lettre{} est : +\begin{docKey}{reverse-files-attachement}{}{\valinitdef[pas de valeur]} + Si, et seulement si, la \lettre{} est à la fois en version pour les lecteurs + (cf. \refKey{for-readers}) et en sortie écran (cf. \refKey{screen}), chacun + des fichiers nécessaires (et suffisants) à la compilation d'un de ses articles + est : \begin{itemize} \item attaché au \pdf{} produit ; \item accessible en cliquant sur l'hyperlien correspondant en forme de - trombone (\noattachfile[icon=Paperclip]) ; + trombone : \noattachfile[icon=Paperclip] ; \end{itemize} - La clé booléenne \refKey{source-files-attached} permet de (dés)activer cette - fonctionnalité. + L'option \refKey{reverse-files-attachement} inverse ce comportement par + défaut. \end{docKey} -\begin{dbremark}{Tables des matières locales}{} - Chaque article peut contenir une table des matières locale, affichée au moyen - de la commande \docAuxCommand{localtableofcontents} (fournie par le - \package*{etoc} chargé en sous-main par la \letgutcls{}). Le niveau de - profondeur est par défaut celui des sections mais cela peut être modifié en la - faisant précéder de la commande \docAuxCommand{etocsetnexttocdepth} (dont - l'argument est par exemple ™subsection™). -\end{dbremark} - \subsection{Options autres} \label{sec:options-autres} @@ -435,7 +436,7 @@ Si la commande \docAuxCommand{title}\marg{titre} est En version étoilée, les fichiers nécessaires (et suffisants) à la compilation de l'article ne sont pas attachés au \pdf{} produit (cf. clé - \refKey{source-files-attached}). + \refKey{reverse-files-attachement}). En plus de l'importation proprement dite, cette commande procède à un certain nombre de réinitialisations. diff --git a/Master/texmf-dist/doc/lualatex/letgut/rebus-2.tex b/Master/texmf-dist/doc/lualatex/letgut/rebus-2.tex deleted file mode 100644 index 2798de7770a..00000000000 --- a/Master/texmf-dist/doc/lualatex/letgut/rebus-2.tex +++ /dev/null @@ -1 +0,0 @@ - Solution du rébus. diff --git a/Master/texmf-dist/source/lualatex/letgut/letgut.org b/Master/texmf-dist/source/lualatex/letgut/letgut.org index 5ad47ec6762..fb91c08587a 100644 --- a/Master/texmf-dist/source/lualatex/letgut/letgut.org +++ b/Master/texmf-dist/source/lualatex/letgut/letgut.org @@ -54,7 +54,7 @@ new versions of the class on CTAN. % This field contains the version of the package. % The value is optional. % The value is restricted to 32 characters. - \version{0.9.5 2023-01-13} + \version{0.9.6 2023-01-14} % ------------------------------------------------------------------------- % This field contains the name of the author(s). % The value is optional. @@ -131,25 +131,8 @@ new versions of the class on CTAN. % The value is optional. % The value is restricted to 8192 characters. \begin{announcement} - ### Added - - Files (`.tex` source, images files, bibliographic files, etc.) used to typeset - an article possibly attached to the Lettre's PDF. - - Starred version of `\inputarticle` that prevents the previous feature. - - Boolean option that (un)forces the previous feature. - - Plural forms `\lettres` and `\lettresgut` of `\lettre` and `\lettregut`. - - Starred versions of `\person` and `\author` that sort the lists of - persons/authors in alphabetic order. - - Environment for announcements. - - Environments and commands for rebus and their solutions. - - ### Changed - - `⅛` replaced by `™` as a short equivalent of ~\lstinline~ (the former is - considered as math if ~unicode-math~ is loaded). - - Documentation updated. - ### Fixed - Several bugs and sub-optimalities. - + Hot fix for the attachment of the Lettre's source files to its PDF. \end{announcement} % ------------------------------------------------------------------------- % This field contains the one-liner for the package. @@ -196,6 +179,7 @@ new versions of the class on CTAN. % The value is optional. % The value is restricted to 2048 characters. \begin{note} + I am sorry for new this (corrective) update, so close to the previous one! \end{note} % ------------------------------------------------------------------------- % This field contains the archive file. @@ -219,6 +203,11 @@ new versions of the class on CTAN. ## [Unreleased] + ## [0.9.6] - 2023-01-14 + + ### Fixed + Hot fix for the attachment to the Lettre's PDF of its source files. + ## [0.9.5] - 2023-01-13 ### Added @@ -227,6 +216,7 @@ new versions of the class on CTAN. - Starred version of `\inputarticle` that prevents the previous feature. - Boolean option that (un)forces the previous feature. - Plural forms `\lettres` and `\lettresgut` of `\lettre` and `\lettregut`. + - Shortcuts for “(a|A)ssociation GUTenberg”. - Starred versions of `\person` and `\author` that sort the lists of persons/authors in alphabetic order. - Environment for announcements. @@ -314,7 +304,7 @@ to the newsletter “La Lettre GUTenberg” of GUTenberg, the French TeX User Gr Release ------- -2023-01-13 v0.9.5 +2023-01-14 v0.9.6 Development ----------- @@ -460,8 +450,8 @@ Now, we can announce the class name and its version: #+begin_src latex \ProvidesExplClass{letgut} - {2023-01-13} - {0.9.5} + {2023-01-14} + {0.9.6} { Class for the newsletter “The GUTenberg Letter” } @@ -1506,12 +1496,8 @@ We now define the options of the class: #+begin_src latex \keys_define:nn { letgut } { - , for-readers .code:n = { - \bool_gset_true:N \g__letgut_for_readers_bool - \bool_gset_false:N \g__letgut_included_files_attached_bool - } + , for-readers .bool_gset:N = \g__letgut_for_readers_bool , for-readers .initial:n = { true } - , for-readers .default:n = { true } , for-authors .bool_gset_inverse:N = \g__letgut_for_readers_bool , draft .bool_gset:N = \g__letgut_draft_bool , draft .initial:n = { true } @@ -1522,9 +1508,10 @@ We now define the options of the class: \pagecolor[rgb]{\c__letgut_default_pagecolor_paper_clist} \clist_set_eq:NN \g__letgut_pagecolor_clist \c__letgut_default_pagecolor_paper_clist - \bool_gset_false:N \g__letgut_included_files_attached_bool } - , screen .bool_gset_inverse:N = \g__letgut_paper_bool + , screen .code:n = { + \bool_gset_false:N \g__letgut_paper_bool + } , number .int_gset:N = \g__letgut_number_int , date .code:n = { \__letgut_date_parse:n { #1 } } , date .initial:x = {\the\year-\the\month} @@ -1557,9 +1544,26 @@ We now define the options of the class: , informations .initial:n = { true } , detailedtoc .bool_gset:N = \g__letgut_detailedtoc_bool , detailedtoc .initial:n = { false } - , source-files-attached .bool_gset:N = \g__letgut_force_included_files_attached_bool + , reverse-files-attachement .code:n = { + \AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_false:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_true:N \g__letgut_included_files_attached_bool + } + } + } } \ProcessKeysOptions { letgut } + \AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_true:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_false:N \g__letgut_included_files_attached_bool + } + } #+end_src #+begin_src latex @@ -3512,7 +3516,6 @@ following characteristics: \lstset{ style=__letgut_reset_listings_styles } \acresetall% \input{#2}% - % \bool_show:N \g__letgut_included_files_attached_bool \bool_if:NT \g__letgut_included_files_attached_bool { \IfBooleanF {#1}{ \seq_gput_left:Nn \g__letgut_included_files_seq { @@ -3700,16 +3703,6 @@ file to the \pdf{}. } #+end_src -#+begin_src latex - \AddToHook{begindocument/before}{ - \bool_if:NTF \g__letgut_force_included_files_attached_bool { - \bool_gset_true:N \g__letgut_included_files_attached_bool - }{ - \bool_gset_false:N \g__letgut_included_files_attached_bool - } - } -#+end_src - ** Listings :PROPERTIES: :CUSTOM_ID: ImplementationListings-514h55h0jlj0 @@ -4512,7 +4505,7 @@ several purposes: - the books advertisements. #+begin_src latex :tangle ../../../tex/lualatex/letgut/letgut.lbx :exports both -\ProvidesFile{letgut.lbx}[2023-01-13 v0.9.5 letgut localization] +\ProvidesFile{letgut.lbx}[2023-01-14 v0.9.6 letgut localization] \InheritBibliographyExtras{french} \DeclareBibliographyStrings{ inherit = {french}, @@ -4526,7 +4519,7 @@ several purposes: create the corresponding new entry). #+begin_src latex :tangle ../../../tex/lualatex/letgut/letgut.dbx :exports both - \ProvidesFile{letgut.dbx}[2023-01-13 v0.9.5 letgut data model macros] + \ProvidesFile{letgut.dbx}[2023-01-14 v0.9.6 letgut data model macros] \DeclareBibliographyDriver{bookreview}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -4581,7 +4574,7 @@ several purposes: We provide a specific ~biblatex~ citation style . #+begin_src latex :tangle ../../../tex/lualatex/letgut/letgut.cbx :exports both - \ProvidesFile{letgut.cbx}[2023-01-13 v0.9.5 letgut base citation style] + \ProvidesFile{letgut.cbx}[2023-01-14 v0.9.6 letgut base citation style] \RequireCitationStyle{numeric} #+end_src @@ -4691,6 +4684,14 @@ well... % % permet l'option `detailedtoc`. % % , detailedtoc + % + % % Les fichiers sources sont attachés au PDF si et seulement si la Lettre est + % % à la fois en version pour les lecteurs (option `for-readers' activée par + % % défaut) et en sortie écran (option `screen' activée par défaut). L'option + % % `reverse-files-attachement' inverse ce comportement par défaut. + % + % , reverse-files-attachement + % } \setmainfont{TeX Gyre Schola} % Par exemple diff --git a/Master/texmf-dist/tex/lualatex/letgut/letgut.cbx b/Master/texmf-dist/tex/lualatex/letgut/letgut.cbx index 876ee67dca3..3fb4a046da0 100644 --- a/Master/texmf-dist/tex/lualatex/letgut/letgut.cbx +++ b/Master/texmf-dist/tex/lualatex/letgut/letgut.cbx @@ -1,4 +1,4 @@ -\ProvidesFile{letgut.cbx}[2023-01-13 v0.9.5 letgut base citation style] +\ProvidesFile{letgut.cbx}[2023-01-14 v0.9.6 letgut base citation style] \RequireCitationStyle{numeric} \DeclareFieldFormat[bookreview]{title}{\textbf{\emph{#1}}} \renewbibmacro*{title}{% diff --git a/Master/texmf-dist/tex/lualatex/letgut/letgut.cls b/Master/texmf-dist/tex/lualatex/letgut/letgut.cls index 21f1685864b..fbd7b02e4d2 100644 --- a/Master/texmf-dist/tex/lualatex/letgut/letgut.cls +++ b/Master/texmf-dist/tex/lualatex/letgut/letgut.cls @@ -48,8 +48,8 @@ } \ExplSyntaxOff \ProvidesExplClass{letgut} -{2023-01-13} -{0.9.5} +{2023-01-14} +{0.9.6} { Class for the newsletter “The GUTenberg Letter” } @@ -577,12 +577,8 @@ \c__letgut_default_pagecolor_screen_clist \keys_define:nn { letgut } { - , for-readers .code:n = { - \bool_gset_true:N \g__letgut_for_readers_bool - \bool_gset_false:N \g__letgut_included_files_attached_bool - } + , for-readers .bool_gset:N = \g__letgut_for_readers_bool , for-readers .initial:n = { true } - , for-readers .default:n = { true } , for-authors .bool_gset_inverse:N = \g__letgut_for_readers_bool , draft .bool_gset:N = \g__letgut_draft_bool , draft .initial:n = { true } @@ -593,9 +589,10 @@ \pagecolor[rgb]{\c__letgut_default_pagecolor_paper_clist} \clist_set_eq:NN \g__letgut_pagecolor_clist \c__letgut_default_pagecolor_paper_clist - \bool_gset_false:N \g__letgut_included_files_attached_bool } - , screen .bool_gset_inverse:N = \g__letgut_paper_bool + , screen .code:n = { + \bool_gset_false:N \g__letgut_paper_bool + } , number .int_gset:N = \g__letgut_number_int , date .code:n = { \__letgut_date_parse:n { #1 } } , date .initial:x = {\the\year-\the\month} @@ -628,9 +625,26 @@ , informations .initial:n = { true } , detailedtoc .bool_gset:N = \g__letgut_detailedtoc_bool , detailedtoc .initial:n = { false } - , source-files-attached .bool_gset:N = \g__letgut_force_included_files_attached_bool + , reverse-files-attachement .code:n = { + \AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_false:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_true:N \g__letgut_included_files_attached_bool + } + } + } } \ProcessKeysOptions { letgut } +\AddToHook{begindocument/before}{ + \bool_lazy_and:nnTF {\g__letgut_for_readers_bool} {!\g__letgut_paper_bool} + { + \bool_gset_true:N \g__letgut_included_files_attached_bool + }{ + \bool_gset_false:N \g__letgut_included_files_attached_bool + } +} \definecolor{letgut_pagecolor}{rgb}{\g__letgut_pagecolor_clist} \renewcommand{\headruleskip}{ \c__letgut_head_rule_skip_dim @@ -1895,7 +1909,6 @@ title .value_required:n = true, \lstset{ style=__letgut_reset_listings_styles } \acresetall% \input{#2}% - % \bool_show:N \g__letgut_included_files_attached_bool \bool_if:NT \g__letgut_included_files_attached_bool { \IfBooleanF {#1}{ \seq_gput_left:Nn \g__letgut_included_files_seq { @@ -2037,13 +2050,6 @@ title .value_required:n = true, \bool_gset_true:N \g__letgut_lstlanguage_file_attached_bool } } -\AddToHook{begindocument/before}{ - \bool_if:NTF \g__letgut_force_included_files_attached_bool { - \bool_gset_true:N \g__letgut_included_files_attached_bool - }{ - \bool_gset_false:N \g__letgut_included_files_attached_bool - } -} \lstdefinestyle{__letgut_reset_listings_styles}{ basicstyle=\ttfamily, breaklines, diff --git a/Master/texmf-dist/tex/lualatex/letgut/letgut.dbx b/Master/texmf-dist/tex/lualatex/letgut/letgut.dbx index 85c26f3a31d..4dae1f22af4 100644 --- a/Master/texmf-dist/tex/lualatex/letgut/letgut.dbx +++ b/Master/texmf-dist/tex/lualatex/letgut/letgut.dbx @@ -1,4 +1,4 @@ -\ProvidesFile{letgut.dbx}[2023-01-13 v0.9.5 letgut data model macros] +\ProvidesFile{letgut.dbx}[2023-01-14 v0.9.6 letgut data model macros] \DeclareBibliographyDriver{bookreview}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% diff --git a/Master/texmf-dist/tex/lualatex/letgut/letgut.lbx b/Master/texmf-dist/tex/lualatex/letgut/letgut.lbx index 05c107b6dab..b96eb5eda41 100644 --- a/Master/texmf-dist/tex/lualatex/letgut/letgut.lbx +++ b/Master/texmf-dist/tex/lualatex/letgut/letgut.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{letgut.lbx}[2023-01-13 v0.9.5 letgut localization] +\ProvidesFile{letgut.lbx}[2023-01-14 v0.9.6 letgut localization] \InheritBibliographyExtras{french} \DeclareBibliographyStrings{ inherit = {french}, |