summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:35:15 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:35:15 +0000
commitc047122dd76be17f819bf86afd136bddf9f8c41f (patch)
treeb0068c3692a312dbad2025085e4e40bf0300d8dc /Master/texmf-dist/bibtex
parenta9aa077338c951ba3f5d90d923b4bb548dc7b3d8 (diff)
biblatex 1.6 2011/07/29
git-svn-id: svn://tug.org/texlive/trunk@23324 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst70
1 files changed, 42 insertions, 28 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 7e982cabc32..adc09d3fad3 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -1,4 +1,4 @@
-% $Id: biblatex.bst,v 1.5 2011/06/08 18:45:46 lehman stable $
+% $Id: biblatex.bst,v 1.6 2011/07/29 19:21:28 lehman stable $
% Copyright (c) 2006-2011 Philipp Lehman.
%
@@ -175,7 +175,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga
last.name last.hash last.year last.extra }
FUNCTION {initialize} {
- "$Revision: 1.5 $"
+ "$Revision: 1.6 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
"Biblatex version: " swap$ * top$
@@ -313,7 +313,7 @@ FUNCTION {truncate} {
if$
}
-FUNCTION {normalize} {
+FUNCTION {purify} {
duplicate$ empty$
{ pop$ "" }
{ purify$
@@ -328,6 +328,20 @@ FUNCTION {normalize} {
if$
}
+FUNCTION {normalize} {
+ duplicate$ empty$
+ { pop$ "" }
+ { ctrl.bibtex8
+ ctrl.cssort
+ and
+ 'skip$
+ { "l" change.case$ }
+ if$
+ truncate
+ }
+ if$
+}
+
FUNCTION {enquote} {
"'" swap$ * "'" *
}
@@ -381,7 +395,7 @@ FUNCTION {push:cite} {
FUNCTION {push:presort} {
presort empty$
{ "mm" }
- { presort normalize
+ { presort purify
#1 #2 substring$
"l" change.case$ }
if$
@@ -496,7 +510,7 @@ FUNCTION {shortname:hash} {
FUNCTION {push:name:namehash} {
push:shortname duplicate$ empty$
{ pop$ push:sorttitle duplicate$ empty$
- { pop$ push:cite normalize }
+ { pop$ push:cite purify }
'skip$
if$
}
@@ -507,7 +521,7 @@ FUNCTION {push:name:namehash} {
FUNCTION {push:name:fullhash} {
push:fullname duplicate$ empty$
{ pop$ push:sorttitle duplicate$ empty$
- { pop$ push:cite normalize }
+ { pop$ push:cite purify }
'skip$
if$
}
@@ -846,7 +860,7 @@ FUNCTION {sortkey:init:label} {
{ pop$ push:sorttitle }
{ check:sortname sortkey:name:format }
if$
- normalize 'sortkey.name :=
+ purify 'sortkey.name :=
sortyear empty$
{ dateyear
dateendyear empty$
@@ -864,8 +878,8 @@ FUNCTION {sortkey:init:label} {
}
{ sortyear }
if$
- normalize 'sortkey.year :=
- push:sorttitle normalize 'sortkey.title :=
+ purify 'sortkey.year :=
+ push:sorttitle purify 'sortkey.title :=
}
FUNCTION {sortkey:init:main} {
@@ -873,7 +887,7 @@ FUNCTION {sortkey:init:main} {
{ pop$ push:sorttitle }
{ check:sortname sortkey:name:format }
if$
- normalize 'sortkey.name :=
+ purify 'sortkey.name :=
}
FUNCTION {sortkey:main:string} {
@@ -882,19 +896,19 @@ FUNCTION {sortkey:main:string} {
sortkey.name delimiter.1 *
sortkey.title * delimiter.1 *
sortkey.year * delimiter.1 *
- volume normalize #4 pad.number * delimiter.1 *
+ volume purify #4 pad.number * delimiter.1 *
}
{ duplicate$ #2 =
{ pop$
sortkey.name delimiter.1 *
sortkey.year * delimiter.1 *
sortkey.title * delimiter.1 *
- volume normalize #4 pad.number * delimiter.1 *
+ volume purify #4 pad.number * delimiter.1 *
}
{ #3 =
{ sortkey.name delimiter.1 *
sortkey.year * delimiter.1 *
- volume normalize #4 pad.number * delimiter.1 *
+ volume purify #4 pad.number * delimiter.1 *
sortkey.title *
}
{ "" }
@@ -922,13 +936,13 @@ FUNCTION {sortkey:main:date} {
{ pop$
sortyear empty$
{ "9999" dateyear sortkey:main:date:year }
- { sortyear normalize }
+ { sortyear purify }
if$
}
{ #2 =
{ sortyear empty$
{ "0" dateyear sortkey:main:date:year }
- { sortyear normalize }
+ { sortyear purify }
if$
str.to.int #9999 swap$ - int.to.str$
}
@@ -938,7 +952,7 @@ FUNCTION {sortkey:main:date} {
if$
sortkey.name * delimiter.1 *
sortkey.title * delimiter.1 *
- volume normalize #4 pad.number * delimiter.1 *
+ volume purify #4 pad.number * delimiter.1 *
}
FUNCTION {sortkey:main} {
@@ -955,7 +969,7 @@ FUNCTION {sortkey:main} {
{ ctrl.sorting #20 <
{ shorthand empty$
{ sortkey.alpha * }
- { shorthand normalize * }
+ { shorthand purify * }
if$
delimiter.1 *
ctrl.sorting #10 - sortkey:main:string
@@ -966,7 +980,7 @@ FUNCTION {sortkey:main} {
{ sortkey }
if$
}
- { push:cite normalize }
+ { push:cite purify }
if$
}
if$
@@ -1227,7 +1241,7 @@ FUNCTION {output:write:list} {
#1 'tempctra :=
#1 'tempctrb :=
#0 'tempctrc :=
- { templist normalize tempctrb global.max$ substring$ num.names$ #0 > }
+ { templist purify tempctrb global.max$ substring$ num.names$ #0 > }
{ templist tempctrb #1 substring$ "{" =
{ tempctrc #1 + 'tempctrc :=
tempctrb #1 + 'tempctrb := }
@@ -1748,7 +1762,7 @@ FUNCTION {input:control:options} {
FUNCTION {input:control:version} {
input:control:parse
- "$Revision: 1.5 $"
+ "$Revision: 1.6 $"
#12 entry.max$ substring$
#-3 entry.max$ substring$
'tempstrga :=
@@ -2068,7 +2082,7 @@ FUNCTION {makelabel:alpha:format} {
}
FUNCTION {makelabel:alpha:year} {
- dateyear normalize
+ dateyear purify
#1 #4 substring$
#-1 #2 substring$
}
@@ -2136,7 +2150,7 @@ FUNCTION {makelabel:hash:format:full} {
FUNCTION {makelabel:ctrl:alpha} {
ctrl:labelalpha
{ label empty$
- { push:cite normalize #1 #3 substring$
+ { push:cite purify #1 #3 substring$
"u" change.case$ "t" change.case$ }
{ label makelabel:alpha:year * }
if$
@@ -2187,7 +2201,7 @@ FUNCTION {labelsort:main} {
ctrl:skiplab not
ctrl.singletitle ctrl.labelyear or
and
- { label.name normalize delimiter.1 *
+ { label.name purify delimiter.1 *
sortkey.year * delimiter.1 *
push:presort * delimiter.1 *
sortkey empty$
@@ -2234,10 +2248,10 @@ FUNCTION {labelsort:hash} {
namehash empty$
or
{ "zzzz" 'sort.key$ := }
- { namehash normalize delimiter.1 *
+ { namehash purify delimiter.1 *
push:shortname duplicate$ empty$
{ pop$ "zzzz" * }
- { sortkey:name:format normalize * }
+ { sortkey:name:format purify * }
if$
truncate 'sort.key$ :=
}
@@ -2249,10 +2263,10 @@ FUNCTION {labelsort:fullhash} {
fullhash empty$
or
{ "zzzz" 'sort.key$ := }
- { fullhash normalize delimiter.1 *
+ { fullhash purify delimiter.1 *
push:shortname duplicate$ empty$
{ pop$ "zzzz" * }
- { sortkey:name:format normalize * }
+ { sortkey:name:format purify * }
if$
truncate 'sort.key$ :=
}
@@ -2571,7 +2585,7 @@ SORT
FUNCTION {output:main:begin} {
"% $ biblatex auxiliary file $" write$ newline$
- "% $ biblatex version " "$Revision: 1.5 $"
+ "% $ biblatex version " "$Revision: 1.6 $"
#12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$
"% Do not modify the above lines!" write$ newline$
"%" write$ newline$