l3 (6sep15)

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

1 files changed, 22 insertions, 60 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
index 3bfbeb053ec..6be9b6f8d57 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3box.dtx Copyright (C) 2005-2014 The LaTeX3 Project
+%% File: l3box.dtx Copyright (C) 2005-2015 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 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: l3box.dtx 5354 2014-08-23 01:35:39Z bruno $
+\GetIdInfo$Id: l3box.dtx 5822 2015-08-09 16:41:04Z joseph $
   {L3 Experimental boxes}
 %</driver|package>
 %<*driver>
@@ -363,9 +363,6 @@
 %   \end{syntax}
 %   Typesets the \meta{contents} into a horizontal box of natural
 %   width and then includes this box in the current list for typesetting.
-%   \begin{texnote}
-%     This is the \TeX{} primitive \tn{hbox}.
-%   \end{texnote}
 % \end{function}
 %
 % \begin{function}{\hbox_to_wd:nn}
@@ -663,7 +660,7 @@
 %
 % \TestFiles{m3box001.lvt}
 %
-% \begin{macro}{\box_new:N,\box_new:c}
+% \begin{macro}{\box_new:N, \box_new:c}
 %   Defining a new \meta{box} register: remember that box $255$ is not
 %   generally available.
 %    \begin{macrocode}
@@ -762,9 +759,9 @@
 %
 % \subsection{Measuring and setting box dimensions}
 %
-% \begin{macro}{\box_ht:N,\box_ht:c}
-% \begin{macro}{\box_dp:N,\box_dp:c}
-% \begin{macro}{\box_wd:N,\box_wd:c}
+% \begin{macro}{\box_ht:N, \box_ht:c}
+% \begin{macro}{\box_dp:N, \box_dp:c}
+% \begin{macro}{\box_wd:N, \box_wd:c}
 % \testfile*
 %    Accessing the height, depth, and width of a \meta{box} register.
 %    \begin{macrocode}
@@ -814,8 +811,8 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\box_move_left:nn,\box_move_right:nn}
-% \begin{macro}{\box_move_up:nn,\box_move_down:nn}
+% \begin{macro}{\box_move_left:nn, \box_move_right:nn}
+% \begin{macro}{\box_move_up:nn, \box_move_down:nn}
 % \testfile*
 %   Move box material in different directions.
 %    \begin{macrocode}
@@ -848,9 +845,9 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}[pTF]{\box_if_horizontal:N,\box_if_horizontal:c}
+% \begin{macro}[pTF]{\box_if_horizontal:N, \box_if_horizontal:c}
 % \testfile*
-% \begin{macro}[pTF]{\box_if_vertical:N,\box_if_vertical:c}
+% \begin{macro}[pTF]{\box_if_vertical:N, \box_if_vertical:c}
 % \testfile*
 %    \begin{macrocode}
 \prg_new_conditional:Npnn \box_if_horizontal:N #1 { p , T , F , TF }
@@ -969,8 +966,8 @@
 % \begin{macro}[aux]{\@@_show:NNnn}
 %   The internal auxiliary to actually do the output uses a group to deal
 %   with breadth and depth values. The \cs{use:n} here gives better output
