summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
committerKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
commitca1c73f9a8de69e467230c4a57ccf8b07cd275a9 (patch)
tree6272657307f73c14327d6b8bce5d6b7ff97c3f66 /Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
parent22c251adda514ed7b453066de05b2f89707d0fe6 (diff)
finish l3 update
git-svn-id: svn://tug.org/texlive/trunk@27427 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx103
1 files changed, 11 insertions, 92 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index b4242b6d8ed..cc205d5da4a 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -35,8 +35,8 @@
%%
%
%<*driver|package>
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3coffins.dtx 3986 2012-07-15 19:23:51Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3coffins.dtx 4011 2012-07-20 21:02:59Z joseph $
{L3 Coffin code layer}
%</driver|package>
%<*driver>
@@ -160,7 +160,7 @@
% environment in a coffin.
% \end{function}
%
-% \begin{function}[added = 2011-08-17]
+% \begin{function}[added = 2012-07-20]
% {\coffin_set_horizontal_pole:Nnn, \coffin_set_horizontal_pole:cnn}
% \begin{syntax}
% \cs{coffin_set_horizontal_pole:Nnn} \meta{coffin}
@@ -169,13 +169,10 @@
% Sets the \meta{pole} to run horizontally through the \meta{coffin}.
% The \meta{pole} will be located at the \meta{offset} from the
% bottom edge of the bounding box of the \meta{coffin}. The
-% \meta{offset} should be given as a dimension expression; this may
-% include the terms \cs{TotalHeight}, \cs{Height}, \cs{Depth} and
-% \cs{Width}, which will evaluate to the appropriate dimensions of
-% the \meta{coffin}.
+% \meta{offset} should be given as a dimension expression.
% \end{function}
%
-% \begin{function}[added = 2011-08-17]
+% \begin{function}[added = 2012-07-20]
% {\coffin_set_vertical_pole:Nnn, \coffin_set_vertical_pole:cnn}
% \begin{syntax}
% \cs{coffin_set_vertical_pole:Nnn} \meta{coffin} \Arg{pole} \Arg{offset}
@@ -183,10 +180,7 @@
% Sets the \meta{pole} to run vertically through the \meta{coffin}.
% The \meta{pole} will be located at the \meta{offset} from the
% left-hand edge of the bounding box of the \meta{coffin}. The
-% \meta{offset} should be given as a dimension expression; this may
-% include the terms \cs{TotalHeight}, \cs{Height}, \cs{Depth} and
-% \cs{Width}, which will evaluate to the appropriate dimensions of
-% the \meta{coffin}.
+% \meta{offset} should be given as a dimension expression.
% \end{function}
%
% \section{Joining and using coffins}
@@ -239,15 +233,16 @@
% expressions.
% \end{function}
%
-% \begin{function}{\coffin_typeset:Nnnnn, \coffin_typeset:cnnnn}
+% \begin{function}[updated = 2012-07-20]
+% {\coffin_typeset:Nnnnn, \coffin_typeset:cnnnn}
% \begin{syntax}
% \cs{coffin_typeset:Nnnnn} \meta{coffin} \Arg{pole_1} \Arg{pole_2}
% ~~\Arg{x-offset} \Arg{y-offset}
% \end{syntax}
% Typesetting is carried out by first calculating \meta{handle}, the
% point of intersection of \meta{pole_1} and \meta{pole_2}. The coffin
-% is then typeset such that the relationship between the current
-% reference point in the document and the \meta{handle} is described
+% is then typeset in horizontal mode such that the relationship between the
+% current reference point in the document and the \meta{handle} is described
% by the \meta{x-offset} and \meta{y-offset}. The two offsets should
% be given as dimension expressions. Typesetting a coffin is
% therefore analogous to carrying out an alignment where the
@@ -464,39 +459,6 @@
% \end{variable}
% \end{variable}
%
-% \begin{variable}{\l_@@_Depth_dim}
-% \begin{variable}{\l_@@_Height_dim}
-% \begin{variable}{\l_@@_TotalHeight_dim}
-% \begin{variable}{\l_@@_Width_dim}
-% Dimensions for the various parts of a coffin.
-% \begin{macrocode}
-\dim_new:N \l_@@_Depth_dim
-\dim_new:N \l_@@_Height_dim
-\dim_new:N \l_@@_TotalHeight_dim
-\dim_new:N \l_@@_Width_dim
-% \end{macrocode}
-% \end{variable}
-% \end{variable}
-% \end{variable}
-% \end{variable}
-%
-% \begin{macro}{\@@_saved_Depth:}
-% \begin{macro}{\@@_saved_Height:}
-% \begin{macro}{\@@_saved_TotalHeight:}
-% \begin{macro}{\@@_saved_Width:}
-% Used to save the meaning of \cs{Depth}, \cs{Height}, \cs{TotalHeight}
-% and \cs{Width}.
-% \begin{macrocode}
-\cs_new_nopar:Npn \@@_saved_Depth: { }
-\cs_new_nopar:Npn \@@_saved_Height: { }
-\cs_new_nopar:Npn \@@_saved_TotalHeight: { }
-\cs_new_nopar:Npn \@@_saved_Width: { }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
% \subsection{Basic coffin functions}
%
% There are a number of basic functions needed for creating coffins and
@@ -829,45 +791,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_set_user_dimensions:N}
-% \begin{macro}{\@@_end_user_dimensions:}
-% \begin{macro}{\Depth}
-% \begin{macro}{\Height}
-% \begin{macro}{\TotalHeight}
-% \begin{macro}{\Width}
-% These make design-level names for the dimensions of a coffin easy to
-% get at.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_user_dimensions:N #1
- {
- \cs_set_eq:NN \@@_saved_Height: \Height
- \cs_set_eq:NN \@@_saved_Depth: \Depth
- \cs_set_eq:NN \@@_saved_TotalHeight: \TotalHeight
- \cs_set_eq:NN \@@_saved_Width: \Width
- \cs_set_eq:NN \Height \l_@@_Height_dim
- \cs_set_eq:NN \Depth \l_@@_Depth_dim
- \cs_set_eq:NN \TotalHeight \l_@@_TotalHeight_dim
- \cs_set_eq:NN \Width \l_@@_Width_dim
- \dim_set:Nn \Height { \box_ht:N #1 }
- \dim_set:Nn \Depth { \box_dp:N #1 }
- \dim_set:Nn \TotalHeight { \box_ht:N #1 + \box_dp:N #1 }
- \dim_set:Nn \Width { \box_wd:N #1 }
- }
-\cs_new_protected_nopar:Npn \@@_end_user_dimensions:
- {
- \cs_set_eq:NN \Height \@@_saved_Height:
- \cs_set_eq:NN \Depth \@@_saved_Depth:
- \cs_set_eq:NN \TotalHeight \@@_saved_TotalHeight:
- \cs_set_eq:NN \Width \@@_saved_Width:
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
% \begin{macro}
% {\coffin_set_horizontal_pole:Nnn, \coffin_set_horizontal_pole:cnn}
% \begin{macro}{\coffin_set_vertical_pole:Nnn,\coffin_set_vertical_pole:cnn}
@@ -881,26 +804,22 @@
{
\@@_if_exist:NT #1
{
- \@@_set_user_dimensions:N #1
\@@_set_pole:Nnx #1 {#2}
{
{ 0 pt } { \dim_eval:n {#3} }
{ 1000 pt } { 0 pt }
}
- \@@_end_user_dimensions:
}
}
\cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3
{
\@@_if_exist:NT #1
{
- \@@_set_user_dimensions:N #1
\@@_set_pole:Nnx #1 {#2}
{
{ \dim_eval:n {#3} } { 0 pt }
{ 0 pt } { 1000 pt }
}
- \@@_end_user_dimensions:
}
}
\cs_new_protected:Npn \@@_set_pole:Nnn #1#2#3
@@ -1431,9 +1350,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \coffin_typeset:Nnnnn #1#2#3#4#5
{
+ \hbox_unpack:N \c_empty_box
\@@_align:NnnNnnnnN \c_empty_coffin { H } { l }
#1 {#2} {#3} {#4} {#5} \l_@@_aligned_coffin
- \hbox_unpack:N \c_empty_box
\box_use:N \l_@@_aligned_coffin
}
\cs_generate_variant:Nn \coffin_typeset:Nnnnn { c }