r26235 - in /tags/3.3.1/docs/latex: functions.tex model-free.tex relax.tex -- October 10, 2014 - 13:06

Author: bugman
Date: Fri Oct 10 13:06:41 2014
New Revision: 26235

URL: http://svn.gna.org/viewcvs/relax?rev=26235&view=rev
Log:
Merged revisions r26232 to r26234 from the trunk.

The command used was:
svn merge -r26231:r26234 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk .

This is simply to allow an improved HTML version of the manual to be compiled 
and uploaded to
http://www.nmr-relax.com/manual/index.html.


Modified:
    tags/3.3.1/docs/latex/functions.tex
    tags/3.3.1/docs/latex/model-free.tex
    tags/3.3.1/docs/latex/relax.tex

Modified: tags/3.3.1/docs/latex/functions.tex
URL: 
http://svn.gna.org/viewcvs/relax/tags/3.3.1/docs/latex/functions.tex?rev=26235&r1=26234&r2=26235&view=diff
==============================================================================
--- tags/3.3.1/docs/latex/functions.tex (original)
+++ tags/3.3.1/docs/latex/functions.tex Fri Oct 10 13:06:41 2014
@@ -51,10 +51,15 @@
 All other sections are created from the sectioning of the user function 
docstring.
 
 
-\newpage
-\raggedbottom
-\twocolumn
-{\scriptsize
-\input{docstring}
-}
-\onecolumn
+\begin{latexonly}
+   \newpage
+   \raggedbottom
+   \twocolumn
+   {\scriptsize
+   \input{docstring}
+   }
+   \onecolumn
+\end{latexonly}
+\begin{htmlonly}
+   \input{docstring}
+\end{htmlonly}

Modified: tags/3.3.1/docs/latex/model-free.tex
URL: 
http://svn.gna.org/viewcvs/relax/tags/3.3.1/docs/latex/model-free.tex?rev=26235&r1=26234&r2=26235&view=diff
==============================================================================
--- tags/3.3.1/docs/latex/model-free.tex        (original)
+++ tags/3.3.1/docs/latex/model-free.tex        Fri Oct 10 13:06:41 2014
@@ -24,7 +24,7 @@
 \end{latexonly}
 \begin{htmlonly}
     \subsection{The chi-squared function -- $chi^2(theta)$}
-\begin{htmlonly}
+\end{htmlonly}
 
 \index{chi-squared|textbf}
 

Modified: tags/3.3.1/docs/latex/relax.tex
URL: 
http://svn.gna.org/viewcvs/relax/tags/3.3.1/docs/latex/relax.tex?rev=26235&r1=26234&r2=26235&view=diff
==============================================================================
--- tags/3.3.1/docs/latex/relax.tex     (original)
+++ tags/3.3.1/docs/latex/relax.tex     Fri Oct 10 13:06:41 2014
@@ -108,7 +108,7 @@
 \newcommand{\ufus}{\_\linebreak[0]}
 
 % New environment.
-\newenvironment{exampleenv}{\footnotesize \begin{ttfamily} \sloppy}{\fussy 
\end{ttfamily}}
+\newenvironment{exampleenv}{\begin{footnotesize} \begin{ttfamily} 
\sloppy}{\fussy \end{ttfamily} \end{footnotesize}}
 \newenvironment{spacedpara}{\setlength{\parindent}{0pt} 
\setlength{\parskip}{2ex plus 0.5ex minus 0.2ex}}{}
 
 % Modify the Toc, Lof, and Lot layout.