latex4wp (4may11)

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

7 files changed, 298 insertions, 190 deletions

diff --git a/Master/texmf-dist/doc/latex/latex4wp/HOW-TO-TYPESET b/Master/texmf-dist/doc/latex/latex4wp/HOW-TO-TYPESET
new file mode 100644
index 00000000000..fd703af77ef
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4wp/HOW-TO-TYPESET
@@ -0,0 +1,3 @@
+Convert this document with pdflatex. Unfortunately, epic and eepix
+clash with the url or hyperref packages over the \path command when plain
+latex is used.
diff --git a/Master/texmf-dist/doc/latex/latex4wp/README b/Master/texmf-dist/doc/latex/latex4wp/README
index fd703af77ef..f92415dce3e 100644
--- a/Master/texmf-dist/doc/latex/latex4wp/README
+++ b/Master/texmf-dist/doc/latex/latex4wp/README
@@ -1,3 +1,6 @@
-Convert this document with pdflatex. Unfortunately, epic and eepix
-clash with the url or hyperref packages over the \path command when plain
-latex is used.
+LaTeX4WP: A LaTeX guide specifically designed for word processor
+users.
+
+“LaTeX for Word Processor Users” is a guide that helps converting
+knowledge and techniques of word processing into the LaTeX typesetting
+environment. It aims at helping WP users use LaTeX instead.
diff --git a/Master/texmf-dist/doc/latex/latex4wp/TODO b/Master/texmf-dist/doc/latex/latex4wp/TODO
deleted file mode 100644
index bfe5436f8b7..00000000000
--- a/Master/texmf-dist/doc/latex/latex4wp/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- bibtex?
diff --git a/Master/texmf-dist/doc/latex/latex4wp/latex4wp.pdf b/Master/texmf-dist/doc/latex/latex4wp/latex4wp.pdf
index 1bc19d8a527..1bef29ed7d7 100644
--- a/Master/texmf-dist/doc/latex/latex4wp/latex4wp.pdf
+++ b/Master/texmf-dist/doc/latex/latex4wp/latex4wp.pdf
diff --git a/Master/texmf-dist/doc/latex/latex4wp/latex4wp.tex b/Master/texmf-dist/doc/latex/latex4wp/latex4wp.tex
index 0c097c306e2..03a6caf796d 100644
--- a/Master/texmf-dist/doc/latex/latex4wp/latex4wp.tex
+++ b/Master/texmf-dist/doc/latex/latex4wp/latex4wp.tex
@@ -1,14 +1,14 @@
 % latex4wp.tex		-*- LaTeX -*-
 %
 % LaTeX for Word Processor Users
-% by Guido Gonzato, guido dot gonzato at poste dot it
+% by Guido Gonzato, guido.gonzato (at) univr.it
 %
 % This document was written with the Jed editor,
 % http://www.jedsoft.org/jed, and the new LaTeX mode
 % available from CTAN mirrors, e.g.
 % http://www.ctan.org/tex-archive/support/jed
 %
-% Last updated: September 14, 2010
+% Last updated: May 4, 2011
 
 % debug
 % \overfullrule=15pt
@@ -49,10 +49,11 @@
 \usepackage[normalem]{ulem} % underline styles
 \usepackage{slashbox}  % slashed box in tables
 \usepackage{paralist}  % paragraph lists
+\usepackage[version=3]{mhchem} % chemical formulae
 
 % --- Definitions and new commands ---
 
-\def\version {1.0.7}
+\def\version {1.0.8}
 \def\bs      {\textbackslash}
 \def\unix    {\textsc{Unix}}
 % \def\warning {\marginpar{\Huge{\textcolor{red}{\Stopsign}}}}
