diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 4dfb03bd13c..777f595d34e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} %</driver> %<*driver|package> -\GetIdInfo$Id: l3file.dtx 5786 2015-08-05 16:18:39Z bruno $ +\GetIdInfo$Id: l3file.dtx 6037 2015-09-23 12:41:15Z joseph $ {L3 File and I/O operations} %</driver|package> %<*driver> @@ -92,7 +92,7 @@ % \begin{variable}{\g_file_current_name_tl} % Contains the name of the current \LaTeX{} file. This variable % should not be modified: it is intended for information only. It -% will be equal to \cs{c_job_name_tl} at the start of a \LaTeX{} +% will be equal to \cs{c_sys_jobname_str} at the start of a \LaTeX{} % run and will be modified each time a file is read using % \cs{file_input:n}. % \end{variable} @@ -1548,7 +1548,7 @@ \group_begin: \char_set_catcode_other:N \* \char_set_lccode:nn {`\*} {`\ } - \tl_to_lowercase:n { \tl_const:Nn \c_catcode_other_space_tl { * } } + \tex_lowercase:D { \tl_const:Nn \c_catcode_other_space_tl { * } } \group_end: % \end{macrocode} % \end{macro} @@ -1757,7 +1757,7 @@ \cs_new_protected_nopar:Npn \@@_wrap_word: { \int_set:Nn \l_@@_current_word_int - { \__str_count_ignore_spaces:N \l_@@_current_word_tl } + { \exp_args:No \str_count_ignore_spaces:n \l_@@_current_word_tl } \int_add:Nn \l_@@_current_line_int { \l_@@_current_word_int } \int_compare:nNnTF \l_@@_current_line_int < \l_@@_target_count_int { \@@_wrap_word_fits: } @@ -1858,37 +1858,6 @@ % \end{macro} % \end{macro} % -% \begin{macro}[aux]{\__str_count_ignore_spaces:N} -% \begin{macro}[aux]{\__str_count_ignore_spaces:n} -% \begin{macro}[aux]{\__str_count_loop:NNNNNNNNN} -% The wrapping code requires to measure the number of character -% in each word. This could be done with \cs{tl_count:n}, but -% it is ten times faster (literally) to use the code below. -% \begin{macrocode} -\cs_new_nopar:Npn \__str_count_ignore_spaces:N - { \exp_args:No \__str_count_ignore_spaces:n } -\cs_new:Npn \__str_count_ignore_spaces:n #1 - { - \__int_value:w \__int_eval:w - \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1} - { X8 } { X7 } { X6 } { X5 } { X4 } { X3 } { X2 } { X1 } { X0 } - \q_stop - \__int_eval_end: - } -\cs_new:Npn \__str_count_loop:NNNNNNNNN #1#2#3#4#5#6#7#8#9 - { - \if_catcode:w X #9 - \exp_after:wN \use_none_delimit_by_q_stop:w - \else: - 9 + - \exp_after:wN \__str_count_loop:NNNNNNNNN - \fi: - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% % \subsection{Messages} % % \begin{macrocode} |