Modified gdoc to be able to handle enumerations. Only valid to latex.

3 files changed, 44 insertions, 3 deletions

diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index a4c2d437c7..6fffa400eb 100644
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -68,6 +68,16 @@ gnutls-api.tex: $(srcdir)/../../lib/*.c $(srcdir)/../../lib/ext/*.c $(srcdir)/..
 	rm -f $@-tmp
 	mv -f $@-tmp2 $@
 
+gnutls-enums.tex: $(srcdir)/../../lib/includes/gnutls/*.h
+	echo "" > $@-tmp
+	for i in $^; do \
+		echo -n "Creating documentation for file $$i... " && \
+		$(srcdir)/../scripts/gdoc -tex $$i >> $@-tmp && \
+		echo "ok"; \
+	done
+	$(srcdir)/../scripts/split.pl enums enum < $@-tmp
+	mv -f $@-tmp $@
+
 x509-api.tex: $(srcdir)/../../lib/x509/*.c
 	echo "" > $@-tmp
 	for i in $^; do \
@@ -104,9 +114,9 @@ extra-api.tex: $(srcdir)/../../libextra/gnutls_extra.c
 	rm -f $@-tmp
 	mv -f $@-tmp2 $@
 
-SOURCE_GEN_FILES =  extra-api.tex pgp-api.tex x509-api.tex gnutls-api.tex
+SOURCE_GEN_FILES =  extra-api.tex pgp-api.tex x509-api.tex gnutls-api.tex gnutls-enums.tex
 
-gnutls.pdf: $(TEX_OBJECTS) $(GEN_TEX_OBJECTS) $(SOURCE_GEN_FILES)
+gnutls.pdf: $(SOURCE_GEN_FILES) $(TEX_OBJECTS) $(GEN_TEX_OBJECTS)
 	-pdflatex gnutls.tex
 	-bibtex gnutls
 	-makeindex gnutls.idx
@@ -114,5 +124,5 @@ gnutls.pdf: $(TEX_OBJECTS) $(GEN_TEX_OBJECTS) $(SOURCE_GEN_FILES)
 
 clean-am:
 	rm -f $(GEN_TEX_OBJECTS) $(SOURCE_GEN_FILES) gnutls.aux gnutls.bbl gnutls.blg gnutls.idx gnutls.ilg gnutls.ind gnutls.log gnutls.out gnutls.toc
-	rm -rf functions
+	rm -rf functions enums
 
diff --git a/doc/latex/gnutls.tex b/doc/latex/gnutls.tex
index 65207ec870..ba4a9d3be4 100644
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/gnutls.tex
@@ -37,6 +37,8 @@
 
 \setcounter{tocdepth}{1}
 \tableofcontents
+\listoftables
+\listoffigures
 
 \pagestyle{fancy}
 \fancyhead[RE]{\slshape \rightmark}
diff --git a/doc/latex/macros.tex b/doc/latex/macros.tex
index 0a53b47bf4..1b48459ba7 100644
--- a/doc/latex/macros.tex
+++ b/doc/latex/macros.tex
@@ -69,8 +69,24 @@
    \input{functions/#1}
   }
  \end{framed}
+ \vspace{0.10cm}
+ \end{minipage}
+ \par
+}
+
+\newcommand{\showenumdesc}[2]{%
+ \begin{table}[h]
+ \begin{minipage}[l]{\linewidth}
+ \begin{framed}
+  \texttt{
+   \input{enums/#1}
+  }
+ \end{framed}
  \vspace{0.15cm}
  \end{minipage}
+ \caption{#2}
+ \label{#1}
+ \end{table}
 }
 
 \newcommand{\showfuncA}[1]{%
@@ -162,7 +178,20 @@
 {\vspace{0.5cm}{\bf Description:}\footnotesize}
 {}
 
+\newenvironment{enum}%
+{}%
+{}
+
+\newcommand{\enumElement}[2]{%
+{\scriptsize {\bf #1}} & {\scriptsize #2}\\%
+}
+
+\newenvironment{enumList}%
+{\begin{tabular}{p{.43\linewidth}p{.53\linewidth}}}%
+{\end{tabular}}
+
 \newcommand{\functionTitle}[1]{}
+\newcommand{\enumTitle}[1]{enum {\bf #1}:}
 
 \newenvironment{functionReturns}%
 {\vspace{0.5cm}{\bf Returns:}\footnotesize}