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

[ion3-doc.git] / macros.tex

diff --git a/macros.tex b/macros.tex
index 0e172d364180b4c8224e436dd9c548c86e236cad..656d686512baeecc05eb071b4543ebea2ecc4bd9 100644 (file)
--- a/macros.tex
+++ b/macros.tex
@@ -1,24 +1,32 @@
 \usepackage{babel}
 \usepackage[latin1]{inputenc}
-\usepackage[dvipdfm]{hyperref}
-\usepackage{ae}
+\usepackage[T1]{fontenc}
+\usepackage{palatino}
+%\usepackage{ae}
 \usepackage{url}
-\usepackage{html}
 %\usepackage{graphicx}
 %\usepackage{color}
 \usepackage{makeidx}
 \usepackage{tabularx}
-\usepackage{textcomp}
+%\usepackage{textcomp}
 \usepackage[nottoc]{tocbibind}
 \usepackage{enumerate} % GNU FDL needs this
-\usepackage[a4paper]{geometry}
 \usepackage{calc}
+\usepackage{ifpdf}
+\usepackage[a4paper,margin=3cm]{geometry}
+
+\ifpdf
+\usepackage[pdftex]{hyperref}
+\else
+\usepackage[hypertex]{hyperref}
+\fi
+
+\usepackage{html}
 
 % URL settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\urlstyle{rm}
-\newcommand{\centerurl}[1]{\begin{center}\url{#1}\end{center}}
+\urlstyle{tt}
 
 % listings package
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35,18 +43,21 @@
 }
 %end{latexonly}
 
+\sloppy
+
 % Some markup
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\note}[1]{\color{red}**#1**}
-\newcommand{\file}[1]{\emph{#1}}
 \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{\var}[1]{\lstinline!#1!}
 \newcommand{\command}[1]{\lstinline!#1!}
 
@@ -58,8 +69,10 @@
 %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{\var}[1]{\texttt{#1}}
 \newcommand{\command}[1]{\texttt{#1}}