l3experimental 3160 (31aug12)

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

1 files changed, 9 insertions, 32 deletions

diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx
index 9ad68d87e0b..8a76d00cd01 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{l3bootstrap}
-\GetIdInfo$Id: xgalley.dtx 3991 2012-07-16 19:00:35Z joseph $
+\GetIdInfo$Id: xgalley.dtx 4155 2012-08-29 10:29:58Z joseph $
   {L3 Experimental galley}
 %</driver|package>
 %<*driver>
@@ -435,18 +435,6 @@
 %   paragraph.
 % \end{TemplateDescription}
 %
-% \begin{InstanceDescription}{justification}{centered}{std}
-%   \InstanceKey{end-skip}{0 pt}
-%   \InstanceKey{fixed-word-spacing}{true}
-%   \InstanceKey{indent-width}{0 pt}
-%   \InstanceKey{left-skip}{0 pt plus 1 em}
-%   \InstanceKey{right-skip}{0 pt plus 1 em}
-%   \InstanceSemantics
-%   Centres typeset material such that hyphenation will still occur and
-%   such that very short lines are discouraged. This is similar to the
-%   \LaTeXe{} \pkg{ragged2e} \env{Centering} environment.
-% \end{InstanceDescription}
-%
 % \begin{InstanceDescription}{justification}{ragged-left}{std}
 %   \InstanceKey{end-skip}{0 pt}
 %   \InstanceKey{fixed-word-spacing}{true}
@@ -471,17 +459,15 @@
 %   similar to the \LaTeXe{} \pkg{ragged2e} \env{RaggedLeft} environment.
 % \end{InstanceDescription}
 %
-% \begin{InstanceDescription}{justification}{centering}{std}
+% \begin{InstanceDescription}{justification}{center}{std}
 %   \InstanceKey{end-skip}{0 pt}
 %   \InstanceKey{fixed-word-spacing}{true}
 %   \InstanceKey{indent-width}{0 pt}
 %   \InstanceKey{left-skip}{0 pt plus 1 fil}
 %   \InstanceKey{right-skip}{0 pt plus 1 fil}
 %   \InstanceSemantics
-%   Centres typeset material such that hyphenation is strongly discouraged
-%   and short lines are allowed. This template is suited to centring arbitrary
-%   material (such as boxes) rather than centring text. In the later case, the
-%   |centered| instance should be used.
+%   Centres typeset material such that hyphenation is discouraged and short
+%   lines are allowed.
 % \end{InstanceDescription}
 %
 % \begin{TemplateDescription}{justification}{compound}
@@ -1149,21 +1135,13 @@
     indent-width = 0 pt
   }
 %    \end{macrocode}
-% The other standard justification schemes are for text which is either
-% centred or ragged. The settings here are taken from the \LaTeXe{}
+% The other standard justification schemes are for text which ragged.
+% The settings here are taken from the \LaTeXe{}
 % \pkg{ragged2e} package, as they maintain a reasonable appearance by
 % ensuring that \TeX{} will not be too tolerant of very short lines.
 % To keep the design clear here, no default values are relied on even
 % though this would make the instance declarations shorter.
 %    \begin{macrocode}
-\DeclareInstance { justification } { centered } { std }
-  {
-    end-skip           = 0 pt           ,
-    fixed-word-spacing = true           ,
-    indent-width       = 0 pt           ,
-    left-skip          = 0 pt plus 1 em ,
-    right-skip         = 0 pt plus 1 em
-  }
 \DeclareInstance { justification } { ragged-left } { std }
   {
     end-skip           = 0 pt            ,
@@ -1181,11 +1159,10 @@
     right-skip         = 0 pt plus 2 em
   }
 %    \end{macrocode}
-% The \texttt{centering} instance is used to centre material without
-% hyphenation: this is used for centring arbitrary material rather
-% than text.
+% The \texttt{centering} instance is used to center material with minimal
+% hyphenation
 %    \begin{macrocode}
-\DeclareInstance { justification } { centering } { std }
+\DeclareInstance { justification } { center } { std }
   {
     end-skip           = 0 pt            ,
     fixed-word-spacing = true            ,