diff options
author | Karl Berry <karl@freefriends.org> | 2020-11-26 22:10:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-11-26 22:10:54 +0000 |
commit | d92ff598fe7b6e43069d579f979856b474f525aa (patch) | |
tree | ed17bc604f91a4c783b40794592b550c29bfc86a | |
parent | fa46996da4f6f4b433c8a98849b4b0572fc9f140 (diff) |
emisa (26nov20)
git-svn-id: svn://tug.org/texlive/trunk@57013 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/CHANGELOG.md | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/README.TEXLIVE | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/README.md | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/emisa.brf | 26 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/emisa.pdf | bin | 429073 -> 515589 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/emisa/manifest.txt | 9 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/emisa/emisa.dtx | 97 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/emisa/emisa.ins | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/emisa/emisa.cls | 34 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
10 files changed, 120 insertions, 87 deletions
diff --git a/Master/texmf-dist/doc/latex/emisa/CHANGELOG.md b/Master/texmf-dist/doc/latex/emisa/CHANGELOG.md index 32ad994e373..09e7e6c7e12 100644 --- a/Master/texmf-dist/doc/latex/emisa/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/emisa/CHANGELOG.md @@ -1,6 +1,19 @@ # Changelog All notable changes to this project will be documented in this file. +## [Unreleased] + +## [2.3.0] - 2020-11-26 +### Added +- New option `cleveref` (default) and `nocleveref` to support `cleveref` package + +### Changed +- Add explicit options to `doclicense`, because the fallbacks are deprecated +- Remove package `latexrelease` + +### Fixed +- Change load order of `newtxmath`, `amsmath` and `amssymb` to fix problem with definition of `\Bbbk` + ## [2.2.0] - 2018-02-24 ### Changed @@ -34,7 +47,8 @@ All notable changes to this project will be documented in this file. - Initial release of the completely reworked bundle -[Unreleased]: https://github.com/gi-ev/emisa-latex-package/compare/v2.2.0...HEAD +[Unreleased]: https://github.com/gi-ev/emisa-latex-package/compare/v2.3.0...HEAD +[2.3.0]: https://github.com/gi-ev/emisa-latex-package/tree/v2.3.0 [2.2.0]: https://github.com/gi-ev/emisa-latex-package/tree/v2.2.0 [2.1.1]: https://github.com/gi-ev/emisa-latex-package/tree/v2.1.1 [2.1.0]: https://github.com/gi-ev/emisa-latex-package/tree/v2.1 diff --git a/Master/texmf-dist/doc/latex/emisa/README.TEXLIVE b/Master/texmf-dist/doc/latex/emisa/README.TEXLIVE index 62853616dd4..94e04bce2bc 100644 --- a/Master/texmf-dist/doc/latex/emisa/README.TEXLIVE +++ b/Master/texmf-dist/doc/latex/emisa/README.TEXLIVE @@ -1,7 +1,8 @@ -The following files have been removed in the TeX Live installation of -the current package, typically due to duplication, lack of space, or -missing source code. You can find these files on CTAN at - http://mirror.ctan.org/macros/latex/contrib/emisa -If questions or concerns, email tex-live@tug.org. +The files below have been removed in the TeX Live installation of +the current package, typically due to missing source code. If this is a +concern, please contact the package maintainer. + +You can find these files on CTAN at + http://mirror.ctan.org/macros/latex/contrib/emisa. emisa-instructions.pdf diff --git a/Master/texmf-dist/doc/latex/emisa/README.md b/Master/texmf-dist/doc/latex/emisa/README.md index 7093b283805..1f2dfb8a50d 100644 --- a/Master/texmf-dist/doc/latex/emisa/README.md +++ b/Master/texmf-dist/doc/latex/emisa/README.md @@ -5,8 +5,8 @@ emisa -- A LaTeX package for preparing manuscripts for the journal EMISA Enterprise Modelling and Information Systems Architectures - International Journal of Conceptual Modeling (EMISAJ) -(c) 2015-2018 -Version: 2.2.0 +(c) 2015-2020 +Version: 2.3.0 Maintainer: Stefan Strecker and Martin Sievers Email: stefan.strecker@fernuni-hagen.de martin.sievers@schoenerpublizieren.de diff --git a/Master/texmf-dist/doc/latex/emisa/emisa.brf b/Master/texmf-dist/doc/latex/emisa/emisa.brf deleted file mode 100644 index d37061b15f0..00000000000 --- a/Master/texmf-dist/doc/latex/emisa/emisa.brf +++ /dev/null @@ -1,26 +0,0 @@ -\backcite {csquotes-pdf}{{5}{11}{section.11}} -\backcite {biblatex-pdf}{{5}{12}{section.12}} -\backcite {tabularx-pdf}{{7}{14}{lstnumber.3.10}} -\backcite {booktabs-pdf}{{8}{14}{lstnumber.4.14}} -\backcite {listings-pdf}{{8}{15}{section.15}} -\backcite {algorithms-pdf}{{10}{16}{lstnumber.-1.7}} -\backcite {textcomp-pdf}{{17}{19.2}{subsection.19.2}} -\backcite {microtype-pdf}{{17}{19.2}{subsection.19.2}} -\backcite {babel-pdf}{{17}{19.2}{subsection.19.2}} -\backcite {float-pdf}{{17}{19.2}{subsection.19.2}} -\backcite {caption-pdf}{{17}{19.2}{subsection.19.2}} -\backcite {graphicx-pdf}{{18}{19.2.1}{subsubsection.19.2.1}} -\backcite {xcolor-pdf}{{18}{19.2.1}{subsubsection.19.2.1}} -\backcite {biblatex-pdf}{{18}{19.2.1}{subsubsection.19.2.1}} -\backcite {csquotes-pdf}{{19}{19.2.1}{subsubsection.19.2.1}} -\backcite {twoopt-pdf}{{19}{19.2.2}{subsubsection.19.2.2}} -\backcite {environ-pdf}{{19}{19.2.2}{subsubsection.19.2.2}} -\backcite {paralist-pdf}{{19}{19.2.2}{subsubsection.19.2.2}} -\backcite {afterpage-pdf}{{20}{19.2.2}{subsubsection.19.2.2}} -\backcite {xspace-pdf}{{20}{19.2.2}{subsubsection.19.2.2}} -\backcite {calc-pdf}{{20}{19.2.2}{subsubsection.19.2.2}} -\backcite {geometry-pdf}{{20}{19.2.2}{subsubsection.19.2.2}} -\backcite {eso-pic-pdf}{{20}{19.2.2}{subsubsection.19.2.2}} -\backcite {hyperref-pdf}{{21}{19.3}{subsection.19.3}} -\backcite {eso-pic-pdf}{{36}{19.9.3}{subsubsection.19.9.3}} -\backcite {source2e-pdf}{{52}{19.10}{subsection.19.10}} diff --git a/Master/texmf-dist/doc/latex/emisa/emisa.pdf b/Master/texmf-dist/doc/latex/emisa/emisa.pdf Binary files differindex 8c928e0fdc2..1ff9ead04fc 100644 --- a/Master/texmf-dist/doc/latex/emisa/emisa.pdf +++ b/Master/texmf-dist/doc/latex/emisa/emisa.pdf diff --git a/Master/texmf-dist/doc/latex/emisa/manifest.txt b/Master/texmf-dist/doc/latex/emisa/manifest.txt index 2efe5d8a790..eddb4491035 100644 --- a/Master/texmf-dist/doc/latex/emisa/manifest.txt +++ b/Master/texmf-dist/doc/latex/emisa/manifest.txt @@ -2,9 +2,9 @@ This is file `manifest.txt'. This file is part of a work named "emisa". -Copyright (C) 2009,2010,2011,2012 by Martin Wilhelm Leidig +Copyright (C) 2009-2012 by Martin Wilhelm Leidig <mwl@moss.in-berlin.de> -Copyright (C) 2015,2016,2017,2018 by Enterprise Modelling and Information +Copyright (C) 2015-2020 by Enterprise Modelling and Information Systems Architectures - An International Electronic Journal (EMISA) -------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -24,7 +24,7 @@ precisely, it explains how the locutions "Work" and "Compiled Work", used in the LaTeX Project Public License, are to be interpreted in the case of this work. -February, 24th 2018 (version 2.2.0) +November, 2nd 2020 (version 2.3.0-devel) @@ -35,9 +35,9 @@ In the case of the EMISA Bundle, the "Work" is the collection of the following 4 files: README.md -- start by reading this file +CHANGELOG.md -- history of the development manifest.txt -- the file you are reading now emisa.dtx -- main source file -emisa.ins -- installation script If you have received the 4 files listed above, you possess an integral copy of the EMISA Bundle. @@ -52,6 +52,7 @@ In the case of the EMISA Bundle, a "Compiled Work" is the collection of: a) the following 2 files that are also part of the "Work" (see above): README.md +CHANGELOG.md manifest.txt diff --git a/Master/texmf-dist/source/latex/emisa/emisa.dtx b/Master/texmf-dist/source/latex/emisa/emisa.dtx index 4f14d19bddd..6f39eae7c69 100644 --- a/Master/texmf-dist/source/latex/emisa/emisa.dtx +++ b/Master/texmf-dist/source/latex/emisa/emisa.dtx @@ -3,7 +3,7 @@ % % Copyright (C) 2009-2012 by Martin Wilhelm Leidig % <mwl@moss.in-berlin.de> -% Copyright (C) 2015-2018 by Enterprise Modelling and Information +% Copyright (C) 2015-2020 by Enterprise Modelling and Information % Systems Architectures -- International Journal of Conceptual % Modeling (EMISAJ) % -------------------------------------------------------------------- @@ -47,7 +47,7 @@ %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<class>\ProvidesClass{emisa}% %<*class> -[2018/02/24 2.2.0 LaTeX class EMISA] +[2020/11/26 2.3.0 LaTeX class EMISA] %</class> % %<*driver> @@ -60,7 +60,6 @@ % \askforoverwritetrue \askonceonly %<batchfile>\showprogress -%<batchfile>\askforoverwritetrue % \usedir{tex/latex/\jobname} %%% % this is for biblatex files: @@ -88,9 +87,9 @@ it as you see fit. If you absolutely have to change \outFileName, please do so in \jobname.dtx (after altering the name, of course!). -Copyright (C) 2009,2010,2011,2012 by Martin Wilhelm Leidig +Copyright (C) 2009-2012 by Martin Wilhelm Leidig <mwl@moss.in-berlin.de> -Copyright (C) 2015,2016,2017,2018 by Enterprise Modelling and Information +Copyright (C) 2015-2020 by Enterprise Modelling and Information Systems Architectures -- International Journal of Conceptual Modeling (EMISAJ) ------------------------------------------------------------------------ @@ -180,7 +179,6 @@ This work consists of all files listed in manifest.txt. backgroundcolor={\color{yellow!30}}, language=[LaTeX]TeX, basicstyle=\MacroFont, - %%%keywordstyle={}, keywordstyle=\MacroFont\bfseries, morekeywords={editor,received,accepted,volume,issue,% specialissuetitle,CCBYNCSAFour,CCBYNCSAThree,license,% @@ -192,7 +190,6 @@ This work consists of all files listed in manifest.txt. breaklines, emptylines=1, gobble=2, - %%% texcsstyle=*{\footnotesize\ttfamily\color{Blue}},% } \lstnewenvironment{examplecode}[1][] {\lstset{#1}} @@ -200,7 +197,6 @@ This work consists of all files listed in manifest.txt. \usepackage{algorithm,algorithmic} \usepackage[onehalfspacing]{setspace} \usepackage[dvipsnames]{xcolor} -%\usepackage{hologo} \usepackage{graphicx} \usepackage[alwaysadjust,flushright]{paralist} \setdefaultleftmargin{1.2em}{1.2em}{1.2em}{1.2em}{1.2em}{1.2em}% @@ -982,8 +978,7 @@ This work consists of all files listed in manifest.txt. % pages} % \changes{v2.1.0}{2016/03/31}{Fix incompatible changes introduced by biblatex % >3.3} -% \changes{v2.1.0}{2016/03/31}{Changed \cs{ifblank} to -% \cs{ifempty} +% \changes{v2.1.0}{2016/03/31}{Changed \cs{ifblank} to \cs{ifempty} % because of wrong interpretations. Not sure, whether this is needed of older % versions} % \changes{v2.1.0}{2016/04/01}{Returned to \cs{ifblank} for the old @@ -994,7 +989,15 @@ This work consists of all files listed in manifest.txt. % on even pages} % \changes{v2.2.0}{2018/02/15}{Changed: Author Instructions. Babel default % option changed to \texttt{american} (from \texttt{british})} -% +% \changes{v2.3.0}{2020/11/02}{Change load order of \texttt{newtxmath}, +% \texttt{amsmath} and \texttt{amssymb} to fix problem with definition of +% \cs{Bbbk}} +% \changes{v2.3.0}{2020/11/02}{Add explicit options to \texttt{doclicense}, +% because the fallbacks are deprecated} +% \changes{v2.3.0}{2020/11/02}{New option \texttt{cleveref} (default) and +% `nocleveref` to support `cleveref` package} +% \changes{v2.3.0}{2020/11/26}{Remove package \texttt{latexrelease} as +% suggested by Frank Mittelbach} % % \section{Introduction} % Enterprise Modelling and Information Systems Architectures @@ -1804,7 +1807,17 @@ This work consists of all files listed in manifest.txt. % \end{option} % \end{option} % \end{option} -% +% \begin{option}{cleveref} +% \begin{option}{nocleveref} +% \begin{switch}{@usecleveref} +% \begin{macrocode} +\newif\if@usecleveref +\DeclareOption{cleveref}{\@useclevereftrue} +\DeclareOption{nocleveref}{\@useclevereffalse} +% \end{macrocode} +% \end{switch} +% \end{option} +% \end{option} % \begin{option}{cover} % \begin{option}{nocover} % \begin{macro}{\coveron} @@ -1836,18 +1849,12 @@ This work consists of all files listed in manifest.txt. % \begin{macrocode} \PassOptionsToClass{a4paper,twoside,11pt}{article}% \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}% -\ExecuteOptions{american,final,noreferee,nocover,oneside,openany}% +\ExecuteOptions{american,final,noreferee,nocover,cleveref,oneside,openany}% \ProcessOptions*\relax% % \end{macrocode} -% -% \begin{macrocode} -\IfFileExists{latexrelease.sty}% - {\RequirePackage[latest]{latexrelease}}% - {\RequirePackage{fixltx2e}}% -% \end{macrocode} -% +% %^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% +% % \subsection{Loading the base class and packages} % \label{sec:code:cls+pkg} % @@ -2123,13 +2130,13 @@ This work consists of all files listed in manifest.txt. % % These macros are imported from \pkg{paralist}, setting standard % enumeration marks and list indentations. -% \changes{0.95i}{2011/04/06}{Default left margin in all levels of +% \changes{v0.95i}{2011/04/06}{Default left margin in all levels of % all list environments set to 1.25em.} -% \changes{0.95l}{2012/12/11}{Default left margin setting changed back to old +% \changes{v0.95l}{2012/12/11}{Default left margin setting changed back to old % setting after production-level \file{emisa.cfg}: % 1em/0.9em/0.7em/0.5em/0.4em/0.3em.} -% \changes{2.0}{2015/12/21}{No more config files} -% \changes{2.0}{2015/12/21}{pltopsep changed} +% \changes{v2.0}{2015/12/21}{No more config files} +% \changes{v2.0}{2015/12/21}{pltopsep changed} % \begin{macrocode} \setdefaultenum{1.}{a)}{i.}{A}% \setdefaultleftmargin{1em}{0.9em}{0.7em}{0.5em}{0.4em}{0.3em}% @@ -2189,8 +2196,11 @@ This work consists of all files listed in manifest.txt. % % \subsubsection{Scripts, fonts, and maps} % +% \changes{v2.3.0}{2020/11/02}{\cs{Bbbk} is defined by newtxmath and amssymb} % \begin{macrocode} \RequirePackage{newtxtext} +\RequirePackage{amsmath} +\RequirePackage{amssymb} \RequirePackage{newtxmath} \RequirePackage[zerostyle=b,straightquotes]{newtxtt} \if@microtype @@ -2228,7 +2238,6 @@ This work consists of all files listed in manifest.txt. \lstnewenvironment{sourcecode*}[1][] {\lstset{float=htbp,#1}} {} - \RequirePackage{amsmath} \RequirePackage[amsmath,standard,hyperref]{ntheorem} % \end{macrocode} % @@ -2256,9 +2265,27 @@ This work consists of all files listed in manifest.txt. hyperfootnotes=false ]{hyperref}% % \end{macrocode} -% +% \changes{v2.3.0}{2020/11/02}{Add support for cleveref} +% \begin{macrocode} +\if@usecleveref% + \RequirePackage[capitalise,nameinlink]{cleveref} + \crefname{section}{Sec.}{Sec.} + \Crefname{section}{Sec.}{Sec.} + \crefname{figure}{\figurename}{\figurename} + \Crefname{figure}{\figurename}{\figurename} + \crefname{listing}{\lstlistingname}{\lstlistingname} + \Crefname{listing}{\lstlistingname}{\lstlistingname} + \crefname{table}{\tablename}{\tablename} + \Crefname{table}{\tablename}{\tablename} +\fi% +% \end{macrocode} +% \changes{v2.3.0}{2020/11/02}{Package now needs explicit options} % \begin{macrocode} -\RequirePackage{doclicense} +\RequirePackage[% + type={CC},% + modifier={by-nc-sa},% + version={4.0}% +]{doclicense} % \end{macrocode} % %^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2604,11 +2631,11 @@ This work consists of all files listed in manifest.txt. % \end{macro} % % \begin{macro}{\specialissuetitle} -% \changes{0.92n}{2010/05/18}{Fixed missing \cs{space} after +% \changes{v0.92n}{2010/05/18}{Fixed missing \cs{space} after % non-empty Special Issue title % prefix.} % \begin{macro}{\specialissuetitle*} -% \changes{0.92n}{2010/05/18}{New.} +% \changes{v0.92n}{2010/05/18}{New.} % \begin{macro}{\specialissuetitleprefix} % If the current issue is a \emph{special issue}, the respective % title goes here. @@ -3091,7 +3118,7 @@ This work consists of all files listed in manifest.txt. % % \begin{macro}{\headmarkstyle} % \begin{macro}{\markhead} -% \changes{0.92d}{2010/01/20}{\cs{markboth} had to be renamed to +% \changes{v0.92d}{2010/01/20}{\cs{markboth} had to be renamed to % \cs{markhead} to avoid \pkg{biblatex}'s \cs{printbibliography} % putting ``REFERENCES'' into the page head.} % \begin{macro}{\markarticle} @@ -3736,7 +3763,7 @@ This work consists of all files listed in manifest.txt. % \end{macrocode} % % -% \changes{0.95i}{2011/04/06}{Affiliation adress for Reinhard Jung +% \changes{v0.95i}{2011/04/06}{Affiliation adress for Reinhard Jung % changed from \emph{University of Duisburg-Essen} to \emph{University % of St.\,Gallen}.} % \begin{macrocode} @@ -5945,7 +5972,7 @@ This work consists of all files listed in manifest.txt. % The macros in this subsection will supersede any previous definition % by the same name(s). % -% \changes{2010-06-21}{v0.93}{Modified to use EMISA name format.} +% \changes{v0.93}{2010/06/21}{Modified to use EMISA name format.} % \begin{bibmacro}{author} % \begin{macrocode} \renewbibmacro*{author}{% @@ -5971,7 +5998,7 @@ This work consists of all files listed in manifest.txt. % \end{bibmacro} % % -% \changes{2010-06-21}{v0.93}{Modified to use EMISA name format.} +% \changes{v0.93}{2010/06/21}{Modified to use EMISA name format.} % \begin{bibmacro}{bbx:editor} % \begin{macrocode} \renewbibmacro*{bbx:editor}[1]{% @@ -5998,7 +6025,7 @@ This work consists of all files listed in manifest.txt. % % % -% \changes{2010-06-21}{v0.93}{Modified to use EMISA name format.} +% \changes{v0.93}{2010/06/21}{Modified to use EMISA name format.} % \begin{bibmacro}{bbx:translator} % \begin{macrocode} \renewbibmacro*{bbx:translator}[1]{% diff --git a/Master/texmf-dist/source/latex/emisa/emisa.ins b/Master/texmf-dist/source/latex/emisa/emisa.ins index 84aed9da5de..523730559d1 100644 --- a/Master/texmf-dist/source/latex/emisa/emisa.ins +++ b/Master/texmf-dist/source/latex/emisa/emisa.ins @@ -9,9 +9,9 @@ %% If you absolutely have to change emisa.ins, please %% do so in emisa.dtx (after altering the name, of course!). %% -%% Copyright (C) 2009,2010,2011,2012 by Martin Wilhelm Leidig +%% Copyright (C) 2009-2012 by Martin Wilhelm Leidig %% <mwl@moss.in-berlin.de> -%% Copyright (C) 2015,2016,2017,2018 by Enterprise Modelling and Information +%% Copyright (C) 2015-2020 by Enterprise Modelling and Information %% Systems Architectures -- International Journal of Conceptual Modeling %% (EMISAJ) %% ------------------------------------------------------------------------ @@ -35,7 +35,6 @@ \askforoverwritefalse \askonceonly \showprogress -\askforoverwritetrue %%% \declarepreamble\biblatexpre @@ -59,9 +58,9 @@ it as you see fit. If you absolutely have to change \outFileName, please do so in \jobname.dtx (after altering the name, of course!). -Copyright (C) 2009,2010,2011,2012 by Martin Wilhelm Leidig +Copyright (C) 2009-2012 by Martin Wilhelm Leidig <mwl@moss.in-berlin.de> -Copyright (C) 2015,2016,2017,2018 by Enterprise Modelling and Information +Copyright (C) 2015-2020 by Enterprise Modelling and Information Systems Architectures -- International Journal of Conceptual Modeling (EMISAJ) ------------------------------------------------------------------------ diff --git a/Master/texmf-dist/tex/latex/emisa/emisa.cls b/Master/texmf-dist/tex/latex/emisa/emisa.cls index dc3804f165c..b51211ebcad 100644 --- a/Master/texmf-dist/tex/latex/emisa/emisa.cls +++ b/Master/texmf-dist/tex/latex/emisa/emisa.cls @@ -9,9 +9,9 @@ %% If you absolutely have to change emisa.cls, please %% do so in emisa.dtx (after altering the name, of course!). %% -%% Copyright (C) 2009,2010,2011,2012 by Martin Wilhelm Leidig +%% Copyright (C) 2009-2012 by Martin Wilhelm Leidig %% <mwl@moss.in-berlin.de> -%% Copyright (C) 2015,2016,2017,2018 by Enterprise Modelling and Information +%% Copyright (C) 2015-2020 by Enterprise Modelling and Information %% Systems Architectures -- International Journal of Conceptual Modeling %% (EMISAJ) %% ------------------------------------------------------------------------ @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{emisa}% -[2018/02/24 2.2.0 LaTeX class EMISA] +[2020/11/26 2.3.0 LaTeX class EMISA] \def\@clearglobaloption#1{% \def\@tempa{#1}% \def\@tempb{\@gobble}% @@ -76,6 +76,9 @@ \DeclareOption{noreferee}{\@refereefalse} \DeclareOption{review}{\@refereetrue} \DeclareOption{noreview}{\@refereefalse} +\newif\if@usecleveref +\DeclareOption{cleveref}{\@useclevereftrue} +\DeclareOption{nocleveref}{\@useclevereffalse} \newif\if@cover \def\coveron{\@covertrue} \def\coveroff{\@coverfalse} @@ -86,11 +89,8 @@ \DeclareOption{nomicrotype}{\@microtypefalse} \PassOptionsToClass{a4paper,twoside,11pt}{article}% \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}% -\ExecuteOptions{american,final,noreferee,nocover,oneside,openany}% +\ExecuteOptions{american,final,noreferee,nocover,cleveref,oneside,openany}% \ProcessOptions*\relax% -\IfFileExists{latexrelease.sty}% - {\RequirePackage[latest]{latexrelease}}% - {\RequirePackage{fixltx2e}}% \LoadClass{article}[2001/06/01]% \RequirePackage[utf8]{inputenc}% \RequirePackage[T1]{fontenc}% @@ -149,6 +149,8 @@ \RequirePackage{eso-pic}% \RequirePackage{placeins}% \RequirePackage{newtxtext} +\RequirePackage{amsmath} +\RequirePackage{amssymb} \RequirePackage{newtxmath} \RequirePackage[zerostyle=b,straightquotes]{newtxtt} \if@microtype @@ -173,7 +175,6 @@ \lstnewenvironment{sourcecode*}[1][] {\lstset{float=htbp,#1}} {} - \RequirePackage{amsmath} \RequirePackage[amsmath,standard,hyperref]{ntheorem} \RequirePackage{url} \urlstyle{same} @@ -190,7 +191,22 @@ urlcolor=black, hyperfootnotes=false ]{hyperref}% -\RequirePackage{doclicense} +\if@usecleveref% + \RequirePackage[capitalise,nameinlink]{cleveref} + \crefname{section}{Sec.}{Sec.} + \Crefname{section}{Sec.}{Sec.} + \crefname{figure}{\figurename}{\figurename} + \Crefname{figure}{\figurename}{\figurename} + \crefname{listing}{\lstlistingname}{\lstlistingname} + \Crefname{listing}{\lstlistingname}{\lstlistingname} + \crefname{table}{\tablename}{\tablename} + \Crefname{table}{\tablename}{\tablename} +\fi% +\RequirePackage[% + type={CC},% + modifier={by-nc-sa},% + version={4.0}% +]{doclicense} \begingroup \catcode`\Z=3 \long\gdef\@M@T@#1#2Z#3#4#5\@nil{#4} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index c033f1f0bd6..f02c046ac65 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3458,6 +3458,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'cprotect' => $standardclean . '|\.cpt', # temp files for doc 'dateiliste' => $standardclean . '|dateiliste.README*', # already in dist 'elvish' => '\.pk3', # no pk files + 'emisa' => $standardclean . '|\.brf$', 'enctex' => '\.ch|\.patch', # binary-related 'findhyph' => 'findhyph.pdf', # we generate 'fundus' => $standardclean . '|outline.sty', # in own package |