From e21c9571155f291cb0cf82705c495d87e0b5e60d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 13 May 2011 22:25:11 +0000
Subject: biblatex 1.4c (13may11)

git-svn-id: svn://tug.org/texlive/trunk@22460 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/biblatex/biblatex.def | 50 ++++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/biblatex/biblatex.def')

diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index b3e9850c454..7f26388c9db 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.4b 2011/04/12 21:10:58 lehman stable $
+% $Id: biblatex.def,v 1.4c 2011/05/12 18:28:32 lehman stable $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.4b 2011/04/12 21:10:58 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.4c 2011/05/12 18:28:32 lehman stable $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -81,9 +81,9 @@
   \interlinepenalty=5000\relax
   \widowpenalty=10000\relax
   \clubpenalty=10000\relax
-  \biburlsetup
   \raggedbottom
-  \frenchspacing}
+  \frenchspacing
+  \biburlsetup}
 
 % The penalties above are not specific to biblatex. These are
 % low-level TeX features. \interlinepenalty is the penalty assigned
@@ -117,31 +117,33 @@
 % \citesetup is a generic hook for citations.
 
 \newcommand*{\citesetup}{%
-  \biburlsetup
-  \frenchspacing}
+  \frenchspacing
+  \biburlsetup}
 
 % Local setup for \url; see comments in url.sty for details.
 
 \newcommand*{\biburlsetup}{%
-  \Urlmuskip=0mu plus 2mu\relax
-  \mathchardef\UrlBreakPenalty=200\relax
+  \Urlmuskip=0mu plus 3mu\relax
   \mathchardef\UrlBigBreakPenalty=100\relax
-  \mathchardef\UrlEmergencyPenalty=9000\relax
-  \appto\UrlSpecials{%
-    \do\0{\mathchar`\0\penalty\UrlEmergencyPenalty}%
-    \do\1{\mathchar`\1\penalty\UrlEmergencyPenalty}%
-    \do\2{\mathchar`\2\penalty\UrlEmergencyPenalty}%
-    \do\3{\mathchar`\3\penalty\UrlEmergencyPenalty}%
-    \do\4{\mathchar`\4\penalty\UrlEmergencyPenalty}%
-    \do\5{\mathchar`\5\penalty\UrlEmergencyPenalty}%
-    \do\6{\mathchar`\6\penalty\UrlEmergencyPenalty}%
-    \do\7{\mathchar`\7\penalty\UrlEmergencyPenalty}%
-    \do\8{\mathchar`\8\penalty\UrlEmergencyPenalty}%
-    \do\9{\mathchar`\9\penalty\UrlEmergencyPenalty}}%
+  \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\UrlBigBreaks{\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}
 
 % The above code allows linebreaks after numbers as a last resort.
 % This is often the only way to break DOIs. It also allows breaks
@@ -889,17 +891,17 @@
     {\protected@edef\theindexentry{%
        \unexpanded{#1}{%
          \ifblank{#4}{}{#4 }%
-         \expandonce{\@firstofone #2}% remove spurious braces
+         \@firstofone #2% remove spurious braces
          \ifblank{#5}{}{ #5}%
          \ifblank{#3}{}{, #3}%
          \actualoperator
-         \ifblank{#4}{}{\unexpanded{\MakeCapital{#4}} }%
+         \ifblank{#4}{}{\MakeCapital{#4} }%
          #2%
          \ifblank{#5}{}{ #5}%
          \ifblank{#3}{}{, #3}}}}
     {\protected@edef\theindexentry{%
        \unexpanded{#1}{%
-         \expandonce{\@firstofone #2}% remove spurious braces
+         \@firstofone #2% remove spurious braces
          \ifblank{#5}{}{ #5}%
          \ifblank{#3#4}{}{,}%
          \ifblank{#3}{}{ #3}%
-- 
cgit v1.2.3

