4 files changed, 79 insertions, 9 deletions

diff --git a/data/bash_completion.tpl b/data/bash_completion.tpl
new file mode 100644
index 000000000..6d7e17215
--- /dev/null
+++ b/data/bash_completion.tpl
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# This script enables bash autocompletion for pandoc.  To enable
+# bash completion, add this to your .bashrc:
+# eval "$(pandoc --bash-completion)"
+
+_pandoc()
+{
+    local cur prev opts lastc informats outformats datadir
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    # These should be filled in by pandoc:
+    opts="%s"
+    informats="%s"
+    outformats="%s"
+    datadir="%s"
+
+    case "${prev}" in
+         --from|-f|--read|-r)
+             COMPREPLY=( $(compgen -W "${informats}" -- ${cur}) )
+             return 0
+             ;;
+         --to|-t|--write|-w|-D|--print-default-template)
+             COMPREPLY=( $(compgen -W "${outformats}" -- ${cur}) )
+             return 0
+             ;;
+         --email-obfuscation)
+             COMPREPLY=( $(compgen -W "references javascript none" -- ${cur}) )
+             return 0
+             ;;
+         --latex-engine)
+             COMPREPLY=( $(compgen -W "pdflatex lualatex xelatex" -- ${cur}) )
+             return 0
+             ;;
+         --print-default-data-file)
+             COMPREPLY=( $(compgen -W "reference.odt reference.docx $(find ${datadir} | sed -e 's/.*\/data\///')" -- ${cur}) )
+             return 0
+             ;;
+         --highlight-style)
+             COMPREPLY=( $(compgen -W "pygments tango espresso zenburn kate monochrome haddock" -- ${cur}) )
+             return 0
+             ;;
+         *)
+             ;;
+    esac
+
+    case "${cur}" in
+         -*)
+             COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+             return 0
+             ;;
+         *)
+             COMPREPLY=( $(compgen -f ${cur}) )
+             return 0
+             ;;
+    esac
+
+}
+
+complete -F _pandoc pandoc
diff --git a/data/epub.css b/data/epub.css
index 1ea24680d..594a1e01e 100644
--- a/data/epub.css
+++ b/data/epub.css
@@ -12,4 +12,7 @@ h2.author { }
 h3.date { }
 ol.toc { padding: 0; margin-left: 1em; }
 ol.toc li { list-style-type: none; margin: 0; padding: 0; }
-a.footnoteRef { vertical-align: super; }
\ No newline at end of file
+a.footnoteRef { vertical-align: super; }
+em, em em em, em em em em em { font-style: italic;}
+em em, em em em em { font-style: normal; }
+
diff --git a/data/sample.lua b/data/sample.lua
index f5c17839e..fa265d04d 100644
--- a/data/sample.lua
+++ b/data/sample.lua
@@ -84,7 +84,7 @@ function Doc(body, metadata, variables)
     end
     add('</ol>')
   end
-  return table.concat(buffer,'\n')
+  return table.concat(buffer,'\n') .. '\n'
 end
 
 -- The functions that follow render corresponding pandoc elements.
@@ -251,6 +251,12 @@ function html_align(align)
   end
 end
 
+function CaptionedImage(src, tit, caption)
+   return '<div class="figure">\n<img src="' .. escape(src,true) ..
+      '" title="' .. escape(tit,true) .. '"/>\n' ..
+      '<p class="caption">' .. caption .. '</p>\n</div>'
+end
+
 -- Caption is a string, aligns is an array of strings,
 -- widths is an array of floats, headers is an array of
 -- strings, rows is an array of arrays of strings.
diff --git a/data/templates b/data/templates
-Subproject d171db3e6d28134e0f98ba10c60ac8c13380a48
+Subproject ff9ebaa31ae31401e236574e81c2e75609adc72