From 66f6f7f59a221b7c1189fc36c479b2f4c881cc36 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Oct 2009 23:17:58 +0000 Subject: babelbib 1.29 (11oct09) git-svn-id: svn://tug.org/texlive/trunk@15783 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/babelbib/babelbib.dtx | 394 ++++++++++++++++++--- .../texmf-dist/source/latex/babelbib/babelbib.xml | 4 +- 2 files changed, 341 insertions(+), 57 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/babelbib/babelbib.dtx b/Master/texmf-dist/source/latex/babelbib/babelbib.dtx index f8316169145..9ed047d1eea 100644 --- a/Master/texmf-dist/source/latex/babelbib/babelbib.dtx +++ b/Master/texmf-dist/source/latex/babelbib/babelbib.dtx @@ -17,7 +17,7 @@ {\let\toprule\hline \let\midrule\hline \let\bottomrule\hline} -\IfFileExists{babelbib.sty}{\usepackage{babelbib} +\IfFileExists{babelbib.sty}{\usepackage[fixlanguage]{babelbib} \let\babelbibSTYfound\active}{\GenericWarning{babelbib.dtx}{Package file babelbib.sty not found (Documentation will be messed up!^^J^^A Generate babelbib.sty by LaTeXing babelbib.ins, process @@ -42,10 +42,11 @@ \CodelineIndex \DoNotIndex{\def,\edef,\let,\newcommand,\newenvironment,\newcounter} \DoNotIndex{\setcounter,\space,\",\@empty,\begin,\end,\iffalse,\fi,\extras} -\DoNotIndex{\bibs,\ifx,\else,\fi,\ ,\ae,\emph,\input} +\DoNotIndex{\bibs,\ifx,\else,\fi,\ ,\ae,\emph,\input,\foreignlanguage} +\DoNotIndex{\IeC,\cyrv,\CYRV,\cyrt,\CYRT,\cyrya,\protect} \CodelineNumbered \RecordChanges -\CheckSum{12203} +\CheckSum{12293} \hyphenation{bib-lio-gra-phy} \begin{document} \DocInput{babelbib.dtx} @@ -134,6 +135,11 @@ % not in Brazilian}% % \changes{1.27}{2009/06/19}{Fixed publisherfont in babamspl.bst}% % \changes{1.27}{2009/06/19}{Added Russian language}% +% \changes{1.28}{2009/07/05}{Corrected Diciembre in Spanish language}% +% \changes{1.28}{2009/07/05}{Automatic formatting of month year +% combinations (either ``June 2009'' or ``06/2009'')}% +% \changes{1.28}{2009/07/05}{Some corrections in Brazilian Portuguese}% +% \changes{1.29}{2009/10/10}{Fix output of ``urldate''}% % % \maketitle % \begin{abstract} @@ -594,6 +600,155 @@ % an eMail. % % +% \subsection{Printing of month and year} +% +% \DescribeMacro{datename}% +% Starting with version 1.29, |babelbib| prints dates in the format +% ``MMM YYYY' with the name of the month in case the month is +% specified in an bibliography entry by default (or by using the +% package option |datename|). +% For example, +% \begin{verbatim} +%@Manual{baeker1998a, +% title = {Automatische Neuvernetzung mit ABAQUS/Standard -- Technik +% und Anwendungen}, +% author = {B\"aker, M.}, +% organization = {Institut f\"ur Werkstoffe, Technische Universit\"at +% Braunschweig}, +% address = {Braunschweig}, +% month = oct, +% year = 1998, +% language = {ngerman} +%} +% +%@TechReport{aurenhammer1996a, +% author = {Aurenhammer, F. and Klein, R.}, +% title = {Voronoi Diagrams}, +% institution = {FernUniversit\"at Gesamthochschule in Hagen}, +% year = 1996, +% number = 198, +% month = 5, +% language = {english} +%}\end{verbatim} +% results in +% \begingroup +% \def\section*#1{} +% \begin{thebibliography}{1} +% \providebibliographyfont{name}{}% +% \providebibliographyfont{title}{\emph}% +% \providebibliographyfont{etal}{\emph}% +% \providebibliographyfont{volume}{}% +% \providebibliographyfont{ISBN}{\MakeUppercase}% +% \providebibliographyfont{ISSN}{\MakeUppercase}% +% \providebibliographyfont{url}{\url}% +% +% \btxselectlanguage {ngerman} +% \bibitem {baeker1998a} +% \btxnamefont {\btxlastnamefont {B\"aker}, M.}\btxauthorcolon\ \btxtitlefont +% {Automatische Neuvernetzung mit ABAQUS/Standard -- Technik und Anwendungen}. +% \newblock Institut f\"ur Werkstoffe, Technische Universit\"at Braunschweig, +% Braunschweig, \btxprintmonthyear{.}{10}{1998}{long}. +%\bibitem {aurenhammer1996a} +%\btxnamefont {\btxlastnamefont {Aurenhammer}, F.} \btxandlong {}\ \btxnamefont +% {R. \btxlastnamefont {Klein}}\btxauthorcolon\ \btxtitlefont +% {\btxifchangecase {Voronoi diagrams}{Voronoi Diagrams}}. +% \newblock \Btxtechreplong {}\ 198, FernUniversit\"at Gesamthochschule +% in Hagen, +% \btxprintmonthyear{.}{5}{1996}{long}. +% \end{thebibliography} +% \endgroup +% Note that this conversion only works if you specify the month using +% the predefined macro names |jan|, |feb|, etc.\ or if you specify the +% month numerically (|1|, |2|, |3|, etc.). +% If you use strings (e.\,g., ``January''), the handling of months +% does not work so that month and year are printed as given in any +% case. +% +% Whether the full name (e.\,g., ``October'') or an abbreviation +% (e.\,g., ``Oct.'') is printed, is determined by the bibliography +% style (|.bst|). +% +% +% \DescribeMacro{datenumeric}% +% By loading |babelbib| with the package option |datenumeric|, the +% month is converted to a number. +% Currently, the output format is ``MM/YYYY'' in all languages. +% The result looks as follows: +% \begingroup +% \def\section*#1{} +% \makeatletter +% \btx@datenumeric +% \makeatother +% \begin{thebibliography}{1} +% \providebibliographyfont{name}{}% +% \providebibliographyfont{title}{\emph}% +% \providebibliographyfont{etal}{\emph}% +% \providebibliographyfont{volume}{}% +% \providebibliographyfont{ISBN}{\MakeUppercase}% +% \providebibliographyfont{ISSN}{\MakeUppercase}% +% \providebibliographyfont{url}{\url}% +% +% \btxselectlanguage {ngerman} +% \bibitem {baeker1998a} +% \btxnamefont {\btxlastnamefont {B\"aker}, M.}\btxauthorcolon\ \btxtitlefont +% {Automatische Neuvernetzung mit ABAQUS/Standard -- Technik und Anwendungen}. +% \newblock Institut f\"ur Werkstoffe, Technische Universit\"at Braunschweig, +% Braunschweig, \btxprintmonthyear{.}{10}{1998}{long}. +%\bibitem {aurenhammer1996a} +%\btxnamefont {\btxlastnamefont {Aurenhammer}, F.} \btxandlong {}\ \btxnamefont +% {R. \btxlastnamefont {Klein}}\btxauthorcolon\ \btxtitlefont +% {\btxifchangecase {Voronoi diagrams}{Voronoi Diagrams}}. +% \newblock \Btxtechreplong {}\ 198, FernUniversit\"at Gesamthochschule +% in Hagen, +% \btxprintmonthyear{.}{5}{1996}{long}. +% \end{thebibliography} +% \endgroup +% +% \DescribeMacro{\btxprintmonthyearnum}% +% If you don't like the used format, you might change it by redefining +% the macro \cs{btxprintmonthyearnum} for your language as follows: +% \begin{verbatim} +%\declarebtxcommands{danish}{% +% \def\btxprintmonthyearnum#1#2{#1-#2}% +%}\end{verbatim} +% Here, the first argument is the month, the second the year. +% +% \DescribeMacro{dateasis}% +% By loading |babelbib| with the package option |dateasis|, the month +% is printed as specified in the |bib| file in the format ``MMM YYYY''. +% Beware that the internal macro names |jan|, |feb|, etc.\ are handled +% as numbers so that following output is gained: +% \begingroup +% \def\section*#1{} +% \makeatletter +% \btx@dateasis +% \makeatother +% \begin{thebibliography}{1} +% \providebibliographyfont{name}{}% +% \providebibliographyfont{title}{\emph}% +% \providebibliographyfont{etal}{\emph}% +% \providebibliographyfont{volume}{}% +% \providebibliographyfont{ISBN}{\MakeUppercase}% +% \providebibliographyfont{ISSN}{\MakeUppercase}% +% \providebibliographyfont{url}{\url}% +% +% \btxselectlanguage {ngerman} +% \bibitem {baeker1998a} +% \btxnamefont {\btxlastnamefont {B\"aker}, M.}\btxauthorcolon\ \btxtitlefont +% {Automatische Neuvernetzung mit ABAQUS/Standard -- Technik und Anwendungen}. +% \newblock Institut f\"ur Werkstoffe, Technische Universit\"at Braunschweig, +% Braunschweig, \btxprintmonthyear{.}{10}{1998}{long}. +%\bibitem {aurenhammer1996a} +%\btxnamefont {\btxlastnamefont {Aurenhammer}, F.} \btxandlong {}\ \btxnamefont +% {R. \btxlastnamefont {Klein}}\btxauthorcolon\ \btxtitlefont +% {\btxifchangecase {Voronoi diagrams}{Voronoi Diagrams}}. +% \newblock \Btxtechreplong {}\ 198, FernUniversit\"at Gesamthochschule +% in Hagen, +% \btxprintmonthyear{.}{5}{1996}{long}. +% \end{thebibliography} +% \endgroup +% +% % % \section{How to add new languages} % @@ -760,8 +915,8 @@ % \end{macrocode} % Version information unique for all generated files: % \begin{macrocode} -% [2009/06/18 v1.27 babelbib: multilingual bibliographies (HH)] -%%% 2009/06/18 v1.27 babelbib: multilingual bibliographies (HH) +% [2009/10/10 v1.29 babelbib: multilingual bibliographies (HH)] +%%% 2009/10/10 v1.29 babelbib: multilingual bibliographies (HH) % \end{macrocode} % % \subsection{The package itself} @@ -806,6 +961,47 @@ % \end{macrocode} % \end{macro} % \end{macro} +% +% \begin{macro}{\bbbbifundefined} +% \begin{macrocode} +\newcommand\btxprintmonthyear[4]{} +\newcommand*\btx@dateasis{% + \def\btxprintmonthyear##1##2##3##4{##2\ ##3}% +} +\newcommand*\btx@datenumeric{% + \def\btxprintmonthyear##1##2##3##4{% + \ifnumber{##2}{\btxprintmonthyearnum{##2}{##3}}{##2\ ##3}}% +} +\newcommand*\btx@datename{% + \def\btxprintmonthyear##1##2##3##4{% + \ifnumber{##2}{% + \ifcase ##2 \or + \csname btxmonjan##4\endcsname{##1}\or + \csname btxmonfeb##4\endcsname{##1}\or + \csname btxmonmar##4\endcsname{##1}\or + \csname btxmonapr##4\endcsname{##1}\or + \csname btxmonmay##4\endcsname{##1}\or + \csname btxmonjun##4\endcsname{##1}\or + \csname btxmonjul##4\endcsname{##1}\or + \csname btxmonaug##4\endcsname{##1}\or + \csname btxmonsep##4\endcsname{##1}\or + \csname btxmonoct##4\endcsname{##1}\or + \csname btxmonnov##4\endcsname{##1}\or + \csname btxmondec##4\endcsname{##1}\or + \PackageError{babelbib}{% + Month outside range 1 to 12 used}{% + Better use the BibTeX names jan, feb, mar, etc.}% + \fi + \ ##3% + }{% + ##2\ ##3}% + }% +} +\DeclareOption{dateasis}{\btx@dateasis} +\DeclareOption{datenumeric}{\btx@datenumeric} +\DeclareOption{datename}{\btx@datename} +% \end{macrocode} +% \end{macro} % If additional options are given, try to load these as % languages. This is implemented in order to be able to use a new % language that is not yet supported by the official |babelbib|. @@ -823,7 +1019,7 @@ % \end{macrocode} % Default options. % \begin{macrocode} -\ExecuteOptions{varlanguage,nolanguagenames,noannote,isbn,issn} +\ExecuteOptions{varlanguage,nolanguagenames,noannote,isbn,issn,datename} % \end{macrocode} % Process the given options. % \begin{macrocode} @@ -1620,6 +1816,10 @@ \def\btxnumeralshort##1{\btxnumeraldot{#1}{##1}}% \def\btxnumerallong##1{\btxnumeraldot{#1}{##1}}% % \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% +% \end{macrocode} % A command that just puts some user defined text in the language of % the keywords. % \begin{macrocode} @@ -1844,6 +2044,10 @@ \def\btxnumeralshort##1{\protect\foreignlanguage{#1}{% \ifnumber{##1}{##1\textsuperscript{a}}{##1}}}% \def\btxnumerallong##1{\btxnumeralshort{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{ingl\'es}}% @@ -2007,6 +2211,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralenglish{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralenglish{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% % \end{macrocode} % \changes{0.2}{2003/04/20}{Added language names}% @@ -2187,6 +2395,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% % \end{macrocode} % \changes{0.2}{2003/04/20}{Added placeholders for language names}% @@ -2355,6 +2567,10 @@ \ifcase##1 ##1h\or pr'wth\or de'uterh\or tr'ith\or t'etarth% \or p'empth\or 'ekth\or 'ebdomh\or 'ogdoh\or 'enath\else ##1h\fi }{##1}}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% % \end{macrocode} % Names of all known languages in the current language. @@ -2513,6 +2729,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% % \end{macrocode} % Names of all known languages in the current language. @@ -2683,6 +2903,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfrench{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfrench{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% % \end{macrocode} % Names of all known languages in the current language. @@ -2982,6 +3206,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{\IeC @@ -3228,7 +3456,7 @@ \def\btxmonseplong##1{\protect\foreignlanguage{#1}{Septiembre}}% \def\btxmonoctlong##1{\protect\foreignlanguage{#1}{Octubre}}% \def\btxmonnovlong##1{\protect\foreignlanguage{#1}{Noviembre}}% - \def\btxmondeclong##1{\protect\foreignlanguage{#1}{Deciembre}}% + \def\btxmondeclong##1{\protect\foreignlanguage{#1}{Diciembre}}% \def\btxmonjanshort##1{\protect\foreignlanguage{#1}{Ene##1{}}}% \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Feb##1{}}}% \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{Mar##1{}}}% @@ -3270,6 +3498,10 @@ % \def\btxnumeralshort##1{\ifnumber{##1}{\protect\foreignlanguage{#1}{% % ##1\ifcase##1 \ieme\or \iere\else \ieme\fi}}{##1}}% \def\btxnumerallong##1{\btxnumeralshort{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{ingl\'es}}% @@ -3431,6 +3663,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engelsk}}% @@ -3583,6 +3819,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{englanti}}% @@ -3742,6 +3982,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{angla}}% @@ -3867,7 +4111,7 @@ \def\btxmonjanshort##1{\protect\foreignlanguage{#1}{Jan##1{}}}% \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{Fev##1{}}}% \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{Mar##1{}}}% - \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{Apr##1{}}}% + \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{Abr##1{}}}% \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{Maio}}% \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{Jun##1{}}}% \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{Jul##1{}}}% @@ -3902,7 +4146,11 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\protect\foreignlanguage{#1}{% \ifnumber{##1}{##1\textsuperscript{\underline a}}{##1}}}% - \def\btxnumerallong##1{\btxnumeralshort{#1}{##1}}% + \def\btxnumerallong##1{\btxnumeralshort{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{ingl\^es}}% @@ -3973,8 +4221,8 @@ \def\btxmonjanshort##1{\protect\foreignlanguage{#1}{jan##1{}}}% \def\btxmonfebshort##1{\protect\foreignlanguage{#1}{fev##1{}}}% \def\btxmonmarshort##1{\protect\foreignlanguage{#1}{mar##1{}}}% - \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{apr##1{}}}% - \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{maio}}% + \def\btxmonaprshort##1{\protect\foreignlanguage{#1}{abr##1{}}}% + \def\btxmonmayshort##1{\protect\foreignlanguage{#1}{mai##1{}}}% \def\btxmonjunshort##1{\protect\foreignlanguage{#1}{jun##1{}}}% \def\btxmonjulshort##1{\protect\foreignlanguage{#1}{jul##1{}}}% \def\btxmonaugshort##1{\protect\foreignlanguage{#1}{ago##1{}}}% @@ -3982,6 +4230,11 @@ \def\btxmonoctshort##1{\protect\foreignlanguage{#1}{out##1{}}}% \def\btxmonnovshort##1{\protect\foreignlanguage{#1}{nov##1{}}}% \def\btxmondecshort##1{\protect\foreignlanguage{#1}{dez##1{}}}% + \def\btxpageshort##1{\protect\foreignlanguage{#1}{p##1{}}}% + \def\btxpagesshort##1{\protect\foreignlanguage{#1}{pp##1{}}}% + \def\Btxpageshort##1{\protect\foreignlanguage{#1}{P##1{}}}% + \def\Btxpagesshort##1{\protect\foreignlanguage{#1}{Pp##1{}}}% + \def\btxurldatecomment##1{\protect\foreignlanguage{#1}{, acesso em ##1}}% } % \end{macrocode} % Append the definitions to the language-calling commands. @@ -4097,6 +4350,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engels}}% @@ -4260,6 +4517,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{engelska}}% @@ -4421,6 +4682,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameafrikaans{\protect\foreignlanguage{#1}{afrikaans}}% @@ -4598,6 +4863,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{inggris}}% @@ -4751,6 +5020,10 @@ \def\btxfnamespacelong{ }% \def\btxnumeralshort##1{\btxnumeralfallback{#1}{##1}}% \def\btxnumerallong##1{\btxnumeralfallback{#1}{##1}}% +% \end{macrocode} +% Define how to print month and year in numeric format, e.\,g. MM/YYYY. +% \begin{macrocode} + \def\btxprintmonthyearnum##1##2{##1/##2}% \def\btxkeywordlanguage##1{{\protect\selectlanguage{#1}##1}}% \ifbbbblanguagenames \def\btxlanguagenameamerican{\protect\foreignlanguage{#1}{angl\`es}}% @@ -5500,7 +5773,18 @@ FUNCTION {format.date} } { month empty$ 'year - { month "\ " * year * } +% +%<*bststd&!bstshort> + { "\btxprintmonthyear{.}{" + month * "}{" * year * "}{long}" * + } +% +%<*bststd&bstshort> + { "\btxprintmonthyear{.}{" + month * "}{" * year * "}{short}" * + } +% +%<*bststd> if$ } if$ @@ -5662,9 +5946,8 @@ FUNCTION {format.url} urldate empty$ { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont{" url * "}}%" * - newline$ output - "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" + "{\latintext \btxurlfont{" url * "}}\empty " * + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * urldate * "}}}" * } if$ @@ -6404,18 +6687,18 @@ FUNCTION {default.type} { misc } % Months and journals: % \begin{macrocode} %<*bststd&!bstshort> -MACRO {jan} {"\btxmonjanlong {}"} -MACRO {feb} {"\btxmonfeblong {}"} -MACRO {mar} {"\btxmonmarlong {}"} -MACRO {apr} {"\btxmonaprlong {}"} -MACRO {may} {"\btxmonmaylong {}"} -MACRO {jun} {"\btxmonjunlong {}"} -MACRO {jul} {"\btxmonjullong {}"} -MACRO {aug} {"\btxmonauglong {}"} -MACRO {sep} {"\btxmonseplong {}"} -MACRO {oct} {"\btxmonoctlong {}"} -MACRO {nov} {"\btxmonnovlong {}"} -MACRO {dec} {"\btxmondeclong {}"} +MACRO {jan} {"1"} +MACRO {feb} {"2"} +MACRO {mar} {"3"} +MACRO {apr} {"4"} +MACRO {may} {"5"} +MACRO {jun} {"6"} +MACRO {jul} {"7"} +MACRO {aug} {"8"} +MACRO {sep} {"9"} +MACRO {oct} {"10"} +MACRO {nov} {"11"} +MACRO {dec} {"12"} MACRO {acmcs} {"ACM Computing Surveys"} MACRO {acta} {"Acta Informatica"} MACRO {cacm} {"Communications of the ACM"} @@ -6439,18 +6722,18 @@ MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"} MACRO {tcs} {"Theoretical Computer Science"} % %<*bststd&bstshort> -MACRO {jan} {"\btxmonjanshort {.}"} -MACRO {feb} {"\btxmonfebshort {.}"} -MACRO {mar} {"\btxmonmarshort {.}"} -MACRO {apr} {"\btxmonaprshort {.}"} -MACRO {may} {"\btxmonmayshort {.}"} -MACRO {jun} {"\btxmonjunshort {.}"} -MACRO {jul} {"\btxmonjulshort {.}"} -MACRO {aug} {"\btxmonaugshort {.}"} -MACRO {sep} {"\btxmonsepshort {.}"} -MACRO {oct} {"\btxmonoctshort {.}"} -MACRO {nov} {"\btxmonnovshort {.}"} -MACRO {dec} {"\btxmondecshort {.}"} +MACRO {jan} {"1"} +MACRO {feb} {"2"} +MACRO {mar} {"3"} +MACRO {apr} {"4"} +MACRO {may} {"5"} +MACRO {jun} {"6"} +MACRO {jul} {"7"} +MACRO {aug} {"8"} +MACRO {sep} {"9"} +MACRO {oct} {"10"} +MACRO {nov} {"11"} +MACRO {dec} {"12"} MACRO {acmcs} {"ACM Comput.\ Surv.{}"} MACRO {acta} {"Acta Inf.{}"} MACRO {cacm} {"Commun. ACM"} @@ -7521,7 +7804,9 @@ FUNCTION {format.date} } { month empty$ 'year - { month "\ " * year * } + { "\btxprintmonthyear{.}{" + month * "}{" * year * "}{long}" * + } if$ } if$ @@ -7659,9 +7944,8 @@ FUNCTION {format.url} urldate empty$ { "{\latintext \btxurlfont{" url * "}}" * } { - "{\latintext \btxurlfont{" url * "}}%" * - newline$ output - "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" + "{\latintext \btxurlfont{" url * "}}\empty " * + "\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" * urldate * "}}}" * } if$ @@ -8148,18 +8432,18 @@ FUNCTION {unpublished} FUNCTION {default.type} { misc } -MACRO {jan} {"\btxmonjanlong {}"} -MACRO {feb} {"\btxmonfeblong {}"} -MACRO {mar} {"\btxmonmarlong {}"} -MACRO {apr} {"\btxmonaprlong {}"} -MACRO {may} {"\btxmonmaylong {}"} -MACRO {jun} {"\btxmonjunlong {}"} -MACRO {jul} {"\btxmonjullong {}"} -MACRO {aug} {"\btxmonauglong {}"} -MACRO {sep} {"\btxmonseplong {}"} -MACRO {oct} {"\btxmonoctlong {}"} -MACRO {nov} {"\btxmonnovlong {}"} -MACRO {dec} {"\btxmondeclong {}"} +MACRO {jan} {"1"} +MACRO {feb} {"2"} +MACRO {mar} {"3"} +MACRO {apr} {"4"} +MACRO {may} {"5"} +MACRO {jun} {"6"} +MACRO {jul} {"7"} +MACRO {aug} {"8"} +MACRO {sep} {"9"} +MACRO {oct} {"10"} +MACRO {nov} {"11"} +MACRO {dec} {"12"} READ diff --git a/Master/texmf-dist/source/latex/babelbib/babelbib.xml b/Master/texmf-dist/source/latex/babelbib/babelbib.xml index 66a3778fb32..bf6bd4c92cf 100644 --- a/Master/texmf-dist/source/latex/babelbib/babelbib.xml +++ b/Master/texmf-dist/source/latex/babelbib/babelbib.xml @@ -1,7 +1,7 @@ babelbib @@ -12,7 +12,7 @@ - 1.25 + 1.28 -- cgit v1.2.3