diff options
author | Karl Berry <karl@freefriends.org> | 2022-06-14 20:21:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-06-14 20:21:03 +0000 |
commit | c2dd31bd12747606971061847c27e79f3f4daff9 (patch) | |
tree | 964673b435198a93816acecffe9bb27d9426003f /Master | |
parent | 7b6c297bf35995d5387284690ff8adfefc50e4d3 (diff) |
gzt (14jun22)
git-svn-id: svn://tug.org/texlive/trunk@63591 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/gzt/CHANGELOG.md | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf | bin | 546057 -> 545986 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/gzt/french/gzt-fr.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/gzt/gzt.dtx | 116 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/gzt/gzt.cls | 109 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/gzt/gztarticle.cls | 105 |
6 files changed, 198 insertions, 139 deletions
diff --git a/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md b/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md index 96e30eaaec2..9506eb125f4 100644 --- a/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md @@ -1,5 +1,10 @@ # [Unreleased] +# [1.1.3] - 2022-06-13 + +## Added +New options for special special (!) editions + # [1.1.2] - 2022-03-18 ## Changed diff --git a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf Binary files differindex 3b85f1192e5..0309184cb8e 100644 --- a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf +++ b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf diff --git a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.tex b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.tex index 52839b4fec7..f61459fbdd3 100644 --- a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.tex +++ b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.tex @@ -4,7 +4,7 @@ \usepackage[firstpage]{draftwatermark} % \lstset{% - alsolanguage=[varioref]TeX,% + moretexcs=vref,% } % \indexsetup{level=\section*,toclevel=section,noclearpage,firstpagestyle=__gzt_mainmatter_ps} diff --git a/Master/texmf-dist/source/latex/gzt/gzt.dtx b/Master/texmf-dist/source/latex/gzt/gzt.dtx index 7cad88ccd7d..cea642f47b5 100644 --- a/Master/texmf-dist/source/latex/gzt/gzt.dtx +++ b/Master/texmf-dist/source/latex/gzt/gzt.dtx @@ -94,7 +94,7 @@ $quote_filenames = 0; % This field contains the version of the package. % The value is optional. % The value is restricted to 32 characters. -\version{1.1.2 2022-03-18} +\version{1.1.3 2022-06-13} % ------------------------------------------------------------------------- % This field contains the name of the author(s). % The value is optional. @@ -214,6 +214,11 @@ France”](https://smf.emath.fr/les-publications/la-gazette): % \end{macrocode} # [Unreleased] +# [1.1.3] - 2022-06-13 + +## Added +New options for special special (!) editions + # [1.1.2] - 2022-03-18 ## Changed @@ -330,8 +335,8 @@ Gazette de la Société Mathématique de France”](https://smf.emath.fr/les-pub \fi %</internal> %<*class|class-article|install> -\def\gztfileversion{1.1.2} -\def\gztfiledate{2022-03-18} +\def\gztfileversion{1.1.3} +\def\gztfiledate{2022-06-13} %</class|class-article|install> %<*install> \input l3docstrip.tex @@ -1009,6 +1014,8 @@ Running "make install" installs the files in the local TeX tree. \bool_new:N \g_@@_cover_bool \bool_new:N \g_@@_coverpage_bool \bool_new:N \g_@@_inside_pages_bool +\bool_new:N \g_@@_invisible_titles_bool +\bool_new:N \g_@@_rubrics_in_toc_bool % \bool_new:N \g_@@_no_inside_backcover_bool %<class-article>\bool_gset_true:N \g_@@_for_authors_bool @@ -1097,6 +1104,8 @@ Running "make install" installs the files in the local TeX tree. specialedition / color .code:n = { \tl_gset:Nn \g_@@_special_edition_color_tl {#1} }, + specialedition / invisible~ titles .bool_gset:N = \g_@@_invisible_titles_bool, + specialedition / rubrics~ in~ toc .bool_gset:N = \g_@@_rubrics_in_toc_bool, specialedition / minitoc .code:n = { \bool_gset_false:N \g_@@_frontcover_without_minitoc_bool }, @@ -4157,7 +4166,7 @@ Running "make install" installs the files in the local TeX tree. \int_zero:N \g_@@_item_in_rubric_int \phantomsection \par - \bool_if:NF {\g_@@_special_edition_bool} { + \bool_if:nF {\g_@@_special_edition_bool && !\g_@@_rubrics_in_toc_bool} { \addcontentsline{toc}{part}{\g_@@_rubric_title_tl} } \thispagestyle{@@_rubric_ps} @@ -4522,57 +4531,61 @@ Running "make install" installs the files in the local TeX tree. \tl_set:Nn \l_@@_title_box_tl { \noindent - \hspace*{18mm} - \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} - \raggedright - \color{@@_article_title_color} - \fontsize{20}{25}\selectfont - \bfseries - \g_@@_title_tl - \tl_if_empty:NF \g_@@_subtitle_tl { + \bool_if:NF {\g_@@_invisible_titles_bool} { + \hspace*{18mm} + \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} + \raggedright + \color{@@_article_title_color} + \fontsize{20}{25}\selectfont + \bfseries + \g_@@_title_tl + \tl_if_empty:NF \g_@@_subtitle_tl { + \par + \g_@@_subtitle_tl + } + \phantomsection \par - \g_@@_subtitle_tl } - \phantomsection - \par - \bool_if:NTF {\g_@@_title_not_in_toc_bool} { - \bookmark[page=\thepage,level=chapter]{\g_@@_short_title_tl} - }{ - \addcontentsline{toc}{chapter}{ - \tl_if_empty:NTF \g_@@_short_title_tl { - \g_@@_title_tl - }{ - \g_@@_short_title_tl - } - \bool_if:NF {\g_@@_subtitle_not_in_toc_bool} { + \bool_if:NTF {\g_@@_title_not_in_toc_bool} { + \bookmark[page=\thepage,level=chapter]{\g_@@_short_title_tl} + }{ + \addcontentsline{toc}{chapter}{ + \tl_if_empty:NTF \g_@@_short_title_tl { + \g_@@_title_tl + }{ + \g_@@_short_title_tl + } + \bool_if:NF {\g_@@_subtitle_not_in_toc_bool} { + \bool_if:nF { + \tl_if_empty_p:N \g_@@_short_subtitle_tl || + \g_@@_interview_rubric_bool || + \g_@@_rearviewmirror_rubric_bool + }{ + \c_space_tl\textendash{}\c_space_tl\g_@@_short_subtitle_tl + } + } \bool_if:nF { - \tl_if_empty_p:N \g_@@_short_subtitle_tl || + \tl_if_empty_p:N \l_@@_people_first_last_names_tl || \g_@@_interview_rubric_bool || \g_@@_rearviewmirror_rubric_bool }{ - \c_space_tl\textendash{}\c_space_tl\g_@@_short_subtitle_tl - } - } - \bool_if:nF { - \tl_if_empty_p:N \l_@@_people_first_last_names_tl || - \g_@@_interview_rubric_bool || - \g_@@_rearviewmirror_rubric_bool - }{ - \textsl{ - \cs_if_exist:cTF {texorpdfstring} - { - \texorpdfstring{ + \textsl{ + \cs_if_exist:cTF {texorpdfstring} + { + \texorpdfstring{ + \c_space_tl\textendash{}\c_space_tl\citeauthor{\g_@@_article_bib_key_tl} + }{} + }{ \c_space_tl\textendash{}\c_space_tl\citeauthor{\g_@@_article_bib_key_tl} - }{} - }{ - \c_space_tl\textendash{}\c_space_tl\citeauthor{\g_@@_article_bib_key_tl} + } } } } } + \bool_if:NF {\g_@@_invisible_titles_bool} { + \end{adjustbox} + } } - \end{adjustbox} -} \dim_gset:Nn \g_@@_abstract_box_width_dim {0.75\linewidth} % \bool_if:nT { \tl_if_empty_p:N \l_@@_people_first_last_names_tl } % { @@ -4593,17 +4606,26 @@ Running "make install" installs the files in the local TeX tree. } \tl_set:Nn \l_@@_authors_box_tl { - \begin{adjustbox}{minipage=0.3\linewidth,min~ width=0.3\linewidth,valign=t} + \bool_if:NF {\g_@@_invisible_titles_bool} { + \begin{adjustbox}{minipage=0.3\linewidth,min~ + width=0.3\linewidth,valign=t} + } \bool_if:nTF { \tl_if_empty_p:N \l_@@_people_first_last_names_tl || \g_@@_interview_rubric_bool } { \mbox{} } { \color{@@_people_color} - \_@@_itemized_citeauthor:n {\g_@@_article_bib_key_tl} + \bool_if:NTF {\g_@@_invisible_titles_bool} { + \nocite {\g__gzt_article_bib_key_tl} + }{ + \_@@_itemized_citeauthor:n {\g_@@_article_bib_key_tl} + } } - \end{adjustbox} - } + \bool_if:NF {\g_@@_invisible_titles_bool} { + \end{adjustbox} + } + } \bool_if:nTF { \int_compare_p:nNn { \g_@@_item_in_rubric_int } = { 1 } } diff --git a/Master/texmf-dist/tex/latex/gzt/gzt.cls b/Master/texmf-dist/tex/latex/gzt/gzt.cls index df531333e77..e26f26ac702 100644 --- a/Master/texmf-dist/tex/latex/gzt/gzt.cls +++ b/Master/texmf-dist/tex/latex/gzt/gzt.cls @@ -11,8 +11,8 @@ %% E-mail:| denis.bitouze@univ-littoral.fr %% License:| Released under the LaTeX Project Public License v1.3c or later %% See:| http://www.latex-project.org/lppl.txt -\def\gztfileversion{1.1.2} -\def\gztfiledate{2022-03-18} +\def\gztfileversion{1.1.3} +\def\gztfiledate{2022-06-13} \def\sectioncommandslist{} \let\saved@ifdefinable\@ifdefinable \let\saved@@ifdefinable\@@ifdefinable @@ -94,6 +94,8 @@ \bool_new:N \g__gzt_cover_bool \bool_new:N \g__gzt_coverpage_bool \bool_new:N \g__gzt_inside_pages_bool +\bool_new:N \g__gzt_invisible_titles_bool +\bool_new:N \g__gzt_rubrics_in_toc_bool \bool_new:N \g__gzt_no_inside_backcover_bool \tl_gset:Nn \g__gzt_moral_report_common_option_tl { \AddToHook{begindocument/before} { @@ -149,6 +151,8 @@ specialedition / color .code:n = { \tl_gset:Nn \g__gzt_special_edition_color_tl {#1} }, + specialedition / invisible~ titles .bool_gset:N = \g__gzt_invisible_titles_bool, + specialedition / rubrics~ in~ toc .bool_gset:N = \g__gzt_rubrics_in_toc_bool, specialedition / minitoc .code:n = { \bool_gset_false:N \g__gzt_frontcover_without_minitoc_bool }, @@ -1830,7 +1834,7 @@ \int_zero:N \g__gzt_item_in_rubric_int \phantomsection \par - \bool_if:NF {\g__gzt_special_edition_bool} { + \bool_if:nF {\g__gzt_special_edition_bool && !\g__gzt_rubrics_in_toc_bool} { \addcontentsline{toc}{part}{\g__gzt_rubric_title_tl} } \thispagestyle{__gzt_rubric_ps} @@ -2071,57 +2075,61 @@ \tl_set:Nn \l__gzt_title_box_tl { \noindent - \hspace*{18mm} - \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} - \raggedright - \color{__gzt_article_title_color} - \fontsize{20}{25}\selectfont - \bfseries - \g__gzt_title_tl - \tl_if_empty:NF \g__gzt_subtitle_tl { + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \hspace*{18mm} + \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} + \raggedright + \color{__gzt_article_title_color} + \fontsize{20}{25}\selectfont + \bfseries + \g__gzt_title_tl + \tl_if_empty:NF \g__gzt_subtitle_tl { + \par + \g__gzt_subtitle_tl + } + \phantomsection \par - \g__gzt_subtitle_tl } - \phantomsection - \par - \bool_if:NTF {\g__gzt_title_not_in_toc_bool} { - \bookmark[page=\thepage,level=chapter]{\g__gzt_short_title_tl} - }{ - \addcontentsline{toc}{chapter}{ - \tl_if_empty:NTF \g__gzt_short_title_tl { - \g__gzt_title_tl - }{ - \g__gzt_short_title_tl - } - \bool_if:NF {\g__gzt_subtitle_not_in_toc_bool} { + \bool_if:NTF {\g__gzt_title_not_in_toc_bool} { + \bookmark[page=\thepage,level=chapter]{\g__gzt_short_title_tl} + }{ + \addcontentsline{toc}{chapter}{ + \tl_if_empty:NTF \g__gzt_short_title_tl { + \g__gzt_title_tl + }{ + \g__gzt_short_title_tl + } + \bool_if:NF {\g__gzt_subtitle_not_in_toc_bool} { + \bool_if:nF { + \tl_if_empty_p:N \g__gzt_short_subtitle_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + }{ + \c_space_tl\textendash{}\c_space_tl\g__gzt_short_subtitle_tl + } + } \bool_if:nF { - \tl_if_empty_p:N \g__gzt_short_subtitle_tl || + \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || \g__gzt_interview_rubric_bool || \g__gzt_rearviewmirror_rubric_bool }{ - \c_space_tl\textendash{}\c_space_tl\g__gzt_short_subtitle_tl - } - } - \bool_if:nF { - \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - }{ - \textsl{ - \cs_if_exist:cTF {texorpdfstring} - { - \texorpdfstring{ + \textsl{ + \cs_if_exist:cTF {texorpdfstring} + { + \texorpdfstring{ + \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} + }{} + }{ \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} - }{} - }{ - \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} + } } } } } + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \end{adjustbox} + } } - \end{adjustbox} -} \dim_gset:Nn \g__gzt_abstract_box_width_dim {0.75\linewidth} % \bool_if:nT { \tl_if_empty_p:N \l__gzt_people_first_last_names_tl } % { @@ -2142,17 +2150,26 @@ } \tl_set:Nn \l__gzt_authors_box_tl { - \begin{adjustbox}{minipage=0.3\linewidth,min~ width=0.3\linewidth,valign=t} + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \begin{adjustbox}{minipage=0.3\linewidth,min~ + width=0.3\linewidth,valign=t} + } \bool_if:nTF { \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || \g__gzt_interview_rubric_bool } { \mbox{} } { \color{__gzt_people_color} - \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} + \bool_if:NTF {\g__gzt_invisible_titles_bool} { + \nocite {\g__gzt_article_bib_key_tl} + }{ + \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} + } } - \end{adjustbox} - } + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \end{adjustbox} + } + } \bool_if:nTF { \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } } diff --git a/Master/texmf-dist/tex/latex/gzt/gztarticle.cls b/Master/texmf-dist/tex/latex/gzt/gztarticle.cls index e1130225f0a..b939718b0e4 100644 --- a/Master/texmf-dist/tex/latex/gzt/gztarticle.cls +++ b/Master/texmf-dist/tex/latex/gzt/gztarticle.cls @@ -11,8 +11,8 @@ %% E-mail:| denis.bitouze@univ-littoral.fr %% License:| Released under the LaTeX Project Public License v1.3c or later %% See:| http://www.latex-project.org/lppl.txt -\def\gztfileversion{1.1.2} -\def\gztfiledate{2022-03-18} +\def\gztfileversion{1.1.3} +\def\gztfiledate{2022-06-13} \RequirePackage{xpatch} \patchcmd {\use@@tikzlibrary} @@ -75,6 +75,8 @@ \bool_new:N \g__gzt_cover_bool \bool_new:N \g__gzt_coverpage_bool \bool_new:N \g__gzt_inside_pages_bool +\bool_new:N \g__gzt_invisible_titles_bool +\bool_new:N \g__gzt_rubrics_in_toc_bool \bool_new:N \g__gzt_no_inside_backcover_bool \bool_gset_true:N \g__gzt_for_authors_bool \bool_gset_true:N \g__gzt_inside_pages_bool @@ -1894,57 +1896,61 @@ \tl_set:Nn \l__gzt_title_box_tl { \noindent - \hspace*{18mm} - \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} - \raggedright - \color{__gzt_article_title_color} - \fontsize{20}{25}\selectfont - \bfseries - \g__gzt_title_tl - \tl_if_empty:NF \g__gzt_subtitle_tl { + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \hspace*{18mm} + \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} + \raggedright + \color{__gzt_article_title_color} + \fontsize{20}{25}\selectfont + \bfseries + \g__gzt_title_tl + \tl_if_empty:NF \g__gzt_subtitle_tl { + \par + \g__gzt_subtitle_tl + } + \phantomsection \par - \g__gzt_subtitle_tl } - \phantomsection - \par - \bool_if:NTF {\g__gzt_title_not_in_toc_bool} { - \bookmark[page=\thepage,level=chapter]{\g__gzt_short_title_tl} - }{ - \addcontentsline{toc}{chapter}{ - \tl_if_empty:NTF \g__gzt_short_title_tl { - \g__gzt_title_tl - }{ - \g__gzt_short_title_tl - } - \bool_if:NF {\g__gzt_subtitle_not_in_toc_bool} { + \bool_if:NTF {\g__gzt_title_not_in_toc_bool} { + \bookmark[page=\thepage,level=chapter]{\g__gzt_short_title_tl} + }{ + \addcontentsline{toc}{chapter}{ + \tl_if_empty:NTF \g__gzt_short_title_tl { + \g__gzt_title_tl + }{ + \g__gzt_short_title_tl + } + \bool_if:NF {\g__gzt_subtitle_not_in_toc_bool} { + \bool_if:nF { + \tl_if_empty_p:N \g__gzt_short_subtitle_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + }{ + \c_space_tl\textendash{}\c_space_tl\g__gzt_short_subtitle_tl + } + } \bool_if:nF { - \tl_if_empty_p:N \g__gzt_short_subtitle_tl || + \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || \g__gzt_interview_rubric_bool || \g__gzt_rearviewmirror_rubric_bool }{ - \c_space_tl\textendash{}\c_space_tl\g__gzt_short_subtitle_tl - } - } - \bool_if:nF { - \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - }{ - \textsl{ - \cs_if_exist:cTF {texorpdfstring} - { - \texorpdfstring{ + \textsl{ + \cs_if_exist:cTF {texorpdfstring} + { + \texorpdfstring{ + \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} + }{} + }{ \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} - }{} - }{ - \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} + } } } } } + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \end{adjustbox} + } } - \end{adjustbox} -} \dim_gset:Nn \g__gzt_abstract_box_width_dim {0.75\linewidth} % \bool_if:nT { \tl_if_empty_p:N \l__gzt_people_first_last_names_tl } % { @@ -1965,17 +1971,26 @@ } \tl_set:Nn \l__gzt_authors_box_tl { - \begin{adjustbox}{minipage=0.3\linewidth,min~ width=0.3\linewidth,valign=t} + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \begin{adjustbox}{minipage=0.3\linewidth,min~ + width=0.3\linewidth,valign=t} + } \bool_if:nTF { \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || \g__gzt_interview_rubric_bool } { \mbox{} } { \color{__gzt_people_color} - \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} + \bool_if:NTF {\g__gzt_invisible_titles_bool} { + \nocite {\g__gzt_article_bib_key_tl} + }{ + \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} + } } - \end{adjustbox} - } + \bool_if:NF {\g__gzt_invisible_titles_bool} { + \end{adjustbox} + } + } \bool_if:nTF { \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } } |