summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.pdfbin292980 -> 293433 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.tex4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.pdfbin383413 -> 383838 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.tex4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.cbx71
-rw-r--r--macros/latex/contrib/edichokey/edichokey-doc-en.pdfbin63825 -> 65165 bytes
-rw-r--r--macros/latex/contrib/edichokey/edichokey-doc-en.tex12
-rw-r--r--macros/latex/contrib/edichokey/edichokey-ex.pdfbin54358 -> 66474 bytes
-rw-r--r--macros/latex/contrib/edichokey/edichokey-ex.tex2
-rw-r--r--macros/latex/contrib/edichokey/edichokey.sty26
13 files changed, 95 insertions, 30 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.pdf
index 9c68afbe9f..845f7226c8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.tex
index 7e31b59fec..89e0024acf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee-alphabetic.tex
@@ -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.3b, last revised 2020/02/26.}}
-\date{Released 2020/02/26}
+ \footnote{This file describes v1.3c, last revised 2020/08/31.}}
+\date{Released 2020/08/31}
\providecommand*{\pkg}[1]{\textsf{#1}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.pdf
index 755c602842..e57ebf5c87 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.tex
index 256aa00657..1182cd1fe1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/biblatex-ieee.tex
@@ -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.3b, last revised 2020/02/26.}}
-\date{Released 2020/02/26}
+ \footnote{This file describes v1.3c, last revised 2020/08/31.}}
+\date{Released 2020/08/31}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.bbx
index c305a2686a..b2654804e2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.bbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.bbx}[2020/02/26 v1.3b biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2020/08/31 v1.3c biblatex bibliography style]
\RequireBibliographyStyle{ieee}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.cbx
index ea8ab90488..be1fc4136a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee-alphabetic.cbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.cbx}[2020/02/26 v1.3b biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2020/08/31 v1.3c biblatex citation style]
\RequireCitationStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.bbx
index f3a6169de0..faeae9a597 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.bbx
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.bbx}[2020/02/26 v1.3b biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2020/08/31 v1.3c biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.cbx
index 16ac2f44d4..e4f422b494 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ieee/ieee.cbx
@@ -1,14 +1,14 @@
%% ---------------------------------------------------------------
-%% biblatex-ieee --- A biblatex implementation of the IEEE
+%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
+%%
-\ProvidesFile{ieee.cbx}[2020/02/26 v1.3b biblatex citation style]
+\ProvidesFile{ieee.cbx}[2020/08/31 v1.3c biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -33,7 +33,9 @@
\bibclosebracket
}
-% The second step is to replace \multicitedelim with a version wrapped in
+
+% The second step is to replace \multicitedelim and
+% \multicitesubentrydelim with a version wrapped in
% the appropriate delimiter.
\renewcommand*{\do}[1]{%
\expandafter\patchcmd\expandafter
@@ -45,35 +47,76 @@
\PackageError{biblatex-ieee}{Failed to update citation style}\@ehc
}%
}
-\docsvlist{cite:comp:comp,cite:comp:end,cite:comp:inset,cite:dump}
+\docsvlist{cite:comp:end,cite:comp:inset,cite:comp:shand,cite:dump}
+
+\renewcommand*{\do}[1]{%
+ \expandafter\patchcmd\expandafter
+ {\csname abx@macro@\detokenize{#1}\endcsname}%
+ {\multicitesubentrydelim}
+ {\bibclosebracket\multicitesubentrydelim\bibopenbracket}
+ {}
+ {%
+ \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc
+ }%
+ }
+\docsvlist{cite:comp:inset,cite:dump:inset}
-% There's also one \bibrangedash to alter.
+
+% There's also one \multiciterangedelim and one
+% \multicitesubentryrangedelimto alter.
\expandafter\patchcmd\expandafter
{\csname abx@macro@\detokenize{cite:dump}\endcsname}%
- {\bibrangedash}
- {\bibclosebracket\bibrangedash\bibopenbracket}
+ {\multiciterangedelim}
+ {\bibclosebracket\multiciterangedelim\bibopenbracket}
{}
{%
\PackageError{biblatex-ieee}{Failed to update citation style}\@ehc
}%
+\expandafter\patchcmd\expandafter
+ {\csname abx@macro@\detokenize{cite:dump:inset}\endcsname}%
+ {\multicitesubentryrangedelim}
+ {\bibclosebracket\multicitesubentryrangedelim\bibopenbracket}
+ {}
+ {%
+ \PackageError{biblatex-ieee}{Failed to update citation style}\@ehc
+ }%
+
+
% More bracket removal required
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
-%%
+% print labelnumber for compressed set entries
+\renewbibmacro*{cite:print:subentry:comp}{%
+ \printtext[bibhyperref]{%
+ \printfield{labelprefix}%
+ \printfield{labelnumber}%
+ \printfield{entrysetcount}}}
+
+\renewbibmacro*{cite:print:last:subentry:comp}{%
+ \printtext[bibhyperref:lastkey]{%
+ \ifdef\cbx@lastprefix
+ {\printtext[labelprefix]{\cbx@lastprefix}}
+ {}%
+ \printtext[labelnumber]{\cbx@lastnumber}%
+ \ifdef\cbx@lastentrysetcount
+ {\printtext[entrysetcount]{\cbx@lastentrysetcount}}
+ {}}}
+
+%%
%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
-%%
+%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
+%%
%% http://www.latex-project.org/lppl.txt
-%%
+%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
-%%
+%%
%% This work consists of the files biblatex-ieee.bib,
%% biblatex-ieee.tex,
%% ieee.bbx,
@@ -83,6 +126,6 @@
%% magyar-ieee.lbx,
%% and the derived files biblatex-ieee.pdf and
%% biblatex-ieee-alphabetic.pdf.
-%%
+%%
%%
%% End of file `ieee.cbx'.
diff --git a/macros/latex/contrib/edichokey/edichokey-doc-en.pdf b/macros/latex/contrib/edichokey/edichokey-doc-en.pdf
index a5c89f264d..61f6e26e19 100644
--- a/macros/latex/contrib/edichokey/edichokey-doc-en.pdf
+++ b/macros/latex/contrib/edichokey/edichokey-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/edichokey/edichokey-doc-en.tex b/macros/latex/contrib/edichokey/edichokey-doc-en.tex
index 211fbbeb26..c10b961d2d 100644
--- a/macros/latex/contrib/edichokey/edichokey-doc-en.tex
+++ b/macros/latex/contrib/edichokey/edichokey-doc-en.tex
@@ -51,8 +51,8 @@
\ for dichotomous identification keys}
\author{\zh{杨宇昌} (Yuchang \textsc{Yang})%
\footnote{Email address: \url{yang.yc.allium@gmail.com}.}}
-\date{July \nth{14}, 2020\qquad ver.~2.00}
-
+\date{August \nth{31}, 2020\qquad ver.~2.01y}
+\hypersetup{hidelinks}
\frenchspacing
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -127,10 +127,12 @@ Here a simple demo is presented, showing how to use the package \pkgname{edichok
A larger example key containing 107 \textit{Allium} species is provided separatedly in the package as file \texttt{edichokey-ex.tex}, which was taken almost verbatim from \textit{Flora of North America} (see the file for full citation; reusable under CC BY license\footnote{Re-use terms of FNA: \url{http://beta.floranorthamerica.org/Copyright}.}), except that the two branches at the base (led by alternatives with number 1) were exchanged (but its meaning stayed the same). This example, in the given order, cannot be constructed with \pkgname{dichokey}.
-Apart from the modification on the algorithm, \pkgname{edichokey} behaves differently from \pkgname{dichokey} in two more aspects:
+The package option $hyperref$ (type $\string\usepackage[hyperref]\{edichokey\}$ instead of $\string\usepackage\{edichokey\}$) can make the output key in PDF file easier to use on electronic devices: conjugated alternatives in a key will be hyperlinked to each other, so a reader can jump quickly by clicking their numbers. However, to apply this feature, the source file is required to be compiled twice.
+
+Apart from the mentioned modifications, \pkgname{edichokey} behaves differently from \pkgname{dichokey} in two more aspects:
{\parskip-5pt
\begin{itemize}
- \parskip0pt\itemsep2pt
+ \parskip0pt\itemsep0pt
\item Dots connecting an alternative and a taxon can be wrapped into two lines;
\item All alternatives (maybe with following dots) are wrapped at $\string\righttaxonskip$ length (by default $2em$) from the right margin, leaving only the keyed out taxa reaching the true right boundary.
\end{itemize}}
@@ -141,6 +143,8 @@ Apart from the modification on the algorithm, \pkgname{edichokey} behaves differ
\parskip=0pt
\parindent=0pt
\begin{description}[style=nextline]
+ \item[ver. 2.01y (2020.8.31)]
+ Package option $hyperref$ added.
\item[ver. 2.00 (2020.7.14)]
Package renamed as \pkgname{edichokey}. \\
Documentation in English finished. \\
diff --git a/macros/latex/contrib/edichokey/edichokey-ex.pdf b/macros/latex/contrib/edichokey/edichokey-ex.pdf
index 9711e1c6df..be47d32cb5 100644
--- a/macros/latex/contrib/edichokey/edichokey-ex.pdf
+++ b/macros/latex/contrib/edichokey/edichokey-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/edichokey/edichokey-ex.tex b/macros/latex/contrib/edichokey/edichokey-ex.tex
index 25d0c8b51e..0e70f152f1 100644
--- a/macros/latex/contrib/edichokey/edichokey-ex.tex
+++ b/macros/latex/contrib/edichokey/edichokey-ex.tex
@@ -34,7 +34,7 @@
\documentclass[a4paper]{article}
\usepackage[margin=25mm]{geometry}
-\usepackage{edichokey}
+\usepackage[hyperref]{edichokey}
\def\var{\textup{var.} }
\frenchspacing
diff --git a/macros/latex/contrib/edichokey/edichokey.sty b/macros/latex/contrib/edichokey/edichokey.sty
index 1b927eadaf..c4dee913c4 100644
--- a/macros/latex/contrib/edichokey/edichokey.sty
+++ b/macros/latex/contrib/edichokey/edichokey.sty
@@ -19,15 +19,20 @@
% - the example files: [edichokey-ex.tex, edichokey-ex.pdf].
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{edichokey}[2020/07/14 v2.00 package edichokey]
+\ProvidesPackage{edichokey}[2020/08/31 v2.01y package edichokey]
\makeatletter
\def\edk@get@array#1{\csname edk@array@#1\endcsname}
\def\edk@set@array#1#2{\expandafter\xdef\csname edk@array@#1\endcsname{#2}}
\newif\if@edk@named@
+\newif\if@edk@hyperref@\@edk@hyperref@false
+\DeclareOption{hyperref}{\@edk@hyperref@true}
+\ProcessOptions
+\RequirePackage{hyperref}
\newdimen\alterindent\alterindent1.2em
\newdimen\taxonrightskip\taxonrightskip2em
\newdimen\edk@leftskip
\newbox\edk@header
+\newcount\edk@key
\newcount\edk@depth
\newcount\edk@couplet
\def\edknamestyle{\bfseries\itshape}
@@ -50,8 +55,12 @@
\def\dot@line{%
\unskip\dot@fill{0pt plus 1fil}\penalty150%
\null\nobreak\dot@fill{12pt plus 1fill}}
-\newenvironment{Key}
- {\edk@depth\z@
+\newenvironment{Key}{%
+ \global\advance\edk@key\@ne
+ \if@edk@hyperref@
+ \hypersetup{hidelinks=true}%
+ \fi
+ \edk@depth\z@
\edk@couplet\z@
\parindent\z@
\advance\rightskip\taxonrightskip
@@ -82,8 +91,17 @@
\xdef\edk@number{\the\edk@couplet}%
\edk@set@array{\the\edk@depth}{\the\edk@couplet}%
\fi
+ \if@edk@hyperref@
+ \def\edk@hyp@prefix{edichokey:\the\edk@key:\edk@number:}
+ \edef\edk@hyp@this{\edk@hyp@prefix\if@edk@named@ b\else a\fi}%
+ \edef\edk@hyp@that{\edk@hyp@prefix\if@edk@named@ a\else b\fi}%
+ \def\edk@hyp@make##1{%
+ \phantomsection\label{\edk@hyp@this}\hyperref[\edk@hyp@that]{##1}}%
+ \else
+ \def\edk@hyp@make##1{##1}%
+ \fi
\@edk@named@false
\sbox\edk@header{\edk@number.~}%
\leftskip\dimexpr\edk@leftskip+\edk@depth\alterindent+\wd\edk@header\relax
- \indent\llap{\box\edk@header}}
+ \indent\edk@hyp@make{\llap{\box\edk@header}}}
\makeatother