From 2ebe2779edac8cb53ee6d49d058c3ce1aac3f685 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Feb 2017 22:42:51 +0000 Subject: l3 (7feb17) git-svn-id: svn://tug.org/texlive/trunk@43162 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3experimental/l3sort/l3sort.sty | 429 --------------------- .../tex/latex/l3experimental/l3str/l3flag.sty | 6 +- .../latex/l3experimental/l3str/l3regex-trace.sty | 6 +- .../tex/latex/l3experimental/l3str/l3regex.sty | 6 +- .../tex/latex/l3experimental/l3str/l3tl-build.sty | 6 +- .../tex/latex/l3experimental/xgalley/l3galley.sty | 8 +- 6 files changed, 16 insertions(+), 445 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty (limited to 'Master/texmf-dist/tex/latex/l3experimental') diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty deleted file mode 100644 index bc01c1d4039..00000000000 --- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty +++ /dev/null @@ -1,429 +0,0 @@ -%% -%% This is file `l3sort.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% l3sort.dtx (with options: `package') -%% -%% Copyright (C) 2012-2016 The 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 license or (at your option) any later version. The latest -%% version of this license is in the file: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% This file is part of the "l3experimental bundle" (The Work in LPPL) -%% and all files in that bundle must be distributed together. -%% -%% File l3sort.dtx (C) Copyright 2012,2014-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} - {} - {% - \PackageError{l3sort}{Support package l3kernel too old} - {% - Please install an up to date version of l3kernel\MessageBreak - using your TeX package manager or from CTAN.\MessageBreak - \MessageBreak - Loading l3sort will abort!% - }% - \endinput - } -\GetIdInfo$Id: l3sort.dtx 6829 2017-01-28 08:52:51Z joseph $ - {L3 Experimental sorting functions} -\ProvidesExplPackage - {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\int_new:N \l__sort_length_int -\int_new:N \l__sort_min_int -\int_new:N \l__sort_top_int -\int_new:N \l__sort_max_int -\int_new:N \l__sort_true_max_int -\int_new:N \l__sort_block_int -\int_new:N \l__sort_begin_int -\int_new:N \l__sort_end_int -\int_new:N \l__sort_A_int -\int_new:N \l__sort_B_int -\int_new:N \l__sort_C_int -\cs_new_protected:Npn \__sort_shrink_range: - { - \int_set:Nn \l__sort_A_int - { \l__sort_true_max_int - \l__sort_min_int + \c_one } - \int_set:Nn \l__sort_block_int { \c_max_register_int / \c_two } - \__sort_shrink_range_loop: - \int_set:Nn \l__sort_max_int - { - \int_compare:nNnTF - { \l__sort_block_int * \c_three / \c_two } > \l__sort_A_int - { - \l__sort_min_int - + ( \l__sort_A_int - \c_one ) / \c_two - + \l__sort_block_int / \c_four - - \c_one - } - { \l__sort_true_max_int - \l__sort_block_int / \c_two } - } - } -\cs_new_protected:Npn \__sort_shrink_range_loop: - { - \if_int_compare:w \l__sort_A_int < \l__sort_block_int - \tex_divide:D \l__sort_block_int \c_two - \exp_after:wN \__sort_shrink_range_loop: - \fi: - } -\cs_new_protected:Npn \__sort_compute_range: - { - \int_set:Nn \l__sort_min_int { \tex_count:D 15 + \c_one } - \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one } - \__sort_shrink_range: - \if_meaning:w \loctoks \tex_undefined:D \else: - \if_meaning:w \loctoks \scan_stop: \else: - \__sort_redefine_compute_range: - \__sort_compute_range: - \fi: - \fi: - } -\cs_new_protected:Npn \__sort_redefine_compute_range: - { - \cs_if_exist:cTF { ver@elocalloc.sty } - { - \cs_gset_protected:Npn \__sort_compute_range: - { - \int_set:Nn \l__sort_min_int { \tex_count:D 265 } - \int_set_eq:NN \l__sort_true_max_int \e@alloc@top - \__sort_shrink_range: - } - } - { - \cs_gset_protected:Npn \__sort_compute_range: - { - \int_set:Nn \l__sort_min_int { \tex_count:D 265 } - \int_set:Nn \l__sort_true_max_int { \tex_count:D 275 } - \__sort_shrink_range: - } - } - } -\cs_if_exist:NT \loctoks { \__sort_redefine_compute_range: } -\tl_map_inline:nn { \lastallocatedtoks \c_syst_last_allocated_toks } - { - \cs_if_exist:NT #1 - { - \cs_gset_protected:Npn \__sort_compute_range: - { - \int_set:Nn \l__sort_min_int { #1 + \c_one } - \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one } - \__sort_shrink_range: - } - } - } -\cs_new_protected:Npn \__sort_main:NNNnNn #1#2#3#4#5#6 - { - \group_begin: - \__sort_disable_toksdef: - \__sort_compute_range: - \int_set_eq:NN \l__sort_top_int \l__sort_min_int - #2 #5 - { - \if_int_compare:w \l__sort_top_int = \l__sort_max_int - \__sort_too_long_error:NNw #3 #5 - \fi: - \tex_toks:D \l__sort_top_int {##1} - \tex_advance:D \l__sort_top_int \c_one - } - \int_set:Nn \l__sort_length_int - { \l__sort_top_int - \l__sort_min_int } - \cs_set:Npn \__sort_compare:nn ##1 ##2 { #6 } - \int_set_eq:NN \l__sort_block_int \c_one - \__sort_level: - \use:x - { - \group_end: - #1 \exp_not:N #5 {#4} - } - } -\cs_new_protected:Npn \seq_sort:Nn - { - \__sort_main:NNNnNn \tl_set:Nn - \seq_map_inline:Nn \seq_map_break:n - { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n } - } -\cs_new_protected:Npn \seq_gsort:Nn - { - \__sort_main:NNNnNn \tl_gset:Nn - \seq_map_inline:Nn \seq_map_break:n - { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n } - } -\cs_new_protected:Npn \tl_sort:Nn - { - \__sort_main:NNNnNn \tl_set:Nn - \tl_map_inline:Nn \tl_map_break:n - { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: } - } -\cs_new_protected:Npn \tl_gsort:Nn - { - \__sort_main:NNNnNn \tl_gset:Nn - \tl_map_inline:Nn \tl_map_break:n - { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: } - } -\cs_new_protected:Npn \clist_sort:Nn - { \__sort_clist:NNn \tl_set:Nn } -\cs_new_protected:Npn \clist_gsort:Nn - { \__sort_clist:NNn \tl_gset:Nn } -\cs_new_protected:Npn \__sort_clist:NNn #1#2#3 - { - \clist_if_empty:NF #2 - { - \__sort_main:NNNnNn #1 - \clist_map_inline:Nn \clist_map_break:n - { - \exp_last_unbraced:Nf \use_none:n - { \__sort_toks:NN \exp_args:No \__clist_wrap_item:n } - } - #2 {#3} - } - } -\cs_new:Npn \__sort_toks:NN #1#2 - { \__sort_toks:NNw #1 #2 \l__sort_min_int ; } -\cs_new:Npn \__sort_toks:NNw #1#2#3 ; - { - \if_int_compare:w #3 < \l__sort_top_int - #1 #2 { \tex_the:D \tex_toks:D #3 } - \exp_after:wN \__sort_toks:NNw \exp_after:wN #1 \exp_after:wN #2 - \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ; - \fi: - } -\cs_new_protected:Npn \__sort_level: - { - \if_int_compare:w \l__sort_block_int < \l__sort_length_int - \l__sort_end_int \l__sort_min_int - \__sort_merge_blocks: - \tex_advance:D \l__sort_block_int \l__sort_block_int - \exp_after:wN \__sort_level: - \fi: - } -\cs_new_protected:Npn \__sort_merge_blocks: - { - \l__sort_begin_int \l__sort_end_int - \tex_advance:D \l__sort_end_int \l__sort_block_int - \if_int_compare:w \l__sort_end_int < \l__sort_top_int - \l__sort_A_int \l__sort_end_int - \tex_advance:D \l__sort_end_int \l__sort_block_int - \if_int_compare:w \l__sort_end_int > \l__sort_top_int - \l__sort_end_int \l__sort_top_int - \fi: - \l__sort_B_int \l__sort_A_int - \l__sort_C_int \l__sort_top_int - \__sort_copy_block: - \tex_advance:D \l__sort_A_int - \c_one - \tex_advance:D \l__sort_B_int - \c_one - \tex_advance:D \l__sort_C_int - \c_one - \exp_after:wN \__sort_merge_blocks_aux: - \exp_after:wN \__sort_merge_blocks: - \fi: - } -\cs_new_protected:Npn \__sort_copy_block: - { - \tex_toks:D \l__sort_C_int \tex_toks:D \l__sort_B_int - \tex_advance:D \l__sort_C_int \c_one - \tex_advance:D \l__sort_B_int \c_one - \if_int_compare:w \l__sort_B_int = \l__sort_end_int - \use_i:nn - \fi: - \__sort_copy_block: - } -\cs_new_protected:Npn \__sort_merge_blocks_aux: - { - \exp_after:wN \__sort_compare:nn \exp_after:wN - { \tex_the:D \tex_toks:D \exp_after:wN \l__sort_A_int \exp_after:wN } - \exp_after:wN { \tex_the:D \tex_toks:D \l__sort_C_int } - \prg_do_nothing: - \__sort_return_mark:N - \__sort_return_mark:N - \__sort_return_none_error: - } -\cs_new_protected:Npn \sort_ordered: #1 \__sort_return_mark:N - { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_ordered: } -\cs_new_protected:Npn \sort_reversed: #1 \__sort_return_mark:N - { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_return_reversed: } -\cs_new_protected:Npn \__sort_return_mark:N #1 { } -\cs_new_protected:Npn \__sort_return_none_error: - { - \__msg_kernel_error:nnxx { sort } { return-none } - { \tex_the:D \tex_toks:D \l__sort_A_int } - { \tex_the:D \tex_toks:D \l__sort_C_int } - \__sort_ordered: - } -\cs_new_protected:Npn \__sort_return_two_error:w - #1 \__sort_return_none_error: - { \__msg_kernel_error:nn { sort } { return-two } } -\cs_new_protected:Npn \__sort_ordered: - { - \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int - \tex_advance:D \l__sort_B_int - \c_one - \tex_advance:D \l__sort_C_int - \c_one - \if_int_compare:w \l__sort_C_int < \l__sort_top_int - \use_i:nn - \fi: - \__sort_merge_blocks_aux: - } -\cs_new_protected:Npn \__sort_return_reversed: - { - \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_A_int - \tex_advance:D \l__sort_B_int - \c_one - \tex_advance:D \l__sort_A_int - \c_one - \if_int_compare:w \l__sort_A_int < \l__sort_begin_int - \__sort_merge_blocks_end: \use_i:nn - \fi: - \__sort_merge_blocks_aux: - } -\cs_new_protected:Npn \__sort_merge_blocks_end: - { - \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int - \tex_advance:D \l__sort_B_int - \c_one - \tex_advance:D \l__sort_C_int - \c_one - \if_int_compare:w \l__sort_B_int < \l__sort_begin_int - \use_i:nn - \fi: - \__sort_merge_blocks_end: - } -\cs_new:Npn \tl_sort:nN #1#2 - { - \exp_not:f - { - \tl_if_blank:nF {#1} - { - \__sort_quick_prepare:Nnnn #2 { } { } - #1 - { \__prg_break_point: \__sort_quick_prepare_end:NNNnw } - \q_stop - } - } - } -\cs_new:Npn \__sort_quick_prepare:Nnnn #1#2#3#4 - { - \__prg_break: #4 \__prg_break_point: - \__sort_quick_prepare:Nnnn #1 { #2 #3 } { #1 {#4} } - } -\cs_new:Npn \__sort_quick_prepare_end:NNNnw #1#2#3#4#5 \q_stop - { - \__sort_quick_split:NnNn #4 \__sort_quick_end:nnTFNn { } - \q_mark { \__sort_quick_cleanup:w \exp_stop_f: } - \s__stop \q_stop - } -\cs_new:Npn \__sort_quick_cleanup:w #1 \s__stop \q_stop {#1} -\cs_new:Npn \__sort_quick_split:NnNn #1#2#3#4 - { - #3 {#2} {#4} \__sort_quick_only_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn - \__sort_quick_single_end:nnnwnw - { #3 {#4} } { } { } {#2} - } -\cs_new:Npn \__sort_quick_only_i:NnnnnNn #1#2#3#4#5#6#7 - { - #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn - \__sort_quick_only_i_end:nnnwnw - { #6 {#7} } { #3 #2 } { } {#5} - } -\cs_new:Npn \__sort_quick_only_ii:NnnnnNn #1#2#3#4#5#6#7 - { - #6 {#5} {#7} \__sort_quick_only_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn - \__sort_quick_only_ii_end:nnnwnw - { #6 {#7} } { } { #4 #2 } {#5} - } -\cs_new:Npn \__sort_quick_split_i:NnnnnNn #1#2#3#4#5#6#7 - { - #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn - \__sort_quick_split_end:nnnwnw - { #6 {#7} } { #3 #2 } {#4} {#5} - } -\cs_new:Npn \__sort_quick_split_ii:NnnnnNn #1#2#3#4#5#6#7 - { - #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn - \__sort_quick_split_end:nnnwnw - { #6 {#7} } {#3} { #4 #2 } {#5} - } -\cs_new:Npn \__sort_quick_end:nnTFNn #1#2#3#4#5#6 {#5} -\cs_new:Npn \__sort_quick_single_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop - { #5 {#3} #6 \q_stop } -\cs_new:Npn \__sort_quick_only_i_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop - { - \__sort_quick_split:NnNn #1 - \__sort_quick_end:nnTFNn { } \q_mark {#5} - {#3} - #6 \q_stop - } -\cs_new:Npn \__sort_quick_only_ii_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop - { - \__sort_quick_split:NnNn #2 - \__sort_quick_end:nnTFNn { } \q_mark { #5 {#3} } - #6 \q_stop - } -\cs_new:Npn \__sort_quick_split_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop - { - \__sort_quick_split:NnNn #2 \__sort_quick_end:nnTFNn { } \q_mark - { - \__sort_quick_split:NnNn #1 - \__sort_quick_end:nnTFNn { } \q_mark {#5} - {#3} - } - #6 \q_stop - } -\cs_new_protected:Npn \__sort_error: - { - \cs_set_eq:NN \__sort_merge_blocks_aux: \prg_do_nothing: - \cs_set_eq:NN \__sort_merge_blocks: \prg_do_nothing: - \cs_set_protected:Npn \__sort_level: \use:x ##1 { \group_end: } - } -\cs_new_protected:Npn \__sort_disable_toksdef: - { \cs_set_eq:NN \toksdef \__sort_disabled_toksdef:n } -\cs_new_protected:Npn \__sort_disabled_toksdef:n #1 - { - \__msg_kernel_error:nnx { sort } { toksdef } - { \token_to_str:N #1 } - \__sort_error: - \tex_toksdef:D #1 - } -\__msg_kernel_new:nnnn { sort } { toksdef } - { Allocation~of~\iow_char:N\\toks~registers~impossible~while~sorting. } - { - The~comparison~code~used~for~sorting~a~list~has~attempted~to~ - define~#1~as~a~new~\iow_char:N\\toks~register~using~\iow_char:N\\newtoks~ - or~a~similar~command.~The~list~will~not~be~sorted. - } -\cs_new_protected:Npn \__sort_too_long_error:NNw #1#2 \fi: - { - \fi: - \__msg_kernel_error:nnxxx { sort } { too-large } - { \token_to_str:N #2 } - { \int_eval:n { \l__sort_true_max_int - \l__sort_min_int } } - { \int_eval:n { \l__sort_top_int - \l__sort_min_int } } - #1 \__sort_error: - } -\__msg_kernel_new:nnnn { sort } { too-large } - { The~list~#1~is~too~long~to~be~sorted~by~TeX. } - { - TeX~has~#2~toks~registers~still~available:~ - this~only~allows~to~sort~with~up~to~#3~ - items.~All~extra~items~will~be~deleted. - } -\__msg_kernel_new:nnnn { sort } { return-none } - { The~comparison~code~did~not~return. } - { - When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~ - did~not~call~ - \iow_char:N\\sort_ordered: ~nor~ - \iow_char:N\\sort_reversed: .~ - Exactly~one~of~these~should~be~called. - } -\__msg_kernel_new:nnnn { sort } { return-two } - { The~comparison~code~returned~multiple~times. } - { - When~sorting~a~list,~the~code~to~compare~items~called~ - \iow_char:N\\sort_ordered: ~or~ - \iow_char:N\\sort_reversed: ~multiple~times.~ - Exactly~one~of~these~should~be~called. - } -%% -%% -%% End of file `l3sort.sty'. diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty index 1c712595718..eb625020ede 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty @@ -19,8 +19,8 @@ %% and all files in that bundle must be distributed together. %% %% File: l3flag.dtx Copyright (C) 2011-2012,2014-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} +\RequirePackage{expl3}[2017/02/07] +\@ifpackagelater{expl3}{2017/02/07} {} {% \PackageError{l3flag}{Support package l3kernel too old} @@ -32,7 +32,7 @@ }% \endinput } -\GetIdInfo$Id: l3flag.dtx 6829 2017-01-28 08:52:51Z joseph $ +\GetIdInfo$Id: l3flag.dtx 6846 2017-02-07 07:04:19Z joseph $ {L3 Experimental flags} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty index 9859252d594..cdf16a65441 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty @@ -19,8 +19,8 @@ %% and all files in that bundle must be distributed together. %% %% File: l3regex.dtx Copyright (C) 2011-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} +\RequirePackage{expl3}[2017/02/07] +\@ifpackagelater{expl3}{2017/02/07} {} {% \PackageError{l3regex}{Support package l3kernel too old} @@ -32,7 +32,7 @@ }% \endinput } -\GetIdInfo$Id: l3regex.dtx 6829 2017-01-28 08:52:51Z joseph $ +\GetIdInfo$Id: l3regex.dtx 6846 2017-02-07 07:04:19Z joseph $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty index 902f5126e0c..27872fd6b13 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty @@ -19,8 +19,8 @@ %% and all files in that bundle must be distributed together. %% %% File: l3regex.dtx Copyright (C) 2011-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} +\RequirePackage{expl3}[2017/02/07] +\@ifpackagelater{expl3}{2017/02/07} {} {% \PackageError{l3regex}{Support package l3kernel too old} @@ -32,7 +32,7 @@ }% \endinput } -\GetIdInfo$Id: l3regex.dtx 6829 2017-01-28 08:52:51Z joseph $ +\GetIdInfo$Id: l3regex.dtx 6846 2017-02-07 07:04:19Z joseph $ {L3 Experimental regular expressions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty index 8b278c5625e..3b8bf4de798 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty @@ -19,8 +19,8 @@ %% and all files in that bundle must be distributed together. %% %% File: l3tl-build.dtx Copyright (C) 2011-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} +\RequirePackage{expl3}[2017/02/07] +\@ifpackagelater{expl3}{2017/02/07} {} {% \PackageError{l3tl-build}{Support package l3kernel too old} @@ -32,7 +32,7 @@ }% \endinput } -\GetIdInfo$Id: l3tl-build.dtx 6829 2017-01-28 08:52:51Z joseph $ +\GetIdInfo$Id: l3tl-build.dtx 6846 2017-02-07 07:04:19Z joseph $ {L3 Experimental token list construction} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 7a75fac96d3..8f33f00a1ed 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -20,8 +20,8 @@ %% %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach %% (C) 2010-2016 The LaTeX3 Project -\RequirePackage{expl3}[2017/01/28] -\@ifpackagelater{expl3}{2017/01/28} +\RequirePackage{expl3}[2017/02/07] +\@ifpackagelater{expl3}{2017/02/07} {} {% \PackageError{l3galley}{Support package l3kernel too old} @@ -33,7 +33,7 @@ }% \endinput } -\GetIdInfo$Id: l3galley.dtx 6829 2017-01-28 08:52:51Z joseph $ +\GetIdInfo$Id: l3galley.dtx 6846 2017-02-07 07:04:19Z joseph $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -944,7 +944,7 @@ { \galley_break_line:Nn \reserved@e {#1} } \DeclareRobustCommand \newline { \galley_break_line:Nn \c_true_bool { 0pt } } -\cs_set_eq:cN { @ @ par } \galley_par: +\cs_set_eq:NN \@@par \galley_par: \cs_set_protected:Npn \addpenalty { \galley_penalty_add_single:n } \cs_set_protected:Npn \addvspace { \galley_vspace_max_single:n } \cs_set_protected:Npn \@afterheading -- cgit v1.2.3