summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex/biblatex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-14 23:55:19 +0000
committerKarl Berry <karl@freefriends.org>2011-11-14 23:55:19 +0000
commita29c7813b0314e553b69c72ed2b6a88b57cc1e20 (patch)
tree16337cec204b13e6cbda22ac470ddb16cc880a03 /Master/texmf-dist/tex/latex/biblatex/biblatex.def
parent389fcf38bf3f3a413329dc89f7381a1b53d25561 (diff)
biblatex 1.7 (14nov11)
git-svn-id: svn://tug.org/texlive/trunk@24596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex/biblatex.def42
1 files changed, 25 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index fe50dcacf90..89b815e8134 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $
+% $Id: biblatex.def,v 1.7 2011/11/13 19:09:07 lehman stable $
\ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.6 2011/07/29 19:21:28 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.7 2011/11/13 19:09:07 lehman stable $
biblatex generic definitions]
% ------------------------------------------------------------------
@@ -43,6 +43,7 @@
\newcommand*{\postnotedelim}{\addcomma\space}
\newcommand*{\nametitledelim}{\addcomma\space}
\newcommand*{\nameyeardelim}{\addspace}
+\newcommand*{\volcitedelim}{\addcomma\space}
% Used in the bibliography and the list of shorthands
@@ -122,28 +123,35 @@
% Local setup for \url; see comments in url.sty for details.
+\newcounter{biburlnumpenalty}
+\newcounter{biburlucpenalty}
+\newcounter{biburllcpenalty}
+
\newcommand*{\biburlsetup}{%
\Urlmuskip=0mu plus 3mu\relax
\mathchardef\UrlBigBreakPenalty=100\relax
\mathchardef\UrlBreakPenalty=200\relax
- \mathchardef\UrlNumberPenalty=3000\relax
- \mathchardef\UrlUppercasePenalty=6000\relax
- \mathchardef\UrlLowercasePenalty=9000\relax
\def\UrlBigBreaks{\do\:\do\-}%
\def\UrlBreaks{%
\do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}%
\do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}%
- \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlNumberPenalty\mathchar`##1 }}}%
- \do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9\do\0%
- \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlUppercasePenalty\mathchar`##1 }}}%
- \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J
- \do\K\do\L\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T
- \do\U\do\V\do\W\do\X\do\Y\do\Z
- \def\do##1{\appto\UrlSpecials{\do##1{\penalty\UrlLowercasePenalty\mathchar`##1 }}}%
- \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j
- \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t
- \do\u\do\v\do\w\do\x\do\y\do\z
- \let\do\noexpand}
+ \ifnumgreater{\value{biburlnumpenalty}}{0}
+ {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburlnumpenalty}}}}%
+ \do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9\do\0}
+ {}%
+ \ifnumgreater{\value{biburlucpenalty}}{0}
+ {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburlucpenalty}}}}%
+ \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J
+ \do\K\do\L\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T
+ \do\U\do\V\do\W\do\X\do\Y\do\Z}
+ {}%
+ \ifnumgreater{\value{biburllcpenalty}}{0}
+ {\def\do##1{\appto\UrlSpecials{\do##1{\mathchar`##1 \penalty\value{biburllcpenalty}}}}%
+ \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j
+ \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t
+ \do\u\do\v\do\w\do\x\do\y\do\z}
+ {}%
+ \let\do=\noexpand}
% The above code allows linebreaks before numbers and letters.
% This is often the only way to break DOIs. It also allows breaks
@@ -2271,7 +2279,7 @@
\iffieldundef{urlyear}
{}
{\setunit*{\addspace}%
- \printtext[urldate]{\printurldate}}}
+ \printurldate}}
\newbibmacro*{pageref}{%
\iflistundef{pageref}