diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-21 00:34:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-21 00:34:51 +0000 |
commit | 5b892fed3be4dbe212ef6cde003f51cc2d3df231 (patch) | |
tree | bdee54eedf6bdc0db2c1e5914ece6cf6359ab5ec /Master/texmf-dist/bibtex | |
parent | 1818174ad5a62aca7ee9a87c646d9888c0e1188a (diff) |
babelbib 1.27 (20jun09)
git-svn-id: svn://tug.org/texlive/trunk@13845 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
20 files changed, 2198 insertions, 395 deletions
diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst index c407eea48b8..7d817b1b358 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -551,14 +562,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -566,10 +577,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -838,7 +850,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -890,7 +902,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -920,7 +932,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -951,14 +963,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1084,7 +1096,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1094,7 +1106,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1363,6 +1375,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst index d3e31d47907..d9e33caaf50 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -549,14 +560,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -564,10 +575,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -836,7 +848,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -888,7 +900,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -918,7 +930,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -949,14 +961,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1082,7 +1094,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1092,7 +1104,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1361,6 +1373,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst index 9cabcf5dd50..c691e720ea1 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -551,14 +562,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -566,10 +577,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -838,7 +850,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -890,7 +902,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -920,7 +932,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -951,14 +963,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1084,7 +1096,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1094,7 +1106,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1363,6 +1375,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst index 3bbd245b24f..871f4f75629 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -545,14 +556,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -560,10 +571,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -832,7 +844,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -884,7 +896,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -914,7 +926,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -945,14 +957,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1078,7 +1090,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1088,7 +1100,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1357,6 +1369,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst index c78a9478ee5..aedd7220f59 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -543,14 +554,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -558,10 +569,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -830,7 +842,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -882,7 +894,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -912,7 +924,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -943,14 +955,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1076,7 +1088,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1086,7 +1098,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1355,6 +1367,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst index 82974c8538f..1ebb47102ab 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -545,14 +556,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -560,10 +571,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -832,7 +844,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -884,7 +896,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -914,7 +926,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -945,14 +957,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1078,7 +1090,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1088,7 +1100,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1357,6 +1369,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst index 7621588702e..488680164dd 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - "\bibitem [{" swap$ * label * "}]{" * write$ + "\bibitem [{" label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1513,6 +1525,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst index 26932559e31..11e7d8c8f57 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - "\bibitem [{" swap$ * label * "}]{" * write$ + "\bibitem [{" label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -543,14 +554,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -558,10 +569,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -830,7 +842,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -882,7 +894,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -912,7 +924,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -943,14 +955,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1076,7 +1088,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1086,7 +1098,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1512,6 +1524,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst index 65eb630b5c8..7170e8f43cf 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - "\bibitem [{" swap$ * label * "}]{" * write$ + "\bibitem [{" label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1513,6 +1525,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha2.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha2.bst new file mode 100644 index 00000000000..432d1abcb15 --- /dev/null +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha2.bst @@ -0,0 +1,1543 @@ +%% +%% This is file `babalpha.bst', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% babelbib.dtx (with options: `bst,bststd,bstsorted,bstalpha') +%% +%% babelbib package +%% +%% Copyright 2003--2006 Harald Harders +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN +%% archives in directory macros/latex/base/lppl.txt; either +%% version 1 of the License, or any later version. +%% +%% h.harders@tu-bs.de +%% +%% 2008/09/24 v1.25 babelbib: multilingual bibliographies (HH) +ENTRY + { address + annote + annotelanguage + author + booktitle + chapter + edition + editor + howpublished + institution + isbn + issn + journal + key + language + month + note + number + organization + pages + publisher + school + series + title + type + url + urldate + volume + year + } + {} + { label extra.label sort.label } + +INTEGERS + { output.state + before.all + mid.sentence + after.sentence + after.block + before.title + } + +STRINGS + { s + t + language.state + change.temp + isbn.command + } + +FUNCTION {init.state.consts} +{ #0 'before.all := + #1 'mid.sentence := + #2 'after.sentence := + #3 'after.block := + #4 'before.title := + "nostate" 'language.state := +} + +FUNCTION {not} +{ { #0 } + { #1 } + if$ +} + +FUNCTION {and} +{ 'skip$ + { pop$ #0 } + if$ +} + +FUNCTION {or} +{ { pop$ #1 } + 'skip$ + if$ +} + +FUNCTION {language.change.case} +{ + 'change.temp := + 't := + "\btxifchangecase {" + t change.temp change.case$ * + "}{" * + t * + "}" * +} + +FUNCTION {output.nonnull} +{ 's := + output.state mid.sentence = + { ", " * write$ } + { output.state after.block = + { add.period$ write$ + newline$ + "\newblock " write$ + } + { output.state before.all = + 'write$ + { + output.state before.title = + { "\btxauthorcolon\ " * write$ } + { add.period$ " " * write$ } + if$ + } + if$ + } + if$ + mid.sentence 'output.state := + } + if$ + s +} + +FUNCTION {output} +{ duplicate$ empty$ + 'pop$ + 'output.nonnull + if$ +} + +FUNCTION {output.check} +{ 't := + duplicate$ empty$ + { pop$ "empty " t * " in " * cite$ * warning$ } + 'output.nonnull + if$ +} + +FUNCTION {output.bibitem} +{ newline$ + language empty$ + { + language.state "nolanguage" = + 'skip$ + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } + if$ + "nolanguage" 'language.state := + } + { + language.state language = + 'skip$ + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } + if$ + language 'language.state := + } + if$ + "\bibitem [{" label * "}]{" * write$ + cite$ write$ + "}" write$ + newline$ + "" + before.all 'output.state := +} + +FUNCTION {output.isbn} +{ + 'isbn.command := + duplicate$ + empty$ + 'pop$ + { + 's := + output.state mid.sentence = + { + isbn.command * " {, " * write$ + s "}" * + } + { output.state after.block = + { + add.period$ + write$ + newline$ + "\newblock " write$ + isbn.command " {" * s * ".}" * + } + { output.state before.all = + { + write$ + isbn.command " {" * write$ + s "}" * + } + { + output.state before.title = + { + "\btxauthorcolon\ " * write$ + isbn.command " {" * write$ + s "}" * + } + { + add.period$ " " * write$ + isbn.command " {" * write$ + s ".}" * + } + if$ + } + if$ + } + if$ + mid.sentence 'output.state := + } + if$ + } + if$ +} + +FUNCTION {fin.entry} +{ add.period$ + write$ + newline$ +} + +FUNCTION {new.block} +{ output.state before.all = + 'skip$ + { after.block 'output.state := } + if$ +} + +FUNCTION {new.sentence} +{ output.state after.block = + 'skip$ + { output.state before.all = + 'skip$ + { after.sentence 'output.state := } + if$ + } + if$ +} + +FUNCTION {after.authors} +{ output.state before.all = + 'skip$ + { before.title 'output.state := } + if$ +} + +FUNCTION {new.block.checka} +{ empty$ + 'skip$ + 'new.block + if$ +} + +FUNCTION {new.block.checkb} +{ empty$ + swap$ empty$ + and + 'skip$ + 'new.block + if$ +} + +FUNCTION {new.block.checkc} +{ empty$ + swap$ empty$ + and + 'skip$ + 'after.authors + if$ +} + +FUNCTION {new.sentence.checka} +{ empty$ + 'skip$ + 'new.sentence + if$ +} + +FUNCTION {new.sentence.checkb} +{ empty$ + swap$ empty$ + and + 'skip$ + 'new.sentence + if$ +} + +FUNCTION {field.or.null} +{ duplicate$ empty$ + { pop$ "" } + 'skip$ + if$ +} + +FUNCTION {namefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxnamefont {" swap$ * "}" * } + if$ +} + +FUNCTION {lastnamefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxlastnamefont {" swap$ * "}" * } + if$ +} +FUNCTION {titlefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxtitlefont {" swap$ * "}" * } + if$ +} +FUNCTION {jtitlefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxjtitlefont {" swap$ * "}" * } + if$ +} +FUNCTION {journalfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxjournalfont {" swap$ * "}" * } + if$ +} +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} +FUNCTION {volumefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxvolumefont {" swap$ * "}" * } + if$ +} + +FUNCTION {etalfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxetalfont {" swap$ * "}" * } + if$ +} + +INTEGERS { nameptr namesleft numnames } + +FUNCTION {format.names} +{ 's := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { nameptr #1 > + { + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ + s nameptr "{ll}" format.name$ lastnamefont * + s nameptr "{, jj}" format.name$ * + 't := + namesleft #1 > + { ", " * t namefont * } + { numnames #2 > + { "\btxandcomma {}" * } + 'skip$ + if$ + s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ "others" = + { " " "\btxetalshort {.}" etalfont * * } + { " \btxandlong {}\ " * t namefont * } + if$ + } + if$ + } + { + s nameptr "{ll}" format.name$ lastnamefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont + } + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {format.authors} +{ author empty$ + { "" } + { author format.names } + if$ +} + +FUNCTION {format.editors} +{ editor empty$ + { "" } + { editor format.names + editor num.names$ #1 > + { "\ (\btxeditorslong {})" * } + { "\ (\btxeditorlong {})" * } + if$ + } + if$ +} +FUNCTION {format.title} +{ title empty$ + { "" } + { title "t" language.change.case titlefont } + if$ +} +FUNCTION {format.jtitle} +{ title empty$ + { "" } + { title "t" language.change.case jtitlefont } + if$ +} +FUNCTION {n.dashify} +{ 't := + "" + { t empty$ not } + { t #1 #1 substring$ "-" = + { t #1 #2 substring$ "--" = not + { "--" * + t #2 global.max$ substring$ 't := + } + { { t #1 #1 substring$ "-" = } + { "-" * + t #2 global.max$ substring$ 't := + } + while$ + } + if$ + } + { t #1 #1 substring$ * + t #2 global.max$ substring$ 't := + } + if$ + } + while$ +} + +FUNCTION {format.date} +{ year empty$ + { month empty$ + { "" } + { "there's a month but no year in " cite$ * warning$ + month + } + if$ + } + { month empty$ + 'year + { month "\ " * year * } + if$ + } + if$ +} + +FUNCTION {format.btitle} +{ title titlefont +} + +FUNCTION {tie.or.space.connect} +{ duplicate$ text.length$ #3 < + { "~" } + { "\ " } + if$ + swap$ * * +} + +FUNCTION {volume.tie.or.space.connect} +{ duplicate$ text.length$ #3 < + { "~" } + { "\ " } + if$ + swap$ volumefont * * +} + +FUNCTION {either.or.check} +{ empty$ + 'pop$ + { "can't use both " swap$ * " fields in " * cite$ * warning$ } + if$ +} + +FUNCTION {format.bvolume} +{ volume empty$ + { "" } + { output.state after.block = + { "\Btxvolumelong {}" } + { "\btxvolumelong {}" } + if$ + volume volume.tie.or.space.connect + series empty$ + 'skip$ + { " \btxofserieslong {}\ " * series titlefont * } + if$ + "volume and number" number either.or.check + } + if$ +} + +FUNCTION {format.number.series} +{ volume empty$ + { number empty$ + { series field.or.null } + { output.state mid.sentence = + { "\btxnumberlong {}" } + { "\Btxnumberlong {}" } + if$ + number tie.or.space.connect + series empty$ + { "there's a number but no series in " cite$ * warning$ } + { " \btxinserieslong {}\ " * series titlefont * } + if$ + } + if$ + } + { "" } + if$ +} + +FUNCTION {format.edition} +{ edition empty$ + { "" } + { + output.state mid.sentence = + { edition "l" change.case$ } + { edition "t" change.case$ } + if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * + } + if$ +} + +FUNCTION {format.isbn} +{ isbn empty$ + { "" } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } + if$ +} + +FUNCTION {format.issn} +{ issn empty$ + { "" } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } + if$ +} +FUNCTION {format.url} +{ url empty$ + { "" } + { + urldate empty$ + { "{\latintext \btxurlfont{" url * "}}" * } + { + "{\latintext \btxurlfont{" url * + "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + urldate * "}}}" * + } + if$ + } + if$ +} +FUNCTION {write.annote} +{ annote empty$ + 'skip$ + { + annotelanguage empty$ + { "\btxkeywordlanguage {" } + { "{\selectlanguage {" annotelanguage * "}" * } + if$ + "\btxannotation {" * annote * "}}" * + write$ newline$ + } + if$ +} +INTEGERS { multiresult } + +FUNCTION {multi.page.check} +{ 't := + #0 'multiresult := + { multiresult not + t empty$ not + and + } + { t #1 #1 substring$ + duplicate$ "-" = + swap$ duplicate$ "," = + swap$ "+" = + or or + { #1 'multiresult := } + { t #2 global.max$ substring$ 't := } + if$ + } + while$ + multiresult +} + +FUNCTION {format.pages} +{ pages empty$ + { "" } + { pages multi.page.check + { "\btxpageslong {}" pages n.dashify tie.or.space.connect } + { "\btxpagelong {}" pages tie.or.space.connect } + if$ + } + if$ +} + +FUNCTION {format.vol.num.pages} +{ volume field.or.null + number empty$ + 'skip$ + { "(" number * ")" * * + volume empty$ + { "there's a number but no volume in " cite$ * warning$ } + 'skip$ + if$ + } + if$ + pages empty$ + 'skip$ + { duplicate$ empty$ + { pop$ format.pages } + { ":" * pages n.dashify * } + if$ + } + if$ +} + +FUNCTION {format.chapter.pages} +{ chapter empty$ + 'format.pages + { type empty$ + { "\btxchapterlong {}" } + { type "l" language.change.case } + if$ + chapter tie.or.space.connect + pages empty$ + 'skip$ + { ", " * format.pages * } + if$ + } + if$ +} + +FUNCTION {format.in.ed.booktitle} +{ booktitle empty$ + { "" } + { editor empty$ + { "\Btxinlong {}\ " booktitle titlefont * } + { "\Btxinlong {}\ " format.editors * ": " * booktitle titlefont * } + if$ + } + if$ +} + +FUNCTION {empty.misc.check} +{ author empty$ title empty$ howpublished empty$ + month empty$ year empty$ note empty$ + and and and and and + key empty$ not and + { "all relevant fields are empty in " cite$ * warning$ } + 'skip$ + if$ +} + +FUNCTION {format.thesis.type} +{ type empty$ + 'skip$ + { pop$ + type "t" language.change.case + } + if$ +} + +FUNCTION {format.tr.number} +{ + number empty$ + { + type empty$ + { "\btxtechreplong {}" } + { type "t" language.change.case } + if$ + } + { + type empty$ + { "\Btxtechreplong {}" } + { type "t" language.change.case } + if$ + number tie.or.space.connect + } + if$ +} + +FUNCTION {format.article.crossref} +{ key empty$ + { journal empty$ + { "need key or journal for " cite$ * " to crossref " * crossref * + warning$ + "" + } + { "\Btxinlong {}\ " journal titlefont * } + if$ + } + { "\Btxinlong {}\ " key titlefont * } + if$ + " \cite{" * crossref * "}" * +} + +FUNCTION {format.crossref.editor} +{ + editor #1 "{ll}{,~jj}{, ff}{~vv}" format.name$ namefont + editor num.names$ duplicate$ + #2 > + { pop$ " " "\btxetalshort {.}" etalfont * * } + { #2 < + 'skip$ + { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = + { " " "\btxetalshort {.}" etalfont * * } + { " \btxandlong {}\ " * editor #2 "{ff}{~vv}{~ll}{, jj}" + format.name$ namefont * } + if$ + } + if$ + } + if$ +} + +FUNCTION {format.book.crossref} +{ volume empty$ + { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ + "\Btxinlong {}\ " + } + { "\Btxvolumelong {}" volume volume.tie.or.space.connect + " \btxofserieslong {}\ " * + } + if$ + editor empty$ + editor field.or.null author field.or.null = + or + { key empty$ + { series empty$ + { "need editor, key, or series for " cite$ * " to crossref " * + crossref * warning$ + "" * + } + { series titlefont * } + if$ + } + { key titlefont * } + if$ + } + { format.crossref.editor * } + if$ + " \cite{" * crossref * "}" * +} + +FUNCTION {format.incoll.inproc.crossref} +{ editor empty$ + editor field.or.null author field.or.null = + or + { key empty$ + { booktitle empty$ + { "need editor, key, or booktitle for " cite$ * " to crossref " * + crossref * warning$ + "" + } + { "\Btxinlong {}\ " booktitle titlefont * } + if$ + } + { "\Btxinlong {}\ " key titlefont * } + if$ + } + { "\Btxinlong {}\ " format.crossref.editor * } + if$ + " \cite{" * crossref * "}" * +} + +FUNCTION {article} +{ output.bibitem + format.authors "author" output.check + after.authors + format.jtitle "title" output.check + new.block + crossref missing$ + { journal + title missing$ + { titlefont } + { journalfont } + if$ + "journal" output.check + format.vol.num.pages output + format.date "year" output.check + } + { format.article.crossref output.nonnull + format.pages output + } + if$ + format.issn "\ifbtxprintISSN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {book} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check } + { format.authors output.nonnull + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + after.authors + format.btitle "title" output.check + crossref missing$ + { format.bvolume output + new.block + format.number.series output + new.sentence + publisher "publisher" output.check publisherfont + address output + } + { new.block + format.book.crossref output.nonnull + } + if$ + format.edition output + format.date "year" output.check + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {booklet} +{ output.bibitem + format.authors output + after.authors + format.title "title" output.check + howpublished address new.block.checkb + howpublished output + address output + format.date output + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {inbook} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check } + { format.authors output.nonnull + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + after.authors + format.btitle "title" output.check + crossref missing$ + { format.bvolume output + format.chapter.pages "chapter and pages" output.check + new.block + format.number.series output + new.sentence + publisher "publisher" output.check publisherfont + address output + } + { format.chapter.pages "chapter and pages" output.check + new.block + format.book.crossref output.nonnull + } + if$ + format.edition output + format.date "year" output.check + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {incollection} +{ output.bibitem + format.authors "author" output.check + after.authors + format.title "title" output.check + new.block + crossref missing$ + { format.in.ed.booktitle "booktitle" output.check + format.bvolume output + format.number.series output + format.chapter.pages output + new.sentence + publisher "publisher" output.check publisherfont + address output + format.edition output + format.date "year" output.check + } + { format.incoll.inproc.crossref output.nonnull + format.chapter.pages output + } + if$ + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {inproceedings} +{ output.bibitem + format.authors "author" output.check + after.authors + format.title "title" output.check + new.block + crossref missing$ + { format.in.ed.booktitle "booktitle" output.check + format.bvolume output + format.number.series output + format.pages output + address empty$ + { organization publisher new.sentence.checkb + organization output + publisher publisherfont output + format.date "year" output.check + } + { address output.nonnull + format.date "year" output.check + new.sentence + organization output + publisher publisherfont output + } + if$ + } + { format.incoll.inproc.crossref output.nonnull + format.pages output + } + if$ + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {conference} { inproceedings } + +FUNCTION {manual} +{ output.bibitem + author empty$ + { organization empty$ + 'skip$ + { organization output.nonnull + address output + } + if$ + } + { format.authors output.nonnull } + if$ + after.authors + format.btitle "title" output.check + author empty$ + { organization empty$ + { address new.block.checka + address output + } + 'skip$ + if$ + } + { organization address new.block.checkb + organization output + address output + } + if$ + format.edition output + format.date output + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {mastersthesis} +{ output.bibitem + format.authors "author" output.check + after.authors + format.title "title" output.check + new.block + "\btxmastthesis {}" format.thesis.type output.nonnull + school "school" output.check + address output + format.date "year" output.check + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {misc} +{ output.bibitem + format.authors output + title howpublished new.block.checkc + format.title output + howpublished new.block.checka + howpublished output + format.date output + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.issn "\ifbtxprintISSN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote + empty.misc.check +} + +FUNCTION {phdthesis} +{ output.bibitem + format.authors "author" output.check + after.authors + format.btitle "title" output.check + new.block + "\btxphdthesis {}" format.thesis.type output.nonnull + school "school" output.check + address output + format.date "year" output.check + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {proceedings} +{ output.bibitem + editor empty$ + { organization output } + { format.editors output.nonnull } + if$ + after.authors + format.btitle "title" output.check + format.bvolume output + format.number.series output + address empty$ + { editor empty$ + { publisher new.sentence.checka } + { organization publisher new.sentence.checkb + organization output + } + if$ + publisher publisherfont output + format.date "year" output.check + } + { address output.nonnull + format.date "year" output.check + new.sentence + editor empty$ + 'skip$ + { organization output } + if$ + publisher publisherfont output + } + if$ + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {techreport} +{ output.bibitem + format.authors "author" output.check + after.authors + format.title "title" output.check + new.block + format.tr.number output.nonnull + institution "institution" output.check + address output + format.date "year" output.check + format.isbn "\ifbtxprintISBN" output.isbn + new.block + format.url output + note output + fin.entry + write.annote +} + +FUNCTION {unpublished} +{ output.bibitem + format.authors "author" output.check + after.authors + format.title "title" output.check + new.block + format.url output + note "note" output.check + format.date output + fin.entry + write.annote +} + +FUNCTION {default.type} { misc } + +MACRO {jan} {"\btxmonjanlong {}"} +MACRO {feb} {"\btxmonfeblong {}"} +MACRO {mar} {"\btxmonmarlong {}"} +MACRO {apr} {"\btxmonaprlong {}"} +MACRO {may} {"\btxmonmaylong {}"} +MACRO {jun} {"\btxmonjunlong {}"} +MACRO {jul} {"\btxmonjullong {}"} +MACRO {aug} {"\btxmonauglong {}"} +MACRO {sep} {"\btxmonseplong {}"} +MACRO {oct} {"\btxmonoctlong {}"} +MACRO {nov} {"\btxmonnovlong {}"} +MACRO {dec} {"\btxmondeclong {}"} +MACRO {acmcs} {"ACM Computing Surveys"} +MACRO {acta} {"Acta Informatica"} +MACRO {cacm} {"Communications of the ACM"} +MACRO {ibmjrd} {"IBM Journal of Research and Development"} +MACRO {ibmsj} {"IBM Systems Journal"} +MACRO {ieeese} {"IEEE Transactions on Software Engineering"} +MACRO {ieeetc} {"IEEE Transactions on Computers"} +MACRO {ieeetcad} + {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} +MACRO {ipl} {"Information Processing Letters"} +MACRO {jacm} {"Journal of the ACM"} +MACRO {jcss} {"Journal of Computer and System Sciences"} +MACRO {scp} {"Science of Computer Programming"} +MACRO {sicomp} {"SIAM Journal on Computing"} +MACRO {tocs} {"ACM Transactions on Computer Systems"} +MACRO {tods} {"ACM Transactions on Database Systems"} +MACRO {tog} {"ACM Transactions on Graphics"} +MACRO {toms} {"ACM Transactions on Mathematical Software"} +MACRO {toois} {"ACM Transactions on Office Information Systems"} +MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"} +MACRO {tcs} {"Theoretical Computer Science"} + +READ + +FUNCTION {sortify} +{ purify$ + "l" change.case$ +} + +INTEGERS { len } + +FUNCTION {chop.word} +{ 's := + 'len := + s #1 len substring$ = + { s len #1 + global.max$ substring$ } + 's + if$ +} + +INTEGERS { et.al.char.used } + +FUNCTION {initialize.et.al.char.used} +{ #0 'et.al.char.used := +} + +EXECUTE {initialize.et.al.char.used} + +FUNCTION {format.lab.names} +{ 's := + s num.names$ 'numnames := + numnames #1 > + { numnames #4 > + { #3 'namesleft := } + { numnames 'namesleft := } + if$ + #1 'nameptr := + "" + { namesleft #0 > } + { nameptr numnames = + { s nameptr "{ff }{vv }{ll}{ jj}" format.name$ "others" = + { "{\etalchar{+}}" * + #1 'et.al.char.used := + } + { s nameptr "{v{}}{l{}}" format.name$ * } + if$ + } + { s nameptr "{v{}}{l{}}" format.name$ * } + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ + numnames #4 > + { "{\etalchar{+}}" * + #1 'et.al.char.used := + } + 'skip$ + if$ + } + { s #1 "{v{}}{l{}}" format.name$ + duplicate$ text.length$ #2 < + { pop$ s #1 "{ll}" format.name$ #3 text.prefix$ } + 'skip$ + if$ + } + if$ +} + +FUNCTION {author.key.label} +{ author empty$ + { key empty$ + { cite$ #1 #3 substring$ } + { key #3 text.prefix$ } + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {author.editor.key.label} +{ author empty$ + { editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + { key #3 text.prefix$ } + if$ + } + { editor format.lab.names } + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {author.key.organization.label} +{ author empty$ + { key empty$ + { organization empty$ + { cite$ #1 #3 substring$ } + { "The " #4 organization chop.word #3 text.prefix$ } + if$ + } + { key #3 text.prefix$ } + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {editor.key.organization.label} +{ editor empty$ + { key empty$ + { organization empty$ + { cite$ #1 #3 substring$ } + { "The " #4 organization chop.word #3 text.prefix$ } + if$ + } + { key #3 text.prefix$ } + if$ + } + { editor format.lab.names } + if$ +} + +FUNCTION {calc.label} +{ type$ "book" = + type$ "inbook" = + or + 'author.editor.key.label + { type$ "proceedings" = + 'editor.key.organization.label + { type$ "manual" = + 'author.key.organization.label + 'author.key.label + if$ + } + if$ + } + if$ + duplicate$ + year field.or.null purify$ #-1 #2 substring$ + * + 'label := + year field.or.null purify$ #-1 #4 substring$ + * + sortify 'sort.label := +} + +FUNCTION {sort.format.names} +{ 's := + #1 'nameptr := + "" + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { nameptr #1 > + { " " * } + 'skip$ + if$ + s nameptr "{ll{ }}{ ff{ }}{vv{ } }{ jj{ }}" format.name$ 't := + nameptr numnames = t "others" = and + { "et al" * } + { t sortify * } + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {sort.format.title} +{ 't := + "A " #2 + "An " #3 + "The " #4 t chop.word + chop.word + chop.word + sortify + #1 global.max$ substring$ +} + +FUNCTION {author.sort} +{ author empty$ + { key empty$ + { "to sort, need author or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { author sort.format.names } + if$ +} + +FUNCTION {author.editor.sort} +{ author empty$ + { editor empty$ + { key empty$ + { "to sort, need author, editor, or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { editor sort.format.names } + if$ + } + { author sort.format.names } + if$ +} + +FUNCTION {author.organization.sort} +{ author empty$ + { organization empty$ + { key empty$ + { "to sort, need author, organization, or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { "The " #4 organization chop.word sortify } + if$ + } + { author sort.format.names } + if$ +} + +FUNCTION {editor.organization.sort} +{ editor empty$ + { organization empty$ + { key empty$ + { "to sort, need editor, organization, or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { "The " #4 organization chop.word sortify } + if$ + } + { editor sort.format.names } + if$ +} + +FUNCTION {presort} +{ + calc.label + sort.label + " " + * + type$ "book" = + type$ "inbook" = + or + 'author.editor.sort + { type$ "proceedings" = + 'editor.organization.sort + { type$ "manual" = + 'author.organization.sort + 'author.sort + if$ + } + if$ + } + if$ + * + " " + * + year field.or.null sortify + * + " " + * + title field.or.null + sort.format.title + * + #1 entry.max$ substring$ + 'sort.key$ := +} + +ITERATE {presort} + +SORT + +STRINGS { longest.label last.sort.label next.extra } + +INTEGERS { longest.label.width last.extra.num } + +FUNCTION {initialize.longest.label} +{ "" 'longest.label := + #0 int.to.chr$ 'last.sort.label := + "" 'next.extra := + #0 'longest.label.width := + #0 'last.extra.num := +} + +FUNCTION {forward.pass} +{ last.sort.label sort.label = + { last.extra.num #1 + 'last.extra.num := + last.extra.num int.to.chr$ 'extra.label := + } + { "a" chr.to.int$ 'last.extra.num := + "" 'extra.label := + sort.label 'last.sort.label := + } + if$ +} + +FUNCTION {reverse.pass} +{ next.extra "b" = + { "a" 'extra.label := } + 'skip$ + if$ + label extra.label * 'label := + label width$ longest.label.width > + { label 'longest.label := + label width$ 'longest.label.width := + } + 'skip$ + if$ + extra.label 'next.extra := +} + +EXECUTE {initialize.longest.label} + +ITERATE {forward.pass} +REVERSE {reverse.pass} + +FUNCTION {begin.bib} +{ + et.al.char.used + { "\newcommand{\etalchar}[1]{$^{#1}$}" write$ newline$ } + 'skip$ + if$ + preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ + " \providebibliographyfont{name}{}%" write$ newline$ + " \providebibliographyfont{lastname}{}%" write$ newline$ + " \providebibliographyfont{title}{\emph}%" write$ newline$ + " \providebibliographyfont{jtitle}{\btxtitlefont}%" write$ newline$ + " \providebibliographyfont{etal}{\emph}%" write$ newline$ + " \providebibliographyfont{journal}{}%" write$ newline$ + " \providebibliographyfont{volume}{}%" write$ newline$ + " \providebibliographyfont{ISBN}{\MakeUppercase}%" write$ newline$ + " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ + " \providebibliographyfont{url}{\url}%" write$ newline$ + " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ +} + +EXECUTE {begin.bib} + +EXECUTE {init.state.consts} + +ITERATE {call.type$} + +FUNCTION {end.bib} +{ newline$ + "\end{thebibliography}" write$ newline$ +} + +EXECUTE {end.bib} + diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst index 05fd05d810f..c6240f8a330 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -145,6 +145,13 @@ FUNCTION {journalfont} if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} + FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -375,7 +382,7 @@ FUNCTION {format.title} FUNCTION {format.jtitle} { title empty$ { "" } - { jtitle "t" language.change.case titlefont } + { title "t" language.change.case jtitlefont } if$ } @@ -503,14 +510,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } @@ -519,17 +526,17 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont {" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ } if$ } - FUNCTION {write.annote} { annote empty$ 'skip$ @@ -748,7 +755,7 @@ FUNCTION {book} format.edition output crossref missing$ { format.bookvolume.series.number output - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.book.crossref output.nonnull @@ -792,7 +799,7 @@ FUNCTION {inbook} crossref missing$ { format.bookvolume.series.number output format.chapter.pages "chapter and pages" output.check - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -815,7 +822,7 @@ FUNCTION {incollection} crossref missing$ { format.incoll.title.editors "booktitle" output.check format.bookvolume.series.number output - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -840,7 +847,7 @@ FUNCTION {inproceedings} { format.inproc.title.address.editors "booktitle" output.check format.bookvolume.series.number output organization output - publisher output + publisher publisherfont output format.date "year" output.check } { format.incoll.inproc.crossref output.nonnull @@ -949,7 +956,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -957,7 +964,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } if$ @@ -1237,8 +1244,9 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ - " \providecommand\btxprintamslanguage[1]{\ (#1)}" - write$ newline$ + " \providecommand\btxprintamslanguage[1]{\ (#1)}" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst index 407cf2f5578..c0899da575b 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -550,14 +561,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -565,10 +576,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -837,7 +849,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -889,7 +901,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -919,7 +931,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -950,14 +962,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1083,7 +1095,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1093,7 +1105,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1362,6 +1374,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst index cf492c48643..1a319b254e6 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -549,14 +560,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -564,10 +575,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -836,7 +848,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -888,7 +900,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -918,7 +930,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -949,14 +961,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1082,7 +1094,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1092,7 +1104,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1361,6 +1373,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst index 184b5bbd1b2..2ca0962fbdf 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -550,14 +561,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -565,10 +576,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -837,7 +849,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -889,7 +901,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -919,7 +931,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -950,14 +962,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1083,7 +1095,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1093,7 +1105,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1362,6 +1374,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst index 59a27903cf6..32065f64ea6 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1356,6 +1368,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst index 028521088bc..b67277bac34 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -543,14 +554,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -558,10 +569,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -830,7 +842,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -882,7 +894,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -912,7 +924,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -943,14 +955,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1076,7 +1088,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1086,7 +1098,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1355,6 +1367,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst index f56de60cb66..50640b81567 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1356,6 +1368,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst index 83b096ec294..15df4612112 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1210,6 +1222,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst index 0e3b2b090d1..6a3fad819a1 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -543,14 +554,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -558,10 +569,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -830,7 +842,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -882,7 +894,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -912,7 +924,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -943,14 +955,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1076,7 +1088,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1086,7 +1098,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1209,6 +1221,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst index 94f0806f44e..5b7827e3c62 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst @@ -8,7 +8,7 @@ %% %% babelbib package %% -%% Copyright 2003--2005 Harald Harders +%% Copyright 2003--2009 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ %% %% h.harders@tu-bs.de %% -%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) +%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) ENTRY { address annote @@ -151,25 +151,30 @@ FUNCTION {output.check} FUNCTION {output.bibitem} { newline$ language empty$ - { "empty language in " cite$ * warning$ - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * + { language.state "nolanguage" = 'skip$ - { duplicate$ write$ newline$ } + { + "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * + write$ newline$ + } if$ "nolanguage" 'language.state := } { - "\btxselectlanguage {" language * "}" * language.state language = 'skip$ - { duplicate$ write$ newline$ } + { + "\btxselectlanguage {" language * "}" * + write$ newline$ + } if$ language 'language.state := } if$ - pop$ "\bibitem {" write$ + "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -338,6 +343,12 @@ FUNCTION {journalfont} { "\btxjournalfont {" swap$ * "}" * } if$ } +FUNCTION {publisherfont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxpublisherfont {" swap$ * "}" * } + if$ +} FUNCTION {volumefont} { duplicate$ empty$ { pop$ "" } @@ -544,14 +555,14 @@ FUNCTION {format.edition} FUNCTION {format.isbn} { isbn empty$ { "" } - { "\btxISBN~\btxISBNfont {" isbn * "}" * } + { "\mbox{\btxISBN~\btxISBNfont {" isbn * "}}" * } if$ } FUNCTION {format.issn} { issn empty$ { "" } - { "\btxISSN~\btxISSNfont {" issn * "}" * } + { "\mbox{\btxISSN~\btxISSNfont {" issn * "}}" * } if$ } FUNCTION {format.url} @@ -559,10 +570,11 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "{\latintext \btxurlfont {" url * "}}" * } + { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont {" url * - "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * + "{\latintext \btxurlfont{" url * "}}%" * + newline$ output + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" urldate * "}}}" * } if$ @@ -831,7 +843,7 @@ FUNCTION {book} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { new.block @@ -883,7 +895,7 @@ FUNCTION {inbook} new.block format.number.series output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output } { format.chapter.pages "chapter and pages" output.check @@ -913,7 +925,7 @@ FUNCTION {incollection} format.number.series output format.chapter.pages output new.sentence - publisher "publisher" output.check + publisher "publisher" output.check publisherfont address output format.edition output format.date "year" output.check @@ -944,14 +956,14 @@ FUNCTION {inproceedings} address empty$ { organization publisher new.sentence.checkb organization output - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull format.date "year" output.check new.sentence organization output - publisher output + publisher publisherfont output } if$ } @@ -1077,7 +1089,7 @@ FUNCTION {proceedings} organization output } if$ - publisher output + publisher publisherfont output format.date "year" output.check } { address output.nonnull @@ -1087,7 +1099,7 @@ FUNCTION {proceedings} 'skip$ { organization output } if$ - publisher output + publisher publisherfont output } if$ format.isbn "\ifbtxprintISBN" output.isbn @@ -1210,6 +1222,8 @@ FUNCTION {begin.bib} " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ " \providebibliographyfont{numeral}{}%" write$ newline$ + " \expandafter\btxselectlanguage\expandafter {\btxfallbacklanguage}" + write$ newline$ } EXECUTE {begin.bib} |