summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-11 03:02:11 +0000
committerNorbert Preining <norbert@preining.info>2020-05-11 03:02:11 +0000
commitfd95e879442e050790f06552eb074eeb7c5b4cab (patch)
treefa133d89d5af2d1a52c702321ee187ad5065f189 /macros
parentadcdf254252f764d8969df03d013bf5da6333873 (diff)
CTAN sync 202005110302
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/acro/README10
-rw-r--r--macros/latex/contrib/acro/acro-manual.pdfbin868396 -> 879954 bytes
-rw-r--r--macros/latex/contrib/acro/acro-manual.tex73
-rw-r--r--macros/latex/contrib/acro/acro.sty378
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-513623.pdfbin0 -> 22752 bytes
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-513623.tex21
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-515295.pdfbin0 -> 15855 bytes
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-515295.tex24
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-542461.pdfbin0 -> 15808 bytes
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.texsx-542461.tex39
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.units.pdfbin65310 -> 65067 bytes
-rw-r--r--macros/latex/contrib/acro/examples/acro.example.units.tex17
-rw-r--r--macros/latex/contrib/anonymous/README.txt9
-rw-r--r--macros/latex/contrib/anonymous/anonymous.pdfbin0 -> 379745 bytes
-rw-r--r--macros/latex/contrib/anonymous/anonymous.sty78
-rw-r--r--macros/latex/contrib/anonymous/anonymous.tex269
-rw-r--r--macros/latex/contrib/apa7/apa7.dtx19
-rw-r--r--macros/latex/contrib/apa7/apa7.pdfbin520965 -> 521278 bytes
-rw-r--r--macros/latex/contrib/apa7/samples/longsample.pdfbin196731 -> 196731 bytes
-rw-r--r--macros/latex/contrib/apa7/samples/shortsample.pdfbin63826 -> 64110 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/README107
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemecormorant.sty38
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemefrigatebird.sty41
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthememagpie.sty38
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.pdfbin3933180 -> 4025008 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.tex192
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/ccby.pngbin4739 -> 12588 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampledefault.pdfbin332710 -> 341865 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampleinfolines.pdfbin335551 -> 344659 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexamplesidebar.pdfbin334948 -> 344090 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampletree.pdfbin334516 -> 343646 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/example.tex7
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampledefault.pdfbin332709 -> 341854 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampleinfolines.pdfbin335551 -> 344652 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexamplesidebar.pdfbin334924 -> 344071 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampletree.pdfbin334517 -> 343640 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampledefault.pdfbin332730 -> 341850 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampleinfolines.pdfbin335557 -> 344645 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexamplesidebar.pdfbin334942 -> 344056 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampletree.pdfbin334532 -> 343627 bytes
-rwxr-xr-xmacros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makecormorant.sh8
-rwxr-xr-xmacros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makemagpie.sh7
-rw-r--r--macros/latex/contrib/llncsconf/CHANGELOG.md13
-rw-r--r--macros/latex/contrib/llncsconf/README.md32
-rw-r--r--macros/latex/contrib/llncsconf/llncsconf.sty14
45 files changed, 1058 insertions, 376 deletions
diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README
index 9b6b9df588..1cfc035d62 100644
--- a/macros/latex/contrib/acro/README
+++ b/macros/latex/contrib/acro/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the ACRO package v3.1 2020/05/03
+the ACRO package v3.2 2020/05/10
Typeset Acronyms
@@ -22,9 +22,10 @@ This work has the LPPL maintenance status `maintained'.
The Current Maintainer of this work is Clemens Niederberger.
--------------------------------------------------------------------------
-The acro package consists of the code file:
+The acro package consists of code files:
acro.sty
+ acro2.sty
The acro package consists of documentation files:
@@ -46,5 +47,8 @@ folder examples/ in the same folder as acro-manual.pdf:
acro.example.issue-154.pdf, acro.example.issue-154.tex
acro.example.texsx-505891.pdf, acro.example.texsx-505891.tex
acro.example.texsx-507726.pdf, acro.example.texsx-507726.tex
-
+ acro.example.texsx-513623.pdf, acro.example.texsx-513623.tex
+ acro.example.texsx-515295.pdf, acro.example.texsx-515295.tex
+ acro.example.texsx-542461.pdf, acro.example.texsx-542461.tex
+
--------------------------------------------------------------------------
diff --git a/macros/latex/contrib/acro/acro-manual.pdf b/macros/latex/contrib/acro/acro-manual.pdf
index 5c2310f650..90a739e61c 100644
--- a/macros/latex/contrib/acro/acro-manual.pdf
+++ b/macros/latex/contrib/acro/acro-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/acro-manual.tex b/macros/latex/contrib/acro/acro-manual.tex
index af5e2387c6..1d21678c63 100644
--- a/macros/latex/contrib/acro/acro-manual.tex
+++ b/macros/latex/contrib/acro/acro-manual.tex
@@ -1123,7 +1123,7 @@ have different indefinite articles\footnote{This may very well be a language
an \ac{ufo}
\end{example}
And what good would it be to use a package like \acro\ if you have to keep
-track of of and second uses, anyway? This is why \acs{ufo} should be defined
+track of first and second uses, anyway? This is why \acs{ufo} should be defined
like we did on page~\pageref{ufo}. We then can just use the dedicated
commands and let them decide for us:
\begin{example}[side-by-side]
@@ -1179,6 +1179,9 @@ There are also some options:
\begin{options}
\keybool{display}\Module{foreign}\Default{true}
Determine wether to hide or display the foreign form.
+ \keybool{display}\Module{list,foreign}\Default{true}
+ \sinceversion{3.2}Determine wether to hide or display the foreign form in
+ the list of acronyms.
\keybool{display}\Module{locale}\Default{false}
This options determines wether the language of the foreign form is printed
or not when the full form of the acronym is printed.
@@ -1250,6 +1253,8 @@ have no effect, of course.
}
\end{sourcecode}
+\pagebreak
+
There are a number of options to control the uppercasing behavior:
\begin{options}
\opt{first}\Module{uppercase}
@@ -1374,7 +1379,7 @@ for an acronym individually.
\end{properties}
This manual is an example for the indexing feature. Each acronym from
section~\vref{sec:acronyms} that has been used in this manual is also listed
-in the manual.
+in the index.
\section{Barriers}\label{sec:barriers}
The main purpose of the concept of barriers is to be able to have \emph{local}
@@ -1401,10 +1406,10 @@ barriers with
\begin{commands}
\command{acbarrier}
For this command to have any effect you must set
- \module{barriers}\code{/}\option{single} to \code{true}!
+ \module{barriers}\code{/}\option{use} to \code{true}!
\end{commands}
\begin{bewareofthedog}
- It takes usually two or even three \LaTeX\ runs until acronym usages
+ It usually takes two or even three \LaTeX\ runs until acronym usages
between barriers are properly counted.
\end{bewareofthedog}
@@ -1415,7 +1420,7 @@ boolean variable if it finds them. Per default \acro\ knows about three
tokens: the \enquote{\code{dot}} (\sym{.}), the \enquote{\code{dash}}
(\sym{-}) and the \enquote{\code{babel-hyphen}} (\cs*{babelhyphen}).
-Yeu have seen an example for this already:
+You have seen an example for this already:
\begin{sourcecode}
\DeclareAcronym{etc}{
short = etc\acdot ,
@@ -1502,8 +1507,7 @@ This command is used to define the two commands you already know:
\code{babel-hyphen} follows.
\expandable\command{abbrdot} Inserts \sym{.}\cs*{@}
\end{commands}
-The definitions are equivalent\footnote{Not \emph{quite}: \acro's definitions
- are engine protected.} to the following code:
+The definitions are equivalent to the following code:
\begin{sourcecode}
\newcommand*\acdot{\aciftrailing{dot}{}{\abbrdot}}
\newcommand*\acspace{\aciftrailing{dash,babel-hyphen}{}{\space}}
@@ -1801,7 +1805,14 @@ to defines own such objects:
\tmpl{longtabu}
A style that uses a \env*{longtabu} environment for building the
list. This needs the \pkg{longtable} package and the \pkg{tabu}
- package~\cite{pkg:tabu} loaded.
+ package~\cite{pkg:tabu} loaded\footnote{Please note that this package
+ currently is un-maintained and has a number of open bugs. For further
+ information refer to
+ \url{https://github.com/tabu-issues-for-future-maintainer/tabu}}.
+ \tmpl{supertabular}
+ A\sinceversion{3.2} style that uses a \env*{supertabular} environment for
+ building the list. This needs the \pkg{supertabular}
+ package~\cite{pkg:supertabular} loaded.
\tmpl{tabular}
A style that uses a \env*{tabular} environment for building the list.
Since a \env*{tabular} cannot break across pages this is only suited for
@@ -1827,7 +1838,7 @@ to defines own such objects:
\tmpl{section}
Uses \cs*{section} for the heading.
\tmpl{section*}
- Uses \cs*{section}\sarg* for the heading.
+ Uses \cs*{section}\sarg\ for the heading.
\end{templates}
\subsection{Defining new templates}\label{sec:defin-new-templ}
@@ -1841,6 +1852,19 @@ For the definition of templates these commends are available:
This re-defines a template of type \meta{type} woth the name \meta{name}
which inserts \meta{code} when used. A template of type \meta{type} with
name \meta{name} must exist. The default type is \code{acronym}.
+ \command{SetupAcroTemplate}[\oarg{type}\marg{name}\marg{code}]
+ Adds\sinceversion{3.2} \meta{code} to the beginning of the template
+ \meta{name} of type \meta{type}. The default type is \code{acronym}.
+ \command{SetupNextAcroTemplate}[\oarg{type}\marg{name}\marg{code}]
+ Adds\sinceversion{3.2} \meta{code} to the beginning of \emph{the next use}
+ of the template \meta{name} of type \meta{type}. The default type is
+ \code{acronym}.
+ \expandable\command{AcroTemplateType}
+ Within a template this expands to the \meta{type} of the current
+ template.
+ \expandable\command{AcroTemplateName}
+ Within a template this expands to the \meta{name} of the current
+ template.
\end{commands}
How to use these commands is best explained by examples of how the existing
@@ -1867,7 +1891,7 @@ and \cs*{acroifF} each have an argument less than \cs*{acroifTF}.
\subsubsection{Commands for common uses}
\begin{commands}
\expandable\command{acrolistname}
- Expnads to whatever is currently set with
+ Expands to whatever is currently set with
\module{list}\code{/}\option{name}.
\command{acrowrite}[\marg{property}]
Prints the property \meta{property} of the current acronym. Depending on
@@ -2137,7 +2161,7 @@ define and use additional articles.
\begin{commands}
\command{DeclareAcroArticle}[\marg{name}\marg{default}]
This command can be used to define properties and options analoguous to
- the indefnite article which have been defined this way:
+ the indefinite article which have been defined this way:
\end{commands}
\begin{sourcecode}
\DeclareAcroArticle{indefinite}{a}
@@ -2163,7 +2187,7 @@ template definitions.
This command tells the template that the article \meta{foo} should be
used.
\end{commands}
-Section~\vref{sec:own-acronym-commands} has an example of how this can be used
+Section~\vref{sec:own-acronym-commands} has examples of how this can be used
to define definite articles and commands that make use of them like this:
\begin{example}
\dacs{hadopi} \par
@@ -2208,13 +2232,13 @@ Translations for a language could be added this way\footnote{\acro\ already
The existing keywords had been shown in table~\vref{tab:translations}.
\section{Properties}\label{sec:new-properties}
-As you know from section~\ref{sec:decl-acronyms-other} \acro\ comes with
-quiute a number of predefined properties for the control of acronyms.
-However, there are cases when additional properties would be nice to have and
-to use. \acro\ provides this command:
+As you know from section~\ref{sec:decl-acronyms-other} \acro\ comes with quite
+a number of predefined properties which control various aspects of
+acronyms. However, there are cases when additional properties would be nice to
+have and to use. It can be done with the following command:
\begin{commands}
- \command{DeclareAcroProperty}[\sarg\qarg\barg\uarg\marg{name}]
- This defines the new property \meta{name}. The command has four optional
+ \command{DeclareAcroProperty}[\sarg\arg{?}\arg{!}\arg{|}\arg{>}\marg{name}]
+ This defines the new property \meta{name}. The command has five optional
arguments most of which you probably never need. \par
The optional star \sym{*} ensures that each acronym gets a \emph{unique}
value for the property. \par
@@ -2223,11 +2247,18 @@ to use. \acro\ provides this command:
\code{false} and when it is used without value (not an empty value!) then
\code{true} is assumed. \par
The optional exclamation mark \sym{!} creates a \emph{mandatory}
- property. An error if raised if an acronym does not set it. \par
+ property. An error is raised if an acronym does not set it. \par
The optional pipe \sym{|} creates a \emph{static} property which means
its value is written to an auxiliary file and read in again at begin
- document. Once set the value is the same throughout the document
- \command{DeclareAcroPropertyAlias}[\sarg\qarg\barg\uarg\marg{name1}\marg{name2}]
+ document. Once set the value is the same throughout the document. \par
+ The optional greater as symbol\sinceversion{3.2} \sym{>} creates a
+ \emph{display} property. This additionally defines the two boolean
+ options \meta{name}\code{/}\option{display} and
+ \module{list}\code{/}\meta{name}\code{/}\option{display}, both initially
+ set to true. If these options are set to false the acronym commands or
+ the list act as if the property \meta{name} has not been set. The
+ \property{foreign} property is an example.
+ \command{DeclareAcroPropertyAlias}[\sarg\arg{?}\arg{!}\arg{|}\arg{>}\marg{name1}\marg{name2}]
This newly declares property \meta{name1} and makes it an alias of
property \meta{name2}. This means that \meta{name1} gets the same value
that \meta{name2} has unless it is set explicitly. Property \meta{name2}
diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty
index 2d1d88f020..d272acdc82 100644
--- a/macros/latex/contrib/acro/acro.sty
+++ b/macros/latex/contrib/acro/acro.sty
@@ -27,9 +27,9 @@
% setup package:
\tl_const:Nn \c_acro_package_name_tl {acro}
-\tl_const:Nn \c_acro_date_tl {2020/05/04}
+\tl_const:Nn \c_acro_date_tl {2020/05/10}
\tl_const:Nn \c_acro_version_major_number_tl {3}
-\tl_const:Nn \c_acro_version_minor_number_tl {1}
+\tl_const:Nn \c_acro_version_minor_number_tl {2}
\tl_const:Nn \c_acro_version_subrelease_tl {}
\tl_const:Nx \c_acro_version_number_tl
{
@@ -653,8 +653,11 @@
\NewDocumentCommand \AcroNeedPackage {m}
{
- \acro_package_if_loaded:nF {m}
- { \msg_error:nnen {acro} {package-needed} { \TemplateName } {#1} }
+ \clist_map_inline:nn {#1}
+ {
+ \acro_package_if_loaded:nF {##1}
+ { \msg_error:nnen {acro} {package-needed} { \TemplateName } {##1} }
+ }
}
% --------------------------------------------------------------------------
@@ -693,13 +696,31 @@
{ \acro_switch_on: }
% --------------------------------------------------------------------------
-\NewDocumentCommand \DeclareAcroProperty {st?t!t|m}
- { \acro_property_declare:nnnnn {#1} {#2} {#3} {#4} {#5} }
+\NewDocumentCommand \DeclareAcroProperty {st?t!t|t>m}
+ {
+ \acro_property_declare:en
+ {
+ \IfBooleanT {#1} {unique=true,}
+ \IfBooleanT {#2} {boolean=true,}
+ \IfBooleanT {#3} {mandatory=true,}
+ \IfBooleanT {#4} {static=true,}
+ \IfBooleanT {#5} {display=true}
+ }
+ {#6}
+ }
-\NewDocumentCommand \DeclareAcroPropertyAlias {st?t!t|mm}
+\NewDocumentCommand \DeclareAcroPropertyAlias {st?t!t|t>mm}
{
- \acro_property_declare:nnnnn {#1} {#2} {#3} {#4} {#5}
- \acro_property_make_alias:nn {#5} {#6}
+ \acro_property_declare:en
+ {
+ \IfBooleanT {#1} {unique=true,}
+ \IfBooleanT {#2} {boolean=true,}
+ \IfBooleanT {#3} {mandatory=true,}
+ \IfBooleanT {#4} {static=true,}
+ \IfBooleanT {#5} {display=true}
+ }
+ {#6}
+ \acro_property_make_alias:nn {#6} {#7}
}
\NewDocumentCommand \MakeAcroPropertyAlias {mm}
@@ -714,6 +735,12 @@
\NewDocumentCommand \RenewAcroTemplate {O{acronym}m+m}
{ \use:c {acro_#1_template_renew:nn} {#2} {#3} }
+\NewDocumentCommand \SetupAcroTemplate {O{acronym}m+m}
+ { \acro_template_setup:nnn {#1} {#2} {#3} }
+
+\NewDocumentCommand \SetupNextAcroTemplate {O{acronym}m+m}
+ { \acro_next_template_setup:nnn {#1} {#2} {#3} }
+
\NewDocumentCommand \DeclareAcronym {m+m}
{ \acro_declare_acronym:nn {#1} {#2} }
@@ -848,16 +875,12 @@
\NewExpandableDocumentCommand \acroifbooleanF {m}
{ \acro_boolean_property_if:enF { \AcronymID } {#1} }
-\NewExpandableDocumentCommand \acroifTF {+m+m+m}
- {
- \acro_property_if_set:enTF { \AcronymID } {#1}
- { \acro_check_foreign:nn {#1} {#2} }
- {#3}
- }
-\NewExpandableDocumentCommand \acroifT {+m+m}
- { \acroifTF {#1} {#2} {} }
-\NewExpandableDocumentCommand \acroifF {+m+m}
- { \acroifTF {#1} {} {#2} }
+\NewExpandableDocumentCommand \acroifTF {m}
+ { \acro_property_if_set:enTF { \AcronymID } {#1} }
+\NewExpandableDocumentCommand \acroifT {m}
+ { \acro_property_if_set:enT { \AcronymID } {#1} }
+\NewExpandableDocumentCommand \acroifF {m}
+ { \acro_property_if_set:enF { \AcronymID } {#1} }
\NewDocumentCommand \acroifanyTF {m+m+m}
{ \acro_property_if_any:enTF { \AcronymID } {#1} {#2} {#3} }
@@ -1154,44 +1177,73 @@
\acro_attribute_new:n {mandatory}
\acro_attribute_new:n {dynamic}
-% \seq_new:N \l__acro_mandatory_properties_seq
\tl_new:N \l__acro_mandatory_properties_tl
+\bool_new:N \l__acro_property_define_unique_bool
+\bool_new:N \l__acro_property_define_boolean_bool
+\bool_new:N \l__acro_property_define_mandatory_bool
+\bool_new:N \l__acro_property_define_static_bool
+\bool_new:N \l__acro_property_define_display_bool
+
+\cs_new_protected:Npn \__acro_setup_property:nn #1#2
+ { \use:c {bool_set_#2:c} {l__acro_property_define_#1_bool} }
+\cs_new_protected:Npn \__acro_setup_property:n #1
+ { \__acro_setup_property:nn {#1} {true} }
+
% new property:
-% #1: boolean (true = unique)
-% #2: boolean (true = boolean)
-% #3: boolean (true = mandatory)
-% #4: boolean (true = static != dynamic)
-% #5: property name
-\cs_new_protected:Npn \acro_property_declare:nnnnn #1#2#3#4#5
- {
- \acro_property_if_exist:nF {#5}
- {
- \seq_put_right:Ne \l__acro_properties_seq { \tl_to_str:n {#5} }
- \acro_attribute_new:n {property::#5}
- \bool_if:nF {#4}
- { \acro_attribute_set:nnn {dynamic} {#5} {true} }
- \__acro_auxlist_new:n {#5}
- \bool_if:nT {#3}
+% #1: attributes
+% #2: property name
+\cs_new_protected:Npn \acro_property_declare:nn #1#2
+ {
+ \acro_property_if_exist:nF {#2}
+ {
+ \seq_put_right:Ne \l__acro_properties_seq { \tl_to_str:n {#2} }
+ \acro_attribute_new:n {property::#2}
+ \bool_set_false:N \l__acro_property_define_unique_bool
+ \bool_set_false:N \l__acro_property_define_boolean_bool
+ \bool_set_false:N \l__acro_property_define_mandatory_bool
+ \bool_set_false:N \l__acro_property_define_static_bool
+ \bool_set_false:N \l__acro_property_define_display_bool
+ \keyval_parse:NNn
+ \__acro_setup_property:n
+ \__acro_setup_property:nn
+ {#1}
+ \bool_if:NF \l__acro_property_define_static_bool
+ { \acro_attribute_set:nnn {dynamic} {#2} {true} }
+ \__acro_auxlist_new:n {#2}
+ \bool_if:NT \l__acro_property_define_mandatory_bool
{
- \acro_attribute_set:nnn {mandatory} {#5} {true}
- % \seq_put_right:Nn \l__acro_mandatory_properties_seq {#5}
- \tl_put_right:Nn \l__acro_mandatory_properties_tl {{#5}}
+ \acro_attribute_set:nnn {mandatory} {#2} {true}
+ \tl_put_right:Nn \l__acro_mandatory_properties_tl {{#2}}
}
- \bool_if:nT {#2}
- { \acro_attribute_set:nnn {boolean} {#5} {true} }
- \bool_if:nT {#1}
+ \bool_if:NT \l__acro_property_define_boolean_bool
+ { \acro_attribute_set:nnn {boolean} {#2} {true} }
+ \bool_if:NT \l__acro_property_define_unique_bool
{
- \acro_attribute_set:nnn {unique} {#5} {true}
- \seq_new:c {l__acro_unique_#5_seq}
+ \acro_attribute_set:nnn {unique} {#2} {true}
+ \seq_new:c {l__acro_unique_#2_seq}
}
- \bool_if:nT {#4}
+ \bool_if:NT \l__acro_property_define_static_bool
{
- \AtEndDocument { \__acro_auxlist_update:n {#5} }
- \acro_at_begin_document:n { \__acro_property_set_from_auxlist:n {#5} }
+ \AtEndDocument { \__acro_auxlist_update:n {#2} }
+ \acro_at_begin_document:n
+ { \__acro_property_set_from_auxlist:n {#2} }
+ }
+ \bool_if:NT \l__acro_property_define_display_bool
+ {
+ \bool_new:c {l__acro_#2_display_bool}
+ \bool_new:c {l__acro_#2_list_display_bool}
+ \keys_define:nn {acro}
+ {
+ #2/display .bool_set:c = {l__acro_#2_display_bool} ,
+ #2/display .initial:n = true ,
+ list/#2/display .bool_set:c = {l__acro_#2_list_display_bool} ,
+ list/#2/display .initial:n = true
+ }
}
}
}
+\cs_generate_variant:Nn \acro_property_declare:nn {e}
% ----------------------------------------------------------------------------
% property conditionals:
@@ -1208,7 +1260,17 @@
\prg_new_conditional:Npnn \acro_property_if_set:nn #1#2 {p,T,F,TF}
{
\acro_attribute_if_set:neTF {#2} { \acro_case_insensitive:n {#1} }
- { \prg_return_true: }
+ {
+ \cs_if_exist:cTF {l__acro_#2_display_bool}
+ {
+ \bool_if:NTF \l__acro_list_bool
+ { \bool_if:cTF {l__acro_#2_list_display_bool} }
+ { \bool_if:cTF {l__acro_#2_display_bool} }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+ { \prg_return_true: }
+ }
{ \prg_return_false: }
}
\prg_generate_conditional_variant:Nnn \acro_property_if_set:nn
@@ -1651,7 +1713,7 @@
\DeclareAcroProperty {pdfcomment}
% locale:
-\DeclareAcroProperty {foreign}
+\DeclareAcroProperty>{foreign}
\DeclareAcroProperty {foreign-babel}
\DeclareAcroProperty {foreign-locale}
@@ -1861,22 +1923,9 @@
{
\tl_if_empty:cTF {l__acro_format_ #1 _tl}
{ \use:n }
- { \tl_use:c {l__acro_format_ #1 _tl} }
- }
- {
- \acro_property_if_alias:nTF {#1}
- {
- \tl_if_exist:cTF
- {l__acro_format_ \acro_property_alias:n {#1} _tl}
- {
- \tl_if_empty:cTF {l__acro_format_ \acro_property_alias:n {#1} _tl}
- { \use:n }
- { \tl_use:c {l__acro_format_ \acro_property_alias:n {#1} _tl} }
- }
- { \use:n }
- }
- { \use:n }
+ { \exp_not:v {l__acro_format_ #1 _tl} }
}
+ { \use:n }
}
% #1: id
@@ -1932,7 +1981,7 @@
\__acro_global_format:n {#2}
{
\__acro_property_format:nn {#1} {#2}
- { \__acro_pdf_comment:nnn {#1} {#2} {#3} }
+ { \__acro_pdf_comment:nnn {#1} {#2} {#3} }
}
}
}
@@ -1993,9 +2042,7 @@
\cs_new_protected:Npn \acro_article_declare:nn #1#2
{
\tl_gput_right:Nn \g__acro_articles_tl {{#1}}
- \acro_property_declare:nnnnn
- { \c_false_bool } { \c_false_bool } { \c_false_bool } { \c_false_bool }
- {#1}
+ \acro_property_declare:nn {} {#1}
\acro_list_map:nn {short}
{
\DeclareAcroPropertyAlias {##1-#1} {#1}
@@ -2049,12 +2096,8 @@
\cs_new_protected:Npn \__acro_declare_ending_properties:n #1
{
- \acro_property_declare:nnnnn
- { \c_false_bool } { \c_false_bool } { \c_false_bool } { \c_false_bool }
- {#1}
- \acro_property_declare:nnnnn
- { \c_false_bool } { \c_false_bool } { \c_false_bool } { \c_false_bool }
- {#1-form}
+ \acro_property_declare:nn {} {#1}
+ \acro_property_declare:nn {} {#1-form}
}
% #1: ending
@@ -2571,10 +2614,10 @@
\cs_new_protected:Npn \acro_footnote:n #1
{
- \tl_set:Ne \l__acro_fnpct_check_tl { \l__acro_fnpct_check_tl }
+ \tl_set:Ne \l__acro_tmpa_tl { \l__acro_fnpct_check_tl }
\exp_last_unbraced:Nno
\footnote {#1}
- \l__acro_fnpct_check_tl
+ \l__acro_tmpa_tl
}
% options for activating actions:
@@ -2932,30 +2975,33 @@
% #2: property
\cs_new_protected:Npn \acro_write:nn #1#2
{
- \group_begin:
- \acro_if_short:nT {#2} { \acro_soft_upper: }
- \__acro_make_link:nnn {#1} {#2}
- {
- \acro_locale:nnn {#1} {#2}
+ \acro_property_if_set:nnT {#1} {#2}
+ {
+ \group_begin:
+ \acro_if_short:nT {#2} { \acro_soft_upper: }
+ \__acro_make_link:nnn {#1} {#2}
{
- \__acro_write:nn {#1} {#2}
- \bool_if:NT \l__acro_include_endings_bool
+ \acro_locale:nnn {#1} {#2}
{
- \acro_if_ending_form:nnF {#1} {#2}
- { \__acro_ending:nn {#1} {#2} }
+ \__acro_write:nn {#1} {#2}
+ \bool_if:NT \l__acro_include_endings_bool
+ {
+ \acro_if_ending_form:nnF {#1} {#2}
+ { \__acro_ending:nn {#1} {#2} }
+ }
}
}
- }
- \group_end:
- \acro_if_ending_form:nnF {#1} {#2}
- {
- \bool_if:NF \l__acro_include_endings_bool
- { \__acro_ending:nn {#1} {#2} }
+ \group_end:
+ \acro_if_ending_form:nnF {#1} {#2}
+ {
+ \bool_if:NF \l__acro_include_endings_bool
+ { \__acro_ending:nn {#1} {#2} }
+ }
+ \acro_property_if_eq:nnT {#2} {long}
+ { \acro_property_get:nn {#1} {long-post} }
+ \bool_set_false:N \l__acro_upper_bool
+ \bool_set_false:N \l__acro_article_bool
}
- \acro_property_if_eq:nnT {#2} {long}
- { \acro_property_get:nn {#1} {long-post} }
- \bool_set_false:N \l__acro_upper_bool
- \bool_set_false:N \l__acro_article_bool
}
\cs_generate_variant:Nn \acro_write:nn {e}
@@ -3139,6 +3185,7 @@
\cs_new_protected:Npn \__acro_template_add:nnn #1#2#3
{
\tl_new:c {l__acro_template_#1_#2_setup_tl}
+ \tl_new:c {l__acro_next_template_#1_#2_setup_tl}
\acro_attribute_set:nnn {template::#1} {#2} {#3}
}
@@ -3181,28 +3228,33 @@
% #3: setup code
\cs_new_protected:Npn \acro_template_setup:nnn #1#2#3
{ \tl_set:cn {l__acro_template_#1_#2_setup_tl} {#3} }
-\cs_generate_variant:Nn \acro_template_setup:nnn {nnV,nVn}
+
+\cs_new_protected:Npn \acro_next template_setup:nnn #1#2#3
+ { \tl_set:cn {l__acro_next_template_#1_#2_setup_tl} {#3} }
% #1: template type
% #2: template name
-\cs_new_protected:Npn \__acro_template_setup:nn #1#2
- { \tl_use:c {l__acro_template_#1_#2_setup_tl} }
+\cs_new_protected:Npn \__acro_template_do_setup:nn #1#2
+ {
+ \tl_use:c {l__acro_template_#1_#2_setup_tl}
+ \tl_use:c {l__acro_next_template_#1_#2_setup_tl}
+ }
% #1: template type
% #2: template name
\cs_new_protected:Npn \__acro_clear_template_setup:nn #1#2
- { \tl_clear:c {l__acro_template_#1_#2_setup_tl} }
+ { \tl_clear:c {l__acro_next_template_#1_#2_setup_tl} }
% #1: template type
% #2: template name
\cs_new_protected:Npn \__acro_template_start:nn #1#2
{
\group_begin:
- \__acro_template_setup:nn {#1} {#2}
- \tl_clear_new:N \TemplateType
- \tl_set:Nn \TemplateType {#1}
- \tl_clear_new:N \TemplateName
- \tl_set:Nn \TemplateName {#2}
+ \__acro_template_do_setup:nn {#1} {#2}
+ \tl_clear_new:N \AcroTemplateType
+ \tl_set:Nn \AcroTemplateType {#1}
+ \tl_clear_new:N \AcroTemplateName
+ \tl_set:Nn \AcroTemplateName {#2}
}
% #1: template type
@@ -3852,9 +3904,7 @@
{ You~ need~ to~ give~ a~ value~ to~ `#1'~ \msg_line_context: }
% --------------------------------------------------------------------------
-\bool_new:N \l__acro_show_foreign_bool
\bool_new:N \l__acro_show_locale_bool
-\bool_new:N \l__acro_list_show_locale_bool
\tl_new:N \l__acro_locale_format_tl
% #1: property
@@ -3865,15 +3915,6 @@
{ \prg_return_false: }
}
-% #1: property
-% #2: text
-\cs_new:Npn \acro_check_foreign:nn #1#2
- {
- \acro_if_foreign:nTF {#1}
- { \bool_if:NT \l__acro_show_foreign_bool {#2} }
- {#2}
- }
-
% #1: id
% #2: property
\prg_new_conditional:Npnn \acro_if_locale:nn #1#2 {p,T,F,TF}
@@ -3896,37 +3937,30 @@
{
\acro_if_foreign:nTF {#2}
{
- \bool_if:NT \l__acro_show_foreign_bool
+ \acro_if_locale:nnTF {#1} {#2}
{
- \acro_if_locale:nnTF {#1} {#2}
+ \bool_if:NTF \l__acro_list_bool
+ { \bool_if:NT \l__acro_list_show_locale_bool }
+ { \bool_if:NT \l__acro_show_locale_bool }
{
- \bool_lazy_or:nnT
- { \l__acro_show_locale_bool }
- {
- \bool_lazy_and_p:nn
- { \l__acro_list_bool }
- { \l__acro_list_show_locale_bool }
- }
- {
+ {
+ \l__acro_locale_format_tl
{
- \l__acro_locale_format_tl
+ \acro_property_if_set:nnTF {#1} {foreign-locale}
+ { \acro_property_get:nn {#1} {foreign-locale} }
{
- \acro_property_if_set:nnTF {#1} {foreign-locale}
- { \acro_property_get:nn {#1} {foreign-locale} }
- {
- \baselanguage
- { \acro_property_get:nn {#1} {foreign-babel} }
- }
+ \baselanguage
+ { \acro_property_get:nn {#1} {foreign-babel} }
}
}
- :~
- }
- \__acro_foreign_language:en
- { \str_lowercase:e { \acro_property_get:nn {#1} {foreign-babel} } }
- {#3}
+ }
+ :~
}
+ \__acro_foreign_language:en
+ { \str_lowercase:e { \acro_property_get:nn {#1} {foreign-babel} } }
{#3}
}
+ {#3}
}
{#3}
}
@@ -3955,12 +3989,6 @@
display .initial:n = false
}
-\keys_define:nn {acro/foreign}
- {
- display .bool_set:N = \l__acro_show_foreign_bool ,
- display .initial:n = true
- }
-
% --------------------------------------------------------------------------
\bool_new:N \l__acro_language_auto_bool
@@ -4104,13 +4132,6 @@
\cs_generate_variant:Nn \__acro_hyper_target:nn {e}
\cs_generate_variant:Nn \__acro_hyper_link:nn {e}
-% \acro_property_declare:nnnnn
-% { \c_false_bool } % not unique
-% { \c_true_bool } % boolean
-% { \c_false_bool } % not mandatory
-% { \c_false_bool } % dynamic
-% {target-set}
-
\cs_new_protected:Npn \__acro_activate_hyperref_support:
{
\bool_lazy_and:nnT
@@ -4987,8 +5008,7 @@
\NewAcroTemplate[list] {longtable}
{
- \AcroNeedPackage {array}
- \AcroNeedPackage {longtable}
+ \AcroNeedPackage {array,longtable}
\acronymsmapF
{
\AcroAddRow
@@ -5013,16 +5033,14 @@
\acroheading
\acropreamble
\par \noindent
- \begin {longtabu} {>{\bfseries}lp{.7\linewidth}}
+ \begin {longtable} {>{\bfseries}lp{.7\linewidth}}
\AcronymTable
- \end {longtabu}
+ \end {longtable}
}
\NewAcroTemplate[list] {longtabu}
{
- \AcroNeedPackage {array}
- \AcroNeedPackage {longtable}
- \AcroNeedPackage {tabu}
+ \AcroNeedPackage {array,longtable,tabu}
\acronymsmapF
{
\AcroAddRow
@@ -5040,7 +5058,7 @@
\acropages
{ \acrotranslate {page} \nobreakspace }
{ \acrotranslate {pages} \nobreakspace }
- \tabularnewline
+ \strut \tabularnewline
}
}
{ \AcroRerun }
@@ -5052,6 +5070,38 @@
\end {longtabu}
}
+\NewAcroTemplate[list] {supertabular}
+ {
+ \AcroNeedPackage {array,supertabular}
+ \acronymsmapF
+ {
+ \AcroAddRow
+ {
+ \acrowrite {short}
+ \acroifT {alt} { / } \acrowrite {alt}
+ &
+ \acrowrite {list}
+ \acroifanyT {foreign,extra} {~(}
+ \acrowrite {foreign}
+ \acroifallT {foreign,extra} {,~}
+ \acrowrite {extra}
+ \acroifanyT {foreign,extra} {)}
+ \acropagefill
+ \acropages
+ { \acrotranslate {page} \nobreakspace }
+ { \acrotranslate {pages} \nobreakspace }
+ \tabularnewline
+ }
+ }
+ { \AcroRerun }
+ \acroheading
+ \acropreamble
+ \par \noindent
+ \begin {supertabular} {>{\bfseries}lp{.7\linewidth}}
+ \AcronymTable
+ \end {supertabular}
+ }
+
\NewAcroTemplate [list] {lof}
{
\acroheading
@@ -5332,24 +5382,14 @@
\cs_new_protected:Npn \acro_deprecated_property:nn #1#2
{
\acro_deprecate:nn {#1} {#2}
- \acro_property_declare:nnnnn
- { \c_false_bool }
- { \c_false_bool }
- { \c_false_bool }
- { \c_false_bool }
- {#1}
+ \acro_property_declare:nn {} {#1}
}
% #1: old
\cs_new_protected:Npn \acro_removed_property:n #1
{
\acro_remove:n {#1}
- \acro_property_declare:nnnnn
- { \c_false_bool }
- { \c_false_bool }
- { \c_false_bool }
- { \c_false_bool }
- {#1}
+ \acro_property_declare:nn {} {#1}
}
% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-513623.pdf b/macros/latex/contrib/acro/examples/acro.example.texsx-513623.pdf
new file mode 100644
index 0000000000..51e1ef49fb
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-513623.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-513623.tex b/macros/latex/contrib/acro/examples/acro.example.texsx-513623.tex
new file mode 100644
index 0000000000..049172952b
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-513623.tex
@@ -0,0 +1,21 @@
+\documentclass{article}
+\usepackage{acro}
+
+\newrobustcmd*\newspecies[4][]{%
+ \DeclareAcronym{#2}{
+ short = {#3} ,
+ long = {#4} ,
+ #1 ,
+ tag = species ,
+ first-style= long ,
+ format = \itshape
+ }%
+}
+\newspecies{ecoli}{E.~coli}{Escherichia coli}
+
+\begin{document}
+
+First use: \ac{ecoli}\par
+Second use: \ac{ecoli}
+
+\end{document}
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-515295.pdf b/macros/latex/contrib/acro/examples/acro.example.texsx-515295.pdf
new file mode 100644
index 0000000000..f5cdd4871b
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-515295.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-515295.tex b/macros/latex/contrib/acro/examples/acro.example.texsx-515295.tex
new file mode 100644
index 0000000000..f9a93dfab2
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-515295.tex
@@ -0,0 +1,24 @@
+\documentclass{article}
+
+\usepackage{acro}
+\usepackage{csquotes}
+\usepackage{chemmacros}
+
+\DeclareAcronym{APA}{
+ short = 3-APA ,
+ long = \iupac{3-azido-1-propyl|amine}
+}
+\DeclareAcronym{CuAAC}{
+ short = \enquote{click} chemistry ,
+ long = copper(I)-catalyzed azide-alkyne cycloaddition
+}
+
+\begin{document}
+
+1: \Acl{APA}
+
+2: \Acs{CuAAC}
+
+3: \Acl{CuAAC}
+
+\end{document}
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-542461.pdf b/macros/latex/contrib/acro/examples/acro.example.texsx-542461.pdf
new file mode 100644
index 0000000000..6c4222c343
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-542461.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/examples/acro.example.texsx-542461.tex b/macros/latex/contrib/acro/examples/acro.example.texsx-542461.tex
new file mode 100644
index 0000000000..c44358073e
--- /dev/null
+++ b/macros/latex/contrib/acro/examples/acro.example.texsx-542461.tex
@@ -0,0 +1,39 @@
+\documentclass{article}
+\usepackage{acro}
+
+\DeclareAcroArticle{definite}{the}
+\DeclareAcroEnding{possessive}{'s}{'s}
+
+\NewAcroCommand\dac{m}{\acrodefinite\UseAcroTemplate{first}{#1}}
+\NewAcroCommand\Dac{m}{\acroupper\acrodefinite\UseAcroTemplate{first}{#1}}
+
+\NewAcroCommand\Dacg{m}{%
+ \acroupper
+ \acrodefinite
+ \acropossessive
+ \UseAcroTemplate{first}{#1}%
+}
+
+\DeclareAcronym{css}{
+ short = CSS ,
+ long = Centre for Spaghetti Studies ,
+ short-definite = \nospace ,
+ long-possessive = '
+}
+
+\begin{document}
+
+Bob hails from \dac{css}. \par
+Bob hails from \dac{css}.
+
+\acreset{css}
+
+\Dacg{css} mandate is broad. \par
+\Dacg{css} mandate is broad.
+
+\acreset{css}
+
+\Dac{css} scientists eat well. \par
+\Dac{css} scientists eat well. \par
+
+\end{document}
diff --git a/macros/latex/contrib/acro/examples/acro.example.units.pdf b/macros/latex/contrib/acro/examples/acro.example.units.pdf
index 79c07fc50a..f699cdcd82 100644
--- a/macros/latex/contrib/acro/examples/acro.example.units.pdf
+++ b/macros/latex/contrib/acro/examples/acro.example.units.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/examples/acro.example.units.tex b/macros/latex/contrib/acro/examples/acro.example.units.tex
index f499a918cb..ff4d9cc8bb 100644
--- a/macros/latex/contrib/acro/examples/acro.example.units.tex
+++ b/macros/latex/contrib/acro/examples/acro.example.units.tex
@@ -33,41 +33,36 @@
short = \ensuremath{f} ,
long = Frequenz ,
unit = \si{\hertz} ,
- class = physics
+ tag = physics
}
\DeclareAcronym{A}{
short = \ensuremath{A} ,
long = Fläche ,
unit = \si{\metre^2} ,
- class = physics
+ tag = physics
}
\DeclareAcronym{C}{
short = \ensuremath{C} ,
long = Kapazität ,
unit = \si{\farad} ,
- class = physics
+ tag = physics
}
\DeclareAcronym{F}{
short = \ensuremath{F} ,
long = Kraft ,
unit = \si{\newton} ,
- class = physics
+ tag = physics
}
\NewAcroTemplate[list]{physics}{%
- \def\TableCode{}%
\acronymsmapT{%
- \AcroPutRight\TableCode{%
- \def\AcronymID{##1}%
+ \AcroAddRow{%
\acrowrite{short}%
&
- \def\AcronymID{##1}%
\acrowrite{unit}%
&
- \def\AcronymID{##1}%
\acrowrite{list}%
&
- \def\AcronymID{##1}%
\acropages
{\acrotranslate{page}\nobreakspace}%
{\acrotranslate{pages}\nobreakspace}%
@@ -80,7 +75,7 @@
\setlength\LTleft{0pt}%
\setlength\LTright{0pt}%
\begin{longtable}{@{}lll@{\extracolsep{\fill}}l@{}}
- \TableCode
+ \AcronymTable
\end{longtable}
}
diff --git a/macros/latex/contrib/anonymous/README.txt b/macros/latex/contrib/anonymous/README.txt
new file mode 100644
index 0000000000..52425830b7
--- /dev/null
+++ b/macros/latex/contrib/anonymous/README.txt
@@ -0,0 +1,9 @@
+The anonymous package for acmart.cls
+
+The anonymous package allows for the easy anonymization and deanonymization of academic papers that use the official Association of Computing Machinery (ACM) master article template, acmart.cls. The required information for both the anonymous and non-anonymous versions are specified at the time of writing. Anonymization or deanonymization is carried out by simply changing one option and recompiling.
+
+Maintained by Brett A. Becker, brett.becker@ucd.ie
+
+This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+
+This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \ No newline at end of file
diff --git a/macros/latex/contrib/anonymous/anonymous.pdf b/macros/latex/contrib/anonymous/anonymous.pdf
new file mode 100644
index 0000000000..c3fb9de338
--- /dev/null
+++ b/macros/latex/contrib/anonymous/anonymous.pdf
Binary files differ
diff --git a/macros/latex/contrib/anonymous/anonymous.sty b/macros/latex/contrib/anonymous/anonymous.sty
new file mode 100644
index 0000000000..173e61a4d4
--- /dev/null
+++ b/macros/latex/contrib/anonymous/anonymous.sty
@@ -0,0 +1,78 @@
+%% anonymous.sty
+%% version 1.0 09-May-2020
+%% Maintained by Brett A. Becker: brett.becker@ucd.ie
+
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+% This program is distributed in the hope that it will be useful
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+% designed to be used with acmart.cls - required for full functionality
+
+%% Identification
+%% The package identifies itself and the LaTeX version needed
+\ProvidesPackage{anonymous}
+\NeedsTeXFormat{LaTeX2e}
+
+
+% Define anonymous condition
+\newif\ifAnonCondition\AnonConditiontrue
+
+% Declare options
+\DeclareOption{true}{\AnonConditiontrue}
+\DeclareOption{false}{\AnonConditionfalse}
+\DeclareOption*{\PackageWarning{anonymous}{Unknown ‘\CurrentOption’}}
+\ProcessOptions\relax
+
+% Anonymous Authors
+\newcommand{\authoranon}[1]{#1}
+\ifAnonCondition
+\renewcommand{\authoranon}[1]{
+\author{Anonymous Author(s)}
+}
+\else
+\renewcommand{\authoranon}[1]{#1}
+\fi
+
+% Anonymous Arbitrary Text
+\newcommand{\textanon}[2]{#1}
+\ifAnonCondition
+\renewcommand{\textanon}[2]{\ifstrequal{}{#2}{<text removed for peer review>}{#2}}
+\else
+\renewcommand{\textanon}[2]{#1}
+\fi
+
+% Anonymous Links
+\newcommand{\linkanon}[2]{\href{#1}{#2}}
+\ifAnonCondition
+\renewcommand{\linkanon}[2]{<anonymous link>}
+\else
+\renewcommand{\linkanon}[2]{\href{#1}{#2}}
+\fi
+
+\newcommand{\textlinkanon}[2]{\href{#1}{#2}}
+\ifAnonCondition
+\renewcommand{\textlinkanon}[2]{#2}
+\else
+\renewcommand{\textlinkanon}[2]{\href{#1}{#2}}
+\fi
+
+% Anonymous Citations & References
+\newcommand{\citeanon}[2][\ ]{\cite[#1]{#2}}
+\ifAnonCondition
+\renewcommand{\citeanon}[2][\ ]{[anonymous]}
+\else
+\renewcommand{\citeanon}[2][@]{\ifstrequal{@}{#1}{\cite{#2}}{\cite[#1]{#2}}}
+\fi
+
+% Anonymous Acknowledgments
+\ifAnonCondition
+\excludecomment{acks}
+\fi
diff --git a/macros/latex/contrib/anonymous/anonymous.tex b/macros/latex/contrib/anonymous/anonymous.tex
new file mode 100644
index 0000000000..71bd2a1978
--- /dev/null
+++ b/macros/latex/contrib/anonymous/anonymous.tex
@@ -0,0 +1,269 @@
+%% documentation for anonymous.sty
+%% version 1.0 09-May-2020
+%% Maintained by Brett A. Becker brett.becker@ucd.ie
+
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+
+% This program is distributed in the hope that it will be useful
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+% requires acmart.cls
+
+\documentclass[sigconf, balance=false]{acmart}
+
+\setcopyright{rightsretained}
+
+\usepackage[false]{anonymous}
+
+\title{The anonymous Package for the ACM \LaTeX~ Master Article Template}
+\subtitle{Version 1.0: May 09, 2020}
+
+\authoranon{
+\author{Brett A. Becker}
+\affiliation{
+ \institution{University College Dublin}
+ \city{Dublin}
+ \country{Ireland}
+ }
+\email{brett.becker@ucd.ie}
+
+\author{Jiahao Xu}
+\affiliation{
+ \institution{Beijing-Dublin International College}
+ \city{Beijing}
+ \country{China}
+ }
+
+\author{Zixiang Xu}
+\affiliation{
+ \institution{Beijing-Dublin International College}
+ \city{Beijing}
+ \country{China}
+ }
+
+\author{Xinchi Feng}
+\affiliation{
+ \institution{Beijing-Dublin International College}
+ \city{Beijing}
+ \country{China}
+ }
+
+\author{Zhaorui Wang}
+\affiliation{
+ \institution{Beijing-Dublin International College}
+ \city{Beijing}
+ \country{China}
+ }
+}
+
+\begin{document}
+
+\begin{abstract}
+Academics often need to submit anonymous versions of their papers for peer-review. This often requires anonymization which at some future date needs to be reversed. However de-anonymizing an anonymized paper can be laborious and error-prone. This \LaTeX~ package allows anonymization options to be specified at the time of writing for authors using acmart.cls, the official Association of Computing Machinery (ACM) master article template. Anonymization or deanonymization is carried out by simply changing one option and recompiling.
+\end{abstract}
+
+\maketitle
+
+%\tableofcontents
+
+\section{Introduction}
+The anonymous package allows for the easy anonymization and deanonymization of academic papers. The required information for both the anonymous and non-anonymous versions of the paper are specified at the time of writing. It is made to be used with the official Association of Computing Machinery (ACM) master article template for \LaTeX~ as described in Section \ref{sec:reqs}. This pdf was produced using acmart. acmart has an anonymous mode which allows for the anonymization of author information, the optional acknowledgments section, and also allows arbitrary text to be hidden (without being replaced by anything such as placeholder text). This package provides additional functionality including placeholder text, anonymous links and anonymous citations/references as described in Section~\ref{sec:usage}.
+
+\subsection{Demonstration}
+A live demonstration of this package is available on Overleaf at:
+\begin{itemize}
+ \item \href{https://www.overleaf.com/read/bmqdgdxkfwys}{https://www.overleaf.com/read/bmqdgdxkfwys}
+\end{itemize}
+\noindent (Overleaf account required).
+
+\subsection{Installation}
+The anonymous package can be found at:
+
+\begin{itemize}
+ \item \url{https://ctan.org/pkg/anonymous}
+\end{itemize}
+\noindent Simply include anonymous.sty in the preamble of your .tex file.
+
+\subsection{Requirements}
+\label{sec:reqs}
+At this time the anonymous package is designed to work with \textbf{acmart}, the official Association of Computing Machinery (ACM) master article template for \LaTeX. This file was prepared with acmart. It is available here:
+\begin{itemize}
+\item \url{https://www.acm.org/publications/proceedings-template}
+\end{itemize}
+
+\noindent or here:
+\begin{itemize}
+ \item \url{https://www.ctan.org/pkg/acmart}.
+\end{itemize}
+This package was tested with acmart version 1.69. The users' guide, implementation and GitHub repo for this class are available here at the link above.
+
+The anonymous text and link features described in Sections \ref{sec:text} and \ref{sec:links} will work with or without acmart. The anonymization of references and citations described in Section \ref{sec:refs} may or may not - it was tested with the ACM reference format only. The anonymization of authors and acknowledgments described in Sections \ref{sec:authors} and \ref{sec:acks} will most likely only work with acmart.
+
+This package also uses the hyperref package which is already used by acmart, so there is probably no need to use it directly, but we include it here for completeness:
+
+\begin{itemize}
+ \item \url{http://www.ctan.org/pkg/hyperref}
+\end{itemize}
+
+\subsection{License}
+This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+
+\section{Usage}
+\label{sec:usage}
+
+The following command should be placed in the preamble of the .tex document you wish to make anonymous.
+\begin{verbatim}
+ \usepackage[option]{anonymous}
+\end{verbatim}
+
+\noindent \texttt{option} can be \texttt{true} or \texttt{false}. True turns anonymous mode on, and false turns anonymous mode off.
+
+\subsection{Author Anonymity}
+\label{sec:authors}
+The following command is used to anonymize author information.
+
+\begin{verbatim}
+ \authoranon{authors information}
+\end{verbatim}
+
+\noindent It should be used to enclose the normal author entries as in the example below.
+
+\begin{verbatim}
+ \authoranon{
+ \author{Brett A. Becker}
+ \affiliation{
+ \institution{University College Dublin}
+ \city{Dublin}
+ \country{Ireland}}
+ \email{brett.becker@ucd.ie}
+ ...
+ %other authors' information here
+ }
+\end{verbatim}
+
+\noindent When anonymous mode is on, the author listing will appear as follows:
+
+\begin{center}
+ \textbf{Anonymous Author(s)}
+\end{center}
+\vspace*{3mm}
+\noindent Additionally, author information will be removed from the `ACM Reference Format' and the `bibstrip' (in this document at the bottom of the first column on page 1). It will also be removed from running headers that appear on pages other than the title page.
+
+\subsection{Anonymous Arbitrary Text}
+\label{sec:text}
+The following command replaces arbitrary text with a default placeholder or a placeholder of the user's choice.
+
+\begin{verbatim}
+ \textanon{text}{placeholder}
+\end{verbatim}
+
+\noindent where \texttt{text} is the text that should be replaced. If the second argument is empty, \texttt{text} is replaced with the default placeholder: <text removed for peer review>. If \texttt{placeholder} is non-empty, that is used to replace \texttt{text}.
+\ \\
+
+\noindent \textbf{Example 1}
+
+\begin{verbatim}
+ In 2020 at \textanon{University College Dublin}{}
+ we conducted a randomized controlled trial with
+ 128 students enrolled in the BSc in Biology.
+\end{verbatim}
+
+\noindent When anonymous mode is on, the above will appear as follows:
+\begin{quote}
+ In 2020 at <text removed for peer review> we conducted a randomized controlled trial with 128 students enrolled in the BSc in Biology.
+\end{quote}
+When anonymous mode is off, it will appear as expected:
+\begin{quote}
+ In 2020 at University College Dublin we conducted a randomized controlled trial with 128 students enrolled in the BSc in Biology.
+\end{quote}
+\ \\
+\noindent \textbf{Example 2}
+
+\begin{verbatim}
+ In 2020 at \textanon{University College Dublin}
+ {Anonymous University} we conducted a randomized
+ controlled trial with 128 students enrolled in the
+ BSc in Biology.
+\end{verbatim}
+
+\noindent When anonymous mode is on, the above will appear as follows:
+\begin{quote}
+ In 2020 at Anonymous University we conducted a randomized controlled trial with 128 students enrolled in the BSc in Biology.
+\end{quote}
+When anonymous mode is off, it will appear as expected:
+\begin{quote}
+ In 2020 at University College Dublin we conducted a randomized controlled trial with 128 students enrolled in the BSc in Biology.
+\end{quote}
+
+\subsection{Anonymous Links}
+\label{sec:links}
+The following commands allow links to be hidden with some flexibility:
+\begin{verbatim}
+ \linkanon{}{}
+ \textlinkanon{}{}
+\end{verbatim}
+
+\noindent Here is an example:
+
+\begin{verbatim}
+ The url for Google is:
+ \linkanon{https://www.google.com}{www.google.com}
+
+ \textlinkanon{https://www.ryanair.com}{Click here}
+ to go to Ryanair.
+\end{verbatim}
+
+\noindent When anonymous mode is on, links are deactivated and the above appears as follows:
+\begin{quote}
+ The url for Google is: <anonymous link>
+\end{quote}
+\begin{quote}
+ Click here to go to Ryanair.
+\end{quote}
+
+\noindent When anonymous mode is off, links are active, and the above appears as follows:
+\begin{quote}
+ The url for Google is: \href{www.google.com}{www.google.com}
+\end{quote}
+\begin{quote}
+ \href{www.ryanair.com}{Click here} to go to Ryanair.
+\end{quote}
+
+\noindent \texttt{\textbackslash linkanon} can also be used with one argument as follows:
+
+\begin{verbatim}
+ \linkanon{www.google.com}
+\end{verbatim}
+
+\noindent In that case the link text and the link itself are both set to be the argument.
+
+\subsection{Anonymous References \& Citations}
+\label{sec:refs}
+The following command is used to make citations anonymous.
+
+\begin{verbatim}
+ \citeanon[option]{bibentry}
+\end{verbatim}
+
+\noindent When anonymous mode is on, citations will appear as [anonymous] and the corresponding reference will not appear in the reference list. If there are other non-anonymous citations in your paper, they may appear renumbered depending on the location of the temporarily anonymized reference in the ordering of references..
+
+When anonymous mode is off, citations appear as normal. For example, \texttt{\textbackslash citeanon\{bibentry\}} might appear as [4] depending on your bibfile and bibliography style. \texttt{\textbackslash citeanon[p.1]\{bibentry\}} might appear as [4, p.1]. Additionally, the corresponding reference will appear in the references list.
+
+\subsection{Anonymous Acknowledgments}
+\label{sec:acks}
+When anonymous mode is on the Acknowledgments Section is automatically hidden (header and body). When anonymous mode is off it appears as normal. It is necessary to use the ``acks'' environment provided by acmart:
+
+\begin{verbatim}
+ \begin{acks}
+ Acknowledgments go here.
+ \end{acks}
+\end{verbatim}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx
index 5eb0137424..47b0ca5af8 100644
--- a/macros/latex/contrib/apa7/apa7.dtx
+++ b/macros/latex/contrib/apa7/apa7.dtx
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2020/05/10 v1.07 APA formatting (7th edition)]
% %
%<*internal> %
-\def\apaSevenVersionDate{2020/05/04}
-\def\apaSevenVersionNumber{1.06}
+\def\apaSevenVersionDate{2020/05/10}
+\def\apaSevenVersionNumber{1.07}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -241,6 +241,8 @@ and the derived files apa7.ins,
%
% \changes{v1.06}{2020/05/04}{Added figurenote command.}
%
+% \changes{v1.07}{2020/05/10}{Fixed bug in figurenote command. Fixed figure title formatting in doc mode. Thanks RH.}
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -545,7 +547,7 @@ and the derived files apa7.ins,
% | \begin{threeparttable}|\par
% \item
% \DescribeMacro{\figurenote}|\figurenote|\marg{figure-note-text}:
-% Formats figure note when placed immidiatly after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|.
+% Formats figure note when placed after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|.
% \item
% \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}:
% Automatically fit a postscript figure; use instead of
@@ -1767,17 +1769,20 @@ and the derived files apa7.ins,
\DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+ \DeclareCaptionLabelSeparator{apalabelsep}{\\}
}{% jou
\DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
+ \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\}
}{% doc
\DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
\DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+ \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\}
}
-\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext}
-\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it}
+\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext}
+\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it}
% space between caption and surrounding document text
% \setlength{\belowcaptionskip}{0pt}
@@ -1789,7 +1794,7 @@ and the derived files apa7.ins,
%
%=============================================================
-\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}}
+\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}}
% Code from theapa.sty
diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf
index c854fb9117..11a47e7b3e 100644
--- a/macros/latex/contrib/apa7/apa7.pdf
+++ b/macros/latex/contrib/apa7/apa7.pdf
Binary files differ
diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf
index e7ea5d3a3c..5b7f1dc886 100644
--- a/macros/latex/contrib/apa7/samples/longsample.pdf
+++ b/macros/latex/contrib/apa7/samples/longsample.pdf
Binary files differ
diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf
index 68e951e2c7..b56f7cbfd4 100644
--- a/macros/latex/contrib/apa7/samples/shortsample.pdf
+++ b/macros/latex/contrib/apa7/samples/shortsample.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/README b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/README
index ba2f55a0bd..11f4c59c31 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/README
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/README
@@ -1,43 +1,4 @@
-% Copyright 2014 by Damien Thiriet
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Damien Thiriet
-%
-% This work consists of the files beamerdarkthemesuserguide.tex,
-% beamerdarkthemesuserguide.pdf, beamercolorthemecormorant.sty,
-% beamercolorthemefrigatebird.sty, beamercolorthememagpie.sty,
-% dahut.jpg, img_5630.jpg, example.tex, frigatebirdexampletree.pdf,
-% frigatebirdexampledefault.pdf, frigatebirdexamplesidebar.pdf,
-% frigatebirdexampleinfolines.pdf, cormorantexampledefault.pdf,
-% cormorantexamplesidebar.pdf, cormorantexampleinfolines.pdf,
-% cormorantexampletree.pdf, magpieexampledefault.pdf,
-% magpieexamplesidebar.pdf, magpieexampleinfolines.pdf,
-% magpieexampletree.pdf, makeexamples.sh
-%
-% img_5630.jpg was taken by Damien Thiriet in the nice Dolina Pięciu
-% Stawów near Zakopane, Poland. img_5630.jpg and dahut.jpg and
-% example.tex are licenced CC-BY version 4.0 or later.
-% You will find a copy of this licence in
-% http://creativecommons.org/licenses/by/4.0/legalcode
-%
-%
-% makeexamples.sh is based upon beamerthemesmakeexample.sh, a file that
-% could be found in beamer official doc in 2013 (scripts are nowadays
-% part of beamer Makefile)
-%
-% beamercolorthemeseahorse.sty was used as a canvas
-% when coding beamercolorthememagpie.sty first version.
-
-%Package version: 0.4.1, 2014-09-03
+DESCRIPTION
Beamerdarkthemes is a bundle of three dark beamer color themes.
They mix one dominant colour with a black background: green for
@@ -45,18 +6,56 @@ cormorant colour theme, red for frigatebird and blue for magpie.
You will find some examples in the documentation file
beamerdarkthemesuserguide.pdf.
+Package version: 0.5.1, 2020-05-10
-CHANGELOG:
-0.4.1: add package version on *sty, *tex files. Licenced *jpg and
-example.tex CC-BY. Add changelog to README
-0.4: change magpie to cormorant; create two new themes: magpie and
-frigatebird. New files for uploading to CTAN:
-beamerdarkthemesuserguide.tex, example.tex and their derivative,
-img_5630.jpg and dahut.jpg
-0.3: change magpie green dominant color from green!50!black to
-green!50!white to avoid unreadable description items on dark rendering
-projectors. New file: makeexample.sh for testing purpose.
-0.2: drop Cracow and oneline; add sidebar color themes to
-beamercolorthememagpie.sty
-0.1: magpie color theme, as well as Cracow theme and oneline
-outer theme.
+AUTHOR
+
+Damien Thiriet
+
+contact: damienXthirietX77@laposteXnet (change X with .)
+
+DOCUMENTATION
+
+Documentation files are beamerdarkthemesuserguide.tex and beamerdarkthemesuserguide.pdf
+
+FILES
+
+This work consists of the files beamerdarkthemesuserguide.tex,
+beamerdarkthemesuserguide.pdf, beamercolorthemecormorant.sty,
+beamercolorthemefrigatebird.sty, beamercolorthememagpie.sty,
+dahut.jpg, img_5630.jpg, example.tex, frigatebirdexampletree.pdf,
+frigatebirdexampledefault.pdf, frigatebirdexamplesidebar.pdf,
+frigatebirdexampleinfolines.pdf, cormorantexampledefault.pdf,
+cormorantexamplesidebar.pdf, cormorantexampleinfolines.pdf,
+cormorantexampletree.pdf, magpieexampledefault.pdf,
+magpieexamplesidebar.pdf, magpieexampleinfolines.pdf,
+magpieexampletree.pdf, makeexamples.sh, ccby.png
+
+img_5630.jpg was taken by Damien Thiriet in the nice Dolina
+Pięciu Stawów near Zakopane, Poland.
+
+LICENCES
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Damien Thiriet
+
+img_5630.jpg and dahut.jpg and example.tex are licenced
+CC-BY version 4.0 or later.
+You will find a copy of this licence in
+http://creativecommons.org/licenses/by/4.0/legalcode
+
+makeexamples.sh is based upon beamerthemesmakeexample.sh,
+a file that could be found in beamer official doc in 2013
+(scripts are nowadays part of beamer Makefile)
+
+beamercolorthemeseahorse.sty was used as a canvas
+when coding beamercolorthememagpie.sty first version.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemecormorant.sty b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemecormorant.sty
index 3135bc9d6d..16150e4a66 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemecormorant.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemecormorant.sty
@@ -1,4 +1,4 @@
-% Copyright 2014 by Damien Thiriet
+% Copyright 2014–2018 by Damien Thiriet
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,20 +37,24 @@
% beamercolorthemeseahorse.sty was used as a canvas
% when coding beamercolorthememagpie.sty first version.
%
-% Package version 0.4.1, 2014-09-03
+% Package version 0.5.1, 2020-05-10
\mode<presentation>
-\definecolor{noir}{rgb}{.09,.09,.09}
-\definecolor{blanc}{rgb}{.91,.91,.91}
-\definecolor{rouge}{rgb}{.91,.09,.09}
-\definecolor{vert}{rgb}{.09,.91,.09}
-\definecolor{bleu}{rgb}{.09,.09,.91}
+\colorlet{noir}{black!90!white}
+\colorlet{blanc}{white!90!black}
+\colorlet{rouge}{red!90!black}
+\colorlet{vert}{green!90!black}
+\colorlet{bleu}{blue!90!black}
\setbeamercolor{background canvas}{bg=noir}
-\setbeamercolor{normal text}{fg=blanc}
-\setbeamercolor{structure}{fg=-bleu}
-\setbeamercolor{local structure}{fg=bleu}
+\setbeamercolor{normal text}{fg=blanc,bg=noir}
+\setbeamercolor{structure}{fg=rouge!20!-bleu}
+\setbeamercolor{alerted text}{fg=-bleu}
+
+\setbeamercolor{item}{fg=structure.fg}
+
+\setbeamercolor{titlelike}{fg=blanc,bg=vert!60!noir}
\setbeamercolor{block title}{fg=blanc,bg=vert!55!noir}
\setbeamercolor{block body}{bg=noir!90!blanc}
@@ -58,18 +62,20 @@
\setbeamercolor{block body alerted}{bg=noir!90!blanc}
\setbeamercolor{block title example}{bg=-rouge!45!blanc,fg=blanc}
\setbeamercolor{block body example}{bg=noir!90!blanc}
-\setbeamercolor{item}{fg=vert}
-
-\setbeamercolor{titlelike}{fg=blanc,bg=vert!60!noir}
\setbeamercolor{palette primary}{bg=noir,fg=blanc}
-\setbeamercolor{palette secondary}{bg=noir,fg=bleu!50!blanc}
-\setbeamercolor{palette tertiary}{bg=noir,fg=-vert}
-\setbeamercolor{palette quaternary}{use=item,bg=noir,fg=item.fg}
+\setbeamercolor{palette secondary}{bg=noir,fg=structure.fg}
+\setbeamercolor{palette tertiary}{bg=noir,fg=alerted text.fg}
+\setbeamercolor{palette quaternary}{use=item,bg=noir,fg=vert!20!blanc}
\setbeamercolor{sidebar}{use=block body, bg=block body.bg}
\setbeamercolor{palette sidebar primary}{use=titlelike, bg=titlelike.bg, fg=titlelike.fg}
\setbeamercolor{section in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{section in sidebar shaded}{ fg=vert!20!blanc}
+\setbeamercolor{section in head/foot shaded}{fg=vert!20!blanc}
+\setbeamercolor{subsection in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{subsection in sidebar shaded}{fg=vert!20!blanc}
+\setbeamercolor{subsection in head/foot shaded}{fg=vert!20!blanc}
\setbeamercolor{logo}{use=block title, bg=block title.bg}
\setbeamercolor{separation line}{fg=blanc,bg=blanc}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemefrigatebird.sty b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemefrigatebird.sty
index 8959ccf8d3..d878b03544 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemefrigatebird.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthemefrigatebird.sty
@@ -1,4 +1,4 @@
-% Copyright 2014 by Damien Thiriet
+% Copyright 2014–2018 by Damien Thiriet
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,40 +37,45 @@
% beamercolorthemeseahorse.sty was used as a canvas
% when coding beamercolorthememagpie.sty first version.
%
-% Package version 0.4.1, 2014-09-03
+% Package version 0.5.1, 2020-05-10
\mode<presentation>
-\definecolor{noir}{rgb}{.09,.09,.09}
-\definecolor{blanc}{rgb}{.91,.91,.91}
-\definecolor{rouge}{rgb}{.91,.09,.09}
-\definecolor{vert}{rgb}{.09,.91,.09}
-\definecolor{bleu}{rgb}{.09,.09,.91}
+\colorlet{noir}{black!90!white}
+\colorlet{blanc}{white!90!black}
+\colorlet{rouge}{red!90!black}
+\colorlet{vert}{green!90!black}
+\colorlet{bleu}{blue!90!black}
\setbeamercolor{background canvas}{bg=noir}
-\setbeamercolor{normal text}{fg=blanc}
-\setbeamercolor{structure}{fg=-bleu}
-\setbeamercolor{local structure}{fg=bleu}
-\setbeamercolor{alerted text}{fg=-vert}
+\setbeamercolor{normal text}{fg=blanc,bg=noir}
+\setbeamercolor{structure}{fg=rouge!20!-bleu}
+\setbeamercolor{alerted text}{fg=-bleu}
+
+\setbeamercolor{item}{fg=structure.fg}
+
+\setbeamercolor{titlelike}{fg=blanc,bg=rouge!65!noir}
\setbeamercolor{block title}{bg=rouge!55!noir,fg=blanc}
\setbeamercolor{block body}{bg=noir!90!blanc}
-\setbeamercolor{block title alerted}{fg=blanc,bg=-vert!55!noir}
+\setbeamercolor{block title alerted}{fg=blanc,bg=purple!55!noir}
\setbeamercolor{block body alerted}{bg=noir!90!blanc}
\setbeamercolor{block title example}{bg=-rouge!45!blanc,fg=blanc}
\setbeamercolor{block body example}{bg=noir!90!blanc}
-\setbeamercolor{item}{fg=rouge!75!blanc}
-
-\setbeamercolor{titlelike}{fg=blanc,bg=rouge!65!noir}
\setbeamercolor{palette primary}{bg=noir,fg=blanc}
-\setbeamercolor{palette secondary}{bg=noir,fg=bleu!50!blanc}
-\setbeamercolor{palette tertiary}{bg=noir,fg=-vert}
-\setbeamercolor{palette quaternary}{use=item,bg=noir,fg=item.fg}
+\setbeamercolor{palette secondary}{bg=noir,fg=structure.fg}
+\setbeamercolor{palette tertiary}{bg=noir,fg=alerted text.fg}
+\setbeamercolor{palette quaternary}{use=item,bg=noir,fg=rouge!20!blanc}
\setbeamercolor{sidebar}{use=block body, bg=block body.bg}
\setbeamercolor{palette sidebar primary}{use=titlelike, bg=titlelike.bg, fg=titlelike.fg}
\setbeamercolor{section in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{section in sidebar shaded}{ fg=rouge!20!blanc}
+\setbeamercolor{section in head/foot shaded}{fg=rouge!20!blanc}
+\setbeamercolor{subsection in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{subsection in sidebar shaded}{fg=rouge!20!blanc}
+\setbeamercolor{subsection in head/foot shaded}{fg=rouge!20!blanc}
\setbeamercolor{logo}{use=block title, bg=block title.bg}
\setbeamercolor{separation line}{fg=blanc,bg=blanc}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthememagpie.sty b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthememagpie.sty
index 83ace08f6c..46f9622ff1 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthememagpie.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamercolorthememagpie.sty
@@ -1,4 +1,4 @@
-% Copyright 2014 by Damien Thiriet
+% Copyright 2014–2018 by Damien Thiriet
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -36,20 +36,24 @@
% beamercolorthemeseahorse.sty was used as a canvas
% when coding beamercolorthememagpie.sty first version.
%
-% Package version 0.4.1, 2014-09-03
+% Package version 0.5.1, 2020-05-10
\mode<presentation>
-\definecolor{noir}{rgb}{.09,.09,.09}
-\definecolor{blanc}{rgb}{.91,.91,.91}
-\definecolor{rouge}{rgb}{.91,.09,.09}
-\definecolor{vert}{rgb}{.09,.91,.09}
-\definecolor{bleu}{rgb}{.09,.09,.91}
+\colorlet{noir}{black!90!white}
+\colorlet{blanc}{white!90!black}
+\colorlet{rouge}{red!90!black}
+\colorlet{vert}{green!90!black}
+\colorlet{bleu}{blue!90!black}
\setbeamercolor{background canvas}{bg=noir}
-\setbeamercolor{normal text}{fg=blanc}
-\setbeamercolor{structure}{fg=-bleu}
-\setbeamercolor{local structure}{fg=vert}
+\setbeamercolor{normal text}{fg=blanc,bg=noir}
+\setbeamercolor{structure}{fg=rouge!20!-bleu}
+\setbeamercolor{alerted text}{fg=-bleu}
+
+\setbeamercolor{item}{fg=structure.fg}
+
+\setbeamercolor{titlelike}{fg=blanc,bg=bleu!70!blanc}
\setbeamercolor{block title}{fg=blanc,bg=bleu!60!blanc}
\setbeamercolor{block body}{bg=noir!90!blanc}
@@ -57,18 +61,20 @@
\setbeamercolor{block body alerted}{bg=noir!90!blanc}
\setbeamercolor{block title example}{bg=-rouge!45!blanc,fg=blanc}
\setbeamercolor{block body example}{bg=noir!90!blanc}
-\setbeamercolor{item}{fg=bleu!40!blanc}
-
-\setbeamercolor{titlelike}{fg=blanc,bg=bleu!70!blanc}
\setbeamercolor{palette primary}{bg=noir,fg=blanc}
-\setbeamercolor{palette secondary}{bg=noir,fg=vert!40!blanc}
-\setbeamercolor{palette tertiary}{bg=noir,fg=-bleu}
-\setbeamercolor{palette quaternary}{use=item,bg=noir,fg=item.fg}
+\setbeamercolor{palette secondary}{bg=noir,fg=structure.fg}
+\setbeamercolor{palette tertiary}{bg=noir,fg=alerted text.fg}
+\setbeamercolor{palette quaternary}{bg=noir,fg=bleu!20!blanc}
\setbeamercolor{sidebar}{use=block body, bg=block body.bg}
\setbeamercolor{palette sidebar primary}{use=titlelike, bg=titlelike.bg, fg=titlelike.fg}
\setbeamercolor{section in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{section in sidebar shaded}{ fg=bleu!20!blanc}
+\setbeamercolor{section in head/foot shaded}{fg=bleu!20!blanc}
+\setbeamercolor{subsection in sidebar}{use=titlelike, fg=titlelike.fg, bg=titlelike.bg}
+\setbeamercolor{subsection in sidebar shaded}{fg=bleu!20!blanc}
+\setbeamercolor{subsection in head/foot shaded}{fg=bleu!20!blanc}
\setbeamercolor{logo}{use=block title, bg=block title.bg}
\setbeamercolor{separation line}{fg=blanc,bg=blanc}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.pdf
index 69ec02c8ea..2647e1808b 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.tex b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.tex
index f484595246..08992081e7 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/beamerdarkthemesuserguide.tex
@@ -1,4 +1,4 @@
-% Copyright 2014 by Damien Thiriet
+% Copyright 2014-2018 by Damien Thiriet
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,19 +24,19 @@
% magpieexampletree.pdf, makeexamples.sh
%
% img_5630.jpg was taken by Damien Thiriet in the nice Dolina Pięciu
-% Stawów near Zakopane, Poland. img_5630.jpg and dahut.jpg and
+% Stawów near Zakopane, Poland. img_5630.jpg, dahut.jpg and
% example.tex are licenced CC-BY version 4.0 or later.
% You will find a copy of this licence in
% http://creativecommons.org/licenses/by/4.0/legalcode
%
% makeexamples.sh is based upon beamerthemesmakeexample.sh, a file that
% could be found in beamer official doc in 2013 (scripts are nowadays
-% part of beamer Makefile)
+% part of beamer Makefile).
%
% beamercolorthemeseahorse.sty was used as a canvas
% when coding beamercolorthememagpie.sty first version.
%
-% Package version 0.4.1, 2014-09-03
+% Package version 0.5.1
\documentclass[12pt]{article}
@@ -47,10 +47,12 @@
\setdefaultlanguage{english}
-%\font\linuxlibertine={name: Linux Libertine}
-\setmainfont[Ligatures=Historic]{Linux Libertine}
-\setsansfont[Ligatures=Historic]{Linux Biolinum}
-\setmonofont[Scale=0.8]{Linux Libertine Mono}
+\setmainfont{Latin Modern Roman}
+\setsansfont{Latin Modern Sans}
+\setmonofont{Latin Modern Mono}
+%\setmainfont{Linux Libertine O}
+%\setsansfont{Linux Biolinum O}
+%\setmonofont{Linux Libertine Mono O}
\title{Beamer dark Themes}
\author{Damien Thiriet \\ \url{damien.thiriet@uj.edu.pl}}
@@ -79,19 +81,24 @@ As far as I understand, pro\TeX{}t uses MiK\TeX{} package manager.
Sometime you cannot use your \TeX{} distribution packaging tools. You may just
do not know what a \TeX{} distribution is; maybe you don't have rights to use its admin tools; some GNU/linux (and *BSD?) distributions package \TeX{} Live without its administration tools; etc.
-Then download \ttfamily beamercolorthemecormorant.sty, beamercolorthemefrigatebird.sty and beamercolorthememagpie.sty. \rmfamily Under GNU/Linux, you'd better put them in a subdirectory of \TeX{} Live personal directory, \verb+$HOME/texmf+ by defaults (\verb+%USERPROFILE%\texmf+ under Windows).
+Download \ttfamily beamercolorthemecormorant.sty, beamercolorthemefrigatebird.sty \rmfamily{} and \rmfamily{} beamercolorthememagpie.sty. \rmfamily Under GNU/Linux, you'd better put them in a subdirectory of \TeX{} Live personal directory, \verb+$HOME/texmf+ by defaults (\verb+%USERPROFILE%\texmf+ under Windows).
Create the subdirectory \verb+$HOME/texmf/tex/latex/+ and move those three files there. They will now be found during compilation, whatever directory you are writing from.
-An alternative is to download those files directly in your presentation file. This is much less convenient if you intend to use these themes in some other presentation, located in another directory. Do not forget then to copy/symlink those files or to point them using the \verb+../+ notation.
+An alternative is to download the file you need directly in your presentation file. This is much less convenient if you intend to use these themes in some other presentation, located in another directory. Do not forget then to copy/symlink those files or to point them using the \verb+../+ notation.
Then insert the following line in your preamble:
\begin{verbatim}
\usecolortheme{cormorant}
\end{verbatim}
-Cormorant should be of course replaced by \ttfamily frigatebird \rmfamily or \ttfamily magpie \rmfamily according to your theme choice.
+Cormorant should be of course replaced by \ttfamily frigatebird \rmfamily or \ttfamily{}magpie\rmfamily{}, depending on your choice.
If you chose any global theme, you should mention the theme first, then your color theme.
+\begin{verbatim}
+ \usetheme{Bergen}
+ \usecolortheme{cormorant}
+\end{verbatim}
+
\section{Dark themes: what for?}
Before choosing any dark theme, you should be aware of its side effects.
@@ -116,30 +123,40 @@ These themes were tested with all beamer themes. In my opinion, mixing them with
\section{Names}
+As requested by Till Tantau in \ttfamily{}beamer\rmfamily{} documentation, my color themes are named after birds.
\begin{description}
-\item[Cormorant]
+\item[cormorant]
A black and green theme, the first one I worked with. First named magpie, since the first black and green bird I could find on the web was an American magpie.
Tested during one year, sadly without asking students for callback. Its items were hardly readable when projector darkened the output. I decided finally to mix green with white rather than black.
-\item[Magpie]
+\item[magpie]
A black/blue theme. Named after European magpies.
-\item[Frigatebird]
+\item[frigatebird]
A black/red theme. Inspired by frigate bird's male. Rather for those who do not associate to closely red with beamer's alert boxes.
\end{description}
+\section{Caveats}
+
+\verb+\alert{}+ is not easy to combine with dark backgrounds. Red is not that readable on a dark background. Orange is more readable, but the hierarchy between \verb+\alert{}+ and \verb+\structure{}+ is not obvious at all.
+
+Version 0.5 reassigned therefore basic colors: yellow to \ttfamily{}alert\rmfamily{} foregrounds and orange to \ttfamily{}structure\rmfamily{} foregrounds. I bet people might find yellow/black contrast more important than the orange/black one. Dark red backgrounds are still used for alertblocks however.
+
\section{Examples}
-Surprisingly, Euclid's presentation does not include any photography. I designed those themes to end up with describing photos students could hardly see. So let's take an example of my own, with a picture, last but not least in French: at least this won't be too awfully written.
+Surprisingly, Euclid's presentation does not include any photography. I designed those themes to end up with describing photos students could hardly see. So let's take an example of my own, with a picture, last but not least in French: this is the part of the doc that will surely be properly written.
Some sentences are too long, though.
-I intended to give a big sample of used colors. You will find those environments or macros:
+Examples are basically issued from an \ttfamily{}example.tex\rmfamily{} file with 4 slides designed with as many environments or macros as possible:
\begin{itemize}
\item slide 2: \verb+frametitle+, \verb+block+, \verb+exampleblock+, \verb+description+
\item slide 3: \verb+framesubtitle+, \verb+includegraphics+
\item slide 4: \verb+structure+, \verb+alert+
\end{itemize}
+You can browse the whole file \ttfamily{}example.tex\rmfamily{} in the package sources.
+
+Examples are displayed on pages \pageref{fig:cormorant-default}–\pageref{fig:frigatebird-tree}. Figure~\ref{fig:cormorant-default} to \ref{fig:frigatebird-default} display the whole document without any outer nor inner theme. Figure~\ref{fig:cormorant-sidebar} to \ref{fig:frigatebird-tree} display slide 2 and 3 with outer themes variations.
\begin{figure}[p]
\pgfimage[width=.45\linewidth,page=1]{cormorantexampledefault.pdf}
@@ -147,16 +164,8 @@ I intended to give a big sample of used colors. You will find those environments
\pgfimage[width=.45\linewidth,page=3]{cormorantexampledefault.pdf}
\pgfimage[width=.45\linewidth,page=4]{cormorantexampledefault.pdf}
- \caption{Cormorant color theme}
-\end{figure}
-
-\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=1]{frigatebirdexampledefault.pdf}
- \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampledefault.pdf}
-
- \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampledefault.pdf}
- \pgfimage[width=.45\linewidth,page=4]{frigatebirdexampledefault.pdf}
- \caption{Frigatebird color theme}
+ \caption{cormorant color theme}
+ \label{fig:cormorant-default}
\end{figure}
\begin{figure}[p]
@@ -165,61 +174,146 @@ I intended to give a big sample of used colors. You will find those environments
\pgfimage[width=.45\linewidth,page=3]{magpieexampledefault.pdf}
\pgfimage[width=.45\linewidth,page=4]{magpieexampledefault.pdf}
- \caption{Magpie color theme}
+ \caption{magpie color theme}
+ \label{fig:magpie-default}
+\end{figure}
+
+\begin{figure}[p]
+ \pgfimage[width=.45\linewidth,page=1]{frigatebirdexampledefault.pdf}
+ \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampledefault.pdf}
+
+ \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampledefault.pdf}
+ \pgfimage[width=.45\linewidth,page=4]{frigatebirdexampledefault.pdf}
+ \caption{frigatebird color theme}
+ \label{fig:frigatebird-default}
\end{figure}
\begin{figure}[p]
\pgfimage[width=.45\linewidth,page=2]{cormorantexamplesidebar.pdf}
\pgfimage[width=.45\linewidth,page=3]{cormorantexamplesidebar.pdf}
- \caption{Cormorant color theme, sidebar outer theme}
+ \caption{cormorant color theme, sidebar outer theme}
+ \label{fig:cormorant-sidebar}
\end{figure}
\begin{figure}[p]
\pgfimage[width=.45\linewidth,page=2]{cormorantexampleinfolines.pdf}
\pgfimage[width=.45\linewidth,page=3]{cormorantexampleinfolines.pdf}
- \caption{Cormorant color theme, infolines outer theme}
+ \caption{cormorant color theme, infolines outer theme}
\end{figure}
\begin{figure}[p]
\pgfimage[width=.45\linewidth,page=2]{cormorantexampletree.pdf}
\pgfimage[width=.45\linewidth,page=3]{cormorantexampletree.pdf}
- \caption{Cormorant color theme, tree outer theme}
+ \caption{cormorant color theme, tree outer theme}
\end{figure}
\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{frigatebirdexamplesidebar.pdf}
- \pgfimage[width=.45\linewidth,page=3]{frigatebirdexamplesidebar.pdf}
- \caption{Frigatebird color theme, sidebar outer theme}
+ \pgfimage[width=.45\linewidth,page=2]{magpieexamplesidebar.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{magpieexamplesidebar.pdf}
+ \caption{magpie color theme with sidebar outer theme}
\end{figure}
\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampleinfolines.pdf}
- \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampleinfolines.pdf}
- \caption{Frigatebird color theme, infolines outer theme}
+ \pgfimage[width=.45\linewidth,page=2]{magpieexampleinfolines.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{magpieexampleinfolines.pdf}
+ \caption{magpie color theme with infolines outer theme}
\end{figure}
\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampletree.pdf}
- \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampletree.pdf}
- \caption{Frigatebird color theme, tree outer theme}
+ \pgfimage[width=.45\linewidth,page=2]{magpieexampletree.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{magpieexampletree.pdf}
+ \caption{magpie color theme with tree outer theme}
+ \label{fig:magpie-tree}
\end{figure}
\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{magpieexamplesidebar.pdf}
- \pgfimage[width=.45\linewidth,page=3]{magpieexamplesidebar.pdf}
- \caption{Magpie color theme with sidebar outer theme}
+ \pgfimage[width=.45\linewidth,page=2]{frigatebirdexamplesidebar.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{frigatebirdexamplesidebar.pdf}
+ \caption{frigatebird color theme, sidebar outer theme}
\end{figure}
\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{magpieexampleinfolines.pdf}
- \pgfimage[width=.45\linewidth,page=3]{magpieexampleinfolines.pdf}
- \caption{Magpie color theme with infolines outer theme}
+ \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampleinfolines.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampleinfolines.pdf}
+ \caption{frigatebird color theme, infolines outer theme}
\end{figure}
-\begin{figure}[p]
- \pgfimage[width=.45\linewidth,page=2]{magpieexampletree.pdf}
- \pgfimage[width=.45\linewidth,page=3]{magpieexampletree.pdf}
- \caption{Magpie color theme with tree outer theme}
+\begin{figure}[h!]
+ \pgfimage[width=.45\linewidth,page=2]{frigatebirdexampletree.pdf}
+ \pgfimage[width=.45\linewidth,page=3]{frigatebirdexampletree.pdf}
+ \caption{frigatebird color theme, tree outer theme}
+ \label{fig:frigatebird-tree}
\end{figure}
+\newpage
+
+\section{History}
+
+\subsection*{v. 0.5.1}
+
+
+\begin{itemize}
+ \item fixed a bug: whitish colors when covered (Riccardo Maffei)
+\end{itemize}
+
+\subsection*{v. 0.5}
+
+Color changes may be considered as bug fixes. I realized only few colors do render well on a dark background; red and green are not one of them.
+\begin{itemize}
+ \item \verb+\alert{}+ switched to previous \verb+\structure{}+ yellow output.
+ \item \verb+\structure{}+ gives now an orange output.
+ \item \ttfamily{}item\rmfamily{} color is now using \ttfamily{}structure.fg\rmfamily{} color.
+ \item Palettes redesigned in a more consistent way.
+ \item New colors: \ttfamily{} section in sidebar shaded\rmfamily{},\ttfamily{} subsection in sidebar shaded\rmfamily{},\ttfamily{} section in head/foot shaded\rmfamily{},\ttfamily{} subsection in head/foot shaded\rmfamily{}.
+ \item \ttfamily{}local structure\rmfamily{} was deleted.
+ \item Documentation improvements: links to auxiliary files, new caveats section, switch to Latin Modern Font, history divided in subsections.
+ \item README now lists package files.
+\end{itemize}
+
+\subsection*{v. 0.4.2}
+\begin{itemize}
+ \item Improvements of frigatebird: brighter description items (the former ones were hardly readable on a black background), alert colour based on purple.
+ \item Typos fixed in documentation, new history section.
+\end{itemize}
+This version was not uploaded on CTAN because I lacked time to do it.
+
+\subsection*{v. 0.4.1}
+First release on CTAN.
+\begin{itemize}
+ \item add package version on *sty, *tex files.
+ \item *jpg and example.tex licenced CC-BY.
+ \item Add changelog to README.
+\end{itemize}
+
+\subsection*{v. 0.4}
+
+\begin{itemize}
+ \item Rename magpie to cormorant;
+ \item New themes: magpie and frigatebird.
+ \item New files: \ttfamily{}beamerdarkthemesuserguide.tex\rmfamily{}, \ttfamily{}example.tex\rmfamily{} and their derivative, \ttfamily{}img\_5630.jpg\rmfamily{} and \ttfamily{}dahut.jpg\rmfamily{}.
+
+\end{itemize}
+
+\subsection*{v. 0.3}
+\begin{itemize}
+ \item Change main green from green!50!black to green!50!white to avoid unreadable description items on dark rendering.
+ \item New file: \ttfamily{}makeexample.sh\rmfamily{}, adapted from \ttfamily{}beamer\rmfamily{} package for testing purpose.
+\end{itemize}
+
+\subsection*{v. 0.2}
+\begin{itemize}
+ \item Cracow theme dropped;
+ \item oneline outertheme dropped;
+ \item Add sidebar colors to \ttfamily{}beamercolorthememagpie.sty\rmfamily{}.
+\end{itemize}
+
+\subsection*{v. 0.1}
+\begin{itemize}
+ \item New colortheme \ttfamily{}magpie\rmfamily{}.
+ \item New theme \ttfamily{}Cracow\rmfamily{}.
+ \item New outer theme \ttfamily{}oneline\rmfamily{}.
+\end{itemize}
+
+
+
\end{document}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/ccby.png b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/ccby.png
index 822491edb9..c8473a2478 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/ccby.png
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/ccby.png
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampledefault.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampledefault.pdf
index d11476e028..97c675082c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampledefault.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampledefault.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampleinfolines.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampleinfolines.pdf
index 6d680b2fbb..acb9341d89 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampleinfolines.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampleinfolines.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexamplesidebar.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexamplesidebar.pdf
index aaf2f6378c..d5366dc334 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexamplesidebar.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexamplesidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampletree.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampletree.pdf
index e86739d58b..9cb2151802 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampletree.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/cormorantexampletree.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/example.tex b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/example.tex
index 3c61d1757c..fdc8994991 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/example.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/example.tex
@@ -38,7 +38,7 @@
% beamercolorthemeseahorse.sty was used as a canvas
% when coding beamercolorthememagpie.sty first version.
%
-% Package version 0.4.1, 2014-09-03
+% Package version 0.5.1, 2020-05-10
\documentclass{beamer}
@@ -46,6 +46,9 @@
\useoutertheme{\outername}
\usepackage{polyglossia}
+\setmainfont{Latin Modern Roman}
+\setsansfont{Latin Modern Sans}
+\setmonofont{Latin Modern Mono}
\title{Le dahut}
\subtitle{Précis de zoologie avec traité de chasse}
@@ -85,7 +88,7 @@
\begin{frame}
\frametitle{Un document exceptionnel}
- \framesubtitle{Gromsoław Krótkowidz, \emph{Paysage au dahut}, huile sur toile, 1887}
+ \framesubtitle{Gromosław Krótkowidz, \emph{Paysage au dahut}, huile sur toile, 1887}
\includegraphics[width=.7\linewidth]{dahut.jpg}
Cracovie, musée Jan Stanisławski.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampledefault.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampledefault.pdf
index d0409728f8..acd69f154a 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampledefault.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampledefault.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampleinfolines.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampleinfolines.pdf
index 2dfb717029..058fc8ff2d 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampleinfolines.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampleinfolines.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexamplesidebar.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexamplesidebar.pdf
index d51897897d..781601207f 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexamplesidebar.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexamplesidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampletree.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampletree.pdf
index bdd8239b18..c48c9918a7 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampletree.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/frigatebirdexampletree.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampledefault.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampledefault.pdf
index 884115aad8..a32ce64bfd 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampledefault.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampledefault.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampleinfolines.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampleinfolines.pdf
index f1a8bb0f1b..0597d4ddc8 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampleinfolines.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampleinfolines.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexamplesidebar.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexamplesidebar.pdf
index 86d192bf2c..a6a068afb4 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexamplesidebar.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexamplesidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampletree.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampletree.pdf
index aaba7645a9..d980759554 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampletree.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/magpieexampletree.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makecormorant.sh b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makecormorant.sh
new file mode 100755
index 0000000000..47af449ed1
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makecormorant.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+#for i in default sidebar ; do (
+for i in default infolines sidebar tree; do (
+ lualatex \\def\\outername\{"$i"\}\\def\\colorname\{"cormorant"\}\\input example.tex;
+ mv example.pdf cormorantexample"$i".pdf;
+ )
+done
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makemagpie.sh b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makemagpie.sh
new file mode 100755
index 0000000000..0205c9e706
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerdarkthemes/makemagpie.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in default infolines sidebar tree; do (
+ lualatex \\def\\outername\{"$i"\}\\def\\colorname\{"magpie"\}\\input example.tex;
+ mv example.pdf magpieexample"$i".pdf;
+ )
+done
diff --git a/macros/latex/contrib/llncsconf/CHANGELOG.md b/macros/latex/contrib/llncsconf/CHANGELOG.md
index 8e8bd0660f..2a0f08412e 100644
--- a/macros/latex/contrib/llncsconf/CHANGELOG.md
+++ b/macros/latex/contrib/llncsconf/CHANGELOG.md
@@ -1,9 +1,20 @@
# Changelog
+
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-## [1.0.0] - 2018-02-20
+## 1.1.0 - 2020-05-10
+
+### Added
+
+- Crop area now takes paper format (a4, letter) into account
+
+## 1.0.0 - 2018-02-20
+
### Added
+
- Initial version uploaded to CTAN.
+
+[1.1.0]: https://git.logicalhacking.com/adbrucker/llncsconf/compare/v1.0.0...v1.1.0
diff --git a/macros/latex/contrib/llncsconf/README.md b/macros/latex/contrib/llncsconf/README.md
index 6d43746f65..cbe60fba6f 100644
--- a/macros/latex/contrib/llncsconf/README.md
+++ b/macros/latex/contrib/llncsconf/README.md
@@ -1,12 +1,15 @@
# llncsconf
+
LaTeX package extending Springer's llncs class.
## Installation
+
Copy `llncsconf.sty` in a directory that is searched by LaTeX
(e.g,. either your `texmf` tree or the local directory with your main
LaTeX file.
## Usage
+
In a LaTeX file that uses Springer's `llncs` class, just add
```tex
\usepackage{llncsconf}
@@ -44,22 +47,39 @@ Moreover, the package requires two commands to be executed:
i.e., the DOI of the final publication available at Springer's web site.
## Self-Archiving
+
Sprinter states in his [Springer's Consent to Publish v3](http://resource-cms.springer.com/springer-cms/rest/v1/content/731196/data/v3):
-> Author may only post his/her own version, provided acknowledgment is given to the original source of publication and a link is inserted to the published article on Springer’s website.
-> The link must be provided by inserting the DOI number of the article in the following sentence:
-> "The final publication is available at Springer via `http://dx.doi.org/[insert DOI]`".
-The DOI (Digital Object Identifier) can be found at the bottom of the first page of the published paper.
+> Author may only post his/her own version, provided acknowledgment is given
+> to the original source of publication and a link is inserted to the published
+> article on Springer’s website. The link must be provided by inserting the DOI
+> number of the article in the following sentence:
+> "The final publication is available at Springer via
+> `http://dx.doi.org/[insert DOI]`".
+The DOI (Digital Object Identifier) can be found at the bottom of the first page
+of the published paper.
-This package uses `https://doi.org` as `http://dx.doi.org` [is deprecated](https://www.doi.org/factsheets/DOIIdentifierSpecs.html).
+This package uses `https://doi.org` as `http://dx.doi.org`
+[is deprecated](https://www.doi.org/factsheets/DOIIdentifierSpecs.html).
## Authors
+
Main author: [Achim D. Brucker](http://www.brucker.ch/)
### Contributors
+
* [Oliver Kopp](https://github.com/koppor/)
## License
+
This project is dual-licensed under a 2-clause BSD-style license and/or
-the LPPL version 1 or any later version.
+the LPPL version 1.3c or (at your opinion) any later version.
+
+SPDX-License-Identifier: LPPL-1.3c+ OR BSD-2-Clause
+
+## Master Repository
+
+The master git repository for this project is hosted by the [Software
+Assurance & Security Research Team](https://logicalhacking.com) at
+<https://git.logicalhacking.com/adbrucker/llncsconf>.
diff --git a/macros/latex/contrib/llncsconf/llncsconf.sty b/macros/latex/contrib/llncsconf/llncsconf.sty
index a8f7a7d483..42d71bddbf 100644
--- a/macros/latex/contrib/llncsconf/llncsconf.sty
+++ b/macros/latex/contrib/llncsconf/llncsconf.sty
@@ -4,11 +4,15 @@
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
-%% version 1 of the License, or any later version.
+%% version 1.3c of the License, or (at your opinion) any later version.
%% OR
%% The 2-clause BSD-style license.
+%%
+%% SPDX-License-Identifier: LPPL-1.3c+ OR BSD-2-Clause
\NeedsTeXFormat{LaTeX2e}\relax
-\ProvidesClass{llncsconf}[Unreleased Achim D. Brucker]
+\ProvidesPackage{llncsconf}
+ [2020/05/10 v1.1.0 %
+ Tweaks for the llncs class.]
%
\RequirePackage{ifthen}
\RequirePackage{hyperref}
@@ -41,7 +45,11 @@
% <crop>
\ifthenelse{\boolean{crop}}{%
-\pdfpagesattr{/CropBox [92 70 523 736]}% LNCS page: 152x235 mm
+ \@ifclasswith{llncs}{a4paper}{%
+ \pdfpagesattr{/CropBox [92 114 523 780]}%
+ }{%
+ \pdfpagesattr{/CropBox [92 65 523 731]}% LNCS page: 152x235 mm
+ }%
}{}
% </crop>
\def\ps@svninfofirst{\let\@mkboth\@gobbletwo\let\@oddhead\@empty\let\@evenhead\@empty