3582: Fix latex package includes in documentation. - Olena-patches

26 Mar 2009

* doc/milena.sty: fix scope of latexonly.

	* doc/tutorial/Makefile.am,
	* doc/ref_guide/Makefile.am: Pass path to .sty files to to_doxygen.sh.

	* doc/tutorial/tutorial.tex,
	* doc/white_paper/white_paper.tex,
	* doc/ref_guide/ref_guide.tex: remove useless packages.

	* doc/tools/todoxygen.sh: Pass latex packages to hevea.

---
 milena/ChangeLog                       |   15 +++++++++++++++
 milena/doc/milena.sty                  |    5 +++--
 milena/doc/ref_guide/Makefile.am       |    2 +-
 milena/doc/ref_guide/ref_guide.tex     |    5 ++---
 milena/doc/tools/todoxygen.sh          |   10 +++++++---
 milena/doc/tutorial/Makefile.am        |    2 +-
 milena/doc/tutorial/tutorial.tex       |    5 ++---
 milena/doc/white_paper/white_paper.tex |    4 +---
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog
index e93ff15..3dd3baf 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,20 @@
 2009-03-26  Guillaume Lazzara  &lt;lazzara(a)lrde.epita.fr&gt;
 
+	Fix latex package includes in documentation.
+
+	* doc/milena.sty: fix scope of latexonly.
+
+	* doc/tutorial/Makefile.am,
+	* doc/ref_guide/Makefile.am: Pass path to .sty files to to_doxygen.sh.
+
+	* doc/tutorial/tutorial.tex,
+	* doc/white_paper/white_paper.tex,
+	* doc/ref_guide/ref_guide.tex: remove useless packages.
+
+	* doc/tools/todoxygen.sh: Pass latex packages to hevea.
+
+2009-03-26  Guillaume Lazzara  &lt;lazzara(a)lrde.epita.fr&gt;
+
 	Revamp documentation commands.
 
 	* doc/doxyfuns.sty,
diff --git a/milena/doc/milena.sty b/milena/doc/milena.sty
index 38af3df..4b13f59 100644
--- a/milena/doc/milena.sty
+++ b/milena/doc/milena.sty
@@ -37,14 +37,15 @@
 % Doxygen color theme for listings.
 %------------------------------------------
 %
+\usepackage{listings}
 
+%%%LISTINGS SETTINGS
+%\begin{latexonly}
 \definecolor{ccomment}{rgb}{0.5,0,0}
 \definecolor{cstring}{rgb}{0,0.32,0.5}
 \definecolor{cidentifier}{rgb}{0,0.5,0}
 \definecolor{cbg}{rgb}{0.95,0.95,0.95}
 
-%%%LISTINGS SETTINGS
-%\begin{latexonly}
 \lstset{frameround=fttt}
 \lstloadlanguages{[ISO]C++}
 \lstset{language=[ISO]C++,
diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am
index 40cab40..774d69f 100644
--- a/milena/doc/ref_guide/Makefile.am
+++ b/milena/doc/ref_guide/Makefile.am
@@ -10,7 +10,7 @@ ref-guide:
 
 ref-guide-html: 
 	chmod u+x $(DOC_SRCDIR)/tools/todoxygen.sh
-	$(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/ref_guide.tex $(DOC_BUILDDIR)/ref_guide
+	$(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/ref_guide.tex $(DOC_BUILDDIR)/ref_guide
$(DOC_SRCDIR)
 
 clean-local:
 	rm -f ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out
diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex
index 01abf0e..8a7b6bd 100644
--- a/milena/doc/ref_guide/ref_guide.tex
+++ b/milena/doc/ref_guide/ref_guide.tex
@@ -35,13 +35,12 @@
 
 %\usepackage{hevea}
 
+\usepackage{html}
 \usepackage{graphicx}
-\usepackage{listings}
 \usepackage{makeidx}
 \usepackage{xcolor}
 \usepackage{color}
-\usepackage{html}
-\usepackage{tikz}
+\usepackage{hyperref}
 \usepackage{pgf}
 \usepackage{doxyfuns}
 \usepackage{milena}
diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh
index fdf67ac..c61f5e1 100755
--- a/milena/doc/tools/todoxygen.sh
+++ b/milena/doc/tools/todoxygen.sh
@@ -1,15 +1,19 @@
 #!/bin/sh
 
-if [ $# -ne 2 ]; then
-  echo "Usage: $0 <file.tex> <output dir>";
+if [ $# -ne 3 ]; then
+  echo "Usage: $0 <file.tex> <output dir> <path to .sty>";
   exit 1;
 fi
 
 out="$2/`basename $1 .tex`.hh"
 html="$2/`basename $1 .tex`.html"
 
+DOC_PACKAGES="
+  $3/doxyfuns.sty \
+  $3/milena.sty"
+
 #Convert .tex to .html
-hevea -O -fix $1 -o $html
+hevea -O -fix $DOC_PACKAGES $1 -o $html
 
 bodyl=`grep -n "<BODY >" $html | cut -d ':' -f 1`
 nlines=`wc -l $html | cut -d ' ' -f 1`
diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am
index 885e8ae..ceeae75 100644
--- a/milena/doc/tutorial/Makefile.am
+++ b/milena/doc/tutorial/Makefile.am
@@ -10,7 +10,7 @@ tutorial:
 
 tuto-html: 
 	chmod u+x $(DOC_SRCDIR)/tools/todoxygen.sh
-	$(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/tutorial.tex $(DOC_BUILDDIR)/tutorial
+	$(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/tutorial.tex $(DOC_BUILDDIR)/tutorial
$(DOC_SRCDIR)
 
 clean-local:
 	rm -f tutorial.aux tutorial.toc tutorial.log tutorial.bbl tutorial.out
diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex
index 3034989..3326b24 100644
--- a/milena/doc/tutorial/tutorial.tex
+++ b/milena/doc/tutorial/tutorial.tex
@@ -34,17 +34,16 @@
 
 %\usepackage{hevea}
 
+\usepackage{html}
 \usepackage{graphicx}
-\usepackage{listings}
 \usepackage{makeidx}
 \usepackage{xcolor}
 \usepackage{color}
-\usepackage{html}
+\usepackage{hyperref}
 \usepackage{pgf}
 \usepackage{doxyfuns}
 \usepackage{milena}
 
-
 \title{Olena -- Tutorial}
 \author{LRDE}
 \date{}
diff --git a/milena/doc/white_paper/white_paper.tex
b/milena/doc/white_paper/white_paper.tex
index 0e58ffc..2f48a9b 100644
--- a/milena/doc/white_paper/white_paper.tex
+++ b/milena/doc/white_paper/white_paper.tex
@@ -2,14 +2,12 @@
 
 %\usepackage{hevea}
 
+\usepackage{html}
 \usepackage{hyperref}
 \usepackage{graphicx}
-\usepackage{listings}
 \usepackage{makeidx}
 \usepackage{xcolor}
 \usepackage{color}
-\usepackage{html}
-\usepackage{tikz}
 \usepackage{pgf}
 \usepackage{doxyfuns}
 \usepackage{milena}
-- 
1.5.6.5



    