diff options
Diffstat (limited to 'macros/latex/contrib')
107 files changed, 808 insertions, 486 deletions
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README index ca3df1b169..c89bc341d7 100644 --- a/macros/latex/contrib/caption/README +++ b/macros/latex/contrib/caption/README @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Release 2020-09-02 +Release 2020-09-11 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx index 5f2823ac0b..956cc40eb8 100644 --- a/macros/latex/contrib/caption/caption3.dtx +++ b/macros/latex/contrib/caption/caption3.dtx @@ -32,7 +32,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{3636} +% \CheckSum{3646} % % \iffalse %<*driver> @@ -192,7 +192,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2020/08/30 v2.0 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2020/09/11 v2.0b caption3 kernel (AR)] % \end{macrocode} % % \section{Generic helpers} @@ -3078,13 +3078,12 @@ % \changes{v1.1}{2006/05/14}{\package{frenchb} babel support added} % \changes{v2.0}{2020/08/01}{\package{french} babel support updated} % -% We provide a dummy `french' caption label separator (so |labelsep=french| works fine); -% it will be re-defined dependant on the `french' package used later on. +% We provide a `french' caption label separator. +% |\caption@french@label|\-|separator| will be defined later on, +% dependent on the `french' package used later on. +% % \begin{macrocode} -\caption@ifdecl{labelseparator}{french} - {\let\caption@french@labelseparator\@undefined}% - {\caption@@set{labelseparator}{labelseparator@french}{default}% - \let\caption@french@labelseparator\caption@labelseparator@french} +\DeclareCaptionLabelSeparator{french}{\caption@french@labelseparator} % \end{macrocode} % % \begin{macro}{\caption@IfBabelFrench} @@ -3103,26 +3102,46 @@ \caption@IfBabelFrench{% % \end{macrocode} % -% If the language `french' is selected, we switch the default label separator to `french' -% which uses |\if|\-|FB|\-|Customise|\-|Fig|\-|Tab|\-|Captions| and |\Caption|\-|Separator|. +% The \package{babel-french} package uses |\Caption|\-|Separator| as label separator. % % \begin{macrocode} - \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator? - \DeclareCaptionLabelSeparator{french}{% - \ifFBCustomiseFigTabCaptions - \CaptionSeparator - \else - \space : % - \fi}% - \fi - \caption@ifdefined\extrasfrench{% - \addto\extrasfrench{% - \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% + \providecommand\caption@french@labelseparator{\CaptionSeparator}% % \end{macrocode} % -% Suppress the warning about load order (since it's not longer valid anymore). +% Add a space before the label separator `colon' in French +% in order to avoid problems when |Auto|\-|Space|\-|Punctuation| is set to |false|. +% % \begin{macrocode} - \caption@AtBeginDocument{\@nameuse{@FBwarning@capsepfalse}}% + \DeclareCaptionLabelSeparator{colon}{\autospace@beforeFDP : }% +% \end{macrocode} +% +% We switch the default label separator to `french', dependant on the switches +% |Customise|\-|Fig|\-|Tab|\-|Captions| and |Old|\-|Fig|\-|Tab|\-|Captions|. +% +% \begin{macrocode} + \ifFBOldFigTabCaptions + \typeout{OldFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed + \caption@ifdefined\extrasfrench{% + \addto\extrasfrench{% + \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% + \caption@ifdefined\extrasacadian{% + \addto\extrasacadian{% + \caption@switchdefault{labelseparator}{\babel@save #1}{french}}}{}% + \else + \typeout{OldFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed + \ifFBCustomiseFigTabCaptions + \typeout{CustomiseFigTabCaptions=true}% %%%%%%%%%%% <= needs to be removed + \caption@AtBeginDocument{% + \ifFB@mainlanguage@FR + \typeout{mainlanguage=FR}% + \SetCaptionDefault{labelseparator}{french}% + \else + \typeout{mainlanguage=other}% %%%%%%%%%%% <= needs to be removed + \fi}% + \else + \typeout{CustomiseFigTabCaptions=false}% %%%%%%%%%%% <= needs to be removed + \fi + \fi % \end{macrocode} % % \begin{macrocode} @@ -3149,13 +3168,16 @@ \caption@IfFrenchLe{% % \end{macrocode} % -% If the language `french' is selected, we switch the default label separator to `french' -% which uses |\caption|\-|separator|, and switch the default font to `it' and the default label font to `up'. +% The \package{frenchle} package uses |\caption|\-|separator| plus |\space| as label separator. +% +% \begin{macrocode} + \providecommand\caption@french@labelseparator{\captionseparator\space}% +% \end{macrocode} +% +% If the language `french' is selected, we switch the default label separator to `french', +% and switch the default font to `it' and the default label font to `up'. % % \begin{macrocode} - \ifx\caption@french@labelseparator\caption@labelseparator@french % still set to dummy label separator? - \DeclareCaptionLabelSeparator{french}{\captionseparator\space}% - \fi \g@addto@macro\extrasfrench{% \caption@switchdefault{labelseparator}{\let\caption@original@labelseparator#1}{french}% \caption@switchdefault{font}{\let\caption@original@font#1}{it}% @@ -3578,6 +3600,7 @@ % \subsection{The subfig package} % \changes{v1.1}{2007/07/07}{Adaptions to the \package{subfig} package added} % \changes{v1.4a}{2011/11/01}{Test for the \package{subfig} package revised} +% \changes{v2.0a}{2020/09/07}{Re-definition of \cs{sf@ifpositiontop} added} % % Since the \package{subfig} package is not maintained anymore, % we have to make adaptions to \thispackage~\version{1.1} here. @@ -3595,6 +3618,7 @@ \let\caption@setfloattype\@gobble \let\@dottedxxxline\sf@NEW@dottedxxxline \let\sf@subfloat\sf@NEW@subfloat + \let\sf@ifpositiontop\caption@iftop % \end{macrocode} % \begin{macrocode} \fi diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index 5937d8be02..959212901a 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,6 +6,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-09-11] + +### Added +- Support for CIELAB separations with `dvips` + +### Fixed +- Some PDF object functions +- Separation color selection for `dvipdfmx`/XeTeX +- Logic for some aspects of CIELAB Separation color + ## [2020-09-01] ### Changed @@ -110,7 +120,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2020-09-01...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-09-11...HEAD +[2020-09-11]: https://github.com/latex3/latex3/compare/2020-09-01...2020-09-11 [2020-09-01]: https://github.com/latex3/latex3/compare/2020-08-07...2020-09-01 [2020-08-07]: https://github.com/latex3/latex3/compare/2020-06-29...2020-08-07 [2020-06-29]: https://github.com/latex3/latex3/compare/2020-06-23...2020-06-29 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index 86d0912e2c..20a0301cf2 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2020-09-01 +Release 2020-09-11 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index a90cd6bb05..abd972dca0 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2020-09-01}{} + {l3backend-dvipdfmx.def}{2020-09-11}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2020-09-01}{} + {l3backend-dvips.def}{2020-09-11}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2020-09-01}{} + {l3backend-dvisvgm.def}{2020-09-11}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2020-09-01}{} + {l3backend-luatex.def}{2020-09-11}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2020-09-01}{} + {l3backend-pdftex.def}{2020-09-11}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2020-09-01}{} + {l3backend-xetex.def}{2020-09-11}{} {L3 backend support: XeTeX} %</xetex> % \end{macrocode} @@ -367,7 +367,9 @@ % \end{macro} % % \begin{macro}{\__kernel_backend_scope_begin:, \__kernel_backend_scope_end:} -% Scoping is done using the backend-specific specials. +% Scoping is done using the backend-specific specials. We use the versions +% originally from \texttt{xdvidfpmx} (\texttt{x:}) as these are well-tested +% \enquote{in the wild}. % \begin{macrocode} \cs_new_protected:Npn \__kernel_backend_scope_begin: { \__kernel_backend_literal:n { x:gsave } } diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index 78cf2d9ebb..039fa38c85 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -250,7 +250,7 @@ %</luatex|pdftex> % \end{macrocode} % -% \subsection{\texttt{dvipdfmx} backend} +% \subsection{\texttt{dvipdfmx}/\XeTeX{} backend} % % \begin{macrocode} %<*dvipdfmx|xetex> @@ -280,7 +280,7 @@ % % \begin{macro}{\@@_backend_rotate:Nn} % \begin{macro}{\@@_backend_rotate_aux:Nn} -% Rotating in \texttt{(x)}dvipdmfx can be implemented using either PDF or +% Rotating in \texttt{dvipdmfx}/\XeTeX{} can be implemented using either PDF or % backend-specific code. The former approach however is not \enquote{aware} % of the content of boxes: this means that any embedded links would not be % adjusted by the rotation. As such, the backend-native approach is preferred: diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index 165313c04b..a9a86daebb 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -311,57 +311,223 @@ % \begin{macro}{\@@_backend_select_separation:nn} % \begin{macrocode} \cs_new_protected:Npn \@@_backend_select_separation:nn #1#2 - { \@@_backend_select:n { setspotcolor ~ #1 ~ #2 } } + { \@@_backend_select:n { separation ~ #1 ~ #2 } } % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_backend_separation_init:nnnnn} -% \begin{macro}{\@@_backend_separation_init:nnn} -% \begin{macro}[EXP]{\@@_backend_separation_init:n} +% \begin{macro} +% { +% \@@_backend_separation_init:nnnnn, +% \@@_backend_separation_init:nxxnn, +% \@@_backend_separation_init_aux:nnnnn +% } +% \begin{macro}[EXP] +% { +% \@@_backend_separation_init_/DeviceCMYK:nnn , +% \@@_backend_separation_init_/DeviceGray:nnn , +% \@@_backend_separation_init_/DeviceRGB:nnn +% } +% \begin{macro}[EXP]{\@@_backend_separation_init_Device:Nn} +% \begin{macro}[EXP]{\@@_backend_separation_init:nnn} +% \begin{macro}[EXP]{\@@_backend_separation_init_count:n} +% \begin{macro}[EXP]{\@@_backend_separation_init_count:w} +% \begin{macro}[EXP]{\@@_backend_separation_init:nnnn} % \begin{macro}[EXP]{\@@_backend_separation_init:w} -% \begin{macro}{\@@_backend_separation_init_cielab:nnnnn} -% \begin{macro}{\@@_backend_separation_init_cielab:n} +% \begin{macro}[EXP]{\@@_backend_separation_init:n} +% \begin{macro}[EXP]{\@@_backend_separation_init:nw} +% \begin{macro}{\@@_backend_separation_init_CIELAB:nnn} % Initialising here means creating a small header set up plus massaging % some data. This comes about as we have to deal with PDF-focussed data, % which makes most sense \enquote{higher-up}. The approach is based on -% ideas from \url{https://tex.stackexchange.com/q/560093}. +% ideas from \url{https://tex.stackexchange.com/q/560093} plus using +% the PostScript manual for other aspects. % \begin{macrocode} \cs_new_protected:Npx \@@_backend_separation_init:nnnnn #1#2#3#4#5 { \bool_if:NT \g__kernel_backend_header_bool { \cs_if_exist:NTF \AtBeginDvi - { \AtBeginDvi } + { \exp_not:N \AtBeginDvi } { \use:n } { - \exp_not:N \@@_backend_separation_init:nnn - {#1} {#2} {#5} + \exp_not:N \@@_backend_separation_init_aux:nnnnn + {#1} {#2} {#3} {#4} {#5} } } } -\cs_new_protected:Npn \@@_backend_separation_init:nnn #1#2#3 +\cs_generate_variant:Nn \@@_backend_separation_init:nnnnn { nxx } +\cs_new_protected:Npn \@@_backend_separation_init_aux:nnnnn #1#2#3#4#5 { \__kernel_backend_literal:e { ! TeXDict ~ begin ~ - /color \int_use:N \g_@@_separation_int \c_space_tl - [#3] ~ aload ~ pop ~ ( \str_convert_pdfname:n {#1} ) ~ - find \@@_backend_separation_init:n {#2} customcolor ~ def ~ + /color \int_use:N \g_@@_separation_int + { + [ ~ + /Separation ~ ( \str_convert_pdfname:n {#1} ) ~ + [ ~ #2 ~ ] ~ + { + \cs_if_exist_use:cF { @@_backend_separation_init_ #2 :nnn } + { \@@_backend_separation_init:nnn } + {#3} {#4} {#5} + } + ] ~ setcolorspace + } ~ def ~ end } } +\cs_new:cpn { @@_backend_separation_init_ /DeviceCMYK :nnn } #1#2#3 + { \@@_backend_separation_init_Device:Nn 4 {#3} } +\cs_new:cpn { @@_backend_separation_init_ /DeviceGray :nnn } #1#2#3 + { \@@_backend_separation_init_Device:Nn 1 {#3} } +\cs_new:cpn { @@_backend_separation_init_ /DeviceRGB :nnn } #1#2#3 + { \@@_backend_separation_init_Device:Nn 2 {#3} } +\cs_new:Npn \@@_backend_separation_init_Device:Nn #1#2 + { + #2 ~ + \prg_replicate:nn {#1} + { #1 ~ index ~ mul ~ #1 ~ 1 ~ roll ~ } + \int_eval:n { #1 + 1 } ~ -1 ~ roll ~ pop + } +% \end{macrocode} +% For the generic case, we cannot use |/FunctionType 2| unfortunately, so +% we have to code that idea up in PostScript. Here, we will therefore assume +% that a range is \emph{always} given. First, we count values in each argument: +% at the backend level, we can assume there are always well-behaved with +% spaces present. +% \begin{macrocode} +\cs_new:Npn \@@_backend_separation_init:nnn #1#2#3 + { + \exp_args:Ne \@@_backend_separation_init:nnnn + { \@@_backend_separation_init_count:n {#2} } + {#1} {#2} {#3} + } +\cs_new:Npn \@@_backend_separation_init_count:n #1 + { \int_eval:n { 0 \@@_backend_separation_init_count:w #1 ~ \s_@@_stop } } +\cs_new:Npn \@@_backend_separation_init_count:w #1 ~ #2 \s_@@_stop + { + +1 + \tl_if_blank:nF {#2} + { \@@_backend_separation_init_count:w #2 \s_@@_stop } + } +% \end{macrocode} +% Now we implement the algorithm. In the terms in the PostScript manual, +% we have $\mathbf{N} = 1$ and $\mathbf{Domain} = [0~1]$, with +% $\mathbf{Range}$ as |#2|, $\mathbf{C0}$ as |#3| and $\mathbf{C1}$ +% as |#4|, with the number of output components in |#1|. So all we have +% to do is implement $y_{i} = \mathbf{C0}_{i} + x(\mathbf{C1}_{i} - +% \mathbf{C0}_{i})$ with lots of stack manipulation, then check the +% ranges. That's done by adding everything to the stack first, then using +% the fact we know all of the offsets. As manipulating the stack is tricky, +% we start by re-formatting the $\mathbf{C0}$ and $\mathbf{C1}$ arrays to +% be interleaved, and add a \texttt{0} to each pair: this is used +% to keep the stack of constant length while we are doing the first pass of +% mathematics. We then working through that list, calculating from the +% last to the first value before tidying up by removing all of the input +% values. We do that by first copying all of the final $y$ values to the +% end of the stack, then rolling everything so we can pop the now-unneeded +% material. +% \begin{macrocode} +\cs_new:Npn \@@_backend_separation_init:nnnn #1#2#3#4 + { + \@@_backend_separation_init:w #3 ~ \s_@@_stop #4 ~ \s_@@_stop + \prg_replicate:nn {#1} + { + pop ~ 1 ~ index ~ neg ~ 1 ~ index ~ add ~ + \int_eval:n { 3 * #1 } ~ index ~ mul ~ + 2 ~ index ~ add ~ + \int_eval:n { 3 * #1 } ~ #1 ~ roll ~ + } + \int_step_function:nnnN {#1} { -1 } { 1 } + \@@_backend_separation_init:n + \int_eval:n { 4 * #1 + 1 } ~ #1 ~ roll ~ + \prg_replicate:nn { 3 * #1 + 1 } { pop ~ } + \tl_if_blank:nF {#2} + { \@@_backend_separation_init:nw {#1} #2 ~ \s_@@_stop } + } +\cs_new:Npn \@@_backend_separation_init:w + #1 ~ #2 \s_@@_stop #3 ~ #4 \s_@@_stop + { + #1 ~ #3 ~ 0 ~ + \tl_if_blank:nF {#2} + { \@@_backend_separation_init:w #2 \s_@@_stop #4 \s_@@_stop } + } \cs_new:Npn \@@_backend_separation_init:n #1 + { \int_eval:n { #1 * 2 } ~ index ~ } +% \end{macrocode} +% Finally, we deal with the range limit if required. This is handled +% by splitting the range into pairs. It's then just a question of doing +% the comparisons, this time dropping everything except the desired +% result. +% \begin{macrocode} +\cs_new:Npn \@@_backend_separation_init:nw #1#2 ~ #3 ~ #4 \s_@@_stop { - \@@_backend_separation_init:w #1 /Device #1 /Device \s_@@_stop + #2 ~ #3 ~ + 2 ~ index ~ 2 ~ index ~ lt ~ + { ~ pop ~ exch ~ pop ~ } ~ + { ~ + 2 ~ index ~ 1 ~ index ~ gt ~ + { ~ exch ~ pop ~ exch ~ pop ~ } ~ + { ~ pop ~ pop ~ } ~ + ifelse ~ + } + ifelse ~ + #1 ~ 1 ~ roll ~ + \tl_if_blank:nF {#4} + { \@@_backend_separation_init:nw {#1} #4 \s_@@_stop } } -\cs_new:Npn \@@_backend_separation_init:w #1 /Device #2 /Device #3 \s_@@_stop - { \str_lowercase:n {#2} } % \end{macrocode} -% Currently no CIELAB support. +% CIELAB support uses the detail from the PostScript reference, page 227; +% other than that block of PostScript, this is the same as for PDF-based +% routes. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \@@_backend_separation_init_cielab:n #1 { } +\cs_new_protected:Npn \@@_backend_separation_init_CIELAB:nnn #1#2#3 + { + \@@_backend_separation_init:nxxnn + {#2} + { + /CIEBasedABC ~ + << ~ + /RangeABC ~ [ ~ \c_@@_model_range_CIELAB_tl \c_space_tl ] ~ + /DecodeABC ~ + [ ~ + { ~ 16 ~ add ~ 116 ~ div ~ } ~ bind ~ + { ~ 500 ~ div ~ } ~ bind ~ + { ~ 200 ~ div ~ } ~ bind ~ + ] ~ + /MatrixABC ~ [ ~ 1 ~ 1 ~ 1 ~ 1 ~ 0 ~ 0 ~ 0 ~ 0 ~ -1 ~ ] ~ + /DecodeLMN ~ + [ ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + 0.9505 ~ mul ~ + } ~ bind ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + } ~ bind ~ + { ~ + dup ~ 6 ~ 29 ~ div ~ ge ~ + { ~ dup ~ dup ~ mul ~ mul ~ } ~ + { ~ 4 ~ 29 ~ div ~ sub ~ 108 ~ 841 ~ div ~ mul ~ } ~ + ifelse ~ + 1.0890 ~ mul ~ + } ~ bind + ] ~ + /WhitePoint ~ + [ ~ \tl_use:c { c_@@_model_whitepoint_CIELAB_ #1 _tl } ~ ] ~ + >> + } + { \c_@@_model_range_CIELAB_tl } + { 100 ~ 0 ~ 0 } + {#3} + } % \end{macrocode} % \end{macro} % \end{macro} @@ -369,6 +535,11 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \begin{macrocode} %</dvips> @@ -386,16 +557,13 @@ % \end{macro} % % \begin{macro} -% {\@@_backend_separation_init:nnnnn, \@@_backend_separation_init_cielab:nnnnn} -% \begin{macro}{\@@_backend_separation_init_cielab:n} +% {\@@_backend_separation_init:nnnnn, \@@_backend_separation_init_CIELAB:nnn} % No support at present. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \@@_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } -\cs_new_protected:Npn \@@_backend_separation_init_cielab:n #1 { } +\cs_new_protected:Npn \@@_backend_separation_init_CIELAB:nnnnnn #1#2#3 { } % \end{macrocode} % \end{macro} -% \end{macro} % % \begin{macrocode} %</dvisvgm> @@ -406,6 +574,7 @@ % \end{macrocode} % % \begin{macro}{\@@_backend_select_separation:nn} +% \begin{macro}{\@@_backend_select:n} % Different syntaxes here as the stacks are accessed very differently. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_select_separation:nn #1#2 @@ -415,32 +584,42 @@ %<*luatex|pdftex> { \@@_backend_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ scn ~ #2 ~ SCN } } %</luatex|pdftex> +%<*dvipdfmx|xetex> +\cs_new_protected:Npn \@@_backend_select:n #1 + { + \__kernel_backend_literal:n { pdf: bc ~ #1 } + \group_insert_after:N \@@_backend_reset: + } +%</dvipdfmx|xetex> % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\@@_backend_separation_init:nnnnn} % \begin{macro}{\@@_backend_separation_init:n} -% \begin{macro}{\@@_backend_separation_init_cielab:nnnnn} -% \begin{macro}{\@@_backend_separation_init_cielab:n} +% \begin{macro}{\@@_backend_separation_init_CIELAB:nnn} % Initialising the PDF structures needs two parts: creating an object % containing the \enquote{real} name of the Separation, then adding a reference % to that to each page. The latter uses the internal name of the \texttt{cs}. % For \texttt{dvipdfmx}/\XeTeX{}, the backend does most of the work so we need a -% simplified version. +% simplified version. We use a separate object for the tint transformation +% following the model in the PDF reference. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { + \pdf_object_now:nx { dict } + { + /FunctionType ~ 2 + /Domain ~ [0 ~ 1] + \tl_if_blank:nF {#3} { /Range ~ [#3] } + /C0 ~ [#4] ~ + /C1 ~ [#5] /N ~ 1 + } \@@_backend_separation_init:n { /Separation / \str_convert_pdfname:n {#1} ~ #2 ~ - << - /FunctionType ~ 2 - /Domain ~ [0 ~ 1] - \tl_if_blank:nF {#3} { /Range ~ [#3] } - /C0 ~ [#4] ~ - /C1 ~ [#5] /N ~ 1 - >> + \pdf_object_last: } %<*luatex|pdftex> \use:x @@ -459,7 +638,7 @@ %<*dvipdfmx|xetex> \__kernel_backend_literal:x { - pdf:obj ~ @ color \int_use:N \g_@@_separation_int \c_space_tl + pdf:obj ~ @color \int_use:N \g_@@_separation_int \c_space_tl [#1] } %</dvipdfmx|xetex> @@ -471,37 +650,37 @@ % For CIELAB colors, we need one object per document for the illuminant, % plus initialisation of the color space referencing that object. % \begin{macrocode} -\cs_new_protected:Npn \@@_backend_separation_init_cielab:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \@@_backend_separation_init_CIELAB:nnn #1#2#3 { + \pdf_object_if_exist:nF { @@_illuminant_CIELAB_ #1 } + { + \pdf_object_new:nn { @@_illuminant_CIELAB_ #1 } { array } + \pdf_object_write:nx { @@_illuminant_CIELAB_ #1 } + { + /Lab ~ + << + /WhitePoint ~ + [ \tl_use:c { c_@@_model_whitepoint_CIELAB_ #1 _tl } ] + /Range ~ [ \c_@@_model_range_CIELAB_tl ] + >> + } + } \@@_backend_separation_init:nnnnn {#2} - { \pdf_object_ref:n { @@_illuminant_cielab_ #1 } } - { \c_@@_model_range_lab_tl } + { \pdf_object_ref:n { @@_illuminant_CIELAB_ #1 } } + { \c_@@_model_range_CIELAB_tl } { 100 ~ 0 ~ 0 } - { #3 ~ #4 ~ #5 } + {#3} } \cs_if_exist:NF \pdf_object_now:nn - { \cs_gset_protected:Npn \@@_backend_separation_init_cielab:nnnnn #1#2#3#4#5 { } } -\cs_new_protected:Npn \@@_backend_separation_init_cielab:n #1 { - \pdf_object_new:nn { @@_illuminant_cielab_ #1 } { array } - \pdf_object_write:nx { @@_illuminant_cielab_ #1 } - { - /Lab ~ - << - /WhitePoint ~ - [ \tl_use:c { c_@@_model_whitepoint_cielab_ #1 _tl } ] - /Range ~ [ \c_@@_model_range_lab_tl ] - >> - } + \cs_gset_protected:Npn \@@_backend_separation_init_CIELAB:nnn #1#2#3 + { } } -\cs_if_exist:NF \pdf_object_new:nn - { \cs_gset_protected:Npn \@@_backend_separation_init_cielab:n #1 { } } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% \end{macro} % % \begin{macrocode} %</dvipdfmx|luatex|pdftex|xetex> diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index 00e9144e4a..f28bfd13bf 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -581,7 +581,9 @@ % matrix into rotations and a scaling, then use those operations as they % are handled by the backend. (There is backend support for matrix operations in % \texttt{dvipdfmx}/\XeTeX{}, but as a matched pair so not suitable for the -% \enquote{stand alone} transformation set up here.) +% \enquote{stand alone} transformation set up here.) The specials used here +% are from \texttt{xdvipdfmx} originally: they are well-tested, but probably +% equivalent to the \texttt{pdf:} versions! % \begin{macrocode} \cs_new_protected:Npn \@@_backend_cm:nnnn #1#2#3#4 { diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index f4eeebbfcb..bac80fa884 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx index c2d0f87452..73cf1bc5ad 100644 --- a/macros/latex/contrib/l3backend/l3backend-header.dtx +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -67,12 +67,12 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{TeXcolorsetspotcolor, setspotcolor} +% \begin{macro}{TeXcolorseparation, separation} % Support for separation/spot colors: this strange naming is so % things work with the color stack. % \begin{macrocode} TeXDict begin -/TeXcolorsetspotcolor { setcustomcolor } def +/TeXcolorseparation { setcolor } def end % \end{macrocode} % \end{macro} diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index f0f20e1b9a..0763c411eb 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -773,16 +773,18 @@ % % \begin{macro}[EXP]{\@@_backend_annotation_last:} % A tiny amount of extra data gets added here; we use \texttt{x}-type -% expansion to get the space in the right place and form. +% expansion to get the space in the right place and form. The \enquote{extra} +% space in the \LuaTeX{} version is \emph{required} as it is consumed in +% finding the end of the keyword. % \begin{macrocode} \cs_new:Npx \@@_backend_annotation_last: { \exp_not:N \int_value:w %<*luatex> - \exp_not:N \tex_pdffeedback:D lastannot + \exp_not:N \tex_pdffeedback:D lastannot ~ %</luatex> %<*pdftex> - \exp_not:N \tex_pdfannot:D + \exp_not:N \tex_pdflastannot:D %</pdftex> \c_space_tl 0 ~ R } @@ -831,7 +833,7 @@ { \exp_not:N \int_value:w %<*luatex> - \exp_not:N \tex_pdffeedback:D lastlink + \exp_not:N \tex_pdffeedback:D lastlink ~ %</luatex> %<*pdftex> \exp_not:N \tex_pdflastlink:D @@ -964,7 +966,7 @@ %<*pdftex> { \tex_pdflastobj:D } %</pdftex> - \prop_gput:Nnn \exp_not:N \g_@@_backend_object_prop {#1} {#2} + \prop_gput:Nnn \g_@@_backend_object_prop {#1} {#2} } \cs_new:Npn \@@_backend_object_ref:n #1 { \int_use:c { c_@@_backend_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } diff --git a/macros/latex/contrib/l3experimental/CHANGELOG.md b/macros/latex/contrib/l3experimental/CHANGELOG.md index 4a8085effb..362059210b 100644 --- a/macros/latex/contrib/l3experimental/CHANGELOG.md +++ b/macros/latex/contrib/l3experimental/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2020-09-11] + +### Fixed +- Typos in CIELAB support + ## [2020-09-01] ### Added @@ -24,7 +29,8 @@ this project uses date-based 'snapshot' version identifiers. ### Changed - Move drawing color functions to `l3color`, generalising the approach - with better `dvips` support + with better `dvips` support (viz. `\draw_color:n` becomes `\color_select:n`, + `\draw_color_[fill|stroke]:n` become `\color_[fill|stroke]:n`) ## [2020-07-17] @@ -168,7 +174,8 @@ this project uses date-based 'snapshot' version identifiers. - New `l3color` module using `xcolor`-like expression syntax - New `l3draw` module, based on `pgf` layer of the TikZ system -[Unreleased]: https://github.com/latex3/latex3/compare/2020-09-01...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2020-09-11...HEAD +[2020-09-11]: https://github.com/latex3/latex3/compare/2020-09-01...2020-09-11 [2020-09-01]: https://github.com/latex3/latex3/compare/2020-08-07...2020-09-01 [2020-08-07]: https://github.com/latex3/latex3/compare/2020-07-17...2020-08-07 [2020-07-17]: https://github.com/latex3/latex3/compare/2020-06-18...2020-07-17 diff --git a/macros/latex/contrib/l3experimental/README.md b/macros/latex/contrib/l3experimental/README.md index a84954d21f..7f96887610 100644 --- a/macros/latex/contrib/l3experimental/README.md +++ b/macros/latex/contrib/l3experimental/README.md @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2020-09-01 +Release 2020-09-11 Overview -------- diff --git a/macros/latex/contrib/l3experimental/l3benchmark.dtx b/macros/latex/contrib/l3experimental/l3benchmark.dtx index 80079c1c41..370723ec90 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.dtx +++ b/macros/latex/contrib/l3experimental/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -129,7 +129,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3benchmark}{2020-09-01}{} +\ProvidesExplPackage{l3benchmark}{2020-09-11}{} {L3 Experimental benchmarking} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3benchmark.pdf b/macros/latex/contrib/l3experimental/l3benchmark.pdf Binary files differindex f16030cee7..197eb04aa1 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.pdf +++ b/macros/latex/contrib/l3experimental/l3benchmark.pdf diff --git a/macros/latex/contrib/l3experimental/l3color.dtx b/macros/latex/contrib/l3experimental/l3color.dtx index ec8266d06f..f644bf5fde 100644 --- a/macros/latex/contrib/l3experimental/l3color.dtx +++ b/macros/latex/contrib/l3experimental/l3color.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -350,9 +350,10 @@ % example those involving separations (see % \url{https://helpx.adobe.com/indesign/using/spot-process-colors.html} % for details of the use of separations in print). Color models may be split -% into families; in the case of the basic \texttt{cmyk}, \texttt{gray} -% and \texttt{rgb} models, the family and the model itself are synonymous. This -% is not generally the case: see the PDF reference for more details. +% into families; for the standard device-based color models (\texttt{DeviceCMYK}, +% \texttt{DeviceRGB}, \texttt{DeviceGray}), these are synonymous. This +% is not generally the case: see the PDF reference for more details. (Note that +% \pkg{l3color} uses the shorter names \texttt{cmyk}, etc.) % % \begin{function}{\color_model_new:nnn} % \begin{syntax} @@ -375,7 +376,7 @@ % name of a spot color ink. Such a \meta{name} may contain spaces, etc., % which are not permitted in the \meta{model}. % \item \texttt{alternative-model} An alternative device colorspace, one of -% \texttt{cmyk}, \texttt{rgb}, \texttt{gray} or \texttt{cielab}. The three +% \texttt{cmyk}, \texttt{rgb}, \texttt{gray} or \texttt{CIELAB}. The three % parameter-based models work as described above; see below for % details of CIELAB colors. % \item \texttt{alternative-values} A comma-separated list of values @@ -384,7 +385,7 @@ % \end{itemize} % % CIELAB color separations are created using the -% \texttt{alternative-model = cielab} setting. These colors must also have an +% \texttt{alternative-model = CIELAB} setting. These colors must also have an % \texttt{illuminant} key, one of \texttt{a}, \texttt{c}, \texttt{e}, % \texttt{d50}, \texttt{d55}, \texttt{d65} or \texttt{d75}. The % \texttt{alternative-values} in this case are the three parameters $L*$, $a*$ @@ -412,7 +413,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3color}{2020-09-01}{} +\ProvidesExplPackage{l3color}{2020-09-11}{} {L3 Experimental color support} % \end{macrocode} % @@ -1525,47 +1526,34 @@ % % \begin{variable} % { -% \c_@@_model_whitepoint_cielab_a_tl , -% \c_@@_model_whitepoint_cielab_b_tl , -% \c_@@_model_whitepoint_cielab_e_tl , -% \c_@@_model_whitepoint_cielab_d50_tl , -% \c_@@_model_whitepoint_cielab_d55_tl , -% \c_@@_model_whitepoint_cielab_d65_tl , -% \c_@@_model_whitepoint_cielab_d75_tl +% \c_@@_model_whitepoint_CIELAB_a_tl , +% \c_@@_model_whitepoint_CIELAB_b_tl , +% \c_@@_model_whitepoint_CIELAB_e_tl , +% \c_@@_model_whitepoint_CIELAB_d50_tl , +% \c_@@_model_whitepoint_CIELAB_d55_tl , +% \c_@@_model_whitepoint_CIELAB_d65_tl , +% \c_@@_model_whitepoint_CIELAB_d75_tl % } % Whitepoint data for the CIELAB profiles. % \begin{macrocode} -\tl_const:Nn \c_@@_model_whitepoint_cielab_a_tl { 1.0985 ~ 1 ~ 0.3558 } -\tl_const:Nn \c_@@_model_whitepoint_cielab_b_tl { 0.9807~ 1 ~ 1.1822 } -\tl_const:Nn \c_@@_model_whitepoint_cielab_e_tl { 1 ~ 1 ~ 1 } -\tl_const:cn { c_@@_model_whitepoint_cielab_d50_tl } { 0.9642 ~, 1 ~ 0.8251 } -\tl_const:cn { c_@@_model_whitepoint_cielab_d55_tl } { 0.9568 ~ 1 ~ 0.9214 } -\tl_const:cn { c_@@_model_whitepoint_cielab_d65_tl } { 0.9504 ~ 1 ~ 1.0888 } -\tl_const:cn { c_@@_model_whitepoint_cielab_d75_tl } { 0.9497 ~ 1 ~ 1.2261 } +\tl_const:Nn \c_@@_model_whitepoint_CIELAB_a_tl { 1.0985 ~ 1 ~ 0.3558 } +\tl_const:Nn \c_@@_model_whitepoint_CIELAB_b_tl { 0.9807 ~ 1 ~ 1.1822 } +\tl_const:Nn \c_@@_model_whitepoint_CIELAB_e_tl { 1 ~ 1 ~ 1 } +\tl_const:cn { c_@@_model_whitepoint_CIELAB_d50_tl } { 0.9642 ~ 1 ~ 0.8251 } +\tl_const:cn { c_@@_model_whitepoint_CIELAB_d55_tl } { 0.9568 ~ 1 ~ 0.9214 } +\tl_const:cn { c_@@_model_whitepoint_CIELAB_d65_tl } { 0.9504 ~ 1 ~ 1.0888 } +\tl_const:cn { c_@@_model_whitepoint_CIELAB_d75_tl } { 0.9497 ~ 1 ~ 1.2261 } % \end{macrocode} % \end{variable} % -% \begin{variable}{\c_@@_model_range_cielab_tl} +% \begin{variable}{\c_@@_model_range_CIELAB_tl} % The range for CIELAB color spaces. % \begin{macrocode} -\tl_const:Nn \c_@@_model_range_cielab_tl { -128 ~ 127 ~ -128 ~ 127 } +\tl_const:Nn \c_@@_model_range_CIELAB_tl { 0 ~ 100 ~ -128 ~ 127 ~ -128 ~ 127 } % \end{macrocode} % \end{variable} % % \begin{macro}{\color_model_new:nnn, \@@_model_new:nnn} -% \begin{macro}{\@@_model_separation:n} -% \begin{macro}{\@@_model_separation:nn} -% \begin{macro}{\@@_model_separation:nnn} -% \begin{macro}{\@@_model_separation:w} -% \begin{macro} -% { -% \@@_model_separation_cmyk:nnnnnn , -% \@@_model_separation_gray:nnnnnn , -% \@@_model_separation_rgb:nnnnnn -% } -% \begin{macro}{\@@_model_convert:nnn} -% \begin{macro}{\@@_model_separation_cielab:nnnnnn} -% \begin{macro}{\@@_model_separation_cielab:nnnnnnn} % Set up a new model: in general this has to be handled by a family-dependent % function. To avoid some \enquote{interesting} questions with casing, we % fold the case of the family name. The key--value list should always be @@ -1596,6 +1584,21 @@ } } % \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_model_separation:n} +% \begin{macro}{\@@_model_separation:nn} +% \begin{macro}{\@@_model_separation:nnn} +% \begin{macro}{\@@_model_separation:w} +% \begin{macro} +% { +% \@@_model_separation_cmyk:nnnnnn , +% \@@_model_separation_gray:nnnnnn , +% \@@_model_separation_rgb:nnnnnn +% } +% \begin{macro}{\@@_model_convert:nnn} +% \begin{macro}{\@@_model_separation_CIELAB:nnnnnn} +% \begin{macro}{\@@_model_separation_CIELAB:nnnnnnn} % Separations must have a \enquote{real} name, which is pretty easy to find. % \begin{macrocode} \cs_new_protected:Npn \@@_model_separation:n #1 @@ -1748,16 +1751,16 @@ % Setting up for CIELAB needs a bit more work: there is the illuminant and % the need for an appropriate object. % \begin{macrocode} -\cs_new_protected:Npn \@@_model_separation_cielab:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \@@_model_separation_CIELAB:nnnnnn #1#2#3#4#5#6 { \prop_get:NnNF \l_@@_internal_prop { illuminant } \l_@@_internal_tl { \__kernel_msg_error:nnn { color } - { cielab-requires-illuminant } {#1} + { CIELAB-requires-illuminant } {#1} \tl_set:Nn \l_@@_internal_tl { d50 } } - \exp_args:NV \@@_model_separation_cielab:nnnnnnn + \exp_args:NV \@@_model_separation_CIELAB:nnnnnnn \l_@@_internal_tl {#1} {#2} {#3} {#4} {#5} {#6} } % \end{macrocode} @@ -1767,12 +1770,11 @@ % cannot be converted to anything else, we fallback to producing black: the % user should set up a second model for colors set up this way. % \begin{macrocode} -\cs_new_protected:Npn \@@_model_separation_cielab:nnnnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \@@_model_separation_CIELAB:nnnnnnn #1#2#3#4#5#6#7 { - \tl_if_exist:cTF { c_@@_model_whitepoint_cielab_ #1 _tl } + \tl_if_exist:cTF { c_@@_model_whitepoint_CIELAB_ #1 _tl } { - \@@_backend_separation_init_cielab:n {#1} - \@@_backend_separation_init_cielab:nnnnn {#2} {#3} {#4} {#5} {#6} + \@@_backend_separation_init_CIELAB:nnn {#1} {#3} { #4 ~ #5 ~ #6 } \cs_new:cpn { @@_convert_ #2 _cmyk:w } ##1 ~ ##2 \s_@@_stop { 0 ~ 0 ~ 0 ~ 1 } \cs_new:cpn { @@_convert_ #2 _rgb:w } ##1 ~ ##2 \s_@@_stop @@ -1782,7 +1784,7 @@ } { \__kernel_msg_error:nnn { color } - { unknown-cielab-illuminant } {#1} + { unknown-CIELAB-illuminant } {#1} } } % \end{macrocode} @@ -1794,7 +1796,6 @@ % \end{macro} % \end{macro} % \end{macro} -% \end{macro} % % \subsection{Diagnostics} % @@ -1830,12 +1831,12 @@ % \subsection{Messages} % % \begin{macrocode} -\__kernel_msg_new:nnnn { color } { cielab-requires-illuminant } +\__kernel_msg_new:nnnn { color } { CIELAB-requires-illuminant } { CIELAB~color~space~'#1'~require~an~illuminant. } { LaTeX~has~been~asked~to~create~a~separation~color~space~using~ CIELAB~specifications,~but~no~\\ \\ - \iow_indent:n { illuminant = <basis> } + \iow_indent:n { illuminant~=~<basis> } \\ \\ key~was~given~with~the~correct~information.~LaTeX~will~use~illuminant~ 'd50'~for~recovery. @@ -1857,7 +1858,7 @@ { LaTeX~has~been~asked~to~create~a~separation~color~space,~ but~no~\\ \\ - \iow_indent:n { alternative-model = <model> } + \iow_indent:n { alternative-model~=~<model> } \\ \\ key~was~given~with~the~correct~information. } @@ -1866,7 +1867,7 @@ { LaTeX~has~been~asked~to~create~a~separation~color~space,~ but~no~\\ \\ - \iow_indent:n { alternative-values = <model> } + \iow_indent:n { alternative-values~=~<model> } \\ \\ key~was~given~with~the~correct~information. } @@ -1875,7 +1876,7 @@ { LaTeX~has~been~asked~to~create~a~separation~color~space,~ but~no~\\ \\ - \iow_indent:n { name = <formal~name> } + \iow_indent:n { name~=~<formal~name> } \\ \\ key~was~given~with~the~correct~information. } @@ -1890,7 +1891,7 @@ { LaTeX~has~been~asked~to~create~a~separation~color~space,~ but~the~model~given~as\\ \\ - \iow_indent:n { alternative-model = <model> } + \iow_indent:n { alternative-model~=~<model> } \\ \\ is~unknown. } @@ -1900,7 +1901,7 @@ LaTeX~has~been~asked~to~export~a~color~in~format~'#1',~ but~this~has~never~been~defined. } -\__kernel_msg_new:nnnn { color } { unknown-cielab-illuminant } +\__kernel_msg_new:nnnn { color } { unknown-CIELAB-illuminant } { Unknown~illuminant~model~'#1'. } { LaTeX~has~been~asked~to~use~create~a~color~space~using~CIELAB~ diff --git a/macros/latex/contrib/l3experimental/l3color.pdf b/macros/latex/contrib/l3experimental/l3color.pdf Binary files differindex 304b1941e3..f2a6933a84 100644 --- a/macros/latex/contrib/l3experimental/l3color.pdf +++ b/macros/latex/contrib/l3experimental/l3color.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx index 940dd8c31d..afc4616dfb 100644 --- a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-code.pdf b/macros/latex/contrib/l3experimental/l3draw-code.pdf Binary files differindex 196604bf26..2226678a0e 100644 --- a/macros/latex/contrib/l3experimental/l3draw-code.pdf +++ b/macros/latex/contrib/l3experimental/l3draw-code.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-layers.dtx b/macros/latex/contrib/l3experimental/l3draw-layers.dtx index 50a8fd81c1..ffe0cd9588 100644 --- a/macros/latex/contrib/l3experimental/l3draw-layers.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-paths.dtx b/macros/latex/contrib/l3experimental/l3draw-paths.dtx index cba6efdb76..9f87bf357c 100644 --- a/macros/latex/contrib/l3experimental/l3draw-paths.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-points.dtx b/macros/latex/contrib/l3experimental/l3draw-points.dtx index b6d9ba0837..aafe12bcc2 100644 --- a/macros/latex/contrib/l3experimental/l3draw-points.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx index 88d0888884..99edbf1992 100644 --- a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx index 0ca26af807..e6b35bf790 100644 --- a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx index 4b3298e0d1..53cc03b98e 100644 --- a/macros/latex/contrib/l3experimental/l3draw-state.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx index 6329c05fb9..e30bcf6d19 100644 --- a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw.dtx b/macros/latex/contrib/l3experimental/l3draw.dtx index 841eae28c0..6d1e5e96aa 100644 --- a/macros/latex/contrib/l3experimental/l3draw.dtx +++ b/macros/latex/contrib/l3experimental/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -1136,7 +1136,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3draw}{2020-09-01}{} +\ProvidesExplPackage{l3draw}{2020-09-11}{} {L3 Experimental core drawing support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3draw.pdf b/macros/latex/contrib/l3experimental/l3draw.pdf Binary files differindex e094bdd4ad..ea0c2c3cd2 100644 --- a/macros/latex/contrib/l3experimental/l3draw.pdf +++ b/macros/latex/contrib/l3experimental/l3draw.pdf diff --git a/macros/latex/contrib/l3experimental/l3galley.dtx b/macros/latex/contrib/l3experimental/l3galley.dtx index 73779d70a3..5de6c7c4aa 100644 --- a/macros/latex/contrib/l3experimental/l3galley.dtx +++ b/macros/latex/contrib/l3experimental/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -686,7 +686,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3galley}{2020-09-01}{} +\ProvidesExplPackage{l3galley}{2020-09-11}{} {L3 Experimental galley code} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3galley.pdf b/macros/latex/contrib/l3experimental/l3galley.pdf Binary files differindex 0987073e2b..aeb2cb074f 100644 --- a/macros/latex/contrib/l3experimental/l3galley.pdf +++ b/macros/latex/contrib/l3experimental/l3galley.pdf diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx index 15f963e60d..6d74ceebb9 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.dtx +++ b/macros/latex/contrib/l3experimental/l3graphics.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -240,7 +240,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3graphics}{2020-09-01}{} +\ProvidesExplPackage{l3graphics}{2020-09-11}{} {L3 Experimental graphics inclusion support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3graphics.pdf b/macros/latex/contrib/l3experimental/l3graphics.pdf Binary files differindex 2faf2c17dc..824722260e 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.pdf +++ b/macros/latex/contrib/l3experimental/l3graphics.pdf diff --git a/macros/latex/contrib/l3experimental/l3pdf-code.pdf b/macros/latex/contrib/l3experimental/l3pdf-code.pdf Binary files differindex 7f78070720..b9936cc61e 100644 --- a/macros/latex/contrib/l3experimental/l3pdf-code.pdf +++ b/macros/latex/contrib/l3experimental/l3pdf-code.pdf diff --git a/macros/latex/contrib/l3experimental/l3pdf.dtx b/macros/latex/contrib/l3experimental/l3pdf.dtx index 7be0907d0b..e5af45a9b8 100644 --- a/macros/latex/contrib/l3experimental/l3pdf.dtx +++ b/macros/latex/contrib/l3experimental/l3pdf.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -190,7 +190,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3pdf}{2020-09-01}{} +\ProvidesExplPackage{l3pdf}{2020-09-11}{} {L3 Experimental core PDF support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3pdf.pdf b/macros/latex/contrib/l3experimental/l3pdf.pdf Binary files differindex c52018c46a..50f9afafa4 100644 --- a/macros/latex/contrib/l3experimental/l3pdf.pdf +++ b/macros/latex/contrib/l3experimental/l3pdf.pdf diff --git a/macros/latex/contrib/l3experimental/l3str-format.dtx b/macros/latex/contrib/l3experimental/l3str-format.dtx index 8264409fb4..775e5d809f 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.dtx +++ b/macros/latex/contrib/l3experimental/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3str-format}{2020-09-01}{} +\ProvidesExplPackage{l3str-format}{2020-09-11}{} {L3 Experimental string formatting} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3str-format.pdf b/macros/latex/contrib/l3experimental/l3str-format.pdf Binary files differindex d245bb68bc..9cde8e0e97 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.pdf +++ b/macros/latex/contrib/l3experimental/l3str-format.pdf diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.dtx b/macros/latex/contrib/l3experimental/l3sys-shell.dtx index f3a06c643b..807e7383d3 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.dtx +++ b/macros/latex/contrib/l3experimental/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -135,7 +135,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3sys-shell}{2020-09-01}{} +\ProvidesExplPackage{l3sys-shell}{2020-09-11}{} {L3 Experimental system shell functions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.pdf b/macros/latex/contrib/l3experimental/l3sys-shell.pdf Binary files differindex 98c66b8421..6939e5e38e 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.pdf +++ b/macros/latex/contrib/l3experimental/l3sys-shell.pdf diff --git a/macros/latex/contrib/l3experimental/xcoffins.dtx b/macros/latex/contrib/l3experimental/xcoffins.dtx index d890d28428..4286442045 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.dtx +++ b/macros/latex/contrib/l3experimental/xcoffins.dtx @@ -56,7 +56,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -675,7 +675,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2020-09-01}{} +\ProvidesExplPackage{xcoffins}{2020-09-11}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/xcoffins.pdf b/macros/latex/contrib/l3experimental/xcoffins.pdf Binary files differindex b13cdfe00c..3872ed532b 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.pdf +++ b/macros/latex/contrib/l3experimental/xcoffins.pdf diff --git a/macros/latex/contrib/l3experimental/xgalley.dtx b/macros/latex/contrib/l3experimental/xgalley.dtx index 77557731ad..52667441b6 100644 --- a/macros/latex/contrib/l3experimental/xgalley.dtx +++ b/macros/latex/contrib/l3experimental/xgalley.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Released 2020-09-01} +% \date{Released 2020-09-11} % % \maketitle % @@ -734,7 +734,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2020-09-01}{} +\ProvidesExplPackage{xgalley}{2020-09-11}{} {L3 Experimental galley} \RequirePackage{xparse,xtemplate,l3galley} % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/xgalley.pdf b/macros/latex/contrib/l3experimental/xgalley.pdf Binary files differindex 4935f6eded..9a3af8e4dc 100644 --- a/macros/latex/contrib/l3experimental/xgalley.pdf +++ b/macros/latex/contrib/l3experimental/xgalley.pdf diff --git a/macros/latex/contrib/qyxf-book/LICENSE b/macros/latex/contrib/qyxf-book/LICENSE index 510db3d20d..e44b3e3479 100644 --- a/macros/latex/contrib/qyxf-book/LICENSE +++ b/macros/latex/contrib/qyxf-book/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 钱院å¦è¾… +Copyright (c) 2020 Qian Yuan Xue Fu Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macros/latex/contrib/qyxf-book/README.md b/macros/latex/contrib/qyxf-book/README.md index 5b5d3e1abe..3fd3a3a8cd 100644 --- a/macros/latex/contrib/qyxf-book/README.md +++ b/macros/latex/contrib/qyxf-book/README.md @@ -1,5 +1,8 @@ # qyxf-book: Book Template for Qian Yuan Xue Fu +![version](https://img.shields.io/ctan/v/qyxf-book?style=flat-square) +![license](https://img.shields.io/ctan/l/qyxf-book?style=flat-square) + > Warning: The template (including demo and docs) is currently designed only for Chinese typesetting. If you would like to use the template in other languages, please contact with us and offer help on that. Thanks. `qyxf-book` is a LaTeX document class (template) developed by *Qian Yuan Xue Fu* (QYXF), a student club of *Xi'an Jiaotong University* (XJTU). Up to now, the template is applied in several academic counseling materials ("course helpers") written by members of QYXF, including: diff --git a/macros/latex/contrib/qyxf-book/README.zh.md b/macros/latex/contrib/qyxf-book/README.zh.md index 488491fcb5..a1210cf225 100644 --- a/macros/latex/contrib/qyxf-book/README.zh.md +++ b/macros/latex/contrib/qyxf-book/README.zh.md @@ -1,11 +1,12 @@ # 钱院å¦è¾… LaTeX 书ç±æ¨¡æ¿ +![version](https://img.shields.io/ctan/v/qyxf-book?style=flat-square) +![license](https://img.shields.io/ctan/l/qyxf-book?style=flat-square) + `qyxf-book` 是由钱院å¦è¾…å¼€å‘çš„ã€ç”¨äºŽæŽ’版ä¸ç‰ä»¥ä¸Šä½“é‡èµ„料的 LaTeX 文类。目å‰ï¼Œè¯¥æ¨¡æ¿å·²è¢«ç”¨äºŽç¼–写了[《大å¦ç‰©ç†é¢˜è§£ã€‹](https://github.com/qyxf/university-physics)ã€ã€Šç†è®ºåŠ›å¦é¢˜è§£ã€‹ã€[《计算方法撷英》](https://qyxf.site/2019/11/26/notes-on-computing-methods-published)ç‰è¯¸å¤šèµ„料。 本份模æ¿åŽŸåœ¨ [qyxf-sets å®é›†](https://github.com/qyxf/qyxf-sets)项目ä¸å¼€å‘ï¼›å› ç»´æŠ¤æˆæœ¬è¿‡é«˜ã€æ•ˆæžœä¸ç†æƒ³ï¼ŒçŽ°ç‹¬ç«‹ç»´æŠ¤ï¼Œå¹¶ä¸å†ä½¿ç”¨ä¹‹å‰çš„ doc/doctrip æ–¹å¼ã€‚现采用 MIT å议许å¯ï¼Œè¯·å¤§å®¶æ”¾å¿ƒåœ° forkã€ä¿®æ”¹ã€‚ -![thumbnail](figure/thumbnail.png) - ## 特点 - æ ·å¼ç®€æ´ã€å¹²å‡€ï¼Œé€‚于排版å¦ä¹ 资料; @@ -16,4 +17,16 @@ ## 使用说明 -ç›®å½•ä¸‹é™„å¸¦ä¸€ä»½æ ·ä¾‹ä»£ç `demo.tex`,编译å³å¯å¾—模æ¿è¯´æ˜Žä¹¦åŠå†…å®¹ç¤ºä¾‹ï¼Œè¯·æ ¹æ®ä»£ç 和编译得到的说明书å¦ä¹ 使用本模æ¿ã€‚
\ No newline at end of file +ç›®å½•ä¸‹é™„å¸¦ä¸€ä»½æ ·ä¾‹ä»£ç `demo.tex`(在 CTAN å‘行的版本ä¸ä¸º `qyxf-book-doc.tex`),编译å³å¯å¾—模æ¿è¯´æ˜Žä¹¦åŠå†…å®¹ç¤ºä¾‹ï¼Œè¯·æ ¹æ®ä»£ç 和编译得到的说明书å¦ä¹ 使用本模æ¿ã€‚ + +![thumbnail](figure/thumbnail.png) + +## å‘å¸ƒå¹³å° + +模æ¿åˆ†åˆ«åœ¨ï¼š + +- Gitee:<https://gitee.com/qyxf/qyxf-book> +- GitHub:<https://github.com/qyxf/qyxf-book> +- CTAN:<https://www.ctan.org/pkg/qyxf-book> + +å‘布,Gitee 为主è¦å¼€å‘å¹³å°ï¼ŒåŽä¸¤è€…æ›´æ–°ç¨æ…¢ï¼ˆCTAN 上的代ç 目录结构ã€æ–‡ä»¶å称与å¦ä¸¤è€…略有区别)。
\ No newline at end of file diff --git a/macros/latex/contrib/qyxf-book/colors/black.tex b/macros/latex/contrib/qyxf-book/colors/black.tex deleted file mode 100644 index 2c0c8063e1..0000000000 --- a/macros/latex/contrib/qyxf-book/colors/black.tex +++ /dev/null @@ -1,23 +0,0 @@ -% color-scheme: black -% author-by: xjtu-blacksmith -% create-on: 2020/8/19 - -% main colors -\newcommand\@primary@color{black} % 修改æ¤å¤„颜色å³å¯å®žçŽ°åŒè‰²ä¹¦æ•ˆæžœ -% for titles amd text -\renewcommand\@title@color{\@primary@color} -\renewcommand\@list@color{\@primary@color} -\renewcommand\@caption@color{\@primary@color} -\renewcommand\@link@color{\@primary@color} -\renewcommand\@misc@color{\@primary@color} -% for boxes -\renewcommand\@box@background{white} -\renewcommand\@box@title@color{\@primary@color} -\renewcommand\@box@title@background{white} -\renewcommand\@box@frame{\@primary@color} -\renewcommand\@alert@title@color{white} -\renewcommand\@alert@title@background{\@primary@color} -% for theorems -\renewcommand\@define@frame{\@primary@color} -\renewcommand\@theorem@background{white} -\renewcommand\@theorem@frame{\@primary@color}
\ No newline at end of file diff --git a/macros/latex/contrib/qyxf-book/colors/bootstrap-v4.tex b/macros/latex/contrib/qyxf-book/colors/bootstrap-v4.tex deleted file mode 100644 index c13a8c40ad..0000000000 --- a/macros/latex/contrib/qyxf-book/colors/bootstrap-v4.tex +++ /dev/null @@ -1,29 +0,0 @@ -% color-scheme: bootstrap-v4 -% author-by: xjtu-blacksmith -% create-on: 2020/8/19 - -% main colors -\newcommand\@primary@color{blue!50!cyan} -\newcommand\@info@color{cyan!80!olive} -% for titles amd text -\renewcommand\@title@color{black!85} -\renewcommand\@list@color{\@primary@color} -\renewcommand\@caption@color{\@info@color} -\renewcommand\@link@color{blue!67!green!} -\renewcommand\@misc@color{\@primary@color} -% for boxes -\renewcommand\@box@background{cyan!20!white} -\renewcommand\@box@frame{blue!30!teal} -\renewcommand\@box@title@background{blue!55!cyan} -\renewcommand\@box@color{blue!45!teal!80!black} -\renewcommand\@alert@background{red!10!white} -\renewcommand\@alert@color{red!40!black!90!white} -\renewcommand\@alert@frame{red!75!teal} -\renewcommand\@alert@title@background{red!80!cyan} -% for theorems -\renewcommand\@define@background{green!8!white!94!black} -\renewcommand\@define@frame{green!10!white!90!black} -\renewcommand\@define@color{green!40!black!90!white} -\renewcommand\@theorem@background{-blue!20!black!96!green} -\renewcommand\@theorem@frame{-blue!30!black!90!green} -\renewcommand\@theorem@color{red!57!green!90!black}
\ No newline at end of file diff --git a/macros/latex/contrib/qyxf-book/colors/rbb.tex b/macros/latex/contrib/qyxf-book/colors/rbb.tex deleted file mode 100644 index 98257f8de9..0000000000 --- a/macros/latex/contrib/qyxf-book/colors/rbb.tex +++ /dev/null @@ -1,24 +0,0 @@ -% color-scheme: rbb -% author-by: xjtu-blacksmith -% create-on: 2020/8/19 - -% main colors -\newcommand\@primary@color{blue} -\newcommand\@info@color{red} -% for titles amd text -\renewcommand\@title@color{\@primary@color} -\renewcommand\@list@color{\@primary@color} -\renewcommand\@caption@color{\@primary@color} -\renewcommand\@link@color{\@info@color} -\renewcommand\@misc@color{\@primary@color} -% for boxes -\renewcommand\@box@background{white} -\renewcommand\@box@frame{\@primary@color} -\renewcommand\@box@title@background{\@primary@color} -\renewcommand\@alert@color{\@info@color} -\renewcommand\@alert@frame{\@info@color} -\renewcommand\@alert@title@background{\@info@color} -% for theorems -\renewcommand\@define@frame{black} -\renewcommand\@theorem@background{white} -\renewcommand\@theorem@frame{\@primary@color}
\ No newline at end of file diff --git a/macros/latex/contrib/qyxf-book/demo.pdf b/macros/latex/contrib/qyxf-book/demo.pdf Binary files differdeleted file mode 100644 index af296de229..0000000000 --- a/macros/latex/contrib/qyxf-book/demo.pdf +++ /dev/null diff --git a/macros/latex/contrib/qyxf-book/figure/cover.pdf b/macros/latex/contrib/qyxf-book/figure/qyxf-cover.pdf Binary files differindex 4250c9dd72..4250c9dd72 100644 --- a/macros/latex/contrib/qyxf-book/figure/cover.pdf +++ b/macros/latex/contrib/qyxf-book/figure/qyxf-cover.pdf diff --git a/macros/latex/contrib/qyxf-book/qyxf-book-doc.pdf b/macros/latex/contrib/qyxf-book/qyxf-book-doc.pdf Binary files differnew file mode 100644 index 0000000000..82d3c3fb0d --- /dev/null +++ b/macros/latex/contrib/qyxf-book/qyxf-book-doc.pdf diff --git a/macros/latex/contrib/qyxf-book/demo.tex b/macros/latex/contrib/qyxf-book/qyxf-book-doc.tex index e9828c9617..d063f7558c 100644 --- a/macros/latex/contrib/qyxf-book/demo.tex +++ b/macros/latex/contrib/qyxf-book/qyxf-book-doc.tex @@ -4,7 +4,7 @@ twoside, openany, b5paper, % 以上å‡ä¸º ctexbook æ供的文类选项 - colorscheme = basic % è¯·æ ¹æ®éœ€è¦é€‰æ‹©æˆ–定制é…色方案 + colorscheme = basic, % è¯·æ ¹æ®éœ€è¦é€‰æ‹©æˆ–定制é…色方案 ]{qyxf-book} \title{钱院å¦è¾… \LaTeX 书ç±æ¨¡æ¿} @@ -90,7 +90,7 @@ 当å‰ç‰ˆæœ¬ã€‚在 V2 版本之上进一æ¥æ”¹è¿›äº†ä¹‹å‰çš„问题,并å‘通用ã€å¯å®šåˆ¶çš„æ–¹å‘å‰è¿›ä¸€å¤§æ¥ã€‚ -在å—体方é¢ï¼Œç§»é™¤äº†ä¸æ–‡å—体备选项,完全采用 C\TeX å®é›†çš„默认设置;西文åŠæ•°å¦å†…容采用 \TeX å‘行版附带的 XITS å—体,由æ¤ä½¿æ¨¡æ¿æœ¬èº«å®Œå…¨æ‘†è„±å¯¹å¤–部å—体的ä¾èµ–\footnote{å—体的定制交由用户完æˆï¼Œæœ¬æ¨¡æ¿ä¸å‚与其ä¸ã€‚}。 +在å—体方é¢ï¼Œç§»é™¤äº†ä¸æ–‡å—体备选项,完全采用 C\TeX å®é›†çš„默认设置;西文åŠæ•°å¦å†…容采用 \TeX å‘行版附带的 XITS å—体,使模æ¿è¿›ä¸€æ¥å‡å°‘了对外部å—体的ä¾èµ–\footnote{å—体的定制交由用户完æˆï¼Œæœ¬æ¨¡æ¿ä¸å‚与其ä¸ã€‚}。 åœ¨æ ·å¼æ–¹é¢ï¼Œç»¼åˆè‹¥å¹²ä¹¦ç±åŠç½‘页模æ¿é‡è®¾äº†å„ç±»å…ƒç´ çš„å°ºå¯¸ã€é—´è·ï¼Œå¹¶å®Œå…¨ç§»é™¤äº†åŽŸç”± \verb|pgfornament| 与 \verb|pgfornament-han| å®åŒ…所实现的装饰\footnote{一方é¢ï¼Œæ˜¯å› 为 \TeX Live 2020 ä¸è¿™ä¸¤ä¸ªå®åŒ…未被容纳进æ¥ï¼›å¦ä¸€æ–¹é¢ï¼Œç›®å‰ä¹Ÿå‘现装饰的å˜åœ¨ä¸åˆ©äºŽæ ·å¼çš„修改ã€å®šåˆ¶ï¼Œä¸”å¯¹é˜…è¯»æ•ˆæžœå¹¶æ— æ˜Žæ˜¾æ”¹å–„ã€‚}。 @@ -98,8 +98,7 @@ \subsection{我该用哪一个版本?} -若需è¦ç¼–译由钱院å¦è¾… 2020 å¹´ 8 月å‰å‘布的资料之 \LaTeX æºç ,请直接用æºç ä¸é™„带的 \verb|qyxf-book.cls| 文件编译,或下载 V2 系列最新版本 v2.3\footnote{链接:\url{https://gitee.com/qyxf/qyxf-book/releases/2.3}}。å¦åˆ™ï¼Œè¯·é‡‡ç”¨æœ€æ–°ç‰ˆæœ¬çš„模æ¿å¥—装\footnote{包括模æ¿æ–‡ä»¶ \texttt{qyxf-book.cls} åŠå›¾ç‰‡ã€é…色方案ç‰é™„件。}。 - +若需è¦ç¼–译由钱院å¦è¾… 2020 å¹´ 8 月å‰å‘布的资料之 \LaTeX æºç ,请直接用æºç ä¸é™„带的 \verb|qyxf-book.cls| 文件编译,或下载 V2 系列最新版本 v2.3\footnote{链接:\url{https://gitee.com/qyxf/qyxf-book/releases/2.3}}。å¦åˆ™ï¼Œè¯·é‡‡ç”¨æœ€æ–°ç‰ˆæœ¬çš„模æ¿æ–‡ä»¶ã€‚ \begin{alert} 请采用 \hologo{XeLaTeX} 编译使用本模æ¿ï¼Œå…¶ä»–场åˆä¸‹ä¸ä¿è¯æœ¬æ¨¡æ¿çš„功能æ£å¸¸ï¼›æ¨¡æ¿æœªæ¥çš„å¼€å‘之ä¸ä¹Ÿä¸ä¼šè€ƒè™‘对其他 \LaTeX å¼•æ“Žçš„æ”¯æŒ @@ -117,8 +116,10 @@ \footnote{模æ¿ä¸æ²¡æœ‰ä¸ºè¿™ä¸ªå‘½ä»¤è®¾ç½®è‡ªåŠ¨ç¼–å·ï¼Œä¸»è¦æ˜¯å› 为编写题解的过程ä¸å¸¸å‡ºçŽ°é€‰é¢˜ã€ 跳题的情况,且自动编å·ä¸‹ä¸æ˜“从æºä»£ç ä¸æ‰¾åˆ°å¯¹åº”题目。} (å¯ç•™ç©ºï¼‰ï¼Œå¦‚ \verb|\exercise{1}| 将生æˆï¼š\exercise{1}。 - \item \verb|\solve|:生æˆä¸€ä¸ªã€Œè§£ã€çš„æ ‡è®°ï¼š\solve。 - \item \verb|\analysis|:生æˆä¸€ä¸ªã€Œåˆ†æžã€çš„æ ‡è®°ï¼š\analysis。 + \item \verb|\solve|:生æˆä¸€ä¸ªã€Œè§£ã€çš„æ ‡è®°ï¼š\solve。(其å¯ä»¥æŽ¥å—一个å¯é€‰å‚æ•°æ¥æ›¿æ¢ã€Œè§£ã€å— + \footnote{ä½ å¯ä»¥é€šè¿‡è¿™ä¸ªç‰¹æ€§å®šä¹‰è‡ªå·±éœ€è¦çš„æ ‡è®°å‘½ä»¤ï¼Œä¸‹é¢çš„分æžæ ‡è®°åŒç†ã€‚}) + ,如 \verb|\solve[ç”]| 将生æˆï¼š\solve[ç”]。 + \item \verb|\analysis|:生æˆä¸€ä¸ªã€Œåˆ†æžã€çš„æ ‡è®°ï¼š\analysis。(其å¯ä»¥æŽ¥å—一个å‚æ•°æ¥æ›¿æ¢ã€Œåˆ†æžã€äºŒå—,如 \verb|\analysis[注记]| 将生æˆï¼š\analysis[注记]。) \end{itemize} 除æ¤ä¹‹å¤–,还æ供了常è§çš„用户环境,包括: @@ -127,7 +128,7 @@ \item 定义类环境:定义 \verb|definition| \item 其他环境:注记 \verb|note|ã€è¦å‘Š \verb|alert| \end{itemize} -å…¶ä¸ï¼Œå®šç†ã€å®šä¹‰ç±»çŽ¯å¢ƒå±žäºŽæ•°å¦çŽ¯å¢ƒï¼Œé‡‡ç”¨ \LaTeX 原生机制定义,仅在外围包裹一层装饰用的盒åï¼›å› æ¤ï¼Œå¯æŒ‰ç…§é€šå¸¸çš„写法编写数å¦çŽ¯å¢ƒï¼Œå¦‚: +å…¶ä¸ï¼Œå®šç†ã€å®šä¹‰ç±»çŽ¯å¢ƒå±žäºŽæ•°å¦ç±»çŽ¯å¢ƒï¼Œé‡‡ç”¨ \LaTeX 原生机制定义,仅在外围包裹一层装饰用的盒åï¼›å› æ¤ï¼Œå¯æŒ‰ç…§é€šå¸¸çš„写法编写数å¦ç±»çŽ¯å¢ƒï¼Œå¦‚: \begin{tcolorbox} \begin{verbatim} \begin{theorem}[L'H\^opital 法则] @@ -148,24 +149,54 @@ \subsection{é…色方案定制} -本模æ¿æ”¯æŒç”¨æˆ·è‡ªå®šä¹‰çš„é…色方案,写法请å‚考å‘å¸ƒç‰ˆæœ¬ä¸ \verb|colors| 目录下的文件。目å‰éšæ¨¡æ¿ä¸€åŒå‘布的é…色方案包括: +\subsubsection{预定义é…色方案} + +ç›®å‰ï¼Œæ¨¡æ¿ä¸å·²é¢„定义的é…色方案包括: \begin{itemize} - \item \verb|basic|:基本的ç°åº¦é…色方案,仿效于 \verb|qyxf-book| V2 版本的设计,默认值。 + \item \verb|basic|:默认的ç°åº¦é…色方案,与 \verb|qyxf-book| V2 版本ä¸çš„é…色接近。 + \item \verb|black|:åªæœ‰é»‘白两色的é…色方案。å¯ä»¥å¾ˆå®¹æ˜“的调整为\emph{自定义åŒè‰²æ–¹æ¡ˆ}。 + \item \verb|rbb|:红色 + è“色 + 黑色(Red Blue Black)的é…色方案。å¯ä»¥å¾ˆå®¹æ˜“的调整为\emph{自定义三色方案}。 \item \verb|bootstrap-v4|:借鉴 BootStrap V4 ä¸çš„é…色方案。 - \item \verb|black|:åªæœ‰é»‘白两色,éžå¸¸é€‚åˆæ”¹é€ æˆå…¶ä»–çš„åŒè‰²é…色方案。 - \item \verb|rbb|:红色 + è“色 + 黑色(Red Blue Black),在å±å¹•ä¸Šæ¯”较醒目。 \end{itemize} - -é…色方案定制完æˆåŽï¼Œè¯·åœ¨æ–‡æ¡£ç±»ä¸é€šè¿‡é”®å€¼å¯¹çš„å½¢å¼å¼•ç”¨ï¼Œå¦‚ +欲使用以上的方案,请在文档类ä¸é€šè¿‡é”®å€¼å¯¹çš„å½¢å¼å¼•ç”¨ï¼Œå¦‚ \begin{tcolorbox} \verb|colorsheme = rbb| \end{tcolorbox} å°†å¯ç”¨ \verb|rbb| é…色方案。 -é…色方案文件请\textbf{务必}放在待编译文件所在目录的 \verb|colors| å目录下。 +\subsubsection{åŒè‰²\&三色方案快速生æˆ} +为方便用户快速修改预定义é…色方案,模æ¿ä¸ºåŒè‰²æ–¹æ¡ˆ \verb|black| 和三色方案 \verb|rbb| 设计了两个文类选项: +\begin{itemize} + \item \verb|primary|:主色,相当于 \verb|black| ä¸çš„é»‘è‰²åŠ \verb|rbb| ä¸çš„è“色; + \item \verb|seconadry|:辅助色,åªå¯¹ \verb|rbb| 方案生效,相当于 \verb|rbb| ä¸çš„红色。 +\end{itemize} +若您想快速定义一个自己的åŒè‰²æˆ–三色é…色方案,å¯ç›´æŽ¥é€šè¿‡ä»¥ä¸Šä¸¤ä¸ªæ–‡ç±»é€‰é¡¹è®¾ç½®ã€‚例如,若您希望使用橙 + 黑的åŒè‰²ä¸»é¢˜ï¼Œå¯é€šè¿‡ä»¥ä¸‹çš„文类选项实现: +\begin{tcolorbox} +\begin{verbatim} +\documentclass[ + colorscheme = black, % 载入åŒè‰²ä¸»é¢˜ï¼Œæ¤æ—¶ä¸»è‰²ä¸ºé»‘色 + primary = orange % 将主色改为橙色 +]{qyxf-book} +\end{verbatim} +\end{tcolorbox} +而如果您希望使用橙 + ç´« + 黑的三色主题,则å¯é€šè¿‡ä»¥ä¸‹çš„文类选项实现: +\begin{tcolorbox} +\begin{verbatim} + \documentclass[ + colorscheme = rbb, % 载入三色主题 + primary = orange, % 将主色改为橙色 + secondary = violet % 将辅助色改为紫色 + ]{qyxf-book} +\end{verbatim} +\end{tcolorbox} + +\begin{alert} +请采用 \verb|xcolor| å®åŒ…所æ供的混色è¯æ³•ï¼ˆå¦‚ \verb|red!50!blue|)设置对应的值,其他写法目å‰å°šä¸æ”¯æŒã€‚下åŒã€‚ +\end{alert} -若您需è¦ç¼–写自己的é…色方案,请å‚考表 \ref{tab:color-scheme} 所示的å„项接å£ï¼›å»ºè®®æ‚¨é‡‡ç”¨ \verb|xcolor| å®åŒ…所æ供的混色è¯æ³•ï¼ˆå¦‚ \verb|red!50!blue|)设置对应的值,其他写法目å‰å°šä¸æ”¯æŒã€‚ +\subsubsection{自定义é…色方案} +若您需è¦ç¼–写自己的é…色方案,请通过 \verb|\renewcommand| 命令修改表 \ref{tab:color-scheme} 所示的å„项接å£ï¼Œåœ¨é¢„定义主题的基础上修改相应颜色值。 \begin{table}[htbp] \centering\small \caption{é…色方案接å£è¡¨}\label{tab:color-scheme} @@ -173,33 +204,43 @@ \toprule æ¡ç›® & 接å£å® & \parbox{5em}{\centering \texttt{basic}\\方案默认值} & 备注 \\ \midrule -æ ‡é¢˜æ–‡å— & \verb|\@title@color| & \verb|black| & \\ -åˆ—è¡¨æ ‡è®° & \verb|\@list@color| & \verb|black| & \\ -å›¾è¡¨æ ‡é¢˜æ–‡å— & \verb|\@caption@color| & \verb|black| & \\ -é“¾æŽ¥æ–‡å— & \verb|\@link@color| & \verb|black| & \\ -æ‚é¡¹æ–‡å— & \verb|\@misc@color| & \verb|black| & \parbox{7em}{页ç ã€å¼•ç”¨æ ‡è®°ã€å¼•å¯¼æ ‡è®°ç‰} \\ +æ ‡é¢˜æ–‡å— & \verb|\TitleColor| & \verb|black| & \\ +åˆ—è¡¨æ ‡è®° & \verb|\ListColor| & \verb|black| & \\ +å›¾è¡¨æ ‡é¢˜æ–‡å— & \verb|\CaptionColor| & \verb|black| & \\ +é“¾æŽ¥æ–‡å— & \verb|\LinkColor| & \verb|black| & \\ +æ‚é¡¹æ–‡å— & \verb|\MiscColor| & \verb|black| & \parbox{7em}{页ç ã€å¼•ç”¨æ ‡è®°ã€å¼•å¯¼æ ‡è®°ç‰} \\ \midrule -ç›’å背景 & \verb|\@box@background| & \verb|white| & \parbox{7em}{\texttt{tcolorbox} 环境默认定义,下åŒ} \\ -ç›’å边框 & \verb|\@box@frame| & \verb|black!75| & \\ -ç›’åæ ‡é¢˜æ–‡å— & \verb|\@box@title@color| & \verb|white| & \\ -ç›’åæ ‡é¢˜èƒŒæ™¯ & \verb|\@box@title@background| & \verb|black!50| & \\ -ç›’åæ–‡å— & \verb|\@box@color| & \verb|black| & \\ -è¦å‘Šç›’å背景 & \verb|\@alert@background| & \verb|white| & \parbox{7em}{对 \texttt{alert} 环境定义,下åŒ} \\ -è¦å‘Šç›’åæ–‡å— & \verb|\@alert@color| & \verb|black| & \\ -è¦å‘Šç›’å边框 & \verb|\@alert@frame| & \verb|black| & \\ -è¦å‘Šç›’åæ ‡é¢˜èƒŒæ™¯ & \verb|\@alert@title@background| & \verb|black| & \\ -è¦å‘Šç›’åæ ‡é¢˜æ–‡å— & \verb|\@alert@title@color| & \verb|white| & \\ +ç›’å背景 & \verb|\BoxBackground| & \verb|white| & \parbox{7em}{\texttt{tcolorbox} 环境默认定义,下åŒ} \\ +ç›’å边框 & \verb|\BoxFrame| & \verb|black!75| & \\ +ç›’åæ ‡é¢˜æ–‡å— & \verb|\BoxTitleColor| & \verb|white| & \\ +ç›’åæ ‡é¢˜èƒŒæ™¯ & \verb|\BoxTitleBackground| & \verb|black!50| & \\ +ç›’åæ–‡å— & \verb|\BoxColor| & \verb|black| & \\ +è¦å‘Šç›’å背景 & \verb|\AlertBackground| & \verb|white| & \parbox{7em}{对 \texttt{alert} 环境定义,下åŒ} \\ +è¦å‘Šç›’åæ–‡å— & \verb|\AlertColor| & \verb|black| & \\ +è¦å‘Šç›’å边框 & \verb|\AlertFrame| & \verb|black| & \\ +è¦å‘Šç›’åæ ‡é¢˜èƒŒæ™¯ & \verb|\AlertTitleBackground| & \verb|black| & \\ +è¦å‘Šç›’åæ ‡é¢˜æ–‡å— & \verb|\AlertTitleColor| & \verb|white| & \\ \midrule -定义环境背景 & \verb|\@define@background| & \verb|white| & \parbox{7em}{对 \texttt{define} 环境定义,下åŒ} \\ -定义环境边框 & \verb|\@define@frame| & \verb|black!40| & \\ -å®šä¹‰çŽ¯å¢ƒæ–‡å— & \verb|\@define@color| & \verb|black| & \\ -定ç†çŽ¯å¢ƒèƒŒæ™¯ & \verb|\@theorem@background| & \verb|black!10| & \parbox{7em}{对å„定ç†ç±»çŽ¯å¢ƒå®šä¹‰ï¼Œä¸‹åŒ} \\ -定ç†çŽ¯å¢ƒè¾¹æ¡† & \verb|\@theorem@frame| & \verb|black!80| & \\ -定ç†çŽ¯å¢ƒæ–‡å— & \verb|\@theorem@color| & \verb|black| & \\ +定义环境背景 & \verb|\DefineBackground| & \verb|white| & \parbox{7em}{对 \texttt{define} 环境定义,下åŒ} \\ +定义环境边框 & \verb|\DefineFrame| & \verb|black!40| & \\ +å®šä¹‰çŽ¯å¢ƒæ–‡å— & \verb|\DefineColor| & \verb|black| & \\ +定ç†çŽ¯å¢ƒèƒŒæ™¯ & \verb|\TheoremBackground| & \verb|black!10| & \parbox{7em}{对å„定ç†ç±»çŽ¯å¢ƒå®šä¹‰ï¼Œä¸‹åŒ} \\ +定ç†çŽ¯å¢ƒè¾¹æ¡† & \verb|\TheoremFrame| & \verb|black!80| & \\ +定ç†çŽ¯å¢ƒæ–‡å— & \verb|\TheoremColor| & \verb|black| & \\ \bottomrule \end{tabular} \end{table} +需è¦æ³¨æ„的是,在é‡å®šä¹‰é“¾æŽ¥åŠç›’å环境的é…色时,å¯èƒ½å› 设置命令æå‰å±•å¼€æŽ¥å£è€Œæ— 法生效;在æ¤æƒ…况下,请使用 \verb|\selectcolor| 命令强制更新这些颜色的值。例如,è¦å˜æ›´é“¾æŽ¥é¢œè‰² \verb|\LinkColor| åŠç›’åæ–‡å—颜色 \verb|\BoxColor| 为 \verb|red!50|,请通过以下命令实现: + +\begin{tcolorbox} +\begin{verbatim} +\renewcommand{\LinkColor}{red!50} +\renewcommand{\BoxColor}{red!50} +\selectcolor % 更新颜色 +\end{verbatim} +\end{tcolorbox} + \subsection{元信æ¯å®šåˆ¶} 本模æ¿ä¸è¦æ±‚å¡«å†™å‡ é¡¹å…ƒä¿¡æ¯ï¼Œå¦‚表 \ref{tab:metadata} 所示。请在使用时填写完整,以é¿å…出现预料之外的情况。 @@ -240,18 +281,19 @@ \subsection{å°é¢å®šåˆ¶} -本模æ¿æ供了简易的å°é¢å®šåˆ¶æŽ¥å£ï¼Œé€šè¿‡ \verb|\cover| 命令æ¥å¡«å†™å°é¢ä¸Šéœ€è¦çš„内容。例如,需è¦å°†æœ¬æ¨¡æ¿ä¸è‡ªå¸¦çš„ \verb|cover.pdf| 文件æ’入到å°é¢ä¸å¿ƒï¼Œé€šè¿‡ä»¥ä¸‹å‘½ä»¤å³å¯ï¼š +本模æ¿æ供了简易的å°é¢å®šåˆ¶æŽ¥å£ï¼Œé€šè¿‡ \verb|\cover| 命令æ¥å¡«å†™å°é¢ä¸Šéœ€è¦çš„内容。例如,需è¦å°†æœ¬æ¨¡æ¿ä¸è‡ªå¸¦çš„ \verb|qyxf-logo.pdf| 文件æ’入到å°é¢ä¸å¿ƒï¼Œé€šè¿‡ä»¥ä¸‹å‘½ä»¤å³å¯ï¼š \begin{tcolorbox} \begin{verbatim} -\cover{\includegraphics[width=0.5\textwidth]{figure/cover.pdf}} +\cover{\includegraphics[width=0.5\textwidth]% +{figure/qyxf-logo.pdf}} \end{verbatim} \end{tcolorbox} 若您希望使æ’å…¥å…ƒç´ é å‘上侧,则å¯è¿™æ ·å®žçŽ°ï¼š \begin{tcolorbox} \begin{verbatim} -\cover{\includegraphics[width=0.5\textwidth]{figure/cover.pdf}% -\vfill} +\cover{\includegraphics[width=0.5\textwidth]% +{figure/qyxf-logo.pdf}\vfill} \end{verbatim} \end{tcolorbox} åŽä¾§çš„ \verb|\vfill| 会将æ’å…¥å…ƒç´ å‘上挤压。在å¦ä¸€æ–¹å‘上åŒç†ã€‚除了æ’入图片之外,您也å¯ä»¥ä½¿ç”¨ \verb|\cover| 命令在首页上æ’入全局性命令,或使用 Ti$k$Z 环境按页é¢å®šä½æ’入图片。 @@ -289,7 +331,7 @@ \subsection{西文å—体设置} -西文å—体方é¢ï¼Œç›®å‰é‡‡ç”¨ XITS 系列å—体 +西文å—体方é¢ï¼Œç›®å‰é‡‡ç”¨ä¸Ž Times 系列å—体相近的 XITS 系列å—体 \footnote{æ— è¡¬çº¿ä½“é‡‡ç”¨æŽ¥è¿‘äºŽ Helvetica çš„ \TeX{} Gyre Heros。} 。如您想å˜æ›´è¥¿æ–‡å—体,请完æˆä»¥ä¸‹ä¸¤ä¸ªæ¥éª¤ï¼š @@ -456,7 +498,7 @@ C\TeX å®é›†æä¾›äº†å‡ ç§é¢„定义的å—体设置,除系统å—ä½“ä¹‹å¤–è¿˜åŒ \begin{figure}[htbp] \centering - \includegraphics[width=.3\textwidth]{cover.pdf} + \includegraphics[width=.3\textwidth]{qyxf-cover.pdf} \caption{V2 版本的å°é¢å›¾ç‰‡} \label{fig:qyxf-logo} \end{figure} diff --git a/macros/latex/contrib/qyxf-book/qyxf-book.cls b/macros/latex/contrib/qyxf-book/qyxf-book.cls index f69f186620..8dfc56085a 100644 --- a/macros/latex/contrib/qyxf-book/qyxf-book.cls +++ b/macros/latex/contrib/qyxf-book/qyxf-book.cls @@ -4,10 +4,10 @@ % -------------------------- \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\newcommand{\styversion}{3.0} +\newcommand{\styversion}{3.1.0} \newcommand{\styname}{qyxf-book} \ProvidesClass{qyxf-book} - [2020/08/27 v3.0 Qian Yuan Xue Fu book template] + [2020/09/11 v3.1.0 Qian Yuan Xue Fu book template] \typeout{The book template provided by Qian Yuan Xue Fu} % 设定 key-val 选项 @@ -16,6 +16,8 @@ % é€‰é¡¹å®šåˆ¶ä¸Žå¤„ç† \DeclareStringOption[basic]{colorscheme}[basic] +\DeclareStringOption{primary} +\DeclareStringOption{secondary} \DeclareBoolOption[true]{xits} \DeclareVoidOption{noCJKfont}{\PassOptionsToClass{fontset=none}{ctexbook}} @@ -46,9 +48,6 @@ \fi \RequirePackage{hologo} -% etoolbox -\RequirePackage{etoolbox} - % æ£æ–‡æ ·å¼è®¾ç½® \RequirePackage[normalem]{ulem} @@ -67,54 +66,128 @@ % caption æ ·å¼è®¾å®š \RequirePackage{caption} -\DeclareCaptionFormat{colored}{\small{\bfseries\color{\@caption@color}#1} #3} +\DeclareCaptionFormat{colored}{\small{\bfseries\color{\CaptionColor}#1} #3} \captionsetup{ format = colored, skip = 1ex } +% 处ç†é…色方案 +\RequirePackage{etoolbox} +\ifdefempty{\QYXF@primary}{\relax}{\newcommand{\PrimaryColor}{\QYXF@primary}} +\ifdefempty{\QYXF@secondary}{\relax}{\newcommand{\SecondaryColor}{\QYXF@secondary}} + % color scheme 默认值 + % for titles amd text -\newcommand{\@title@color}{black} -\newcommand{\@list@color}{black} -\newcommand{\@caption@color}{black} -\newcommand{\@link@color}{black} -\newcommand{\@misc@color}{black} +\newcommand{\TitleColor}{black} +\newcommand{\ListColor}{black} +\newcommand{\CaptionColor}{black} +\newcommand{\LinkColor}{black} +\newcommand{\MiscColor}{black} % for boxes -\newcommand{\@box@background}{white} -\newcommand{\@box@frame}{black!75} -\newcommand{\@box@title@color}{white} -\newcommand{\@box@title@background}{black!50} -\newcommand{\@box@color}{black} -\newcommand{\@alert@background}{white} -\newcommand{\@alert@color}{black} -\newcommand{\@alert@frame}{black} -\newcommand{\@alert@title@background}{black} -\newcommand{\@alert@title@color}{white} +\newcommand{\BoxBackground}{white} +\newcommand{\BoxFrame}{black!75} +\newcommand{\BoxTitleColor}{white} +\newcommand{\BoxTitleBackground}{black!50} +\newcommand{\BoxColor}{black} +\newcommand{\AlertBackground}{white} +\newcommand{\AlertColor}{black} +\newcommand{\AlertFrame}{black} +\newcommand{\AlertTitleBackground}{black} +\newcommand{\AlertTitleColor}{white} % for theorems -\newcommand{\@define@background}{white} -\newcommand{\@define@frame}{black!40} -\newcommand{\@define@color}{black} -\newcommand{\@theorem@background}{black!10} -\newcommand{\@theorem@frame}{black!80} -\newcommand{\@theorem@color}{black} +\newcommand{\DefineBackground}{white} +\newcommand{\DefineFrame}{black!40} +\newcommand{\DefineColor}{black} +\newcommand{\TheoremBackground}{black!10} +\newcommand{\TheoremFrame}{black!80} +\newcommand{\TheoremColor}{black} % è¯»å– color scheme -\ifdefstring{\QYXF@colorscheme}{basic}{\relax}{% - \newcommand\schemepath{colors/\QYXF@colorscheme.tex} - \input{\schemepath}} +\RequirePackage{xstring} +\IfEqCase{\QYXF@colorscheme}{% + {basic}{\relax}% Basic theme + {black}{% BLack theme (bicolor) + % main colors + \providecommand\PrimaryColor{black} + % for titles amd text + \renewcommand\TitleColor{\PrimaryColor} + \renewcommand\ListColor{\PrimaryColor} + \renewcommand\CaptionColor{\PrimaryColor} + \renewcommand\LinkColor{\PrimaryColor} + \renewcommand\MiscColor{\PrimaryColor} + % for boxes + \renewcommand\BoxBackground{white} + \renewcommand\BoxTitleColor{\PrimaryColor} + \renewcommand\BoxTitleBackground{white} + \renewcommand\BoxFrame{\PrimaryColor} + \renewcommand\AlertTitleColor{white} + \renewcommand\AlertTitleBackground{\PrimaryColor} + % for theorems + \renewcommand\DefineFrame{\PrimaryColor} + \renewcommand\TheoremBackground{white} + \renewcommand\TheoremFrame{\PrimaryColor} + }% + {rbb}{% Red-Blue-Black theme (tricolor) + % main colors + \providecommand\PrimaryColor{blue} + \providecommand\SecondaryColor{red} + % for titles amd text + \renewcommand\TitleColor{\PrimaryColor} + \renewcommand\ListColor{\PrimaryColor} + \renewcommand\CaptionColor{\PrimaryColor} + \renewcommand\LinkColor{\SecondaryColor} + \renewcommand\MiscColor{\PrimaryColor} + % for boxes + \renewcommand\BoxBackground{white} + \renewcommand\BoxFrame{\PrimaryColor} + \renewcommand\BoxTitleBackground{\PrimaryColor} + \renewcommand\AlertColor{\SecondaryColor} + \renewcommand\AlertFrame{\SecondaryColor} + \renewcommand\AlertTitleBackground{\SecondaryColor} + % for theorems + \renewcommand\DefineFrame{black} + \renewcommand\TheoremBackground{white} + \renewcommand\TheoremFrame{\PrimaryColor} + }% + {bootstrap-v4}{% Bootstrap V4 theme + % for titles amd text + \renewcommand\TitleColor{black!85} + \renewcommand\ListColor{blue!50!cyan} + \renewcommand\CaptionColor{cyan!80!olive} + \renewcommand\LinkColor{blue!67!green!} + \renewcommand\MiscColor{blue!50!cyan} + % for boxes + \renewcommand\BoxBackground{cyan!20!white} + \renewcommand\BoxFrame{blue!30!teal} + \renewcommand\BoxTitleBackground{blue!55!cyan} + \renewcommand\BoxColor{blue!45!teal!80!black} + \renewcommand\AlertBackground{red!10!white} + \renewcommand\AlertColor{red!40!black!90!white} + \renewcommand\AlertFrame{red!75!teal} + \renewcommand\AlertTitleBackground{red!80!cyan} + % for theorems + \renewcommand\DefineBackground{green!8!white!94!black} + \renewcommand\DefineFrame{green!10!white!90!black} + \renewcommand\DefineColor{green!40!black!90!white} + \renewcommand\TheoremBackground{-blue!20!black!96!green} + \renewcommand\TheoremFrame{-blue!30!black!90!green} + \renewcommand\TheoremColor{red!57!green!90!black} + }% +}[\ClassWarning{\styname}{Color scheme `\QYXF@colorscheme' not found, `basic' theme is used then.}] % tcolorbox æ ·å¼è®¾å®š \tcbset{ enhanced, noparskip, after = \noindent, - colback = \@box@background, + colback = \BoxBackground, title filled, - colbacktitle = \@box@title@background, - colframe = \@box@frame, - coltitle = \@box@title@color, - coltext = \@box@color, + colbacktitle = \BoxTitleBackground, + colframe = \BoxFrame, + coltitle = \BoxTitleColor, + coltext = \BoxColor, fonttitle = \bfseries, arc = 0.25em, boxrule = 0.5pt, @@ -130,28 +203,28 @@ } % 引导命令 -\newcommand{\exercise}[1]{\noindent\textbf{\color{\@misc@color}ç»ƒä¹ #1}\ } -\newcommand{\solve}{\noindent\textbf{\color{\@misc@color}\uline{解}}\ } -\newcommand{\analysis}{\noindent\textbf{\color{\@misc@color}\uline{分æž}}\ } +\newcommand{\exercise}[1]{\noindent\textbf{\color{\MiscColor}ç»ƒä¹ #1}\ } +\newcommand{\solve}[1][解]{\noindent\textbf{\color{\MiscColor}#1}\ } +\newcommand{\analysis}[1][分æž]{\noindent\emph{\color{\MiscColor}#1}\ } % 定ç†çŽ¯å¢ƒåŠæ ·å¼è®¾å®š \newtheorem{theorem}{定ç†} \newtheorem{lemma}[theorem]{引ç†} \newtheorem{define}{定义} -\BeforeBeginEnvironment{theorem}{\begin{tcolorbox}[colback=\@theorem@background,colframe=\@theorem@frame,coltext=\@theorem@color]} +\BeforeBeginEnvironment{theorem}{\begin{tcolorbox}[colback=\TheoremBackground,colframe=\TheoremFrame,coltext=\TheoremColor]} \AfterEndEnvironment{theorem}{\end{tcolorbox}} -\BeforeBeginEnvironment{lemma}{\begin{tcolorbox}[colback=\@theorem@background,colframe=\@theorem@frame,coltext=\@theorem@color]} +\BeforeBeginEnvironment{lemma}{\begin{tcolorbox}[colback=\TheoremBackground,colframe=\TheoremFrame,coltext=\TheoremColor]} \AfterEndEnvironment{lemma}{\end{tcolorbox}} -\BeforeBeginEnvironment{define}{\begin{tcolorbox}[colback=\@define@background,colframe=\@define@frame,coltext=\@define@color]} +\BeforeBeginEnvironment{define}{\begin{tcolorbox}[colback=\DefineBackground,colframe=\DefineFrame,coltext=\DefineColor]} \AfterEndEnvironment{define}{\end{tcolorbox}} \newtcolorbox{note}{title={注记}} \newtcolorbox{alert}{ title = {è¦å‘Š}, - colback = \@alert@background, - colframe = \@alert@frame, - colbacktitle = \@alert@title@background, - coltitle = \@alert@title@color, - coltext = \@alert@color + colback = \AlertBackground, + colframe = \AlertFrame, + colbacktitle = \AlertTitleBackground, + coltitle = \AlertTitleColor, + coltext = \AlertColor } % 页é¢è®¾ç½® @@ -174,18 +247,21 @@ } \hypersetup{ colorlinks = true, - linkcolor = \@link@color, - anchorcolor = \@misc@color, - urlcolor = \@link@color, - citecolor = \@misc@color + linkcolor = \LinkColor, + anchorcolor = \MiscColor, + urlcolor = \LinkColor, + citecolor = \MiscColor } % ç« èŠ‚æ ‡é¢˜ä¸Žç›®å½•æ ·å¼ \RequirePackage{titlesec,titletoc} \ctexset{section={name={\S,}}} -\titleformat{\chapter}[block]{\color{\@title@color}\centering\bfseries\fontsize{2.25em}{1.2ex}}{\CTEXthechapter}{1em}{} -\titleformat*{\section}{\color{\@title@color}\fontsize{1.75em}{1.225ex}\bfseries\centering} -\titleformat*{\subsection}{\color{\@title@color}\fontsize{1.5em}{1.43ex}\bfseries} +\titleformat{\chapter}[block]{\color{\TitleColor}\centering\bfseries\fontsize{2.25em}{1.2ex}}{\CTEXthechapter}{1em}{} +\titleformat*{\section}{\color{\TitleColor}\fontsize{1.75em}{1.225ex}\bfseries\centering} +\titleformat*{\subsection}{\color{\TitleColor}\fontsize{1.5em}{1.43ex}\bfseries} +\titleformat*{\subsubsection}{\color{\TitleColor}\fontsize{1.25em}{1.4ex}\bfseries} +\titleformat*{\paragraph}{\color{\TitleColor}\bfseries} +\titleformat*{\subparagraph}{\color{\TitleColor}} \titlespacing{\chapter}{0pt}{*1}{*4} \titlecontents{chapter}[24pt]{\hspace{-2pc}\filright} {\normalsize\bfseries\contentspush{\thecontentslabel\ }} @@ -200,7 +276,7 @@ % 页眉页脚设置 \newcommand{\footerbox}{% - {\color{\@misc@color}\bfseries\thepage}\\[-\baselineskip] + {\color{\MiscColor}\bfseries\thepage}\\[-\baselineskip] \uline{\hphantom{\@footorginfo}}\\ \@footorginfo} \RequirePackage{fancyhdr} @@ -218,20 +294,19 @@ % åˆ—è¡¨æ ·å¼è®¾ç½® \RequirePackage[shortlabels]{enumitem} \RequirePackage{pifont} -\newcommand{\arrowmark}{\ding{228}} \setlist{nosep, partopsep=0.5ex} -\setlist[itemize,1]{label={\color{\@list@color}\arrowmark}, left=0.8em} -\setlist[itemize,2]{label={\color{\@list@color}\ding{111}}, left=2.8em} -\setlist[itemize,3]{label={\color{\@list@color}\ding{109}}, left=4.8em} -\setlist[enumerate,1]{label={\color{\@list@color}\textbf{\arabic*}.}, left=0.8em} -\setlist[enumerate,2]{label={\color{\@list@color}{\arabic*}.}, left=2.8em} -\setlist[enumerate,3]{label={\color{\@list@color}({\arabic*})}, left=4.8em} -\setlist[description]{style=nextline, font=\color{\@list@color}\bfseries} +\setlist[itemize,1]{label={\color{\ListColor}\ding{228}}, left=0.8em} +\setlist[itemize,2]{label={\color{\ListColor}\ding{111}}, left=2.8em} +\setlist[itemize,3]{label={\color{\ListColor}\ding{109}}, left=4.8em} +\setlist[enumerate,1]{label={\color{\ListColor}\textbf{\arabic*}.}, left=0.8em} +\setlist[enumerate,2]{label={\color{\ListColor}{\arabic*}.}, left=2.8em} +\setlist[enumerate,3]{label={\color{\ListColor}({\arabic*})}, left=4.8em} +\setlist[description]{style=nextline, font=\color{\ListColor}\bfseries} % å‚考文献定制 \RequirePackage[square,numbers]{natbib} -\renewcommand{\citenumfont}[1]{{\color{\@link@color}#1}} -\renewcommand{\bibnumfmt}[1]{{\color{\@list@color}[#1]}} +\renewcommand{\citenumfont}[1]{{\color{\LinkColor}#1}} +\renewcommand{\bibnumfmt}[1]{{\color{\ListColor}[#1]}} \AtBeginEnvironment{thebibliography}{\addcontentsline{toc}{chapter}{\bibname}} % æ‚项 @@ -274,12 +349,12 @@ \begin{titlepage} \null \begin{center}\large - \begin{tcolorbox}[blanker,borderline west={1mm}{0pt}{\@box@frame},% + \begin{tcolorbox}[blanker,borderline west={1mm}{0pt}{\BoxFrame},% left=20pt,top=1ex,bottom=1ex,after skip=0pt,no shadow] - {\color{\@title@color}\titlefont\@title} - \ifdefempty\@subtitle{}{\\[1ex]{\color{\@title@color}\subtitlefont\@subtitle}} + {\color{\TitleColor}\titlefont\@title} + \ifdefempty\@subtitle{}{\\[1ex]{\color{\TitleColor}\subtitlefont\@subtitle}} \end{tcolorbox} - \begin{tcolorbox}[blanker,borderline west={1mm}{0pt}{\@title@color},% + \begin{tcolorbox}[blanker,borderline west={1mm}{0pt}{\TitleColor},% left=20pt,top=2ex,bottom=1ex,before skip=0pt,after skip=0pt,no shadow] {\authorfont\@author}\\\datefont\@date \end{tcolorbox} @@ -293,12 +368,13 @@ \hypersetup{pageanchor=true} \null\vfill \begin{tcolorbox}[title={\bfseries 作å“ä¿¡æ¯}] - \arrowmark \textbf{æ ‡é¢˜ï¼š}\@title{} - \ifdefempty\@subtitle{}{: \textit{\@subtitle}}\\ - \arrowmark \textbf{作者:}\@author\\ - \ifdefempty{\@typo}{}{\arrowmark \textbf{æ ¡å¯¹æŽ’ç‰ˆï¼š}\@typo\\} - \arrowmark \textbf{出å“时间:}\@date\\ - \arrowmark \textbf{总页数:}\pageref{LastPage} + \begin{itemize} + \item \textbf{æ ‡é¢˜ï¼š}\@title{}\ifdefempty\@subtitle{}{: \textit{\@subtitle}} + \item \textbf{作者:}\@author% + \ifdefempty{\@typo}{}{\item \textbf{æ ¡å¯¹æŽ’ç‰ˆï¼š}\@typo} + \item \textbf{出å“时间:}\@date + \item \textbf{总页数:}\pageref{LastPage} + \end{itemize} \end{tcolorbox} \ifdefempty\@licenseinfo{}{% \begin{tcolorbox}[title={\bfseries 许å¯è¯è¯´æ˜Ž}] @@ -330,4 +406,21 @@ \setcounter{page}{1} } +% ä¿®æ£é…色方案é‡å®šä¹‰é—®é¢˜ +\newcommand{\selectcolor}{ + \hypersetup{ + linkcolor = \LinkColor, + anchorcolor = \MiscColor, + urlcolor = \LinkColor, + citecolor = \MiscColor + } + \tcbset{ + colback = \BoxBackground, + colbacktitle = \BoxTitleBackground, + colframe = \BoxFrame, + coltitle = \BoxTitleColor, + coltext = \BoxColor + } +} + \endinput diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 4c6724968f..edf2a42812 100644 --- a/macros/latex/contrib/tuda-ci/README.md +++ b/macros/latex/contrib/tuda-ci/README.md @@ -2,7 +2,7 @@ Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2020 - tuda-ci 2020/09/08 v3.00 + tuda-ci 2020/09/11 v3.01 *************************************************************************** @@ -201,4 +201,5 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - feature enhancement for more flexible usage and department specific requirements - introduce department specific mode *mecheng* - restructure internals (ptxcd module) + * v3.01 (2020-09-11) small bugfixes caused by the internal restructuring diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf Binary files differindex 50213a8ac9..34bb10305f 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf Binary files differindex 68764d87f6..072e89f28f 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf Binary files differindex f3c103b9e4..245bfb3a71 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf Binary files differindex d69a00ec77..dd3649d595 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf Binary files differindex df674ecd0f..d7b14a8403 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf Binary files differindex 09ef857e5b..5883532298 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf Binary files differindex 99febac9d2..f4668e5ace 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf Binary files differindex 03643e3c5b..4d6e024c04 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf Binary files differindex dc0aa5e068..d9fd1be1b5 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf Binary files differindex 1bae4c4b70..69dd572d5a 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf Binary files differindex 573843d80c..7786c7783c 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex index 247edf87f7..5422de95e5 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaAnnouncement.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex index bbbad88530..3dfe74b7d4 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBeamer.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaBeamer.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib index 9f46ebad38..d2de3494d4 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBibliography.bib' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaBibliography.bib' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex index 2792e0dbd1..0781cbf1aa 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaExercise.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaExercise.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco index cb1029b6c6..cc419fa4f2 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaFromaddress.lco' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex index b78481ec43..d2241e94d1 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLeaflet.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex index 4d96be1be3..ced11ca34d 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLetter.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaLetter.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex index f25fc6101b..a8563699da 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPhD.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaPhD.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex index 95e79a3cc8..a760f22930 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPoster.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaPoster.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex index 5d05b18732..3d879db32b 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPub.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaPub.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex index 68873f04fb..3c490ab572 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaReport.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaReport.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex index 9c7b9b5f4d..273dbe6e91 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaSciPoster.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex index 297b2bda39..bfc801e909 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaThesis.tex' version 3.00 (2020/09/08), +%% This is file `DEMO-TUDaThesis.tex' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index 3436437533..c5588e0cb2 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamercolorthemeTUDa.sty' version 3.00 (2020/09/08), +%% This is file `beamercolorthemeTUDa.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthemeTUDa} [\filedate\space\fileversion] diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty index ceb211eff7..13492005b7 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerfontthemeTUDa.sty' version 3.00 (2020/09/08), +%% This is file `beamerfontthemeTUDa.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthemeTUDa} [\filedate\space\fileversion] diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty index aa7404b629..fa6ded28cb 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerinnerthemeTUDa.sty' version 3.00 (2020/09/08), +%% This is file `beamerinnerthemeTUDa.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty index 88558b2a85..1fa20b6bfb 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerouterthemeTUDa.sty' version 3.00 (2020/09/08), +%% This is file `beamerouterthemeTUDa.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty index 745b113ed7..03ceb27b48 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa-mecheng.sty' version 3.00 (2020/09/08), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \RequirePackage{expl3} \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty index 9f61b08382..733e7cece1 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa.sty' version 3.00 (2020/09/08), +%% This is file `beamerthemeTUDa.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTUDa} [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt] diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo index 96dcf95d8d..fb8a684e41 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a0paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a0paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo index 9671c338ad..f3d3719396 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a1paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a1paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo index 649804ee10..7ca8f3f4ee 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a2paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a2paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo index 7eb16621da..b0219f5b9f 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a3paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a3paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo index 00f4d4e110..320b87ac6f 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a4paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a4paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo index 608441280b..d46e44a70c 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a5paper.clo' version 3.00 (2020/09/08), +%% This is file `tuda-a5paper.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty index cf6400471b..c001aa8e7e 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty +++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty @@ -1,4 +1,4 @@ -%% This is file `tuda-pgfplots.sty' version 3.00 (2020/09/08), +%% This is file `tuda-pgfplots.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes] diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls index f7ba16e972..0acce3eecd 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls @@ -1,4 +1,4 @@ -%% This is file `tudabeamer.cls' version 3.00 (2020/09/08), +%% This is file `tudabeamer.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index b54b0455c4..6aada4e67c 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def +++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def @@ -1,4 +1,4 @@ -%% This is file `tudacolors.def' version 3.00 (2020/09/08), +%% This is file `tudacolors.def' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \ProvidesFile{tudacolors.def} [\filedate\space\fileversion\space Color definitions for tuda-ci] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty index 87094ee3c1..21cd4be4cb 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty @@ -1,4 +1,4 @@ -%% This is file `tudacolors.sty' version 3.00 (2020/09/08), +%% This is file `tudacolors.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls index 7f7be57b7f..ecfab8442d 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls @@ -1,4 +1,4 @@ -%% This is file `tudaexercise.cls' version 3.00 (2020/09/08), +%% This is file `tudaexercise.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaexercise} @@ -51,6 +51,24 @@ \bool_new:N \g_ptxcd_smalltitle_bool \str_new:N \g_ptxcd_department_str +\RequirePackage{environ} + +\def\solution{\ptxcd_ex_solutionheader:} +\def\endsolution{} + +\cs_new:Nn \ptxcd_setup_solution: { + \bool_if:NTF \l_ptxcd_ex_solution_bool { + \def\solution{\ptxcd_ex_solutionheader:} + \def\endsolution{} + }{ + \RenewEnviron{solution}{ + \if_false: + \BODY + \fi: + } + } +} + %Message Declaration for option processing \msg_new:nnn{tudaexercise} {titlepage-option-disabled} { You~set~the~titlepage~option~to~#1.\\ diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty index c2baab0e0e..97a5495ae1 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty @@ -1,4 +1,4 @@ -%% This is file `tudafonts.sty' version 3.00 (2020/09/08), +%% This is file `tudafonts.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudafonts} [\filedate\space\fileversion\space diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls index 2b64756059..419463abd7 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls @@ -1,4 +1,4 @@ -%% This is file `tudaleaflet.cls' version 3.00 (2020/09/08), +%% This is file `tudaleaflet.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls index 3d92b60f21..c38a133cd1 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaletter.cls' version 3.00 (2020/09/08), +%% This is file `tudaletter.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo index 831defc19a..47137fc3eb 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudalettersize10pt.clo' version 3.00 (2020/09/08), +%% This is file `tudalettersize10pt.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} %% This is file `tudalettersize10pt.clo' version 1.0 (2018/12/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg index d3bf8ed08a..fd78f4d8da 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg +++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg @@ -1,4 +1,4 @@ -%% This is file `tudamecheng.cfg' version 3.00 (2020/09/08), +%% This is file `tudamecheng.cfg' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index 81581aa1bf..6fced2f628 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaposter.cls' version 3.00 (2020/09/08), +%% This is file `tudaposter.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls index f42c037891..40998a4887 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls @@ -1,4 +1,4 @@ -%% This is file `tudapub.cls' version 3.00 (2020/09/08), +%% This is file `tudapub.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index 464e43bd6a..371b1e5ae9 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty @@ -1,4 +1,4 @@ -%% This is file `tudarules.sty' version 3.00 (2020/09/08), +%% This is file `tudarules.sty' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle} diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls index 4308a4603a..c0a71c56d7 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudasciposter.cls' version 3.00 (2020/09/08), +%% This is file `tudasciposter.cls' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo index 320499f748..2fecc8d907 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudasize9pt.clo' version 3.00 (2020/09/08), +%% This is file `tudasize9pt.clo' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} %% This is file `tudasize9pt.clo' version 1.0 (2018/12/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg index cd4b4c647c..efbe4816dd 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg +++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg @@ -1,4 +1,4 @@ -%% This is file `tudathesis.cfg' version 3.00 (2020/09/08), +%% This is file `tudathesis.cfg' version 3.01 (2020/09/11), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.00} -\def\filedate{2020/09/08} +\def\fileversion{3.01} +\def\filedate{2020/09/11} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} @@ -578,7 +578,7 @@ Bei einer Thesis des Fachbereichs Architektur entspricht die eingereichte elektr \newcommand*{\AffidavitSignature}[1][Darmstadt]{ \par \bigskip - #1, \ptxcd_submissiondate\hfill\SignatureBox{\ptxcd_signature}\\\strut + #1,~ \ptxcd_submissiondate\hfill\SignatureBox{\ptxcd_signature}\\\strut } \newcommand*{\SignatureBox}[2][5cm]{\parbox[t]{#1}{\centering\rule{\linewidth}{.3pt}\\\makebox[0pt][c]{#2}}} |