Merge branch 'master' of https://github.com/vermaseren/form

configure.ac

@@ -11,7 +11,14 @@ AC_INIT([FORM], FORM_VERSION, [form@nikhef.nl])
 AC_CONFIG_SRCDIR([sources/form3.h])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([foreign 1.7 dist-bzip2])
+dnl Use the serial-tests option if automake >= 1.13.
+dnl Assume the automake command is ${AUTOMAKE:-automake} as autoreconf does.
+dnl It may not work if "make" re-runs a different version of automake.
+m4_define([serial_tests], [m4_esyscmd([
+	${AUTOMAKE:-automake} --version | head -1 |
+	awk '{split ($NF,a,"."); if (a[1] >= 2 || (a[1] == 1 && a[2] >= 13)) { print "serial-tests" }}'
+])])
+AM_INIT_AUTOMAKE([1.7 foreign -Wall dist-bzip2] serial_tests)
 
 AC_DEFINE(MAJORVERSION, FORM_MAJORVERSION, [Major version of FORM.])
 AC_DEFINE(MINORVERSION, FORM_MINORVERSION, [Minor version of FORM.])

doc/manual/prepro.tex

@@ -1120,9 +1120,9 @@ \section{\#if}
 \leftvitem{3cm}{isdefined()}
 \rightvitem{13cm}{The argument of isdefined\index{isdefined} is the name of a 
 preprocessor variable. This function then returns one if this object 
-has been defined. Otherwise it returns zero. Technically \verb:#ifdef 
-`VAR': and 
-\verb:#if ( isdefined(`NAME') ): are the same. The isdefined function 
+has been defined. Otherwise it returns zero. Technically \texttt{\#ifdef `VAR'} 
+and 
+\texttt{\#if ( isdefined(`NAME') )} are the same. The isdefined function 
 allows for greater flexibility in composite conditions.}
 
 \leftvitem{3cm}{isfactorized()}

doc/manual/statements.tex

@@ -823,7 +823,7 @@ \section{delete}
 Syntax & delete storage; \\
 See also & save (\ref{substasave}), load (\ref{substaload}) \\
 Syntax & delete extrasymbols; \\
-Syntax & delete extrasymbols>number; \\
+Syntax & delete extrasymbols\textgreater{}number; \\
 See also & extrasymbols (\ref{substaextrasymbols}) \\
 
 \end{tabular} \vspace{4mm}
@@ -1328,7 +1328,7 @@ \section{extrasymbols}
 
 \noindent \begin{tabular}{ll}
 Type & Declaration statement\\
-Syntax & extrasymbols,array|vector|underscore,name;
+Syntax & extrasymbols,array\textbar{}vector\textbar{}underscore,name;
 \\ See also & ToPolynomial (\ref{substatopolynomial}), FromPolynomial 
 (\ref{substafrompolynomial}) and extra symbols 
 (\ref{sect-extrasymbols}).
@@ -1438,7 +1438,7 @@ \section{factdollar}
 
 \noindent \begin{tabular}{ll}
 Type & Executable statement\\
-Syntax & factdollar options \verb:{:{\tt<}name of dollar variable{\tt>};
+Syntax & factdollar {\tt<}name of dollar variable{\tt>};
 \\ See also & the chapter on polynomials~\ref{polynomials}.
 \end{tabular} \vspace{4mm}
 
@@ -1468,7 +1468,7 @@ \section{factorize}
 
 \noindent \begin{tabular}{ll}
 Type & Output control statement\\
-Syntax & factorize \verb:{:(options)\verb:}: \verb:{:{\tt<}name of expression(s){\tt>};
+Syntax & factorize \verb:{:{\tt<}name of expression(s){\tt>}\verb:}:;
 \\ See also & the chapter on polynomials~\ref{polynomials}.
 \end{tabular} \vspace{4mm}
 
@@ -3138,7 +3138,7 @@ \section{nfactorize}
 
 \noindent \begin{tabular}{ll}
 Type & Output control statement\\
-Syntax & nfactorize \verb:{:{\tt<}name of expression(s){\tt>};
+Syntax & nfactorize \verb:{:{\tt<}name of expression(s){\tt>}\verb:}:;
 \\ See also & the chapter on polynomials~\ref{polynomials} and 
 \ref{substafactorize}.
 \end{tabular} \vspace{4mm}
@@ -3368,7 +3368,7 @@ \section{nunfactorize}
 
 \noindent \begin{tabular}{ll}
 Type & Output control statement\\
-Syntax & nunfactorize \verb:{:{\tt<}name of expression(s){\tt>};
+Syntax & nunfactorize \verb:{:{\tt<}name of expression(s){\tt>}\verb:}:;
 \\ See also & the chapter on polynomials~\ref{polynomials} and 
 \ref{substaunfactorize}.
 \end{tabular} \vspace{4mm}
@@ -5770,7 +5770,7 @@ \section{unfactorize}
 
 \noindent \begin{tabular}{ll}
 Type & Output control statement\\
-Syntax & unfactorize \verb:{:{\tt<}name of expression(s){\tt>};
+Syntax & unfactorize \verb:{:{\tt<}name of expression(s){\tt>}\verb:}:;
 \\ See also & the chapter on polynomials~\ref{polynomials} and the 
 factorize statement~\ref{substafactorize}.
 \end{tabular} \vspace{4mm}