[latexrefman-commits] [SCM] latexrefman updated: r636 - trunk

jimhefferon at gnu.org.ua jimhefferon at gnu.org.ua
Fri Jun 1 15:46:47 CEST 2018


Author: jimhefferon
Date: 2018-06-01 16:46:47 +0300 (Fri, 01 Jun 2018)
New Revision: 636

Modified:
   trunk/ChangeLog
   trunk/latex2e.html
   trunk/latex2e.info
   trunk/latex2e.pdf
   trunk/latex2e.texi
Log:
Letters; brought in fr text on \mlabel customization

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2018-05-31 16:43:51 UTC (rev 635)
+++ trunk/ChangeLog	2018-06-01 13:46:47 UTC (rev 636)
@@ -1,3 +1,9 @@
+2018-06-01  Jim Hefferon  <jhefferon at smcvt.edu>
+
+	* latex2e.texi (Letters)  Next in latex-info.  Adjust wording.
+	(\mlabel) Brought text from fr on customization of label
+	printing, added example.
+
 2018-05-31  Jim Hefferon  <jhefferon at smcvt.edu>
 
 	* latex2e.texi (Lengths)  Next in latex-info is Lengths.

Modified: trunk/latex2e.html
===================================================================
--- trunk/latex2e.html	2018-05-31 16:43:51 UTC (rev 635)
+++ trunk/latex2e.html	2018-06-01 13:46:47 UTC (rev 636)
@@ -5984,7 +5984,7 @@
 <var>delta_x,delta_y</var>.  The <var>obj</var> first appears at position
 <em>(x,y)</em>, then at <em>(x+\delta_x,y+\delta_y)</em>, and so on.
 </p>
