updates

.gitignore

@@ -15,3 +15,4 @@ nafems4.tex
 nafems4.pdf
 nafems4.docx
 nafems4.epub
+nafems4.nafems4.docx

make.sh

@@ -130,9 +130,11 @@ for format in ${formats}; do
 
   if [ -e "${template_file}" ]; then
     template_spec="--template $template_file"
+  else
+    template_spec=""
   fi
   
-  m4 -Doutput_format=${format} markuw.m4 meta.yaml ${name}.md hash.yaml |\
+  m4 markuw.m4 meta.yaml ${name}.md hash.yaml |\
     pandoc -s ${flags} ${template_spec} --filter pandoc-crossref --filter pandoc-citeproc -o ${name}.${format} || exit 1
 
   if [ -z "`git check-ignore ${name}.${format}`" ]; then

markuw.m4

@@ -1,7 +1,6 @@
 divert(`-1')
 changequote(`[[', `]]')
 define(lorem_ipsum, [[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam elit orci, semper sit amet augue sed, vehicula tristique mauris. Quisque tincidunt felis ex, et sodales nisl fermentum eget. Vestibulum nec lacinia diam. Vivamus condimentum porta volutpat. Nam eu malesuada augue. Vestibulum in volutpat massa. Proin nisi magna, lobortis et tincidunt nec, scelerisque sed quam. Phasellus rutrum scelerisque felis vitae vestibulum. Curabitur egestas nulla ac nibh ullamcorper rhoncus. Nam sit amet justo vulputate, consectetur urna eget, mollis nisl. Nunc vitae suscipit urna. Cras fermentum purus lorem, nec rutrum elit faucibus at. Nullam nec maximus orci. Quisque aliquet et metus vel gravida. Vivamus egestas, elit in ullamcorper semper, massa orci dictum tellus, at rhoncus leo dui eget risus.]])
-define(vector_format, ifelse(output_format, [[html]], [[svg]], [[pdf]])) 
 # forloop(var, from, to, stmt) - simple version
 define([[forloop]], [[pushdef([[$1]], [[$2]])_forloop($@)popdef([[$1]])]])
 define([[_forloop]],