diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-17 20:46:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-17 20:46:23 +0000 |
commit | 7e35adbdee582daff121151221ef2cb0ff887f89 (patch) | |
tree | f114f98236276a474f3e8325100a50d78a999c86 | |
parent | 04125cde6fa8e062cf366f08d2208e313049aa6d (diff) |
easybook (17nov21)
git-svn-id: svn://tug.org/texlive/trunk@61085 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 581540 -> 581408 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
6 files changed, 19 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex d949277b011..9f1eaf022ed 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf +++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index 661175447eb..fdf030956ef 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/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 = 排版简体中文学位论文和书籍, diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 2e023285a00..4d5a6904436 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 99518e4bf6e..84eb1f466c8 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \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 } @@ -1484,7 +1484,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 @@ -1783,7 +1782,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 @@ -1793,7 +1792,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}, @@ -1806,7 +1805,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 } { @@ -1842,7 +1841,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 } @@ -1850,7 +1849,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} @@ -2022,7 +2021,7 @@ } } -\cs_new:Npn \eb_allow_url_break: +\cs_new_protected:Npn \eb_allow_url_break: { \eb_appto_cmd:Nn \UrlBreaks { diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index b73ce1ff16e..b680720a6ee 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \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 diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 245fd9dc665..91063fd4eca 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\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 } |