From 17e42b429cd221f11fd3fe35cf3209f8ab654bf8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Apr 2016 20:52:37 +0000 Subject: emisa (7apr16) git-svn-id: svn://tug.org/texlive/trunk@40326 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/emisa/README.md | 27 ++++--- Master/texmf-dist/doc/latex/emisa/emisa.pdf | Bin 423772 -> 425015 bytes Master/texmf-dist/doc/latex/emisa/manifest.txt | 2 +- Master/texmf-dist/source/latex/emisa/emisa.dtx | 101 ++++++++++++++++++++----- Master/texmf-dist/tex/latex/emisa/emisa.bbx | 51 +++++++++++-- Master/texmf-dist/tex/latex/emisa/emisa.cbx | 2 +- Master/texmf-dist/tex/latex/emisa/emisa.cls | 2 +- 7 files changed, 145 insertions(+), 40 deletions(-) diff --git a/Master/texmf-dist/doc/latex/emisa/README.md b/Master/texmf-dist/doc/latex/emisa/README.md index 442688600c8..b326f93963e 100644 --- a/Master/texmf-dist/doc/latex/emisa/README.md +++ b/Master/texmf-dist/doc/latex/emisa/README.md @@ -5,7 +5,7 @@ emisa -- A LaTeX package for preparing manuscripts for the journal EMISA Enterprise Modelling and Information Systems Architectures - An International Journal (EMISA) (c) 2015, 2016 -Version: 2.01 +Version: 2.1 Maintainer: Stefan Strecker and Martin Sievers Email: stefan.strecker@fernuni-hagen.de martin.sievers@schoenerpublizieren.de @@ -24,19 +24,24 @@ package managers of recent TeX distributions (e.g. “tlmgr” of the TeX Live distribution). Read emisa.pdf for author instructions and style guidelines. +``` -Change log: +## Changelog -2.01 to 2.0 -– Set uniquelist option to false in order to change the cite output -– Changed maxcitenames=3 to maxcitenames=2 -– Added \FloatBarrier from the placeins package at the end of the appendix -– Added tracking (5%) for smallcaps -– Moved special issue title below title in page header -– Modified insertion of license text +### 2.1 to 2.01 +* Fixed a bug introduced by incompatible changes of latest biblatex packages (>3.3) -2.0 Initial release of the completely reworked bundle +### 2.01 to 2.0 +* Set uniquelist option to false in order to change the cite output +* Changed maxcitenames=3 to maxcitenames=2 +* Added \FloatBarrier from the placeins package at the end of the appendix +* Added tracking (5%) for smallcaps +* Moved special issue title below title in page header +* Modified insertion of license text + +### 2.0 + +* Initial release of the completely reworked bundle -``` diff --git a/Master/texmf-dist/doc/latex/emisa/emisa.pdf b/Master/texmf-dist/doc/latex/emisa/emisa.pdf index a3811cdfb07..08f763ee86d 100644 Binary files a/Master/texmf-dist/doc/latex/emisa/emisa.pdf and b/Master/texmf-dist/doc/latex/emisa/emisa.pdf differ diff --git a/Master/texmf-dist/doc/latex/emisa/manifest.txt b/Master/texmf-dist/doc/latex/emisa/manifest.txt index a95c0a36ee3..421e8320cb3 100644 --- a/Master/texmf-dist/doc/latex/emisa/manifest.txt +++ b/Master/texmf-dist/doc/latex/emisa/manifest.txt @@ -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 06, 2016 (version 2.0) +March 31, 2016 (version 2.1) diff --git a/Master/texmf-dist/source/latex/emisa/emisa.dtx b/Master/texmf-dist/source/latex/emisa/emisa.dtx index 18d39584320..1fda96a0831 100644 --- a/Master/texmf-dist/source/latex/emisa/emisa.dtx +++ b/Master/texmf-dist/source/latex/emisa/emisa.dtx @@ -46,7 +46,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{emisa}% %<*class> -[2016/02/23 2.0.1 LaTeX class EMISA] +[2016/03/31 2.1 LaTeX class EMISA] % % %<*driver> @@ -498,6 +498,7 @@ This work consists of all files listed in manifest.txt. %^^A \DoNotIndex{\ifandothers}%%% %^^A \DoNotIndex{\ifbibxstring}%%% %^^A \DoNotIndex{\ifblank}%%% +%^^A \DoNotIndex{\ifempty}%%% %^^A \DoNotIndex{\iffieldequalstr}%%% %^^A \DoNotIndex{\iffieldequals}%%% %^^A \DoNotIndex{\iffieldundef}%%% @@ -962,6 +963,9 @@ This work consists of all files listed in manifest.txt. %\changes{v2.0.1}{2016/02/22}{Moved special issue title below title in page header} %\changes{v2.0.1}{2016/02/22}{Modified insertion of license text} %\changes{v2.0.1}{2016/02/23}{Special issue title now right aligned on even pages} +%\changes{v2.1}{2016/03/31}{Fix incompatible changes introduced by biblatex >3.3} +%\changes{v2.1}{2016/03/31}{Changed \string\ifblank to \string\ifempty because of wrong interpretations. Not sure, whether this is needed of older versions} +%\changes{v2.1}{2016/04/01}{Returned to \string\ifblank for the old versions} % % % @@ -4305,7 +4309,7 @@ This work consists of all files listed in manifest.txt. % \end{macrocode} % We start by declaring the file name and date. % \begin{macrocode} -\ProvidesFile{emisa.bbx}[2016/02/06 2.0 EMISA bibliography style] +\ProvidesFile{emisa.bbx}[2016/03/31 2.1 EMISA bibliography style] % \end{macrocode} % The \DTXclassname bibliography style is built on top of the standard style \file{authoryear.bbx} % being loaded here \ldots @@ -4679,29 +4683,85 @@ This work consists of all files listed in manifest.txt. % % % -% All the formatting directives for name lists get the following «arguments»: -% \begin{compactenum}[\#1{${}=$}] -% \item last name -% \item last name (initials) -% \item first name -% \item first name (initials) -% \item name prefix, a.k.a. `von part' -% \item name prefix (initials) -% \item name affix, a.k.a. `junior part' -% \item name affix (initials) -% \end{compactenum} -% % This declares the output format of name lists to be used by \cs{printnames}. +% +% Please note: We have to check the biblatex version, since there has been an incompatible change for version 3.3 from 2016/03/03 % \begin{macrocode} -\DeclareNameFormat{emisa:names}{% +\@ifpackagelater{biblatex}{2016/03/03}% +% \end{macrocode} +% Now for the latest versions +% \begin{macrocode} +{% + \DeclareNameFormat{emisa:names}{% + \nameparts{#1}% + \usebibmacro{name:family-giveninit}% + {\namepartfamily}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}% + \usebibmacro{name:andothers}}% +}% +% \end{macrocode} +% and now for the older versions +% All the formatting directives for name lists get the following «arguments»: +% \begin{compactenum}[\#1{${}=$}] + % \item last name + % \item last name (initials) + % \item first name + % \item first name (initials) + % \item name prefix, a.k.a. `von part' + % \item name prefix (initials) + % \item name affix, a.k.a. `junior part' + % \item name affix (initials) + % \end{compactenum} +% +% \begin{macrocode} +{% + \DeclareNameFormat{emisa:names}{% \usebibmacro{name:last-firstinit}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}} + \usebibmacro{name:andothers}}% +}% % \end{macrocode} % % This bibmacro formats the names of authors, editors or translators. % \begin{bibmacro}{name:last-firstinit} +% Again we check for the biblatex version. This could be neglected for this macro. However, it is clearer and maybe better for future development. +% \begin{macrocode} +\@ifpackagelater{biblatex}{2016/03/03}% +% \end{macrocode} +% Now for the latest versions +% \begin{macrocode} +{% + \newbibmacro*{name:family-giveninit}[4]{% + \usebibmacro{name:delim}{#2#3#1}% + \usebibmacro{name:hook}{#2#3#1}% +% \end{macrocode} +% Formatting: name prefix (`von part'), \ldots +% \begin{macrocode} + \ifempty{#3}{}{% + \mkbibnameprefix{#3}%\isdot + \ifprefchar% replaces \ifpunctmark{'}% + {}% + {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% +% \end{macrocode} +% \ldots\ last name \ldots % \begin{macrocode} -\newbibmacro*{name:last-firstinit}[4]{% + \mkbibnamefamily{#1}\addhighpenspace% +% \end{macrocode} +% \ldots\ name affix (`junior part'), \ldots +% \begin{macrocode} + \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}% +% \end{macrocode} +% \ldots\ and first name (initials). +% \begin{macrocode} + \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot}% + }% +}% +% \end{macrocode} +% and now for the older versions +% \begin{macrocode} +{% + \newbibmacro*{name:last-firstinit}[4]{% \usebibmacro{name:delim}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% % \end{macrocode} @@ -4709,13 +4769,13 @@ This work consists of all files listed in manifest.txt. % \begin{macrocode} \ifblank{#3}{}{% \mkbibnameprefix{#3}%\isdot - \ifpunctmark{'} + \ifpunctmark{'}% {} {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% % \end{macrocode} % \ldots\ last name \ldots % \begin{macrocode} - \mkbibnamelast{#1}\addhighpenspace + \mkbibnamelast{#1}\addhighpenspace% % \end{macrocode} % \ldots\ name affix (`junior part'), \ldots % \begin{macrocode} @@ -4725,6 +4785,7 @@ This work consists of all files listed in manifest.txt. % \begin{macrocode} \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot}% }% +}% % \end{macrocode} % \end{bibmacro} % @@ -5923,7 +5984,7 @@ techreport = {},% % \end{macrocode} % % \begin{macrocode} -\ProvidesFile{emisa.cbx}[2016/02/06 2.0 EMISA citation style] +\ProvidesFile{emisa.cbx}[2016/03/31 2.1 EMISA citation style] \RequireCitationStyle{authoryear-comp} \renewcommand*{\nameyeardelim}{\addspace} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/emisa/emisa.bbx b/Master/texmf-dist/tex/latex/emisa/emisa.bbx index 4e9d1b8a216..c945aa112f1 100644 --- a/Master/texmf-dist/tex/latex/emisa/emisa.bbx +++ b/Master/texmf-dist/tex/latex/emisa/emisa.bbx @@ -10,7 +10,7 @@ %% See there for more information. %% ------------------------------------------------------------------------ %% -\ProvidesFile{emisa.bbx}[2016/02/06 2.0 EMISA bibliography style] +\ProvidesFile{emisa.bbx}[2016/03/31 2.1 EMISA bibliography style] \RequireBibliographyStyle{authoryear} \newcommand*{\bibitemlabel}[1]{% \normalfont #1} @@ -97,21 +97,60 @@ \DeclareFieldFormat{version}{\bibcpstring{version}~#1} \DeclareFieldFormat{volume}{\bibcpstring{volume}~#1} \DeclareFieldFormat{volumes}{#1~\bibcpstring{volumes}} -\DeclareNameFormat{emisa:names}{% +\@ifpackagelater{biblatex}{2016/03/03}% +{% + \DeclareNameFormat{emisa:names}{% + \nameparts{#1}% + \usebibmacro{name:family-giveninit}% + {\namepartfamily}% + {\namepartgiveni}% + {\namepartprefix}% + {\namepartsuffix}% + \usebibmacro{name:andothers}}% +}% + % \item last name + % \item last name (initials) + % \item first name + % \item first name (initials) + % \item name prefix, a.k.a. `von part' + % \item name prefix (initials) + % \item name affix, a.k.a. `junior part' + % \item name affix (initials) + % \end{compactenum} +{% + \DeclareNameFormat{emisa:names}{% \usebibmacro{name:last-firstinit}{#1}{#4}{#5}{#7}% - \usebibmacro{name:andothers}} -\newbibmacro*{name:last-firstinit}[4]{% + \usebibmacro{name:andothers}}% +}% +\@ifpackagelater{biblatex}{2016/03/03}% +{% + \newbibmacro*{name:family-giveninit}[4]{% + \usebibmacro{name:delim}{#2#3#1}% + \usebibmacro{name:hook}{#2#3#1}% + \ifempty{#3}{}{% + \mkbibnameprefix{#3}%\isdot + \ifprefchar% replaces \ifpunctmark{'}% + {}% + {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% + \mkbibnamefamily{#1}\addhighpenspace% + \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}% + \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot}% + }% +}% +{% + \newbibmacro*{name:last-firstinit}[4]{% \usebibmacro{name:delim}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% \ifblank{#3}{}{% \mkbibnameprefix{#3}%\isdot - \ifpunctmark{'} + \ifpunctmark{'}% {} {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% - \mkbibnamelast{#1}\addhighpenspace + \mkbibnamelast{#1}\addhighpenspace% \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}% \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot}% }% +}% \renewbibmacro*{in:}{% \printtext{% \bibcpstring{in}% diff --git a/Master/texmf-dist/tex/latex/emisa/emisa.cbx b/Master/texmf-dist/tex/latex/emisa/emisa.cbx index e848215118c..fcf2d3e98ad 100644 --- a/Master/texmf-dist/tex/latex/emisa/emisa.cbx +++ b/Master/texmf-dist/tex/latex/emisa/emisa.cbx @@ -10,7 +10,7 @@ %% See there for more information. %% ------------------------------------------------------------------------ %% -\ProvidesFile{emisa.cbx}[2016/02/06 2.0 EMISA citation style] +\ProvidesFile{emisa.cbx}[2016/03/31 2.1 EMISA citation style] \RequireCitationStyle{authoryear-comp} \renewcommand*{\nameyeardelim}{\addspace} \DeclareRangeChars*{f} diff --git a/Master/texmf-dist/tex/latex/emisa/emisa.cls b/Master/texmf-dist/tex/latex/emisa/emisa.cls index 0b1d80b0d1a..7d09a357886 100644 --- a/Master/texmf-dist/tex/latex/emisa/emisa.cls +++ b/Master/texmf-dist/tex/latex/emisa/emisa.cls @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{emisa}% -[2016/02/23 2.0.1 LaTeX class EMISA] +[2016/03/31 2.1 LaTeX class EMISA] \def\@clearglobaloption#1{% \def\@tempa{#1}% \def\@tempb{\@gobble}% -- cgit v1.2.3