diff options
author | Karl Berry <karl@freefriends.org> | 2014-01-01 22:56:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-01-01 22:56:28 +0000 |
commit | 999dd6fa37bd291385b20ccf85f980eccfd2e683 (patch) | |
tree | 0556279ecc60a91218fc66f799180d9b30c6bf4a /Master/texmf-dist/source/latex/l3experimental/l3str | |
parent | 612e0aeaa3a96eceef8eb6e8de16fac2d6b4d8f0 (diff) |
l3 (1jan14)
git-svn-id: svn://tug.org/texlive/trunk@32537 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3str')
3 files changed, 9 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx index 82a8e0ae577..8e61c59d187 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: l3regex.dtx 4576 2013-07-24 21:40:24Z joseph $ +\GetIdInfo$Id: l3regex.dtx 4623 2013-12-14 13:53:40Z bruno $ {L3 Experimental regular expressions} %</driver|package> %<*driver> @@ -5444,7 +5444,6 @@ \c_one { \l_@@_submatch_int - \c_one } \@@_extract_seq_aux:n - \s_obj_end } \int_compare:nNnF { \flag_height:n { @@_begin } + \flag_height:n { @@_end } } diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-convert.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-convert.dtx index 19bad05b982..02b7a6cfc0e 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-convert.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-convert.dtx @@ -253,6 +253,8 @@ % % Encoding/escaping-related tasks. % \begin{itemize} +% \item Change \cs{str_set_convert:Nnnn} to expand its last two +% arguments. % \item Describe the internal format in the code comments. Refuse code % points in $[\hexnum{D800}, \hexnum{DFFF}]$ in the internal % representation? @@ -268,7 +270,8 @@ % 8-bit to Unicode, use $256$ integer registers; for encoding, use a % tree-box. % \item More encodings (see Heiko's \pkg{stringenc}). CESU? -% \item More escapings: shell escapes, lua escapes, etc? +% \item More escapings: \textsc{ascii85}, shell escapes, lua escapes, +% \emph{etc.}? % \end{itemize} % % \end{documentation} @@ -732,14 +735,14 @@ % \end{macro} % \end{macro} % -% \begin{macro}[int]{\@@_if_flag_times:nT} +% \begin{macro}[int, rEXP]{\@@_if_flag_times:nT} % At the end of each conversion step, we raise all relevant errors as % one error message, built on the fly. The height of each flag % indicates how many times a given error was encountered. This % function prints |#2| followed by the number of occurrences of an % error if it occurred, nothing otherwise. % \begin{macrocode} -\cs_new_protected:Npn \@@_if_flag_times:nT #1#2 +\cs_new:Npn \@@_if_flag_times:nT #1#2 { \flag_if_raised:nT {#1} { #2~(x \flag_height:n {#1} ) } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx index 92b3e1eebef..22a78320431 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3str-format.dtx @@ -548,7 +548,8 @@ { \tl_to_str:f { - \@@_seq:ff { \exp_after:wN \@@_seq_extract:w #1 } + \@@_seq:ff + { \exp_after:wN \use_i:nn \exp_after:wN \exp_stop_f: #1 } { \@@_parse:n {#2} } } } @@ -556,14 +557,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux, rEXP]{\@@_seq_extract:w} -% Extract the contents of a sequence as items of the form -% |\__seq_item:n| \Arg{item}. -% \begin{macrocode} -\cs_new:Npn \@@_seq_extract:w \s__seq #1 \s_obj_end { \exp_stop_f: #1 } -% \end{macrocode} -% \end{macro} -% % \begin{macro}[aux, EXP]{\@@_seq:nn, \@@_seq:ff} % The first argument is the contents of a \texttt{seq} variable. The % second is a parsed \meta{format specification}. Set up the loop. |