[latex3-commits] [l3svn] branch master updated: Probably can remove nopar here
noreply at latex-project.org
noreply at latex-project.org
Sun Jun 12 23:06:58 CEST 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new f4d669a Probably can remove nopar here
f4d669a is described below
commit f4d669a245a1e0cb1612d9210be1e1926587905d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Jun 12 22:06:45 2016 +0100
Probably can remove nopar here
---
l3experimental/xgalley/l3galley.dtx | 60 +++++++++++++++++------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index 52d9f3c..c62d106 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -987,7 +987,7 @@
% standard values. For example, the measure is set to the galley width and
% any paragraph shape is cleared.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_initialise_variables:
+\cs_new_protected:Npn \@@_initialise_variables:
{
\bool_gset_true:N \g_@@_begin_level_bool
\seq_gclear:N \g_@@_cutout_left_seq
@@ -1015,7 +1015,7 @@
% as it allows an efficency saving in parshape setting: only
% when it is actively set \texttt{false} is action needed.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_initialise_settings:
+\cs_new_protected:Npn \@@_initialise_settings:
{
\bool_set_true:N \l_@@_parshape_multipar_bool
\seq_clear:N \l_@@_parshape_left_indent_seq
@@ -1031,7 +1031,7 @@
% Saving and restoring parameters is carried out by a series of copy
% functions.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_save_parameters:
+\cs_new_protected:Npn \@@_save_parameters:
{
\bool_set_eq:NN \l_@@_begin_level_bool
\g_@@_begin_level_bool
@@ -1064,7 +1064,7 @@
\tl_set_eq:NN \l_@@_whatsit_next_tl
\g_galley_whatsit_next_tl
}
-\cs_new_protected_nopar:Npn \@@_restore_parameters:
+\cs_new_protected:Npn \@@_restore_parameters:
{
\bool_gset_eq:NN \g_@@_begin_level_bool
\l_@@_begin_level_bool
@@ -1106,7 +1106,7 @@
% settings, starting a group then initialising both the local and global
% variables.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_level:
+\cs_new_protected:Npn \galley_level:
{
\@@_save_parameters:
\group_begin:
@@ -1122,7 +1122,7 @@
% must come in a fixed location. All of this relies on the
% \enquote{color safe} group used inside a box.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_level_end:
+\cs_new_protected:Npn \@@_level_end:
{
\par
\@@_restore_parameters:
@@ -1150,7 +1150,7 @@
% but will stop at a scan marker. Thus the code can test for an
% \enquote{omit paragraph} marker.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_par:
+\cs_new_protected:Npn \galley_par:
{
\s__par_omit
\exp_after:wN \@@_par_auxi: \exp:w \exp_end_continue_f:w
@@ -1175,7 +1175,7 @@
% \cs{etex_interlinepenalties:D}). In vertical mode, that means just
% inserting the primitive.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_par_auxii:
+\cs_new_protected:Npn \@@_par_auxii:
{
\mode_if_vertical:TF
{
@@ -1227,7 +1227,7 @@
% each paragraph to avoid any grouping issues and without needing to set
% \cs{tex_parshape:n} globally.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_par_set_cutout:
+\cs_new_protected:Npn \@@_par_set_cutout:
{
\bool_if:nF
{
@@ -1236,7 +1236,7 @@
}
{ \@@_parshape_set: }
}
-\cs_new_protected_nopar:Npn \@@_par_update_cutout:
+\cs_new_protected:Npn \@@_par_update_cutout:
{
\bool_if:nF
{
@@ -1304,7 +1304,7 @@
% settings from the surrounding material. They may also start and end with
% special spacing values.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_display_begin:
+\cs_new_protected:Npn \galley_display_begin:
{
\group_begin:
\@@_save_parameters:
@@ -1355,7 +1355,7 @@
% \cs{group_insert_after:N}. Resetting the meaning of the \cs{par} token
% needs to be carried out after the group used for the environment.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_display_end:
+\cs_new_protected:Npn \galley_display_end:
{
\par
\@@_restore_parameters:
@@ -1369,7 +1369,7 @@
% \cs{par} token is then altered so that a check can be made to see if
% this assumption was correct.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_display_par_setup:
+\cs_new_protected:Npn \@@_display_par_setup:
{
\bool_gset_false:N \g_galley_omit_next_indent_bool
\cs_set_eq:NN \par \@@_display_par:
@@ -1388,7 +1388,7 @@
% cutout will have to be updated as it depends on the number of lines
% \TeX{} has typeset.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_display_par:
+\cs_new_protected:Npn \@@_display_par:
{
\cs_set_eq:NN \par \galley_par:
\mode_if_vertical:TF
@@ -1506,7 +1506,7 @@
% tidied up before sorting out any items which have been set on a
% single-paragraph basis.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_start_paragraph_std:
+\cs_new_protected:Npn \@@_start_paragraph_std:
{
\@@_start_paragraph_common:N \@@_insert_vertical_items:
\@@_insert_horizontal_items:
@@ -1523,7 +1523,7 @@
% must not add any vertical space as the start of the box unless there
% is a user space to insert.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_start_paragraph_first:
+\cs_new_protected:Npn \@@_start_paragraph_first:
{
\bool_gset_false:N \g_@@_begin_level_bool
\mode_if_horizontal:TF
@@ -1532,7 +1532,7 @@
\@@_insert_horizontal_items:
\@@_restore_running_parameters:
}
-\cs_new_protected_nopar:Npn \@@_insert_vspace_first:
+\cs_new_protected:Npn \@@_insert_vspace_first:
{
\tl_if_empty:NF \g_@@_interpar_vspace_user_tl
{ \skip_vertical:n { \g_@@_interpar_vspace_user_tl } }
@@ -1553,7 +1553,7 @@
% the inter-paragraph space is applied: only one space is ever added
% there.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_insert_vertical_items:
+\cs_new_protected:Npn \@@_insert_vertical_items:
{
\g_galley_whatsit_previous_tl
\tl_gclear:N \g_galley_whatsit_previous_tl
@@ -1583,7 +1583,7 @@
% Horizontal mode objects start with the whatsits for the next paragraph. An
% indent is then included if the removed box was not void.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_insert_horizontal_items:
+\cs_new_protected:Npn \@@_insert_horizontal_items:
{
\g_galley_whatsit_next_tl
\tl_gclear:N \g_galley_whatsit_next_tl
@@ -1604,7 +1604,7 @@
% variable in which the appropriate assignments are stored. The
% list can then be cleared.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_restore_running_parameters:
+\cs_new_protected:Npn \@@_restore_running_parameters:
{
\g_galley_restore_running_tl
\tl_gclear:N \g_galley_restore_running_tl
@@ -1669,12 +1669,12 @@
% Setting the paragraph shape is mainly a question of converting the input.
% First, though, a flag is set.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_parshape_set_multi:nnnN
+\cs_new_protected:Npn \galley_parshape_set_multi:nnnN
{
\bool_set_true:N \l_@@_parshape_multipar_bool
\@@_parshape_set:nnnN
}
-\cs_new_protected_nopar:Npn \galley_parshape_set_single:nnnN
+\cs_new_protected:Npn \galley_parshape_set_single:nnnN
{
\bool_set_false:N \l_@@_parshape_multipar_bool
\@@_parshape_set:nnnN
@@ -1725,9 +1725,9 @@
% the same idea with one or two very specific points of difference. As such,
% the two interface functions both use the same implementation.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_cutout_left:nn
+\cs_new_protected:Npn \galley_cutout_left:nn
{ \@@_cutout:nnn { left } }
-\cs_new_protected_nopar:Npn \galley_cutout_right:nn
+\cs_new_protected:Npn \galley_cutout_right:nn
{ \@@_cutout:nnn { right } }
% \end{macrocode}
% The cutout information needs to be saved in in the appropriate sequence.
@@ -1796,7 +1796,7 @@
% code, the approach taken here is always to reset the entire shape. This
% is done in three stages, one for each conceptual element.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parshape_set:
+\cs_new_protected:Npn \@@_parshape_set:
{
\@@_parshape_set_margins:
\@@_parshape_set_indents:
@@ -1808,7 +1808,7 @@
% apply as these settings are very fast, so it is not worth doing a check
% at this stage for further parts to apply.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parshape_set_margins:
+\cs_new_protected:Npn \@@_parshape_set_margins:
{
\bool_if:nTF
{
@@ -1830,7 +1830,7 @@
% will always apply. The margins are reapplied at this stage as part of
% the auxiliary for the calculation of indentation.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parshape_set_indents:
+\cs_new_protected:Npn \@@_parshape_set_indents:
{
\bool_if:nF
{
@@ -1871,7 +1871,7 @@
% done by finding the length difference then applying an auxiliary to
% the shorter sequence.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parshape_set_cutouts:
+\cs_new_protected:Npn \@@_parshape_set_cutouts:
{
\bool_if:nF
{
@@ -2351,7 +2351,7 @@
% so an \texttt{f}-type expansion is used to make life a little less
% complex.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_calc_interline_penalties:
+\cs_new_protected:Npn \@@_calc_interline_penalties:
{
\exp_args:Nff \@@_calc_interline_penalties:nn
{
@@ -2471,7 +2471,7 @@
% a simple conversion. The general interline penalty is always the
% last value in the primitive array.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \galley_interline_penalty:
+\cs_new_protected:Npn \galley_interline_penalty:
{ \__int_value:w \etex_interlinepenalties:D \etex_interlinepenalties:D \c_zero }
% \end{macrocode}
% \end{macro}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list