diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-09 23:31:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-09 23:31:15 +0000 |
commit | 215b9a864d5829070bdc66ba736986eb72e5143e (patch) | |
tree | fe0882c81fc4ec945cee4b512f72eaa21ea5f791 /Master/texmf-dist/tex/latex/expl3/l3xref.sty | |
parent | df90ec06321940c2f066b05e12f1b5ab099105da (diff) |
expl3 1407 (9jun09)
git-svn-id: svn://tug.org/texlive/trunk@13686 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3xref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3xref.sty | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3xref.sty b/Master/texmf-dist/tex/latex/expl3/l3xref.sty index 4635b63f382..98a3ca09251 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3xref.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3xref.sty @@ -15,7 +15,7 @@ %% Do not distribute a modified version of this file. %% %% -%% File: l3xref.dtx Copyright (C) 2006 LaTeX3 project +%% File: l3xref.dtx Copyright (C) 2006,2009 LaTeX3 project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -33,7 +33,7 @@ %% %% The development version of the bundle can be found at %% -%% http://www.latex-project.org/cgi-bin/cvsweb.cgi/ +%% http://www.latex-project.org/svnroot/experimental/trunk/ %% %% for those people who are interested. %% @@ -48,62 +48,60 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3xref.dtx 621 2007-09-01 20:14:19Z morten $ +\GetIdInfo$Id: l3xref.dtx 1362 2009-05-28 20:19:21Z joseph $ {L3 Experimental cross referencing} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} -\RequirePackage{l3quark} -\RequirePackage{l3toks} -\RequirePackage{l3io} -\RequirePackage{l3prop} -\RequirePackage{l3int} -\RequirePackage{l3token} -\prop_new:N \g_xref_all_curr_immediate_fields_plist -\prop_new:N \g_xref_all_curr_deferred_fields_plist -\def_new:Npn \xref_new:nn {\xref_new_aux:nnn{immediate}} -\def_new:Npn \xref_deferred_new:nn {\xref_new_aux:nnn{deferred}} -\def_new:Npn \xref_new_aux:nnn #1#2#3{ - \prop_gput:ccx {g_xref_all_curr_ #1 _fields_plist} +\package_check_loaded_expl: +\prop_new:N \g_xref_all_curr_immediate_fields_prop +\prop_new:N \g_xref_all_curr_deferred_fields_prop +\cs_new_nopar:Npn \xref_new:nn {\xref_new_aux:nnn{immediate}} +\cs_new_nopar:Npn \xref_deferred_new:nn {\xref_new_aux:nnn{deferred}} +\cs_new_nopar:Npn \xref_new_aux:nnn #1#2#3{ + \prop_gput:ccx {g_xref_all_curr_ #1 _fields_prop} { xref_ #2 _key } - { \exp_not:c {l_xref_curr_#2_tlp }} - \def_protected:cpn { xref_#2_key }{} - \tlp_new:cn{l_xref_curr_#2_tlp}{#3} + { \exp_not:c {l_xref_curr_#2_tl }} + \cs_set_protected_nopar:cpn { xref_#2_key }{} + \tl_new:cn{l_xref_curr_#2_tl}{#3} \toks_set:Nx \l_tmpa_toks { - \exp_not:n { \def:cpn {xref_get_value_#2_aux:w} ##1 } + \exp_not:n { \cs_set_nopar:cpn {xref_get_value_#2_aux:w} ##1 } + \exp_not:N \q_prop \exp_not:c { xref_#2_key } + \exp_not:N \q_prop } \toks_use:N \l_tmpa_toks ##2 ##3\q_nil {##2} } -\def_new:Npn \xref_get_value:nn #1#2 { - \cs_if_really_free:cTF{g_xref_#2_plist} - {??} +\cs_new_nopar:Npn \xref_get_value:nn #1#2 { + \cs_if_exist:cTF{g_xref_#2_prop} { - \exp_args:NcNc \exp_after:NN {xref_get_value_#1_aux:w} - \prop_use:N {g_xref_#2_plist} + \exp_args:NcNc \exp_after:wN {xref_get_value_#1_aux:w} + \toks_use:N {g_xref_#2_prop} \q_nil } + {??} } -\def:NNn \exp_after:cc 2 { - \exp_after:NN \exp_after:NN - \cs:w #1\exp_after:NN\cs_end: \cs:w #2\cs_end: +\cs_set_nopar:Npn \exp_after:cc #1#2 { + \exp_after:wN \exp_after:wN + \cs:w #1\exp_after:wN\cs_end: \cs:w #2\cs_end: } -\def_protected_new:Npn \xref_define_label:nn { +\cs_set_protected:Npn \q_prop {\q_prop} +\cs_new_protected_nopar:Npn \xref_define_label:nn { \group_begin: \char_set_catcode:nn {`\ }\c_ten \xref_define_label_aux:nn } -\def_new:Npn \xref_define_label_aux:nn #1#2 { - \cs_if_really_free:cTF{g_xref_#1_plist} - {\prop_new:c{g_xref_#1_plist}}{\WARNING} - \toks_gset:cn{g_xref_#1_plist}{#2} +\cs_new_nopar:Npn \xref_define_label_aux:nn #1#2 { + \cs_if_free:cTF{g_xref_#1_prop} + {\prop_new:c{g_xref_#1_prop}}{\WARNING} + \toks_gset:cn{g_xref_#1_prop}{#2} \group_end: } -\def:Npn \xref_set_label:n #1{ - \def:Npx \tmp:w{\prop_use:N\g_xref_all_curr_immediate_fields_plist} - \exp_args:NNx\iow_deferred_expanded:Nn \xref_write{ +\cs_set_nopar:Npn \xref_set_label:n #1{ + \cs_set_nopar:Npx \xref_tmp:w{\toks_use:N\g_xref_all_curr_immediate_fields_prop} + \exp_args:NNx\iow_shipout_x:Nn \xref_write{ \xref_define_label:nn {#1} { - \tmp:w - \prop_use:N \g_xref_all_curr_deferred_fields_plist + \xref_tmp:w + \toks_use:N \g_xref_all_curr_deferred_fields_prop } } } |