l3 (21dec12)

git-svn-id: svn://tug.org/texlive/trunk@28608 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
index 9e0ecffb59a..d0086f4a3e3 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
@@ -37,7 +37,7 @@
 %
 %<*driver|package>
 \RequirePackage{expl3}
-\GetIdInfo$Id: xgalley.dtx 4253 2012-11-01 21:01:54Z joseph $
+\GetIdInfo$Id: xgalley.dtx 4373 2012-12-17 16:41:59Z joseph $
   {L3 Experimental galley}
 %</driver|package>
 %<*driver>
@@ -872,14 +872,14 @@
     \AssignTemplateKeys
     \bool_if:NTF \l_@@_parshape_on_left_bool
       {
-        \galley_parshape_single_par:nVVN
+        \galley_parshape_set_single:nVVN
           \l_@@_parshape_lines_int
           \l_@@_parshape_indent_dim
           \c_zero_dim
           \c_false_bool
       }
       {
-        \galley_parshape_single_par:nVVN
+        \galley_parshape_set_single:nVVN
           \l_@@_parshape_lines_int
           \c_zero_dim
           \l_@@_parshape_indent_dim
@@ -905,14 +905,14 @@
       }
     \bool_if:NTF \l_@@_parshape_on_left_bool
       {
-        \galley_parshape_single_par:nVVN
+        \galley_parshape_set_single:nVVN
           \c_zero
           \l_@@_tmpa_clist
           \l_@@_tmpb_clist
           \c_true_bool
       }
       {
-        \galley_parshape_single_par:nVVN
+        \galley_parshape_set_single:nVVN
           \c_zero
           \l_@@_tmpb_clist
           \l_@@_tmpa_clist
@@ -1059,7 +1059,7 @@
   {
     \AssignTemplateKeys
     \tl_clear:N \l_@@_justification_other_tl
-    \galley_set_interword_spacing:N \l_galley_fixed_spacing_bool
+    \galley_interword_spacing_set:N \l_galley_fixed_spacing_bool
     \bool_if:NTF \l_galley_par_stretch_last_bool
       { \int_set_eq:NN \l_galley_last_line_fit_int \c_one_thousand }
       { \int_zero:N \l_galley_last_line_fit_int }
@@ -1089,7 +1089,7 @@
         \bool_if:NTF \l_galley_fixed_spacing_bool
           { \bool_set_true:N  \exp_not:N \l_galley_fixed_spacing_bool }
           { \bool_set_false:N \exp_not:N \l_galley_fixed_spacing_bool }
-        \galley_set_interword_spacing:N
+        \galley_interword_spacing_set:N
           \exp_not:N \l_galley_fixed_spacing_bool
         \dim_set:Nn \exp_not:N \l_galley_par_indent_dim
           { \dim_use:N \l_galley_par_indent_dim  }
@@ -1107,7 +1107,7 @@
     \tl_gput_right:Nn \g_galley_restore_running_tl
       { \l_@@_justification_other_tl }
     \AssignTemplateKeys
-    \galley_set_interword_spacing:N \l_galley_fixed_spacing_bool
+    \galley_interword_spacing_set:N \l_galley_fixed_spacing_bool
     \bool_if:NTF \l_galley_par_stretch_last_bool
       { \int_set_eq:NN \l_galley_last_line_fit_int \c_one_thousand }
       { \int_zero:N \l_galley_last_line_fit_int }
@@ -1159,8 +1159,8 @@
     right-skip         = 0 pt plus 2 em
   }
 %    \end{macrocode}
-% The \texttt{centering} instance is used to center material with minimal
-% hyphenation
+% The \texttt{center} instance is used to center material with minimal
+% hyphenation.
 %    \begin{macrocode}
 \DeclareInstance { justification } { center } { std }
   {
@@ -1300,11 +1300,11 @@
   }
   {
     \AssignTemplateKeys
-    \galley_set_club_penalties:V          \l_@@_club_penalty_int
-    \galley_set_display_club_penalties:V  \l_@@_display_club_penalty_int
-    \galley_set_display_widow_penalties:V \l_@@_display_widow_penalty_int
-    \galley_set_interline_penalty:n       \l_@@_interline_penalty_int
-    \galley_set_widow_penalties:V         \l_@@_widow_penalty_int
+    \galley_club_penalties_set:V          \l_@@_club_penalty_int
+    \galley_display_club_penalties_set:V  \l_@@_display_club_penalty_int
+    \galley_display_widow_penalties_set:V \l_@@_display_widow_penalty_int
+    \galley_interline_penalty_set:n       \l_@@_interline_penalty_int
+    \galley_widow_penalties_set:V         \l_@@_widow_penalty_int
   }
 %    \end{macrocode}
 % \end{variable}
@@ -1383,7 +1383,7 @@
 %    \begin{macrocode}
     \tl_if_empty:NF \l_@@_interline_penalty_tl
       {
-        \tl_gput_right:Nx \g_galley_par_after_hook_tl
+        \tl_gput_right:Nx \g_galley_par_reset_hook_tl
           {
             \int_set:Nn \exp_not:N \l_@@_interline_penalty_int
               { \galley_interline_penalty: }
@@ -1393,7 +1393,7 @@
       }
     \tl_if_empty:NF \l_@@_parbreak_fuzz_tl
       {
-        \tl_gput_right:Nx \g_galley_par_after_hook_tl
+        \tl_gput_right:Nx \g_galley_par_reset_hook_tl
           {
             \dim_set:Nn \exp_not:N \l_galley_parbreak_fuzz_dim
               { \dim_use:N \l_galley_parbreak_fuzz_dim }
@@ -1408,7 +1408,7 @@
       {
         \tl_if_empty:cF { l_galley_ ##1 _tl }
           {
-            \tl_gput_right:Nx \g_galley_par_after_hook_tl
+            \tl_gput_right:Nx \g_galley_par_reset_hook_tl
               {
                 \int_set:Nn \exp_not:c { l_galley_ ##1 _int }
                   { \int_use:c { l_galley_ ##1 _int } }
@@ -1426,7 +1426,7 @@
         \tl_if_empty:cF { l_galley_ ##1 _tl }
           {
             \use:c { galley_save_ ##1 :N } \l_@@_tmpa_clist
-            \tl_gput_right:Nx \g_galley_par_after_hook_tl
+            \tl_gput_right:Nx \g_galley_par_reset_hook_tl
               {
                 \exp_not:c { galley_set_ ##1 :n }
                   { \exp_not:o \l_@@_tmpa_clist }