diff options
| author | Marius <mariausol@gmail.com> | 2012-10-19 01:20:13 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2012-10-19 01:20:13 +0300 |
| commit | 69d2352af4b60929b37fc49f3bdb263977016244 (patch) | |
| tree | db5eb11398e345dfa23b4c4500fb93575d2afb7c /tex/context/base/bibl-tra.mkiv | |
| parent | c18f7cbe51449a611ea1819fedd9a4ff18529b7d (diff) | |
| download | context-69d2352af4b60929b37fc49f3bdb263977016244.tar.gz | |
stable 2012.05.30 11:26
Diffstat (limited to 'tex/context/base/bibl-tra.mkiv')
| -rw-r--r-- | tex/context/base/bibl-tra.mkiv | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv index 08d8eb6fe..3531703ad 100644 --- a/tex/context/base/bibl-tra.mkiv +++ b/tex/context/base/bibl-tra.mkiv @@ -755,7 +755,7 @@ \ctxlua{bibtex.hacks.filterall()}} {\doif{\listparameter\c!criterium}\v!cite {\setuplist[pubs][\c!criterium=\v!here]}% - \strc_lists_place_current + \doplacestructurelist {pubs}% {\listparameter\c!criterium}% {\listparameter\c!number}% @@ -1244,7 +1244,7 @@ %D \type{\ixbibauthoryearref} stores the data in the macros %D \type{\currentbibauthor} and \type{\currentbibyear}. -\def\doifbibinteractionelse +\def\ifbibinteractionelse {\iflocation \edef\test{\bibalternative\c!interaction}% \ifx\test\v!stop @@ -1256,11 +1256,20 @@ \@EA\secondoftwoarguments \fi} +\def\ifbibinteractionelse + {\iflocation + \doifelse{\bibalternative\c!interaction}\v!stop + {\@EA\secondoftwoarguments} + {\@EA\firstoftwoarguments}% + \else + \@EA\secondoftwoarguments + \fi} + \def\bibmaybeinteractive#1#2% {\ifbibcitecompress #2% \else - \doifbibinteractionelse{\gotobiblink{#2}[#1]}{#2}% + \ifbibinteractionelse{\gotobiblink{#2}[#1]}{#2}% \fi} \def\bibauthoryearref[#1]% @@ -1351,7 +1360,7 @@ \gotobiblink{#1}[#1]} \def\bibgotoDOI#1#2% - {\doifbibinteractionelse + {\ifbibinteractionelse {\useURL[bibfooDoi#1][#2]% \useURL[bibfoo#1][http://dx.doi.org/#2]% \goto{\url[bibfooDoi#1]}[url(bibfoo#1)]} @@ -1374,7 +1383,7 @@ \bibalternative\v!right} \def\bibgotoURL#1#2% - {\doifbibinteractionelse + {\ifbibinteractionelse {\useURL[bibfoo#1][#2]\goto{\url[bibfoo#1]}[url(bibfoo#1)]} {\hyphenatedurl{#2}}} @@ -1402,7 +1411,7 @@ \def\dobibpageref#1% {\bibinsertrefsep - \doifbibinteractionelse + \ifbibinteractionelse {\atbiblink[#1]} {{\referencingfalse\at[#1]}}} @@ -1475,6 +1484,8 @@ %D And some defaults are loaded from bibl-apa: +\def\c!monthconversion{monthconversion} % todo + \setuppublications [\c!monthconversion=, \c!alternative=apa, @@ -1491,6 +1502,4 @@ % \appendtoks \preloadbiblist \to \everysetuppublications % \appendtoks \preloadbiblist \to \everystarttext -\let\ifbibinteractionelse\doifbibinteractionelse - \protect \endinput |