From c3002414cc6356ddb2289303378b8c2dd448908a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Jan 2017 23:42:50 +0000 Subject: gzt (2jan17) git-svn-id: svn://tug.org/texlive/trunk@42832 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/gzt/gztarticle.cls | 191 ++++++++++++++----------- 1 file changed, 106 insertions(+), 85 deletions(-) (limited to 'Master/texmf-dist/tex/latex/gzt/gztarticle.cls') diff --git a/Master/texmf-dist/tex/latex/gzt/gztarticle.cls b/Master/texmf-dist/tex/latex/gzt/gztarticle.cls index 6769a60bc7e..ccc4538f5f0 100644 --- a/Master/texmf-dist/tex/latex/gzt/gztarticle.cls +++ b/Master/texmf-dist/tex/latex/gzt/gztarticle.cls @@ -61,8 +61,8 @@ \ExplSyntaxOn \ProvidesExplClass {gztarticle} - {2016/10/24} - {0.95b} + {2017/01/01} + {0.96} { SMF~class~for~the~French~journal^^J "La~Gazette~des~Math'ematiciens". @@ -85,7 +85,7 @@ \PassOptionsToPackage{english,french}{cleveref} \RequirePackage[group=false]{standalone}% \RequirePackage{datatool}% -\pdftex_if_engine:TF +\sys_if_engine_pdftex:TF { \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} @@ -208,20 +208,20 @@ \tl_const:Nn \c__gzt_president_message_date_string_tl {Le~} \tl_const:Nn \c__gzt_frontcover_header_string_tl { \l__gzt_uppercased_date_format\displaydate{__gzt_date} - \space + \c_space_tl \textendash{} - \space + \c_space_tl \No\int_use:N\g__gzt_issue_number_int% } \tl_const:Nn \c__gzt_pdftitle_string_tl { \c__gzt_journal_title_string_tl - % \space + % \c_space_tl % \textendash{} - % \space + % \c_space_tl % \l__gzt_uppercased_date_format{\displaydate{__gzt_date}} - \space + \c_space_tl \textendash{} - \space + \c_space_tl N°\int_use:N\g__gzt_issue_number_int } \tl_const:Nn \c__gzt_frontmatter_directory_string_tl {frontmatter} @@ -248,8 +248,8 @@ actuelle~n'est~pas~d{\'e}finitive\,:~votre~article~pourra~en~particulier~ne~pas~ d{\'e}buter~en~haut~d'une~page.% } -\tl_const:Nn \c__gzt_tellme_extra_title_string_tl {...\space} -\tl_const:Nn \c__gzt_minitoc_rubric_title_separator_string_tl {\space\textendash} +\tl_const:Nn \c__gzt_tellme_extra_title_string_tl {...\c_space_tl} +\tl_const:Nn \c__gzt_minitoc_rubric_title_separator_string_tl {\c_space_tl\textendash} \tl_const:Nn \c__gzt_mathematics_rubric_string_tl {Math\'ematiques} \tl_const:Nn \c__gzt_dossier_rubric_string_tl {Dossier} \tl_const:Nn \c__gzt_community_rubric_string_tl {Vie~de~la~communaut\'e} @@ -277,9 +277,9 @@ \tl_const:Nn \c__gzt_footer_string_tl { \c__gzt_footer_size_font_tl \textcolor{__gzt_smf_number_color}{\MakeTextUppercase{\c__gzt_smf_short_string_tl}} - \space + \c_space_tl \textcolor{__gzt_date_color}{ - \textendash{}\space + \textendash{}\c_space_tl \MakeTextUppercase{\c__gzt_journal_short_title_string_tl} } } @@ -339,9 +339,9 @@ \dim_const:Nn \c__gzt_bindingoffset_d_dim {4.1mm} \dim_const:Nn \c__gzt_bindingoffset_e_dim {4.5mm} \dim_const:Nn \c__gzt_bindingoffset_f_dim {5mm} -\zexternaldocument[self]{\jobname}% \int_new:N \g__gzt_total_pages_number_int% \int_new:N \g__gzt_total_inside_pages_number_int% +\zexternaldocument[self]{\jobname}% \int_gset:Nn \g__gzt_total_pages_number_int { \zref@extractdefault{selfLastPage}{abspage}{0} } \int_gset:Nn \g__gzt_total_inside_pages_number_int { \g__gzt_total_pages_number_int - 4 } \int_compare:nNnTF {\g__gzt_total_inside_pages_number_int}<{\c__gzt_thresold_a_int} @@ -616,9 +616,9 @@ number .int_gset:N = \g__gzt_issue_number_int, month .int_gset:N = \g__gzt_issue_month_int, year .int_gset:N = \g__gzt_issue_year_int, - number .value_required:, - month .value_required:, - year .value_required:, + number .value_required:n = true, + month .value_required:n = true, + year .value_required:n = true, number .initial:n = 0, frontcoverimageoptions .tl_gset:N = \g__gzt_frontcover_image_options_tl } @@ -640,39 +640,39 @@ url .tl_set:N = \l__gzt_journal_url_tl, issn .tl_set:N = \l__gzt_journal_issn_tl, isbn .tl_set:N = \l__gzt_journal_isbn_tl, - publisher .value_required:, - address .value_required:, - phone .value_required:, - fax .value_required:, - email .value_required:, - url .value_required:, - issn .value_required:, - isbn .value_required:, + publisher .value_required:n = true, + address .value_required:n = true, + phone .value_required:n = true, + fax .value_required:n = true, + email .value_required:n = true, + url .value_required:n = true, + issn .value_required:n = true, + isbn .value_required:n = true, } \keys_define:nn { gzt/title } { short .tl_gset:N = \g__gzt_short_title_tl, minishort .tl_gset:N = \g__gzt_mini_short_title_tl, notintoc .bool_gset:N = \g__gzt_title_not_in_toc_bool, - short .value_required:, - minishort .value_required:, + short .value_required:n = true, + minishort .value_required:n = true, } \keys_define:nn { gzt/subtitle } { short .tl_gset:N = \g__gzt_short_subtitle_tl, minishort .tl_gset:N = \g__gzt_mini_short_subtitle_tl, notintoc .bool_gset:N = \g__gzt_subtitle_not_in_toc_bool, - short .value_required:, - minishort .value_required:, + short .value_required:n = true, + minishort .value_required:n = true, } \keys_define:nn { gzt/rubric } { abstract .tl_gset:N = \g__gzt_rubric_abstract_tl, title .tl_gset:N = \g__gzt_rubric_title_tl, pictogram .tl_gset:N = \g__gzt_rubric_pictofile_tl, - abstract .value_required:, - title .value_required:, - pictogram .value_required:, + abstract .value_required:n = true, + title .value_required:n = true, + pictogram .value_required:n = true, } \keys_define:nn { gzt/minitoc } { @@ -682,10 +682,10 @@ textwidth .dim_gset:N = \g__gzt_minitoc_textwidth_dim, xshift .dim_gset:N = \g__gzt_minitoc_xshift_dim, yshift .dim_gset:N = \g__gzt_minitoc_yshift_dim, - diameter .value_required:, - textwidth .value_required:, - xshift .value_required:, - yshift .value_required:, + diameter .value_required:n = true, + textwidth .value_required:n = true, + xshift .value_required:n = true, + yshift .value_required:n = true, } \keys_define:nn { gzt/authors } { @@ -694,11 +694,11 @@ minibio .tl_gset:N = \g__gzt_people_minibio_tl, photo .tl_gset:N = \g__gzt_people_photo_tl, webpage .tl_gset:N = \g__gzt_people_webpage_tl, - affiliation .value_required:, - email .value_required:, - minibio .value_required:, - photo .value_required:, - webpage .value_required:, + affiliation .value_required:n = true, + email .value_required:n = true, + minibio .value_required:n = true, + photo .value_required:n = true, + webpage .value_required:n = true, } \tl_new:N \g__gzt_interviewee_minibio_tl \tl_new:N \g__gzt_interviewee_photo_tl @@ -707,8 +707,8 @@ { minibio .tl_gset:N = \g__gzt_interviewee_minibio_tl, photo .tl_gset:N = \g__gzt_interviewee_photo_tl, - minibio .value_required:, - photo .value_required:, + minibio .value_required:n = true, + photo .value_required:n = true, } \tl_new:N \g__gzt_bookreview_frontcover_tl \tl_new:N \g__gzt_bookreview_bibkey_tl @@ -716,8 +716,8 @@ { frontcover .tl_gset:N = \g__gzt_bookreview_frontcover_tl, bibkey .tl_gset:N = \g__gzt_bookreview_bibkey_tl, - frontcover .value_required:, - bibkey .value_required:, + frontcover .value_required:n = true, + bibkey .value_required:n = true, } \tl_new:N \g__gzt_bookadvertisement_frontcover_tl \tl_new:N \g__gzt_bookadvertisement_bibkey_tl @@ -725,16 +725,16 @@ { frontcover .tl_gset:N = \g__gzt_bookadvertisement_frontcover_tl, bibkey .tl_gset:N = \g__gzt_bookadvertisement_bibkey_tl, - frontcover .value_required:, - bibkey .value_required:, + frontcover .value_required:n = true, + bibkey .value_required:n = true, } \tl_new:N \l__gzt_newtheorem_style_tl \keys_define:nn { gzt/newtheorem } { frenchtitle .tl_set:N = \l__gzt_newtheorem_frenchtitle_tl, englishtitle .tl_set:N = \l__gzt_newtheorem_englishtitle_tl, - frenchtitle .value_required:, - englishtitle .value_required:, + frenchtitle .value_required:n = true, + englishtitle .value_required:n = true, % style .choice:, style / theorem .code:n = {\tl_set:Nn \l__gzt_newtheorem_style_tl {theorem}}, @@ -1042,7 +1042,7 @@ \exp_not:V\DTLcurrentindex}% \tl_if_empty:NF \l__gzt_people_email_tl { - \space(\href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}) + \c_space_tl(\href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}) } } } @@ -1151,14 +1151,14 @@ \item[\c__gzt_editorial_secretariat_string_tl{}~:] \ \par% \l__gzt_journal_publisher_tl% % \par% - \space\textendash{}\space% + \c_space_tl\textendash{}\c_space_tl% \__gzt_display_people_by_role:n { secretary }\par \l__gzt_journal_address_tl\par% - \c__gzt_phone_string_tl{}~:~\l__gzt_journal_phone_tl{} \space\textendash{}\space + \c__gzt_phone_string_tl{}~:~\l__gzt_journal_phone_tl{} \c_space_tl\textendash{}\c_space_tl \c__gzt_fax_string_tl{}~:~\l__gzt_journal_fax_tl\par% \href{mailto:\l__gzt_journal_email_tl}{\nolinkurl{\l__gzt_journal_email_tl}}% % \newline% - \space\textendash{}\space + \c_space_tl\textendash{}\c_space_tl \url{\l__gzt_journal_url_tl} \item[\c__gzt_publishingdirector_string_tl{}~:] \__gzt_display_people_by_role:n { president } @@ -1192,7 +1192,7 @@ \begin{description}[leftmargin=1em,font=\color{__gzt_about_frontcover_title_color}] \item[\g__gzt_about_frontcover_string_tl] \g__gzt_about_frontcover_tl \bool_if:NT {\g__gzt_credit_frontcover_bool} { - \space(\c__gzt_credit_frontcover_string_tl{}~:~% + \c_space_tl(\c__gzt_credit_frontcover_string_tl{}~:~% \DTLforeach*[\DTLiseq{\l__gzt_people_role_tl}{frontcovercredit}]{people}{% \l__gzt_firstlastname=first-last-name% ,\l__gzt_people_role_tl=role% @@ -1640,7 +1640,7 @@ \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 } { - \space\textendash{}\space\g__gzt_short_subtitle_tl + \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 } @@ -1649,10 +1649,10 @@ \cs_if_exist:cTF {texorpdfstring} { \texorpdfstring{% - \space\textendash{}\space\citeauthor{\g__gzt_article_bib_key_tl} + \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} }{} }{% - \space\textendash{}\space\citeauthor{\g__gzt_article_bib_key_tl} + \c_space_tl\textendash{}\c_space_tl\citeauthor{\g__gzt_article_bib_key_tl} }% } } @@ -2004,7 +2004,7 @@ \\[1.5mm] \hspace*{\fill}% \__gzt_display_people_by_role:n { president }% - ,\space + ,\c_space_tl \c__gzt_president_signatory_string_tl % \__gzt_after_frontmatter_stuff: {} @@ -2139,14 +2139,12 @@ \tcbuselibrary{breakable,skins,hooks,xparse,theorems,listingsutf8} \usetikzlibrary{babel,fadings,positioning,calc} \tcbset{% - new/blend into/tables/.style={% + new/blend into/tables-/.style={% use counter*=table,% - list inside=lot, - /tcb/code={\appto\tcb@new@colopt{,before title={\fnum@table\space\textendash{}\space}}}},% - new/blend into/figures/.style={% + /tcb/code={\appto\tcb@new@colopt{,before title={\fnum@table}}}},% + new/blend into/figures-/.style={% use counter*=figure,% - list inside=lof, - /tcb/code={\appto\tcb@new@colopt{,before title={\fnum@figure\space\textendash{}\space}}}},% + /tcb/code={\appto\tcb@new@colopt{,before title={\fnum@figure}}}},% } \ExplSyntaxOn \newpagestyle{__gzt_frontmatter_ps}[]{% @@ -2309,7 +2307,7 @@ { \translate{__gzt_century}% \int_compare:nNnT { #1 } < { 0 }{ - \space + \c_space_tl \translate{__gzt_bc} \IfLanguageName {french}{ \@ifnextchar.% @@ -2519,38 +2517,54 @@ } \DeclareTColorBox[blend~into=figures]{gztfigure}{ O{} } { - #1% - % ,title={#2}% ,width=\linewidth% + ,blend~before~title=dash% ,__gzt_tcb_floats_style% + ,#1% + ,code={\ifdefempty{\kvtcb@title}{\tcbset{__gzt_tcb_notitle}}{}}% } \DeclareTColorBox[blend~into=figures]{gztfigure*}{ O{} } { - #1% ,float* - % ,title={#2}% + ,blend~before~title=dash% ,width=\textwidth% ,__gzt_tcb_floats_style% + ,#1% + ,code={\ifdefempty{\kvtcb@title}{\tcbset{__gzt_tcb_notitle}}{}}% } \DeclareTColorBox[blend~into=tables]{gzttable}{ O{} } { - #1% - % ,title={#2}% ,width=\linewidth% + ,blend~before~title=dash% ,__gzt_tcb_floats_style% + ,#1% + ,code={\ifdefempty{\kvtcb@title}{\tcbset{__gzt_tcb_notitle}}{}}% } \DeclareTColorBox[blend~into=tables]{gzttable*}{ O{} } { - #1% ,float* - % ,title={#2}% + ,blend~before~title=dash% ,width=\textwidth% ,__gzt_tcb_floats_style% + ,#1% + ,code={\ifdefempty{\kvtcb@title}{\tcbset{__gzt_tcb_notitle}}{}}% +} +\DeclareTColorBox{gztframe}{ O{} } +{ + ,width=\linewidth% + ,__gzt_tcb_floats_style% + ,#1% +} +\DeclareTColorBox{gztframe*}{ O{} } +{ + ,float* + ,width=\textwidth% + ,__gzt_tcb_floats_style% + ,#1% } \DeclareTColorBox{gztscan}{ O{} } { #1% - % ,title={#2}% ,width=\textwidth% ,__gzt_tcb_floats_style% ,size=tight% @@ -2681,6 +2695,7 @@ {\namepartgiveni} {\namepartprefix} {\namepartsuffix}% + \usebibmacro{name:andothers}% } }{ \DeclareNameFormat{giveninits-last}{% @@ -2711,9 +2726,9 @@ } \renewbibmacro*{volume+number+eid}{% \printfield{volume}% - \setunit{\addcomma\space}% + \setunit{\addcomma\c_space_tl}% \printfield{number}% - \setunit{\addcomma\space}% + \setunit{\addcomma\c_space_tl}% \printfield{eid}} \DeclareFieldFormat[article]{volume}{\mkbibbold{#1}} \DeclareFieldFormat[book]{volume}{\mkbibbold{#1}} @@ -2746,8 +2761,15 @@ } } \tcbset{ - copyright/.style={overlay={\node[rotate=90,anchor=south~west,font=\tiny] - at (frame.south~east) {\copyright{}~#1};}} + copyright/.style={% + overlay={% + \node[rotate=90,anchor=south~west,font=\tiny] at (frame.south~east) {% + \begin{minipage}[t]{\tcbtextheight} + \copyright{}~#1% + \end{minipage} + };% + }% + }% } \tcbset{% __gzt_tcb_floats_style/.style={% @@ -2760,13 +2782,12 @@ ,center~upper% ,sharp~corners=all% ,boxrule=0.3mm% - ,separator~sign~dash - % ,attach~boxed~title~to~bottom~center - % ,minipage~boxed~title*=-6mm - % ,boxed~title~style={ - % enhanced - % ,boxrule=0mm% - % ,sharp~corners=all% + }% +} +\tcbset{% + __gzt_tcb_notitle/.style={% + blend~before~title~code={##1} + ,title={\c_space_tl}% }% } \tcbset{% -- cgit v1.2.3