-%   appearance. Setting \tn{tracingonline} is used to control what
-%   appears in the terminal.
+%   appearance. Setting \tn{tracingonline} and \tn{errorcontextlines} is
+%   used to control what appears in the terminal.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_show:NNnn #1#2#3#4
   {
@@ -978,6 +975,7 @@
       \int_set:Nn \tex_showboxbreadth:D {#3}
       \int_set:Nn \tex_showboxdepth:D   {#4}
       \int_set_eq:NN \tex_tracingonline:D #1
+      \int_set_eq:NN \tex_errorcontextlines:D \c_minus_one
       \box_if_exist:NTF #2
         { \tex_showbox:D \use:n {#2} }
         {
@@ -995,12 +993,12 @@
 % \testfile{m3box002.lvt}
 %   Put a horizontal box directly into the input stream.
 %    \begin{macrocode}
-\cs_new_protected:Npn \hbox:n { \tex_hbox:D \scan_stop: }
+\cs_new_protected:Npn \hbox:n #1 { \tex_hbox:D \scan_stop: {#1} }
 %    \end{macrocode}
 %  \end{macro}
 %
-% \begin{macro}{\hbox_set:Nn,\hbox_set:cn}
-% \begin{macro}{\hbox_gset:Nn,\hbox_gset:cn}
+% \begin{macro}{\hbox_set:Nn, \hbox_set:cn}
+% \begin{macro}{\hbox_gset:Nn, \hbox_gset:cn}
 % \testfile*
 %    \begin{macrocode}
 \cs_new_protected:Npn \hbox_set:Nn #1#2
@@ -1012,8 +1010,8 @@
 %  \end{macro}
 %  \end{macro}
 %
-% \begin{macro}{\hbox_set_to_wd:Nnn,\hbox_set_to_wd:cnn}
-% \begin{macro}{\hbox_gset_to_wd:Nnn,\hbox_gset_to_wd:cnn}
+% \begin{macro}{\hbox_set_to_wd:Nnn, \hbox_set_to_wd:cnn}
+% \begin{macro}{\hbox_gset_to_wd:Nnn, \hbox_gset_to_wd:cnn}
 % \testfile*
 %   Storing material in a horizontal box with a specified width.
 %    \begin{macrocode}
@@ -1047,23 +1045,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\hbox_set_inline_begin:N, \hbox_set_inline_begin:c}
-% \begin{macro}{\hbox_gset_inline_begin:N, \hbox_gset_inline_begin:c}
-% \begin{macro}{\hbox_set_inline_end:,\hbox_gset_inline_end:}
-% \testfile*
-% Renamed September 2011.
-%    \begin{macrocode}
-\cs_new_eq:NN \hbox_set_inline_begin:N  \hbox_set:Nw
-\cs_new_eq:NN \hbox_set_inline_begin:c  \hbox_set:cw
-\cs_new_eq:NN \hbox_set_inline_end:     \hbox_set_end:
-\cs_new_eq:NN \hbox_gset_inline_begin:N \hbox_gset:Nw
-\cs_new_eq:NN \hbox_gset_inline_begin:c \hbox_gset:cw
-\cs_new_eq:NN \hbox_gset_inline_end:    \hbox_gset_end:
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
 %  \begin{macro}{\hbox_to_wd:nn}
 %  \begin{macro}{\hbox_to_zero:n}
 %  \testfile*
@@ -1118,8 +1099,8 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\vbox_to_ht:nn,\vbox_to_zero:n}
-% \begin{macro}{\vbox_to_ht:nn,\vbox_to_zero:n}
+% \begin{macro}{\vbox_to_ht:nn, \vbox_to_zero:n}
+% \begin{macro}{\vbox_to_ht:nn, \vbox_to_zero:n}
 % \testfile*
 %   Put a vertical box directly into the input stream.
 %    \begin{macrocode}
@@ -1161,8 +1142,8 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\vbox_set_to_ht:Nnn,\vbox_set_to_ht:cnn}
-% \begin{macro}{\vbox_gset_to_ht:Nnn,\vbox_gset_to_ht:cnn}
+% \begin{macro}{\vbox_set_to_ht:Nnn, \vbox_set_to_ht:cnn}
+% \begin{macro}{\vbox_gset_to_ht:Nnn, \vbox_gset_to_ht:cnn}
 %  \testfile*
 %  Storing material in a vertical box with a specified height.
 %    \begin{macrocode}
@@ -1203,25 +1184,6 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\vbox_set_inline_begin:N,  \vbox_set_inline_begin:c}
-% \begin{macro}{\vbox_gset_inline_begin:N, \vbox_gset_inline_begin:c}
-% \begin{macro}{\vbox_set_inline_end:}
-% \begin{macro}{\vbox_gset_inline_end:}
-% \testfile*
-% Renamed September 2011.
-%    \begin{macrocode}
-\cs_new_eq:NN \vbox_set_inline_begin:N  \vbox_set:Nw
-\cs_new_eq:NN \vbox_set_inline_begin:c  \vbox_set:cw
-\cs_new_eq:NN \vbox_set_inline_end:  \vbox_set_end:
-\cs_new_eq:NN \vbox_gset_inline_begin:N \vbox_gset:Nw
-\cs_new_eq:NN \vbox_gset_inline_begin:c \vbox_gset:cw
-\cs_new_eq:NN \vbox_gset_inline_end: \vbox_gset_end:
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
 % \begin{macro}{\vbox_unpack:N, \vbox_unpack:c}
 % \begin{macro}{\vbox_unpack_clear:N, \vbox_unpack_clear:c}
 % \testfile*