summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/LICENSE.md5
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/README.md (renamed from Master/texmf-dist/doc/latex/biblatex-ieee/README)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdfbin293556 -> 293179 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex10
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib8
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdfbin382210 -> 381166 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex17
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx93
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds8
12 files changed, 55 insertions, 110 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/LICENSE.md b/Master/texmf-dist/doc/latex/biblatex-ieee/LICENSE.md
new file mode 100644
index 00000000000..69cdc42a1a3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/LICENSE.md
@@ -0,0 +1,5 @@
+Released under the [LaTeX Project Public
+License](http://www.latex-project.org/lppl.txt), v1.3c or later.
+
+The package has status 'maintained': the current maintainer is
+[Joseph Wright](joseph.wright@morningstar2.co.uk). \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/README b/Master/texmf-dist/doc/latex/biblatex-ieee/README.md
index aa92af32a72..aa92af32a72 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/README
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/README.md
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
index 25a678215ff..eae04241246 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
index 5e33aaa819a..6364001dd55 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
@@ -11,7 +11,7 @@
\documentclass[a4paper]{ltxdoc}
\usepackage{lmodern}
\usepackage[T1]{fontenc}
-\usepackage[style=ieee-alphabetic,backend=bibtex]{biblatex}
+\usepackage[style=ieee-alphabetic,backend=biber]{biblatex}
\usepackage[final]{microtype}
\usepackage{csquotes}
\usepackage{hyperref}
@@ -24,8 +24,8 @@
\href{mailto:joseph.wright@morningstar2.co.uk}
{\texttt{joseph.wright@morningstar2.co.uk}}}}
\title{The \pkg{ieee-alphabetic} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.1k, last revised 52015/03/12.}}
-\date{Released 2015/03/12}
+ \footnote{This file describes v1.1m, last revised 2016/04/16.}}
+\date{Released 2016/04/16}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -55,7 +55,7 @@ of example citations.
\end{document}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -78,4 +78,4 @@ of example citations.
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `biblatex-ieee.tex'. \ No newline at end of file
+%% End of file `biblatex-ieee.tex'.
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
index 1dc0706f5e0..5c0ef49c809 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
@@ -99,7 +99,7 @@
}
@inbook{IEEEexample:repeatedauthorone,
- author = "W. Dai and H. V. Pham and and O. Milenkovic",
+ author = "W. Dai and H. V. Pham and O. Milenkovic",
title = "Distortion-rate functions for quantized compressive sensing",
booktitle =
"IEEE Information Theory Workshop on Networking and Information Theory",
@@ -107,7 +107,7 @@
}
@inbook{IEEEexample:repeatedauthortwo,
- author = "W. Dai and H. V. Pham and and O. Milenkovic",
+ author = "W. Dai and H. V. Pham and O. Milenkovic",
title = "comparative study of quantized compressive sensing schemes",
booktitle =
"IEEE Information Theory Workshop on Networking and Information Theory",
@@ -386,7 +386,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright at morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -409,4 +409,4 @@
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `biblatex-ieee.bib'. \ No newline at end of file
+%% End of file `biblatex-ieee.bib'.
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
index 41d1ae527a8..0d5d51e3c2b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
index 2eca5456b27..5027982a8a7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
@@ -11,7 +11,7 @@
\documentclass[a4paper]{ltxdoc}
\usepackage{lmodern}
\usepackage[T1]{fontenc}
-\usepackage[style=ieee,backend=bibtex]{biblatex}
+\usepackage[style=ieee,backend=biber]{biblatex}
\usepackage[final]{microtype}
\usepackage{csquotes}
\usepackage{hyperref}
@@ -24,8 +24,8 @@
\href{mailto:joseph.wright@morningstar2.co.uk}
{\texttt{joseph.wright@morningstar2.co.uk}}}}
\title{The \pkg{ieee} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.1k last revised 2015/03/12.}}
-\date{Released 2015/03/12}
+ \footnote{This file describes v1.1m last revised 2016/04/16.}}
+\date{Released 2016/04/16}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -78,12 +78,14 @@ It is demonstrated in the accompany \textsc{pdf} file
Suggestions for improvement and bug reports can be logged in the package
issue database, found at
-\url{https://github.com/josephwright/biblatex-ieee/issues/issues}, or can
+\url{https://github.com/josephwright/biblatex-ieee/issues/}, or can
be sent by e-mail to
\href{mailto:joseph.wright@morningstar2.co.uk}
{\texttt{joseph.wright@morningstar2.co.uk}}.
\nocite{*}
+\cite{IEEEexample:incollectionwithseries,IEEEexample:bookwitheditor}
+
\printbibliography
\changes{v1.0}{2011/02/27}{First stable release}
@@ -116,13 +118,16 @@ be sent by e-mail to
\changes{v1.1j}{2013/10/25}{Update \cs{textcite} code for \pkg{biblatex}~v2.7}
\changes{v1.1j}{2013/10/25}{Correctly format multi-part page ranges}
\changes{v1.1k}{2015/03/12}{Capitalise after colon in titles}
+\changes{v1.1l}{2015/03/25}{Respect braces for capitalisation in titles}
+\changes{v1.1m}{2016/04/06}{Track \pkg{biblatex} changes}
+\changes{v1.1m}{2016/04/16}{Much simplified citation style approach}
\PrintChanges
\end{document}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -145,4 +150,4 @@ be sent by e-mail to
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `biblatex-ieee.tex'. \ No newline at end of file
+%% End of file `biblatex-ieee.tex'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
index dff2af68458..7947685f548 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.bbx}[2015/03/12 v1.1k biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2016/04/16 v1.1m biblatex bibliography style]
\RequireBibliographyStyle{ieee}
@@ -53,7 +53,7 @@
{\item}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -76,4 +76,4 @@
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `ieee-alphabetic.bbx'. \ No newline at end of file
+%% End of file `ieee-alphabetic.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
index 23d35f3cc8d..5194faa5718 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.cbx}[2015/03/12 v1.1k biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2016/04/16 v1.1m biblatex citation style]
\RequireCitationStyle{alphabetic}
@@ -45,7 +45,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
index 2494dc05c9b..e0e3092c47d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
@@ -8,14 +8,14 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.bbx}[2015/03/12 v1.1k biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2016/04/16 v1.1m biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
% Alter settings that carry through from biblatex
\ExecuteBibliographyOptions{
- firstinits,
+ giveninits,
maxnames = 999,
minnames = 3,
sorting = none
@@ -464,15 +464,15 @@
% {<process>} {<text>}
\newcommand*{\bbx@colon@search}[2]{%
- \bbx@colon@search@aux#1#2: \stop
+ \bbx@colon@search@aux#1\empty#2: \stop
}
\long\def\bbx@colon@search@aux#1#2: #3\stop{%
- #1{#2}%
+ \expandafter#1\expandafter{#2}%
\ifblank{#3}
{}
{%
: %
- \bbx@colon@search@aux#1#3\stop
+ \bbx@colon@search@aux#1\empty#3\stop
}%
}
@@ -806,7 +806,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -829,4 +829,4 @@
%% biblatex-ieee-alphabetic.pdf.
%%
%%
-%% End of file `ieee.bbx'. \ No newline at end of file
+%% End of file `ieee.bbx'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
index a06fcdab0f0..9849a2469fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.cbx}[2015/03/12 v1.1k biblatex citation style]
+\ProvidesFile{ieee.cbx}[2016/04/16 v1.1m biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -18,91 +18,24 @@
sorting = none
}
-% Putting brackets around each citation number is a two-part
-% operation. First, remove them from around the whole citation by
-% redeclaring here.
\DeclareCiteCommand{\cite}%
- {\usebibmacro{cite:init}%
- \bibopenbracket
- \usebibmacro{prenote}}
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}%
- \usebibmacro{postnote}%
- \bibclosebracket
- }
-
-% The second part if more awkward. To add brackets, we cannot use labelnumber
-% as the biblatex kernel does not do a great job on the difference between it
-% and labelnumberwidth! So instead we tackle the issue here, but that means
-% a bit of copy-paste work.
-\renewbibmacro*{cite:comp:comp}{%
- \ifboolexpr{
- ( test {\iffieldundef{prefixnumber}} and test {\ifundef\cbx@lastprefix} )
- or
- test {\iffieldequals{prefixnumber}{\cbx@lastprefix}}
- }
- {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}}
- {\savefield{entrykey}{\cbx@lastkey}%
- \savefield{labelnumber}{\cbx@lastnumber}%
- \addtocounter{cbx@tempcnta}{1}}
- {\ifnumequal{\thefield{labelnumber}}{\value{cbx@tempcntb}-1}
- {}
- {\usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}}}}}}
- {\usebibmacro{cite:comp:end}}%
- \setcounter{cbx@tempcntb}{\thefield{labelnumber}}%
- \savefield{prefixnumber}{\cbx@lastprefix}}
-
-\renewbibmacro*{cite:comp:end}{%
- \usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}}}}
-
-\renewbibmacro*{cite:comp:inset}{%
- \usebibmacro{cite:dump}%
- \ifnumgreater{\value{cbx@tempcntb}}{-1}
- {\bibclosebracket\multicitedelim\bibopenbracket}
- {}%
- \printtext{\printtext[bibhyperref]{%
- \printfield{prefixnumber}%
- \printfield{labelnumber}%
- \printfield{entrysetcount}}}%
- \setcounter{cbx@tempcntb}{-1}}
-
-\renewbibmacro*{cite:dump}{%
- \ifnumgreater{\value{cbx@tempcnta}}{0}
- {%
- \bibclosebracket
- \ifnumgreater{\value{cbx@tempcnta}}{1}
- {\bibrangedash}
- {\multicitedelim}%
- \bibopenbracket
- \bibhyperref[\cbx@lastkey]{%
- \ifdef\cbx@lastprefix
- {\printtext[prefixnumber]{\cbx@lastprefix}}
- {}%
- \printtext{\cbx@lastnumber}}}
- {}%
- \setcounter{cbx@tempcnta}{0}%
- \global\undef\cbx@lastprefix}
-
+ {}% % precode
+ {\bibopenbracket% % loopcode
+ \usebibmacro{prenote}%
+ \usebibmacro{cite:init}%
+ \usebibmacro{citeindex}%
+ \usebibmacro{cite:comp}%
+ \usebibmacro{cite:dump}%
+ \usebibmacro{postnote}%
+ \bibclosebracket}%
+ {\multicitedelim}% % sepcode
+ {}% % postcode
% More bracket removal required
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
%%
-%% Copyright (C) 2011-2013,2015 by
+%% Copyright (C) 2011-2013,2015,2016 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index db406071b46..c74013f595d 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1416,7 +1416,8 @@ $standardfmt='latex';
# packages which need special .tex/.sty files installed
-$standardtex='\.(.bx|4ht|cfg|clo|cls|cmap|def|code\.tex|fd|fontspec|ldf|sty)$';
+$standardtex = '(\.(.bx|4ht|cls|clo|cmap|code\.tex|def|fd|fontspec|ldf|sty)'
+ . '|.*[^c]\.cfg)$'; # not ltxdoc.cfg
%specialtex = (
'2up', '2up\.tex|' . $standardtex,
'FAQ-en', 'NULL',
@@ -1446,7 +1447,7 @@ $standardtex='\.(.bx|4ht|cfg|clo|cls|cmap|def|code\.tex|fd|fontspec|ldf|sty)$';
'bclogo', 'bc[^l].*\.(tex|pdf|eps|mps)|bclogo\.sty',
'beamer2thesis','\.jpg|' . $standardtex,
'bghyphen', '\.tex',
- 'bgteubner', '\.sty|\.cls|[^c]\.cfg', # not ltxdoc.cfg
+# 'bgteubner', '\.sty|\.cls|[^c]\.cfg', # not ltxdoc.cfg
'biblatex-gost', '\.(.bx|def|)$', # not .cfg
'bibtex', 'apalike\..*|' . $standardtex,
'bidi', '^bidi\.tex|' . $standardtex,
@@ -2141,7 +2142,8 @@ $standarddocfmt='latex';
$standardsourcefmt='latex';
-$standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
+$standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)'
+ . '|configure.*|install-sh|ltxdoc\.cfg)$';
%specialsource= (
'FAQ-en', 'NULL',
'ae', '\.mtx|\.etx|\.tex|clean|go|install|makepl',