diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index f573668fde8..bba0907bbd8 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,2011 The LaTeX3 Project +%% (C) 2010-2012 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{l3names} -\GetIdInfo$Id: xgalley.dtx 2922 2011-10-17 19:01:04Z joseph $ +\GetIdInfo$Id: xgalley.dtx 3253 2012-01-28 14:59:55Z joseph $ {L3 Experimental galley} %</driver|package> %<*driver> @@ -471,7 +471,7 @@ % similar to the \LaTeXe{} \pkg{ragged2e} \env{RaggedLeft} environment. % \end{InstanceDescription} % -% \begin{InstanceDescription}{justification}{center}{std} +% \begin{InstanceDescription}{justification}{centering}{std} % \InstanceKey{end-skip}{0 pt} % \InstanceKey{fixed-word-spacing}{true} % \InstanceKey{indent-width}{0 pt} @@ -994,16 +994,21 @@ \int_set:Nn \tex_lefthyphenmin:D { \bool_if:NTF \l_galley_hyphen_enable_bool - { \l_galley_hyphen_left_int } { 63 } + { \l_galley_hyphen_left_int } + { 63 } } \int_set:Nn \tex_uchyph:D - { \bool_if:NTF \l_galley_hyphen_uppercase_bool { 1 } { 0 } } + { + \bool_if:NTF \l_galley_hyphen_uppercase_bool + { 1 } + { 0 } + } } % \end{macrocode} % At this stage, the default hyphenation character should be set and % hyphenation should be enabled. % \begin{macrocode} -%\UseTemplate { hyphenation } { std } { } +\UseTemplate { hyphenation } { std } { } \tex_defaulthyphenchar:D 45 \scan_stop: % \end{macrocode} % @@ -1094,7 +1099,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_space:N + \galley_set_interword_spacing: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 } @@ -1102,8 +1107,8 @@ { \skip_use:N \l_galley_line_left_skip } \skip_set:Nn \exp_not:N \l_galley_line_right_skip { \skip_use:N \l_galley_line_right_skip } - \skip_set:Nn \exp_not:N \l_galley_par_start_skip - { \skip_use:N \l_galley_par_start_skip } + \skip_set:Nn \exp_not:N \l_galley_par_begin_skip + { \skip_use:N \l_galley_par_begin_skip } \int_set:Nn \exp_not:N \l_galley_last_line_fit_int { \int_use:N \l_galley_last_line_fit_int } \skip_set:Nn \exp_not:N \@rightskip @@ -1471,7 +1476,7 @@ \DeclareInstance { paragraph-breaking } { single-noclub } { single } { club-penalty = 10 000 , - display-club-penalty = 10 000 + display-club-penalty = 10 000 } \DeclareInstance { paragraph-breaking } { single-nolone } { single } { |