summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/emisa
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-07 20:52:37 +0000
committerKarl Berry <karl@freefriends.org>2016-04-07 20:52:37 +0000
commit17e42b429cd221f11fd3fe35cf3209f8ab654bf8 (patch)
tree7b33e6abf746dc92c99c40f58f4b47ac045fee09 /Master/texmf-dist/tex/latex/emisa
parent0db58e0ada1f7e2ca133f9ead01b3c9d64056175 (diff)
emisa (7apr16)
git-svn-id: svn://tug.org/texlive/trunk@40326 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/emisa')
-rw-r--r--Master/texmf-dist/tex/latex/emisa/emisa.bbx51
-rw-r--r--Master/texmf-dist/tex/latex/emisa/emisa.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/emisa/emisa.cls2
3 files changed, 47 insertions, 8 deletions
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}%