Merge branch 'upstream-master' into dev

Conflicts: rebar.config
hibari · Nov 6, 2015 · 42d792a · 42d792a
2 parents f13353c + 3fee280
commit 42d792a
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: erlang
 script: "make clean compile xref test"
 otp_release:
-  - R16B
-  - R15B02
-  - R14B04
+  - 17.1
+  - R16B03-1
+  - R15B03
diff --git a/README.md b/README.md
@@ -2,9 +2,10 @@
 
 # AsciiEDoc - EDoc extension for generating HTML or Github-flavored Markdown from AsciiDoc sources #
 
-Copyright (c) 2011-2013 by Joseph Wayne Norton
+Copyright (c) 2011-2015 by Joseph Wayne Norton
 
 __Authors:__ Joseph Wayne Norton ([`norton@alum.mit.edu`](mailto:norton@alum.mit.edu)).
+
 <p>AsciiEdoc is an Erlang application that integrates AsciiDoc with EDoc
 or EDoc with EDown.  This may sound a little crazy at first but the
 primary reasons are:</p>
@@ -92,13 +93,3 @@ General Public License version 2</em> (GPLv2).</p>
 
 
 
-
-
-## Modules ##
-
-
-<table width="100%" border="0" summary="list of modules">
-<tr><td><a href="https://github.com/norton/asciiedoc/blob/master/doc/asciiedoc_doclet.md" class="module">asciiedoc_doclet</a></td></tr>
-<tr><td><a href="https://github.com/norton/asciiedoc/blob/master/doc/asciiedoc_lib.md" class="module">asciiedoc_lib</a></td></tr>
-<tr><td><a href="https://github.com/norton/asciiedoc/blob/master/doc/asciiedown_doclet.md" class="module">asciiedown_doclet</a></td></tr></table>
-
diff --git a/doc/README.md b/doc/README.md
@@ -2,9 +2,10 @@
 
 # AsciiEDoc - EDoc extension for generating HTML or Github-flavored Markdown from AsciiDoc sources #
 
-Copyright (c) 2011-2013 by Joseph Wayne Norton
+Copyright (c) 2011-2015 by Joseph Wayne Norton
 
 __Authors:__ Joseph Wayne Norton ([`norton@alum.mit.edu`](mailto:norton@alum.mit.edu)).
+
 <p>AsciiEdoc is an Erlang application that integrates AsciiDoc with EDoc
 or EDoc with EDown.  This may sound a little crazy at first but the
 primary reasons are:</p>
@@ -92,13 +93,3 @@ General Public License version 2</em> (GPLv2).</p>
 
 
 
