Merge pull request #142 from mookerji/fix-latex

Latex datasheet fixes.
swift-nav · May 4, 2015 · 16f8ef8 · 16f8ef8
2 parents b95ec80 + 46de40a
commit 16f8ef8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/docs/sbp.pdf b/docs/sbp.pdf
diff --git a/generator/sbpg/targets/latex.py b/generator/sbpg/targets/latex.py
@@ -295,5 +295,6 @@ def render_source(output_dir, package_specs):
   import subprocess
   import os
   os.chdir(output_dir)
-  subprocess.call(["pdflatex", "sbp_out.tex"])
+  subprocess.call(["pdflatex", "--enable-write18",
+                   "-shell-escape", "sbp_out.tex"])
   subprocess.call(["mv", "sbp_out.pdf", "../docs/sbp.pdf"])
diff --git a/generator/sbpg/targets/resources/sbp_base.tex b/generator/sbpg/targets/resources/sbp_base.tex
@@ -18,6 +18,8 @@
 \usepackage{pbox}
 \usepackage{soul}
 \usepackage{hyperref}
+\usepackage{ltxtable}
+\usepackage{caption}
 
 \hypersetup{bookmarks,bookmarksopen,bookmarksdepth=4}
 
@@ -31,13 +33,6 @@
 \numberwithin{field}{subsection}
 
 \renewcommand{\thesubsubsection}{\hspace{-0.45cm}}
-%% \renewcommand{\thesubsection}{\arabic{section}.\arabic{subsection}}
-%% \makeatletter
-%% \def\@seccntformat#1{\csname #1ignore\expandafter\endcsname\csname the#1\endcsname\quad}
-%% \let\sectionignore\@gobbletwo
-%% \let\latex@numberline\numberline
-%% \def\numberline#1{\if\relax#1\relax\else\latex@numberline{#1}\fi}
-%% \makeatother
 
 \newcommand{\specialcell}[2][c]{%
   \begin{tabular}[#1]{@{}c@{}}#2\end{tabular}}
@@ -59,10 +54,14 @@
 \newcolumntype{c}{>{\hsize=.3\hsize}X}
 \newcolumntype{d}{>{\hsize=.7\hsize}X}
 
+% Shell out to git to get the most recent tag and pass it to the LateX
+% job name. Hopefully this doesn't screw with things.
+\immediate\write18{git describe --abbrev=0 --tags > \jobname.info }
+
 \title{Swift Navigation Binary Protocol}
-\version{0.33}
+\version{\input{\jobname.info}}
 \author{Swift Navigation}
-\mysubtitle{Protocol Specification v\theversion}
+\mysubtitle{Protocol Specification \theversion}
 \date{\today}
 
 \begin{document}

diff --git a/generator/sbpg/targets/resources/sbp_messages_table.tex b/generator/sbpg/targets/resources/sbp_messages_table.tex
@@ -12,9 +12,9 @@ \section{Message Types}
 purposes only}. Many draft messages are implementation-defined, and
 some collections, such as the acquisition package, are used for
 internal development.
-\end{large}
-\begin{table}[h]
-  \centering
+\end{large}\\
+
+\begin{center}
   \begin{tabularx}{\textwidth}{badcX}
     \toprule
     Package & Msg ID & Name & Size (bytes) & Description \\
@@ -39,9 +39,9 @@ \section{Message Types}
       (((m.short_desc|removedir|escape_tex))) \\
     ((*- endfor *))
     \bottomrule
-  \end{tabularx}
-  \caption{SBP message types}
   \label{tab:messages}
-\end{table}
+  \end{tabularx}
+\captionof{table}{SBP message types}
+\end{center}
 
 ((* endblock *))