Update lfe{,-compile} and pandoc

lfe 1.1.1 lfe-compile 0.5.0 pandoc 1.17.2
quasiquoting · Aug 18, 2016 · 5f0b4a3 · 5f0b4a3
1 parent afb3481
commit 5f0b4a3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 61 deletions.
diff --git a/rebar.config b/rebar.config
@@ -1,23 +1,11 @@
 %% -*- erlang -*-
-{erl_opts, []}.
-
-{eunit_compile_opts, [{src_dirs, ["src", "test"]}]}.
 
 {lfe_first_files, ["src/levaindoc-util.lfe"]}.
 
-{deps, []}.
-
 {plugins, [
-  {'lfe-compile', {git, "git://github.com/lfe-rebar3/compile.git",
-                   {tag, "0.4.0"}}}
-]}.
-
-{overrides, [
-  {override, 'lfe-compile', [
-    {deps, [
-      {lfe, {git, "git://github.com/rvirding/lfe.git", {branch, "develop"}}}
-    ]}
-  ]}
+  {'lfe-compile',
+   {git, "git://github.com/lfe-rebar3/compile.git",
+    {tag, "0.5.0"}}}
 ]}.
 
 {provider_hooks, [{pre, [{compile, {lfe, compile}}]}]}.

diff --git a/src/levaindoc-util.lfe b/src/levaindoc-util.lfe
@@ -1,5 +1,5 @@
 (defmodule levaindoc-util
-  (doc "Utility functions for [levaindoc](levaindoc.html).")
+  "Utility functions for [levaindoc](levaindoc.html)."
   ;; Conversions
   (export (input-formats 0) (output-formats 0))
   ;; Random filename
@@ -13,56 +13,56 @@
 (defun input-formats ()
   "The list of supported input formats.
 
-```bash
-$ pandoc --version | head -1
-```
-```
-pandoc 1.15.0.6
-```
+  ```bash
+  $ pandoc --version | head -1
+  ```
+  ```
+  pandoc 1.17.2
+  ```
 
-```bash
-$ pandoc --help | head -6 | tail +2
-```
-```
-Input formats:  commonmark, docbook, docx, epub, haddock, html, json*, latex,
-                markdown, markdown_github, markdown_mmd, markdown_phpextra,
-                markdown_strict, mediawiki, native, opml, org, rst, t2t,
-                textile, twiki
-                [ *only Pandoc's JSON version of native AST]
-```"
+  ```bash
+  $ pandoc --help | head -6 | tail +2
+  ```
+  ```
+  Input formats:  commonmark, docbook, docx, epub, haddock, html, json*, latex,
+                  markdown, markdown_github, markdown_mmd, markdown_phpextra,
+                  markdown_strict, mediawiki, native, odt, opml, org, rst, t2t,
+                  textile, twiki
+                  [ *only Pandoc's JSON version of native AST]
+  ```"
   '["commonmark" "docbook" "docx" "epub" "haddock" "html" "json" "latex"
     "markdown" "markdown_github" "markdown_mmd" "markdown_phpextra"
-    "markdown_strict" "mediawiki" "native" "opml" "org" "rst" "t2t"
-    "textile" "twki"])
+    "markdown_strict" "mediawiki" "native" "odt" "opml" "org" "rst" "t2t"
+    "textile" "twiki"])
 
 (defun output-formats ()
   "The list of supported output formats.
 
-```bash
-$ pandoc --version | head -1
-```
-```
-pandoc 1.15.0.6
-```
+  ```bash
+  $ pandoc --version | head -1
+  ```
+  ```
+  pandoc 1.17.2
+  ```
 
-```bash
-$ pandoc --help | tail +7 | head -7
-```
-```
-Output formats: asciidoc, beamer, commonmark, context, docbook, docx, dokuwiki,
-                dzslides, epub, epub3, fb2, haddock, html, html5, icml, json*,
-                latex, man, markdown, markdown_github, markdown_mmd,
-                markdown_phpextra, markdown_strict, mediawiki, native, odt,
-                opendocument, opml, org, pdf**, plain, revealjs, rst, rtf, s5,
-                slideous, slidy, texinfo, textile
-                [**for pdf output, use latex or beamer and -o FILENAME.pdf]
-```"
-  '["asciidoc" "beamer" "commonmark" "context" "docbook" "docx" "dokuwiki"
-    "dzslides" "epub" "epub3" "fb2" "haddock" "html" "html5" "icml" "json"
-    "latex" "man" "markdown" "markdown_github" "markdown_mmd"
-    "markdown_phpextra" "markdown_strict" "mediawiki" "native" "odt"
-    "opendocument" "opml" "org" "pdf" "plain" "revealjs" "rst" "rtf" "s5"
-    "slideous" "slidy" "texinfo" "textile"])
+  ```bash
+  $ pandoc --help | tail +7 | head -7
+  ```
+  ```
+  Output formats: asciidoc, beamer, commonmark, context, docbook, docbook5, docx,
+                  dokuwiki, dzslides, epub, epub3, fb2, haddock, html, html5,
+                  icml, json*, latex, man, markdown, markdown_github,
+                  markdown_mmd, markdown_phpextra, markdown_strict, mediawiki,
+                  native, odt, opendocument, opml, org, pdf**, plain, revealjs,
+                  rst, rtf, s5, slideous, slidy, tei, texinfo, textile, zimwiki
+                  [**for pdf output, use latex or beamer and -o FILENAME.pdf]
+  ```"
+  '["asciidoc" "beamer" "commonmark" "context" "docbook" "docbook5" "docx"
+    "dokuwiki" "dzslides" "epub" "epub3" "fb2" "haddock" "html" "html5"
+    "icml" "json" "latex" "man" "markdown" "markdown_github"
+    "markdown_mmd" "markdown_phpextra" "markdown_strict" "mediawiki"
+    "native" "odt" "opendocument" "opml" "org" "pdf" "plain" "revealjs"
+    "rst" "rtf" "s5" "slideous" "slidy" "tei" "texinfo" "textile"])
 
 
 ;;;===================================================================

diff --git a/src/levaindoc.lfe b/src/levaindoc.lfe
@@ -1,5 +1,5 @@
 (defmodule levaindoc
-  (doc "A partial LFE port of [Pandex](https://github.com/FilterKaapi/pandex).")
+  "A partial LFE port of [Pandex](https://github.com/FilterKaapi/pandex)."
   ;; API
   (export (convert-string 1) (convert-string 3) (convert-string 4)
           (convert-file   1) (convert-file   3) (convert-file   4))
@@ -13,8 +13,8 @@
 ;;; Conversions
 ;;;===================================================================
 
-;; Define all the conversion functions, unary and binary,
-;; with names of the form, {{input-format}}->{{output-format}}.
+;; Define all the conversion functions, unary and binary, for strings and files,
+;; with the names, {{input-}}->{{output}} and {{input}}-file->{{output}}.
 ;; See include/conversions.lfe for details.
 (defconversions)