From f4ca072dc8bbae3f3891556ff24ba3f325029539 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 May 2015 22:51:22 +0000 Subject: context 20may15 git-svn-id: svn://tug.org/texlive/trunk@37464 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/context/base/publ-imp-aps.mkvi | 67 +++++++++++++++------- 1 file changed, 46 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/tex/context/base/publ-imp-aps.mkvi') diff --git a/Master/texmf-dist/tex/context/base/publ-imp-aps.mkvi b/Master/texmf-dist/tex/context/base/publ-imp-aps.mkvi index 28af82e748b..71b0dc1855c 100644 --- a/Master/texmf-dist/tex/context/base/publ-imp-aps.mkvi +++ b/Master/texmf-dist/tex/context/base/publ-imp-aps.mkvi @@ -33,15 +33,15 @@ [aps] [\c!default=default, \c!specification=aps, - \c!otherstext={\space{\it\btxlabeltext{aps:others}}}, + \c!otherstext={\btxspace{\it\btxlabeltext{aps:others}}}, \c!etallimit=10, \c!etaldisplay=\btxparameter\c!etallimit, %c!journalconversion=\v!normal, \c!monthconversion=\v!month, \c!title=\v!yes, - \c!separator:names:2={,\space}, - \c!separator:names:3={,\space\btxlabeltext{aps:and}\space}, % not \textampersand - \c!separator:names:4= {\space\btxlabeltext{aps:and}\space}] % not \textampersand + \c!separator:names:2={\btxcomma}, + \c!separator:names:3={\btxcomma\btxlabeltext{aps:and}\space}, + \c!separator:names:4={\btxspace\btxlabeltext{aps:and}\space}] % First, define and set list and rendering parameters @@ -83,9 +83,9 @@ \definebtx [aps:\s!list:\s!page] [aps:\s!list] - [\c!separator:2={,\space}, - \c!separator:3={,\space\btxlabeltext{aps:and}\space}, - \c!separator:4={\space\btxlabeltext{aps:and}\space}, + [\c!separator:2={\btxcomma}, + \c!separator:3={\btxcomma\btxlabeltext{aps:and}\space}, + \c!separator:4={\btxspace\btxlabeltext{aps:and}\space}, \c!left={\btxleftparenthesis}, \c!right={\btxrightparenthesis}, \c!command={\wordright}] @@ -247,10 +247,36 @@ \definebtx [aps:\s!cite] [aps] - [\c!authorconversion=\v!name, + [\c!alternative=num, + \c!authorconversion=\v!name, \c!compress=\v!yes, \c!sorttype=normal] +\definebtx + [aps:\s!cite:name] + [aps:\s!cite] + [\c!authorconversion=\v!name] + +\definebtx + [aps:\s!cite:inverted] + [aps:\s!cite] + [\c!authorconversion=\v!invertedshort] + +\definebtx + [aps:\s!cite:invertedshort] + [aps:\s!cite] + [\c!authorconversion=\v!invertedshort] + +\definebtx + [aps:\s!cite:normalshort] + [aps:\s!cite] + [\c!authorconversion=\v!normalshort] + +\definebtx + [aps:\s!cite:normal] + [aps:\s!cite] + [\c!authorconversion=\v!normal] + \definebtx [aps:\s!cite:author] [aps:\s!cite] @@ -260,14 +286,14 @@ [aps:\s!cite:author] [\c!left={(}, \c!right={)}, - \c!inbetween={,\space}] + \c!inbetween={\btxcomma}] \definebtx [aps:\s!cite:authoryears] [aps:\s!cite:authoryear] [\c!left=, \c!right=, - \c!inbetween={\space}] + \c!inbetween={\btxspace}] \definebtx [aps:\s!cite:authornum] @@ -278,7 +304,7 @@ \definebtx [aps:\s!cite:author:num] % todo [aps:\s!cite:authornum] - [\c!left={\space[}, + [\c!left={\btxspace[}, \c!right={]}] \definebtx @@ -291,7 +317,7 @@ [aps:\s!cite:author:years] % todo [aps:\s!cite:authoryears] [\c!inbetween=, - \c!left={\space(}, + \c!left={\btxspace(}, \c!right={)}] \definebtx @@ -326,9 +352,9 @@ [aps:\s!cite] [\c!left=, \c!right=, - \c!separator:2={,\space}, % :0 and :1 - between items of a list - \c!separator:3={,\space\btxlabeltext{aps:and}\space}, % not \textampersand - \c!separator:4= {\space\btxlabeltext{aps:and}\space}] % not \textampersand + \c!separator:2={\btxcomma}, % :0 and :1 - between items of a list + \c!separator:3={\btxcomma\btxlabeltext{aps:and}\space}, + \c!separator:4={\btxspace\btxlabeltext{aps:and}\space}] \definebtx [aps:\s!cite:pages] @@ -381,17 +407,17 @@ [aps:\s!cite:num] [\c!left={Ref.\nbsp}, \c!command=, - \c!separator:2={,\space}, - \c!separator:3={\space\btxlabeltext{aps:and}\space}, - \c!separator:4={\space\btxlabeltext{aps:and}\space}] + \c!separator:2={\btxcomma}, + \c!separator:3={\btxspace\btxlabeltext{aps:and}\space}, + \c!separator:4={\btxspace\btxlabeltext{aps:and}\space}] \definebtx [aps:\s!cite:entry] [aps:\s!cite] [\c!left=, \c!right=, - \c!inbetween={\space}, - \c!separator:2={;\space}, + \c!inbetween={\btxspace}, + \c!separator:2={\btxsemicolon}, \c!separator:3=\btxparameter{\c!separator:2}, \c!separator:4=\btxparameter{\c!separator:2}] @@ -816,7 +842,6 @@ \else #text \fi - \stoptexdefinition % Then setups, by category -- cgit v1.2.3