diff options
author | Marius <mariausol@gmail.com> | 2011-11-21 19:40:15 +0200 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2011-11-21 19:40:15 +0200 |
commit | 411958915524daa27f2ef8cd6299b31191d88572 (patch) | |
tree | 38a8d7efa7a757c8afdd92bbb17af4d72d9e8d4e /tex/context/base/strc-ref.mkvi | |
parent | ed9ce64970b8efbaf358d7383eb4b65277201756 (diff) | |
download | context-411958915524daa27f2ef8cd6299b31191d88572.tar.gz |
beta 2011.11.21 18:27
Diffstat (limited to 'tex/context/base/strc-ref.mkvi')
-rw-r--r-- | tex/context/base/strc-ref.mkvi | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index 581c1333e..e285a1a8d 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -1323,10 +1323,10 @@ \let\useexternaldocument\usefile \def\do_use_url[#label][#url][#file][#description]% - {\ctxlua{structures.references.urls.define("#label",\!!bs\detokenize{#url}\!!es,\!!bs\detokenize{#file}\!!es,\!!bs\detokenize{#description}\!!es)}} + {\ctxcommand{useurl("#label",\!!bs\detokenize{#url}\!!es,\!!bs\detokenize{#file}\!!es,\!!bs\detokenize{#description}\!!es)}} \def\do_use_file[#label][#file][#description]% - {\ctxlua{structures.references.files.define("#label",\!!bs\detokenize{#file}\!!es,\!!bs\detokenize{#description}\!!es)}} + {\ctxcommand{usefile("#label",\!!bs\detokenize{#file}\!!es,\!!bs\detokenize{#description}\!!es)}} \def\doifurldefinedelse #label{\ctxcommand{doifurldefinedelse ("#label")}} \def\doiffiledefinedelse#label{\ctxcommand{doiffiledefinedelse("#label")}} @@ -1356,11 +1356,9 @@ \begingroup \dosetfontattribute\??ur\c!style \dosetcolorattribute\??ur\c!color - \hyphenatedurl{\ctxlua{structures.references.urls.get("#label","\@@uralternative","\@@urspace")}}% + \hyphenatedurl{\ctxcommand{geturl("#label")}}% \endgroup} -% # fails - %D This macro is hooked into a support macro, and thereby %D \URL's break ok, according to the setting of a switch, %D @@ -1375,30 +1373,13 @@ %D Such an \URL\ is, depending on the settings, hyphenated as: %D %D \getbuffer -%D -%D \startlinecorrection -%D \hbox to \hsize -%D {\hss\en -%D \setupreferencing[urlalternative=both]% -%D \vbox{\hsize.25cm\hbox{\bf both}\prewordbreak\url[test]}% -%D \hss -%D \setupreferencing[urlalternative=before]% -%D \vbox{\hsize.25cm\hbox{\bf before}\prewordbreak\url[test]}% -%D \hss -%D \setupreferencing[urlalternative=after]% -%D \vbox{\hsize.25cm\hbox{\bf after}\prewordbreak\url[test]}% -%D \hss} -%D \stoplinecorrection -%D -%D By setting \type{urlspace=yes} one can get slightly better -%D spacing when using very long \URL's. -%D + %D When defining the external source of information, one can %D also specify a suitable name (the last argument). This name %D can be called upon with: %D %D \showsetup{from} - +%D %D We keep this for compatibility reasons, hence the hackery. \unexpanded\def\reference_from @@ -1597,15 +1578,11 @@ \c!export=\v!no] \setupurl - [\c!alternative=\v!both, - \c!space=\v!no, - \c!style=\v!type, + [\c!style=\v!type, \c!color=] \setupprograms [\c!directory=, - \c!alternative=\v!both, - \c!space=\v!no, \c!style=\v!type, \c!color=] |