[svn-upgrade] Integrating new upstream version, ion3-doc (20080411)

[ion3-doc.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index 0f3bce22504e9475bf71ec56f3caec292c73bd6a..656d686512baeecc05eb071b4543ebea2ecc4bd9 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -4,7 +4,6 @@
 \usepackage{palatino}
 %\usepackage{ae}
 \usepackage{url}
 \usepackage{palatino}
 %\usepackage{ae}
 \usepackage{url}

-\usepackage{html}

 %\usepackage{graphicx}
 %\usepackage{color}
 \usepackage{makeidx}
 %\usepackage{graphicx}
 %\usepackage{color}
 \usepackage{makeidx}


@@ -22,6 +21,8 @@
 \usepackage[hypertex]{hyperref}
 \fi
 
 \usepackage[hypertex]{hyperref}
 \fi
 

+\usepackage{html}
+

 % URL settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % URL settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 


@@ -48,12 +49,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\note}[1]{\color{red}**#1**}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\note}[1]{\color{red}**#1**}

-\newcommand{\file}[1]{\mbox{\emph{#1}}}

 \newcommand{\type}[1]{#1}
 \newcommand{\spec}[1]{#1}
 \newcommand{\indextype}[1]{\index{#1@\type{#1}}}
 
 %begin{latexonly}
 \newcommand{\type}[1]{#1}
 \newcommand{\spec}[1]{#1}
 \newcommand{\indextype}[1]{\index{#1@\type{#1}}}
 
 %begin{latexonly}

+\newcommand{\file}[1]{\mbox{\emph{#1}}}

 \newcommand{\key}[1]{\mbox{\textbf{#1}}}
 \newcommand{\code}[1]{\lstinline!#1!}
 \newcommand{\codestr}[1]{`\texttt{#1}'}
 \newcommand{\key}[1]{\mbox{\textbf{#1}}}
 \newcommand{\code}[1]{\lstinline!#1!}
 \newcommand{\codestr}[1]{`\texttt{#1}'}


@@ -68,6 +69,7 @@
 %end{latexonly}
 \begin{htmlonly}
     
 %end{latexonly}
 \begin{htmlonly}
     

+\newcommand{\file}[1]{\emph{#1}}

 \newcommand{\key}[1]{\textbf{#1}}
 \newcommand{\code}[1]{\texttt{#1}}
 \newcommand{\codestr}[1]{`\texttt{#1}'}
 \newcommand{\key}[1]{\textbf{#1}}
 \newcommand{\code}[1]{\texttt{#1}}
 \newcommand{\codestr}[1]{`\texttt{#1}'}