-
-
-## Modules ##
-
-
-<table width="100%" border="0" summary="list of modules">
-<tr><td><a href="asciiedoc_doclet.md" class="module">asciiedoc_doclet</a></td></tr>
-<tr><td><a href="asciiedoc_lib.md" class="module">asciiedoc_lib</a></td></tr>
-<tr><td><a href="asciiedown_doclet.md" class="module">asciiedown_doclet</a></td></tr></table>
-
diff --git a/doc/asciiedoc_doclet.md b/doc/asciiedoc_doclet.md
@@ -4,7 +4,6 @@
 * [Function Index](#index)
 * [Function Details](#functions)
 
-
 <a name="index"></a>
 
 ## Function Index ##
@@ -23,18 +22,15 @@
 
 `expand_text(Cs, L) -> any()`
 
-
 <a name="parse_xml-2"></a>
 
 ### parse_xml/2 ###
 
 `parse_xml(Data, Line) -> any()`
 
-
 <a name="run-2"></a>
 
 ### run/2 ###
 
 `run(Cmd, Ctxt) -> any()`
 
-
diff --git a/doc/asciiedoc_lib.md b/doc/asciiedoc_lib.md
@@ -4,7 +4,6 @@
 * [Function Index](#index)
 * [Function Details](#functions)
 
-
 <a name="index"></a>
 
 ## Function Index ##
@@ -23,18 +22,15 @@
 
 `expand_text(Cs, L) -> any()`
 
-
 <a name="parse_xml-2"></a>
 
 ### parse_xml/2 ###
 
 `parse_xml(Data, Line) -> any()`
 
-
 <a name="run-3"></a>
 
 ### run/3 ###
 
 `run(Mod, Cmd, Ctxt) -> any()`
 
-
diff --git a/doc/asciiedown_doclet.md b/doc/asciiedown_doclet.md
@@ -4,7 +4,6 @@
 * [Function Index](#index)
 * [Function Details](#functions)
 
-
 <a name="index"></a>
 
 ## Function Index ##
@@ -23,18 +22,15 @@
 
 `expand_text(Cs, L) -> any()`
 
-
 <a name="parse_xml-2"></a>
 
 ### parse_xml/2 ###
 
 `parse_xml(Data, Line) -> any()`
 
-
 <a name="run-2"></a>
 
 ### run/2 ###
 
 `run(Cmd, Ctxt) -> any()`
 
-
diff --git a/doc/edoc-info b/doc/edoc-info
@@ -1,4 +1,3 @@
 %% encoding: UTF-8
 {application,asciiedoc}.
-{packages,[]}.
 {modules,[asciiedoc_doclet,asciiedoc_lib,asciiedown_doclet]}.
diff --git a/doc/overview.edoc b/doc/overview.edoc
@@ -1,7 +1,7 @@
 %% -*- Doc -*-
 %% vim: set syntax=asciidoc:
 @author Joseph Wayne Norton <norton@alum.mit.edu>
-@copyright 2011-2013 by Joseph Wayne Norton
+@copyright 2011-2015 by Joseph Wayne Norton
 @title AsciiEDoc - EDoc extension for generating HTML or Github-flavored Markdown from AsciiDoc sources
 @doc
 AsciiEdoc is an Erlang application that integrates AsciiDoc with EDoc

diff --git a/rebar b/rebar
diff --git a/rebar.config b/rebar.config
@@ -1,6 +1,6 @@
 %%% -*- mode: erlang -*-
 
-{require_otp_vsn, "R14|R15|R16|17"}.
+{require_otp_vsn, "R15|R16|17|18"}.
 
 {erl_opts, [warnings_as_errors]}.
 

diff --git a/src/asciiedoc_doclet.erl b/src/asciiedoc_doclet.erl
@@ -1,6 +1,6 @@
 %% The MIT License
 %%
-%% Copyright (C) 2011-2013 by Joseph Wayne Norton <norton@alum.mit.edu>
+%% Copyright (C) 2011-2015 by Joseph Wayne Norton <norton@alum.mit.edu>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal

diff --git a/src/asciiedoc_lib.erl b/src/asciiedoc_lib.erl
@@ -1,6 +1,6 @@
 %% The MIT License
 %%
-%% Copyright (C) 2011-2013 by Joseph Wayne Norton <norton@alum.mit.edu>
+%% Copyright (C) 2011-2015 by Joseph Wayne Norton <norton@alum.mit.edu>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal
@@ -44,6 +44,7 @@ run(Mod, Cmd, Ctxt) ->
         meck:expect(edoc_wiki, parse_xml, fun parse_xml/2),
         meck:expect(edoc_wiki, expand_text, fun expand_text/2),
         meck:expect(edown_lib, redirect_uri, fun(E) -> redirect_uri(TopLevelReadme, E) end),
+        meck:expect(edown_lib, export, fun(D, O) -> meck:passthrough([D, O]) end),
         %% NOTE: Enable edoc_doclet for HTML output
         %% edoc_doclet:run(Cmd, Ctxt)
         Mod:run(Cmd, Ctxt)
@@ -77,7 +78,7 @@ throw_error(L, D) ->
 %% expand_text/2
 expand_text(Cs, L) ->
     DirName = filename:join(["/", "tmp", ?MODULE_STRING]),
-    {A,B,C}=now(),
+    {A,B,C} = my_now(),
     Unique = lists:flatten(io_lib:format("~p-~p.~p.~p",[node(),A,B,C])),
     FileName = filename:join([DirName, Unique]),
     In = FileName ++ ".in",
@@ -157,3 +158,11 @@ get_attr(Name, [_ | As]) ->
     get_attr(Name, As);
 get_attr(_, []) ->
     [].
+
+my_now() ->
+    case erlang:function_exported(erlang, timestamp, 0) of
+        true ->
+            erlang:timestamp();
+        false ->
+            apply(erlang, now, [])
+    end.
diff --git a/src/asciiedown_doclet.erl b/src/asciiedown_doclet.erl
@@ -1,6 +1,6 @@
 %% The MIT License
 %%
-%% Copyright (C) 2011-2013 by Joseph Wayne Norton <norton@alum.mit.edu>
+%% Copyright (C) 2011-2015 by Joseph Wayne Norton <norton@alum.mit.edu>
 %%
 %% Permission is hereby granted, free of charge, to any person obtaining a copy
 %% of this software and associated documentation files (the "Software"), to deal