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

jimhefferon at gnu.org.ua jimhefferon at gnu.org.ua
Wed Mar 21 19:48:09 CET 2018


Author: jimhefferon
Date: 2018-03-21 20:48:08 +0200 (Wed, 21 Mar 2018)
New Revision: 613

Added:
   trunk/makedist.sh
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/latex2e.html
   trunk/latex2e.info
   trunk/latex2e.pdf
   trunk/latex2e.texi
Log:
Version for CTAN, also added a .sh script to make a .zip for CTAN


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/ChangeLog	2018-03-21 18:48:08 UTC (rev 613)
@@ -1,3 +1,9 @@
+2018-03-21  Jim Hefferon  <jhefferon at smcvt.edu>
+
+	* latex2e.texi (Graphics): Couple of typos, small rewordings.
+	* makedist.sh  Create.  Bash script for making .zip for
+	a distribution for CTAN.
+
 2018-03-04  Jim Hefferon  <jhefferon at smcvt.edu>
 
 	* latex2e.texi (Graphics): Create as a new chapter.  Include all

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/NEWS	2018-03-21 18:48:08 UTC (rev 613)
@@ -4,9 +4,14 @@
 Spanish translation originally from Nacho Pacheco (currently unmaintained).
 French translation originally from Vincent Belaiche.
 
-- list environment: diagram of parameters and much additional text.
-- tabbing environment added.
+Changes in April 2018 release:
 
+There is a new chapter on color and a new chapter on graphics
+inclusion (all the commands from grfguide.pdf are now covered),
+there is much greater coverage of the list environment including a
+diagram of the parameters, and a description of the tabbing
+environment.
+
 ----------------------------------------------------------------
 Changes in Aug 2017 release:
 

Modified: trunk/latex2e.html
===================================================================
--- trunk/latex2e.html	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/latex2e.html	2018-03-21 18:48:08 UTC (rev 613)
@@ -2240,7 +2240,7 @@
 <p>Finally, the command <code>\oldstylenums{<var>numerals</var>}</code> will typeset
 so-called “old-style” numerals, which have differing heights and
 depths (and sometimes widths) from the standard “lining” numerals,
-which all have the same height as upper-case letters.  LaTeX’s
+which all have the same height as uppercase letters.  LaTeX’s
 default fonts support this, and will respect <code>\textbf</code> (but not
 other styles; there are no italic old-style numerals in Computer
 Modern).  Many other fonts have old-style numerals also; sometimes the
