1 files changed, 74 insertions, 51 deletions
diff --git a/Master/texmf-dist/source/latex/paracol/man.dtx b/Master/texmf-dist/source/latex/paracol/man.dtx
index fca209e8b51..fc6486a14fe 100644
--- a/Master/texmf-dist/source/latex/paracol/man.dtx
+++ b/Master/texmf-dist/source/latex/paracol/man.dtx
@@ -28,8 +28,10 @@
 % than English and Japanese and the latter should be hardly understood by
 % most of readers, the right column is the translation of the left English
 % column into a computational language.  That is, the right column is the
-% \LaTeX{} source code of the left column\footnote{Not really but its essence
-% is shown.}\label{firstfootnote}.
+% \LaTeX{} source code of the left column\footnote{
+% 
+% Not really but its essence
+% is shown.\label{fn:first}}.
 % 
 % \switchcolumn
 %\begin{Verbatim}
@@ -158,8 +160,8 @@
 % means to switch to the leftmost column, |\switchcolumn[1]| is to start the
 % second column and so on.  Thus the |\switchcolumn| without the optional
 % argument may be considered as \!\switchcolumn!|[|$i+1\bmod{n}$|]| where
-% $i$ is the last column number and $n$ is the number of columns given to
-% \env{paracol} environment.
+% $i$ is the ordinal of the column you are leaving from and $n$ is the
+% number of columns given to \env{paracol} environment.
 % 
 % 
 % 
@@ -171,10 +173,11 @@
 % command.  For example, the previous section has three \!\switchcolumn!|*|
 % commands at which left and right columns are vertically aligned.
 % 
-% The {\em starred} version of \!\switchcolumn! may have an optional argument
-% to specify a {\em\Uidx\mctext} whose bottom is the vertical alignment
-% points of the columns.  For example, \!\section! commands in this manual are
-% given as optional arguments of\break\!\switchcolumn!|*| like;
+% The {\em starred} version of \!\switchcolumn! may have an optional
+% argument to specify a single-column {\em\Uidx\mctext} whose bottom is the
+% vertical alignment points of the columns.  For example, \!\section!
+% commands in this manual are given as optional arguments
+% of \!\switchcolumn!|*| like;
 %\begin{Verbatim}
 %  \switchcolumn*[\section{Basic Usage}]
 %\end{Verbatim}
@@ -206,11 +209,12 @@
 % 
 % 
 % \begin{column*}[\section{Environments for Columns}\label{sec:env}]
+% \Uidx{\Index{column-switching environment}}
 % \subsection{Environment \texttt{column}}
 % The \!\switchcolumn! is simple but you may prefer to pack the contents of a
 % column in an environment.  The \Uidx{\env{column}} environment is
-% available for this well-structurization of \LaTeX{} sources for parallel
-% columned documents. A construct;
+% available for this well-structurization of \LaTeX{} sources for
+% parallel-columned documents. A construct;
 % \begin{quote}
 % \!\begin!|{|\env{column}|}|\\
 % \textit{text for a column}\\
@@ -273,16 +277,19 @@
 % 
 % 
 % \begin{leftcolumn*}
