texlive[62522] Master/texmf-dist: easybook (8mar22)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 8 22:24:57 CET 2022
Revision: 62522
http://tug.org/svn/texlive?view=revision&revision=62522
Author: karl
Date: 2022-03-08 22:24:56 +0100 (Tue, 08 Mar 2022)
Log Message:
-----------
easybook (8mar22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2022-03-08 21:24:35 UTC (rev 62521)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2022-03-08 21:24:56 UTC (rev 62522)
@@ -21,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v1.641,
- date = 2022/03/06,
+ version = v1.642,
+ date = 2022/03/08,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = q1jx at foxmail.com,
@@ -531,7 +531,7 @@
\subsection{超链接}
\label{subsec:hyperlinks}
-模块 \module*{refset} 将超链接选项交给 \pkg*{hyperref} 宏包处理，除了一些关于 \code{pdf} 书签或已预设的选项可能失效，其它由接口命令 \cs*{hypersetup} 支持的多数选项可用。
+模块 \module*{refset} 将超链接选项交给 \pkg*{hyperref} 宏包处理。除了一些超链接颜色的选项失效，其它由宏包全局和接口命令 \cs*{hypersetup} 支持的多数选项可用。
\begin{options}
\keychoice{linktype}{edge,colors,none}\Module{refset}\Default{edge}
超链接类型。\code{edge} 使超链接形式为边框，\code{colors} 使超链接字体为彩色，\code{none} 关闭超链接边框与颜色，此时 \option{linkcolor} 选项无效。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-03-08 21:24:35 UTC (rev 62521)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-03-08 21:24:56 UTC (rev 62522)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/03/06}{1.641}
+\ProvidesExplClass{easybook}{2022/03/08}{1.642}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -76,22 +76,22 @@
\cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
}
\cs_new_protected:Npn \eb_setmainfont:nn #1#2
- { \__fontspec_main_setmainfont:nn {#1} {#2} }
+ { \__fontspec_main_setmainfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setsansfont:nn #1#2
- { \__fontspec_main_setsansfont:nn {#1} {#2} }
+ { \__fontspec_main_setsansfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setmonofont:nn #1#2
- { \__fontspec_main_setmonofont:nn {#1} {#2} }
+ { \__fontspec_main_setmonofont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2
- { \eb_set_family:nnn { \CJKrmdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2
- { \eb_set_family:nnn { \CJKsfdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
- { \eb_set_family:nnn { \CJKttdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
\eb_seq_map_inline:nn
{ main,sans,mono,CJKmain,CJKsans,CJKmono }
{
\exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
- {\use:c { eb_set#1font:nn } {##1,##3} {##2}}
+ {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
}
\RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
{
@@ -303,7 +303,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/03/06}{1.641}
+\ProvidesExplPackage{easybase}{2022/03/08}{1.642}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -451,7 +451,7 @@
{
style,subfont,spread,
refset,bibset,thmset,
- geoset,hdrset,tocset
+ geoset,hdrset,tocset,list
}
{
\ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} }
@@ -873,11 +873,10 @@
fnindent .dim_set:N = \footindent,
fnindent .initial:n = 0.8em,
fnparskip .skip_set:N = \footparskip,
- fnparskip .initial:n = 0ex,
+ fnparskip .initial:n = 0ex plus .1ex,
fnparindent .tl_set:N = \footparindent,
fnparindent .initial:n = 2em,
fnpara-form .tl_set:N = \l__eb_fnpara_format_tl,
-
fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
fntext-pos .initial:n = super,
fntext-code .code:n = \eb_assign_fntext_code:n {#1},
@@ -885,13 +884,11 @@
fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate },
fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust },
fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 },
-
footnotetype .multichoices:nn =
{ default,hang,bottom,para,flush }
{ \eb_footnote_value_handle:n {#1} },
footnotetype .value_required:n = true,
footnotetype .initial:n = hang,
-
fnmark-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { v },
fnmark-hmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { h },
fntext-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { text } { v },
@@ -898,7 +895,6 @@
fnmark-vmove .initial:n = 0pt,
fnmark-hmove .initial:n = 0pt,
fntext-vmove .initial:n = 0pt,
-
fnmark-num .choices:nn =
{ plain,pifont,pifont*,pifont-sans,pifont-sans* }
{ \eb_fnmate_normal_label_set:Nn \theupfootnote {#1} },
@@ -1261,7 +1257,7 @@
{
\ctex_define:n
{
- list/#1 .meta:n =
+ list/#1 .meta:n =
{
figure/#1 = ##1,table/#1 = ##1,
lstlisting/#1 = ##1
@@ -1273,7 +1269,7 @@
{
\ctex_define:nn { tocset }
{
- #1-every .code:n =
+ #1-every .code:n =
{
\ctex_set:n
{
@@ -1325,32 +1321,47 @@
{ \p at numberline{\use:c { #1name }~\use:c { the#1 }} }
\ctex_set:n
{
- part/tocformat = \addvspace{1pc}\sffamily\large,
- part/tocindent = 0em,
- part/tocrule = \tocrule{}[\bfseries],
- part/tocline = \CTEXnumberline{#1}#2,
- chapter/tocformat = \addvspace{1pc}\sffamily,
- chapter/tocindent = 0em,
- chapter/tocrule = \tocrule{$\cdot$}[\bfseries],
- chapter/tocline = \CTEXnumberline{#1}#2,
- section/tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily },
- section/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em },
- section/tocrule =
+ part =
{
- \bool_if:NTF \l__eb_class_mode_book_bool
- { \tocrule{$\cdot$} }
- { \tocrule{$\cdot$}[\bfseries] }
+ tocformat = \addvspace{1pc}\sffamily\large,
+ tocindent = 0em,
+ tocrule = \tocrule{}[\bfseries],
+ tocline = \CTEXnumberline{#1}#2
},
- subsection/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
- subsection/tocrule = \tocrule{$\cdot$},
- list/tocindent = 0em,
- list/tocrule = \tocrule{$\cdot$},
- list/between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} },
+ chapter =
+ {
+ tocformat = \addvspace{1pc}\sffamily,
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$}[\bfseries],
+ tocline = \CTEXnumberline{#1}#2
+ },
+ section =
+ {
+ tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily },
+ tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em },
+ tocrule =
+ {
+ \bool_if:NTF \l__eb_class_mode_book_bool
+ { \tocrule{$\cdot$} }
+ { \tocrule{$\cdot$}[\bfseries] }
+ }
+ },
+ subsection =
+ {
+ tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
+ tocrule = \tocrule{$\cdot$}
+ },
+ list =
+ {
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$},
+ between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }
+ },
table/tocline = \listnumberline{table}#2,
figure/tocline = \listnumberline{figure}#2,
- lstlisting/tocline = \listnumberline{lstlisting}#2
+ lstlisting/tocline = \listnumberline{lstlisting}#2,
+ tocset/tocafter-every = \hspace{1em}
}
-\ctex_set:nn { tocset } { tocafter-every = \hspace{1em} }
\prop_new:N \l__eb_list_label_entry_prop
\prop_set_from_keyval:Nn \l__eb_list_label_entry_prop
{
@@ -1784,9 +1795,8 @@
\tl_gset:Nn \dblfloatpagefraction { 0.9 }
}
\dim_zero_new:N \mathindent
-\skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
-\skip_set:Nn \textfloatsep { 12pt plus 2pt minus 4pt }
-\skip_set:Nn \dbltextfloatsep { 12pt plus 2pt minus 4pt }
+\skip_set:Nn \textfloatsep { 12pt plus 4pt minus 3pt }
+\skip_set:Nn \dbltextfloatsep { 12pt plus 4pt minus 3pt }
\skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt }
%% \int_gset:Nn \vbadness { 10000 }
%% \int_gset:Nn \hbadness { 10000 }
@@ -2217,7 +2227,6 @@
linktype/colors .code:n = \eb_link_colors_set:,
linktype/various .meta:n = linktype/colors,
linktype .initial:n = edge,
-
linktoc .choice:,
linktoc/unknown .code:n = \eb_link_toc_put:n {#1},
linktoc .default:n = all,
@@ -2257,6 +2266,7 @@
urlcolor = ctex at url,urlbordercolor = ctex at url,
citecolor = ctex at cite,citebordercolor = ctex at cite
}
+ \hypersetup{bookmarksnumbered = true}
\exp_args:NV \hypersetup \l__eb_hyperref_clist
}
@@ -2307,7 +2317,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.641}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/08}{1.642}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2022-03-08 21:24:35 UTC (rev 62521)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2022-03-08 21:24:56 UTC (rev 62522)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/03/06}{1.641}
+\ProvidesExplPackage{easybase}{2022/03/08}{1.642}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -168,7 +168,7 @@
{
style,subfont,spread,
refset,bibset,thmset,
- geoset,hdrset,tocset
+ geoset,hdrset,tocset,list
}
{
\ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} }
@@ -590,11 +590,10 @@
fnindent .dim_set:N = \footindent,
fnindent .initial:n = 0.8em,
fnparskip .skip_set:N = \footparskip,
- fnparskip .initial:n = 0ex,
+ fnparskip .initial:n = 0ex plus .1ex,
fnparindent .tl_set:N = \footparindent,
fnparindent .initial:n = 2em,
fnpara-form .tl_set:N = \l__eb_fnpara_format_tl,
-
fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
fntext-pos .initial:n = super,
fntext-code .code:n = \eb_assign_fntext_code:n {#1},
@@ -602,13 +601,11 @@
fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate },
fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust },
fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 },
-
footnotetype .multichoices:nn =
{ default,hang,bottom,para,flush }
{ \eb_footnote_value_handle:n {#1} },
footnotetype .value_required:n = true,
footnotetype .initial:n = hang,
-
fnmark-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { v },
fnmark-hmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { h },
fntext-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { text } { v },
@@ -615,7 +612,6 @@
fnmark-vmove .initial:n = 0pt,
fnmark-hmove .initial:n = 0pt,
fntext-vmove .initial:n = 0pt,
-
fnmark-num .choices:nn =
{ plain,pifont,pifont*,pifont-sans,pifont-sans* }
{ \eb_fnmate_normal_label_set:Nn \theupfootnote {#1} },
@@ -978,7 +974,7 @@
{
\ctex_define:n
{
- list/#1 .meta:n =
+ list/#1 .meta:n =
{
figure/#1 = ##1,table/#1 = ##1,
lstlisting/#1 = ##1
@@ -990,7 +986,7 @@
{
\ctex_define:nn { tocset }
{
- #1-every .code:n =
+ #1-every .code:n =
{
\ctex_set:n
{
@@ -1042,32 +1038,47 @@
{ \p at numberline{\use:c { #1name }~\use:c { the#1 }} }
\ctex_set:n
{
- part/tocformat = \addvspace{1pc}\sffamily\large,
- part/tocindent = 0em,
- part/tocrule = \tocrule{}[\bfseries],
- part/tocline = \CTEXnumberline{#1}#2,
- chapter/tocformat = \addvspace{1pc}\sffamily,
- chapter/tocindent = 0em,
- chapter/tocrule = \tocrule{$\cdot$}[\bfseries],
- chapter/tocline = \CTEXnumberline{#1}#2,
- section/tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily },
- section/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em },
- section/tocrule =
+ part =
{
- \bool_if:NTF \l__eb_class_mode_book_bool
- { \tocrule{$\cdot$} }
- { \tocrule{$\cdot$}[\bfseries] }
+ tocformat = \addvspace{1pc}\sffamily\large,
+ tocindent = 0em,
+ tocrule = \tocrule{}[\bfseries],
+ tocline = \CTEXnumberline{#1}#2
},
- subsection/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
- subsection/tocrule = \tocrule{$\cdot$},
- list/tocindent = 0em,
- list/tocrule = \tocrule{$\cdot$},
- list/between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} },
+ chapter =
+ {
+ tocformat = \addvspace{1pc}\sffamily,
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$}[\bfseries],
+ tocline = \CTEXnumberline{#1}#2
+ },
+ section =
+ {
+ tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily },
+ tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em },
+ tocrule =
+ {
+ \bool_if:NTF \l__eb_class_mode_book_bool
+ { \tocrule{$\cdot$} }
+ { \tocrule{$\cdot$}[\bfseries] }
+ }
+ },
+ subsection =
+ {
+ tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
+ tocrule = \tocrule{$\cdot$}
+ },
+ list =
+ {
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$},
+ between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }
+ },
table/tocline = \listnumberline{table}#2,
figure/tocline = \listnumberline{figure}#2,
- lstlisting/tocline = \listnumberline{lstlisting}#2
+ lstlisting/tocline = \listnumberline{lstlisting}#2,
+ tocset/tocafter-every = \hspace{1em}
}
-\ctex_set:nn { tocset } { tocafter-every = \hspace{1em} }
\prop_new:N \l__eb_list_label_entry_prop
\prop_set_from_keyval:Nn \l__eb_list_label_entry_prop
{
@@ -1501,9 +1512,8 @@
\tl_gset:Nn \dblfloatpagefraction { 0.9 }
}
\dim_zero_new:N \mathindent
-\skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
-\skip_set:Nn \textfloatsep { 12pt plus 2pt minus 4pt }
-\skip_set:Nn \dbltextfloatsep { 12pt plus 2pt minus 4pt }
+\skip_set:Nn \textfloatsep { 12pt plus 4pt minus 3pt }
+\skip_set:Nn \dbltextfloatsep { 12pt plus 4pt minus 3pt }
\skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt }
%% \int_gset:Nn \vbadness { 10000 }
%% \int_gset:Nn \hbadness { 10000 }
@@ -1934,7 +1944,6 @@
linktype/colors .code:n = \eb_link_colors_set:,
linktype/various .meta:n = linktype/colors,
linktype .initial:n = edge,
-
linktoc .choice:,
linktoc/unknown .code:n = \eb_link_toc_put:n {#1},
linktoc .default:n = all,
@@ -1974,6 +1983,7 @@
urlcolor = ctex at url,urlbordercolor = ctex at url,
citecolor = ctex at cite,citebordercolor = ctex at cite
}
+ \hypersetup{bookmarksnumbered = true}
\exp_args:NV \hypersetup \l__eb_hyperref_clist
}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-03-08 21:24:35 UTC (rev 62521)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-03-08 21:24:56 UTC (rev 62522)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/03/06}{1.641}
+\ProvidesExplClass{easybook}{2022/03/08}{1.642}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -81,22 +81,22 @@
\cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
}
\cs_new_protected:Npn \eb_setmainfont:nn #1#2
- { \__fontspec_main_setmainfont:nn {#1} {#2} }
+ { \__fontspec_main_setmainfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setsansfont:nn #1#2
- { \__fontspec_main_setsansfont:nn {#1} {#2} }
+ { \__fontspec_main_setsansfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setmonofont:nn #1#2
- { \__fontspec_main_setmonofont:nn {#1} {#2} }
+ { \__fontspec_main_setmonofont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2
- { \eb_set_family:nnn { \CJKrmdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2
- { \eb_set_family:nnn { \CJKsfdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
- { \eb_set_family:nnn { \CJKttdefault } {#1} {#2} }
+ { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
\eb_seq_map_inline:nn
{ main,sans,mono,CJKmain,CJKsans,CJKmono }
{
\exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
- {\use:c { eb_set#1font:nn } {##1,##3} {##2}}
+ {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
}
\RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
{
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2022-03-08 21:24:35 UTC (rev 62521)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2022-03-08 21:24:56 UTC (rev 62522)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.641}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/08}{1.642}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.