@@ -8708,7 +8708,7 @@
 <code>\newcommand{\points}[1]{\makebox[0pt]{\makebox[10em][l]{#1~pts}}\ignorespaces}</code>.
 </p>
 <p>A second example shows spaces being removed from the front of text.  The
-commands below allow a user to uniformily attach a title to names.  But,
+commands below allow a user to uniformly attach a title to names.  But,
 as given, if a title accidentally starts with a space then
 <code>\fullname</code> will reproduce that.
 </p>
@@ -10051,7 +10051,7 @@
 <dt><code>\ell</code>
 <a name="index-_005cell"></a>
 </dt>
-<dd><p>&#x2113; Lower-case cursive letter l (ordinary).
+<dd><p>&#x2113; Lowercase cursive letter l (ordinary).
 </p>
 </dd>
 <dt><code>\emptyset</code>
@@ -12292,7 +12292,7 @@
 shrink value is multiplied by <em>1000/f</em> (for Computer Modern Roman
 10 point these are 1.66666 and 1.11111 points).  In short, compared
 to a normal space, such as the space following a word ending in a
-lower-case letter, intersentence spacing has a fixed extra space added
+lowercase letter, inter-sentence spacing has a fixed extra space added
 and then the space can stretch 3 times as much and shrink 1/3 as much.
 </p>
 <p>The rules for how TeX uses space factors are even more complex
@@ -13433,18 +13433,18 @@
 
 <p>To use the commands described here your document preamble must contain
 either <code>\usepackage{graphicx}</code> or
-<code>\usepackage{graphics}</code>. (Most of the time, <samp>graphicx</samp> is
-the better choice.)
+<code>\usepackage{graphics}</code>. Most of the time, <samp>graphicx</samp> is the
+better choice.
 </p>
-<p>Broadly speaking, graphics come in two types, raster and vector.
-LaTeX can use both.  In raster graphics the file contains an entry
-for each location in an array, describing what color it is.  An example
-is a photograph, in JPG format.  In vector graphics, the file contains a
-list of instructions such as ‘<samp>draw a circle with this radius and
-that center</samp>’.  An example is a line drawing produced by the Asymptote
+<p>Graphics come in two main types, raster and vector.  LaTeX can use
+both.  In raster graphics the file contains an entry for each location
+in an array, describing what color it is.  An example is a photograph,
+in JPG format.  In vector graphics, the file contains a list of
+instructions such as ‘<samp>draw a circle with this radius and that
+center</samp>’.  An example is a line drawing produced by the Asymptote
 program, in PDF format.  Generally vector graphics are more useful
-because you can rescale their size without pixellation or other
-problems, and because they often have a smaller size.
+because you can rescale their size without pixelation or other problems,
+and because they often have a smaller size.
 </p>
 <p>There are systems particularly well-suited to make graphics for a
 LaTeX document.  For example, these allow you to use the same fonts
@@ -13492,11 +13492,11 @@
 <pre class="example">\usepackage[<var>comma-separated option list</var>]{graphicx}
 </pre></div>
 
-<p>The two packages <samp>graphics</samp> and <code>graphicx</code> offering the same
-capabilities, but the second has a format for optional arguments to
-commands that is typically more convenient (it is the key-value format).
-When you load the <samp>graphics</samp> or <samp>graphicx</samp> package there are
-two kinds of available options.
+<p>The <code>graphicx</code> package has a format for optional arguments to the
+<code>\includegraphics</code> command that is convenient (it is the key-value
+format), so it is the better choice for new documents.  When you load
+the <samp>graphics</samp> or <samp>graphicx</samp> package with <code>\usepackage</code>
+there are two kinds of available options.
 </p>
 <p>The first is that LaTeX does not contain information about different
 output systems but instead depends on information stored in a
@@ -13547,11 +13547,11 @@
 </dd>
 <dt><code>hiresbb</code></dt>
 <dd><p>In a PS or EPS file the graphic size may be specified in two ways.  The
-standard <code>%%BoundingBox</code> lines describe the graphic size using
-integer multiples of a PostScript point, that is, integer multiples of
-1/72 inch.  A later addition to the PostScript language allows decimal
-multiples, in <code>%%HiResBoundingBox</code> lines.  This option has LaTeX
-to read the size from the latter.
+<code>%%BoundingBox</code> lines describe the graphic size using integer
+multiples of a PostScript point, that is, integer multiples of 1/72
+inch.  A later addition to the PostScript language allows decimal
+multiples, such as 1.23, in <code>%%HiResBoundingBox</code> lines.  This
+option has LaTeX to read the size from the latter.
 </p>
 </dd>
 </dl>
@@ -13581,7 +13581,7 @@
 <p>The behavior of file system search code is necessarily platform
 dependent.  In this document we cover Linux, Macintosh, and Windows, as
 those systems are typically configured.  For other situations consult
-the documention in <samp>grfguide.pdf</samp>, or the LaTeX source, or your
+the documentation in <samp>grfguide.pdf</samp>, or the LaTeX source, or your
 TeX distribution’s documentation.
 </p>
 <table class="menu" border="0" cellspacing="0">
@@ -13631,17 +13631,18 @@
 particular, in this case one of the places it looks is the current
 directory.
 </p>
-<p>You must enclose each directory name in curly braces; for example, above
-it says ‘<samp><code>{pix}</code></samp>’.  This is true even if there is only one
-directory.  Each directory name must end in a forward slash, <samp>/</samp>.
-This is true even on Windows, where good practice is to use forward
-slashes for all the directory separators since it makes the document
-portable to other platforms.  If you have spaces in your directory name
-then use double quotes, as with <code>{"my docs/"}</code>. If you get one of
-these wrong then LaTeX will report <code>Error: File `<var>filename</var>'
-not found</code>.
+<p>Enclose each directory name in curly braces; for example, above it says
+‘<samp><code>{pix}</code></samp>’.  Do this even if there is only one directory.
+Each directory name must end in a forward slash, <samp>/</samp>.  This is true
+even on Windows, where good practice is to use forward slashes for all
+the directory separators since it makes the document portable to other
+platforms.  If you have spaces in your directory name then use double
+quotes, as with <code>{"my docs/"}</code>. Getting one of these rules wrong
+will cause LaTeX to report <code>Error: File `<var>filename</var>' not
+found</code>.
 </p>
-<p>Basically, the algorithm is that for this example,
+<p>Basically, the algorithm is that with this example, after looking in the
+current directory,
 </p>
 <div class="example">
 <pre class="example">\graphicspath{ {pix/} {../pix/} }
@@ -13649,23 +13650,22 @@
 \usepackage{lion.png}
 </pre></div>
 
-<p>for each of the directories, LaTeX concatenates it with the file name
-and searches for the result, checking for <samp>pix/lion.png</samp> and if
-that fails then it tries <samp>../pix/lion.png</samp>.  This algorithm means
-that the <code>\graphicspath</code> command does not recursively search
-subdirectories: if you issue <code>\graphicspath{{a/}}</code> and the
-graphic is in <samp>a/b/lion.png</samp> then LaTeX will not find it.  It
-also means that you can use absolute paths such as
+<p>for each of the listed directories, LaTeX concatenates it with the
+file name and searches for the result, checking for <samp>pix/lion.png</samp>
+and then <samp>../pix/lion.png</samp>.  This algorithm means that the
+<code>\graphicspath</code> command does not recursively search subdirectories:
+if you issue <code>\graphicspath{{a/}}</code> and the graphic is in
+<samp>a/b/lion.png</samp> then LaTeX will not find it.  It also means that
+you can use absolute paths such as
 <code>\graphicspath{{/home/jim/logos/}}</code> or
 <code>\graphicspath{{C:/Users/Albert/Pictures/}}</code>.  However, using
 these means that the document is not portable.  (You could preserve
-protability by adjusting your TeX system settings configuration file
+portability by adjusting your TeX system settings configuration file
 parameter <code>TEXINPUTS</code>; see the documentation of your system.)
 </p>
 <p>You can use <code>\graphicspath</code> in the preamble or in the document
-body.  You can use it more than once, each time changing the path list.
-For debugging, show its value with
-<code>\makeatletter\typeout{\Ginput at path}\makeatother</code>.
+body.  You can use it more than once.  For debugging, show its value
+with <code>\makeatletter\typeout{\Ginput at path}\makeatother</code>.
 </p>
 <p>The directories are taken with respect to the base file.  That is,
 suppose that you are working on a document based on <samp>book/book.tex</samp>
@@ -13706,18 +13706,20 @@
 \includegraphics{lion}   % will find <samp>lion.png</samp> before <samp>lion.pdf</samp> 
 </pre></div>
 
-<p>Because the file name <samp>lion</samp> does not have a period, for each
-directory in the graphics path (see <a href="#g_t_005cgraphicspath">\graphicspath</a>), LaTeX will
-try the extensions in the order given.  If it does not find such a file
-then it reports ‘<samp>! LaTeX Error: File `<samp>lion</samp>' not found</samp>’.
-Note that you must include the periods at the start of the extensions.
+<p>Because the file name <samp>lion</samp> does not have a period, LaTeX uses
+the extension list.  For each directory in the graphics path
+(see <a href="#g_t_005cgraphicspath">\graphicspath</a>), LaTeX will try the extensions in the order
+given.  If it does not find such a file after trying all the directories
+and extensions then it reports ‘<samp>! LaTeX Error: File `<samp>lion</samp>'
+not found</samp>’.  Note that you must include the periods at the start of the
+extensions.
 </p>
 <p>Because Linux and Macintosh filenames are case sensitive, the list of
 file extensions is case sensitive on those platforms.  The Windows
 platform is not case sensitive.
 </p>
-<p>Your document does not need to have a <code>\DeclareGraphicsExtensions</code>
-declaration; the printer driver has a sensible default.  For example,
+<p>You are not required to include <code>\DeclareGraphicsExtensions</code> in
+your document; the printer driver has a sensible default.  For example,
 the most recent <samp>pdftex.def</samp> has the extension list
 ‘<samp><code>.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2</code></samp>’.
 </p>
@@ -13743,8 +13745,7 @@
 <pre class="example">\DeclareGraphicsRule{<var>extension</var>}{<var>type</var>}{<var>size-file extension</var>}{<var>command</var>}
 </pre></div>
 
-<p>Declare how to handle graphic files whose names end in the extension
-<var>ext</var>.
+<p>Declare how to handle graphic files whose names end in <var>extension</var>.
 </p>
 <p>This example declares that all files with names have the form
 <samp>filename-without-dot.mps</samp> will be treated as output from MetaPost,
@@ -13768,7 +13769,7 @@
 <p>This describes the four arguments.
 </p>
 <dl compact="compact">
-<dt><var>ext</var></dt>
+<dt><var>extension</var></dt>
 <dd><p>The file extension to which this rule applies. The extension is anything
 after and including the first dot in the filename.  Use the Kleene star,
 <code>*</code>, to denote the default behaviour for all undeclared extensions.
@@ -13817,7 +13818,6 @@
 modern systems restrict running commands unless you explicitly allow it.
 See the documentation for your TeX distribution.
 </p>
-
 </dd>
 </dl>
 
@@ -13959,14 +13959,13 @@
                                 \setbox0=\hbox{#1}\parbox{\wd0}{\box0}\endgroup}
   ...
 \begin{center}
-\vcenteredhbox{
-  \includegraphics[width=0.4\textwidth]{plot}}
-\hspace{1em}
-\vcenteredhbox{\begin{minipage}{0.4\textwidth}
-                 \begin{displaymath}
-                   f(x)=(1/x)\cdot \sin (1/x)
-                 \end{displaymath}
-               \end{minipage}}
+  \vcenteredhbox{\includegraphics[width=0.4\textwidth]{plot}}
+  \hspace{1em}
+  \vcenteredhbox{\begin{minipage}{0.4\textwidth}
+                   \begin{displaymath}
+                     f(x)=x\cdot \sin (1/x)
+                   \end{displaymath}
+                 \end{minipage}}
 \end{center}
 </pre></div>
 
@@ -13983,10 +13982,7 @@
 tall and so its origin is at (0,0).
 </p>
 <p>The <samp>graphicx</samp> package gives you many more options.  Specify them
-in a key-value form, as here.  The options are read left-to-right. So
-the first graphic below is made one inch wide and then rotated, while
-the second is rotated and then made one inch wide.  Thus, unless the
-graphic is perfectly square, the two will be different sizes.
+in a key-value form, as here.
 </p>
 <div class="example">
 <pre class="example">\begin{center}
@@ -13996,6 +13992,11 @@
 \end{center}
 </pre></div>
 
+<p>The options are read left-to-right. So the first graphic above is made
+one inch wide and then rotated, while the second is rotated and then
+made one inch wide.  Thus, unless the graphic is perfectly square, the
+two will end with different widths and heights.
+</p>
 <p>There are many options.  The primary ones are listed first.
 </p>
 <p>Note that a graphic is placed by LaTeX into a box, which is
@@ -14034,11 +14035,11 @@
 </dd>
 <dt><code>keepaspectratio</code></dt>
 <dd><p>If set to <code>true</code>, or just specified as with
-<code>\includegraphics[...,keepaspectratio,...]{...}</code>, then if you
-give as options both <code>width</code> and <code>height</code> (or
-<code>totalheight</code>) then LaTeX will make the graphic is as large as
-possible without distortion. That is, LaTeX will ensure that neither
-is the graphic wider than <code>width</code> nor taller than <code>height</code> (or
+<code>\includegraphics[...,keepaspectratio,...]{...}</code> and you give as
+options both <code>width</code> and <code>height</code> (or <code>totalheight</code>),
+then LaTeX will make the graphic is as large as possible without
+distortion. That is, LaTeX will ensure that neither is the graphic
+wider than <code>width</code> nor taller than <code>height</code> (or
 <code>totalheight</code>).
 </p>
 </dd>
@@ -14081,8 +14082,9 @@
 <dd><p>Pick out a subregion of the graphic to show.  Takes four arguments,
 separated by spaces and given in TeX dimensions, as with
 <code>\includegraphics[.., viewport=0in 0in 1in 0.618in]{...}</code>.  The
-dimensions default to big points.  They are taken relative to the origin
-specified by the bounding box.  See also the <code>trim</code> option.
+dimensions default to big points, <code>bp</code>.  They are taken
+relative to the origin specified by the bounding box.  See also the
+<code>trim</code> option.
 </p>
 </dd>
 <dt><code>trim</code></dt>
@@ -14104,7 +14106,7 @@
 </p>
 </dd>
 <dt><code>page</code></dt>
-<dd><p>Give the page number of a multi-page PDF file.  The default
+<dd><p>Give the page number of a multi-page PDF file.  The default is
 <code>page=1</code>.
 </p>
 </dd>
@@ -14160,14 +14162,14 @@
 <dd><p>Specify the bounding box of the displayed region.  The argument is four
 dimensions separated by spaces, as with <code>\includegraphics[.., bb=
 0in 0in 1in 0.618in]{...}</code>.  Usually <code>\includegraphics</code> reads the
-BouindingBox numbers from the EPS file automatically, so this option is
+BoundingBox numbers from the EPS file automatically, so this option is
 only useful if the bounding box is missing from that file or if you want
 to change it.
 </p>
 </dd>
 <dt><code>bbllx, bblly, bburx, bbury</code></dt>
-<dd><p>Set the bounding box.  (These four are obsolete, but are retained for
-compatibility with old packages.)
+<dd><p>Set the bounding box.  These four are obsolete, but are retained for
+compatibility with old packages.
 </p>
 </dd>
 <dt><code>natwidth, natheight</code></dt>
@@ -14262,9 +14264,6 @@
 <pre class="example">  \rotatebox[origin=c]{45}{\includegraphics[width=1in]{lion}}
 </pre></div>
 
-<p>You can get the same effect using the <samp>graphicx</samp> package alone
-(see <a href="#g_t_005cincludegraphics">\includegraphics</a>).
-</p>
 <p>To place the rotated material, the first step is that LaTeX sets
 <var>material</var> in a box, with a reference point on the left baseline.
 The second step is the rotation, by default about the reference point.
@@ -14275,9 +14274,11 @@
 bounding box, in its new position, is what LaTeX uses as the box when
 typesetting this material.
 </p>
-<p>If you use the <samp>graphics</samp> package then the roatation is about the
-reference point of the box.  If you use <samp>graphicx</samp> then these are
-the options that can go in the <var>key-value list</var>.
+<p>If you use the <samp>graphics</samp> package then the rotation is about the
+reference point of the box.  If you use the <samp>graphicx</samp> package then
+then these are the options that can go in the <var>key-value list</var>, but
+note that you can get the same effect without needing this package,
+except for the <code>x</code> and <code>y</code> options (see <a href="#g_t_005cincludegraphics">\includegraphics</a>).
 </p>
 <dl compact="compact">
 <dt><code>origin</code></dt>

Modified: trunk/latex2e.info
===================================================================
--- trunk/latex2e.info	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/latex2e.info	2018-03-21 18:48:08 UTC (rev 613)
@@ -1227,7 +1227,7 @@
    Finally, the command '\oldstylenums{NUMERALS}' will typeset so-called
 "old-style" numerals, which have differing heights and depths (and
 sometimes widths) from the standard "lining" numerals, which all have
-the same height as upper-case letters.  LaTeX's default fonts support
+the same height as uppercase letters.  LaTeX's default fonts support
 this, and will respect '\textbf' (but not other styles; there are no
 italic old-style numerals in Computer Modern).  Many other fonts have
 old-style numerals also; sometimes the 'textcomp' package must be
@@ -3289,7 +3289,24 @@
 
    This shows the horizontal and vertical distances.
 
-++..............Surrounding environment, preceding material.............. -
+                                                                        | v0 
+ |---h0--|-h1-|                                                         |
+ ..Label..    .....First item.....................................      -
+      ............................................................
+      ............................................................      -
+                                                                        | v1
+           ........First item, second paragraph ..................      -
+      |-h2-|                                                            | v2
+                                                                        |
+ ..Label..    .....Second item....................................      -
+      ............................................................
+      ............................................................      -
+|-h3--|-h4-|                                                     |-h5-| |v3
+                                                                        |
+..............Surrounding environment, following material.............. -
+......................................................................." 
    The lengths shown are listed below.  The key relationship is that the
 right edge of the bracket for H1 equals the right edge of the bracket
@@ -5757,7 +5774,7 @@
 '\newcommand{\points}[1]{\makebox[0pt]{\makebox[10em][l]{#1~pts}}\ignorespaces}'.
 
    A second example shows spaces being removed from the front of text.
-The commands below allow a user to uniformily attach a title to names.
+The commands below allow a user to uniformly attach a title to names.
 But, as given, if a title accidentally starts with a space then
 '\fullname' will reproduce that.
 
@@ -6590,7 +6607,7 @@
      down arrow '\downarrow'.
 
 '\ell'
-     U+2113 Lower-case cursive letter l (ordinary).
+     U+2113 Lowercase cursive letter l (ordinary).
 
 '\emptyset'
      U+2205 Empty set symbol (ordinary).  The variant form is
@@ -7872,7 +7889,7 @@
 is multiplied by f /1000 and the normal shrink value is multiplied by
 1000/f (for Computer Modern Roman 10 point these are 1.66666 and
 1.11111 points).  In short, compared to a normal space, such as the
-space following a word ending in a lower-case letter, intersentence
+space following a word ending in a lowercase letter, inter-sentence
 spacing has a fixed extra space added and then the space can stretch 3
 times as much and shrink 1/3 as much.
 
@@ -8658,18 +8675,18 @@
      \includegraphics[width=0.5\linewidth]{plot.pdf}
 
    To use the commands described here your document preamble must
-contain either '\usepackage{graphicx}' or '\usepackage{graphics}'.
-(Most of the time, 'graphicx' is the better choice.)
+contain either '\usepackage{graphicx}' or '\usepackage{graphics}'.  Most
+of the time, 'graphicx' is the better choice.
 
-   Broadly speaking, graphics come in two types, raster and vector.
-LaTeX can use both.  In raster graphics the file contains an entry for
-each location in an array, describing what color it is.  An example is a
-photograph, in JPG format.  In vector graphics, the file contains a list
-of instructions such as 'draw a circle with this radius and that
-center'.  An example is a line drawing produced by the Asymptote
-program, in PDF format.  Generally vector graphics are more useful
-because you can rescale their size without pixellation or other
-problems, and because they often have a smaller size.
+   Graphics come in two main types, raster and vector.  LaTeX can use
+both.  In raster graphics the file contains an entry for each location
+in an array, describing what color it is.  An example is a photograph,
+in JPG format.  In vector graphics, the file contains a list of
+instructions such as 'draw a circle with this radius and that center'.
+An example is a line drawing produced by the Asymptote program, in PDF
+format.  Generally vector graphics are more useful because you can
+rescale their size without pixelation or other problems, and because
+they often have a smaller size.
 
    There are systems particularly well-suited to make graphics for a
 LaTeX document.  For example, these allow you to use the same fonts as
@@ -8703,11 +8720,11 @@
 
      \usepackage[COMMA-SEPARATED OPTION LIST]{graphicx}
 
-   The two packages 'graphics' and 'graphicx' offering the same
-capabilities, but the second has a format for optional arguments to
-commands that is typically more convenient (it is the key-value format).
-When you load the 'graphics' or 'graphicx' package there are two kinds
-of available options.
+   The 'graphicx' package has a format for optional arguments to the
+'\includegraphics' command that is convenient (it is the key-value
+format), so it is the better choice for new documents.  When you load
+the 'graphics' or 'graphicx' package with '\usepackage' there are two
+kinds of available options.
 
    The first is that LaTeX does not contain information about different
 output systems but instead depends on information stored in a "printer
@@ -8750,11 +8767,11 @@
 
 'hiresbb'
      In a PS or EPS file the graphic size may be specified in two ways.
-     The standard '%%BoundingBox' lines describe the graphic size using
-     integer multiples of a PostScript point, that is, integer multiples
-     of 1/72 inch.  A later addition to the PostScript language allows
-     decimal multiples, in '%%HiResBoundingBox' lines.  This option has
-     LaTeX to read the size from the latter.
+     The '%%BoundingBox' lines describe the graphic size using integer
+     multiples of a PostScript point, that is, integer multiples of 1/72
+     inch.  A later addition to the PostScript language allows decimal
+     multiples, such as 1.23, in '%%HiResBoundingBox' lines.  This
+     option has LaTeX to read the size from the latter.
 
 
 File: latex2e.info,  Node: Graphics package configuration,  Next: Commands for graphics,  Prev: Graphics package options,  Up: Graphics
@@ -8768,7 +8785,7 @@
    The behavior of file system search code is necessarily platform
 dependent.  In this document we cover Linux, Macintosh, and Windows, as
 those systems are typically configured.  For other situations consult
-the documention in 'grfguide.pdf', or the LaTeX source, or your TeX
+the documentation in 'grfguide.pdf', or the LaTeX source, or your TeX
 distribution's documentation.
 
 * Menu:
@@ -8804,36 +8821,36 @@
 looks for a file (it uses LaTeX's '\input at path').  In particular, in
 this case one of the places it looks is the current directory.
 
-   You must enclose each directory name in curly braces; for example,
-above it says ''{pix}''.  This is true even if there is only one
-directory.  Each directory name must end in a forward slash, '/'.  This
-is true even on Windows, where good practice is to use forward slashes
-for all the directory separators since it makes the document portable to
-other platforms.  If you have spaces in your directory name then use
-double quotes, as with '{"my docs/"}'.  If you get one of these wrong
-then LaTeX will report 'Error: File `FILENAME' not found'.
+   Enclose each directory name in curly braces; for example, above it
+says ''{pix}''.  Do this even if there is only one directory.  Each
+directory name must end in a forward slash, '/'.  This is true even on
+Windows, where good practice is to use forward slashes for all the
+directory separators since it makes the document portable to other
+platforms.  If you have spaces in your directory name then use double
+quotes, as with '{"my docs/"}'.  Getting one of these rules wrong will
+cause LaTeX to report 'Error: File `FILENAME' not found'.
 
-   Basically, the algorithm is that for this example,
+   Basically, the algorithm is that with this example, after looking in
+the current directory,
 
      \graphicspath{ {pix/} {../pix/} }
      ...
      \usepackage{lion.png}
 
-   for each of the directories, LaTeX concatenates it with the file name
-and searches for the result, checking for 'pix/lion.png' and if that
-fails then it tries '../pix/lion.png'.  This algorithm means that the
-'\graphicspath' command does not recursively search subdirectories: if
-you issue '\graphicspath{{a/}}' and the graphic is in 'a/b/lion.png'
-then LaTeX will not find it.  It also means that you can use absolute
-paths such as '\graphicspath{{/home/jim/logos/}}' or
+   for each of the listed directories, LaTeX concatenates it with the
+file name and searches for the result, checking for 'pix/lion.png' and
+then '../pix/lion.png'.  This algorithm means that the '\graphicspath'
+command does not recursively search subdirectories: if you issue
+'\graphicspath{{a/}}' and the graphic is in 'a/b/lion.png' then LaTeX
+will not find it.  It also means that you can use absolute paths such as
+'\graphicspath{{/home/jim/logos/}}' or
 '\graphicspath{{C:/Users/Albert/Pictures/}}'.  However, using these
 means that the document is not portable.  (You could preserve
-protability by adjusting your TeX system settings configuration file
+portability by adjusting your TeX system settings configuration file
 parameter 'TEXINPUTS'; see the documentation of your system.)
 
    You can use '\graphicspath' in the preamble or in the document body.
-You can use it more than once, each time changing the path list.  For
-debugging, show its value with
+You can use it more than once.  For debugging, show its value with
 '\makeatletter\typeout{\Ginput at path}\makeatother'.
 
    The directories are taken with respect to the base file.  That is,
@@ -8864,19 +8881,20 @@
        ...
      \includegraphics{lion}   % will find lion.png before lion.pdf
 
-   Because the file name 'lion' does not have a period, for each
-directory in the graphics path (*note \graphicspath::), LaTeX will try
-the extensions in the order given.  If it does not find such a file then
-it reports '! LaTeX Error: File `'lion'' not found'.  Note that you must
-include the periods at the start of the extensions.
+   Because the file name 'lion' does not have a period, LaTeX uses the
+extension list.  For each directory in the graphics path (*note
+\graphicspath::), LaTeX will try the extensions in the order given.  If
+it does not find such a file after trying all the directories and
+extensions then it reports '! LaTeX Error: File `'lion'' not found'.
+Note that you must include the periods at the start of the extensions.
 
    Because Linux and Macintosh filenames are case sensitive, the list of
 file extensions is case sensitive on those platforms.  The Windows
 platform is not case sensitive.
 
-   Your document does not need to have a '\DeclareGraphicsExtensions'
-declaration; the printer driver has a sensible default.  For example,
-the most recent 'pdftex.def' has the extension list
+   You are not required to include '\DeclareGraphicsExtensions' in your
+document; the printer driver has a sensible default.  For example, the
+most recent 'pdftex.def' has the extension list
 ''.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2''.
 
    You can use this command in the preamble or in the document body.
@@ -8893,8 +8911,7 @@
 
      \DeclareGraphicsRule{EXTENSION}{TYPE}{SIZE-FILE EXTENSION}{COMMAND}
 
-   Declare how to handle graphic files whose names end in the extension
-EXT.
+   Declare how to handle graphic files whose names end in EXTENSION.
 
    This example declares that all files with names have the form
 'filename-without-dot.mps' will be treated as output from MetaPost,
@@ -8913,7 +8930,7 @@
 
    This describes the four arguments.
 
-EXT
+EXTENSION
      The file extension to which this rule applies.  The extension is
      anything after and including the first dot in the filename.  Use
      the Kleene star, '*', to denote the default behaviour for all
@@ -9061,14 +9078,13 @@
                                      \setbox0=\hbox{#1}\parbox{\wd0}{\box0}\endgroup}
        ...
      \begin{center}
-     \vcenteredhbox{
-       \includegraphics[width=0.4\textwidth]{plot}}
-     \hspace{1em}
-     \vcenteredhbox{\begin{minipage}{0.4\textwidth}
-                      \begin{displaymath}
-                        f(x)=(1/x)\cdot \sin (1/x)
-                      \end{displaymath}
-                    \end{minipage}}
+       \vcenteredhbox{\includegraphics[width=0.4\textwidth]{plot}}
+       \hspace{1em}
+       \vcenteredhbox{\begin{minipage}{0.4\textwidth}
+                        \begin{displaymath}
+                          f(x)=x\cdot \sin (1/x)
+                        \end{displaymath}
+                      \end{minipage}}
      \end{center}
 
    If you use the 'graphics' package then the only options involve the
@@ -9084,10 +9100,7 @@
 its origin is at (0,0).
 
    The 'graphicx' package gives you many more options.  Specify them in
-a key-value form, as here.  The options are read left-to-right.  So the
-first graphic below is made one inch wide and then rotated, while the
-second is rotated and then made one inch wide.  Thus, unless the graphic
-is perfectly square, the two will be different sizes.
+a key-value form, as here.
 
      \begin{center}
        \includegraphics[width=1in,angle=90]{lion}
@@ -9095,6 +9108,11 @@
        \includegraphics[angle=90,width=1in]{lion}
      \end{center}
 
+   The options are read left-to-right.  So the first graphic above is
+made one inch wide and then rotated, while the second is rotated and
+then made one inch wide.  Thus, unless the graphic is perfectly square,
+the two will end with different widths and heights.
+
    There are many options.  The primary ones are listed first.
 
    Note that a graphic is placed by LaTeX into a box, which is
@@ -9130,8 +9148,8 @@
 
 'keepaspectratio'
      If set to 'true', or just specified as with
-     '\includegraphics[...,keepaspectratio,...]{...}', then if you give
-     as options both 'width' and 'height' (or 'totalheight') then LaTeX
+     '\includegraphics[...,keepaspectratio,...]{...}' and you give as
+     options both 'width' and 'height' (or 'totalheight'), then LaTeX
      will make the graphic is as large as possible without distortion.
      That is, LaTeX will ensure that neither is the graphic wider than
      'width' nor taller than 'height' (or 'totalheight').
@@ -9169,8 +9187,9 @@
      Pick out a subregion of the graphic to show.  Takes four arguments,
      separated by spaces and given in TeX dimensions, as with
      '\includegraphics[.., viewport=0in 0in 1in 0.618in]{...}'.  The
-     dimensions default to big points.  They are taken relative to the
-     origin specified by the bounding box.  See also the 'trim' option.
+     dimensions default to big points, 'bp'.  They are taken relative to
+     the origin specified by the bounding box.  See also the 'trim'
+     option.
 
 'trim'
      Gives parts of the graphic to not show.  Takes four arguments,
@@ -9188,7 +9207,7 @@
      starred form of the command, as '\includegraphics*[...]{...}'.
 
 'page'
-     Give the page number of a multi-page PDF file.  The default
+     Give the page number of a multi-page PDF file.  The default is
      'page=1'.
 
 'pagebox'
@@ -9236,13 +9255,13 @@
      Specify the bounding box of the displayed region.  The argument is
      four dimensions separated by spaces, as with '\includegraphics[..,
      bb= 0in 0in 1in 0.618in]{...}'.  Usually '\includegraphics' reads
-     the BouindingBox numbers from the EPS file automatically, so this
+     the BoundingBox numbers from the EPS file automatically, so this
      option is only useful if the bounding box is missing from that file
      or if you want to change it.
 
 'bbllx, bblly, bburx, bbury'
-     Set the bounding box.  (These four are obsolete, but are retained
-     for compatibility with old packages.)
+     Set the bounding box.  These four are obsolete, but are retained
+     for compatibility with old packages.
 
 'natwidth, natheight'
      An alternative for 'bb'.  Setting
@@ -9308,9 +9327,6 @@
 
        \rotatebox[origin=c]{45}{\includegraphics[width=1in]{lion}}
 
-   You can get the same effect using the 'graphicx' package alone (*note
-\includegraphics::).
-
    To place the rotated material, the first step is that LaTeX sets
 MATERIAL in a box, with a reference point on the left baseline.  The
 second step is the rotation, by default about the reference point.  The
@@ -9321,9 +9337,11 @@
 new position, is what LaTeX uses as the box when typesetting this
 material.
 
-   If you use the 'graphics' package then the roatation is about the
-reference point of the box.  If you use 'graphicx' then these are the
-options that can go in the KEY-VALUE LIST.
+   If you use the 'graphics' package then the rotation is about the
+reference point of the box.  If you use the 'graphicx' package then then
+these are the options that can go in the KEY-VALUE LIST, but note that
+you can get the same effect without needing this package, except for the
+'x' and 'y' options (*note \includegraphics::).
 
 'origin'
      The point of the MATERIAL's box about which the rotation happens.
@@ -12822,245 +12840,245 @@
 Node: Fonts47384
 Ref: Typefaces47487
 Node: Font styles47815
-Node: Font sizes52244
-Node: Low-level font commands53475
-Node: Layout58582
-Node: \onecolumn59080
-Node: \twocolumn59411
-Node: \flushbottom63806
-Node: \raggedbottom64906
-Node: Page layout parameters65442
-Node: Floats71140
-Node: Sectioning77605
-Ref: Sectioning/secnumdepth78926
-Node: \@startsection79336
-Ref: \@startsection/name80608
-Ref: \@startsection/level81068
-Ref: \@startsection/indent82139
-Ref: \@startsection/beforeskip82402
-Ref: \@startsection/afterskip83923
-Ref: \@startsection/style85234
-Node: Cross references89070
-Node: \label90936
-Node: \pageref92483
-Node: \ref93153
-Node: Environments93842
-Node: abstract95845
-Node: array97434
-Node: center99692
-Node: \centering101333
-Node: description102705
-Node: displaymath104892
-Node: document106670
-Node: \AtBeginDocument107100
-Node: \AtEndDocument107724
-Node: enumerate108368
-Node: eqnarray111165
-Node: equation113219
-Node: figure113889
-Node: filecontents115701
-Node: flushleft117454
-Node: \raggedright117947
-Node: flushright118506
-Node: \raggedleft119004
-Node: itemize119561
-Node: letter123062
-Node: list123300
-Node: \item134633
-Node: trivlist135886
-Node: math137414
-Node: minipage137720
-Node: picture138912
-Node: \circle143207
-Node: \makebox (picture)143550
-Node: \framebox (picture)144256
-Node: \dashbox144746
-Node: \frame145269
-Node: \line145595
-Node: \linethickness146053
-Node: \thicklines146474
-Node: \thinlines146784
-Node: \multiput147086
-Node: \oval147453
-Node: \put148174
-Node: \shortstack148465
-Node: \vector148939
-Node: quotation and quote149253
-Node: tabbing150460
-Node: table156398
-Node: tabular157825
-Node: \multicolumn165033
-Node: \vline168918
-Node: \cline170263
-Node: \hline170947
-Node: thebibliography171630
-Node: \bibitem173244
-Node: \cite174002
-Node: \nocite174521
-Node: Using BibTeX174809
-Node: theorem176318
-Node: titlepage176704
-Node: verbatim177994
-Node: \verb178633
-Node: verse179183
-Node: Line breaking179677
-Node: \\180774
-Node: \obeycr & \restorecr181812
-Node: \newline182214
-Node: \- (hyphenation)183048
-Node: \discretionary183663
-Node: \fussy183955
-Node: \sloppy184345
-Node: \hyphenation184672
-Node: \linebreak & \nolinebreak185297
-Node: Page breaking185949
-Node: \cleardoublepage186557
-Node: \clearpage186986
-Node: \newpage187283
-Node: \enlargethispage187514
-Node: \pagebreak & \nopagebreak188041
-Node: Footnotes188735
-Node: \footnote189989
-Node: \footnotemark191785
-Node: \footnotetext193029
-Node: Footnotes in a table193519
-Node: Footnotes in section headings195376
-Node: Footnotes of footnotes196232
-Node: Multiple reference to footnotes196999
-Node: Footnote parameters197857
-Node: Definitions198607
-Node: \newcommand & \renewcommand199484
-Node: \providecommand203320
-Node: \newcounter203981
-Node: \newlength204952
-Node: \newsavebox205599
-Node: \newenvironment & \renewenvironment206210
-Node: \newtheorem210570
-Node: \newfont214059
-Node: \protect215624
-Node: \ignorespaces & \ignorespacesafterend218010
-Node: Counters220760
-Node: \alph \Alph \arabic \roman \Roman \fnsymbol222360
-Node: \usecounter224432
-Node: \value225264
-Node: \setcounter226207
-Node: \addtocounter226693
-Node: \refstepcounter227158
-Node: \stepcounter227816
-Node: \day \month \year228158
-Node: Lengths228703
-Node: Units of length230493
-Node: \setlength231987
-Node: \addtolength232391
-Node: \settodepth232709
-Node: \settoheight233000
-Node: \settowidth233297
-Node: Predefined lengths233605
-Node: Making paragraphs234120
-Node: \indent234692
-Node: \noindent235154
-Node: \parskip235663
-Node: Marginal notes235921
-Node: Math formulas237733
-Node: Subscripts & superscripts239517
-Node: Math symbols240855
-Node: Math functions266185
-Node: Math accents267128
-Node: Spacing in math mode268100
-Node: Math miscellany269567
-Node: Modes272117
-Node: \ensuremath273957
-Node: Page styles274873
-Node: \maketitle275367
-Node: \pagenumbering276437
-Node: \pagestyle276933
-Node: \thispagestyle278074
-Node: Spaces278380
-Node: \hspace279250
-Node: \hfill280205
-Node: \spacefactor280597
-Node: \(SPACE) and \@283309
-Ref: \AT283452
-Node: \frenchspacing284929
-Node: \normalsfcodes285545
-Node: \(SPACE) after control sequence285734
-Node: \thinspace286645
-Node: \/286965
-Node: \hrulefill \dotfill288147
-Node: \addvspace289140
-Node: \bigskip \medskip \smallskip290186
-Node: \vfill291078
-Node: \vspace291947
-Node: Boxes292940
-Node: \mbox293652
-Node: \fbox and \framebox293939
-Node: lrbox294743
-Node: \makebox295101
-Node: \parbox295821
-Node: \raisebox297389
-Node: \savebox297986
-Node: \sbox298401
-Node: \usebox298850
-Node: Color299111
-Node: Color package options299955
-Node: Color models301597
-Node: Commands for color303906
-Node: Define colors304321
-Node: Colored text305036
-Node: Colored boxes307411
-Node: Colored pages308850
-Node: Graphics309543
-Node: Graphics package options311677
-Node: Graphics package configuration314418
-Node: \graphicspath315203
-Node: \DeclareGraphicsExtensions318142
-Node: \DeclareGraphicsRule319857
-Node: Commands for graphics323048
-Node: \includegraphics323553
-Node: \rotatebox336548
-Node: \scalebox339287
-Node: \resizebox340339
-Node: Special insertions341531
-Node: Reserved characters342335
-Node: Upper and lower case343536
-Node: Symbols by font position345451
-Node: Text symbols346071
-Node: Accents349519
-Node: Additional Latin letters352061
-Ref: Non-English characters352232
-Node: \rule353249
-Node: \today353678
-Node: Splitting the input354432
-Node: \include355196
-Node: \includeonly355787
-Node: \input356300
-Node: Front/back matter356795
-Node: Tables of contents357000
-Node: \addcontentsline358061
-Node: \addtocontents359079
-Node: Glossaries359612
-Node: Indexes360131
-Node: Letters361764
-Node: \address365442
-Node: \cc366312
-Node: \closing366730
-Node: \encl367041
-Node: \location367456
-Node: \makelabels367725
-Node: \name368726
-Node: \opening368956
-Node: \ps369296
-Node: \signature369585
-Node: \telephone370677
-Node: Terminal input/output371042
-Node: \typein371307
-Node: \typeout371892
-Node: Command line372515
-Node: Document templates373467
-Node: beamer template373874
-Node: book template374525
-Node: tugboat template374893
-Node: Concept Index377257
-Node: Command Index440028
+Node: Font sizes52243
+Node: Low-level font commands53474
+Node: Layout58581
+Node: \onecolumn59079
+Node: \twocolumn59410
+Node: \flushbottom63805
+Node: \raggedbottom64905
+Node: Page layout parameters65441
+Node: Floats71139
+Node: Sectioning77604
+Ref: Sectioning/secnumdepth78925
+Node: \@startsection79335
+Ref: \@startsection/name80607
+Ref: \@startsection/level81067
+Ref: \@startsection/indent82138
+Ref: \@startsection/beforeskip82401
+Ref: \@startsection/afterskip83922
+Ref: \@startsection/style85233
+Node: Cross references89069
+Node: \label90935
+Node: \pageref92482
+Node: \ref93152
+Node: Environments93841
+Node: abstract95844
+Node: array97433
+Node: center99691
+Node: \centering101332
+Node: description102704
+Node: displaymath104891
+Node: document106669
+Node: \AtBeginDocument107099
+Node: \AtEndDocument107723
+Node: enumerate108367
+Node: eqnarray111164
+Node: equation113218
+Node: figure113888
+Node: filecontents115700
+Node: flushleft117453
+Node: \raggedright117946
+Node: flushright118505
+Node: \raggedleft119003
+Node: itemize119560
+Node: letter123061
+Node: list123299
+Node: \item135965
+Node: trivlist137218
+Node: math138746
+Node: minipage139052
+Node: picture140244
+Node: \circle144539
+Node: \makebox (picture)144882
+Node: \framebox (picture)145588
+Node: \dashbox146078
+Node: \frame146601
+Node: \line146927
+Node: \linethickness147385
+Node: \thicklines147806
+Node: \thinlines148116
+Node: \multiput148418
+Node: \oval148785
+Node: \put149506
+Node: \shortstack149797
+Node: \vector150271
+Node: quotation and quote150585
+Node: tabbing151792
+Node: table157730
+Node: tabular159157
+Node: \multicolumn166365
+Node: \vline170250
+Node: \cline171595
+Node: \hline172279
+Node: thebibliography172962
+Node: \bibitem174576
+Node: \cite175334
+Node: \nocite175853
+Node: Using BibTeX176141
+Node: theorem177650
+Node: titlepage178036
+Node: verbatim179326
+Node: \verb179965
+Node: verse180515
+Node: Line breaking181009
+Node: \\182106
+Node: \obeycr & \restorecr183144
+Node: \newline183546
+Node: \- (hyphenation)184380
+Node: \discretionary184995
+Node: \fussy185287
+Node: \sloppy185677
+Node: \hyphenation186004
+Node: \linebreak & \nolinebreak186629
+Node: Page breaking187281
+Node: \cleardoublepage187889
+Node: \clearpage188318
+Node: \newpage188615
+Node: \enlargethispage188846
+Node: \pagebreak & \nopagebreak189373
+Node: Footnotes190067
+Node: \footnote191321
+Node: \footnotemark193117
+Node: \footnotetext194361
+Node: Footnotes in a table194851
+Node: Footnotes in section headings196708
+Node: Footnotes of footnotes197564
+Node: Multiple reference to footnotes198331
+Node: Footnote parameters199189
+Node: Definitions199939
+Node: \newcommand & \renewcommand200816
+Node: \providecommand204652
+Node: \newcounter205313
+Node: \newlength206284
+Node: \newsavebox206931
+Node: \newenvironment & \renewenvironment207542
+Node: \newtheorem211902
+Node: \newfont215391
+Node: \protect216956
+Node: \ignorespaces & \ignorespacesafterend219342
+Node: Counters222091
+Node: \alph \Alph \arabic \roman \Roman \fnsymbol223691
+Node: \usecounter225763
+Node: \value226595
+Node: \setcounter227538
+Node: \addtocounter228024
+Node: \refstepcounter228489
+Node: \stepcounter229147
+Node: \day \month \year229489
+Node: Lengths230034
+Node: Units of length231824
+Node: \setlength233318
+Node: \addtolength233722
+Node: \settodepth234040
+Node: \settoheight234331
+Node: \settowidth234628
+Node: Predefined lengths234936
+Node: Making paragraphs235451
+Node: \indent236023
+Node: \noindent236485
+Node: \parskip236994
+Node: Marginal notes237252
+Node: Math formulas239064
+Node: Subscripts & superscripts240848
+Node: Math symbols242186
+Node: Math functions267515
+Node: Math accents268458
+Node: Spacing in math mode269430
+Node: Math miscellany270897
+Node: Modes273447
+Node: \ensuremath275287
+Node: Page styles276203
+Node: \maketitle276697
+Node: \pagenumbering277767
+Node: \pagestyle278263
+Node: \thispagestyle279404
+Node: Spaces279710
+Node: \hspace280580
+Node: \hfill281535
+Node: \spacefactor281927
+Node: \(SPACE) and \@284639
+Ref: \AT284782
+Node: \frenchspacing286259
+Node: \normalsfcodes286875
+Node: \(SPACE) after control sequence287064
+Node: \thinspace287975
+Node: \/288295
+Node: \hrulefill \dotfill289477
+Node: \addvspace290470
+Node: \bigskip \medskip \smallskip291516
+Node: \vfill292408
+Node: \vspace293277
+Node: Boxes294270
+Node: \mbox294982
+Node: \fbox and \framebox295269
+Node: lrbox296073
+Node: \makebox296431
+Node: \parbox297151
+Node: \raisebox298719
+Node: \savebox299316
+Node: \sbox299731
+Node: \usebox300180
+Node: Color300441
+Node: Color package options301285
+Node: Color models302927
+Node: Commands for color305236
+Node: Define colors305651
+Node: Colored text306366
+Node: Colored boxes308741
+Node: Colored pages310180
+Node: Graphics310873
+Node: Graphics package options312992
+Node: Graphics package configuration315744
+Node: \graphicspath316531
+Node: \DeclareGraphicsExtensions319454
+Node: \DeclareGraphicsRule321247
+Node: Commands for graphics324436
+Node: \includegraphics324941
+Node: \rotatebox337967
+Node: \scalebox340762
+Node: \resizebox341814
+Node: Special insertions343006
+Node: Reserved characters343810
+Node: Upper and lower case345011
+Node: Symbols by font position346926
+Node: Text symbols347546
+Node: Accents350994
+Node: Additional Latin letters353536
+Ref: Non-English characters353707
+Node: \rule354724
+Node: \today355153
+Node: Splitting the input355907
+Node: \include356671
+Node: \includeonly357262
+Node: \input357775
+Node: Front/back matter358270
+Node: Tables of contents358475
+Node: \addcontentsline359536
+Node: \addtocontents360554
+Node: Glossaries361087
+Node: Indexes361606
+Node: Letters363239
+Node: \address366917
+Node: \cc367787
+Node: \closing368205
+Node: \encl368516
+Node: \location368931
+Node: \makelabels369200
+Node: \name370201
+Node: \opening370431
+Node: \ps370771
+Node: \signature371060
+Node: \telephone372152
+Node: Terminal input/output372517
+Node: \typein372782
+Node: \typeout373367
+Node: Command line373990
+Node: Document templates374942
+Node: beamer template375349
+Node: book template376000
+Node: tugboat template376368
+Node: Concept Index378732
+Node: Command Index441503
 
 End Tag Table

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

Modified: trunk/latex2e.texi
===================================================================
--- trunk/latex2e.texi	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/latex2e.texi	2018-03-21 18:48:08 UTC (rev 613)
@@ -21,6 +21,7 @@
 @c xx merge latex-manual from savannah
 @c xx merge display style math
 @c xx vertical mode, horizontal mode
+ at c xx JH Discuss restricted execution
 @c
 @c xx The typeset source2e has an index with all kernel
 @c xx commands, though some are internal and shouldn't be included.
@@ -10487,18 +10488,18 @@
 
 To use the commands described here your document preamble must contain
 either @code{\usepackage@{graphicx@}} or
- at code{\usepackage@{graphics@}}. (Most of the time, @file{graphicx} is
-the better choice.)
+ at code{\usepackage@{graphics@}}. Most of the time, @file{graphicx} is the
+better choice.
 
-Broadly speaking, graphics come in two types, raster and vector.
- at LaTeX{} can use both.  In raster graphics the file contains an entry
-for each location in an array, describing what color it is.  An example
-is a photograph, in JPG format.  In vector graphics, the file contains a
-list of instructions such as @samp{draw a circle with this radius and
-that center}.  An example is a line drawing produced by the Asymptote
+Graphics come in two main types, raster and vector.  @LaTeX{} can use
+both.  In raster graphics the file contains an entry for each location
+in an array, describing what color it is.  An example is a photograph,
+in JPG format.  In vector graphics, the file contains a list of
+instructions such as @samp{draw a circle with this radius and that
+center}.  An example is a line drawing produced by the Asymptote
 program, in PDF format.  Generally vector graphics are more useful
-because you can rescale their size without pixelation or other
-problems, and because they often have a smaller size.
+because you can rescale their size without pixelation or other problems,
+and because they often have a smaller size.
 
 There are systems particularly well-suited to make graphics for a
 @LaTeX{} document.  For example, these allow you to use the same fonts
@@ -10537,11 +10538,11 @@
 \usepackage[@var{comma-separated option list}]@{graphicx@}
 @end example
 
-The two packages @file{graphics} and @code{graphicx} offering the same
-capabilities, but the second has a format for optional arguments to
-commands that is typically more convenient (it is the key-value format).
-When you load the @file{graphics} or @file{graphicx} package there are
-two kinds of available options.
+The @code{graphicx} package has a format for optional arguments to the
+ at code{\includegraphics} command that is convenient (it is the key-value
+format), so it is the better choice for new documents.  When you load
+the @file{graphics} or @file{graphicx} package with @code{\usepackage}
+there are two kinds of available options.
 
 The first is that @LaTeX{} does not contain information about different
 output systems but instead depends on information stored in a
@@ -10589,11 +10590,11 @@
 
 @item hiresbb
 In a PS or EPS file the graphic size may be specified in two ways.  The
-standard @code{%%BoundingBox} lines describe the graphic size using
-integer multiples of a PostScript point, that is, integer multiples of
-1/72 inch.  A later addition to the PostScript language allows decimal
-multiples, in @code{%%HiResBoundingBox} lines.  This option has @LaTeX{}
-to read the size from the latter.
+ at code{%%BoundingBox} lines describe the graphic size using integer
+multiples of a PostScript point, that is, integer multiples of 1/72
+inch.  A later addition to the PostScript language allows decimal
+multiples, such as 1.23, in @code{%%HiResBoundingBox} lines.  This
+option has @LaTeX{} to read the size from the latter.
 
 @end table
 
@@ -10657,17 +10658,18 @@
 particular, in this case one of the places it looks is the current
 directory.
 
-You must enclose each directory name in curly braces; for example, above
-it says @samp{@code{@{pix@}}}.  This is true even if there is only one
-directory.  Each directory name must end in a forward slash, @file{/}.
-This is true even on Windows, where good practice is to use forward
-slashes for all the directory separators since it makes the document
-portable to other platforms.  If you have spaces in your directory name
-then use double quotes, as with @code{@{"my docs/"@}}. If you get one of
-these wrong then @LaTeX{} will report @code{Error: File `@var{filename}'
-not found}.
+Enclose each directory name in curly braces; for example, above it says
+ at samp{@code{@{pix@}}}.  Do this even if there is only one directory.
+Each directory name must end in a forward slash, @file{/}.  This is true
+even on Windows, where good practice is to use forward slashes for all
+the directory separators since it makes the document portable to other
+platforms.  If you have spaces in your directory name then use double
+quotes, as with @code{@{"my docs/"@}}. Getting one of these rules wrong
+will cause @LaTeX{} to report @code{Error: File `@var{filename}' not
+found}.
 
-Basically, the algorithm is that for this example,
+Basically, the algorithm is that with this example, after looking in the
+current directory,
 
 @example
 \graphicspath@{ @{pix/@} @{../pix/@} @}
@@ -10675,13 +10677,13 @@
 \usepackage@{lion.png@}
 @end example
 
-for each of the directories, @LaTeX{} concatenates it with the file name
-and searches for the result, checking for @file{pix/lion.png} and if
-that fails then it tries @file{../pix/lion.png}.  This algorithm means
-that the @code{\graphicspath} command does not recursively search
-subdirectories: if you issue @code{\graphicspath@{@{a/@}@}} and the
-graphic is in @file{a/b/lion.png} then @LaTeX{} will not find it.  It
-also means that you can use absolute paths such as
+for each of the listed directories, @LaTeX{} concatenates it with the
+file name and searches for the result, checking for @file{pix/lion.png}
+and then @file{../pix/lion.png}.  This algorithm means that the
+ at code{\graphicspath} command does not recursively search subdirectories:
+if you issue @code{\graphicspath@{@{a/@}@}} and the graphic is in
+ at file{a/b/lion.png} then @LaTeX{} will not find it.  It also means that
+you can use absolute paths such as
 @code{\graphicspath@{@{/home/jim/logos/@}@}} or
 @code{\graphicspath@{@{C:/Users/Albert/Pictures/@}@}}.  However, using
 these means that the document is not portable.  (You could preserve
@@ -10689,9 +10691,8 @@
 parameter @code{TEXINPUTS}; see the documentation of your system.)
 
 You can use @code{\graphicspath} in the preamble or in the document
-body.  You can use it more than once, each time changing the path list.
-For debugging, show its value with
- at code{\makeatletter\typeout@{\Ginput@@path@}\makeatother}.
+body.  You can use it more than once.  For debugging, show its value
+with @code{\makeatletter\typeout@{\Ginput@@path@}\makeatother}.
 
 The directories are taken with respect to the base file.  That is,
 suppose that you are working on a document based on @file{book/book.tex}
@@ -10726,18 +10727,20 @@
 \includegraphics@{lion@}   % will find @file{lion.png} before @file{lion.pdf} 
 @end example
 
-Because the file name @file{lion} does not have a period, for each
-directory in the graphics path (@pxref{\graphicspath}), @LaTeX{} will
-try the extensions in the order given.  If it does not find such a file
-then it reports @samp{! LaTeX Error: File `@file{lion}' not found}.
-Note that you must include the periods at the start of the extensions.
+Because the file name @file{lion} does not have a period, @LaTeX{} uses
+the extension list.  For each directory in the graphics path
+(@pxref{\graphicspath}), @LaTeX{} will try the extensions in the order
+given.  If it does not find such a file after trying all the directories
+and extensions then it reports @samp{! LaTeX Error: File `@file{lion}'
+not found}.  Note that you must include the periods at the start of the
+extensions.
 
 Because Linux and Macintosh filenames are case sensitive, the list of
 file extensions is case sensitive on those platforms.  The Windows
 platform is not case sensitive.
 
-Your document does not need to have a @code{\DeclareGraphicsExtensions}
-declaration; the printer driver has a sensible default.  For example,
+You are not required to include @code{\DeclareGraphicsExtensions} in
+your document; the printer driver has a sensible default.  For example,
 the most recent @file{pdftex.def} has the extension list
 @samp{@code{.png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,.PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2}}.
 
@@ -10757,8 +10760,7 @@
 \DeclareGraphicsRule@{@var{extension}@}@{@var{type}@}@{@var{size-file extension}@}@{@var{command}@}
 @end example
 
-Declare how to handle graphic files whose names end in the extension
- at var{ext}.
+Declare how to handle graphic files whose names end in @var{extension}.
 
 This example declares that all files with names have the form
 @file{filename-without-dot.mps} will be treated as output from MetaPost,
@@ -10782,7 +10784,7 @@
 This describes the four arguments.
 
 @table @var
- at item ext
+ at item extension
 The file extension to which this rule applies. The extension is anything
 after and including the first dot in the filename.  Use the Kleene star,
 @code{*}, to denote the default behaviour for all undeclared extensions.
@@ -10828,8 +10830,6 @@
 modern systems restrict running commands unless you explicitly allow it.
 See the documentation for your @TeX{} distribution.
 
- at c xx Discuss restricted execution
-
 @end table
 
 @node Commands for graphics
@@ -10954,14 +10954,13 @@
                                 \setbox0=\hbox@{#1@}\parbox@{\wd0@}@{\box0@}\endgroup@}
   ...
 \begin@{center@}
-\vcenteredhbox@{
-  \includegraphics[width=0.4\textwidth]@{plot@}@}
-\hspace@{1em@}
-\vcenteredhbox@{\begin@{minipage@}@{0.4\textwidth@}
-                 \begin@{displaymath@}
-                   f(x)=(1/x)\cdot \sin (1/x)
-                 \end@{displaymath@}
-               \end@{minipage@}@}
+  \vcenteredhbox@{\includegraphics[width=0.4\textwidth]@{plot@}@}
+  \hspace@{1em@}
+  \vcenteredhbox@{\begin@{minipage@}@{0.4\textwidth@}
+                   \begin@{displaymath@}
+                     f(x)=x\cdot \sin (1/x)
+                   \end@{displaymath@}
+                 \end@{minipage@}@}
 \end@{center@}
 @end example
 
@@ -10979,10 +10978,7 @@
 tall and so its origin is at (0,0).
 
 The @file{graphicx} package gives you many more options.  Specify them
-in a key-value form, as here.  The options are read left-to-right. So
-the first graphic below is made one inch wide and then rotated, while
-the second is rotated and then made one inch wide.  Thus, unless the
-graphic is perfectly square, the two will be different sizes.
+in a key-value form, as here.
 
 @example
 \begin@{center@}
@@ -10992,6 +10988,11 @@
 \end@{center@}
 @end example
 
+The options are read left-to-right. So the first graphic above is made
+one inch wide and then rotated, while the second is rotated and then
+made one inch wide.  Thus, unless the graphic is perfectly square, the
+two will end with different widths and heights.
+
 There are many options.  The primary ones are listed first.
 
 Note that a graphic is placed by @LaTeX{} into a box, which is
@@ -11028,11 +11029,11 @@
 
 @item keepaspectratio
 If set to @code{true}, or just specified as with
- at code{\includegraphics[...,keepaspectratio,...]@{...@}}, then if you
-give as options both @code{width} and @code{height} (or
- at code{totalheight}) then @LaTeX{} will make the graphic is as large as
-possible without distortion. That is, @LaTeX{} will ensure that neither
-is the graphic wider than @code{width} nor taller than @code{height} (or
+ at code{\includegraphics[...,keepaspectratio,...]@{...@}} and you give as
+options both @code{width} and @code{height} (or @code{totalheight}),
+then @LaTeX{} will make the graphic is as large as possible without
+distortion. That is, @LaTeX{} will ensure that neither is the graphic
+wider than @code{width} nor taller than @code{height} (or
 @code{totalheight}).
 
 @item scale
@@ -11071,8 +11072,9 @@
 Pick out a subregion of the graphic to show.  Takes four arguments,
 separated by spaces and given in @TeX{} dimensions, as with
 @code{\includegraphics[.., viewport=0in 0in 1in 0.618in]@{...@}}.  The
-dimensions default to big points.  They are taken relative to the origin
-specified by the bounding box.  See also the @code{trim} option.
+dimensions default to big points, at tie{}@code{bp}.  They are taken
+relative to the origin specified by the bounding box.  See also the
+ at code{trim} option.
 
 @item trim
 Gives parts of the graphic to not show.  Takes four arguments, separated
@@ -11091,7 +11093,7 @@
 @code{\includegraphics*[...]@{...@}}.
 
 @item page
-Give the page number of a multi-page PDF file.  The default
+Give the page number of a multi-page PDF file.  The default is
 @code{page=1}.
 
 @item pagebox
@@ -11147,8 +11149,8 @@
 to change it.
 
 @item bbllx, bblly, bburx, bbury
-Set the bounding box.  (These four are obsolete, but are retained for
-compatibility with old packages.)
+Set the bounding box.  These four are obsolete, but are retained for
+compatibility with old packages.
 
 @item natwidth, natheight
 An alternative for @code{bb}.  Setting
@@ -11231,9 +11233,6 @@
   \rotatebox[origin=c]@{45@}@{\includegraphics[width=1in]@{lion@}@}
 @end example
 
-You can get the same effect using the @file{graphicx} package alone
-(@pxref{\includegraphics}).
-
 To place the rotated material, the first step is that @LaTeX{} sets
 @var{material} in a box, with a reference point on the left baseline.
 The second step is the rotation, by default about the reference point.
@@ -11245,8 +11244,10 @@
 typesetting this material.
 
 If you use the @file{graphics} package then the rotation is about the
-reference point of the box.  If you use @file{graphicx} then these are
-the options that can go in the @var{key-value list}.
+reference point of the box.  If you use the @file{graphicx} package then
+then these are the options that can go in the @var{key-value list}, but
+note that you can get the same effect without needing this package,
+except for the @code{x} and @code{y} options (@pxref{\includegraphics}).
 
 @table @code
 @item origin

Index: trunk/makedist.sh
===================================================================
--- trunk/makedist.sh	2018-03-16 14:47:28 UTC (rev 612)
+++ trunk/makedist.sh	2018-03-21 18:48:08 UTC (rev 613)

Property changes on: trunk/makedist.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property


More information about the latexrefman-commits mailing list