summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/l3messages.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3messages.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3messages.dtx88
1 files changed, 41 insertions, 47 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3messages.dtx b/Master/texmf-dist/source/latex/expl3/l3messages.dtx
index 5aea5a26d35..b5ae9e6025f 100644
--- a/Master/texmf-dist/source/latex/expl3/l3messages.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3messages.dtx
@@ -1,5 +1,5 @@
% \iffalse
-%% File: l3messages.dtx Copyright (C) 1990-2006 LaTeX3 project
+%% File: l3messages.dtx Copyright (C) 1990-2007 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
@@ -32,33 +32,21 @@
%%
%% -----------------------------------------------------------------------
%
-%<package>\RequirePackage{l3names}
-%<package>\RequirePackage{l3basics}
-%<package>\RequirePackage{l3tlp}
-%<package>\RequirePackage{l3expan}
-%<package>\RequirePackage{l3num}
-%<package>\RequirePackage{l3io}
-%<package>\RequirePackage{l3int}
-%<package>\RequirePackage{l3toks}
-%<*dtx>
+%<*driver|package>
+\RequirePackage{l3names}
+%</driver|package>
%\fi
-\def\GetIdInfo$Id: #1.dtx #2 #3-#4-#5 #6 #7$#8{%
- \def\fileversion{#2}%
- \def\filedate{#3/#4/#5}%
- \ProvidesFile{#1.dtx}[#3/#4/#5 v#2 #8]%
-}
-%\iffalse
-%</dtx>
-%\fi
-\GetIdInfo$Id: l3messages.dtx 573 2006-08-21 20:59:37Z morten $
+\GetIdInfo$Id: l3messages.dtx 673 2007-09-28 20:50:33Z mittelba $
{L3 Experimental LaTeX Messages module}
-%
-% \iffalse
+%\iffalse
%<*driver>
+%\fi
+\ProvidesFile{\filename.\filenameext}
+ [\filedate\space v\fileversion\space\filedescription]
+%\iffalse
\documentclass{l3doc}
-
\begin{document}
-\DocInput{l3messages.dtx}
+\DocInput{\filename.\filenameext}
\end{document}
%</driver>
% \fi
@@ -129,7 +117,8 @@
% \end{syntax}
% Is used to break an informational, warning or error message up
% into multiple lines. May be defined in such a way that the new
-% line starts with a standard <continuation>.
+% line starts with a standard <continuation>. A normal line break in such
+% messages can be achieved with "\iow_newline:" from the l3iow module.
% \end{function}
%
% \subsection{Storing the information}
@@ -264,11 +253,6 @@
%
% \subsection{Variables and constants}
%
-% \begin{variable}{\iow_newline}
-% Identifier denoting the character that triggers a line break in
-% the output.
-% \end{variable}
-%
% \begin{variable}{\c_iow_err_stream}
% Output stream used to access the error files during their
% generation.
@@ -312,6 +296,16 @@
% \subsection{The implementation}
%
% \begin{macrocode}
+%<package>\ProvidesExplPackage
+%<package> {\filename}{\filedate}{\fileversion}{\filedescription}
+%<package>\RequirePackage{l3basics}
+%<package>\RequirePackage{l3tlp}
+%<package>\RequirePackage{l3expan}
+%<package>\RequirePackage{l3num}
+%<package>\RequirePackage{l3io}
+%<package>\RequirePackage{l3int}
+%<package>\RequirePackage{l3toks}
+%<package>\RequirePackage{l3token}
%<*initex|package>
% \end{macrocode}
%
@@ -453,13 +447,13 @@
% \end{macrocode}
% Make sure that the \emph{continuation} is part of "\err_newline:".
% \begin{macrocode}
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
% \end{macrocode}
% Then write the message.
% \begin{macrocode}
\io_put_log:x {#1~\io_show_file_lineno:}}
\def_new:Npn \err_warn:nn #1#2{
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
\io_put_term:x {#1~\io_show_file_lineno:}}
% \end{macrocode}
% \end{macro}
@@ -471,10 +465,10 @@
% linenumber to the message.
% \begin{macrocode}
\def_new:Npn \err_info_noline:nn #1#2{
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
\io_put_log:x {#1}}
\def_new:Npn \err_warn_noline:nn #1#2{
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
\io_put_term:x {#1}}
% \end{macrocode}
% \end{macro}
@@ -522,7 +516,7 @@
% \end{macrocode}
% Make sure that the \emph{continuation} is part of "\err_newline".
% \begin{macrocode}
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
% \end{macrocode}
% Then write the message.
% \begin{macrocode}
@@ -537,7 +531,7 @@
% occured.
% \begin{macrocode}
\def_new:Npn \err_fatal_noline:nn #1#2{
- \def:Npn\err_newline:{\iow_newline#2}
+ \def:Npn\err_newline:{\iow_newline:#2}
\io_put_term:x {#1}
\tex_end:D
}
@@ -610,9 +604,9 @@
{\err_latex_bug:x{You~closed~the~wrong~error~file~`#1'.~
Open~is~`\g_err_curr_fname'.}}
\iow_long_unexpanded:Nn \c_iow_err_stream {\err_latex_bug:x{Didn't~find~the~
- correct~error~message~to~show.\iow_newline
+ correct~error~message~to~show.\iow_newline:
Was~searching~for~a~function~
- with~the~following~meaning:\iow_newline
+ with~the~following~meaning:\iow_newline:
\token_to_string:N\token_to_meaning:N
\token_to_string:N\l_err_label_token}
% \end{macrocode}
@@ -651,7 +645,7 @@
% Both \m{errmsg} and \m{code} might contain hashmarks denoting
% arguments to the error handler.
% \begin{macrocode}
- \group_begin: \tex_catcode:D`\#\c_other_char_code
+ \group_begin: \char_set_catcode:nn{`\#}{12}
% \end{macrocode}
% We also have to check that output goes to the correct error file.
% \begin{macrocode}
@@ -692,9 +686,9 @@
\cmd_declare:Nnn\err_display_aux:w [#2]{
\group_end:
\toks_gset:Nx\g_err_help_toks{#4}
- \io_put_term:x{LaTeX~error~\io_show_file_lineno:.\iow_newline
+ \io_put_term:x{LaTeX~error~\io_show_file_lineno:.\iow_newline:
\text_put_sp:\text_put_four_sp: \text_put_sp:
- See~LaTeX~manual~for~explanation.\iow_newline
+ See~LaTeX~manual~for~explanation.\iow_newline:
\text_put_sp:\text_put_four_sp: \text_put_sp:
Type~\text_put_sp: H~<return>~\text_put_sp: for~
immediate~help.}
@@ -801,9 +795,9 @@
% \begin{macrocode}
%<*package>
\def:Npn\err_help_ignored: {
- Your~command~was~ignored.\iow_newline
+ Your~command~was~ignored.\iow_newline:
Type \text_put_sp: I~<command>~<return>
- \text_put_sp: to~replace~it~with~another~command,\iow_newline
+ \text_put_sp: to~replace~it~with~another~command,\iow_newline:
or~\text_put_sp: <return> \text_put_sp: to~continue~without~it.}
\def:Npn\err_help_textlost: {
@@ -811,7 +805,7 @@
\def:Npn\err_help_return_or_X: {
Try~typing\text_put_sp: <return>
- \text_put_sp: to~proceed.\iow_newline
+ \text_put_sp: to~proceed.\iow_newline:
If~that~doesn't~work,~type
\text_put_sp: X~<return>\text_put_sp: to~quit.}
@@ -826,10 +820,10 @@
\err_kernel_interrupt_new:NNnnn\cs_free_p:N{1}
{Command~name~`\tex_string:D#1'~already~used}
{You~tried~to~define~a~command~which~already~has~
- a~meaning.\iow_newline
+ a~meaning.\iow_newline:
If~you~really~want~to~redefine~it~try~
\token_to_string:N\cmd_declare:Nnn\text_put_sp:
- next~time.\iow_newline
+ next~time.\iow_newline:
For~this~run~I~will~ignore~your~definition.}
{}
@@ -842,7 +836,7 @@
\err_kernel_interrupt_new:NNnnn\newcnt{0}
{No~such~counter}
{The~counter~name~mentioned~in~the~operation~is~not~
- known~to~me.\iow_newline
+ known~to~me.\iow_newline:
Check~the~spelling.}
{}
@@ -969,4 +963,4 @@
%
% Revision 1.1 2005/04/29 22:30:44 braams
% first version that can be loaded without producing errors.
-% Just a translation from the old stuff, haven't looked at the docu yet \ No newline at end of file
+% Just a translation from the old stuff, haven't looked at the docu yet