@@ -127,6 +128,9 @@
 \newcommand{\style}[1]
 {\texttt{#1}}
 
+\newcommand{\ltx}[1]
+{\texttt{#1}}
+
 % --- end of definitions and new commands ---
 % ok, let's start
 
@@ -196,8 +200,8 @@ thesis fit on a single CP/M-bootable 720K floppy, with lots of room to
 spare!} buggy, crash-prone, expensive, virus ridden, and incompatible
 with each other. Not to talk about their default output quality.
 
-\LaTeX{} is a good alternative; but if you try to write casual,
-unstructured documents, it will rightly stand in the way.
+\LaTeX{} is a good alternative; but it's not much intuitive for those
+accustomed to WYSIWYG, 
 
 To sum up, sometimes you may want to use word processor-like
 features---but using \LaTeX. It would be nice to know how to obtain
@@ -212,9 +216,7 @@ Short Introduction to \LaTeX2e{}'. Another good primer is
 
 In the following sections, we shall navigate through the menus and
 menu items of an imaginary word processor, finding out the
-corresponding \LaTeX{} way of doing the same work. If you're a
-\LaTeX{} purist and this approach makes you sick{\ldots} don't hurt
-yourself, please stop here.
+corresponding \LaTeX{} way of doing the same work.
 
 % -----
 
@@ -236,13 +238,12 @@ already mentioned \url{http://www.ctan.org}; this site has a wide list
 of mirrors. From now on, \href{http://www.ctan.org}{CTAN:} means `your
 favourite CTAN mirror here, starting from the \TeX{} directory'. For
 instance, you can get \LaTeX{} for your platform from
-\href{http://www.tex.ac.uk/tex-archive/systems}{CTAN://systems} (e.g.\
+\href{http://www.tex.ac.uk/tex-archive/systems}{CTAN://systems} (e.g.,
 \url{http://www.tex.ac.uk/tex-archive/systems/}).
 
 To write your documents, you will need a good text editor. A better
-choice for beginners is a \emph{\LaTeX{} shell}, i.e.\ an editor
-dedicated to writing \LaTeX{} source, with preview and many
-facilities.
+choice for beginners is a \emph{\LaTeX{} shell}: an editor dedicated
+to writing \LaTeX{} source, with preview and many facilities.
 
 I suggest that you install one of the programs listed below; all of
 them are Free/Open Source software.
@@ -355,8 +356,11 @@ no first-hand experience. Instructions for MiK\TeX{} (probably the
 most popular implementation for Windows) will follow below.
 
 A large collection of \LaTeX{} packages is natively supported; for
-instance, Ubuntu provides lots of \app{texlive-*} packages. If you
-need to install an unsupported package, do the following.
+instance, Ubuntu provides lots of \app{texlive-*} packages. Please
+note the ambiguity: we're talking of \texttt{.deb} \emph{packages}
+containing \LaTeX{} \emph{packages}.
+
+If you need to install an unsupported package, do the following.
 
 \begin{enumerate}
 
@@ -382,7 +386,7 @@ need to install an unsupported package, do the following.
   \item If no \texttt{.sty} file exists, run the command
   \texttt{latex foo.ins} or \texttt{latex foo.dtx} to create it;
   
-  \item run the command \cmdline{texhash ~/texmf}.
+  \item run the command \cmdline{texhash \~{}/texmf}.
     
 \end{enumerate}
 
@@ -419,13 +423,12 @@ Before we start, please keep this in mind:
 
 \end{enumerate}
 
-Convince yourself, apply the rules, and your printed material will
-magically look professional! Again, let me recommend that you study a
-real \LaTeX{} primer.
+Applying these simple rules, your printed material will magically look
+professional.
 
-These rules apply to most documents. However, if the stuff you are
-going to write is largely unstructured (circulars, notices, etc.),
-then you asked for that: go ahead and read the rest of this guide.
+That said, this guide will help you overcome the second rule. So, you
+will also be able to compose unstructured material such as circulars,
+notices, poster, etc.
 
 \bigskip
 {\color{blue} \dingline{45}}
@@ -451,6 +454,7 @@ This is the \LaTeX{} equivalent of a blank page:
 
 \begin{Verbatim}[fontsize=\small]
 \documentclass{article}
+\thispagestyle{empty} % no page number
 \begin{document}
 % This is a comment. Write your stuff here.
 \end{document}
@@ -588,7 +592,8 @@ example,
 \documentclass[a5paper,landscape,12pt]{article}
 \end{Verbatim}
 
-Document-wide margins are set with these commands:
+Document-wide margins are set with the \cmd{setlength} command, which
+is used to change the value of variables and counters:
 
 \begin{Verbatim}[fontsize=\small]
 \setlength{\leftmargin}{2cm}
@@ -726,8 +731,6 @@ Section~\ref{sec:figure}.
 Simply use \cmdline{lpr file.ps} from the command line, or via the
 \entry{File}{Print} menu entry of your previewer.
 
-% TO DO: print the LaTeX source, pretty-formatted
-
 % -----
 
 % FILE/VERSIONS
@@ -843,14 +846,20 @@ environment, you can specify it as an argument to \cmd{item}:
 \end{itemize}
 \end{example}
 
-Another way is to redefine the style of the counters that refer to the
-digits in the first- to fourth-level lists.\footnote{These are
-\cmd{labelitemi}, \cmd{labelitemii}, \cmd{labelitemiii} and
-\cmd{labelitemiv}.} There are several styles: \cmd{arabic} for
-`normal' numbers, \cmd{roman} for lower-case roman numerals (e.g. viii
-is 8), \cmd{Roman} for upper-case roman numerals, \cmd{alph} and
-\cmd{Alph} for lower- and upper-case letters, and \cmd{fnsymbol} that
-I will not explain for now:
+Another way is to redefine the style of the
+\emph{counters}\footnote{each text element numbered by \LaTeX{}
+(sections, lists, figures, etc.) has a counter associated with it.}
+hat refer to the digits in the first- to fourth-level lists. These
+counters are \cmd{labelitemi}, \cmd{labelitemii}, \cmd{labelitemiii}
+and \cmd{labelitemiv} for itemised lists; \cmd{labelenumi},
+\cmd{labelenumii}, \cmd{labelenumiii} and \cmd{labelenumiv} for
+enumerated lists.
+
+There are several styles: \cmd{arabic} for `normal' numbers,
+\cmd{roman} for lower-case roman numerals (e.g., viii is 8),
+\cmd{Roman} for upper-case roman numerals, \cmd{alph} and \cmd{Alph}
+for lower- and upper-case letters, and \cmd{fnsymbol} that I will not
+explain for now:
 
 \begin{example}
 \begin{itemize}
@@ -901,6 +910,18 @@ include some text, enclose it in braces:
 \end{enumerate}
 \end{example}
 
+To change the number of an enumerated item, just redefine its counter:
+
+\begin{example}
+\begin{enumerate}
+  \setcounter{enumi}{2}
+  \item Example 3.
+  \item Example 4.
+  \setcounter{enumi}{5}
+  \item Example 6.
+\end{enumerate}
+\end{example}
+
 Lists within paragraphs are implemented by the \package{paralist}
 package, which provides the \env{inparaenum} environment:
 
@@ -1232,6 +1253,8 @@ document:
 \listoftables
 \end{Verbatim}
 
+% TO DO: \renewcommand{\contentsname}{Table of Contents}
+
 % TO DO: how to customise the table of contents.
 
 % The table of contents can be customised. 
@@ -1267,9 +1290,9 @@ four \hfill five
 \null
 \end{example}
 
-Normally, \LaTeX{} won't let you insert blank spaces at your will.
-However, if you do want to make your document look messy, use \verb|~|
-to make a non-breakable space.
+Normally, \LaTeX{} won't let you insert blank spaces at your will: two
+or more are considered a single space. However, if you do want to make
+your document look messy, use \verb|~| to make a non-breakable space.
 
 Also, use the command \cmd{hspace} like in this example:
 
@@ -1285,7 +1308,26 @@ This is a \hspace{2cm}
 \subsection{\entry{Insert}{Tabs}}
 
 The \env{tabbing} environment provides a rough equivalent to the
-action of the TAB key. See this example:
+action of the TAB key, and it's used to align text in columns. These
+are the most commonly used commands:
+
+\begin{center}
+  \begin{tabular}{ll}
+    \hline
+    \textbf{Command} & \textbf{Action} \\
+    \hline
+    \verb|\=| & Sets a tab stop \\
+    \verb|\>| & Advances to the next tab stop \\
+    \verb|\+| & Sets the left margin one tab stop to the right \\
+    \verb|\-| & Sets the left margin one tab stop to the left \\
+    \verb|\\| & Ends a line \\
+    \verb|\pushtabs| & Saves all tab stop positions \\
+    \verb|\poptabs| & Restores previously saved tab stop positions \\
+    \hline
+  \end{tabular}
+\end{center}
+
+This example shows some of the available commands:
 
 \begin{example}
 \begin{tabbing}
@@ -1328,7 +1370,7 @@ obtained using \cmd{label} and \cmd{ref} as in this example:
 \label{par:example}
 This paragraph appears
 in Section~\ref{par:example}
-on page \pageref{par:example}.
+on page~\pageref{par:example}.
 \end{example}
 
 Of course, you may use your own prefixes. For example, take this
@@ -1356,27 +1398,44 @@ Very simple: use \verb|\marginpar{text}|.
 
 % INSERT/FRAME
 
-\subsection{\entry{Insert}{Frame}}
+\subsection{\entry{Insert}{Text Frame}}
 
-Let's imagine you want to typeset a poster or a sign: you'll need a
-way to put text and figures on fixed position on the page. Use the
-\package{textpos} package, as shown in the example listed in
+A text frame is used to define a part of text that does not break
+across pages. To place a text frame on a fixed position on the page,
+use the \package{textpos} package, as shown in the example listed in
 Figure~\ref{fig:poster} (see Appendix~\ref{ap:templates}).
 
-\medskip
+\setlength{\fboxsep}{5mm}
 
-\begin{boxedminipage}[c]{0.6\linewidth}
-A simpler approach is using \emph{minipages}: literally, miniature pages.
-This text is included in a \texttt{minipage} environment. Actually, to be
-more precise, a \texttt{boxedminipage}, courtesy of the
-\package{boxedminipage} package. I used this declaration:
-\begin{verbatim}
-\begin{boxedminipage}[c]{0.6\linewidth}
-... text ...
+\begin{center}
+  \begin{minipage}[c]{0.4\linewidth}
+    If you don't need to specify a fixed position, then use the
+    \env{minipage} (miniature page) environment. This text is enclosed
+    in a minipage{\ldots}
+  \end{minipage}
+  \begin{boxedminipage}[c]{0.4\linewidth}
+    {\ldots}and this is some other text enclosed in a
+    \env{boxedminipage} environment, provided by the package of same
+    name.
 \end{boxedminipage}
+\end{center}
+
+\setlength{\fboxsep}{3pt} % default
+
+I remind you what a \env{minipage} declaration looks like:
+
+\begin{verbatim}
+\begin{minipage}[position]{width}
+...
+\end{minipage}
 \end{verbatim}
-\end{boxedminipage}
 
+In a \env{boxedminipage}, the space between the frame and the text is
+set with this command:
+
+\begin{verbatim}
+\setlength{\fboxsep}{5mm}
+\end{verbatim}
 
 % -----
 
@@ -1426,7 +1485,8 @@ above'; rather, use `\verb|see Figure~\ref{fig:label}|'.
 
 Owing to this property, figures and tables are called \emph{floats}.
 If you do need to position a float exactly, use the \package{here}
-package that provides an optional placement argument \texttt{H}.
+package that provides an optional placement argument \texttt{H}
+(meaning, ``right HERE!'').
 
 Given a picture in Encapsulated \PS{} (\texttt{.eps}) format, you
 insert it in a \LaTeX{} source file using the \package{graphicx}
@@ -1471,6 +1531,8 @@ example, ImageMagik (\url{http://www.imagemagik.org}) and The GIMP
 (\url{http://www.gimp.org}). However, these applications produce huge
 \PS{} files.
 
+TO DO: explications here
+
 Best results are obtained using applications that wrap the bitmap,
 turning it into a compact \PS{} file. You'll want to use \app{jpeg2ps}
 (\url{http://www.pdflib.com/jpeg2ps/index.html}) or \app{bmeps}
@@ -1479,13 +1541,12 @@ turning it into a compact \PS{} file. You'll want to use \app{jpeg2ps}
 wrapping \file{.jpg} files, but the latter handles more graphics
 formats.
 
-\begin{warn}
-
-  If you use PDF\LaTeX{}, you must convert your pictures to
-  \file{.pdf} with the command \app{epstopdf} and modify the source
-  accordingly! 
-
-\end{warn}
+% NONSENSE:
+% \begin{warn}
+%   If you use PDF\LaTeX{}, you must convert your pictures to
+%   \file{.pdf} with the command \app{epstopdf} and modify the source
+%   accordingly! 
+% \end{warn}
 
 If you wish to make both \file{.pdf} and \file{.ps} from the same
 source file, include these commands:
@@ -1503,7 +1564,7 @@ source file, include these commands:
 ...
 % include the right graphic file
 \ifpdf
-  \includegraphics{file.pdf}
+  \includegraphics{file.png}
 \else
   \includegraphics{file.eps}
 \fi
@@ -1554,8 +1615,8 @@ placement, the overhang, and the figure width.
 commands like \cmd{circle}, \cmd{oval} and so on. In my opinion,
 drawing pictures without a graphical environment is just too hard, and
 \env{picture} has several limitations too. It's much better to use the
-drawing program Xfig (\url{http://www.xfig.org}), only available for
-\unix. It has a couple of good tricks in store.
+vector drawing program Xfig (\url{http://www.xfig.org}), only
+available for \unix. It has a couple of good tricks in store.
 
 \medskip
 
@@ -1635,15 +1696,29 @@ There's a caveat though: it looks like \package{epic} and
 command is redefined by the latter. Another good reason to use
 \cmdline{pdflatex}.
 
-If you wish to do real magic, then check out the \package{pgf}
-package, \url{http://sourceforge.net/projects/pgf/}. Or 
-\package{pstricks}: \url{http://tug.org/PSTricks/main.cgi/}. These
-packages let you make fine \PS{} drawings in \LaTeX. Another wonderful
-program is ePiX
-(\url{http://mathcs.holycross.edu/~ahwang/current/ePiX.html}),
-specialised in producing scientific plots and figures for inclusion in
-\LaTeX{} documents. Many more are available; search the web for
-``LaTeX vector graphics''.
+If you wish to do real magic, then check out one of the following
+programs:
+
+\begin{itemize}
+  
+  \item \package{pgf}, Portable Graphic Format:
+  \url{http://sourceforge.net/projects/pgf/}
+  
+  \item Asymptote, The Vector Graphics Language:
+  \url{http://asymptote.sourceforge.net/}
+  
+  \item ePiX creates mathematically accurate figures:
+  \url{http://mathcs.holycross.edu/~ahwang/current/ePiX.html};
+  
+  \item \package{pstricks} is a set of macros that allow the inclusion
+  of PostScript drawings in \LaTeX{} documents:
+  \url{http://tug.org/PSTricks/main.cgi/}
+  
+\end{itemize}
+
+These packages let you make publication-quality \PS{} drawings in
+\LaTeX. Many more are available; search the web for ``LaTeX vector
+graphics''.
 
 % -----
 
@@ -1676,11 +1751,10 @@ Total price \dotfill \euro~10
 \subsection{\entry{Insert}{Hyperlink}}
 \label{sec:hyperlink}
 
-The \package{url} package lets you write URLs and have them hyphenated
-correctly. When used together with the package \package{hyperref} and
-\app{dvipdf} or \app{pdflatex}, \package{url} lets you make browseable
-\file{.pdf} documents! For instance, this document uses this
-declaration:
+The \package{hyperref} package lets you write URLs and other external
+references. When used together with \app{dvipdf} or \app{pdflatex},
+\package{hyperref} lets you make browseable \file{.pdf} documents! For
+instance, this document uses this declaration:
 
 \begin{Verbatim}[fontsize=\small]
 \usepackage[colorlinks,urlcolor=blue,filecolor=magenta]{hyperref}
@@ -1822,7 +1896,7 @@ Please note the difference between italics and emphasised text.
 \emph{these words} are emphasised in upright}. As you can see,
 \cmd{emph} is a \emph{logical} rather than typographic command.
 
-Also, please note that underscript is normally used in math mode only.
+Also, please note that subscript is normally used in math mode only.
 The trick to use it in normal text is:
 
 \begin{example}
@@ -1854,6 +1928,23 @@ $_{\mbox{\footnotesize{subscript}}}$
 
 % -----
 
+\subsubsection{Superscript and Subscript in Chemical Formulae}
+
+Most chemical formulae could be entered as math formulae, using
+\verb|^| and \verb|_| to obtain superscript and subscript. The
+\env{mhchem} package provides a simpler command, though. Digits are
+printed as subscripts by default, as superscript when preceded by
+\verb|^|. Formulae must be enclosed in the \cmd{ce} command:
+
+\begin{example}
+\ce{H2O + CO2 -> H2CO3}\\
+\ce{CaCO3 -> Ca^2+ + CO3^2-}\\
+\ce{CO3^2- + H2CO3 -> 2 HCO3^-}\\
+\ce{CaCO3 + H2CO3 -> Ca^2+ + 2HCO3^-}
+\end{example}
+
+% -----
+
 \subsubsection{Underline styles}
 
 Normally, \uline{underline} is not used. It's just a relic of the old
@@ -1917,10 +2008,10 @@ Parameters are font size and baseline. Yet another approach is this:
 
 \subsubsection{\entry{Format}{Character Font}}
 
-\LaTeX{} uses its own fonts, automatically generated when needed by
-the \MF{} subsystem. This ensures portability and yields very good
-results. However, many of us are accustomed to other fonts: Times,
-Helvetica, Sans Serif{\ldots}
+\LaTeX{} uses its own fonts (Computer Modern), automatically generated
+when needed by the \MF{} subsystem. This ensures portability and
+yields very good results. However, many of us are accustomed to other
+fonts: Times, Helvetica, Sans Serif{\ldots}
 
 Fortunately, \LaTeX{} can use \PS{} fonts. Try using one of the
 following packages: \package{avant}, \package{avangar},
@@ -2041,7 +2132,7 @@ what?
 
 \subsection{\entry{Format}{Paragraph}}
 
-Let's remind what a paragraph is according to \LaTeX{}: a portion of
+Let's remind what a paragraph is according to \LaTeX: a portion of
 text that either ends with \verb|\\|, or is followed by a blank line.
 
 \emph{Environments} are \LaTeX{}'s way of specifying properties like
@@ -2075,30 +2166,34 @@ following sections, I'll show you what to use and when.
 \begin{tabular}{ll} \hline
 \textbf{Environment} & \textbf{Purpose} \\
 \hline
-\verb|array| & Math arrays \\
-\verb|center| & Centered lines \\
-\verb|description| & Labelled lists \\
-\verb|enumerate| & Numbered lists \\
-\verb|eqnarray| & Sequence of aligned equations \\
-\verb|equation| & Displayed equation \\
-\verb|figure| & Floating figures \\
-\verb|flushleft| & Flushed left lines \\
-\verb|flushright| & Flushed right lines \\
-\verb|itemize| & Bulleted lists \\
-\verb|letter| & Letters \\
-\verb|list| & Generic list environment \\
-\verb|minipage| & Miniature page \\
-\verb|picture| & Picture with text, arrows, lines and circles \\
-\verb|quotation| & Indented environment with paragraph indentation \\
-\verb|quote| & Indented environment with no paragraph indentation \\
-\verb|tabbing| & Align text arbitrarily \\
-\verb|table| & Floating tables \\
-\verb|tabular| & Align text in columns \\
-\verb|thebibliography| & Bibliography or reference list \\
-\verb|theorem| & Theorems, lemmas, etc \\
-\verb|titlepage| & For hand crafted title pages \\
-\verb|verbatim| & Simulating typed input \\
-\verb|verse| & For poetry and other things \\
+\ltx{abstract} & abstract\\
+\ltx{array} & Math arrays\\
+\ltx{center} & Centered lines\\
+\ltx{description} & Labelled lists\\
+\ltx{displaymath} & Formulas on their own line\\
+\ltx{document} & Encloses the whole document\\
+\ltx{enumerate} & Numbered lists\\
+\ltx{eqnarray} & Sequence of aligned equations\\
+\ltx{equation} & Displayed equation\\
+\ltx{figure} & Floating figures\\
+\ltx{flushleft} & Flushed left lines\\
+\ltx{flushright} & Flushed right lines\\
+\ltx{itemize} & Bulleted lists\\
+\ltx{letter} & Letters\\
+\ltx{list} & Generic list environment\\
+\ltx{math} & In-line math\\
+\ltx{minipage} & Miniature page\\
+\ltx{picture} & Picture with text, arrows, lines and circles\\
+\ltx{quotation} & Indented environment with paragraph indentation\\
+\ltx{quote} & Indented environment with no paragraph indentation\\
+\ltx{tabbing} & Align text arbitrarily\\
+\ltx{table} & Floating tables\\
+\ltx{tabular} & Align text in columns\\
+\ltx{thebibliography} & Bibliography or reference list\\
+\ltx{theorem} & Theorems, lemmas, etc\\
+\ltx{titlepage} & For hand crafted title pages\\
+\ltx{verbatim} & Simulating typed input\\
+\ltx{verse} & For poetry and other things\\
 \hline
 \end{tabular}
 \caption{Standard \LaTeX{} environments.}
@@ -2110,7 +2205,7 @@ following sections, I'll show you what to use and when.
 
 % FORMAT/PARAGRAPH HORIZONTAL ALIGNMENT
 
-\subsubsection{\entry{Format}{Paragraph Horizontal Alignment}}
+\subsubsection{\entry{Paragraph}{Horizontal Alignment}}
 
 By default, the text is justified. To get left--aligned,
 right--aligned or centered text, use the \env{flushleft},
@@ -2123,13 +2218,14 @@ a new paragraph.
 
 % FORMAT/PARAGRAPH VERTICAL ALIGNMENT
 
-\subsubsection{\entry{Format}{Paragraph Vertical Alignment}}
+\subsubsection{\entry{Paragraph}{Vertical Alignment}}
 
 The way paragraphs are separated is often puzzling to word processor
 users.  \emph{Empty lines and multiple spaces are treated like a
-single empty line or space}. The commands \cmd{smallskip},
-\cmd{medskip}, and \cmd{bigskip} provide some space between
-paragraphs.
+single empty line or space}. This means that you can't get more space
+between paragraphs inserting more empty lines. The commands
+\cmd{smallskip}, \cmd{medskip}, and \cmd{bigskip} provide some space
+between paragraphs.
 
 If you need more space, use the command
 \cmd{vskip}\{\textit{parameter}\} as in this example:
@@ -2178,7 +2274,7 @@ of the page. For example,
 
 % FORMAT/PARAGRAPH MARGINS
 
-\subsubsection{\entry{Format}{Paragraph Margins}}
+\subsubsection{\entry{Paragraph}{Margins}}
 
 Normally, the margins are set for the whole document as seen in
 Section~\ref{sec:pagesetup}. Redefining them for a section of text
@@ -2210,11 +2306,11 @@ has normal margins.
 
 % FORMAT/PARAGRAPH INDENTATION
 
-\subsubsection{\entry{Format}{Paragraph Indentation}}
+\subsubsection{\entry{Paragraph}{Indentation}}
 
-To set the amount of indentation of the first line of a paragraph, use
-the command \cmd{parindent}. In the following example, we set a 1-cm
-indentation:
+To set the amount of indentation of the first line of a paragraph, we
+redefine the value of the \cmd{parindent} counter. In the following
+example, we set a 1-cm indentation:
 
 \begin{Verbatim}[fontsize=\small]
 \setlength{\parindent}{1cm}
@@ -2222,7 +2318,7 @@ indentation:
 
 The commands \cmd{indent} and \cmd{noindent} allow/disallow
 indentation on the following paragraph. Finally, the distance between
-paragraphs is set by \cmd{parskip}:
+paragraphs is set by the \cmd{parskip} counter:
 
 \begin{Verbatim}[fontsize=\small]
 \setlength{\parskip}{3pt}
@@ -2232,7 +2328,7 @@ paragraphs is set by \cmd{parskip}:
 
 % FORMAT/BORDER
 
-\subsection{\entry{Format}{Paragraph Border and Shade}}
+\subsubsection{\entry{Paragraph}{Border and Shade}}
 
 To get framed (bordered) paragraphs or words, you have the choice of
 using the \package{framed} package or the \cmd{parbox} command. The
@@ -2287,21 +2383,22 @@ named environment. For those who want to know more: the commands
 
 are functionally equivalent to the \env{boxedminipage} environment.
 
-This example uses \cmd{parbox}:
+% This example uses \cmd{parbox}:
 
-\begin{example}
-\noindent
-\fbox{
-  \parbox{\linewidth 
-    -2 \fboxsep -2 \fboxrule}
-  {again, a framed paragraph!}
-}
-\end{example}
+% \begin{example}
+% \noindent
+% \fbox{
+%   \parbox{\linewidth 
+%     -2 \fboxsep -2 \fboxrule}
+%   {again, a framed paragraph!}
+% }
+% \end{example}
 
-\cmd{linewidth} sets the width of the minipage equal to that of the
+\cmd{width} sets the width of the minipage equal to that of the
 remaining text. Obviously, you can specify the width as you like.
 
-Finally, to frame something adapting the frame to the width of the text:
+Finally, to frame something adapting the frame to the width of the
+text:
 
 \begin{example}
 this is a 
@@ -2324,7 +2421,7 @@ the right in this example).
 
 % FORMAT/COLOUR
 
-\subsection{\entry{Format}{Colour}}
+\subsubsection{\entry{Paragraph}{Colour}}
 
 Now that you have a bordered paragraph, you'll want to set its colour
 too. Do this:
@@ -2339,13 +2436,14 @@ too. Do this:
 }
 \end{example}
 
-More about colours in Section~\ref{sec:charcol}.
+Just as an example, we set the minipage colour for only the 80\% of
+its width. More about colours in Section~\ref{sec:charcol}.
 
 % -----
 
 % FORMAT/COLUMNS
 
-\subsection{\entry{Format}{Columns}}
+\subsubsection{\entry{Format}{Columns}}
 
 The commands \cmd{twocolumn} and \cmd{onecolumn} start a new page and
 set the number of columns; they can also be used as parameters in
@@ -2377,6 +2475,10 @@ usually contains a \env{tabular} environment, even though other
 possibilities exist. By default, a table adjusts its width to match
 the width of its contents.
 
+Let me stress that the \env{table} environment is a float, but
+\env{tabular} is not. Keep this in mind if you want to write informal
+tabular material, i.e. without label and caption.
+
 This is the general format of a table:
 
 \begin{Verbatim}[fontsize=\footnotesize]
@@ -2386,20 +2488,20 @@ This is the general format of a table:
 % 4-column table; alignment is left, centered, right, fixed width
 \begin{tabular}{|l|c|rp{4cm}|} 
 \hline              % horizontal line
-\textbf{Left} & \textbf{Centre} & \textbf{Right} & \textbf{4 cm} \\
+\textbf{Left} & \textbf{Centre} & \textbf{Right} & \textbf{4 cm}\\
 \hline
-row 1, col 1 & row 1, col 2 & row 1, col 3 & row 1, col 4 \\
+row 1, col 1 & row 1, col 2 & row 1, col 3 & row 1, col 4\\
 \cline{1-2}         % horizontal line spanning columns 1-2
-row 2, col 1 & row 2, col 2 & row 2, col 3 & row 2, col 4 \\
+row 2, col 1 & row 2, col 2 & row 2, col 3 & row 2, col 4\\
 \cline{1-2}
 \multicolumn{2}{|c|}{spanning two columns} & row 3, col 3 & 
-row 3, col 4 \\
+row 3, col 4\\
 \cline{1-3}
-row 4, col 1 & row 4, col 2 & row 4, col 3 & ~ \hfill right \\
+row 4, col 1 & row 4, col 2 & row 4, col 3 & ~ \hfill right\\
 % force a space with "\ "
-row 5, col 1 & row 5, col 2 & row 5, col 3 & left \hfill ~ \\
+row 5, col 1 & row 5, col 2 & row 5, col 3 & left \hfill ~\\
 row 5, col 1 & row 5, col 2 & row 5, col 3 & 
-~ \hfill centre \hfill ~ \\
+~ \hfill centre \hfill ~\\
 \hline
 \end{tabular}
 \caption{A sample table.}
@@ -2419,20 +2521,20 @@ Table~\ref{tab:sampletab} shows the result.
 % 4-column table; alignment is left, centered, right, fixed width
 \begin{tabular}{|l|c|rp{4cm}|} 
 \hline              % horizontal line
-\textbf{Left} & \textbf{Centre} & \textbf{Right} & \textbf{4 cm} \\
+\textbf{Left} & \textbf{Centre} & \textbf{Right} & \textbf{4 cm}\\
 \hline
-row 1, col 1 & row 1, col 2 & row 1, col 3 & row 1, col 4 \\
+row 1, col 1 & row 1, col 2 & row 1, col 3 & row 1, col 4\\
 \cline{1-2}         % horizontal line spanning columns 1-2
-row 2, col 1 & row 2, col 2 & row 2, col 3 & row 2, col 4 \\
+row 2, col 1 & row 2, col 2 & row 2, col 3 & row 2, col 4\\
 \cline{1-2}
 \multicolumn{2}{|c|}{spanning two columns} & row 3, col 3 & 
-row 3, col 4 \\
+row 3, col 4\\
 \cline{1-3}
-row 4, col 1 & row 4, col 2 & row 4, col 3 & ~ \hfill right \\
+row 4, col 1 & row 4, col 2 & row 4, col 3 & ~ \hfill right\\
 % force a space with "\ "
-row 5, col 1 & row 5, col 2 & row 5, col 3 & left \hfill ~ \\
+row 5, col 1 & row 5, col 2 & row 5, col 3 & left \hfill ~\\
 row 5, col 1 & row 5, col 2 & row 5, col 3 & 
-~ \hfill centre \hfill ~ \\
+~ \hfill centre \hfill ~\\
 \hline
 \end{tabular}
 \caption{A sample table.}
@@ -2456,28 +2558,28 @@ Here's an example:
 % \begin{example} will not work here
 \medskip
 
-\begin{minipage}[c]{0.6\textwidth}
+\begin{minipage}[c]{0.7\textwidth}
   \begin{Verbatim}[fontsize=\small]
   \begin{sidewaystable}
     \begin{tabularx}{7.5cm}{|l|X|X|}
       \hline
       \textbf{normal} & \textbf{tilted} & 
-      \textbf{wider} \\
+      \textbf{wider}\\
       \hline
       normal & \rotatebox{30}{I'm tilted!} & 
-      I'm wider \\
+      I'm wider\\
       \hline
     \end{tabularx}
   \end{sidewaystable}
 \end{Verbatim}
 \end{minipage}%
-\begin{minipage}[c]{0.4\textwidth}
+\begin{minipage}[c]{0.3\textwidth}
 % here we cheat. Tabularx won't work inside a minipage,
 % so let's load the picture.
 \ifpdf
-  \includegraphics[width=0.9\textwidth]{tbx.pdf}
+  \includegraphics{tbx.pdf}
 \else
-  \includegraphics[width=0.9\textwidth]{tbx.eps}
+  \includegraphics{tbx.eps}
 \fi
 
 \end{minipage}
@@ -2531,7 +2633,7 @@ cell range into a \LaTeX{} table. Links:
 
 % -----
 
-\subsection{Line Spacing}
+\subsection{\entry{Table}{Line Spacing}}
 
 A line adjusts itself to the height of the text it contains. To add
 some space \emph{before} a line, the trick is to start it with a
@@ -2554,7 +2656,7 @@ one & two & three\\
 
 % -----
 
-\subsection{Rule Width}
+\subsection{\entry{Table}{Rule Width}}
 
 % TO DO: \setlength{\arrayrulewidth}{<width>}
 
@@ -2572,12 +2674,12 @@ four & five & six\\
 
 % -----
 
-\subsection{Aligning Numbers}
+\subsection{\entry{Table}{Aligning Numbers}}
 
 A special case of a tabular environment is when we want to align
 numbers with respect to the decimal positions. 
 
-The simplest method is using the \texttt{@} column specifier, which in
+The simplest method is using the \ltx{@} column specifier, which in
 practice is useful in tables containing only numbers. The column
 separator \texttt{\&} is replaced by the decimal dot:
 
@@ -2611,11 +2713,11 @@ you'll have to put the text in an \cmd{mbox}.
   D{.}{.}{5}|D{.}{.}{-1}|}
   \hline
   \mbox{One} & \mbox{Two} &
-  \mbox{Three} \\
-  10.33 & 10.33 & 10.33 \\
-  1000 & 1000 & 1000 \\
-  5.1 & 5.1 & 5.1 \\
-  3.14 & 3.14159 & 3.14159 \\
+  \mbox{Three}\\
+  10.33 & 10.33 & 10.33\\
+  1000 & 1000 & 1000\\
+  5.1 & 5.1 & 5.1\\
+  3.14 & 3.14159 & 3.14159\\
   \hline
   \end{tabular}
   \end{Verbatim}
@@ -2625,11 +2727,11 @@ you'll have to put the text in an \cmd{mbox}.
 D{.}{.}{5}|D{.}{.}{-1}|}
 \hline
 \mbox{One} & \mbox{Two} &
-\mbox{Three} \\
-10.33 & 10.33 & 10.33 \\
-1000 & 1000 & 1000 \\
-5.1 & 5.1 & 5.1 \\
-3.14 & 3.14159 & 3.14159 \\
+\mbox{Three}\\
+10.33 & 10.33 & 10.33\\
+1000 & 1000 & 1000\\
+5.1 & 5.1 & 5.1\\
+3.14 & 3.14159 & 3.14159\\
 \hline
 \end{tabular}
 \end{minipage}
@@ -2647,11 +2749,11 @@ This package add the \cmd{backslashbox} command:
 \begin{tabular}{|l|l|l|}
   \hline
   \backslashbox[2cm]{Lesson}{Date} & 
-  Monday & Tuesday \\
+  Monday & Tuesday\\
   \hline
-  Stratigraphy & room A & room A \\
-  Chemistry & room B & Lab $\alpha$ \\
-  Physics & room C & Lab $\beta$ \\
+  Stratigraphy & room A & room A\\
+  Chemistry & room B & Lab $\alpha$\\
+  Physics & room C & Lab $\beta$\\
   \hline
 \end{tabular}
 \end{Verbatim}
@@ -2660,11 +2762,11 @@ This package add the \cmd{backslashbox} command:
 \begin{tabular}{|l|l|l|}
   \hline
   \backslashbox[2cm]{Lesson}{Date} & 
-  Monday & Tuesday \\
+  Monday & Tuesday\\
   \hline
-  Stratigraphy & room A & room A \\
-  Chemistry & room B & Lab $\alpha$ \\
-  Physics & room C & Lab $\beta$ \\
+  Stratigraphy & room A & room A\\
+  Chemistry & room B & Lab $\alpha$\\
+  Physics & room C & Lab $\beta$\\
   \hline
 \end{tabular}
 \end{minipage}
@@ -2680,13 +2782,13 @@ This package add the \cmd{backslashbox} command:
 For many people, data files are the bread and butter of everyday's
 work. Most data files are simply ASCII text with columns of numbers,
 but some people use spreadsheets. Nearly all spreadsheet applications
-can export sheets in the ASCII-based \file{.cvf} file format; values
-are separated by the `;' character.
+can export sheets in the ASCII-based \file{.csv} file format; values
+are usually separated by the `;' character.
 
 Converting a data file into a \LaTeX{} table is quite a tedious
 process. The following script for \unix{} will convert a datafile with
 an arbitrary number of columns to a table. It will also work on
-\file{.cvf} files.
+\file{.csv} files.
 
 \begin{Verbatim}[fontsize=\small]  
 #!/bin/sh
@@ -2698,7 +2800,7 @@ if [ $# != 1 ]; then
   exit 1
 fi
 
-# is this a cvs file?
+# is this a csv file?
 grep ";" $1 > /dev/null
 if [ $? = 0 ]; then
   AWK="awk -F;"
@@ -2708,13 +2810,13 @@ fi
 
 # ok awk, make my day
 $AWK '{if (1 == FNR) { \
-        printf "\\begin\{tabular\}\{"; \
+        printf "\\begin{tabular}{"; \
         for (i = 1; i <= NF; i++) {printf "l"}; \
-        printf "\}\n"
+        printf "}\n"
       }
       for (i = 1; i < NF; i++) \
-        {printf $i" & "} printf $NF" \\\\ \n"} \
-      END {printf "\\end\{tabular\}\n"}' $1
+        {printf $i" & "} printf $NF"\\\\ \n"} \
+      END {printf "\\end{tabular}\n"}' $1
 
 # end of dat2tex
 \end{Verbatim}
@@ -2989,12 +3091,13 @@ The best place to start is the CTAN site,
   \item \url{http://www.ctan.org/tex-archive/info/LatexHelpBook/} is a very
     nice help system for \LaTeX{}, fully integrated with Windows.
     
-  \item don't forget the \url{news:comp.text.latex} newsgroup: it's an
-  invaluable source of help.
+  \item don't forget the
+  \url{http://groups.google.com/group/comp.text.tex/topics} newsgroup:
+  it's an invaluable source of help.
   
 \end{itemize}
 
-As of 2010, most GNU/Linux distributions ship with \app{TeXLive},
+As of 2011, most GNU/Linux distributions ship with \app{TeXLive},
 probably the most complete \TeX/\LaTeX{} systems. A lot of
 documentation is provided; on my Ubuntu machine, it's found in
 \path{/usr/share/doc/texlive-doc/}.
@@ -3003,7 +3106,7 @@ documentation is provided; on my Ubuntu machine, it's found in
 
 \section{The End}
 
-This document is copyleeft \textcopyright{} Guido Gonzato, 2001--2010,
+This document is copyleft \textcopyright{} Guido Gonzato, 2001--2011,
 and released under the GNU Free Documentation Licence. I really hope
 you'll find this guide useful. For any suggestions or comments, please
 feel free to contact me.
diff --git a/Master/texmf-dist/doc/latex/latex4wp/tbx.pdf b/Master/texmf-dist/doc/latex/latex4wp/tbx.pdf
index 53b872d0e53..29b814ea369 100644
--- a/Master/texmf-dist/doc/latex/latex4wp/tbx.pdf
+++ b/Master/texmf-dist/doc/latex/latex4wp/tbx.pdf
diff --git a/Master/texmf-dist/doc/latex/latex4wp/xfig.jpg b/Master/texmf-dist/doc/latex/latex4wp/xfig.jpg
deleted file mode 100644
index 3e4cfedb082..00000000000
--- a/Master/texmf-dist/doc/latex/latex4wp/xfig.jpg
+++ /dev/null