From d2602fc0b65f4c8d5ab78f5e88e73f1b78127b61 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Mar 2024 20:45:37 +0000 Subject: gzt (9mar24) git-svn-id: svn://tug.org/texlive/trunk@70532 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/gzt/CHANGELOG.md | 15 + Master/texmf-dist/doc/latex/gzt/README.md | 1 - Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf | Bin 545986 -> 546492 bytes Master/texmf-dist/source/latex/gzt/gzt.dtx | 472 +++++++++++++--------- Master/texmf-dist/tex/latex/gzt/gzt.cls | 428 +++++++++++--------- Master/texmf-dist/tex/latex/gzt/gzt.dbx | 2 +- Master/texmf-dist/tex/latex/gzt/gzt.lbx | 2 +- Master/texmf-dist/tex/latex/gzt/gztarticle.cls | 366 +++++++++-------- 8 files changed, 750 insertions(+), 536 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md b/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md index 9506eb125f4..e63c02efe70 100644 --- a/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/gzt/CHANGELOG.md @@ -1,5 +1,20 @@ # [Unreleased] +# [1.1.4] - 2024-03-09 + +## Fixed +Some color changing in breakable boxes may not survive the break to the next +box. + +## Changed +- Editorial and President's word now in justified paragraphs. +- New ornaments color handling. +- Better banner. +- `\maketitle` can now hide the blue rule and bullet, the title and the title in + the toc. +- Extension of `\printbibliography` features to `\bibbycategory`. +- Boxed issue number title changed in case of special editions. + # [1.1.3] - 2022-06-13 ## Added diff --git a/Master/texmf-dist/doc/latex/gzt/README.md b/Master/texmf-dist/doc/latex/gzt/README.md index 8b0bc295134..fed74a2061b 100644 --- a/Master/texmf-dist/doc/latex/gzt/README.md +++ b/Master/texmf-dist/doc/latex/gzt/README.md @@ -1,4 +1,3 @@ -| -------:| ----------------------------------------------------------------- gzt:| Bundle of two classes and BibLaTeX styles for the French journal “La Gazette de la Société Mathématique de France” Author:| Denis Bitouzé diff --git a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf index 0309184cb8e..121ef89e0e8 100644 Binary files a/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf and b/Master/texmf-dist/doc/latex/gzt/french/gzt-fr.pdf differ diff --git a/Master/texmf-dist/source/latex/gzt/gzt.dtx b/Master/texmf-dist/source/latex/gzt/gzt.dtx index cea642f47b5..10f2b0e6902 100644 --- a/Master/texmf-dist/source/latex/gzt/gzt.dtx +++ b/Master/texmf-dist/source/latex/gzt/gzt.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% File: gzt.dtx Copyright (C) 2014-2022 by +% File: gzt.dtx Copyright (C) 2014-2024 by % Denis Bitouzé % % It may be distributed and/or modified under the conditions of the @@ -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.3 2022-06-13} +\version{1.1.4 2024-03-09} % ------------------------------------------------------------------------- % This field contains the name of the author(s). % The value is optional. @@ -214,6 +214,21 @@ France”](https://smf.emath.fr/les-publications/la-gazette): % \end{macrocode} # [Unreleased] +# [1.1.4] - 2024-03-09 + +## Fixed +Some color changing in breakable boxes may not survive the break to the next +box. + +## Changed +- Editorial and President's word now in justified paragraphs. +- New ornaments color handling. +- Better banner. +- `\maketitle` can now hide the blue rule and bullet, the title and the title in + the toc. +- Extension of `\printbibliography` features to `\bibbycategory`. +- Boxed issue number title changed in case of special editions. + # [1.1.3] - 2022-06-13 ## Added @@ -307,7 +322,6 @@ All bibliographic numeric labels equal 0 % \end{macrocode} % %<*readme> -| -------:| ----------------------------------------------------------------- gzt:| Bundle of two classes and BibLaTeX styles for the French journal “La Gazette de la Société Mathématique de France” Author:| Denis Bitouzé @@ -335,8 +349,8 @@ Gazette de la Société Mathématique de France”](https://smf.emath.fr/les-pub \fi % %<*class|class-article|install> -\def\gztfileversion{1.1.3} -\def\gztfiledate{2022-06-13} +\def\gztfileversion{1.1.4} +\def\gztfiledate{2024-03-09} % %<*install> \input l3docstrip.tex @@ -352,7 +366,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later \endpreamble \postamble -Copyright (C) 2014-2021 by Denis Bitouzé +Copyright (C) 2014-2024 by Denis Bitouzé This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -992,10 +1006,10 @@ Running "make install" installs the files in the local TeX tree. % {gztarticle} {\gztfiledate} {\gztfileversion} - { - SMF~ class~ for~ the~ French~ journal^^J - "La~ Gazette~ de~ la~ Soci'et'e~ Math'ematique~ de~ France". -%~ (Author~ version.) + {% + SMF class for the French journal^^J + “La Gazette de la Société Mathématique de France”. +% (Author version.) } % \end{macrocode} % @@ -1096,6 +1110,11 @@ Running "make install" installs the files in the local TeX tree. }, output / web .code:n = { }, + maindarkcolor .code:n = { + \AddToHook{begindocument/before}{ + \definecolor{@@_generic_dark_color}{cmyk}{#1} + } + }, specialedition .code:n = { \bool_gset_true:N \g_@@_special_edition_bool \bool_gset_true:N \g_@@_frontcover_without_minitoc_bool @@ -1104,6 +1123,11 @@ 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 / ornaments~ color .code:n = { + \AddToHook{begindocument/before}{ + \definecolor{@@_generic_dark_color}{cmyk}{#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 = { @@ -2726,7 +2750,9 @@ Running "make install" installs the files in the local TeX tree. { short .tl_gset:N = \g_@@_short_title_tl, minishort .tl_gset:N = \g_@@_mini_short_title_tl, + notinarticle .bool_gset:N = \g_@@_title_not_in_article_bool, notintoc .bool_gset:N = \g_@@_title_not_in_toc_bool, + without~ rule .bool_gset:N = \g_@@_title_without_rule_bool, % \end{macrocode} % % The following options, when used, must receive a value. @@ -2755,6 +2781,7 @@ Running "make install" installs the files in the local TeX tree. { short .tl_gset:N = \g_@@_short_subtitle_tl, minishort .tl_gset:N = \g_@@_mini_short_subtitle_tl, + notinarticle .bool_gset:N = \g_@@_subtitle_not_in_article_bool, notintoc .bool_gset:N = \g_@@_subtitle_not_in_toc_bool, % \end{macrocode} % @@ -2772,6 +2799,7 @@ Running "make install" installs the files in the local TeX tree. \keys_define:nn { gzt/rubric } { abstract .tl_gset:N = \g_@@_rubric_abstract_tl, + header .tl_gset:N = \g_@@_rubric_header_tl, title .tl_gset:N = \g_@@_rubric_title_tl, pictogram .tl_gset:N = \g_@@_rubric_pictofile_tl, % \end{macrocode} @@ -2955,54 +2983,54 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \begin{macrocode} -\definecolorset{cmyk}{@@_}{_color}{ - generic_dark,1,.60,.10,0; % kind of blue (!) - light_generic_dark,1,.35,0,0 % kind of blue (!), light -} -\colorlet{@@_generic_light_color}{black!50} -\colorlet{@@_dark_generic_light_color}{black!60} -\colorlet{@@_description_label_light_color}{@@_dark_generic_light_color} -\colorlet{@@_minitoc_color}{@@_generic_light_color} -\colorlet{@@_cover_itemize_label_color}{@@_light_generic_dark_color} -\colorlet{@@_default_text_color}{black} -\colorlet{@@_head_text_color}{black!65} -\colorlet{@@_rubric_head_text_color}{@@_head_text_color} -\colorlet{@@_bibliography_minibios_acknowledgements_bg_color}{black!10} -\colorlet{@@_headrule_color}{@@_generic_light_color!65} -\colorlet{@@_circlerule_color}{@@_generic_dark_color!65} -\colorlet{@@_frontmatter_text_color}{black!75} -\colorlet{@@_people_color}{@@_generic_dark_color} -\colorlet{@@_arrayrule_color}{@@_generic_dark_color} -\colorlet{@@_acknowledgements_color}{@@_generic_dark_color} -\colorlet{@@_question_color}{@@_generic_dark_color} -\colorlet{@@_boxed_issue_number_bg_color}{@@_generic_dark_color} -\colorlet{@@_rule_in_toc_color}{@@_generic_dark_color} -\colorlet{@@_rubric_in_toc_color}{@@_generic_dark_color} -\colorlet{@@_article_in_toc_color}{@@_frontmatter_text_color} -\colorlet{@@_rubric_title_color}{@@_generic_light_color} -\colorlet{@@_article_title_color}{@@_generic_dark_color} -\colorlet{@@_section_color}{@@_generic_dark_color} -\colorlet{@@_subsection_color}{@@_generic_dark_color!90} -\colorlet{@@_subsubsection_color}{@@_generic_dark_color!80} -\colorlet{@@_rubric_abstract_color}{@@_generic_dark_color} -\colorlet{@@_article_abstract_color}{@@_generic_light_color} -\colorlet{@@_dotfill_color}{@@_generic_dark_color} -\colorlet{@@_about_frontcover_title_color}{@@_generic_dark_color} -\colorlet{@@_reflected_text_color}{@@_generic_dark_color} -\colorlet{@@_inside_frontcover_frame_bg_color}{@@_generic_dark_color!8} -\colorlet{@@_inside_frontcover_frame_title_color}{@@_generic_dark_color} -\colorlet{@@_footer_bg_color}{black!10} -\colorlet{@@_float_title_color}{@@_generic_dark_color} -\colorlet{@@_float_title_bg_color}{@@_generic_dark_color!10} -\colorlet{@@_float_frame_color}{@@_generic_dark_color!20} -\colorlet{@@_chapter_color}{@@_generic_dark_color} -\colorlet{@@_smf_number_color}{@@_generic_dark_color} -\colorlet{@@_date_color}{@@_generic_light_color} -\colorlet{@@_table_head_color}{@@_generic_dark_color!25} -\colorlet{@@_book_review_frame_bg_color}{@@_generic_dark_color!8} -\colorlet{@@_book_advertisement_bg_color}{white} -\colorlet{@@_book_advertisement_frame_color}{@@_generic_dark_color} -\colorlet{@@_default_cover_color}{white} +\definecolor{@@_generic_dark_color}{cmyk}{1,.60,.10,0} +% +\AddToHook{begindocument}{ + \colorlet{@@_generic_light_color}{black!50} + \colorlet{@@_dark_generic_light_color}{black!60} + \colorlet{@@_description_label_light_color}{@@_dark_generic_light_color} + \colorlet{@@_minitoc_color}{@@_generic_light_color} + \colorlet{@@_cover_itemize_label_color}{@@_generic_dark_color} + \colorlet{@@_default_text_color}{black} + \colorlet{@@_head_text_color}{black!65} + \colorlet{@@_rubric_head_text_color}{@@_head_text_color} + \colorlet{@@_bibliography_minibios_acknowledgements_bg_color}{black!10} + \colorlet{@@_headrule_color}{@@_generic_light_color!65} + \colorlet{@@_circlerule_color}{@@_generic_dark_color!65} + \colorlet{@@_frontmatter_text_color}{black!75} + \colorlet{@@_people_color}{@@_generic_dark_color} + \colorlet{@@_arrayrule_color}{@@_generic_dark_color} + \colorlet{@@_acknowledgements_color}{@@_generic_dark_color} + \colorlet{@@_question_color}{@@_generic_dark_color} + \colorlet{@@_boxed_issue_number_bg_color}{@@_generic_dark_color} + \colorlet{@@_rule_in_toc_color}{@@_generic_dark_color} + \colorlet{@@_rubric_in_toc_color}{@@_generic_dark_color} + \colorlet{@@_article_in_toc_color}{@@_frontmatter_text_color} + \colorlet{@@_rubric_title_color}{@@_generic_light_color} + \colorlet{@@_article_title_color}{@@_generic_dark_color} + \colorlet{@@_section_color}{@@_generic_dark_color} + \colorlet{@@_subsection_color}{@@_generic_dark_color!90} + \colorlet{@@_subsubsection_color}{@@_generic_dark_color!80} + \colorlet{@@_rubric_abstract_color}{@@_generic_dark_color} + \colorlet{@@_article_abstract_color}{@@_generic_light_color} + \colorlet{@@_dotfill_color}{@@_generic_dark_color} + \colorlet{@@_about_frontcover_title_color}{@@_generic_dark_color} + \colorlet{@@_reflected_text_color}{@@_generic_dark_color} + \colorlet{@@_inside_frontcover_frame_bg_color}{@@_generic_dark_color!8} + \colorlet{@@_inside_frontcover_frame_title_color}{@@_generic_dark_color} + \colorlet{@@_footer_bg_color}{black!10} + \colorlet{@@_float_title_color}{@@_generic_dark_color} + \colorlet{@@_float_title_bg_color}{@@_generic_dark_color!10} + \colorlet{@@_float_frame_color}{@@_generic_dark_color!20} + \colorlet{@@_chapter_color}{@@_generic_dark_color} + \colorlet{@@_smf_number_color}{@@_generic_dark_color} + \colorlet{@@_date_color}{@@_generic_light_color} + \colorlet{@@_table_head_color}{@@_generic_dark_color!25} + \colorlet{@@_book_review_frame_bg_color}{@@_generic_dark_color!8} + \colorlet{@@_book_advertisement_bg_color}{white} + \colorlet{@@_book_advertisement_frame_color}{@@_generic_dark_color} + \colorlet{@@_default_cover_color}{white} +} % \end{macrocode} % % \begin{macrocode} @@ -3986,7 +4014,9 @@ Running "make install" installs the files in the local TeX tree. \int_gincr:N \g_@@_articles_int \tl_gclear:N \g_@@_short_title_tl \tl_gclear:N \g_@@_short_subtitle_tl + \bool_gset_false:N \g_@@_title_not_in_article_bool \bool_gset_false:N \g_@@_title_not_in_toc_bool + \bool_gset_false:N \g_@@_title_without_rule_bool \IfNoValueF {#1} { \keys_set:nn { gzt/title } { #1 } @@ -4139,6 +4169,7 @@ Running "make install" installs the files in the local TeX tree. { \newpage \tl_gclear:N \g_@@_rubric_abstract_tl + \tl_gclear:N \g_@@_rubric_header_tl \tl_gset:Nn \g_@@_rubric_title_tl {#2} \file_if_exist:nTF { #3.pdf }{ \tl_gset:Nn \g_@@_rubric_pictofile_tl {#3} @@ -4373,6 +4404,20 @@ Running "make install" installs the files in the local TeX tree. \RenewDocumentCommand \maketitle { s } { % \end{macrocode} % +% % We add to this command some options that let us specify: +% % \begin{itemize} +% % \item whether the blue rule and bullet is displayed or not at the beginning of +% % the article, +% % \item whether the title is visible or not at the beginning of the article, +% % \item whether the title is visible or not in the ToC. +% % \end{itemize} +% % \begin{macrocode} +% \IfNoValueF {#1} +% { +% \keys_set:nn { gzt/maketitle } { #1 } +% } +% % \end{macrocode} +% % We force all the previous floats to be processed before a new article starts % (this is already done in ×bibliography_minibiographies_acknowledgements× % environment but is repeated here if what is before provides floats but neither @@ -4530,8 +4575,9 @@ Running "make install" installs the files in the local TeX tree. } \tl_set:Nn \l_@@_title_box_tl { - \noindent \bool_if:NF {\g_@@_invisible_titles_bool} { + \noindent + % \bool_show:N \g_@@_title_not_in_article_bool \hspace*{18mm} \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} \raggedright @@ -4546,46 +4592,8 @@ Running "make install" installs the files in the local TeX tree. \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: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 \l_@@_people_first_last_names_tl || - \g_@@_interview_rubric_bool || - \g_@@_rearviewmirror_rubric_bool - }{ - \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} - } - } - } - } - } - \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 } % { @@ -4616,20 +4624,18 @@ Running "make install" installs the files in the local TeX tree. } { \color{@@_people_color} - \bool_if:NTF {\g_@@_invisible_titles_bool} { - \nocite {\g__gzt_article_bib_key_tl} - }{ + \bool_if:NF {\g_@@_invisible_titles_bool} { \_@@_itemized_citeauthor:n {\g_@@_article_bib_key_tl} } } \bool_if:NF {\g_@@_invisible_titles_bool} { - \end{adjustbox} - } - } - \bool_if:nTF { - \int_compare_p:nNn { \g_@@_item_in_rubric_int } = { 1 } + \end{adjustbox} } - { + } + \bool_if:nTF { + \int_compare_p:nNn { \g_@@_item_in_rubric_int } = { 1 } + } + { \mbox{} \par \bool_if:nTF { @@ -4682,12 +4688,12 @@ Running "make install" installs the files in the local TeX tree. % % We fix some of the PDF's metadata . % \begin{macrocode} -\bool_if:NT {\g_@@_for_authors_bool} { - \hypersetup{ - pdftitle=\g_@@_short_title_tl, - pdfauthor=\l_@@_people_first_last_names_tl - } -} + \bool_if:NT {\g_@@_for_authors_bool} { + \hypersetup{ + pdftitle=\g_@@_short_title_tl, + pdfauthor=\l_@@_people_first_last_names_tl + } + } % \end{macrocode} % % Here, we put the \pkg{TikZ}'s picture of the \enquote{bullet and rule} @@ -4695,19 +4701,21 @@ Running "make install" installs the files in the local TeX tree. % follows a ×\cleaders× that makes the whole vanishes at pages boundaries % (cf. \url{https://tex.stackexchange.com/a/31615/18401}). % \begin{macrocode} - \bool_if:nF { \g_@@_for_authors_bool } { - % \xleaders\vbox { - % \bigskip - % } - % \vskip\bigskipamount - \noindent - \checkoddpage - \ifoddpage - \l_@@_bullet_and_rule_odd_tl - \else - \l_@@_bullet_and_rule_even_tl - \fi - \bigskip + \bool_if:nF { \g_@@_for_authors_bool } { + \bool_if:NF {\g_@@_title_without_rule_bool} { + % \xleaders\vbox { + % \bigskip + % } + % \vskip\bigskipamount + \noindent + \checkoddpage + \ifoddpage + \l_@@_bullet_and_rule_odd_tl + \else + \l_@@_bullet_and_rule_even_tl + \fi + \bigskip + } } \par \nopagebreak[4] @@ -4722,52 +4730,91 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % % \begin{macrocode} - \l_@@_title_box_tl - \normalsize - \nopagebreak[3] - \bool_if:nF { - \tl_if_empty_p:N \g_@@_abstract_body_tl - && - ( - \tl_if_empty_p:N \l_@@_people_first_last_names_tl || - \g_@@_interview_rubric_bool || - \g_@@_rearviewmirror_rubric_bool - ) - }{ - \par - \bigskip - \bigskip - \large - \mbox{} - \checkoddpage - \ifoddpage - \l_@@_abstract_box_tl - \hspace*{11mm} - \l_@@_authors_box_tl - \else - \hspace*{-.85\c_@@_outermargin_dim} - \l_@@_authors_box_tl - \hspace*{11mm} - \l_@@_abstract_box_tl - \fi - } - \tl_gclear:N \g_@@_title_tl - \tl_gclear:N \g_@@_subtitle_tl - \tl_gclear:N \g_@@_abstract_body_tl - \normalsize - \bigskip - \tl_if_empty:NF \g_@@_abstract_body_tl - % { - % \tl_if_empty:NF \l_@@_people_first_last_names_tl - % { - % \bigskip - % } - % } - { + \nocite {\g__gzt_article_bib_key_tl} + \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 \l_@@_people_first_last_names_tl || + \g_@@_interview_rubric_bool || + \g_@@_rearviewmirror_rubric_bool + }{ + \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} + } + } + } + } + } + \bool_if:NF {\g_@@_title_not_in_article_bool} { + \l_@@_title_box_tl + \normalsize + \nopagebreak[3] + \bool_if:nF { + \tl_if_empty_p:N \g_@@_abstract_body_tl + && + ( + \tl_if_empty_p:N \l_@@_people_first_last_names_tl || + \g_@@_interview_rubric_bool || + \g_@@_rearviewmirror_rubric_bool + ) + }{ + \par + \bigskip + \bigskip + \large + \mbox{} + \checkoddpage + \ifoddpage + \l_@@_abstract_box_tl + \hspace*{11mm} + \l_@@_authors_box_tl + \else + \hspace*{-.85\c_@@_outermargin_dim} + \l_@@_authors_box_tl + \hspace*{11mm} + \l_@@_abstract_box_tl + \fi + } + } + \tl_gclear:N \g_@@_title_tl + \tl_gclear:N \g_@@_subtitle_tl + \tl_gclear:N \g_@@_abstract_body_tl + \normalsize \bigskip - } - \bool_if:nT \g_@@_interview_rubric_bool - { + \tl_if_empty:NF \g_@@_abstract_body_tl + % { + % \tl_if_empty:NF \l_@@_people_first_last_names_tl + % { + % \bigskip + % } + % } + { + \bigskip + } + \bool_if:nT \g_@@_interview_rubric_bool + { % \end{macrocode} % % We set ×\parindent× to zero in \enquote{Interview} rubric. @@ -4852,20 +4899,23 @@ Running "make install" installs the files in the local TeX tree. \edef\toctablepiece { \ExceptFirstPart {\noexpand\\[-1.5mm]} \unexpanded{ - \color{@@_rubric_in_toc_color}\scshape\fontseries{bx}\selectfont + \protect\leavevmode\color{@@_rubric_in_toc_color}% + \scshape\fontseries{bx}\selectfont } \unexpanded\expandafter{\etocthelinkedname}& % \ifShowPartPageInToc - \unexpanded{\bfseries\color{@@_rubric_in_toc_color}} + \unexpanded{\bfseries% + \protect\leavevmode\color{@@_rubric_in_toc_color}% + } \unexpanded\expandafter{\etocthelinkedpage} % \fi \noexpand\\} \gdef\ExceptFirstPart ##1{##1} } \newcommand*\PrepareChapter{ - \edef\toctablepiece { - \unexpanded{\color{@@_article_in_toc_color}\small} - \unexpanded\expandafter{\etocthelinkedname}& + \edef\toctablepiece {\begingroup + \unexpanded{\small\color{@@_article_in_toc_color}} + \unexpanded\expandafter{\etocthelinkedname}\endgroup& \unexpanded{\color{@@_article_in_toc_color}\small} \unexpanded\expandafter{\etocthelinkedpage} \noexpand\\[1mm]} @@ -4913,6 +4963,7 @@ Running "make install" installs the files in the local TeX tree. \tl_gset:Nn \g_@@_boxed_issue_number_tl { \tcbox{\Large\No\g_@@_issue_number_int} } +\tl_new:N \l_@@_boxed_issue_number_title_tl \cs_new_protected:Nn \@@_boxed_issue_number:nn { \noindent @@ -4926,14 +4977,14 @@ Running "make install" installs the files in the local TeX tree. } } \bool_if:NTF {\g_@@_special_edition_bool} { - \tl_set:Nn \l_tmpa_tl {\c_@@_short_special_edition_string_tl} + \tl_set:Nn \l_@@_boxed_issue_number_title_tl {\c_@@_short_special_edition_string_tl} }{ - \tl_set:Nn \l_tmpa_tl {\No\int_use:N\g_@@_issue_number_int} + \tl_set:Nn \l_@@_boxed_issue_number_title_tl {\No\int_use:N\g_@@_issue_number_int} } \begin{adjustbox}{valign=t} \begin{tcolorbox}[ enhanced, - title=\l_tmpa_tl,%\int_use:N \g_@@_issue_number_int, + title=\l_@@_boxed_issue_number_title_tl,%\int_use:N \g_@@_issue_number_int, fonttitle=\Large, colback=white, sharp~ corners=all, @@ -4985,7 +5036,6 @@ Running "make install" installs the files in the local TeX tree. \@@_boxed_issue_number:nn {#1}{#2} \color{@@_frontmatter_text_color} \fontsize{11}{13.6}\selectfont - \RaggedRight } \cs_new_protected:Nn \_@@_after_editorial_presidentmessage: { @@ -5910,9 +5960,14 @@ Running "make install" installs the files in the local TeX tree. ] [ \adjustbox{raise={\c_@@_header_yshift_dim}{\height}}{ - \large\bfseries\scshape\color{@@_head_text_color}\g_@@_rubric_title_tl + \large\bfseries\scshape\color{@@_head_text_color} + \tl_if_empty:NTF \g_@@_rubric_header_tl { + \g_@@_rubric_title_tl + }{ + \g_@@_rubric_header_tl } - ] + } + ] [] {} { @@ -5980,11 +6035,15 @@ Running "make install" installs the files in the local TeX tree. % acknowledgements. % \begin{macrocode} \FloatBarrier - \begin{_@@_minibiographies_acknowledgements_tcbox} \nopagebreak[0] - \IfBooleanF {#1} + \IfBooleanTF {#1} { - \@@_display_people_by_role:n { author-art-\int_use:N \g_@@_articles_int } + \tl_if_empty:NF \l_@@_article_acknowledgements_tl { + \begin{_@@_minibiographies_acknowledgements_tcbox} + } + }{ + \begin{_@@_minibiographies_acknowledgements_tcbox} + \@@_display_people_by_role:n { author-art-\int_use:N \g_@@_articles_int } } \DTLsavelastrowcount{\_@@_authors_number} \tl_if_empty:NF \l_@@_article_acknowledgements_tl @@ -6002,7 +6061,14 @@ Running "make install" installs the files in the local TeX tree. \end{adjustbox} } \bool_gset_true:N \g_@@_previous_article_with_bibliography_or_minibio_bool - \end{_@@_minibiographies_acknowledgements_tcbox} + \IfBooleanTF {#1} + { + \tl_if_empty:NF \l_@@_article_acknowledgements_tl { + \end{_@@_minibiographies_acknowledgements_tcbox} + } + }{ + \end{_@@_minibiographies_acknowledgements_tcbox} + } } % \end{macrocode} % \end{macro} @@ -6042,6 +6108,33 @@ Running "make install" installs the files in the local TeX tree. \printminibios } } +\cs_set_eq:NN \_@@_bibbycategory \bibbycategory +\RenewDocumentCommand \bibbycategory { s O{} } { + \bool_if:NT {\g_@@_multicols_bool} { + \end{multicols} + } +% \end{macrocode} +% We force all the previous floats to be processed no later on the page +% following the beginning of the bibliography, \textsc{cv} or +% acknowledgements. +% \begin{macrocode} +% \afterpage{ + \FloatBarrier +% } + \begin{_@@_bibliography_tcbox} + \defbibheading{bibliography}{% + \section*{Références}} + \printbibheading + \_@@_bibbycategory[#2] + \end{_@@_bibliography_tcbox} + \nopagebreak[0] + \IfBooleanTF {#1} + { + \printminibios* + }{ + \printminibios + } +} % \end{macrocode} % \end{macro} % @@ -6513,7 +6606,7 @@ Running "make install" installs the files in the local TeX tree. columns=flexible, inputencoding=utf8/latin1 } -\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ @@_light_generic_dark_color!8}{#1} +\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ @@_generic_dark_color!8}{#1} % \end{macrocode} % % The optional argument declaration must be prefixed with an ×!× (see @@ -6970,6 +7063,7 @@ Running "make install" installs the files in the local TeX tree. enhanced, colback=@@_book_review_frame_bg_color, breakable, + use~ color~ stack, % height=50mm, boxrule=\c_zero_dim, sharp~ corners=all, @@ -7048,6 +7142,7 @@ Running "make install" installs the files in the local TeX tree. _@@_tcb_bibliography_style/.style={ colback=@@_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, sharp~ corners=all, enhanced @@ -7057,6 +7152,7 @@ Running "make install" installs the files in the local TeX tree. _@@_tcb_minibiographies_acknowledgements_style/.style={ colback=@@_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, extras~ unbroken~ and~ last={drop~ lifted~ shadow}, sharp~ corners=all, diff --git a/Master/texmf-dist/tex/latex/gzt/gzt.cls b/Master/texmf-dist/tex/latex/gzt/gzt.cls index e26f26ac702..6d6c5d8ab58 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.3} -\def\gztfiledate{2022-06-13} +\def\gztfileversion{1.1.4} +\def\gztfiledate{2024-03-09} \def\sectioncommandslist{} \let\saved@ifdefinable\@ifdefinable \let\saved@@ifdefinable\@@ifdefinable @@ -82,9 +82,9 @@ {gzt} {\gztfiledate} {\gztfileversion} - { - SMF~ class~ for~ the~ French~ journal^^J - "La~ Gazette~ de~ la~ Soci'et'e~ Math'ematique~ de~ France". + {% + SMF class for the French journal^^J + “La Gazette de la Société Mathématique de France”. } \NeedsTeXFormat{LaTeX2e} \bool_new:N \g__gzt_moral_report_bool @@ -143,6 +143,11 @@ }, output / web .code:n = { }, + maindarkcolor .code:n = { + \AddToHook{begindocument/before}{ + \definecolor{__gzt_generic_dark_color}{cmyk}{#1} + } + }, specialedition .code:n = { \bool_gset_true:N \g__gzt_special_edition_bool \bool_gset_true:N \g__gzt_frontcover_without_minitoc_bool @@ -151,6 +156,11 @@ specialedition / color .code:n = { \tl_gset:Nn \g__gzt_special_edition_color_tl {#1} }, + specialedition / ornaments~ color .code:n = { + \AddToHook{begindocument/before}{ + \definecolor{__gzt_generic_dark_color}{cmyk}{#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 = { @@ -872,7 +882,9 @@ { short .tl_gset:N = \g__gzt_short_title_tl, minishort .tl_gset:N = \g__gzt_mini_short_title_tl, + notinarticle .bool_gset:N = \g__gzt_title_not_in_article_bool, notintoc .bool_gset:N = \g__gzt_title_not_in_toc_bool, + without~ rule .bool_gset:N = \g__gzt_title_without_rule_bool, short .value_required:n = true, minishort .value_required:n = true, } @@ -880,6 +892,7 @@ { short .tl_gset:N = \g__gzt_short_subtitle_tl, minishort .tl_gset:N = \g__gzt_mini_short_subtitle_tl, + notinarticle .bool_gset:N = \g__gzt_subtitle_not_in_article_bool, notintoc .bool_gset:N = \g__gzt_subtitle_not_in_toc_bool, short .value_required:n = true, minishort .value_required:n = true, @@ -887,6 +900,7 @@ \keys_define:nn { gzt/rubric } { abstract .tl_gset:N = \g__gzt_rubric_abstract_tl, + header .tl_gset:N = \g__gzt_rubric_header_tl, title .tl_gset:N = \g__gzt_rubric_title_tl, pictogram .tl_gset:N = \g__gzt_rubric_pictofile_tl, abstract .value_required:n = true, @@ -964,54 +978,53 @@ { theorem~ or~ definition~ or~ proof } { \exp_not:n {#1} } } -\definecolorset{cmyk}{__gzt_}{_color}{ - generic_dark,1,.60,.10,0; % kind of blue (!) - light_generic_dark,1,.35,0,0 % kind of blue (!), light -} -\colorlet{__gzt_generic_light_color}{black!50} -\colorlet{__gzt_dark_generic_light_color}{black!60} -\colorlet{__gzt_description_label_light_color}{__gzt_dark_generic_light_color} -\colorlet{__gzt_minitoc_color}{__gzt_generic_light_color} -\colorlet{__gzt_cover_itemize_label_color}{__gzt_light_generic_dark_color} -\colorlet{__gzt_default_text_color}{black} -\colorlet{__gzt_head_text_color}{black!65} -\colorlet{__gzt_rubric_head_text_color}{__gzt_head_text_color} -\colorlet{__gzt_bibliography_minibios_acknowledgements_bg_color}{black!10} -\colorlet{__gzt_headrule_color}{__gzt_generic_light_color!65} -\colorlet{__gzt_circlerule_color}{__gzt_generic_dark_color!65} -\colorlet{__gzt_frontmatter_text_color}{black!75} -\colorlet{__gzt_people_color}{__gzt_generic_dark_color} -\colorlet{__gzt_arrayrule_color}{__gzt_generic_dark_color} -\colorlet{__gzt_acknowledgements_color}{__gzt_generic_dark_color} -\colorlet{__gzt_question_color}{__gzt_generic_dark_color} -\colorlet{__gzt_boxed_issue_number_bg_color}{__gzt_generic_dark_color} -\colorlet{__gzt_rule_in_toc_color}{__gzt_generic_dark_color} -\colorlet{__gzt_rubric_in_toc_color}{__gzt_generic_dark_color} -\colorlet{__gzt_article_in_toc_color}{__gzt_frontmatter_text_color} -\colorlet{__gzt_rubric_title_color}{__gzt_generic_light_color} -\colorlet{__gzt_article_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_section_color}{__gzt_generic_dark_color} -\colorlet{__gzt_subsection_color}{__gzt_generic_dark_color!90} -\colorlet{__gzt_subsubsection_color}{__gzt_generic_dark_color!80} -\colorlet{__gzt_rubric_abstract_color}{__gzt_generic_dark_color} -\colorlet{__gzt_article_abstract_color}{__gzt_generic_light_color} -\colorlet{__gzt_dotfill_color}{__gzt_generic_dark_color} -\colorlet{__gzt_about_frontcover_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_reflected_text_color}{__gzt_generic_dark_color} -\colorlet{__gzt_inside_frontcover_frame_bg_color}{__gzt_generic_dark_color!8} -\colorlet{__gzt_inside_frontcover_frame_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_footer_bg_color}{black!10} -\colorlet{__gzt_float_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_float_title_bg_color}{__gzt_generic_dark_color!10} -\colorlet{__gzt_float_frame_color}{__gzt_generic_dark_color!20} -\colorlet{__gzt_chapter_color}{__gzt_generic_dark_color} -\colorlet{__gzt_smf_number_color}{__gzt_generic_dark_color} -\colorlet{__gzt_date_color}{__gzt_generic_light_color} -\colorlet{__gzt_table_head_color}{__gzt_generic_dark_color!25} -\colorlet{__gzt_book_review_frame_bg_color}{__gzt_generic_dark_color!8} -\colorlet{__gzt_book_advertisement_bg_color}{white} -\colorlet{__gzt_book_advertisement_frame_color}{__gzt_generic_dark_color} -\colorlet{__gzt_default_cover_color}{white} +\definecolor{__gzt_generic_dark_color}{cmyk}{1,.60,.10,0} +\AddToHook{begindocument}{ + \colorlet{__gzt_generic_light_color}{black!50} + \colorlet{__gzt_dark_generic_light_color}{black!60} + \colorlet{__gzt_description_label_light_color}{__gzt_dark_generic_light_color} + \colorlet{__gzt_minitoc_color}{__gzt_generic_light_color} + \colorlet{__gzt_cover_itemize_label_color}{__gzt_generic_dark_color} + \colorlet{__gzt_default_text_color}{black} + \colorlet{__gzt_head_text_color}{black!65} + \colorlet{__gzt_rubric_head_text_color}{__gzt_head_text_color} + \colorlet{__gzt_bibliography_minibios_acknowledgements_bg_color}{black!10} + \colorlet{__gzt_headrule_color}{__gzt_generic_light_color!65} + \colorlet{__gzt_circlerule_color}{__gzt_generic_dark_color!65} + \colorlet{__gzt_frontmatter_text_color}{black!75} + \colorlet{__gzt_people_color}{__gzt_generic_dark_color} + \colorlet{__gzt_arrayrule_color}{__gzt_generic_dark_color} + \colorlet{__gzt_acknowledgements_color}{__gzt_generic_dark_color} + \colorlet{__gzt_question_color}{__gzt_generic_dark_color} + \colorlet{__gzt_boxed_issue_number_bg_color}{__gzt_generic_dark_color} + \colorlet{__gzt_rule_in_toc_color}{__gzt_generic_dark_color} + \colorlet{__gzt_rubric_in_toc_color}{__gzt_generic_dark_color} + \colorlet{__gzt_article_in_toc_color}{__gzt_frontmatter_text_color} + \colorlet{__gzt_rubric_title_color}{__gzt_generic_light_color} + \colorlet{__gzt_article_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_section_color}{__gzt_generic_dark_color} + \colorlet{__gzt_subsection_color}{__gzt_generic_dark_color!90} + \colorlet{__gzt_subsubsection_color}{__gzt_generic_dark_color!80} + \colorlet{__gzt_rubric_abstract_color}{__gzt_generic_dark_color} + \colorlet{__gzt_article_abstract_color}{__gzt_generic_light_color} + \colorlet{__gzt_dotfill_color}{__gzt_generic_dark_color} + \colorlet{__gzt_about_frontcover_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_reflected_text_color}{__gzt_generic_dark_color} + \colorlet{__gzt_inside_frontcover_frame_bg_color}{__gzt_generic_dark_color!8} + \colorlet{__gzt_inside_frontcover_frame_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_footer_bg_color}{black!10} + \colorlet{__gzt_float_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_float_title_bg_color}{__gzt_generic_dark_color!10} + \colorlet{__gzt_float_frame_color}{__gzt_generic_dark_color!20} + \colorlet{__gzt_chapter_color}{__gzt_generic_dark_color} + \colorlet{__gzt_smf_number_color}{__gzt_generic_dark_color} + \colorlet{__gzt_date_color}{__gzt_generic_light_color} + \colorlet{__gzt_table_head_color}{__gzt_generic_dark_color!25} + \colorlet{__gzt_book_review_frame_bg_color}{__gzt_generic_dark_color!8} + \colorlet{__gzt_book_advertisement_bg_color}{white} + \colorlet{__gzt_book_advertisement_frame_color}{__gzt_generic_dark_color} + \colorlet{__gzt_default_cover_color}{white} +} \AddToHook{env/multicols/begin}{ \bool_gset_true:N \g__gzt_multicols_bool } @@ -1718,7 +1731,9 @@ \int_gincr:N \g__gzt_articles_int \tl_gclear:N \g__gzt_short_title_tl \tl_gclear:N \g__gzt_short_subtitle_tl + \bool_gset_false:N \g__gzt_title_not_in_article_bool \bool_gset_false:N \g__gzt_title_not_in_toc_bool + \bool_gset_false:N \g__gzt_title_without_rule_bool \IfNoValueF {#1} { \keys_set:nn { gzt/title } { #1 } @@ -1811,6 +1826,7 @@ { \newpage \tl_gclear:N \g__gzt_rubric_abstract_tl + \tl_gclear:N \g__gzt_rubric_header_tl \tl_gset:Nn \g__gzt_rubric_title_tl {#2} \file_if_exist:nTF { #3.pdf }{ \tl_gset:Nn \g__gzt_rubric_pictofile_tl {#3} @@ -2074,8 +2090,9 @@ } \tl_set:Nn \l__gzt_title_box_tl { - \noindent \bool_if:NF {\g__gzt_invisible_titles_bool} { + \noindent + % \bool_show:N \g__gzt_title_not_in_article_bool \hspace*{18mm} \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} \raggedright @@ -2090,46 +2107,8 @@ \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: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 \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - }{ - \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} - } - } - } - } - } - \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 } % { @@ -2160,20 +2139,18 @@ } { \color{__gzt_people_color} - \bool_if:NTF {\g__gzt_invisible_titles_bool} { - \nocite {\g__gzt_article_bib_key_tl} - }{ + \bool_if:NF {\g__gzt_invisible_titles_bool} { \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} } } \bool_if:NF {\g__gzt_invisible_titles_bool} { - \end{adjustbox} - } - } - \bool_if:nTF { - \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } + \end{adjustbox} } - { + } + \bool_if:nTF { + \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } + } + { \mbox{} \par \bool_if:nTF { @@ -2210,74 +2187,115 @@ } } \bool_gset_false:N \g__gzt_previous_article_with_bibliography_or_minibio_bool -\bool_if:NT {\g__gzt_for_authors_bool} { - \hypersetup{ - pdftitle=\g__gzt_short_title_tl, - pdfauthor=\l__gzt_people_first_last_names_tl - } -} - \bool_if:nF { \g__gzt_for_authors_bool } { - % \xleaders\vbox { - % \bigskip - % } - % \vskip\bigskipamount - \noindent - \checkoddpage - \ifoddpage - \l__gzt_bullet_and_rule_odd_tl - \else - \l__gzt_bullet_and_rule_even_tl - \fi - \bigskip + \bool_if:NT {\g__gzt_for_authors_bool} { + \hypersetup{ + pdftitle=\g__gzt_short_title_tl, + pdfauthor=\l__gzt_people_first_last_names_tl + } + } + \bool_if:nF { \g__gzt_for_authors_bool } { + \bool_if:NF {\g__gzt_title_without_rule_bool} { + % \xleaders\vbox { + % \bigskip + % } + % \vskip\bigskipamount + \noindent + \checkoddpage + \ifoddpage + \l__gzt_bullet_and_rule_odd_tl + \else + \l__gzt_bullet_and_rule_even_tl + \fi + \bigskip + } } \par \nopagebreak[4] - \l__gzt_title_box_tl - \normalsize - \nopagebreak[3] - \bool_if:nF { - \tl_if_empty_p:N \g__gzt_abstract_body_tl - && - ( - \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - ) - }{ - \par - \bigskip - \bigskip - \large - \mbox{} - \checkoddpage - \ifoddpage - \l__gzt_abstract_box_tl - \hspace*{11mm} - \l__gzt_authors_box_tl - \else - \hspace*{-.85\c__gzt_outermargin_dim} - \l__gzt_authors_box_tl - \hspace*{11mm} - \l__gzt_abstract_box_tl - \fi - } - \tl_gclear:N \g__gzt_title_tl - \tl_gclear:N \g__gzt_subtitle_tl - \tl_gclear:N \g__gzt_abstract_body_tl - \normalsize - \bigskip - \tl_if_empty:NF \g__gzt_abstract_body_tl - % { - % \tl_if_empty:NF \l__gzt_people_first_last_names_tl - % { - % \bigskip - % } - % } - { + \nocite {\g__gzt_article_bib_key_tl} + \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 \l__gzt_people_first_last_names_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + }{ + \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} + } + } + } + } + } + \bool_if:NF {\g__gzt_title_not_in_article_bool} { + \l__gzt_title_box_tl + \normalsize + \nopagebreak[3] + \bool_if:nF { + \tl_if_empty_p:N \g__gzt_abstract_body_tl + && + ( + \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + ) + }{ + \par + \bigskip + \bigskip + \large + \mbox{} + \checkoddpage + \ifoddpage + \l__gzt_abstract_box_tl + \hspace*{11mm} + \l__gzt_authors_box_tl + \else + \hspace*{-.85\c__gzt_outermargin_dim} + \l__gzt_authors_box_tl + \hspace*{11mm} + \l__gzt_abstract_box_tl + \fi + } + } + \tl_gclear:N \g__gzt_title_tl + \tl_gclear:N \g__gzt_subtitle_tl + \tl_gclear:N \g__gzt_abstract_body_tl + \normalsize \bigskip - } - \bool_if:nT \g__gzt_interview_rubric_bool - { + \tl_if_empty:NF \g__gzt_abstract_body_tl + % { + % \tl_if_empty:NF \l__gzt_people_first_last_names_tl + % { + % \bigskip + % } + % } + { + \bigskip + } + \bool_if:nT \g__gzt_interview_rubric_bool + { \dim_zero:N \parindent % \tl_if_empty:NF \l__gzt_people_photo_tl % { @@ -2321,20 +2339,23 @@ \edef\toctablepiece { \ExceptFirstPart {\noexpand\\[-1.5mm]} \unexpanded{ - \color{__gzt_rubric_in_toc_color}\scshape\fontseries{bx}\selectfont + \protect\leavevmode\color{__gzt_rubric_in_toc_color}% + \scshape\fontseries{bx}\selectfont } \unexpanded\expandafter{\etocthelinkedname}& % \ifShowPartPageInToc - \unexpanded{\bfseries\color{__gzt_rubric_in_toc_color}} + \unexpanded{\bfseries% + \protect\leavevmode\color{__gzt_rubric_in_toc_color}% + } \unexpanded\expandafter{\etocthelinkedpage} % \fi \noexpand\\} \gdef\ExceptFirstPart ##1{##1} } \newcommand*\PrepareChapter{ - \edef\toctablepiece { - \unexpanded{\color{__gzt_article_in_toc_color}\small} - \unexpanded\expandafter{\etocthelinkedname}& + \edef\toctablepiece {\begingroup + \unexpanded{\small\color{__gzt_article_in_toc_color}} + \unexpanded\expandafter{\etocthelinkedname}\endgroup& \unexpanded{\color{__gzt_article_in_toc_color}\small} \unexpanded\expandafter{\etocthelinkedpage} \noexpand\\[1mm]} @@ -2365,6 +2386,7 @@ \tl_gset:Nn \g__gzt_boxed_issue_number_tl { \tcbox{\Large\No\g__gzt_issue_number_int} } +\tl_new:N \l__gzt_boxed_issue_number_title_tl \cs_new_protected:Nn \__gzt_boxed_issue_number:nn { \noindent @@ -2378,14 +2400,14 @@ } } \bool_if:NTF {\g__gzt_special_edition_bool} { - \tl_set:Nn \l_tmpa_tl {\c__gzt_short_special_edition_string_tl} + \tl_set:Nn \l__gzt_boxed_issue_number_title_tl {\c__gzt_short_special_edition_string_tl} }{ - \tl_set:Nn \l_tmpa_tl {\No\int_use:N\g__gzt_issue_number_int} + \tl_set:Nn \l__gzt_boxed_issue_number_title_tl {\No\int_use:N\g__gzt_issue_number_int} } \begin{adjustbox}{valign=t} \begin{tcolorbox}[ enhanced, - title=\l_tmpa_tl,%\int_use:N \g__gzt_issue_number_int, + title=\l__gzt_boxed_issue_number_title_tl,%\int_use:N \g__gzt_issue_number_int, fonttitle=\Large, colback=white, sharp~ corners=all, @@ -2431,7 +2453,6 @@ \__gzt_boxed_issue_number:nn {#1}{#2} \color{__gzt_frontmatter_text_color} \fontsize{11}{13.6}\selectfont - \RaggedRight } \cs_new_protected:Nn \__gzt_after_editorial_presidentmessage: { @@ -3060,9 +3081,14 @@ ] [ \adjustbox{raise={\c__gzt_header_yshift_dim}{\height}}{ - \large\bfseries\scshape\color{__gzt_head_text_color}\g__gzt_rubric_title_tl + \large\bfseries\scshape\color{__gzt_head_text_color} + \tl_if_empty:NTF \g__gzt_rubric_header_tl { + \g__gzt_rubric_title_tl + }{ + \g__gzt_rubric_header_tl } - ] + } + ] [] {} { @@ -3111,11 +3137,15 @@ \end{multicols} } \FloatBarrier - \begin{__gzt_minibiographies_acknowledgements_tcbox} \nopagebreak[0] - \IfBooleanF {#1} + \IfBooleanTF {#1} { - \__gzt_display_people_by_role:n { author-art-\int_use:N \g__gzt_articles_int } + \tl_if_empty:NF \l__gzt_article_acknowledgements_tl { + \begin{__gzt_minibiographies_acknowledgements_tcbox} + } + }{ + \begin{__gzt_minibiographies_acknowledgements_tcbox} + \__gzt_display_people_by_role:n { author-art-\int_use:N \g__gzt_articles_int } } \DTLsavelastrowcount{\__gzt_authors_number} \tl_if_empty:NF \l__gzt_article_acknowledgements_tl @@ -3133,7 +3163,14 @@ \end{adjustbox} } \bool_gset_true:N \g__gzt_previous_article_with_bibliography_or_minibio_bool - \end{__gzt_minibiographies_acknowledgements_tcbox} + \IfBooleanTF {#1} + { + \tl_if_empty:NF \l__gzt_article_acknowledgements_tl { + \end{__gzt_minibiographies_acknowledgements_tcbox} + } + }{ + \end{__gzt_minibiographies_acknowledgements_tcbox} + } } \cs_set_eq:NN \__gzt_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { s O{} } { @@ -3152,6 +3189,26 @@ \printminibios } } +\cs_set_eq:NN \__gzt_bibbycategory \bibbycategory +\RenewDocumentCommand \bibbycategory { s O{} } { + \bool_if:NT {\g__gzt_multicols_bool} { + \end{multicols} + } + \FloatBarrier + \begin{__gzt_bibliography_tcbox} + \defbibheading{bibliography}{% + \section*{Références}} + \printbibheading + \__gzt_bibbycategory[#2] + \end{__gzt_bibliography_tcbox} + \nopagebreak[0] + \IfBooleanTF {#1} + { + \printminibios* + }{ + \printminibios + } +} \deftranslation[to=French]{__gzt_century}{si\`ecle} \deftranslation[to=English]{__gzt_century}{century} \deftranslation[to=French]{__gzt_first}{\ier} @@ -3488,7 +3545,7 @@ columns=flexible, inputencoding=utf8/latin1 } -\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ __gzt_light_generic_dark_color!8}{#1} +\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ __gzt_generic_dark_color!8}{#1} \NewTCBListing{gztcode}{ !O{} }{ listing~ style=__gzt_lst_style, listing~ only, @@ -3792,6 +3849,7 @@ enhanced, colback=__gzt_book_review_frame_bg_color, breakable, + use~ color~ stack, % height=50mm, boxrule=\c_zero_dim, sharp~ corners=all, @@ -3870,6 +3928,7 @@ __gzt_tcb_bibliography_style/.style={ colback=__gzt_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, sharp~ corners=all, enhanced @@ -3879,6 +3938,7 @@ __gzt_tcb_minibiographies_acknowledgements_style/.style={ colback=__gzt_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, extras~ unbroken~ and~ last={drop~ lifted~ shadow}, sharp~ corners=all, @@ -4096,7 +4156,7 @@ \NewDocumentCommand \C {} {\mathbb{C}} \NewDocumentCommand \K {} {\mathbb{K}} %% -%% Copyright (C) 2014-2021 by Denis Bitouzé +%% Copyright (C) 2014-2024 by Denis Bitouzé %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/gzt/gzt.dbx b/Master/texmf-dist/tex/latex/gzt/gzt.dbx index e0ecebdbff2..4a34f46b989 100644 --- a/Master/texmf-dist/tex/latex/gzt/gzt.dbx +++ b/Master/texmf-dist/tex/latex/gzt/gzt.dbx @@ -219,7 +219,7 @@ \usebibmacro{finentry} } %% -%% Copyright (C) 2014-2021 by Denis Bitouzé +%% Copyright (C) 2014-2024 by Denis Bitouzé %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/gzt/gzt.lbx b/Master/texmf-dist/tex/latex/gzt/gzt.lbx index 50c26a2847d..51e11f6eac3 100644 --- a/Master/texmf-dist/tex/latex/gzt/gzt.lbx +++ b/Master/texmf-dist/tex/latex/gzt/gzt.lbx @@ -20,7 +20,7 @@ volumes = {{volumes}{vol\adddot}}, } %% -%% Copyright (C) 2014-2021 by Denis Bitouzé +%% Copyright (C) 2014-2024 by Denis Bitouzé %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/gzt/gztarticle.cls b/Master/texmf-dist/tex/latex/gzt/gztarticle.cls index b939718b0e4..26a2ca664e3 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.3} -\def\gztfiledate{2022-06-13} +\def\gztfileversion{1.1.4} +\def\gztfiledate{2024-03-09} \RequirePackage{xpatch} \patchcmd {\use@@tikzlibrary} @@ -62,10 +62,10 @@ {gztarticle} {\gztfiledate} {\gztfileversion} - { - SMF~ class~ for~ the~ French~ journal^^J - "La~ Gazette~ de~ la~ Soci'et'e~ Math'ematique~ de~ France". -~ (Author~ version.) + {% + SMF class for the French journal^^J + “La Gazette de la Société Mathématique de France”. + (Author version.) } \NeedsTeXFormat{LaTeX2e} \bool_new:N \g__gzt_moral_report_bool @@ -796,7 +796,9 @@ { short .tl_gset:N = \g__gzt_short_title_tl, minishort .tl_gset:N = \g__gzt_mini_short_title_tl, + notinarticle .bool_gset:N = \g__gzt_title_not_in_article_bool, notintoc .bool_gset:N = \g__gzt_title_not_in_toc_bool, + without~ rule .bool_gset:N = \g__gzt_title_without_rule_bool, short .value_required:n = true, minishort .value_required:n = true, } @@ -804,6 +806,7 @@ { short .tl_gset:N = \g__gzt_short_subtitle_tl, minishort .tl_gset:N = \g__gzt_mini_short_subtitle_tl, + notinarticle .bool_gset:N = \g__gzt_subtitle_not_in_article_bool, notintoc .bool_gset:N = \g__gzt_subtitle_not_in_toc_bool, short .value_required:n = true, minishort .value_required:n = true, @@ -811,6 +814,7 @@ \keys_define:nn { gzt/rubric } { abstract .tl_gset:N = \g__gzt_rubric_abstract_tl, + header .tl_gset:N = \g__gzt_rubric_header_tl, title .tl_gset:N = \g__gzt_rubric_title_tl, pictogram .tl_gset:N = \g__gzt_rubric_pictofile_tl, abstract .value_required:n = true, @@ -888,54 +892,53 @@ { theorem~ or~ definition~ or~ proof } { \exp_not:n {#1} } } -\definecolorset{cmyk}{__gzt_}{_color}{ - generic_dark,1,.60,.10,0; % kind of blue (!) - light_generic_dark,1,.35,0,0 % kind of blue (!), light -} -\colorlet{__gzt_generic_light_color}{black!50} -\colorlet{__gzt_dark_generic_light_color}{black!60} -\colorlet{__gzt_description_label_light_color}{__gzt_dark_generic_light_color} -\colorlet{__gzt_minitoc_color}{__gzt_generic_light_color} -\colorlet{__gzt_cover_itemize_label_color}{__gzt_light_generic_dark_color} -\colorlet{__gzt_default_text_color}{black} -\colorlet{__gzt_head_text_color}{black!65} -\colorlet{__gzt_rubric_head_text_color}{__gzt_head_text_color} -\colorlet{__gzt_bibliography_minibios_acknowledgements_bg_color}{black!10} -\colorlet{__gzt_headrule_color}{__gzt_generic_light_color!65} -\colorlet{__gzt_circlerule_color}{__gzt_generic_dark_color!65} -\colorlet{__gzt_frontmatter_text_color}{black!75} -\colorlet{__gzt_people_color}{__gzt_generic_dark_color} -\colorlet{__gzt_arrayrule_color}{__gzt_generic_dark_color} -\colorlet{__gzt_acknowledgements_color}{__gzt_generic_dark_color} -\colorlet{__gzt_question_color}{__gzt_generic_dark_color} -\colorlet{__gzt_boxed_issue_number_bg_color}{__gzt_generic_dark_color} -\colorlet{__gzt_rule_in_toc_color}{__gzt_generic_dark_color} -\colorlet{__gzt_rubric_in_toc_color}{__gzt_generic_dark_color} -\colorlet{__gzt_article_in_toc_color}{__gzt_frontmatter_text_color} -\colorlet{__gzt_rubric_title_color}{__gzt_generic_light_color} -\colorlet{__gzt_article_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_section_color}{__gzt_generic_dark_color} -\colorlet{__gzt_subsection_color}{__gzt_generic_dark_color!90} -\colorlet{__gzt_subsubsection_color}{__gzt_generic_dark_color!80} -\colorlet{__gzt_rubric_abstract_color}{__gzt_generic_dark_color} -\colorlet{__gzt_article_abstract_color}{__gzt_generic_light_color} -\colorlet{__gzt_dotfill_color}{__gzt_generic_dark_color} -\colorlet{__gzt_about_frontcover_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_reflected_text_color}{__gzt_generic_dark_color} -\colorlet{__gzt_inside_frontcover_frame_bg_color}{__gzt_generic_dark_color!8} -\colorlet{__gzt_inside_frontcover_frame_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_footer_bg_color}{black!10} -\colorlet{__gzt_float_title_color}{__gzt_generic_dark_color} -\colorlet{__gzt_float_title_bg_color}{__gzt_generic_dark_color!10} -\colorlet{__gzt_float_frame_color}{__gzt_generic_dark_color!20} -\colorlet{__gzt_chapter_color}{__gzt_generic_dark_color} -\colorlet{__gzt_smf_number_color}{__gzt_generic_dark_color} -\colorlet{__gzt_date_color}{__gzt_generic_light_color} -\colorlet{__gzt_table_head_color}{__gzt_generic_dark_color!25} -\colorlet{__gzt_book_review_frame_bg_color}{__gzt_generic_dark_color!8} -\colorlet{__gzt_book_advertisement_bg_color}{white} -\colorlet{__gzt_book_advertisement_frame_color}{__gzt_generic_dark_color} -\colorlet{__gzt_default_cover_color}{white} +\definecolor{__gzt_generic_dark_color}{cmyk}{1,.60,.10,0} +\AddToHook{begindocument}{ + \colorlet{__gzt_generic_light_color}{black!50} + \colorlet{__gzt_dark_generic_light_color}{black!60} + \colorlet{__gzt_description_label_light_color}{__gzt_dark_generic_light_color} + \colorlet{__gzt_minitoc_color}{__gzt_generic_light_color} + \colorlet{__gzt_cover_itemize_label_color}{__gzt_generic_dark_color} + \colorlet{__gzt_default_text_color}{black} + \colorlet{__gzt_head_text_color}{black!65} + \colorlet{__gzt_rubric_head_text_color}{__gzt_head_text_color} + \colorlet{__gzt_bibliography_minibios_acknowledgements_bg_color}{black!10} + \colorlet{__gzt_headrule_color}{__gzt_generic_light_color!65} + \colorlet{__gzt_circlerule_color}{__gzt_generic_dark_color!65} + \colorlet{__gzt_frontmatter_text_color}{black!75} + \colorlet{__gzt_people_color}{__gzt_generic_dark_color} + \colorlet{__gzt_arrayrule_color}{__gzt_generic_dark_color} + \colorlet{__gzt_acknowledgements_color}{__gzt_generic_dark_color} + \colorlet{__gzt_question_color}{__gzt_generic_dark_color} + \colorlet{__gzt_boxed_issue_number_bg_color}{__gzt_generic_dark_color} + \colorlet{__gzt_rule_in_toc_color}{__gzt_generic_dark_color} + \colorlet{__gzt_rubric_in_toc_color}{__gzt_generic_dark_color} + \colorlet{__gzt_article_in_toc_color}{__gzt_frontmatter_text_color} + \colorlet{__gzt_rubric_title_color}{__gzt_generic_light_color} + \colorlet{__gzt_article_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_section_color}{__gzt_generic_dark_color} + \colorlet{__gzt_subsection_color}{__gzt_generic_dark_color!90} + \colorlet{__gzt_subsubsection_color}{__gzt_generic_dark_color!80} + \colorlet{__gzt_rubric_abstract_color}{__gzt_generic_dark_color} + \colorlet{__gzt_article_abstract_color}{__gzt_generic_light_color} + \colorlet{__gzt_dotfill_color}{__gzt_generic_dark_color} + \colorlet{__gzt_about_frontcover_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_reflected_text_color}{__gzt_generic_dark_color} + \colorlet{__gzt_inside_frontcover_frame_bg_color}{__gzt_generic_dark_color!8} + \colorlet{__gzt_inside_frontcover_frame_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_footer_bg_color}{black!10} + \colorlet{__gzt_float_title_color}{__gzt_generic_dark_color} + \colorlet{__gzt_float_title_bg_color}{__gzt_generic_dark_color!10} + \colorlet{__gzt_float_frame_color}{__gzt_generic_dark_color!20} + \colorlet{__gzt_chapter_color}{__gzt_generic_dark_color} + \colorlet{__gzt_smf_number_color}{__gzt_generic_dark_color} + \colorlet{__gzt_date_color}{__gzt_generic_light_color} + \colorlet{__gzt_table_head_color}{__gzt_generic_dark_color!25} + \colorlet{__gzt_book_review_frame_bg_color}{__gzt_generic_dark_color!8} + \colorlet{__gzt_book_advertisement_bg_color}{white} + \colorlet{__gzt_book_advertisement_frame_color}{__gzt_generic_dark_color} + \colorlet{__gzt_default_cover_color}{white} +} \AddToHook{env/multicols/begin}{ \bool_gset_true:N \g__gzt_multicols_bool } @@ -1642,7 +1645,9 @@ \int_gincr:N \g__gzt_articles_int \tl_gclear:N \g__gzt_short_title_tl \tl_gclear:N \g__gzt_short_subtitle_tl + \bool_gset_false:N \g__gzt_title_not_in_article_bool \bool_gset_false:N \g__gzt_title_not_in_toc_bool + \bool_gset_false:N \g__gzt_title_without_rule_bool \IfNoValueF {#1} { \keys_set:nn { gzt/title } { #1 } @@ -1895,8 +1900,9 @@ } \tl_set:Nn \l__gzt_title_box_tl { - \noindent \bool_if:NF {\g__gzt_invisible_titles_bool} { + \noindent + % \bool_show:N \g__gzt_title_not_in_article_bool \hspace*{18mm} \begin{adjustbox}{minipage=\linewidth-18mm,valign=t} \raggedright @@ -1911,46 +1917,8 @@ \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: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 \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - }{ - \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} - } - } - } - } - } - \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 } % { @@ -1981,20 +1949,18 @@ } { \color{__gzt_people_color} - \bool_if:NTF {\g__gzt_invisible_titles_bool} { - \nocite {\g__gzt_article_bib_key_tl} - }{ + \bool_if:NF {\g__gzt_invisible_titles_bool} { \__gzt_itemized_citeauthor:n {\g__gzt_article_bib_key_tl} } } \bool_if:NF {\g__gzt_invisible_titles_bool} { - \end{adjustbox} - } - } - \bool_if:nTF { - \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } + \end{adjustbox} } - { + } + \bool_if:nTF { + \int_compare_p:nNn { \g__gzt_item_in_rubric_int } = { 1 } + } + { \mbox{} \par \bool_if:nTF { @@ -2032,52 +1998,91 @@ } \bool_gset_false:N \g__gzt_previous_article_with_bibliography_or_minibio_bool \hypersetup{pdftitle=\g__gzt_short_title_tl,pdfauthor=\l__gzt_people_first_last_names_tl} - \l__gzt_title_box_tl - \normalsize - \nopagebreak[3] - \bool_if:nF { - \tl_if_empty_p:N \g__gzt_abstract_body_tl - && - ( - \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || - \g__gzt_interview_rubric_bool || - \g__gzt_rearviewmirror_rubric_bool - ) - }{ - \par - \bigskip - \bigskip - \large - \mbox{} - \checkoddpage - \ifoddpage - \l__gzt_abstract_box_tl - \hspace*{11mm} - \l__gzt_authors_box_tl - \else - \hspace*{-.85\c__gzt_outermargin_dim} - \l__gzt_authors_box_tl - \hspace*{11mm} - \l__gzt_abstract_box_tl - \fi - } - \tl_gclear:N \g__gzt_title_tl - \tl_gclear:N \g__gzt_subtitle_tl - \tl_gclear:N \g__gzt_abstract_body_tl - \normalsize - \bigskip - \tl_if_empty:NF \g__gzt_abstract_body_tl - % { - % \tl_if_empty:NF \l__gzt_people_first_last_names_tl - % { - % \bigskip - % } - % } - { + \nocite {\g__gzt_article_bib_key_tl} + \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 \l__gzt_people_first_last_names_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + }{ + \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} + } + } + } + } + } + \bool_if:NF {\g__gzt_title_not_in_article_bool} { + \l__gzt_title_box_tl + \normalsize + \nopagebreak[3] + \bool_if:nF { + \tl_if_empty_p:N \g__gzt_abstract_body_tl + && + ( + \tl_if_empty_p:N \l__gzt_people_first_last_names_tl || + \g__gzt_interview_rubric_bool || + \g__gzt_rearviewmirror_rubric_bool + ) + }{ + \par + \bigskip + \bigskip + \large + \mbox{} + \checkoddpage + \ifoddpage + \l__gzt_abstract_box_tl + \hspace*{11mm} + \l__gzt_authors_box_tl + \else + \hspace*{-.85\c__gzt_outermargin_dim} + \l__gzt_authors_box_tl + \hspace*{11mm} + \l__gzt_abstract_box_tl + \fi + } + } + \tl_gclear:N \g__gzt_title_tl + \tl_gclear:N \g__gzt_subtitle_tl + \tl_gclear:N \g__gzt_abstract_body_tl + \normalsize \bigskip - } - \bool_if:nT \g__gzt_interview_rubric_bool - { + \tl_if_empty:NF \g__gzt_abstract_body_tl + % { + % \tl_if_empty:NF \l__gzt_people_first_last_names_tl + % { + % \bigskip + % } + % } + { + \bigskip + } + \bool_if:nT \g__gzt_interview_rubric_bool + { \dim_zero:N \parindent % \tl_if_empty:NF \l__gzt_people_photo_tl % { @@ -2102,6 +2107,7 @@ \tl_gset:Nn \g__gzt_boxed_issue_number_tl { \tcbox{\Large\No\g__gzt_issue_number_int} } +\tl_new:N \l__gzt_boxed_issue_number_title_tl \cs_new_protected:Nn \__gzt_boxed_issue_number:nn { \noindent @@ -2115,14 +2121,14 @@ } } \bool_if:NTF {\g__gzt_special_edition_bool} { - \tl_set:Nn \l_tmpa_tl {\c__gzt_short_special_edition_string_tl} + \tl_set:Nn \l__gzt_boxed_issue_number_title_tl {\c__gzt_short_special_edition_string_tl} }{ - \tl_set:Nn \l_tmpa_tl {\No\int_use:N\g__gzt_issue_number_int} + \tl_set:Nn \l__gzt_boxed_issue_number_title_tl {\No\int_use:N\g__gzt_issue_number_int} } \begin{adjustbox}{valign=t} \begin{tcolorbox}[ enhanced, - title=\l_tmpa_tl,%\int_use:N \g__gzt_issue_number_int, + title=\l__gzt_boxed_issue_number_title_tl,%\int_use:N \g__gzt_issue_number_int, fonttitle=\Large, colback=white, sharp~ corners=all, @@ -2168,7 +2174,6 @@ \__gzt_boxed_issue_number:nn {#1}{#2} \color{__gzt_frontmatter_text_color} \fontsize{11}{13.6}\selectfont - \RaggedRight } \cs_new_protected:Nn \__gzt_after_editorial_presidentmessage: { @@ -2441,9 +2446,14 @@ ] [ \adjustbox{raise={\c__gzt_header_yshift_dim}{\height}}{ - \large\bfseries\scshape\color{__gzt_head_text_color}\g__gzt_rubric_title_tl + \large\bfseries\scshape\color{__gzt_head_text_color} + \tl_if_empty:NTF \g__gzt_rubric_header_tl { + \g__gzt_rubric_title_tl + }{ + \g__gzt_rubric_header_tl } - ] + } + ] [] {} { @@ -2492,11 +2502,15 @@ \end{multicols} } \FloatBarrier - \begin{__gzt_minibiographies_acknowledgements_tcbox} \nopagebreak[0] - \IfBooleanF {#1} + \IfBooleanTF {#1} { - \__gzt_display_people_by_role:n { author-art-\int_use:N \g__gzt_articles_int } + \tl_if_empty:NF \l__gzt_article_acknowledgements_tl { + \begin{__gzt_minibiographies_acknowledgements_tcbox} + } + }{ + \begin{__gzt_minibiographies_acknowledgements_tcbox} + \__gzt_display_people_by_role:n { author-art-\int_use:N \g__gzt_articles_int } } \DTLsavelastrowcount{\__gzt_authors_number} \tl_if_empty:NF \l__gzt_article_acknowledgements_tl @@ -2514,7 +2528,14 @@ \end{adjustbox} } \bool_gset_true:N \g__gzt_previous_article_with_bibliography_or_minibio_bool - \end{__gzt_minibiographies_acknowledgements_tcbox} + \IfBooleanTF {#1} + { + \tl_if_empty:NF \l__gzt_article_acknowledgements_tl { + \end{__gzt_minibiographies_acknowledgements_tcbox} + } + }{ + \end{__gzt_minibiographies_acknowledgements_tcbox} + } } \cs_set_eq:NN \__gzt_printbibliography \printbibliography \RenewDocumentCommand \printbibliography { s O{} } { @@ -2533,6 +2554,26 @@ \printminibios } } +\cs_set_eq:NN \__gzt_bibbycategory \bibbycategory +\RenewDocumentCommand \bibbycategory { s O{} } { + \bool_if:NT {\g__gzt_multicols_bool} { + \end{multicols} + } + \FloatBarrier + \begin{__gzt_bibliography_tcbox} + \defbibheading{bibliography}{% + \section*{Références}} + \printbibheading + \__gzt_bibbycategory[#2] + \end{__gzt_bibliography_tcbox} + \nopagebreak[0] + \IfBooleanTF {#1} + { + \printminibios* + }{ + \printminibios + } +} \deftranslation[to=French]{__gzt_century}{si\`ecle} \deftranslation[to=English]{__gzt_century}{century} \deftranslation[to=French]{__gzt_first}{\ier} @@ -2752,7 +2793,7 @@ columns=flexible, inputencoding=utf8/latin1 } -\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ __gzt_light_generic_dark_color!8}{#1} +\DeclareTotalTCBox{\gztverb}{ v }{verbatim,blank,fuzzy~ halo=0pt~ with~ __gzt_generic_dark_color!8}{#1} \NewTCBListing{gztcode}{ !O{} }{ listing~ style=__gzt_lst_style, listing~ only, @@ -3016,6 +3057,7 @@ enhanced, colback=__gzt_book_review_frame_bg_color, breakable, + use~ color~ stack, % height=50mm, boxrule=\c_zero_dim, sharp~ corners=all, @@ -3094,6 +3136,7 @@ __gzt_tcb_bibliography_style/.style={ colback=__gzt_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, sharp~ corners=all, enhanced @@ -3103,6 +3146,7 @@ __gzt_tcb_minibiographies_acknowledgements_style/.style={ colback=__gzt_bibliography_minibios_acknowledgements_bg_color, breakable, + use~ color~ stack, boxrule=\c_zero_dim, extras~ unbroken~ and~ last={drop~ lifted~ shadow}, sharp~ corners=all, @@ -3320,7 +3364,7 @@ \NewDocumentCommand \C {} {\mathbb{C}} \NewDocumentCommand \K {} {\mathbb{K}} %% -%% Copyright (C) 2014-2021 by Denis Bitouzé +%% Copyright (C) 2014-2024 by Denis Bitouzé %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either -- cgit v1.2.3