diff options
author | Karl Berry <karl@freefriends.org> | 2024-07-15 21:36:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-07-15 21:36:29 +0000 |
commit | d176a04aba8ab1cf3a8526e7b6cdd31e3bf3a9ad (patch) | |
tree | af4db0d6e5696d22caaca9fee255ab5ca14df32b /Master | |
parent | d959a6879a176e01f069437f342f21af93c7ff36 (diff) |
easybook (15jul24)
git-svn-id: svn://tug.org/texlive/trunk@71808 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/README.md | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 626026 -> 625940 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 31 | ||||
-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 |
7 files changed, 58 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md index 6d523ef4c66..72378fef178 100644 --- a/Master/texmf-dist/doc/latex/easybook/README.md +++ b/Master/texmf-dist/doc/latex/easybook/README.md @@ -1,5 +1,5 @@ # The `easybook` document class -Easily typesetting Chinese theses or books (v2024cq) +Easily typesetting Chinese theses or books (v2024cs) ## Abstract `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes. @@ -11,5 +11,5 @@ This work may be distributed and/or modified under the conditions of the LPPL-1. | [Gitee](https://gitee.com/texno3/easybook) | [Github](https://github.com/texno3/easybook) | [CTAN](https://ctan.org/pkg/easybook) | ## Maintainer -QuYi<br/> +Qu Yi<br/> Email: toquyi@163.com
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex f13ae4dde99..d336c3af6dd 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 04af78defea..2d98d894377 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024cq, - date = 2024/07/12, + version = v2024cs, + date = 2024/07/15, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 0ff31af280d..803ccc09afd 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -14,7 +14,7 @@ % This work has the LPPL maintenance status `maintained'. %<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15] %<*class> -\ProvidesExplClass{easybook}{2024/07/12}{2024cq} +\ProvidesExplClass{easybook}{2024/07/15}{2024cs} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool @@ -301,7 +301,7 @@ %</class> %<*package> \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/07/12}{2024cq} +\ProvidesExplPackage{easybase}{2024/07/15}{2024cs} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -372,7 +372,11 @@ \IfNoValueTF{#1} {\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}} {\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}} + \IfFileExists{#2.sty}{} + {\msg_warning:nnn { easybase } { package-not-found } {#2}} } +\msg_new:nnn { easybase } { package-not-found } + { The~macro~package~'#1'~can't~be~found. } \cs_new_protected:Npn \ebloadpackage #1 { \int_compare:nTF { \clist_count:n {#1} <= 1 } @@ -802,7 +806,7 @@ \UseFntSymbsList{empty} \cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList \cs_set_eq:NN \setfntsymbol \UseFntSymbsList -\cs_new:Npn \eb_int_format_trans:NN #1 +\cs_new:Npn \eb_int_type_trans:NN #1 { \str_case:nn {#1} { @@ -837,23 +841,38 @@ } \cs_set_eq:NN \thedownfootnote \thefootnote } +\cs_generate_variant:Nn \msg_warning:nnnn { nnnV } \cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2 { \tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2} \clist_map_inline:nn { A,a,1,I,i,c,s } { - \regex_match:nnT {##1} {#2} + \regex_match:nnTF {##1} {#2} { \regex_replace_once:nnN {##1} - { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} } + { \c{eb_int_type_trans:NN} ##1 \c{c@footnote} } \l__eb_fnmarktext_short_tokens_tl - \seq_map_break: + \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl + \clist_map_break: + } + { + \str_if_eq:nnT {##1} { s } + { + \str_if_eq:nnTF {#1} { \thefootnote } + { \str_set:Nn \l_tmpa_str { \thedownfootnote } } + { \str_set:Nn \l_tmpa_str { \theupfootnote } } + \msg_warning:nnnV { easybase } { unknown-fnt-type } {#2} \l_tmpa_str + } } } - \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl \cs_set_eq:NN \thedownfootnote \thefootnote } +\msg_new:nnn { easybase } { unknown-fnt-type } + { + The~'#1'~includes~unknown~footnote~numbering~type \\ + in~#2. + } \cs_new_protected:Npn \eb_footnote_value_handle:n #1 { \str_case:nnF {#1} @@ -2665,7 +2684,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/12}{2024cq} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/15}{2024cs} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index ba32310a30e..d8cb268a644 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}[2021/11/15] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/07/12}{2024cq} +\ProvidesExplPackage{easybase}{2024/07/15}{2024cs} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -91,7 +91,11 @@ \IfNoValueTF{#1} {\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}} {\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}} + \IfFileExists{#2.sty}{} + {\msg_warning:nnn { easybase } { package-not-found } {#2}} } +\msg_new:nnn { easybase } { package-not-found } + { The~macro~package~'#1'~can't~be~found. } \cs_new_protected:Npn \ebloadpackage #1 { \int_compare:nTF { \clist_count:n {#1} <= 1 } @@ -521,7 +525,7 @@ \UseFntSymbsList{empty} \cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList \cs_set_eq:NN \setfntsymbol \UseFntSymbsList -\cs_new:Npn \eb_int_format_trans:NN #1 +\cs_new:Npn \eb_int_type_trans:NN #1 { \str_case:nn {#1} { @@ -556,23 +560,38 @@ } \cs_set_eq:NN \thedownfootnote \thefootnote } +\cs_generate_variant:Nn \msg_warning:nnnn { nnnV } \cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2 { \tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2} \clist_map_inline:nn { A,a,1,I,i,c,s } { - \regex_match:nnT {##1} {#2} + \regex_match:nnTF {##1} {#2} { \regex_replace_once:nnN {##1} - { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} } + { \c{eb_int_type_trans:NN} ##1 \c{c@footnote} } \l__eb_fnmarktext_short_tokens_tl - \seq_map_break: + \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl + \clist_map_break: + } + { + \str_if_eq:nnT {##1} { s } + { + \str_if_eq:nnTF {#1} { \thefootnote } + { \str_set:Nn \l_tmpa_str { \thedownfootnote } } + { \str_set:Nn \l_tmpa_str { \theupfootnote } } + \msg_warning:nnnV { easybase } { unknown-fnt-type } {#2} \l_tmpa_str + } } } - \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl \cs_set_eq:NN \thedownfootnote \thefootnote } +\msg_new:nnn { easybase } { unknown-fnt-type } + { + The~'#1'~includes~unknown~footnote~numbering~type \\ + in~#2. + } \cs_new_protected:Npn \eb_footnote_value_handle:n #1 { \str_case:nnF {#1} diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 823c6896366..0e714ce9680 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] -\ProvidesExplClass{easybook}{2024/07/12}{2024cq} +\ProvidesExplClass{easybook}{2024/07/15}{2024cs} {Easily typesetting Chinese theses or books} \bool_new: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 56e7c2763d6..09f5d81cc2d 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}{2024/07/12}{2024cq} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/15}{2024cs} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |