bug in \lstset fixed better double figures

Better font for pdf manual.

manual/analysis.tex

@@ -281,20 +281,17 @@ cycles.
 
 \begin{figure}
   \centering
-  \parbox{0.47\linewidth}{%
-    \ifdefined\HCode
-\includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qmca_opt_energy.png}
-\else
-\includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qmca_opt_energy.pdf}
+  \ifdefined\HCode%
+  \begin{xltabular}[l]{1024pt}{X X}
+    \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=512pt]{./figures/qmca_opt_energy.png}&
+    \includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=512pt]{./figures/qmca_opt_variance.png}\\
+  \end{xltabular}
+\else%
+  \begin{xltabular}[l]{\textwidth}{X X}
+    \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=0.47\textwidth]{./figures/qmca_opt_energy.pdf}&
+    \includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=0.47\textwidth]{./figures/qmca_opt_variance.png}\\
+    \end{xltabular}
 \fi%
-  }%
-  \qquad\begin{minipage}{0.47\linewidth}%
-   \ifdefined\HCode
-   \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qmca_opt_variance.png}
-    \else
-    \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qmca_opt_variance.png}
-\fi%
-  \end{minipage}%
   \caption{Energy and variance vs. optimization series for an 8 atom cell of diamond as plotted by \texttt{qmca}.}%
   \label{fig:qmca_opt_ev}%
 \end{figure}
@@ -1149,22 +1146,18 @@ panel of Fig.~\ref{fig:qfit_timestep}.
 
 \begin{figure}
   \centering
-  \parbox{0.47\linewidth}{%
-    \ifdefined\HCode%
-\includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qfit_timestep_linear.png}%
+\ifdefined\HCode%
+  \begin{xltabular}[l]{1024pt}{X X}
+    \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=512pt]{./figures/qfit_timestep_linear.png}&
+    \includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=512pt]{./figures/qfit_timestep_quadratic.png}\\
+  \end{xltabular}
 \else%
-\includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qfit_timestep_linear.pdf}%
+  \begin{xltabular}[l]{\textwidth}{X X}
+    \includegraphics[trim=0mm 0mm 4mm 0mm,clip,width=0.47\textwidth]{./figures/qfit_timestep_linear.pdf}&
+    \includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=0.47\textwidth]{./figures/qfit_timestep_quadratic.pdf}\\
+    \end{xltabular}
 \fi%
-  }%
-  \qquad%
-  \begin{minipage}{0.47\linewidth}%
-    \ifdefined\HCode%
-    \includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qfit_timestep_quadratic.png}%
-\else%
-\includegraphics[trim=2mm 0mm 4mm 0mm,clip,width=\linewidth]{./figures/qfit_timestep_quadratic.pdf}%
-\fi%
-  \end{minipage}%
-  \caption{Linear (left) and quadratic (right) timestep fits to DMC data for a 32 atom supercell of MnO obtained with \texttt{qfit}.  Zero timestep estimates are indicated by the red data point on the left side of either panel.}
+\caption{Linear (left) and quadratic (right) timestep fits to DMC data for a 32 atom supercell of MnO obtained with \texttt{qfit}.  Zero timestep estimates are indicated by the red data point on the left side of either panel.}
   \label{fig:qfit_timestep}
 \end{figure}
 

manual/build_html_manual.sh

