diff options
author | Karl Berry <karl@freefriends.org> | 2011-04-02 23:32:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-04-02 23:32:37 +0000 |
commit | 765026f4d90f6962b8a1bf9e9aecb1d70ae95f0a (patch) | |
tree | ab3659349c7ccfc12252888783509905ea041761 /Master/texmf-dist/bibtex/bst | |
parent | 5ef548762bb0e9f317aec1ec1e357e07caac1932 (diff) |
biblatex 1.4 (1apr11)
git-svn-id: svn://tug.org/texlive/trunk@21926 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex/bst')
-rw-r--r-- | Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst | 122 |
1 files changed, 13 insertions, 109 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 7f3a3d01a61..27079e2a340 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.3a 2011/03/18 12:20:20 lehman stable $ +% $Id: biblatex.bst,v 1.4 2011/03/31 21:55:36 lehman stable $ % Copyright (c) 2006-2011 Philipp Lehman. % @@ -159,23 +159,23 @@ ENTRY { verbb verbc } - { skipbib skiplos skiplab useauthor useeditor usetranslator useprefix singletitle uniquename } + { skipbib skiplos skiplab useauthor useeditor usetranslator useprefix singletitle } { entryoptions labelhash namehash fullhash dateyear dateendyear extrayear labelalpha extraalpha - sortinit label.name label.uniq label.year sortkey.nosort sortkey.name sortkey.year + sortinit label.name label.year sortkey.nosort sortkey.name sortkey.year sortkey.title sortkey.alpha sort.year sort.alph warningmsg } INTEGERS { ctrl.debug ctrl.bibtex8 ctrl.maxline ctrl.sorting ctrl.cssort ctrl.sortlos ctrl.maxnames ctrl.minnames ctrl.useauthor ctrl.useeditor ctrl.usetranslator ctrl.useprefix ctrl.terseinits ctrl.labelalpha ctrl.singletitle - ctrl.uniquename ctrl.labelyear citecount + ctrl.labelyear citecount tempctra tempctrb tempctrc resvctra resvctrb resvctrc - last.extra.num last.uniq.num } + last.extra.num } STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga - last.name last.hash last.uniq last.year last.extra } + last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 1.3 $" + "$Revision: 1.4 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ @@ -184,7 +184,6 @@ FUNCTION {initialize} { #0 'ctrl.labelalpha := #0 'ctrl.labelyear := #0 'ctrl.singletitle := - #0 'ctrl.uniquename := #0 'ctrl.sorting := #0 'ctrl.sortlos := #1 'ctrl.useauthor := @@ -1193,10 +1192,12 @@ FUNCTION {output:write:name} { if$ "\name" tempstrga wrap:braces * tempctrb int.to.str$ wrap:braces * + "" wrap:braces * "{%" * output:indent:field { tempctrb #0 > } - { "{" output:write:name:last * "%" * output:indent:subfield - " " output:write:name:first * "%" * output:indent:subfield + { "{{}%" output:indent:subfield + " " output:write:name:last * "%" * output:indent:subfield + " " output:write:name:first * "%" * output:indent:subfield " " output:write:name:prefix * "%" * output:indent:subfield " " output:write:name:suffix * "}%" * output:indent:subfield tempctra #1 + 'tempctra := @@ -1326,10 +1327,6 @@ FUNCTION {output:specials} { { "singletitle" #1 output:write:bool } 'skip$ if$ - ctrl.uniquename - { "uniquename" uniquename output:write:count } - 'skip$ - if$ } FUNCTION {output:names} { @@ -1751,7 +1748,7 @@ FUNCTION {input:control:options} { FUNCTION {input:control:version} { input:control:parse - "$Revision: 1.3 $" + "$Revision: 1.4 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ 'tempstrga := @@ -1780,7 +1777,6 @@ FUNCTION {input:control} { input:control:options 'ctrl.labelalpha := input:control:options 'ctrl.labelyear := input:control:options 'ctrl.singletitle := - input:control:options 'ctrl.uniquename := input:control:options 'ctrl.sorting := input:control:options 'ctrl.sortlos := input:control:options 'ctrl.maxnames := @@ -2012,19 +2008,6 @@ FUNCTION {makelabel:name:format} { if$ } -FUNCTION {makelabel:name:uniq} { - duplicate$ num.names$ #1 = - { #1 - "{ll}{" delimiter.3 * - "f}{" delimiter.3 * * - "v}{" delimiter.3 * * - "j}" * - format.name$ - } - { pop$ "" } - if$ -} - FUNCTION {makelabel:name:full} { duplicate$ num.names$ #1 = { #1 @@ -2182,10 +2165,6 @@ FUNCTION {makelabel:label} { { push:shortname duplicate$ makelabel:name:format 'label.name := duplicate$ makelabel:hash:format 'namehash := - ctrl.uniquename - { duplicate$ makelabel:name:uniq 'label.uniq := } - 'skip$ - if$ makelabel:ctrl:alpha:format 'labelalpha := } if$ @@ -2195,17 +2174,6 @@ FUNCTION {makelabel:label} { if$ } -FUNCTION {makelabel:label:uniq} { - uniquename #0 = - 'skip$ - { uniquename #1 = - { label.uniq 'label.name := } - { push:shortname makelabel:name:full 'label.name := } - if$ - } - if$ -} - % ------------------------------------------------------------------- % Sort labels % ------------------------------------------------------------------- @@ -2236,23 +2204,6 @@ FUNCTION {labelsort:main} { 'sort.year := } -FUNCTION {labelsort:name} { - ctrl:skiplab not - ctrl.uniquename - and - { sortkey empty$ - { sortkey.name delimiter.1 * sortkey.title * } - { sortkey } - if$ - truncate - } - { "" } - if$ - duplicate$ - 'sort.key$ := - 'sort.year := -} - FUNCTION {labelsort:alph} { ctrl:labelalpha { labelalpha normalize delimiter.1 * @@ -2312,11 +2263,9 @@ FUNCTION {labelsort:fullhash} { FUNCTION {labelsort:init} { "" 'last.name := - "" 'last.uniq := "" 'last.year := "" 'last.hash := "" 'last.extra := - #0 'last.uniq.num := #1 'last.extra.num := } @@ -2421,37 +2370,6 @@ FUNCTION {labelsort:fullhash:reverse} { if$ } -FUNCTION {labelsort:uniquename} { - ctrl:skiplab not - ctrl.uniquename - and - { push:shortname num.names$ #1 > - 'skip$ - { push:name:namehash last.hash = - { last.uniq.num 'uniquename := } - { label.name last.name = - { label.uniq last.uniq = - ctrl.uniquename #2 = - and - { #2 'uniquename := } - { #1 'uniquename := } - if$ - } - 'skip$ - if$ - } - if$ - label.name 'last.name := - label.uniq 'last.uniq := - uniquename 'last.uniq.num := - push:name:namehash 'last.hash := - } - if$ - } - 'skip$ - if$ -} - FUNCTION {labelsort:main:singletitle} { ctrl.singletitle { label.name last.name = @@ -2597,20 +2515,6 @@ REVERSE {labelsort:fullhash:reverse} EXECUTE {labelsort:init} -ITERATE {labelsort:name} - -SORT - -ITERATE {labelsort:uniquename} - -EXECUTE {labelsort:init} - -REVERSE {labelsort:uniquename} - -ITERATE {makelabel:label:uniq} - -EXECUTE {labelsort:init} - ITERATE {labelsort:main} SORT @@ -2667,7 +2571,7 @@ SORT FUNCTION {output:main:begin} { "% $ biblatex auxiliary file $" write$ newline$ - "% $ biblatex version " "$Revision: 1.3 $" + "% $ biblatex version " "$Revision: 1.4 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" * write$ newline$ "% Do not modify the above lines!" write$ newline$ "%" write$ newline$ |