From ba9472aebfed07843bc4faa00c7b96bc86194691 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 4 Oct 2006 08:43:01 +0000 Subject: Fix ctan2tds for pgf installation comment powerdot-doc-vn in tpm-ctan-check, it always breaks Update of the following packages: labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst | 97 +++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst | 97 +++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst | 95 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst | 74 +++++++++++++---- .../texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst | 95 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babplain-fl.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babplain-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/babplain.bst | 95 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst | 96 ++++++++++++++------- .../texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst | 93 ++++++++++++++------- Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst | 95 ++++++++++++++------- 19 files changed, 1246 insertions(+), 536 deletions(-) (limited to 'Master/texmf-dist/bibtex/bst/babelbib') diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst index 7ed7bd7b7fb..c407eea48b8 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,11 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr + "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{,~jj}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -382,9 +387,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -411,14 +416,18 @@ FUNCTION {format.editors} } 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 := "" @@ -530,9 +539,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -550,23 +561,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -744,7 +766,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -774,7 +796,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -795,6 +817,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -829,6 +852,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -844,6 +868,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -880,6 +905,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -908,6 +934,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -944,6 +971,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -982,6 +1010,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -998,6 +1027,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1015,6 +1045,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1033,6 +1064,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1070,6 +1102,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1087,6 +1120,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1099,6 +1133,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1320,12 +1355,14 @@ FUNCTION {begin.bib} " \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$ } 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 526f2ec0b5a..d3e31d47907 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -382,7 +386,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -409,14 +414,18 @@ FUNCTION {format.editors} } 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 := "" @@ -528,9 +537,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -548,23 +559,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -742,7 +764,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -772,7 +794,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -793,6 +815,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -827,6 +850,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -842,6 +866,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -878,6 +903,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -906,6 +932,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -942,6 +969,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -980,6 +1008,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -996,6 +1025,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1013,6 +1043,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1031,6 +1062,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1068,6 +1100,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1085,6 +1118,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1097,6 +1131,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1318,12 +1353,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst index 91b0c20fdd0..9cabcf5dd50 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbr3.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,11 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr + "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{,~jj}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -383,7 +388,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -410,14 +416,18 @@ FUNCTION {format.editors} } 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 := "" @@ -529,9 +539,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -549,23 +561,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -743,7 +766,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -773,7 +796,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -794,6 +817,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -828,6 +852,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -843,6 +868,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -879,6 +905,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -907,6 +934,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -943,6 +971,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -981,6 +1010,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -997,6 +1027,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1014,6 +1045,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1032,6 +1064,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1069,6 +1102,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1086,6 +1120,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1098,6 +1133,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1319,12 +1355,14 @@ FUNCTION {begin.bib} " \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$ } 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 a552d6d183c..3bbd245b24f 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,11 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr + "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{,~jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,9 +381,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -405,14 +410,18 @@ FUNCTION {format.editors} } 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 := "" @@ -524,9 +533,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -544,23 +555,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -738,7 +760,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -768,7 +790,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -789,6 +811,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -823,6 +846,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -838,6 +862,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -874,6 +899,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -902,6 +928,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -938,6 +965,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -976,6 +1004,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -992,6 +1021,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1009,6 +1039,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1027,6 +1058,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1064,6 +1096,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1081,6 +1114,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1093,6 +1127,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1314,12 +1349,14 @@ FUNCTION {begin.bib} " \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$ } 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 413e10efb6e..c78a9478ee5 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,7 +380,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -403,14 +408,18 @@ FUNCTION {format.editors} } 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 := "" @@ -522,9 +531,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -542,23 +553,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -736,7 +758,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -766,7 +788,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -787,6 +809,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -821,6 +844,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -836,6 +860,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -872,6 +897,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -900,6 +926,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -936,6 +963,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -974,6 +1002,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -990,6 +1019,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1007,6 +1037,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1025,6 +1056,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1062,6 +1094,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1079,6 +1112,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1091,6 +1125,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1312,12 +1347,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst index fe6570d6fd1..82974c8538f 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/bababbrv.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,11 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{f.~}{vv~}" format.name$ + s nameptr + "{f{.\btxfnamespaceshort }.~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{,~jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -377,7 +382,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{,~f.}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{,~f{.\btxfnamespaceshort }.}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -404,14 +410,18 @@ FUNCTION {format.editors} } 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 := "" @@ -523,9 +533,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionshort {.}" * } - { edition "t" language.change.case "~\btxeditionshort {.}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -543,23 +555,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -737,7 +760,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinshort {.}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -767,7 +790,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -788,6 +811,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -822,6 +846,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -837,6 +862,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -873,6 +899,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -901,6 +928,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -937,6 +965,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -975,6 +1004,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -991,6 +1021,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1008,6 +1039,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1026,6 +1058,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1063,6 +1096,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1080,6 +1114,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1092,6 +1127,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1313,12 +1349,14 @@ FUNCTION {begin.bib} " \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$ } 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 219185cdc3b..7621588702e 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem[" label * "]{" * write$ + "\bibitem [{" swap$ * label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,9 +380,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -405,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -524,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -544,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -738,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -768,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -789,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -823,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -838,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -874,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -902,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -938,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -976,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -992,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1009,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1027,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1064,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1081,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1093,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1471,12 +1505,14 @@ FUNCTION {begin.bib} " \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$ } 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 c4441c131fd..26932559e31 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem[" label * "]{" * write$ + "\bibitem [{" swap$ * label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{, jj}{, ff}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,7 +380,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -403,14 +408,18 @@ FUNCTION {format.editors} } 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 := "" @@ -522,9 +531,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -542,23 +553,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -736,7 +758,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -766,7 +788,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -787,6 +809,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -821,6 +844,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -836,6 +860,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -872,6 +897,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -900,6 +926,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -936,6 +963,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -974,6 +1002,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -990,6 +1019,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1007,6 +1037,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1025,6 +1056,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1062,6 +1094,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1079,6 +1112,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1091,6 +1125,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1469,12 +1504,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst index 54af527b1ae..65eb630b5c8 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem[" label * "]{" * write$ + "\bibitem [{" swap$ * label * "}]{" * write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -377,7 +381,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -404,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -523,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -543,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -737,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -767,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -788,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -822,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -837,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -873,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -901,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -937,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -975,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -991,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1008,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1026,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1063,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1080,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1092,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1470,12 +1505,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst index 291c150cf51..05fd05d810f 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babamspl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -129,6 +131,13 @@ FUNCTION {titlefont} if$ } +FUNCTION {jtitlefont} +{ duplicate$ empty$ + { pop$ "" } + { "\btxjtitlefont {" swap$ * "}" * } + if$ +} + FUNCTION {journalfont} { duplicate$ empty$ { pop$ "" } @@ -252,9 +261,7 @@ FUNCTION {output.bibitem} language 'language.state := } if$ - "\bibitem{" write$ - cite$ write$ - "}" write$ + "\bibitem {" cite$ * "}" * write$ newline$ "" before.all 'output.state := @@ -294,7 +301,7 @@ FUNCTION {format.names} numnames 'namesleft := { namesleft #0 > } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong }~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * s nameptr "{, jj}" format.name$ * 't := nameptr #1 > @@ -312,7 +319,7 @@ FUNCTION {format.names} if$ } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong }~}{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * s nameptr "{, jj}" format.name$ * namefont } @@ -365,6 +372,13 @@ FUNCTION {format.title} if$ } +FUNCTION {format.jtitle} +{ title empty$ + { "" } + { jtitle "t" language.change.case titlefont } + if$ +} + FUNCTION {format.journal.vol.year} { journal empty$ { "journal name" missing.warning ""} @@ -475,10 +489,13 @@ FUNCTION {format.incoll.title.editors} FUNCTION {format.edition} { edition empty$ { "" } - { output.state mid.sentence = - { edition "l" language.change.case " \btxeditionshort {.}" * } - { edition "t" language.change.case " \btxeditionshort {.}" * } + { + output.state mid.sentence = + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumeralshort {" swap$ * + "}~\btxeditionshort {.}" * } if$ } @@ -502,17 +519,31 @@ FUNCTION {format.url} { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont {" * - urldate * "}}" * + "{\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} @@ -684,7 +715,7 @@ FUNCTION {format.incoll.inproc.crossref} FUNCTION {article} { output.bibitem format.authors "author" output.check - format.title "title" output.check + format.jtitle "title" output.check crossref missing$ { format.journal.vol.year output format.number output @@ -699,6 +730,7 @@ FUNCTION {article} format.language * note output fin.entry + write.annote } FUNCTION {book} @@ -728,6 +760,7 @@ FUNCTION {book} format.language * note output fin.entry + write.annote } FUNCTION {booklet} @@ -740,6 +773,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -771,6 +805,7 @@ FUNCTION {inbook} format.language * note output fin.entry + write.annote } FUNCTION {incollection} @@ -794,6 +829,7 @@ FUNCTION {incollection} format.url output format.language * fin.entry + write.annote } FUNCTION {inproceedings} @@ -816,6 +852,7 @@ FUNCTION {inproceedings} format.url output format.language * fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -849,6 +886,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -863,6 +901,7 @@ FUNCTION {mastersthesis} note output format.book.pages output fin.entry + write.annote } FUNCTION {misc} @@ -877,6 +916,7 @@ FUNCTION {misc} note output format.book.pages output fin.entry + write.annote empty.misc.check } @@ -893,6 +933,7 @@ FUNCTION {phdthesis} note output format.book.pages output fin.entry + write.annote } FUNCTION {proceedings} @@ -924,6 +965,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -938,6 +980,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -948,6 +991,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1185,12 +1229,14 @@ FUNCTION {begin.bib} " \providebibliographyfont{name}{}%" write$ newline$ " \providebibliographyfont{lastname}{}%" write$ newline$ " \providebibliographyfont{title}{\emph}%" write$ newline$ + " \providebibliographyfont{jtitle}{\btxtitlefont}%" write$ newline$ " \providebibliographyfont{etal}{}%" write$ newline$ " \providebibliographyfont{journal}{}%" write$ newline$ " \providebibliographyfont{volume}{\textbf}%" write$ newline$ " \providebibliographyfont{ISBN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$ " \providebibliographyfont{url}{\url}%" write$ newline$ + " \providebibliographyfont{numeral}{}%" write$ newline$ " \providecommand\btxprintamslanguage[1]{\ (#1)}" write$ newline$ } diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst index 075c0ce1c78..407cf2f5578 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -382,9 +386,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -411,14 +415,18 @@ FUNCTION {format.editors} } 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 := "" @@ -530,9 +538,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -550,23 +560,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -744,7 +765,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -774,7 +795,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -795,6 +816,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -829,6 +851,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -844,6 +867,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -880,6 +904,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -908,6 +933,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -944,6 +970,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -982,6 +1009,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -998,6 +1026,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1015,6 +1044,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1033,6 +1063,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1070,6 +1101,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1087,6 +1119,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1099,6 +1132,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1320,12 +1354,14 @@ FUNCTION {begin.bib} " \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$ } 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 88015d9f614..cf492c48643 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{, jj}{, ff}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -382,7 +386,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -409,14 +414,18 @@ FUNCTION {format.editors} } 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 := "" @@ -528,9 +537,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -548,23 +559,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -742,7 +764,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -772,7 +794,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -793,6 +815,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -827,6 +850,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -842,6 +866,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -878,6 +903,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -906,6 +932,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -942,6 +969,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -980,6 +1008,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -996,6 +1025,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1013,6 +1043,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1031,6 +1062,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1068,6 +1100,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1085,6 +1118,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1097,6 +1131,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1318,12 +1353,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst index 2df398b6d66..184b5bbd1b2 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplai3.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #2 > { " " "\btxetalshort {.}" etalfont * * #1 'namesleft := } @@ -383,7 +387,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -410,14 +415,18 @@ FUNCTION {format.editors} } 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 := "" @@ -529,9 +538,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -549,23 +560,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -743,7 +765,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -773,7 +795,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -794,6 +816,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -828,6 +851,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -843,6 +867,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -879,6 +904,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -907,6 +933,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -943,6 +970,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -981,6 +1009,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -997,6 +1026,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1014,6 +1044,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1032,6 +1063,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1069,6 +1101,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1086,6 +1119,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1098,6 +1132,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1319,12 +1354,14 @@ FUNCTION {begin.bib} " \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$ } 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 c6219c2fd82..59a27903cf6 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,9 +380,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -405,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -524,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -544,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -738,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -768,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -789,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -823,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -838,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -874,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -902,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -938,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -976,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -992,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1009,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1027,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1064,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1081,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1093,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1314,12 +1348,14 @@ FUNCTION {begin.bib} " \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$ } 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 ffd819af2dc..028521088bc 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{, jj}{, ff}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,7 +380,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -403,14 +408,18 @@ FUNCTION {format.editors} } 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 := "" @@ -522,9 +531,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -542,23 +553,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -736,7 +758,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -766,7 +788,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -787,6 +809,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -821,6 +844,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -836,6 +860,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -872,6 +897,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -900,6 +926,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -936,6 +963,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -974,6 +1002,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -990,6 +1019,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1007,6 +1037,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1025,6 +1056,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1062,6 +1094,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1079,6 +1112,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1091,6 +1125,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1312,12 +1347,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst b/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst index a6abddc392c..f56de60cb66 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babplain.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -377,7 +381,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -404,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -523,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -543,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -737,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -767,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -788,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -822,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -837,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -873,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -901,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -937,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -975,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -991,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1008,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1026,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1063,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1080,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1092,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1313,12 +1348,14 @@ FUNCTION {begin.bib} " \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$ } 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 11724a73da2..83b096ec294 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-fl.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,9 +380,9 @@ FUNCTION {format.names} if$ } { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * namefont + s nameptr "{,~jj}" format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -405,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -524,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -544,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -738,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -768,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -789,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -823,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -838,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -874,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -902,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -938,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -976,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -992,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1009,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1027,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1064,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1081,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1093,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1168,12 +1202,14 @@ FUNCTION {begin.bib} " \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$ } 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 70ff1da7335..0e3b2b090d1 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt-lf.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -360,7 +363,8 @@ FUNCTION {format.names} { nameptr #1 > { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{, jj}{, ff}{~vv}" format.name$ * 't := + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -376,7 +380,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -403,14 +408,18 @@ FUNCTION {format.editors} } 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 := "" @@ -522,9 +531,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -542,23 +553,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -736,7 +758,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -766,7 +788,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -787,6 +809,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -821,6 +844,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -836,6 +860,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -872,6 +897,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -900,6 +926,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -936,6 +963,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -974,6 +1002,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -990,6 +1019,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1007,6 +1037,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1025,6 +1056,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1062,6 +1094,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1079,6 +1112,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1091,6 +1125,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1166,12 +1201,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst index d52cc1f0bbd..94f0806f44e 100644 --- a/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst +++ b/Master/texmf-dist/bibtex/bst/babelbib/babunsrt.bst @@ -17,9 +17,11 @@ %% %% h.harders@tu-bs.de %% -%% 2005/09/01 v1.15 babelbib: multilingual bibliographies (HH) +%% 2005/11/13 v1.20 babelbib: multilingual bibliographies (HH) ENTRY { address + annote + annotelanguage author booktitle chapter @@ -150,26 +152,24 @@ FUNCTION {output.bibitem} { newline$ language empty$ { "empty language in " cite$ * warning$ + "\expandafter\btxselectlanguage\expandafter {" + "\btxfallbacklanguage}" * language.state "nolanguage" = 'skip$ - { - "\expandafter\btxselectlanguage\expandafter {" - "\btxfallbacklanguage}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ "nolanguage" 'language.state := } - { language.state language = + { + "\btxselectlanguage {" language * "}" * + language.state language = 'skip$ - { "\btxselectlanguage {" language * "}" * write$ - newline$ - } + { duplicate$ write$ newline$ } if$ language 'language.state := } if$ - "\bibitem{" write$ + pop$ "\bibitem {" write$ cite$ write$ "}" write$ newline$ @@ -320,21 +320,24 @@ FUNCTION {lastnamefont} { "\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 {volumefont} { duplicate$ empty$ { pop$ "" } @@ -359,9 +362,10 @@ FUNCTION {format.names} { namesleft #0 > } { nameptr #1 > { - s nameptr "{ff~}{vv~}" format.name$ + s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$ s nameptr "{ll}" format.name$ lastnamefont * - s nameptr "{, jj}" format.name$ * 't := + s nameptr "{, jj}" format.name$ * + 't := namesleft #1 > { ", " * t namefont * } { numnames #2 > @@ -377,7 +381,8 @@ FUNCTION {format.names} } { s nameptr "{ll}" format.name$ lastnamefont - s nameptr "{,~jj}{, ff}{~vv}" format.name$ * namefont + s nameptr "{,~jj}{, ff{\btxfnamespacelong }}{~vv}" + format.name$ * namefont } if$ nameptr #1 + 'nameptr := @@ -404,14 +409,18 @@ FUNCTION {format.editors} } 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 := "" @@ -523,9 +532,11 @@ FUNCTION {format.edition} { "" } { output.state mid.sentence = - { edition "l" language.change.case "~\btxeditionlong {}" * } - { edition "t" language.change.case "~\btxeditionlong {}" * } + { edition "l" change.case$ } + { edition "t" change.case$ } if$ + "\btxnumerallong {" swap$ * + "}~\btxeditionlong {}" * } if$ } @@ -543,23 +554,34 @@ FUNCTION {format.issn} { "\btxISSN~\btxISSNfont {" issn * "}" * } if$ } - FUNCTION {format.url} { url empty$ { "" } { urldate empty$ - { "\btxurlfont{" url * "}" * } + { "{\latintext \btxurlfont {" url * "}}" * } { - "\btxurlfont{" url * - "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" * - urldate * "}}" * + "{\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} @@ -737,7 +759,7 @@ FUNCTION {format.book.crossref} { key titlefont * } if$ } - { "\Btxinlong {}\ " format.crossref.editor * } + { format.crossref.editor * } if$ " \cite{" * crossref * "}" * } @@ -767,7 +789,7 @@ FUNCTION {article} { output.bibitem format.authors "author" output.check after.authors - format.title "title" output.check + format.jtitle "title" output.check new.block crossref missing$ { journal @@ -788,6 +810,7 @@ FUNCTION {article} format.url output note output fin.entry + write.annote } FUNCTION {book} @@ -822,6 +845,7 @@ FUNCTION {book} format.url output note output fin.entry + write.annote } FUNCTION {booklet} @@ -837,6 +861,7 @@ FUNCTION {booklet} format.url output note output fin.entry + write.annote } FUNCTION {inbook} @@ -873,6 +898,7 @@ FUNCTION {inbook} format.url output note output fin.entry + write.annote } FUNCTION {incollection} @@ -901,6 +927,7 @@ FUNCTION {incollection} format.url output note output fin.entry + write.annote } FUNCTION {inproceedings} @@ -937,6 +964,7 @@ FUNCTION {inproceedings} format.url output note output fin.entry + write.annote } FUNCTION {conference} { inproceedings } @@ -975,6 +1003,7 @@ FUNCTION {manual} format.url output note output fin.entry + write.annote } FUNCTION {mastersthesis} @@ -991,6 +1020,7 @@ FUNCTION {mastersthesis} format.url output note output fin.entry + write.annote } FUNCTION {misc} @@ -1008,6 +1038,7 @@ FUNCTION {misc} format.url output note output fin.entry + write.annote empty.misc.check } @@ -1026,6 +1057,7 @@ FUNCTION {phdthesis} format.url output note output fin.entry + write.annote } FUNCTION {proceedings} @@ -1063,6 +1095,7 @@ FUNCTION {proceedings} format.url output note output fin.entry + write.annote } FUNCTION {techreport} @@ -1080,6 +1113,7 @@ FUNCTION {techreport} format.url output note output fin.entry + write.annote } FUNCTION {unpublished} @@ -1092,6 +1126,7 @@ FUNCTION {unpublished} note "note" output.check format.date output fin.entry + write.annote } FUNCTION {default.type} { misc } @@ -1167,12 +1202,14 @@ FUNCTION {begin.bib} " \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$ } EXECUTE {begin.bib} -- cgit v1.2.3