@@ -8,8 +8,9 @@ if [ $# -eq 1 ]; then
   sed -i "s/Development Version/$QMCPACK_VER/" version.tex
 fi
 
-./prep_pdf.sh './figures/*.pdf'
-make4ht -u -x -e qmcpack_manual.mk4 -c qmcpack_manual.cfg qmcpack_manual.tex "xhtml,2,html5,graphics-144" "" " -cvalidate"
+cp -r figures html_site/
+./prep_pdf.sh './html_site/figures/*.pdf'
+make4ht -u -x -e qmcpack_manual.mk4 -c qmcpack_manual.cfg qmcpack_manual.tex "xhtml,2,html5,graphics-144" "" " -cvalidate" -d "html_site"
 
 if [ ! -z "$QMCPACK_VER" ]; then
   mv version.save.tex version.tex

manual/prep_pdf.sh

@@ -1,10 +1,15 @@
 #!/bin/bash
 set -x
 for file in $1; do
-    filename=${file%.*}
-    echo "converting ${filename}.pdf to ${filename}.svg"
-    pdfcrop --margins 10 --clip --resolution 144 "$filename.pdf" "$filename.pdf"
-    pdf2svg "$filename.pdf" "$filename.svg"
-    echo "converting ${filename}.pdf to ${filename}.png"
-    convert -density 300x300 "$filename.pdf" "$filename.png"
+    stat $file 2>%1
+    #if the png doesn't exist
+    if [ $? -neq 0 ]
+    then
+       filename=${file%.*}
+       echo "converting ${filename}.pdf to ${filename}.svg"
+       pdfcrop --margins 10 --clip --resolution 144 "$filename.pdf" "$filename.pdf"
+       pdf2svg "$filename.pdf" "$filename.svg"
+       echo "converting ${filename}.pdf to ${filename}.png"
+       convert -density 300x300 "$filename.pdf" "$filename.png"
+    fi
 done

manual/qmcpack_manual.cfg

@@ -53,6 +53,7 @@
 \HCode{<pre>}}
 {\HCode{</pre>}\EndNoFonts\endgraf}
 
+\Css{ body{font-family: Arial, Helvetica, DejaVu Sans, sans-serif;} }
 \Css{ .verbatim{border:1px solid; margin:20px 0; padding: 20px; border-radius: 5px; font-family: Courier New !important, Consolas, Monaco, Lucida Console, monospace; white-space: pre !important;} }
 
 \begin{document}

manual/qmcpack_manual.mk4

@@ -46,4 +46,4 @@ Make:image("svg$",function(arg)
      os.execute(cmd)
    end
  end
-)
+)

manual/qmcpack_manual.sty

@@ -19,7 +19,7 @@
 %% The empty bracket below is false condition of the Courier New Check
 \@ifpackageloaded{fontspec}%
                  {%
-\setmainfont{DejaVu Sans Condensed}%
+\setmainfont{XCharter Roman}%
 \@ifpackagelater{fontspec}{2016/01/30}% Guess at when IfFontExistsTF was added.
 {%
 \IfFontExistsTF {DejaVu Sans Mono}%

manual/qmcpack_manual.tex

@@ -12,6 +12,7 @@
 \usepackage{hyperref} %for urls
 %\usepackage{url}
 \usepackage{tabularx}
+\usepackage{xltabular}
 \usepackage{placeins}
 % environment for shaded verbatim
 \usepackage{verbatim}
@@ -46,7 +47,7 @@
 
 \lstset{language=C++,
   basicstyle=\ttfamily \scriptsize,
-  keywordstyle=\color{blue}\ttfamily,//
+  keywordstyle=\color{blue}\ttfamily,
   stringstyle=\color{red}\ttfamily,
   commentstyle=\color{gray}\ttfamily,
   morecomment=[l][\color{magenta}]{\#},

manual/title.tex

@@ -6,9 +6,12 @@
 %{\huge \bfseries QMCPACK \\[0.5cm]}
 %{\large User's Guide and Developer's Manual\\[1cm]}
 %\HRule
-%\includegraphics[width=10cm]{./figures/QMCPACK_logo.pdf} \\
 
+\ifpdf
+\includegraphics[width=10cm]{./figures/QMCPACK_logo.pdf} \\
+\else
 \includegraphics[width=0.8\textwidth]{./figures/QMCPACK_logo.png} \\
+\fi
 {\huge User's Guide and Developer's Manual\\}
 {\huge \QMCPACKver \\}
 {\huge %v1.0\\