diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-05 22:01:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-05 22:01:18 +0000 |
commit | d78a5a4de1e73a2151e8ed2635a199d928ccb559 (patch) | |
tree | ca490a3efa7d3614793427f850ec1aeb6bf971f1 /Master/texmf-dist/source/latex/l3experimental/xgalley | |
parent | b41cac6cebc8095cf8eaf7e84f8a2d5f63b7be38 (diff) |
latex3 (5may14)
git-svn-id: svn://tug.org/texlive/trunk@33859 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx | 64 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx | 6 |
2 files changed, 35 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 3bbe92eacc0..f22931ea3b9 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -1,7 +1,7 @@ % \iffalse % %% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach -%% (C) 2010-2013 The LaTeX3 Project +%% (C) 2010-2014 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 @@ -37,7 +37,7 @@ % %<*driver|package> \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 4494 2013-05-24 06:27:01Z joseph $ +\GetIdInfo$Id: l3galley.dtx 4728 2014-05-04 13:25:37Z joseph $ {L3 Experimental galley code} %</driver|package> %<*driver> @@ -172,7 +172,7 @@ % \end{function} % % \subsection{Between paragraphs} -% +% % \begin{variable}{\g_galley_previous_par_lines_int} % The number of lines in the preceding conceptual paragraph. This may not % correspond to the \TeX{} \tn{prevgraf} primitive value as one conceptual @@ -355,7 +355,7 @@ % the interaction of a display block with the paragraphs before and after it % can be adjusted independent of the design of text. % \end{function} -% +% % \subsection{Hyphenation} % % \begin{variable}{\l_galley_hyphen_left_int} @@ -562,7 +562,7 @@ % \end{variable} % % \section{Paragraphs} -% +% % \begin{function}{\galley_par:} % \begin{syntax} % \cs{galley_par:} @@ -675,7 +675,7 @@ % \begin{macrocode} %<*initex|package> % \end{macrocode} -% +% % \begin{macrocode} %<@@=galley> % \end{macrocode} @@ -691,7 +691,7 @@ % % Functions or settings which are needed by the galley but perhaps also % elsewhere. -% +% % \begin{macro}{\seq_map_function:Nc} % Used to allow a mapping to choose the outcome using a passed option. % \begin{macrocode} @@ -706,7 +706,7 @@ \tex_defaulthyphenchar:D 45 \scan_stop: %</initex> % \end{macrocode} -% +% % \subsection{Scratch variables} % % \begin{variable}{\l_@@_tmp_int} @@ -735,7 +735,7 @@ \bool_new:N \l_@@_parshape_multipar_bool % \end{macrocode} % \end{variable} -% +% % \begin{variable} % {\l_@@_parshape_left_indent_seq, \l_@@_parshape_right_indent_seq} % Used to convert user input comma lists into sequences for mapping, and also @@ -811,7 +811,7 @@ \bool_new:N \l_@@_begin_level_bool % \end{macrocode} % \end{variable} -% +% % \begin{variable} % { % \g_@@_cutout_left_seq, \l_@@_cutout_left_seq, @@ -1148,7 +1148,7 @@ { \group_begin: \tex_par:D - \group_end: + \group_end: } % \end{macrocode} % In horizontal mode, the paragraph shape is set \enquote{just in time} @@ -1160,7 +1160,7 @@ % \begin{macrocode} { \g_galley_par_end_hook_tl - \group_begin: + \group_begin: \tex_par:D \group_end: \int_gset:Nn \g_galley_previous_par_lines_int @@ -1528,7 +1528,7 @@ % \end{macro} % % \subsection{Measure} -% +% % \begin{variable}{\l_@@_total_left_margin_dim, \l_@@_total_right_margin_dim} % Used to set the measure, first by providing a place to save the existing % values, then allowing calculation of the difference between old and new @@ -1570,7 +1570,7 @@ - \l_galley_total_left_margin_dim - \l_galley_total_right_margin_dim } - \@@_set_measure: + \@@_set_measure: } % \end{macrocode} % Saves the previous margin state so that it can be used for calculation @@ -1595,7 +1595,7 @@ { \int_compare:nNnTF \tex_parshape:D = \c_zero { \@@_parshape_measure: } - { + { \dim_sub:Nn \l_@@_total_left_margin_dim \l_galley_total_left_margin_dim \dim_sub:Nn \l_@@_total_right_margin_dim @@ -1621,7 +1621,7 @@ % \end{macro} % \end{macro} % \end{macro} -% +% % \begin{macro}{\@@_parshape_reset:} % Test for paragraph shapes to be removed: a multi-step procedure! First, % check to see if there is a shape at all. If there is, the second check @@ -1634,9 +1634,9 @@ \int_compare:nNnF \tex_parshape:D = \c_zero { \bool_if:nTF - { + { \seq_if_empty_p:N \g_@@_cutout_left_seq - && \seq_if_empty_p:N \g_@@_cutout_right_seq + && \seq_if_empty_p:N \g_@@_cutout_right_seq } { \bool_if:NF \l_@@_parshape_multipar_bool @@ -1659,13 +1659,13 @@ { \@@_parshape_set: } { \@@_parshape_measure: } \@@_cutout_set:Nn \g_@@_cutout_left_seq { left } - \@@_cutout_set:Nn \g_@@_cutout_right_seq { right } + \@@_cutout_set:Nn \g_@@_cutout_right_seq { right } } - } + } } % \end{macrocode} % \end{macro} -% +% % \begin{macro}[int]{\@@_parshape_measure:} % Sets the parshape to the full measure at the current time: used in a few % places, so worth spinning out. @@ -1679,7 +1679,7 @@ } % \end{macrocode} % \end{macro} -% +% % \subsection{Paragraph shape} % % \begin{macro} @@ -1731,7 +1731,7 @@ { \seq_put_right:Nn \l_@@_parshape_left_indent_seq { 0 pt } \seq_put_right:Nn \l_@@_parshape_right_indent_seq { 0 pt } - } + } \@@_parshape_set: } \cs_new_protected_nopar:Npn \@@_parshape_set: @@ -1758,13 +1758,13 @@ % \end{macro} % \end{macro} % \end{macro} -% +% % \subsection{Cutouts} -% +% % Cutouts are another way of looking at paragraph shapes, but apply to % a fixed number of lines within a galley. As such, they require separate % handling from the measure and shape. -% +% % \begin{macro}{\galley_cutout_left:nn, \galley_cutout_right:nn} % \begin{macro}[int]{\@@_cutout:nnn} % \begin{macro}[aux]{\@@_cutout_store:nn} @@ -1800,7 +1800,7 @@ { \seq_count:c { g_@@_cutout_ #1 _ seq } } { \seq_map_inline:Nn \l_@@_tmpa_seq - { + { \@@_cutout_store:nn { \seq_gpop:cNF { g_@@_cutout_ #1 _ seq } } {##1} @@ -1808,7 +1808,7 @@ } { \seq_map_inline:cn { g_@@_cutout_ #1 _ seq } - { + { \@@_cutout_store:nn { \seq_pop:NNF \l_@@_tmpa_seq } {##1} @@ -1889,14 +1889,14 @@ \c_space_tl \dim_eval:n { \etex_parshapelength:D \l_@@_tmp_int - ( #1 ) } \c_space_tl - } + } } } \cs_new_protected:Npn \@@_cutout_right:n #1 { \int_incr:N \l_@@_tmp_int \tl_put_right:Nx \l_@@_tmp_tl - { + { \int_compare:nNnTF \l_@@_tmp_int > \tex_parshape:D { \dim_use:N \l_@@_total_left_margin_dim @@ -1920,12 +1920,12 @@ { \int_incr:N \l_@@_tmp_int \tl_put_right:Nx \l_@@_tmp_tl - { + { \dim_eval:n { \etex_parshapeindent:D #1 } \c_space_tl \dim_eval:n { \etex_parshapelength:D #1 } \c_space_tl - } + } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index d0086f4a3e3..b1dda9c1990 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx @@ -1,7 +1,7 @@ % \iffalse % %% File: xgalley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach -%% (C) 2010-2012 The LaTeX3 Project +%% (C) 2010-2012,2014 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 @@ -37,7 +37,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: xgalley.dtx 4373 2012-12-17 16:41:59Z joseph $ +\GetIdInfo$Id: xgalley.dtx 4728 2014-05-04 13:25:37Z joseph $ {L3 Experimental galley} %</driver|package> %<*driver> @@ -744,7 +744,7 @@ % \begin{macrocode} %<*package> % \end{macrocode} -% +% % \begin{macrocode} %<@@=galley> % \end{macrocode} |