diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/generic/hologo/README.md (renamed from macros/latex/contrib/hologo/README.md) | 0 | ||||
-rw-r--r-- | macros/generic/hologo/hologo.dtx (renamed from macros/latex/contrib/hologo/hologo.dtx) | 0 | ||||
-rw-r--r-- | macros/generic/hologo/hologo.pdf (renamed from macros/latex/contrib/hologo/hologo.pdf) | bin | 602839 -> 602839 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 19 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.pdf | bin | 581540 -> 581408 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.tex | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/macros/latex/contrib/hologo/README.md b/macros/generic/hologo/README.md index 854664e194..854664e194 100644 --- a/macros/latex/contrib/hologo/README.md +++ b/macros/generic/hologo/README.md diff --git a/macros/latex/contrib/hologo/hologo.dtx b/macros/generic/hologo/hologo.dtx index 0c14b7f010..0c14b7f010 100644 --- a/macros/latex/contrib/hologo/hologo.dtx +++ b/macros/generic/hologo/hologo.dtx diff --git a/macros/latex/contrib/hologo/hologo.pdf b/macros/generic/hologo/hologo.pdf Binary files differindex 701d02fc6d..701d02fc6d 100644 --- a/macros/latex/contrib/hologo/hologo.pdf +++ b/macros/generic/hologo/hologo.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 2e023285a0..4d5a690443 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/11/16}{1.40Q} +\ProvidesExplClass{easybook}{2021/11/16}{1.40R} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/11/16}{1.40Q} +\ProvidesExplPackage{easybase}{2021/11/16}{1.40R} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1789,7 +1789,6 @@ \setcounter{totalnumber}{8} \allowdisplaybreaks[4] \everymath{\displaystyle} -\tl_gset:Nn \ULthickness { \l__eb_rule_width_dim } \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif} \cs_set_protected:Npn \hangpara #1#2 @@ -2088,7 +2087,7 @@ } \bool_set_true:N \l__eb_backend_bibtex_bool -\tl_new:N \l__eb_bib_all_style_tl +\tl_new:N \l__eb_bib_both_style_tl \tl_new:N \l__eb_bib_cite_style_tl \clist_new:N \l__eb_bib_datafile_clist @@ -2098,7 +2097,7 @@ backend .value_required:n = true, backend/bibtex .code:n = { }, backend/biblatex .code:n = \bool_set_false:N \l__eb_backend_bibtex_bool, - bibstyle .code:n = \tl_set:Nn \l__eb_bib_all_style_tl {#1}, + bibstyle .code:n = \tl_set:Nn \l__eb_bib_both_style_tl {#1}, bibstyle .value_required:n = true, bibstyle .initial:n = numerical, citestyle .code:n = \tl_set:Nn \l__eb_bib_cite_style_tl {#1}, @@ -2111,7 +2110,7 @@ \cs_new_protected:Npn \eb_natbib_bibtex_set: { \LoadPackage[sort&compress]{natbib} - \str_case:VnTF \l__eb_bib_all_style_tl + \str_case:VnTF \l__eb_bib_both_style_tl { { numerical } { @@ -2147,7 +2146,7 @@ { \PassOptionsToPackage{#1}{biblatex} } \cs_new_protected:Npn \eb_biblatex_biber_set: { - \str_case:VnF \l__eb_bib_all_style_tl + \str_case:VnF \l__eb_bib_both_style_tl { { numerical } { \use_i:nnn } { authoryear } { \use_ii:nnn } @@ -2155,7 +2154,7 @@ { \use_iii:nnn } { \eb_put_biblatex:n { style = gb7714-2015 } } { \eb_put_biblatex:n { style = gb7714-2015ay } } - { \eb_put_biblatex:n { style = \l__eb_bib_all_style_tl } } + { \eb_put_biblatex:n { style = \l__eb_bib_both_style_tl } } \tl_if_empty:NF \l__eb_bib_cite_style_tl { \eb_put_biblatex:n { citestyle = \l__eb_bib_cite_style_tl } } \LoadPackage[backend = biber]{biblatex} @@ -2327,7 +2326,7 @@ } } -\cs_new:Npn \eb_allow_url_break: +\cs_new_protected:Npn \eb_allow_url_break: { \eb_appto_cmd:Nn \UrlBreaks { @@ -2394,7 +2393,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40Q} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40R} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex d949277b01..9f1eaf022e 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 661175447e..fdf030956e 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40Q, + version = v1.40R, date = 2021/11/16, authors = 瞿毅, info = 排版简体中文学位论文和书籍, |