On Mon, Nov 6, 2006 at 17:55:47 +0100, Frank Küster wrote:
> Julien Danjou <[EMAIL PROTECTED]> wrote:
>
> >> ./macros.tex:24: Warning: Command not found: \remakesection
> >> ./macros.tex:25: Parsing of argument failed
> >> Giving up command: \chapter
> >> Giving up command: \input
> >> ./macros.tex:25: Error while reading LaTeX macros arguments:
> >> Argument expected
>
> This is caused by #397332. Here's a patch until hevea is fixed:
>
And here is a better patch, by the hevea author (Luc Maranget
<[EMAIL PROTECTED]>), which fixes ion2's macros.tex to work with
hevea 1.09.
With this patch
* macros.tex doesn't use \remakesection anymore
* a few macros have been modified to fix warnings
+ \fnref generates a link, as it was supposed to, instead of an anchor
+ \centerurl works
+ hevea no longer warns about the use of '_' outside mathmode
+ babel is given the "english" option
Cheers,
Julien
--- ion2-20040729/ion-doc/macros.tex.orig 2006-11-09 14:12:50.000000000
+0100
+++ ion2-20040729/ion-doc/macros.tex 2006-11-09 22:25:36.000000000 +0100
@@ -1,4 +1,4 @@
-\usepackage{babel}
+\usepackage[english]{babel}
\usepackage[latin1]{inputenc}
\usepackage{ae}
\usepackage{url}
@@ -21,9 +21,6 @@
\begin{htmlonly}
%END LATEX
-\remakesection
- {\chapter}{-1}{chapter}
- [EMAIL PROTECTED]@close{H1}}
\setcounter{tocdepth}{3}
\setcounter{indexcols}{1}
[EMAIL PROTECTED]@attributes}{CELLSPACING=10 CELLPADDING=0}
@@ -35,9 +32,21 @@
% URL settings
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%BEGIN LATEX
\urlstyle{rm}
\newcommand{\centerurl}[1]{\begin{center}\url{#1}\end{center}}
+%END LATEX
+
+%BEGIN LATEX
+\begin{htmlonly}
+%END LATEX
+
+\urlstyle{rm}
+\newcommand{\centerurl}[1]{\begin{center}\ahrefurl{#1}\end{center}}
+
+%BEGIN LATEX
+\end{htmlonly}
+%END LATEX
% listings package
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -58,7 +67,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\note}[1]{\color{red}**#1**}
+%BEGIN LATEX
\newcommand{\file}[1]{\emph{#1}}
+%END LATEX
\newcommand{\type}[1]{#1}
\newcommand{\spec}[1]{#1}
\newcommand{\key}[1]{\textbf{#1}}
@@ -77,15 +88,18 @@
%BEGIN LATEX
\begin{htmlonly}
%END LATEX
-\newcommand{\code}[1]{\texttt{#1}}
-\newcommand{\var}[1]{\texttt{#1}}
-\newcommand{\command}[1]{\texttt{#1}}
[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]@tilde\emph{#1}}}
[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL PROTECTED]@o{#1}}}
[EMAIL PROTECTED]@o
[EMAIL PROTECTED]@o
[EMAIL PROTECTED]@o
% docode is not present nor needed in hevea
\newcommand{\docode}{}
-
-\newcommand{\hyperlabel}[1]{\label{#1}}
-\newcommand{\fnref}[1]{\aname{fn:#1}{\texttt{#1}}}
[EMAIL PROTECTED]@o}[1]{{\catcode95=12{}#1}}
[EMAIL PROTECTED]@o{#1}}}
+\newcommand{\fnref}[1]{\ahrefloc{fn:[EMAIL PROTECTED]@[EMAIL
PROTECTED]@o{#1}}}}
\newcommand{\myhref}[2]{\ahref{#2}{#1}}
%BEGIN LATEX
\end{htmlonly}
@@ -128,10 +142,10 @@
\end{description}
}
\newcommand{\synopsis}[1]{
- \item[Synopsis:] \texttt{#1}
+ \item[Synopsis:] \code{#1}
}
\newcommand{\funcname}[1]{
- \item[Function:] \texttt{#1}
+ \item[Function:] \code{#1}
}
\newenvironment{funcdesc}{
\item[Description:]