From ba91902004c8ba5dda89ddfacd0ceba3491820d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 23 Feb 2021 22:34:05 +0000 Subject: easybook (23feb21) git-svn-id: svn://tug.org/texlive/trunk@57859 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybook.cls | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 16ae60d7a78..470d7ae4951 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/02/21}{1.23f}{} +\ProvidesExplClass{easybook}{2021/02/23}{1.23g}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -1046,7 +1046,7 @@ bibstyle .choice:, bibstyle .value_required:n = true, - bibstyle/number .code:n = + bibstyle/numerical .code:n = { \tl_set:Nn \l__bib_style_tl{#1} \tl_clear:N \l__bib_mysty_tl @@ -1058,7 +1058,7 @@ }, bibstyle/unknown .code:n = {\tl_set_eq:NN \l__bib_mysty_tl\l_keys_value_tl}, - bibstyle .initial:n = number, + bibstyle .initial:n = numerical, citestyle .code:n = {\tl_set:Nn \l__bib_citesty_tl{#1}}, @@ -1070,10 +1070,10 @@ { \tl_if_empty:NTF \l__bib_mysty_tl { - \tl_if_eq:VnT \l__bib_style_tl{number} + \tl_if_eq:VnT \l__bib_style_tl{numerical} { \bibliographystyle{gbt7714-numerical} - \setcitestyle{square,comma,super} + \setcitestyle{comma,square,super} } \tl_if_eq:VnT \l__bib_style_tl{authoryear} {\bibliographystyle{gbt7714-author-year}} @@ -1081,6 +1081,8 @@ }{ \exp_args:NV \bibliographystyle\l__bib_mysty_tl } + \tl_if_empty:NF \l__bib_citesty_tl + {\exp_args:NV \setcitestyle\l__bib_citesty_tl} \cs_set:Npn \bibsection{\__title_mark_intoc:n \bibname} \skip_set:Nn \bibsep{0ex} \NewDocumentCommand\printbibliography{o} @@ -1100,7 +1102,7 @@ \__put_biblatex:n {style = \l__bib_mysty_tl} } \tl_if_empty:NF \l__bib_citesty_tl - {\__put_biblatex:n {citestyle = \l__bib_mysty_tl}} + {\__put_biblatex:n {citestyle = \l__bib_citesty_tl}} \__put_biblatex:n {backend = biber} } \cs_new_protected:Npn \__biblatex_after_set: @@ -1178,7 +1180,7 @@ rulecolor = \color{ctex@frame}, commentstyle = \color{gray}, emphstyle = \color{ctex@emph}, - emph = {caption,subcaption,tabularx}, + emph = {caption,makecell,subcaption,tabularx}, keywordstyle = \lst@ifdisplaystyle\bfseries\color{ctex@emph}\else\color{ctex@verb}\fi, morekeywords = -- cgit v1.2.3