-% \subsection[Environment \texttt{leftcolumn} and \texttt{rightcolumn}]
-%     {Environment \texttt{leftcolumn} and\\\texttt{rightcolumn}}
-% The environment \Uidx{\env{leftcolumn}} and \Uidx{\env{rightcolumn}} (and
+% \subsection[Environments \texttt{leftcolumn} and \texttt{rightcolumn}]
+%     {Environments \texttt{leftcolumn} and\\\texttt{rightcolumn}}
+% The environments \Uidx{\env{leftcolumn}} and \Uidx{\env{rightcolumn}} (and
 % their starred versions with an optional argument) are available as more
-% convenient means than saying \!\begin!|{|\env{nthcolumn}|}{0}| and
-% \!\begin!|{|\env{nthcolumn}|}{1}|.
+% convenient means than saying \!\begin!|{|\env{nthcolumn}|}{0}| to switch
+% to the left(most) column and
+% \!\begin!|{|\env{nthcolumn}|}{1}| to the right (but may not be rightmost)
+% one.
 % 
 % \Uidx{\EnvIndex{leftcolumn*}}\Uidx{\EnvIndex{rightcolumn*}}
 % 
 % \begin{figure*}\nosv
+% \def\arraystretch{0.8}
 % \centerline{\begin{tabular}[b]{|c|}\hline
 %     \hbox to.9\textwidth{}\\
 %     double-column figure \#1\\
@@ -291,6 +298,7 @@
 % \caption{A Double-Column Figure}
 % \end{figure*}
 % \begin{figure}[t]\nosv
+% \def\arraystretch{0.8}
 % \centerline{\begin{tabular}[b]{|c|}\hline
 %     \hbox to.9\columnwidth{}\\\\
 %     single-column figure \#1\\
@@ -305,14 +313,14 @@
 %\begin{Verbatim}
 %\begin{leftcolumn*}
 %\subsection{%
-%  Environment \texttt{leftcolumn} and\\
+%  Environments \texttt{leftcolumn} and\\
 %  \texttt{rightcolumn}}
-%The environment |leftcolumn| and
+%The environments |leftcolumn| and
 %|rightcolumn| (and their starred versions
 %with an optional argument) are available as
 %more convenient means than saying
-%|\begin{nthcolumn}{0}| and
-%|\begin{nthcolumn}{1}|.
+%|\begin{nthcolumn}{0}| to switch to the
+%left(most) column and ...
 %\begin{figure*}...\end{figure*}
 %\begin{figure}[t]...\end{figure}
 %\end{leftcolumn*}
@@ -321,6 +329,7 @@
 % \textit{source and a \texttt{figure} env}\\
 % |\end{rightcolumn}|
 % \begin{figure}[t]\nosv
+% \def\arraystretch{0.8}
 % \centerline{\begin{tabular}[b]{|c|}\hline
 %     \hbox to.9\columnwidth{}\\
 %     \ttfamily single-column figure \#2\\
@@ -334,6 +343,9 @@
 % 
 % \begin{leftcolumn*}[\section{Floats, Footnotes and Counters}
 %     \label{sec:float}]
+% \changes{v1.2-7}{2013/05/11}
+% 	{Remove \cs{nosv} from verbatim example of Table~1 shown in the right
+%	 column.}
 % \begin{table}[b]\nosv
 % \caption{A Single-Column Table}
 % \centerline{\begin{tabular}[t]{|l|c|r|}\hline
@@ -366,16 +378,20 @@
 % Even if you have enough space above, sorry.}.
 % 
 % Therefore, the author put two \env{figure} environments for the figures
-% shown in the previous page into the \env{leftcolumn*} and \env{rightcolumn}
+% shown in this page into the \env{leftcolumn*} and \env{rightcolumn}
 % environment for the previous section.
 % 
 % \subsection{Footnotes and Marginal Notes}
+% \changes{v1.2-2}{2013/05/11}
+% 	{Add a footnote mentioning single-columned footnotes.}
+%
 % Footnotes are also put at the bottom of the column in which \!\footnote!
-% commands and their references (like this\footnote{
+% commands and their references reside (like this\footnote{
 % 
-% An example of footnote.})
+% Unless you specify to make footnotes {\em single-columned} as explained in
+% Section \ref{sec:ref-scfnote} and \ref{sec:fnnp}.}),
 % 
-% reside, as shown in page~\pageref{firstfootnote} and this page.  Marginal
+% as shown in page~\pageref{fn:first} and this page.  Marginal
 % notes behave similarly like what you are seeing in the left margin of this
 % sentence\marginpar{
 % 
@@ -398,8 +414,8 @@
 % counterpart Figure~2.  The tables in the page are also numbered as 1 and 2
 % crossing the column boundary.  However, the footnotes in each column have
 % their own numbering sequence.  Moreover, the footnote numbers in left
-% columns are typeset in Roman font while those in right columns have italic
-% shapes.  Similarly, sub-section numbering is local and the headings in right
+% columns are typeset in roman font while those in right columns have italic
+% shapes.  Similarly, subsection numbering is local and the headings in right
 % columns have typewriter-face numbers.
 % 
 % This happens because the author declared the counters \counter{figure} and
@@ -422,8 +438,7 @@
 % environment because the modifications are \emph{broadcasted} to
 % \lcounter{}s in all columns.  You will see the effect of this
 % inter-environment counter value conservation in the footnote numbers in
-% the right column in page~\pageref{rightfootnote3} and
-% \pageref{rightfootnote4}.
+% the right column in page~\pageref{fn:right3} and \pageref{fn:right4}.
 % 
 % This broadcasting of a \lcounter{} value can be done explicity in
 % \env{paracol} environment by a command $\Uidx{\!\synccounter!}\Arg{ctr}$.
@@ -456,12 +471,12 @@
 % incremented correctly in the left-most column.  However, the stepping
 % \counter{section} has a side effect to reset its decendent counter
 % \counter{subsection} and referred from \!\thesubsection! command.  Thus if
-% \counter{section} were local, the right-column sub-sections in
+% \counter{section} were local, the right-column subsections in
 % Section~\ref{sec:env} would be numbered as ``0.1'', ``0.2'' and ``0.3''
 % because the local value of \counter{section} would be zero.  Moreover, the
-% right-column sub-sections of this section would be ``0.4'', ``0.5'' and
-% ``0.6'' because stepping \counter{section} local to left-columns would not
-% reset \counter{subsection} local to right-columns.
+% right-column subsections of this section would be ``0.4'', ``0.5'' and
+% ``0.6'' because stepping \counter{section} local to the left column would
+% not reset \counter{subsection} local to the right column.
 % 
 % You may give a local appearance to a counter \textit{ctr} for the $i$-th
 % column (zero origin) by a command;
@@ -496,7 +511,7 @@
 %\begin{Verbatim}
 %\begin{leftcolumn*}[\section{%
 %   Floats, Footnotes and Counters}]
-%\begin{table}[b]\nosv
+%\begin{table}[b]
 %\caption{A Single-Column Table}
 %\centerline{\begin{tabular}[t]{|l|c|r|}
 %  \hline
@@ -511,21 +526,21 @@
 %columns) may be placed by |figure*| and
 %\end{Verbatim}
 % {\ttfamily |table*| environments as usual\footnote{Another example
-% of footnote.}\label{rightfootnote3}. ...}
+% of footnote.\label{fn:right3}}. ...}
 % 
 % \subsection{\ttfamily Footnotes and Marginal Notes}
 %\begin{Verbatim}
 %Footnotes are also put at the bottom of the
 %column in which |\footnote| commands and
-%their references (like this\footnote{%
-%An example of footnote.}) reside, as shown
-%in page~2 and this page.  Marginal notes
-%behave similarly like what you are seeing
-%in the left margin of this
-%sentense\marginpar{\raggedright An example
-%of marginal note.} and the right marginal
+%their references reside (like
+%this\footnote{...}), as shown in page~2 and
+%this page. Marginal notes behave similarly
+%like what you are seeing in the left margin
+%of this sentense\marginpar{\raggedright 
+%An example of marginal note.} and the right
+%marginal note in this
 %\end{Verbatim}
-% |note in this page\footnote{...}. ...|
+% |page\footnote{...}. ...|
 % \marginpar{\raggedright\ttfamily
 % Another example of marginal note.}
 % 
@@ -557,8 +572,10 @@
 %figures and tables is \emph{global} while
 %that of footnotes are \emph{local}. ...
 %\end{leftcolumn*}
+%\begin{rightcolumn}
 %\end{Verbatim}
-% \textit{source}.
+% \textit{source}.\\
+% |\end{rightcolumn}|
 %
 % \begin{figure}[p]\nosv
 % \centerline{\begin{tabular}[b]{|c|}\hline
@@ -606,10 +623,10 @@
 % 
 % \begin{figure}[t]\nosv
 % \centerline{\begin{tabular}[b]{|c|}\hline
-%     \hbox to.9\columnwidth{}\\\\\\\\
+%     \hbox to.9\columnwidth{}\\\\\\
 %     \ttfamily yet another figure with [t]\\
 %     \ttfamily option to fill space
-%     \\\\\\\\\hline
+%     \\\\\\\hline
 %     \end{tabular}}
 % \caption{\ttfamily
 % Yet Another Figure with [t] Option}
@@ -642,7 +659,7 @@
 % \begin{itemize}\item[]
 % \!\switchcolumn!|[|$i$|]*[|\!\newpage!|]|
 % \end{itemize}
-% but more robust\footnotemark.
+% but more robust\footnotemark\label{fn:flush}.
 % The ordinary page breaking command \Uidx{\!\clearpage!} may also be used
 % to flush all columns and to start a fresh page, but it has a side effect
 % to put all figures and tables which are not yet output.
@@ -650,12 +667,15 @@
 % 
 % \begin{rightcolumn}
 %\begin{Verbatim}
+%\begin{paracol}{2}
 %\begin{leftcolumn}
 %The environment may also be restarted
 %anywhere you like as shown here. ...
 %\end{leftcolumn}
+%\begin{rightcolumn}
 %\end{Verbatim}
 % \textit{source}\\
+% |\end{rightcolumn}|\\
 % |\end{paracol}|\\
 % |Now the aurthor will do ...|
 % \end{rightcolumn}
@@ -686,16 +706,19 @@
 %\begin{paracol}{2}
 %\begin{leftcolumn}
 %O.K., we have restarted |paracol|
-%environment and we will see the
-%effect of |\flushpage| now!!
+%environment...
 %\end{leftcolumn}
+%\begin{rightcolumn}
 %\end{Verbatim}
-% \textit{source}
+% \textit{source}\\
+% |\end{rightcolumn}|
 % \flushpage
 % \end{rightcolumn}
 % 
 % 
 % 
+% \changes{v1.2-7}{2013/05/11}
+% 	{Correct a few words in German and English libretti.}
 % \newenvironment{Gverse}{\begin{leftcolumn*}
 % 	\begin{myverse}}
 %   {\end{myverse}\end{leftcolumn*}}
@@ -721,7 +744,7 @@
 % \itshape Oh friends, no more of these sad tones!\\
 % Let us rather raise our voices together\\
 % In more pleasant and joyful tones
-% \footnote{This part was added by Beethoven.}\label{rightfootnote4}.
+% \footnote{This part was added by Beethoven.\label{fn:right4}}.
 % \end{Everse}
 % \begin{Gverse}
 % Freude!\\
@@ -744,7 +767,7 @@
 % We approach thy shrine.\\
 % Your magic reunites\\
 % {\itshape That which stern custom has parted;\\
-% All humans will become brothere\footnote{
+% All humans will become brothers\footnote{
 % Original: 
 % What custom's sword has parted;\\
 % Beggars become princes' brothers}}\\
@@ -773,7 +796,7 @@
 % \begin{Gverse}
 % Freude trinken alle Wesen
 % an den Br\"usten der Natur;\\
-% Alle Guten, all B\"osen
+% Alle Guten, alle B\"osen
 % folgen ihrer Rosenspur.\\
 % K\"usse gab sie uns und Reben,
 % einen Freund, gepr\"uft im Tod;\\