From c33dd0f6eb3ee533df663d363845fc7d22578ba6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Aug 2012 23:28:14 +0000 Subject: l3* (14aug12) git-svn-id: svn://tug.org/texlive/trunk@27406 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3experimental/l3dt/l3dt.dtx | 4 +- .../source/latex/l3experimental/l3sort/l3sort.dtx | 4 +- .../latex/l3experimental/xcoffins/xcoffins.dtx | 88 ++++++++++++++-------- .../latex/l3experimental/xgalley/l3galley.dtx | 9 +-- .../latex/l3experimental/xgalley/xgalley.dtx | 4 +- 5 files changed, 63 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx b/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx index be3fc8eb1c1..250fbd7bdf5 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3dt/l3dt.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: l3dt.dtx 3877 2012-06-30 22:24:42Z joseph $ +\GetIdInfo$Id: l3dt.dtx 3991 2012-07-16 19:00:35Z joseph $ {L3 Experimental data tables} % %<*driver> @@ -1264,4 +1264,4 @@ % % \end{implementation} % -% \PrintIndex \ No newline at end of file +% \PrintIndex diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx index 4d795c7c9f5..22c4e73d42e 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: l3sort.dtx 3953 2012-07-11 16:15:09Z bruno $ +\GetIdInfo$Id: l3sort.dtx 3991 2012-07-16 19:00:35Z joseph $ {L3 Experimental sorting functions} % %<*driver> @@ -675,4 +675,4 @@ % % \end{implementation} % -% \PrintIndex \ No newline at end of file +% \PrintIndex diff --git a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx index 0cee83f61ab..1d2a22efea3 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xcoffins/xcoffins.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{xparse} -\GetIdInfo$Id: xcoffins.dtx 3876 2012-06-30 15:35:39Z joseph $ +\GetIdInfo$Id: xcoffins.dtx 4029 2012-07-29 18:16:03Z bruno $ {L3 Experimental design-level coffins} % %<*driver> @@ -150,16 +150,6 @@ % name of the \meta{coffin} is not globally-unique. % \end{function} % -% \begin{function}{\BoxToCoffin} -% \begin{syntax} -% \cs{BoxToCoffin} \meta{box} -% \end{syntax} -% Adds coffin structure to the \meta{box}, which should be a \LaTeXe{} -% \enquote{user} box (e.g.~one created using \cs{newsavebox}). This function -% allows standard \LaTeXe{} box material to be used in coffin-based -% alignments. -% \end{function} -% % \begin{function}{\SetHorizontalCoffin} % \begin{syntax} % \cs{SetHorizontalCoffin} \meta{coffin} \Arg{material} @@ -338,10 +328,7 @@ % \cs{ResizeCoffin} \meta{coffin} \Arg{width} \Arg{total-height} % \end{syntax} % Resized the \meta{coffin} to \meta{width} and \meta{total-height}, -% both of which should be given as dimension expressions. These may -% include the terms \cs{TotalHeight}, \cs{Height}, \cs{Depth} and -% \cs{Width}, which will evaluate to the appropriate dimensions of -% the \meta{coffin}. +% both of which should be given as dimension expressions. % \end{function} % % \begin{function}{\ScaleCoffin} @@ -712,7 +699,6 @@ {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} % \end{macrocode} % -% % \begin{variable} % { % \l_@@_A_hpole_tl , @@ -757,6 +743,35 @@ % \end{macrocode} % \end{variable} % +% \begin{macro}{\@@_design_names:N} +% \begin{variable}{\Height, \Depth, \Width, \TotalHeight} +% \begin{variable}[int] +% {\l_@@_height_dim, \l_@@_depth_dim, \l_@@_width_dim, \l_@@_totalheight_dim} +% Sets up design-level names for the various coffin dimensions. These are +% not defined outside of this scope, and are dimensions so that they work +% correctly inside for example \cs{fp_eval:n}. +% \begin{macrocode} +\cs_new_protected:Npn \@@_design_names:N #1 + { + \dim_set:Nn \l_@@_height_dim { \coffin_ht:N #1 } + \dim_set:Nn \l_@@_depth_dim { \coffin_dp:N #1 } + \dim_set:Nn \l_@@_width_dim { \coffin_wd:N #1 } + \dim_set:Nn \l_@@_totalheight_dim + { \l_@@_height_dim + \l_@@_depth_dim } + \cs_set_eq:NN \Height \l_@@_height_dim + \cs_set_eq:NN \Depth \l_@@_depth_dim + \cs_set_eq:NN \Width \l_@@_width_dim + \cs_set_eq:NN \TotalHeight \l_@@_totalheight_dim + } +\dim_new:N \l_@@_height_dim +\dim_new:N \l_@@_depth_dim +\dim_new:N \l_@@_width_dim +\dim_new:N \l_@@_totalheight_dim +% \end{macrocode} +% \end{variable} +% \end{variable} +% \end{macro} +% % A lot of this is more-or-less just passing data straight through. % % \begin{macro}{\NewCoffin} @@ -767,19 +782,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\BoxToCoffin} -% For allowing a user-level \LaTeXe{} box to be used as a coffin. -% \begin{macrocode} -\NewDocumentCommand \BoxToCoffin { m } - { - \prop_clear_new:c { l_@@_corners_ \__int_value:w #1 _prop } - \prop_clear_new:c { l_@@_poles_ \__int_value:w #1 _prop } - \@@_update_corners:N #1 - \@@_update_poles:N #1 - } -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\SetHorizontalCoffin} % \begin{macro}{\SetVerticalCoffin} % These are again straight-forward translations. @@ -794,12 +796,32 @@ % % \begin{macro}{\SetHorizontalPole} % \begin{macro}{\SetVerticalPole} -% Again straight-forward +% Here, there is a need to set up the design-level names for coffin +% dimensions. This requires grouping, but the coffin work has to occur +% outside of the group. Hence there is a bit of expansion trickery. % \begin{macrocode} \NewDocumentCommand \SetHorizontalPole { m m m } - { \coffin_set_horizontal_pole:Nnn #1 {#2} {#3} } + { + \group_begin: + \@@_design_names:N #1 + \use:x + { + \group_end: + \coffin_set_horizontal_pole:Nnn #1 + { \exp_not:n {#2} } { \dim_eval:n {#3} } + } + } \NewDocumentCommand \SetVerticalPole { m m m } - { \coffin_set_vertical_pole:Nnn #1 {#2} {#3} } + { + \group_begin: + \@@_design_names:N #1 + \use:x + { + \group_end: + \coffin_set_vertical_pole:Nnn #1 + { \exp_not:n {#2} } { \dim_eval:n {#3} } + } + } % \end{macrocode} % \end{macro} % \end{macro} @@ -933,4 +955,4 @@ % % \end{implementation} % -% \PrintIndex \ No newline at end of file +% \PrintIndex diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 77b6456d15e..783ebbf0113 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -37,7 +37,7 @@ % %<*driver|package> \RequirePackage{xparse} -\GetIdInfo$Id: l3galley.dtx 3918 2012-07-05 00:32:37Z bruno $ +\GetIdInfo$Id: l3galley.dtx 4009 2012-07-20 18:18:29Z joseph $ {L3 Experimental galley code} % %<*driver> @@ -1224,17 +1224,12 @@ % group level as the text, hence this function cannot be placed using % \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. -% As \LaTeXe{} already adds one group, there are two \enquote{escapes} -% here: the format version needs only one escape. % \begin{macrocode} \cs_new_protected_nopar:Npn \galley_display_end: { \par \@@_restore_parameters: \group_end: -%<*package> - \group_insert_after:N \group_insert_after:N -% \group_insert_after:N \@@_display_par_setup: } % \end{macrocode} @@ -2325,4 +2320,4 @@ % % \end{implementation} % -% \PrintIndex \ No newline at end of file +% \PrintIndex diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index 87b30d0ce25..9ad68d87e0b 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx @@ -36,8 +36,8 @@ %% % %<*driver|package> -\RequirePackage{l3names} -\GetIdInfo$Id: xgalley.dtx 3879 2012-07-01 09:17:47Z joseph $ +\RequirePackage{l3bootstrap} +\GetIdInfo$Id: xgalley.dtx 3991 2012-07-16 19:00:35Z joseph $ {L3 Experimental galley} % %<*driver> -- cgit v1.2.3