summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xpackages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-28 22:36:09 +0000
committerKarl Berry <karl@freefriends.org>2011-04-28 22:36:09 +0000
commit7baa3b2da85b6c1521d5f52417f2ebbf0f51ce41 (patch)
treeeadaf3c57105662f582b67417a6a28ed9a76637f /Master/texmf-dist/tex/latex/xpackages
parent97073d3a436fba10891a4529c3b2f96a6b11b08f (diff)
xpackages 2155 (28apr11)
git-svn-id: svn://tug.org/texlive/trunk@22237 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xpackages')
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty80
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/xcoffins/l3coffins.sty208
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/xcoffins/xcoffins.sty55
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/xhead/xtextblock.sty101
4 files changed, 224 insertions, 220 deletions
diff --git a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
index a6c0132ec16..bdb507e62ff 100644
--- a/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/xbase/xparse.sty
@@ -57,7 +57,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3names}
-\GetIdInfo$Id: xparse.dtx 2136 2011-01-23 12:15:49Z joseph $
+\GetIdInfo$Id: xparse.dtx 2219 2011-04-08 21:07:45Z joseph $
{Generic document command parser}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -240,6 +240,9 @@
\xparse_declare_cmd_aux:Nnn #1 {#2}
}
\cs_new:Npn \xparse_declare_cmd_aux:Nnn #1#2#3 {
+ \cs_if_exist:cF { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
+ { \tl_new:c { l_xparse_ \token_to_str:N #1 _arg_spec_tl } }
+ \tl_set:cn { l_xparse_ \token_to_str:N #1 _arg_spec_tl } {#2}
\xparse_count_mandatory:n {#2}
\xparse_prepare_signature:n {#2}
\bool_if:NTF \l_xparse_m_only_bool {
@@ -254,11 +257,16 @@
#1 \cs_set_protected_nopar:Npn \l_xparse_total_args_int {#2}
}
\cs_new:Npn \xparse_declare_cmd_mixed:Nn #1#2 {
+ \group_begin:
+ \tex_escapechar:D 92 \scan_stop:
+ \tl_set:Nx \l_xparse_function_tl { \token_to_str:N #1 }
+ \exp_args:NNNo \group_end:
+ \tl_set:Nn \l_xparse_function_tl { \l_xparse_function_tl }
\cs_set_protected_nopar:Npx #1 {
\exp_not:n {
\int_zero:N \l_xparse_processor_int
\tl_set:Nn \l_xparse_args_tl
- } { \exp_not:c { \token_to_str:N #1 } }
+ } { \exp_not:c { \l_xparse_function_tl } }
\exp_not:V \l_xparse_signature_tl
\exp_not:N \l_xparse_args_tl
}
@@ -841,7 +849,11 @@
\msg_kernel_info:nnxx { xparse } { define-command }
{ \token_to_str:N #1 } { \exp_not:n {#2} }
}
- \tl_set:Nn \l_xparse_function_tl {#1}
+ \group_begin:
+ \tex_escapechar:D 92 \scan_stop:
+ \tl_set:Nx \l_xparse_function_tl { \token_to_str:N #1}
+ \exp_args:NNNo \group_end:
+ \tl_set:Nn \l_xparse_function_tl { \l_xparse_function_tl }
\xparse_exp_prepare_function:n {#2}
\int_compare:nTF {
\l_xparse_total_args_int = \l_xparse_m_args_int
@@ -944,42 +956,50 @@
}
}
\cs_new_eq:NN \xparse_exp_set:cpx \cs_set_nopar:cpx
-\cs_new_protected:Npn \parse_get_arg_spec:N #1 {
- \cs_if_exist:cTF { l_parse_ \token_to_str:N #1 _arg_spec_tl }
+\cs_new_protected:Npn \xparse_get_arg_spec:N #1 {
+ \cs_if_exist:cTF { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
{
\tl_set_eq:Nc \ArgumentSpecification
- { l_parse_ \token_to_str:N #1 _arg_spec_tl }
+ { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
}
{
- \msg_kernel_error:nx { unknown-document-command }
+ \msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \parse_get_arg_spec:n #1 {
- \cs_if_exist:cTF { l_parse_ #1 _arg_spec_tl }
- { \tl_set_eq:Nc \ArgumentSpecification { l_parse_ #1 _arg_spec_tl } }
- { \msg_kernel_error:nx { unknown-document-environment } {#1} }
+\cs_new_protected:Npn \xparse_get_arg_spec:n #1 {
+ \cs_if_exist:cTF { l_xparse_ #1 _arg_spec_tl }
+ {
+ \tl_set_eq:Nc \ArgumentSpecification { l_xparse_ #1 _arg_spec_tl }
+ }
+ {
+ \msg_kernel_error:nnx { xparse }
+ { unknown-document-environment } {#1}
+ }
}
\tl_new:N \ArgumentSpecification
-\cs_new_protected:Npn \parse_show_arg_spec:N #1 {
- \cs_if_exist:cTF { l_parse_ \token_to_str:N #1 _arg_spec_tl }
+\cs_new_protected:Npn \xparse_show_arg_spec:N #1 {
+ \cs_if_exist:cTF { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
{
\tl_set_eq:Nc \ArgumentSpecification
- { l_parse_ \token_to_str:N #1 _arg_spec_tl }
+ { l_xparse_ \token_to_str:N #1 _arg_spec_tl }
\tl_show:N \ArgumentSpecification
}
{
- \msg_kernel_error:nx { unknown-document-command }
+ \msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \parse_show_arg_spec:n #1 {
- \cs_if_exist:cTF { l_parse_ #1 _arg_spec_tl }
+\cs_new_protected:Npn \xparse_show_arg_spec:n #1 {
+ \cs_if_exist:cTF { l_xparse_ #1 _arg_spec_tl }
{
- \tl_set_eq:Nc \ArgumentSpecification { l_parse_ #1 _arg_spec_tl }
+ \tl_set_eq:Nc \ArgumentSpecification { l_xparse_ #1 _arg_spec_tl }
\tl_show:N \ArgumentSpecification
}
- { \msg_kernel_error:nx { unknown-document-environment } {#1} }
+ {
+ \msg_kernel_error:nnx { xparse }
+ { unknown-document-environment } {#1}
+ }
}
\msg_kernel_new:nnnn { xparse } { command-already-defined }
{ Command~'#1'~already~defined! }
@@ -1047,7 +1067,7 @@
Argument~specification~'#1'~contains~a~processor~function:\\
this~is~only~supported~for~standard~robust~functions.
}
-\msg_kernel_set:nnnn { xparse } { split-excess-tokens }
+\msg_kernel_new:nnnn { xparse } { split-excess-tokens }
{ Too~many~'#1'~tokens~when~trying~to~split~argument. }
{
LaTeX~was~asked~to~split~the~input~'#3'\\
@@ -1060,6 +1080,18 @@
The~letter~#1'~does~not~specify~a~known~argument~type.\\
I'm~assuming~you~want~a~standard~mandatory~argument~(type~'m').
}
+\msg_kernel_new:nnnn { xparse } { unknown-document-command }
+ { Unknown~document~command~'#1'. }
+ {
+ You~have~asked~for~the~argument~specification~for~a~command~'#1',~
+ but~this~is~not~a~document~command.
+ }
+\msg_kernel_new:nnnn { xparse } { unknown-document-environment }
+ { Unknown~document~environment~'#1'. }
+ {
+ You~have~asked~for~the~argument~specification~for~a~command~'#1',~
+ but~this~is~not~a~document~environment.
+ }
\msg_kernel_new:nnn { xparse } { define-command }
{
Defining~document~command~#1\\
@@ -1157,10 +1189,10 @@
\cs_new_eq:NN \ReverseBoolean \_xparse_bool_reverse:N
\cs_new_eq:NN \SplitArgument \_xparse_split_argument:nnn
\cs_new_eq:NN \SplitList \_xparse_split_list:nn
-\cs_new_eq:NN \GetDocumentCommandArgSpec \parse_get_arg_spec:N
-\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \parse_get_arg_spec:n
-\cs_new_eq:NN \ShowDocumentCommandArgSpec \parse_show_arg_spec:N
-\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \parse_show_arg_spec:n
+\cs_new_eq:NN \GetDocumentCommandArgSpec \xparse_get_arg_spec:N
+\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \xparse_get_arg_spec:n
+\cs_new_eq:NN \ShowDocumentCommandArgSpec \xparse_show_arg_spec:N
+\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \xparse_show_arg_spec:n
\endinput
%%
%% End of file `xparse.sty'.
diff --git a/Master/texmf-dist/tex/latex/xpackages/xcoffins/l3coffins.sty b/Master/texmf-dist/tex/latex/xpackages/xcoffins/l3coffins.sty
index cf83a54f0c5..9c3636292f5 100644
--- a/Master/texmf-dist/tex/latex/xpackages/xcoffins/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/xcoffins/l3coffins.sty
@@ -54,7 +54,7 @@
%%
\RequirePackage{expl3}
\RequirePackage{graphicx,xcolor,trace}
-\GetIdInfo$Id: l3coffins.dtx 2109 2010-12-23 19:39:41Z joseph $
+\GetIdInfo$Id: l3coffins.dtx 2209 2011-03-23 08:33:19Z joseph $
{Coffins}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -108,60 +108,89 @@
\cs_new_nopar:Npn \coffin_saved_Height: { }
\cs_new_nopar:Npn \coffin_saved_TotalHeight: { }
\cs_new_nopar:Npn \coffin_saved_Width: { }
-\cs_new_protected_nopar:Npn \coffin_clear:N #1 {
- \box_clear:N #1
- \coffin_reset_structure:N #1
-}
-\cs_new_protected_nopar:Npn \coffin_new:N #1 {
- \cs_if_free:NTF #1
+\cs_new_protected:Npn \coffin_if_exist_execute:Nn #1#2 {
+ \cs_if_exist:NTF #1
{
- \box_new:N #1
- \prop_new:c { l_coffin_corners_ \tex_number:D #1 _prop }
- \prop_new:c { l_coffin_poles_ \tex_number:D #1 _prop }
- \prop_gset_eq:cN { l_coffin_corners_ \tex_number:D #1 _prop }
- \c_coffin_corners_prop
- \prop_gset_eq:cN { l_coffin_poles_ \tex_number:D #1 _prop }
- \c_coffin_poles_prop
+ \cs_if_exist:cTF { l_coffin_poles_ \tex_number:D #1 _prop }
+ { #2 }
+ {
+ \msg_kernel_error:nnx { coffin } { unknown-coffin }
+ { \token_to_str:N #1 }
+ }
}
{
- \msg_kernel_error:nnx { coffin }{ variable-already-defined }
+ \msg_kernel_error:nnx { coffin } { unknown-coffin }
{ \token_to_str:N #1 }
}
}
+\cs_new_protected_nopar:Npn \coffin_clear:N #1 {
+ \coffin_if_exist_execute:Nn #1
+ {
+ \box_clear:N #1
+ \coffin_reset_structure:N #1
+ }
+}
+\cs_generate_variant:Nn \coffin_clear:N { c }
+\cs_new_protected_nopar:Npn \coffin_new:N #1 {
+ \box_new:N #1
+ \cs_gundefine:c { l_coffin_corners_ \tex_number:D #1 _prop }
+ \cs_gundefine:c { l_coffin_poles_ \tex_number:D #1 _prop }
+ \prop_new:c { l_coffin_corners_ \tex_number:D #1 _prop }
+ \prop_new:c { l_coffin_poles_ \tex_number:D #1 _prop }
+ \prop_gset_eq:cN { l_coffin_corners_ \tex_number:D #1 _prop }
+ \c_coffin_corners_prop
+ \prop_gset_eq:cN { l_coffin_poles_ \tex_number:D #1 _prop }
+ \c_coffin_poles_prop
+}
+\cs_generate_variant:Nn \coffin_new:N { c }
\cs_new_protected:Npn \hcoffin_set:Nn #1#2 {
- \hbox_set:Nn #1
+ \coffin_if_exist_execute:Nn #1
{
- \group_begin:
- \set@color
- #2
- \group_end:
+ \hbox_set:Nn #1
+ {
+ \group_begin:
+ \set@color
+ #2
+ \group_end:
+ }
+ \coffin_reset_structure:N #1
+ \coffin_update_poles:N #1
+ \coffin_update_corners:N #1
}
- \coffin_reset_structure:N #1
- \coffin_update_poles:N #1
- \coffin_update_corners:N #1
}
+\cs_generate_variant:Nn \hcoffin_set:Nn { c }
\cs_new_protected:Npn \vcoffin_set:Nnn #1#2#3 {
- \vbox_set:Nn #1
- {
- \dim_set:Nn \tex_hsize:D {#2}
- \group_begin:
- \set@color
- #3
- \group_end:
- }
- \coffin_reset_structure:N #1
- \coffin_update_poles:N #1
- \coffin_update_corners:N #1
- \vbox_set_top:Nn \l_coffin_tmp_box { \vbox_unpack:N #1 }
- \dim_set:Nn \l_coffin_tmp_dim
- { \box_ht:N #1 - \box_ht:N \l_coffin_tmp_box }
- \coffin_set_pole:Nnx #1 { T }
- { { 0 pt } { \dim_use:N \l_coffin_tmp_dim } { 1000 pt } { 0 pt } }
+ \coffin_if_exist_execute:Nn #1
+ {
+ \vbox_set:Nn #1
+ {
+ \dim_set:Nn \tex_hsize:D {#2}
+ \group_begin:
+ \set@color
+ #3
+ \group_end:
+ }
+ \coffin_reset_structure:N #1
+ \coffin_update_poles:N #1
+ \coffin_update_corners:N #1
+ \vbox_set_top:Nn \l_coffin_tmp_box { \vbox_unpack:N #1 }
+ \dim_set:Nn \l_coffin_tmp_dim
+ { \box_ht:N #1 - \box_ht:N \l_coffin_tmp_box }
+ \coffin_set_pole:Nnx #1 { T }
+ {
+ { 0 pt } { \dim_use:N \l_coffin_tmp_dim } { 1000 pt } { 0 pt }
+ }
+ }
}
+\cs_generate_variant:Nn \vcoffin_set:Nnn { c }
\cs_new_protected_nopar:Npn \coffin_set_eq:NN #1#2 {
- \box_set_eq:NN #1 #2
- \coffin_set_eq_structure:NN #1 #2
+ \coffin_if_exist_execute:Nn #1
+ {
+ \box_set_eq:NN #1 #2
+ \coffin_set_eq_structure:NN #1 #2
+ }
}
+\cs_generate_variant:Nn \coffin_set_eq:NN { c , Nc , cc }
\coffin_new:N \c_empty_coffin
\hbox_set:Nn \c_empty_coffin { }
\coffin_new:N \l_coffin_aligned_coffin
@@ -208,26 +237,34 @@
\cs_set_eq:NN \Width \coffin_saved_Width:
}
\cs_new_protected_nopar:Npn \coffin_set_horizontal_pole:Nnn #1#2#3 {
- \coffin_set_user_dimensions:N #1
- \coffin_set_pole:Nnx #1 {#2}
+ \coffin_if_exist_execute:Nn #1
{
- { 0 pt } { \tex_the:D \etex_dimexpr:D #3 \scan_stop: }
- { 1000 pt } { 0 pt }
+ \coffin_set_user_dimensions:N #1
+ \coffin_set_pole:Nnx #1 {#2}
+ {
+ { 0 pt } { \dim_eval:n {#3} }
+ { 1000 pt } { 0 pt }
+ }
+ \coffin_end_user_dimensions:
}
- \coffin_end_user_dimensions:
}
\cs_new_protected_nopar:Npn \coffin_set_vertical_pole:Nnn #1#2#3 {
- \coffin_set_user_dimensions:N #1
- \coffin_set_pole:Nnx #1 {#2}
+ \coffin_if_exist_execute:Nn #1
{
- { \tex_the:D \etex_dimexpr:D #3 \scan_stop: } { 0 pt }
- { 0 pt } { 1000 pt }
+ \coffin_set_user_dimensions:N #1
+ \coffin_set_pole:Nnx #1 {#2}
+ {
+ { \dim_eval:n {#3} } { 0 pt }
+ { 0 pt } { 1000 pt }
+ }
+ \coffin_end_user_dimensions:
}
- \coffin_end_user_dimensions:
}
\cs_new_protected_nopar:Npn \coffin_set_pole:Nnn #1#2#3 {
\prop_put:cnn { l_coffin_poles_ \tex_number:D #1 _prop } {#2} {#3}
}
+\cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c }
+\cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c }
\cs_generate_variant:Nn \coffin_set_pole:Nnn { Nnx }
\cs_new_protected_nopar:Npn \coffin_update_corners:N #1 {
\prop_put:cnx { l_coffin_corners_ \tex_number:D #1 _prop } { tl }
@@ -406,6 +443,7 @@
\coffin_update_vertical_poles:NNN #1 #4 \l_coffin_aligned_coffin
\coffin_set_eq:NN #1 \l_coffin_aligned_coffin
}
+\cs_generate_variant:Nn \coffin_join:NnnNnnnn { c , Nnnc , cnnc }
\cs_new_protected_nopar:Npn \coffin_attach:NnnNnnnn #1#2#3#4#5#6#7#8 {
\coffin_align:NnnNnnnnN
#1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin
@@ -432,6 +470,7 @@
\box_set_wd:Nn \l_coffin_aligned_coffin { \box_wd:N #1 }
\box_set_eq:NN #1 \l_coffin_aligned_coffin
}
+\cs_generate_variant:Nn \coffin_attach:NnnNnnnn { c , Nnnc , cnnc }
\cs_new_protected_nopar:Npn
\coffin_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9 {
\coffin_calculate_intersection:Nnn #4 {#5} {#6}
@@ -478,8 +517,8 @@
{ l_coffin_corners_ \tex_number:D \l_coffin_aligned_coffin _prop }
{ #1 - #2 }
{
- { \tex_the:D \etex_dimexpr:D #3 + #5 \scan_stop: }
- { \tex_the:D \etex_dimexpr:D #4 + #6 \scan_stop: }
+ { \dim_eval:n { #3 + #5 } }
+ { \dim_eval:n { #4 + #6 } }
}
}
\cs_new_protected_nopar:Npn \coffin_update_vertical_poles:NNN #1#2#3 {
@@ -532,15 +571,7 @@
\hbox_unpack:N \c_empty_box
\box_use:N \l_coffin_aligned_coffin
}
-\cs_new_protected_nopar:Npn \coffin_typeset_overlay:Nnnnn #1#2#3#4#5 {
- \coffin_align:NnnNnnnnN \c_empty_coffin { H } { l }
- #1 {#2} {#3} {#4} {#5} \l_coffin_aligned_coffin
- \box_set_ht:Nn \l_coffin_aligned_coffin { \c_zero_dim }
- \box_set_dp:Nn \l_coffin_aligned_coffin { \c_zero_dim }
- \box_set_wd:Nn \l_coffin_aligned_coffin { \c_zero_dim }
- \hbox_unpack:N \c_empty_box
- \box_use:N \l_coffin_aligned_coffin
-}
+\cs_generate_variant:Nn \coffin_typeset:Nnnnn { c }
\prop_new:N \l_coffin_bounding_prop
\dim_new:N \l_coffin_bounding_shift_dim
\dim_new:N \l_coffin_left_corner_dim
@@ -580,6 +611,7 @@
\prop_map_inline:cn { l_coffin_poles_ \tex_number:D #1 _prop }
{ \coffin_shift_pole:Nnnnnn #1 {##1} ##2 }
}
+\cs_generate_variant:Nn \coffin_rotate:Nn { c }
\cs_new_protected_nopar:Npn \coffin_set_bounding:N #1 {
\prop_put:Nnx \l_coffin_bounding_prop { tl }
{ { 0 pt } { \dim_use:N \box_ht:N #1 } }
@@ -653,27 +685,15 @@
\cs_new_protected_nopar:Npn \coffin_shift_corner:Nnnn #1#2#3#4 {
\prop_put:cnx { l_coffin_corners_ \tex_number:D #1 _ prop } {#2}
{
- {
- \tex_the:D \etex_dimexpr:D #3 - \l_coffin_left_corner_dim
- \scan_stop:
- }
- {
- \tex_the:D \etex_dimexpr:D #4 - \l_coffin_bottom_corner_dim
- \scan_stop:
- }
+ { \dim_eval:n { #3 - \l_coffin_left_corner_dim } }
+ { \dim_eval:n { #4 - \l_coffin_bottom_corner_dim } }
}
}
\cs_new_protected_nopar:Npn \coffin_shift_pole:Nnnnnn #1#2#3#4#5#6 {
\prop_put:cnx { l_coffin_poles_ \tex_number:D #1 _ prop } {#2}
{
- {
- \tex_the:D \etex_dimexpr:D #3 - \l_coffin_left_corner_dim
- \scan_stop:
- }
- {
- \tex_the:D \etex_dimexpr:D #4 - \l_coffin_bottom_corner_dim
- \scan_stop:
- }
+ { \dim_eval:n { #3 - \l_coffin_left_corner_dim } }
+ { \dim_eval:n { #4 - \l_coffin_bottom_corner_dim } }
{#5} {#6}
}
}
@@ -692,6 +712,7 @@
\hbox_set:Nn #1 { \resizebox * {#2} {#3} { \box_use:N #1 } }
\coffin_resize_common:Nnn #1 {#2} {#3}
}
+\cs_generate_variant:Nn \coffin_resize:Nnn { c }
\cs_new_protected_nopar:Npn \coffin_resize_common:Nnn #1#2#3 {
\prop_map_inline:cn { l_coffin_corners_ \tex_number:D #1 _prop }
{ \coffin_scale_corner:Nnnn #1 {##1} ##2 }
@@ -720,6 +741,7 @@
\coffin_resize_common:Nnn #1
{ \l_coffin_scaled_width_dim } { \l_coffin_scaled_total_height_dim }
}
+\cs_generate_variant:Nn \coffin_scale:Nnn { c }
\cs_new_protected_nopar:Npn \coffin_scale_vector:nnNN #1#2#3#4 {
\fp_set_from_dim:Nn \l_coffin_tmp_fp {#1}
\fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_x_fp }
@@ -847,6 +869,7 @@
{ #3 \l_coffin_display_offset_dim }
{ #4 \l_coffin_display_offset_dim }
}
+\cs_generate_variant:Nn \coffin_mark_handle:Nnnn { c }
\cs_new_protected_nopar:Npn \coffin_display_handles:Nn #1#2 {
\hcoffin_set:Nn \l_coffin_display_pole_coffin
{
@@ -921,6 +944,7 @@
{ #3 \l_coffin_display_offset_dim }
{ #4 \l_coffin_display_offset_dim }
}
+\cs_generate_variant:Nn \coffin_display_handles:Nn { c }
\cs_new_protected_nopar:Npn \coffin_display_attach:Nnnnn #1#2#3#4#5 {
\coffin_calculate_intersection:Nnn #1 {#2} {#3}
\dim_set:Nn \l_coffin_x_prime_dim { \l_coffin_x_dim }
@@ -945,22 +969,17 @@
\box_set_eq:NN \l_coffin_display_coffin \l_coffin_aligned_coffin
}
\cs_new_protected_nopar:Npn \coffin_show_structure:N #1 {
- \iow_term:x
- {
- \iow_newline:
- Size~of~coffin~\token_to_str:N #1 : \iow_newline:
- > ~ ht~=~\dim_use:N \box_ht:N #1 \iow_newline:
- > ~ dp~=~\dim_use:N \box_dp:N #1 \iow_newline:
- > ~ wd~=~\dim_use:N \box_wd:N #1 \iow_newline:
- }
\toks_clear:N \l_coffin_show_toks
- \cs_if_free:cTF { l_coffin_poles_ \tex_number:D #1 _prop }
- {
- \iow_term:x { ---~No~poles~found~--- }
- \toks_put_right:Nn \l_coffin_show_toks
- { Is~this~really~a~coffin? }
- }
+ \cs_if_exist:cTF { l_coffin_poles_ \tex_number:D #1 _prop }
{
+ \iow_term:x
+ {
+ \iow_newline:
+ Size~of~coffin~\token_to_str:N #1 : \iow_newline:
+ > ~ ht~=~\dim_use:N \box_ht:N #1 \iow_newline:
+ > ~ dp~=~\dim_use:N \box_dp:N #1 \iow_newline:
+ > ~ wd~=~\dim_use:N \box_wd:N #1 \iow_newline:
+ }
\iow_term:x { Poles~of~coffin~\token_to_str:N #1 : }
\prop_map_inline:cn { l_coffin_poles_ \tex_number:D #1 _prop }
{
@@ -973,6 +992,11 @@
{ ~ \exp_not:n {##1} \c_space_tl => ~ \exp_not:n {##2} }
}
}
+ {
+ \iow_term:x { ---~No~poles~found~--- }
+ \toks_put_right:Nn \l_coffin_show_toks
+ { Is~this~really~a~coffin? }
+ }
\toks_show:N \l_coffin_show_toks
}
\cs_generate_variant:Nn \coffin_show_structure:N { c }
diff --git a/Master/texmf-dist/tex/latex/xpackages/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/xpackages/xcoffins/xcoffins.sty
index efed9bd8982..f201481052b 100644
--- a/Master/texmf-dist/tex/latex/xpackages/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/xcoffins/xcoffins.sty
@@ -59,6 +59,31 @@
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
\RequirePackage{l3coffins,xparse}
+\keys_define:nn { coffin } {
+ coffin1-hpole .tl_set:N = \l_coffin_A_hpole_tl ,
+ coffin1-hpole .value_required: ,
+ coffin1-vpole .tl_set:N = \l_coffin_A_vpole_tl ,
+ coffin1-vpole .value_required: ,
+ coffin2-hpole .tl_set:N = \l_coffin_B_hpole_tl ,
+ coffin2-hpole .value_required: ,
+ coffin2-vpole .tl_set:N = \l_coffin_B_vpole_tl ,
+ coffin2-vpole .value_required: ,
+ grow-bounding-box .bool_set:N = \l_coffin_bound_box_grow_bool ,
+ grow-bounding-box .default:n = true ,
+ hoffset .dim_set:N = \l_coffin_hoffset_dim ,
+ hoffset .value_required: ,
+ voffset .dim_set:N = \l_coffin_voffset_dim ,
+ voffset .value_required: ,
+}
+\keys_set:nn { coffin } {
+ coffin1-hpole = H ,
+ coffin1-vpole = l ,
+ coffin2-hpole = H ,
+ coffin2-vpole = l ,
+ grow-bounding-box = true ,
+ hoffset = 0 pt ,
+ voffset = 0 pt ,
+}
\NewDocumentCommand \NewCoffin { m } {
\coffin_new:N #1
}
@@ -76,6 +101,7 @@
}
\NewDocumentCommand \JoinCoffins
{
+ o
s
m
> { \SplitArgument { 1 } { , } } O { H , l }
@@ -84,9 +110,32 @@
> { \SplitArgument { 1 } { , } } D ( ) { 0 pt , 0 pt }
}
{
- \IfBooleanTF #1
- { \coffin_attach:NnnNnnnn #2 #3 #4 #5 #6 }
- { \coffin_join:NnnNnnnn #2 #3 #4 #5 #6 }
+ \IfNoValueTF {#1}
+ {
+ \IfBooleanTF #2
+ { \coffin_attach:NnnNnnnn #3 #4 #5 #6 #7 }
+ { \coffin_join:NnnNnnnn #3 #4 #5 #6 #7 }
+ }
+ {
+ \group_begin:
+ \keys_set:nn { coffin } {#1}
+ \tl_set:Nx \l_coffin_tmp_tl
+ {
+ \group_end:
+ \bool_if:NTF \l_coffin_bound_box_grow_bool
+ { \coffin_join:NnnNnnnn }
+ { \coffin_attach:NnnNnnnn }
+ \exp_not:N #3
+ { \exp_not:o { \l_coffin_A_hpole_tl } }
+ { \exp_not:o { \l_coffin_A_vpole_tl } }
+ \exp_not:N #5
+ { \exp_not:o { \l_coffin_B_hpole_tl } }
+ { \exp_not:o { \l_coffin_B_vpole_tl } }
+ { \dim_use:N \l_coffin_hoffset_dim }
+ { \dim_use:N \l_coffin_voffset_dim }
+ }
+ \l_coffin_tmp_tl
+ }
}
\NewDocumentCommand \TypesetCoffin
{
diff --git a/Master/texmf-dist/tex/latex/xpackages/xhead/xtextblock.sty b/Master/texmf-dist/tex/latex/xpackages/xhead/xtextblock.sty
deleted file mode 100644
index 3f1907a5b5d..00000000000
--- a/Master/texmf-dist/tex/latex/xpackages/xhead/xtextblock.sty
+++ /dev/null
@@ -1,101 +0,0 @@
-% tmp file during development
-
-\DeclareObjectType {textblock-1} {1}
-\DeclareObjectType {textblock-2} {2}
-\DeclareObjectType {textblock-3} {3}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\DeclareTemplateInterface {textblock-1} {std} {1}
- {
- font : tokenlist = ,
- parshape : instance {parshape} = plain ,
- justification : instance {justification} = default ,
- }
-
-
-\tl_new:N \l_tblock_font_tl
-
-\cs_new:Npn \tblock_parshape: {}
-\cs_new:Npn \tblock_justification: {}
-
-
-\DeclareTemplateCode {textblock-1} {std} {1}
- {
- font = \l_tblock_font_tl ,
- parshape = \tblock_parshape: ,
- justification = \tblock_justification: ,
- }
- {
- \AssignTemplateKeys
- \group_begin:
- \l_tblock_font_tl
- \tblock_parshape:
- \tblock_justification:
- #1
- \@@par
- \group_end:
-}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\dim_new:N \l_tblock_h_dim
-\tl_new:N \l_tblock_font_ii_tl
-
-\DeclareTemplateInterface {textblock-2} {hangfrom} {2}
- {
- font-1 : tokenlist = ,
- font-2 : tokenlist = ,
- h-sep : length = 1em ,
- parshape : instance {parshape} = plain ,
- justification : instance {justification} = default ,
- }
-
-
-\DeclareTemplateCode {textblock-2} {hangfrom} {2}
- {
-
- font-1 = \l_tblock_font_tl ,
- font-2 = \l_tblock_font_ii_tl ,
- h-sep = \l_tblock_h_dim ,
- parshape = \tblock_parshape: ,
- justification = \tblock_justification: ,
- }
- {
- \AssignTemplateKeys
- \group_begin:
- \l_tblock_font_tl
-
- \hbox_set:Nn \l_tmpa_box
- { \tl_if_empty:oF {#1} {#1 \hskip \l_tblock_h_dim } }
-
- \UseInstance{measure}{fullwidth}
- { \box_wd:N \l_tmpa_box }
-
- \l_tblock_font_ii_tl
- \tblock_parshape:
- \tblock_justification:
-
- \leavevmode
- \box_set_to_last:N \l_tmpb_box
- \hskip -\leftskip
- \hbox_overlap_left:n{ \box_use:N \l_tmpa_box }
- \hskip \leftskip
- \box_use:N \l_tmpb_box
- #2
- \@@par
- \group_end:
-}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%555
-
-
-\DeclareTemplateInterface {textblock-3} {std} {3}
- {
- }
-
-
-