-<p>This draws a simple grid with every fifth line bolded (see also
+<p>This draws a simple grid with every fifth line in bold (see also
 <a href="#g_t_005cgraphpaper">\graphpaper</a>).
 </p>
 <div class="example">
@@ -6223,7 +6223,7 @@
 <pre class="example">\put(5,7){\circle{6}}
 </pre></div>
 
-<p>The available radiuses for <code>circle</code> are, in points, the even
+<p>The available radii for <code>circle</code> are, in points, the even
 numbers from 2 to 20, inclusive.  For <code>circle*</code> they are all the
 integers from 1 to 15.
 </p>
@@ -6459,7 +6459,7 @@
 <code>\fboxsep</code> between the frame and the contents of the box.
 </p>
 <p>For this command, you must specify the <var>width</var> and <var>height</var>.  If
-you want to just put a frame around some contents whose dimenstion is
+you want to just put a frame around some contents whose dimension is
 determined in some other way then either use <code>\fbox</code> (see <a href="#g_t_005cfbox-and-_005cframebox">\fbox and \framebox</a>) or <code>\frame</code> (see <a href="#g_t_005cframe">\frame</a>).
 </p>
 <hr>
@@ -17018,7 +17018,7 @@
 </p>
 <div class="example">
 <pre class="example">\documentclass{letter}
-\address{<var>sender address</var>}
+\address{<var>sender address</var>}   % return address
 \signature{<var>sender name</var>}
 \begin{document}
 \begin{letter}{<var>recipient address</var>}
@@ -17034,12 +17034,11 @@
 </p>
 <p>Each letter is in a separate <code>letter</code> environment, whose argument
 <var>recipient address</var> often contains multiple lines separated with a
-double backslash (<code>\\</code>).  For example, you might have:
+double backslash, (<code>\\</code>).  For example, you might have:
 </p>
 <div class="example">
-<pre class="example"> \begin{letter}{Mr. Joe Smith \\ 
-      2345 Princess St. \\ 
-      Edinburgh, EH1 1AA}
+<pre class="example"> \begin{letter}{Ninon de l'Enclos \\
+   l'h\^otel Sagonne}
    ...
  \end{letter}
 </pre></div>
@@ -17055,13 +17054,13 @@
 under the closing, after a vertical space for the traditional
 hand-written signature; it also can contain multiple lines.
 </p>
-<p>Each <code>letter</code> environment body begins with a required <code>\opening</code> command
-such as <code>\opening{Dear Madam or Sir:}</code>.  The <var>letter body</var>
-text is ordinary LaTeX so it can contain everything from
-enumerated lists to displayed math, except that commands such as
-<code>\chapter</code> that make no sense in a letter are turned off.  Each
-<code>letter</code> environment body typically ends with a <code>\closing</code>
-command such as <code>\closing{Yours,}</code>.
+<p>Each <code>letter</code> environment body begins with a required
+<code>\opening</code> command such as <code>\opening{Dear Madam or Sir:}</code>.
+The <var>letter body</var> text is ordinary LaTeX so it can contain
+everything from enumerated lists to displayed math, except that commands
+such as <code>\chapter</code> that make no sense in a letter are turned off.
+Each <code>letter</code> environment body typically ends with a
+<code>\closing</code> command such as <code>\closing{Yours,}</code>.
 </p>
 <a name="index-_005c_005c-for-letters"></a>
 <p>Additional material may come after the <code>\closing</code>.  You can say who
@@ -17142,19 +17141,18 @@
 <pre class="example">\address{<var>senders address</var>}
 </pre></div>
 
-<p>Specifies the return address as it appears on the letter and on the
+<p>Specify the return address, as it appears on the letter and on the
 envelope.  Separate multiple lines in <var>senders address</var> with a
-double backslash <code>\\</code>.
+double backslash, <code>\\</code>.
 </p>
 <p>Because it can apply to multiple letters this declaration is often put
 in the preamble.  However, it can go anywhere, including inside an
 individual <code>letter</code> environment.
 </p>
-<p>This command is optional: without the <code>\address</code> declaration the
-letter is formatted with some blank space on top, for copying onto
-pre-printed letterhead paper.  (See <a href="#Overview">Overview</a>, for details on your
-local implementation.)  With the <code>\address</code> declaration, it is
-formatted as a personal letter.
+<p>This command is optional: if you do not use it then the letter is
+formatted with some blank space on top, for copying onto pre-printed
+letterhead paper.  If you do use the <code>\address</code> declaration then it
+is formatted as a personal letter.
 </p>
 <p>Here is an example.
 </p>
@@ -17267,7 +17265,7 @@
 <pre class="example">\location{<var>text</var>}
 </pre></div>
 
-<p>The <var>text</var> appears centered at the bottom of the each page.  It only
+<p>The <var>text</var> appears centered at the bottom of the page.  It only
 appears if the page style is <code>firstpage</code>.
 </p>
 
@@ -17285,26 +17283,60 @@
 <p>Synopsis:
 </p>
 <div class="example">
-<pre class="example">\makelabels
+<pre class="example">\makelabels   % in preamble
 </pre></div>
 
-<p>Create a sheet of address labels from the recipient addresses, one for
-each letter. This sheet will be output before the letters, with the idea
-that you can copy it to a sheet of peel-off labels.  This command goes
-in the preamble.
+<p>Optional.  If you just put <code>\makelabels</code> in the preamble then at
+the end of the document you will get a sheet with labels for all the
+recipients, one for each letter environment, that you can copy to a
+sheet of peel-off address labels.
 </p>
 <p>Customize the labels by redefining the commands <code>\startlabels</code>,
-<code>\mlabel</code>, and <code>\returnaddress</code> in the preamble.  The command
-<code>\startlabels</code> sets the width, height, number of columns, etc., of
-the page onto which the labels are printed.  The command
-<code>\mlabel{<var>sender address</var>}{<var>recipient address</var>}</code>
-produces the two labels (or one, if you choose to ignore the <var>sender
-address</var>). The <var>sender address</var> is the value returned by the macro
-<code>\returnaddress</code> while <var>recipient address</var> is the value passed
-in the argument to the <code>letter</code> environment.  By default
-<code>\mlabel</code> ignores the first argument, the <var>sender address</var>.
+<code>\mlabel</code>, and <code>\returnaddress</code> (and perhaps <code>\name</code>) in
+the preamble.  The command <code>\startlabels</code> sets the width, height,
+number of columns, etc., of the page onto which the labels are printed.
+The command <code>\mlabel{<var>return address</var>}{<var>recipient
+address</var>}</code> produces the two labels (or one, if you choose to ignore the
+<var>return address</var>) for each letter environment. The first argument,
+<var>return address</var>, is the value returned by the macro
+<code>\returnaddress</code>.  The second argument, <var>recipient address</var>, is
+the value passed in the argument to the <code>letter</code> environment.  By
+default <code>\mlabel</code> ignores the first argument, the <var>return
+address</var>, causing the default behavior described in the prior paragraph.
 </p>
+<p>This illustrates customization.  Its output includes a page with two
+columns having two labels each.
+</p>
+<div class="example">
+<pre class="example">\documentclass{letter}
+\renewcommand*{\returnaddress}{Fred McGuilicuddy \\ Oshkosh, Mineola 12305}
+\newcommand*\originalMlabel{}
+\let\originalMlabel\mlabel
+\def\mlabel#1#2{\originalMlabel{}{#1}\originalMlabel{}{#2}}
+\makelabels
+  ...
+\begin{document}
+\begin{letter}{A Einstein \\ 112 Mercer Street \\ Princeton, New Jersey, USA 08540}
+  ...
+\end{letter}
+\begin{letter}{K G\"odel \\ 145 Linden Lane \\ Princeton, New Jersey, USA 08540}
+  ...
+\end{letter}
+\end{document}
+</pre></div>
 
+<p>The first column contains the return address twice.  The second column
+contains the address for each recipient.
+</p>
+<a name="index-package_002c-envlab"></a>
+<a name="index-envlab-package"></a>
+
+<p>The package <code>envlab</code> makes formatting the labels easier, with
+standard sizes already provided.  The preamble lines
+<code>\usepackage[personalenvelope]{envlab}</code> and <code>\makelabels</code>
+are all that you need to print envelopes.
+</p>
+
 <hr>
 <a name="g_t_005cname"></a>
 <div class="header">
@@ -17322,8 +17354,8 @@
 <pre class="example">\name{<var>name</var>}
 </pre></div>
 
-<p>Sender’s name, used for printing on the envelope together with the
-return address.
+<p>Optional.  Sender’s name, used for printing on the envelope together
+with the return address.
 </p>
 
 <hr>
@@ -17341,12 +17373,11 @@
 <p>Synopsis:
 </p>
 <div class="example">
-<pre class="example">\opening{<var>text</var>}
+<pre class="example">\opening{<var>salutation</var>}
 </pre></div>
 
-<p>This command is required.  It starts a letter, following the
-<code>\begin{letter}{...}</code>. The mandatory argument <var>text</var> is the
-text that starts your letter.  For instance:
+<p>Required.  Follows the <code>\begin{letter}{...}</code>. The argument
+<var>salutation</var> is mandatory.  For instance:
 </p>
 <div class="example">
 <pre class="example">\opening{Dear John:}
@@ -17399,10 +17430,10 @@
 <p>The sender’s name.  This command is optional, although its inclusion is
 usual.
 </p>
-<p>The argument text appears at the end of the letter, after the closing
-and after a vertical space for the traditional hand-written
+<p>The argument text appears at the end of the letter, after the closing.
+LaTeX leaves some vertical space for a handwritten
 signature. Separate multiple lines with a double
-backslash <code>\\</code>.  For example:
+backslash, <code>\\</code>.  For example:
 </p>
 <div class="example">
 <pre class="example">\signature{J Fred Muggs \\
@@ -17411,7 +17442,9 @@
 
 <p>LaTeX’s default for the vertical space from the <code>\closing</code> text
 down to the <code>\signature</code> text is <code>6\medskipamount</code>, which is
-six times 0.7em.
+six times <code>\medskipamount</code> (where <code>\medskipamount</code> is equal to
+a <code>\parskip</code>, which in turn is defined by default here to
+0.7em).
 </p>
 <p>This command is usually in the preamble, to apply to all the letters in
 the document.  To have it apply to one letter only, put it inside a
@@ -17419,8 +17452,8 @@
 </p>
 <p>You can include a graphic in the signature, for instance with
 <code>\signature{\vspace{-6\medskipamount}\includegraphics{sig.png}\\
-My name}</code> (this requires writing <code>\usepackage{graphicx}</code> in the
-preamble).
+My name}</code>.  This requires putting <code>\usepackage{graphicx}</code> in the
+preamble (see <a href="#Graphics">Graphics</a>).
 </p>
 
 
@@ -18061,6 +18094,7 @@
 <tr><td></td><td valign="top"><a href="#index-environment_002c-theorem_002dlike">environment, theorem-like</a>:</td><td> </td><td valign="top"><a href="#g_t_005cnewtheorem">\newtheorem</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-environments">environments</a>:</td><td> </td><td valign="top"><a href="#Environments">Environments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-environments_002c-defining">environments, defining</a>:</td><td> </td><td valign="top"><a href="#g_t_005cnewenvironment-_0026-_005crenewenvironment">\newenvironment & \renewenvironment</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-envlab-package"><code>envlab</code> <span class="roman">package</span></a>:</td><td> </td><td valign="top"><a href="#g_t_005cmakelabels">\makelabels</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-EPS-files">EPS files</a>:</td><td> </td><td valign="top"><a href="#Graphics-package-configuration">Graphics package configuration</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-EPS-files-1">EPS files</a>:</td><td> </td><td valign="top"><a href="#g_t_005cincludegraphics">\includegraphics</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-equation-number_002c-cross-referencing">equation number, cross referencing</a>:</td><td> </td><td valign="top"><a href="#g_t_005cref">\ref</a></td></tr>
@@ -18355,6 +18389,7 @@
 <tr><td></td><td valign="top"><a href="#index-package_002c-cprotect-1"><span class="roman">package</span>, <code>cprotect</code></a>:</td><td> </td><td valign="top"><a href="#g_t_005cverb">\verb</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-package_002c-datetime"><span class="roman">package</span>, <code>datetime</code></a>:</td><td> </td><td valign="top"><a href="#g_t_005ctoday">\today</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-package_002c-enumitem"><span class="roman">package</span>, <code>enumitem</code></a>:</td><td> </td><td valign="top"><a href="#list">list</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-package_002c-envlab"><span class="roman">package</span>, <code>envlab</code></a>:</td><td> </td><td valign="top"><a href="#g_t_005cmakelabels">\makelabels</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-package_002c-etoolbox"><span class="roman">package</span>, <code>etoolbox</code></a>:</td><td> </td><td valign="top"><a href="#Class-and-package-commands">Class and package commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-package_002c-fancyvrb"><span class="roman">package</span>, <code>fancyvrb</code></a>:</td><td> </td><td valign="top"><a href="#tabbing">tabbing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-package_002c-fancyvrb-1"><span class="roman">package</span>, <code>fancyvrb</code></a>:</td><td> </td><td valign="top"><a href="#verbatim">verbatim</a></td></tr>

Modified: trunk/latex2e.info
===================================================================
--- trunk/latex2e.info	2018-05-31 16:43:51 UTC (rev 635)
+++ trunk/latex2e.info	2018-06-01 13:46:47 UTC (rev 636)
@@ -3916,8 +3916,8 @@
 The OBJ first appears at position (x,y), then at
 (x+\delta_x,y+\delta_y), and so on.
 
-   This draws a simple grid with every fifth line bolded (see also *note
-\graphpaper::).
+   This draws a simple grid with every fifth line in bold (see also
+*note \graphpaper::).
 
      \begin{picture}(10,10)
        \linethickness{0.05mm}
@@ -4081,7 +4081,7 @@
 
      \put(5,7){\circle{6}}
 
-   The available radiuses for 'circle' are, in points, the even numbers
+   The available radii for 'circle' are, in points, the even numbers
 from 2 to 20, inclusive.  For 'circle*' they are all the integers from 1
 to 15.
 
@@ -4248,7 +4248,7 @@
 the box.
 
    For this command, you must specify the WIDTH and HEIGHT.  If you want
-to just put a frame around some contents whose dimenstion is determined
+to just put a frame around some contents whose dimension is determined
 in some other way then either use '\fbox' (*note \fbox and \framebox::)
 or '\frame' (*note \frame::).
 
@@ -11152,7 +11152,7 @@
 Synopsis:
 
      \documentclass{letter}
-     \address{SENDER ADDRESS}
+     \address{SENDER ADDRESS}   % return address
      \signature{SENDER NAME}
      \begin{document}
      \begin{letter}{RECIPIENT ADDRESS}
@@ -11167,11 +11167,10 @@
 
    Each letter is in a separate 'letter' environment, whose argument
 RECIPIENT ADDRESS often contains multiple lines separated with a double
-backslash ('\\').  For example, you might have:
+backslash, ('\\').  For example, you might have:
 
-      \begin{letter}{Mr. Joe Smith \\
-           2345 Princess St. \\
-           Edinburgh, EH1 1AA}
+      \begin{letter}{Ninon de l'Enclos \\
+        l'h\^otel Sagonne}
         ...
       \end{letter}
 
@@ -11249,19 +11248,18 @@
 
      \address{SENDERS ADDRESS}
 
-   Specifies the return address as it appears on the letter and on the
+   Specify the return address, as it appears on the letter and on the
 envelope.  Separate multiple lines in SENDERS ADDRESS with a double
-backslash '\\'.
+backslash, '\\'.
 
    Because it can apply to multiple letters this declaration is often
 put in the preamble.  However, it can go anywhere, including inside an
 individual 'letter' environment.
 
-   This command is optional: without the '\address' declaration the
-letter is formatted with some blank space on top, for copying onto
-pre-printed letterhead paper.  (*Note Overview::, for details on your
-local implementation.)  With the '\address' declaration, it is formatted
-as a personal letter.
+   This command is optional: if you do not use it then the letter is
+formatted with some blank space on top, for copying onto pre-printed
+letterhead paper.  If you do use the '\address' declaration then it is
+formatted as a personal letter.
 
    Here is an example.
 
@@ -11330,8 +11328,8 @@
 
      \location{TEXT}
 
-   The TEXT appears centered at the bottom of the each page.  It only
-appears if the page style is 'firstpage'.
+   The TEXT appears centered at the bottom of the page.  It only appears
+if the page style is 'firstpage'.
 
 
 File: latex2e.info,  Node: \makelabels,  Next: \name,  Prev: \location,  Up: Letters
@@ -11341,23 +11339,52 @@
 
 Synopsis:
 
-     \makelabels
+     \makelabels   % in preamble
 
-   Create a sheet of address labels from the recipient addresses, one
-for each letter.  This sheet will be output before the letters, with the
-idea that you can copy it to a sheet of peel-off labels.  This command
-goes in the preamble.
+   Optional.  If you just put '\makelabels' in the preamble then at the
+end of the document you will get a sheet with labels for all the
+recipients, one for each letter environment, that you can copy to a
+sheet of peel-off address labels.
 
    Customize the labels by redefining the commands '\startlabels',
-'\mlabel', and '\returnaddress' in the preamble.  The command
-'\startlabels' sets the width, height, number of columns, etc., of the
-page onto which the labels are printed.  The command '\mlabel{SENDER
-ADDRESS}{RECIPIENT ADDRESS}' produces the two labels (or one, if you
-choose to ignore the SENDER ADDRESS).  The SENDER ADDRESS is the value
-returned by the macro '\returnaddress' while RECIPIENT ADDRESS is the
-value passed in the argument to the 'letter' environment.  By default
-'\mlabel' ignores the first argument, the SENDER ADDRESS.
+'\mlabel', and '\returnaddress' (and perhaps '\name') in the preamble.
+The command '\startlabels' sets the width, height, number of columns,
+etc., of the page onto which the labels are printed.  The command
+'\mlabel{RETURN ADDRESS}{RECIPIENT ADDRESS}' produces the two labels (or
+one, if you choose to ignore the RETURN ADDRESS) for each letter
+environment.  The first argument, RETURN ADDRESS, is the value returned
+by the macro '\returnaddress'.  The second argument, RECIPIENT ADDRESS,
+is the value passed in the argument to the 'letter' environment.  By
+default '\mlabel' ignores the first argument, the RETURN ADDRESS,
+causing the default behavior described in the prior paragraph.
 
+   This illustrates customization.  Its output includes a page with two
+columns having two labels each.
+
+     \documentclass{letter}
+     \renewcommand*{\returnaddress}{Fred McGuilicuddy \\ Oshkosh, Mineola 12305}
+     \newcommand*\originalMlabel{}
+     \let\originalMlabel\mlabel
+     \def\mlabel#1#2{\originalMlabel{}{#1}\originalMlabel{}{#2}}
+     \makelabels
+       ...
+     \begin{document}
+     \begin{letter}{A Einstein \\ 112 Mercer Street \\ Princeton, New Jersey, USA 08540}
+       ...
+     \end{letter}
+     \begin{letter}{K G\"odel \\ 145 Linden Lane \\ Princeton, New Jersey, USA 08540}
+       ...
+     \end{letter}
+     \end{document}
+
+   The first column contains the return address twice.  The second
+column contains the address for each recipient.
+
+   The package 'envlab' makes formatting the labels easier, with
+standard sizes already provided.  The preamble lines
+'\usepackage[personalenvelope]{envlab}' and '\makelabels' are all that
+you need to print envelopes.
+
 
 File: latex2e.info,  Node: \name,  Next: \opening,  Prev: \makelabels,  Up: Letters
 
@@ -11368,8 +11395,8 @@
 
      \name{NAME}
 
-   Sender's name, used for printing on the envelope together with the
-return address.
+   Optional.  Sender's name, used for printing on the envelope together
+with the return address.
 
 
 File: latex2e.info,  Node: \opening,  Next: \ps,  Prev: \name,  Up: Letters
@@ -11379,11 +11406,10 @@
 
 Synopsis:
 
-     \opening{TEXT}
+     \opening{SALUTATION}
 
-   This command is required.  It starts a letter, following the
-'\begin{letter}{...}'.  The mandatory argument TEXT is the text that
-starts your letter.  For instance:
+   Required.  Follows the '\begin{letter}{...}'.  The argument
+SALUTATION is mandatory.  For instance:
 
      \opening{Dear John:}
 
@@ -11416,15 +11442,17 @@
    The sender's name.  This command is optional, although its inclusion
 is usual.
 
-   The argument text appears at the end of the letter, after the closing
-and after a vertical space for the traditional hand-written signature.
-Separate multiple lines with a double backslash '\\'.  For example:
+   The argument text appears at the end of the letter, after the
+closing.  LaTeX leaves some vertical space for a handwritten signature.
+Separate multiple lines with a double backslash, '\\'.  For example:
 
      \signature{J Fred Muggs \\
                 White House}
 
    LaTeX's default for the vertical space from the '\closing' text down
-to the '\signature' text is '6\medskipamount', which is six times 0.7em.
+to the '\signature' text is '6\medskipamount', which is six times
+'\medskipamount' (where '\medskipamount' is equal to a '\parskip', which
+in turn is defined by default here to 0.7em).
 
    This command is usually in the preamble, to apply to all the letters
 in the document.  To have it apply to one letter only, put it inside a
@@ -11432,7 +11460,8 @@
 
    You can include a graphic in the signature, for instance with
 '\signature{\vspace{-6\medskipamount}\includegraphics{sig.png}\\ My
-name}' (this requires writing '\usepackage{graphicx}' in the preamble).
+name}'.  This requires putting '\usepackage{graphicx}' in the preamble
+(*note Graphics::).
 
 
 File: latex2e.info,  Node: \telephone,  Prev: \signature,  Up: Letters
@@ -11955,6 +11984,7 @@
 * environments:                          Environments.        (line   6)
 * environments, defining:                \newenvironment & \renewenvironment.
                                                               (line   6)
+* envlab package:                        \makelabels.         (line  49)
 * EPS files:                             Graphics package configuration.
                                                               (line   6)
 * EPS files <1>:                         \includegraphics.    (line   6)
@@ -12293,6 +12323,7 @@
 * package, cprotect <1>:                 \verb.               (line  34)
 * package, datetime:                     \today.              (line  22)
 * package, enumitem:                     list.                (line 247)
+* package, envlab:                       \makelabels.         (line  49)
 * package, etoolbox:                     Class and package commands.
                                                               (line 110)
 * package, fancyvrb:                     tabbing.             (line 145)
@@ -13634,7 +13665,7 @@
 * \\ (for \shortstack objects):          \shortstack.         (line  32)
 * \\ (tabbing):                          tabbing.             (line  66)
 * \\ for flushleft:                      flushleft.           (line  14)
-* \\ for letters:                        Letters.             (line  50)
+* \\ for letters:                        Letters.             (line  49)
 * \\ for tabular:                        tabular.             (line  34)
 * \\ for verse:                          verse.               (line  21)
 * \\ for \author:                        \maketitle.          (line  12)
@@ -13891,194 +13922,194 @@
 Node: picture146770
 Node: \put153197
 Node: \multiput153675
-Node: \qbezier154394
-Node: \graphpaper155322
-Node: \line156119
-Node: \linethickness157898
-Node: \thinlines158347
-Node: \thicklines158758
-Node: \circle159142
-Node: \oval159685
-Node: \shortstack160664
-Node: \vector162058
-Node: \makebox (picture)162901
-Node: \framebox (picture)163822
-Node: \frame164620
-Node: \dashbox165021
-Node: quotation & quote165747
-Node: tabbing166646
-Node: table172651
-Node: tabular174676
-Node: \multicolumn181926
-Node: \vline185811
-Node: \cline187156
-Node: \hline187840
-Node: thebibliography188522
-Node: \bibitem190935
-Node: \cite193217
-Node: \nocite194874
-Node: Using BibTeX195363
-Node: theorem197310
-Node: titlepage198232
-Node: verbatim199515
-Node: \verb201025
-Node: verse202494
-Node: Line breaking203222
-Node: \\204319
-Node: \obeycr & \restorecr205357
-Node: \newline205759
-Node: \- (hyphenation)206593
-Node: \discretionary207208
-Node: \fussy207500
-Node: \sloppy207890
-Node: \hyphenation208217
-Node: \linebreak & \nolinebreak208842
-Node: Page breaking209494
-Node: \cleardoublepage210102
-Node: \clearpage210531
-Node: \newpage210828
-Node: \enlargethispage211059
-Node: \pagebreak & \nopagebreak211586
-Node: Footnotes212280
-Node: \footnote213426
-Node: \footnotemark216374
-Node: \footnotetext218719
-Node: Footnotes in section headings219320
-Node: Footnotes in a table220147
-Node: Footnotes of footnotes223025
-Node: Definitions223729
-Node: \newcommand & \renewcommand224606
-Node: \providecommand229817
-Node: \newcounter230966
-Node: \newlength232711
-Node: \newsavebox233571
-Node: \newenvironment & \renewenvironment234515
-Node: \newtheorem239625
-Node: \newfont243154
-Node: \protect244450
-Node: \ignorespaces & \ignorespacesafterend246836
-Node: Counters249585
-Node: \alph \Alph \arabic \roman \Roman \fnsymbol251258
-Node: \usecounter254087
-Node: \value254950
-Node: \setcounter255879
-Node: \addtocounter256481
-Node: \refstepcounter256946
-Node: \stepcounter257604
-Node: \day \month \year257946
-Node: Lengths258491
-Node: Units of length260281
-Node: \setlength261775
-Node: \addtolength262552
-Node: \settodepth263526
-Node: \settoheight264281
-Node: \settowidth265040
-Node: Predefined lengths265823
-Node: Making paragraphs266338
-Node: \indent266910
-Node: \noindent267372
-Node: \parskip267881
-Node: Marginal notes268139
-Node: Math formulas269951
-Node: Subscripts & superscripts271735
-Node: Math symbols273073
-Node: Math functions298402
-Node: Math accents299345
-Node: Spacing in math mode300317
-Node: Math miscellany301784
-Node: Modes304334
-Node: \ensuremath306174
-Node: Page styles307090
-Node: \maketitle307584
-Node: \pagenumbering308654
-Node: \pagestyle309150
-Node: \thispagestyle310291
-Node: Spaces310597
-Node: \hspace311467
-Node: \hfill312422
-Node: \spacefactor312814
-Node: \(SPACE) and \@315526
-Ref: \AT315669
-Node: \frenchspacing317146
-Node: \normalsfcodes317762
-Node: \(SPACE) after control sequence317951
-Node: \thinspace318862
-Node: \/319182
-Node: \hrulefill \dotfill320364
-Node: \addvspace321357
-Node: \bigskip \medskip \smallskip322403
-Node: \vfill323295
-Node: \vspace324164
-Node: Boxes325157
-Node: \mbox325869
-Node: \fbox and \framebox326156
-Node: lrbox326960
-Node: \makebox327318
-Node: \parbox328038
-Node: \raisebox330149
-Node: \savebox330762
-Node: \sbox331177
-Node: \usebox331626
-Node: Color331887
-Node: Color package options332731
-Node: Color models334377
-Node: Commands for color336686
-Node: Define colors337101
-Node: Colored text337816
-Node: Colored boxes340191
-Node: Colored pages341630
-Node: Graphics342323
-Node: Graphics package options344450
-Node: Graphics package configuration347206
-Node: \graphicspath348008
-Node: \DeclareGraphicsExtensions350931
-Node: \DeclareGraphicsRule352728
-Node: Commands for graphics355917
-Node: \includegraphics356422
-Node: \rotatebox369391
-Node: \scalebox372186
-Node: \resizebox373238
-Node: Special insertions374430
-Node: Reserved characters375234
-Node: Upper and lower case376435
-Node: Symbols by font position378350
-Node: Text symbols378970
-Node: Accents382418
-Node: Additional Latin letters384960
-Ref: Non-English characters385131
-Node: \rule386148
-Node: \today386577
-Node: Splitting the input387331
-Node: \endinput388708
-Node: \include & \includeonly389975
-Node: \input393992
-Node: Front/back matter394700
-Node: Tables of contents394905
-Node: \addcontentsline395966
-Node: \addtocontents396984
-Node: Glossaries397517
-Node: Indexes398036
-Node: Letters399669
-Node: \address403347
-Node: \cc404217
-Node: \closing404635
-Node: \encl404946
-Node: \location405361
-Node: \makelabels405630
-Node: \name406631
-Node: \opening406861
-Node: \ps407201
-Node: \signature407490
-Node: \telephone408582
-Node: Terminal input/output408947
-Node: \typein409212
-Node: \typeout409797
-Node: Command line410420
-Node: Document templates411372
-Node: beamer template411779
-Node: book template412430
-Node: tugboat template412798
-Node: Concept Index415162
-Node: Command Index479647
+Node: \qbezier154395
+Node: \graphpaper155323
+Node: \line156120
+Node: \linethickness157899
+Node: \thinlines158348
+Node: \thicklines158759
+Node: \circle159143
+Node: \oval159683
+Node: \shortstack160662
+Node: \vector162056
+Node: \makebox (picture)162899
+Node: \framebox (picture)163820
+Node: \frame164617
+Node: \dashbox165018
+Node: quotation & quote165744
+Node: tabbing166643
+Node: table172648
+Node: tabular174673
+Node: \multicolumn181923
+Node: \vline185808
+Node: \cline187153
+Node: \hline187837
+Node: thebibliography188519
+Node: \bibitem190932
+Node: \cite193214
+Node: \nocite194871
+Node: Using BibTeX195360
+Node: theorem197307
+Node: titlepage198229
+Node: verbatim199512
+Node: \verb201022
+Node: verse202491
+Node: Line breaking203219
+Node: \\204316
+Node: \obeycr & \restorecr205354
+Node: \newline205756
+Node: \- (hyphenation)206590
+Node: \discretionary207205
+Node: \fussy207497
+Node: \sloppy207887
+Node: \hyphenation208214
+Node: \linebreak & \nolinebreak208839
+Node: Page breaking209491
+Node: \cleardoublepage210099
+Node: \clearpage210528
+Node: \newpage210825
+Node: \enlargethispage211056
+Node: \pagebreak & \nopagebreak211583
+Node: Footnotes212277
+Node: \footnote213423
+Node: \footnotemark216371
+Node: \footnotetext218716
+Node: Footnotes in section headings219317
+Node: Footnotes in a table220144
+Node: Footnotes of footnotes223022
+Node: Definitions223726
+Node: \newcommand & \renewcommand224603
+Node: \providecommand229814
+Node: \newcounter230963
+Node: \newlength232708
+Node: \newsavebox233568
+Node: \newenvironment & \renewenvironment234512
+Node: \newtheorem239622
+Node: \newfont243151
+Node: \protect244447
+Node: \ignorespaces & \ignorespacesafterend246833
+Node: Counters249582
+Node: \alph \Alph \arabic \roman \Roman \fnsymbol251255
+Node: \usecounter254084
+Node: \value254947
+Node: \setcounter255876
+Node: \addtocounter256478
+Node: \refstepcounter256943
+Node: \stepcounter257601
+Node: \day \month \year257943
+Node: Lengths258488
+Node: Units of length260278
+Node: \setlength261772
+Node: \addtolength262549
+Node: \settodepth263523
+Node: \settoheight264278
+Node: \settowidth265037
+Node: Predefined lengths265820
+Node: Making paragraphs266335
+Node: \indent266907
+Node: \noindent267369
+Node: \parskip267878
+Node: Marginal notes268136
+Node: Math formulas269948
+Node: Subscripts & superscripts271732
+Node: Math symbols273070
+Node: Math functions298399
+Node: Math accents299342
+Node: Spacing in math mode300314
+Node: Math miscellany301781
+Node: Modes304331
+Node: \ensuremath306171
+Node: Page styles307087
+Node: \maketitle307581
+Node: \pagenumbering308651
+Node: \pagestyle309147
+Node: \thispagestyle310288
+Node: Spaces310594
+Node: \hspace311464
+Node: \hfill312419
+Node: \spacefactor312811
+Node: \(SPACE) and \@315523
+Ref: \AT315666
+Node: \frenchspacing317143
+Node: \normalsfcodes317759
+Node: \(SPACE) after control sequence317948
+Node: \thinspace318859
+Node: \/319179
+Node: \hrulefill \dotfill320361
+Node: \addvspace321354
+Node: \bigskip \medskip \smallskip322400
+Node: \vfill323292
+Node: \vspace324161
+Node: Boxes325154
+Node: \mbox325866
+Node: \fbox and \framebox326153
+Node: lrbox326957
+Node: \makebox327315
+Node: \parbox328035
+Node: \raisebox330146
+Node: \savebox330759
+Node: \sbox331174
+Node: \usebox331623
+Node: Color331884
+Node: Color package options332728
+Node: Color models334374
+Node: Commands for color336683
+Node: Define colors337098
+Node: Colored text337813
+Node: Colored boxes340188
+Node: Colored pages341627
+Node: Graphics342320
+Node: Graphics package options344447
+Node: Graphics package configuration347203
+Node: \graphicspath348005
+Node: \DeclareGraphicsExtensions350928
+Node: \DeclareGraphicsRule352725
+Node: Commands for graphics355914
+Node: \includegraphics356419
+Node: \rotatebox369388
+Node: \scalebox372183
+Node: \resizebox373235
+Node: Special insertions374427
+Node: Reserved characters375231
+Node: Upper and lower case376432
+Node: Symbols by font position378347
+Node: Text symbols378967
+Node: Accents382415
+Node: Additional Latin letters384957
+Ref: Non-English characters385128
+Node: \rule386145
+Node: \today386574
+Node: Splitting the input387328
+Node: \endinput388705
+Node: \include & \includeonly389972
+Node: \input393989
+Node: Front/back matter394697
+Node: Tables of contents394902
+Node: \addcontentsline395963
+Node: \addtocontents396981
+Node: Glossaries397514
+Node: Indexes398033
+Node: Letters399666
+Node: \address403332
+Node: \cc404143
+Node: \closing404561
+Node: \encl404872
+Node: \location405287
+Node: \makelabels405551
+Node: \name407703
+Node: \opening407944
+Node: \ps408225
+Node: \signature408514
+Node: \telephone409731
+Node: Terminal input/output410096
+Node: \typein410361
+Node: \typeout410946
+Node: Command line411569
+Node: Document templates412521
+Node: beamer template412928
+Node: book template413579
+Node: tugboat template413947
+Node: Concept Index416311
+Node: Command Index480942
 
 End Tag Table

Modified: trunk/latex2e.pdf
===================================================================
(Binary files differ)

Modified: trunk/latex2e.texi
===================================================================
--- trunk/latex2e.texi	2018-05-31 16:43:51 UTC (rev 635)
+++ trunk/latex2e.texi	2018-06-01 13:46:47 UTC (rev 636)
@@ -2,7 +2,7 @@
 @c $Id$
 @comment %**start of header (This is for running Texinfo on a region.)
 @setfilename latex2e.info
- at set UPDATED May 2018
+ at set UPDATED June 2018
 @include common.texi
 @settitle @LaTeX{}2e unofficial reference manual (@value{UPDATED})
 @comment %**end of header (This is for running Texinfo on a region.)
@@ -13589,7 +13589,7 @@
 
 @example
 \documentclass@{letter@}
-\address@{@var{sender address}@}
+\address@{@var{sender address}@}   % return address
 \signature@{@var{sender name}@}
 \begin@{document@}
 \begin@{letter@}@{@var{recipient address}@}
@@ -13605,12 +13605,11 @@
 
 Each letter is in a separate @code{letter} environment, whose argument
 @var{recipient address} often contains multiple lines separated with a
-double backslash at tie{}(@code{\\}).  For example, you might have:
+double backslash, at tie{}(@code{\\}).  For example, you might have:
 
 @example
- \begin@{letter@}@{Mr. Joe Smith \\ 
-      2345 Princess St. \\ 
-      Edinburgh, EH1 1AA@}
+ \begin@{letter@}@{Ninon de l'Enclos \\
+   l'h\^otel Sagonne@}
    ...
  \end@{letter@}
 @end example
@@ -13626,13 +13625,13 @@
 under the closing, after a vertical space for the traditional
 hand-written signature; it also can contain multiple lines.
 
-Each @code{letter} environment body begins with a required @code{\opening} command
-such as @code{\opening@{Dear Madam or Sir:@}}.  The @var{letter body}
-text is ordinary @LaTeX{} so it can contain everything from
-enumerated lists to displayed math, except that commands such as
- at code{\chapter} that make no sense in a letter are turned off.  Each
- at code{letter} environment body typically ends with a @code{\closing}
-command such as @code{\closing@{Yours,@}}.
+Each @code{letter} environment body begins with a required
+ at code{\opening} command such as @code{\opening@{Dear Madam or Sir:@}}.
+The @var{letter body} text is ordinary @LaTeX{} so it can contain
+everything from enumerated lists to displayed math, except that commands
+such as @code{\chapter} that make no sense in a letter are turned off.
+Each @code{letter} environment body typically ends with a
+ at code{\closing} command such as @code{\closing@{Yours,@}}.
 
 @findex \\ @r{for letters}
 Additional material may come after the @code{\closing}.  You can say who
@@ -13697,19 +13696,18 @@
 \address@{@var{senders address}@}
 @end example
 
-Specifies the return address as it appears on the letter and on the
+Specify the return address, as it appears on the letter and on the
 envelope.  Separate multiple lines in @var{senders address} with a
-double backslash at tie{}@code{\\}.
+double backslash, at tie{}@code{\\}.
 
 Because it can apply to multiple letters this declaration is often put
 in the preamble.  However, it can go anywhere, including inside an
 individual @code{letter} environment.
 
-This command is optional: without the @code{\address} declaration the
-letter is formatted with some blank space on top, for copying onto
-pre-printed letterhead paper.  (@xref{Overview}, for details on your
-local implementation.)  With the @code{\address} declaration, it is
-formatted as a personal letter.
+This command is optional: if you do not use it then the letter is
+formatted with some blank space on top, for copying onto pre-printed
+letterhead paper.  If you do use the @code{\address} declaration then it
+is formatted as a personal letter.
 
 Here is an example.
 
@@ -13756,8 +13754,8 @@
 \closing@{@var{text}@}
 @end example
 
-Usually at the end of a letter, above the handwritten signature, there
-is a @code{\closing} (although this command is optional).  For example,
+Optional, but usual.  It appears at the end of a letter, above the
+handwritten signature.  For example,
 
 @example
 \closing@{Regards,@}
@@ -13798,7 +13796,7 @@
 \location@{@var{text}@}
 @end example
 
-The @var{text} appears centered at the bottom of the each page.  It only
+The @var{text} appears centered at the bottom of the page.  It only
 appears if the page style is @code{firstpage}.
 
 
@@ -13810,27 +13808,58 @@
 Synopsis:
 
 @example
-\makelabels
+\makelabels   % in preamble
 @end example
 
-Create a sheet of address labels from the recipient addresses, one for
-each letter. This sheet will be output before the letters, with the idea
-that you can copy it to a sheet of peel-off labels.  This command goes
-in the preamble.
+Optional.  If you just put @code{\makelabels} in the preamble then at
+the end of the document you will get a sheet with labels for all the
+recipients, one for each letter environment, that you can copy to a
+sheet of peel-off address labels.
 
 Customize the labels by redefining the commands @code{\startlabels},
- at code{\mlabel}, and @code{\returnaddress} in the preamble.  The command
- at code{\startlabels} sets the width, height, number of columns, etc., of
-the page onto which the labels are printed.  The command
- at code{\mlabel@{@var{sender address}@}@{@var{recipient address}@}}
-produces the two labels (or one, if you choose to ignore the @var{sender
-address}). The @var{sender address} is the value returned by the macro
- at code{\returnaddress} while @var{recipient address} is the value passed
-in the argument to the @code{letter} environment.  By default
- at code{\mlabel} ignores the first argument, the @var{sender address}.
+ at code{\mlabel}, and @code{\returnaddress} (and perhaps @code{\name}) in
+the preamble.  The command @code{\startlabels} sets the width, height,
+number of columns, etc., of the page onto which the labels are printed.
+The command @code{\mlabel@{@var{return address}@}@{@var{recipient
+address}@}} produces the two labels (or one, if you choose to ignore the
+ at var{return address}) for each letter environment. The first argument,
+ at var{return address}, is the value returned by the macro
+ at code{\returnaddress}.  The second argument, @var{recipient address}, is
+the value passed in the argument to the @code{letter} environment.  By
+default @code{\mlabel} ignores the first argument, the @var{return
+address}, causing the default behavior described in the prior paragraph.
 
- at c xxx TODO, align on latex2e-fr.texi, see https://mail.gna.org/public/latexrefman-discuss/2015-10/msg00000.html
+This illustrates customization.  Its output includes a page with two
+columns having two labels each.
 
+ at example
+\documentclass@{letter@}
+\renewcommand*@{\returnaddress@}@{Fred McGuilicuddy \\ Oshkosh, Mineola 12305@}
+\newcommand*\originalMlabel@{@}
+\let\originalMlabel\mlabel
+\def\mlabel#1#2@{\originalMlabel@{@}@{#1@}\originalMlabel@{@}@{#2@}@}
+\makelabels
+  ...
+\begin@{document@}
+\begin@{letter@}@{A Einstein \\ 112 Mercer Street \\ Princeton, New Jersey, USA 08540@}
+  ...
+\end@{letter@}
+\begin@{letter@}@{K G\"odel \\ 145 Linden Lane \\ Princeton, New Jersey, USA 08540@}
+  ...
+\end@{letter@}
+\end@{document@}
+ at end example
+
+The first column contains the return address twice.  The second column
+contains the address for each recipient.
+
+ at PkgIndex{envlab}
+The package @code{envlab} makes formatting the labels easier, with
+standard sizes already provided.  The preamble lines
+ at code{\usepackage[personalenvelope]@{envlab@}} and @code{\makelabels}
+are all that you need to print envelopes.
+
+
 @node \name
 @section @code{\name}
 
@@ -13842,8 +13871,8 @@
 \name@{@var{name}@}
 @end example
 
-Sender's name, used for printing on the envelope together with the
-return address.
+Optional.  Sender's name, used for printing on the envelope together
+with the return address.
 
 
 @node \opening
@@ -13855,12 +13884,11 @@
 Synopsis:
 
 @example
-\opening@{@var{text}@}
+\opening@{@var{salutation}@}
 @end example
 
-This command is required.  It starts a letter, following the
- at code{\begin@{letter@}@{...@}}. The mandatory argument @var{text} is the
-text that starts your letter.  For instance:
+Required.  Follows the @code{\begin@{letter@}@{...@}}. The argument
+ at var{salutation} is mandatory.  For instance:
 
 @example
 \opening@{Dear John:@}
@@ -13901,10 +13929,10 @@
 The sender's name.  This command is optional, although its inclusion is
 usual.
 
-The argument text appears at the end of the letter, after the closing
-and after a vertical space for the traditional hand-written
+The argument text appears at the end of the letter, after the closing.
+ at LaTeX{} leaves some vertical space for a handwritten
 signature. Separate multiple lines with a double
-backslash at tie{}@code{\\}.  For example:
+backslash, at tie{}@code{\\}.  For example:
 
 @example
 \signature@{J Fred Muggs \\
@@ -13913,7 +13941,9 @@
 
 @LaTeX{}'s default for the vertical space from the @code{\closing} text
 down to the @code{\signature} text is @code{6\medskipamount}, which is
-six times 0.7 at dmn{em}.
+six times @code{\medskipamount} (where @code{\medskipamount} is equal to
+a @code{\parskip}, which in turn is defined by default here to
+0.7 at dmn{em}).
 
 This command is usually in the preamble, to apply to all the letters in
 the document.  To have it apply to one letter only, put it inside a
@@ -13921,8 +13951,8 @@
 
 You can include a graphic in the signature, for instance with
 @code{\signature@{\vspace@{-6\medskipamount@}\includegraphics@{sig.png@}\\
-My name@}} (this requires writing @code{\usepackage@{graphicx@}} in the
-preamble).
+My name@}}.  This requires putting @code{\usepackage@{graphicx@}} in the
+preamble (@pxref{Graphics}).
 
 
 @c I think this is not a user-level command; it is used to keep from breaking



More information about the latexrefman-commits mailing list