Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix error handling type macros; fix email

  • Loading branch information...
commit 6e85097766587458a8b983b69dc2a53bf15b8387 1 parent 29c772d
@uwiger uwiger authored
View
12 README.md
@@ -67,7 +67,7 @@ markedoc
The sed script bin/markedoc works in the opposite direction and converts
your `README.md` to an `EDoc` file.
-See [bin/MARKEDOC-README.md](http://github.com/esl/edown/blob/master/bin/MARKEDOC-README.md).
+See [bin/MARKEDOC-README.md](http://github.com/esl/gproc/blob/master/bin/MARKEDOC-README.md).
**FreeBSD, Mac OS X** `$ sed -E -f markedoc.sed <markdown file> > <edoc file>`
@@ -77,9 +77,9 @@ See [bin/MARKEDOC-README.md](http://github.com/esl/edown/blob/master/bin/MARKEDO
<table width="100%" border="0" summary="list of modules">
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_doclet.md" class="module">edown_doclet</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_layout.md" class="module">edown_layout</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_lib.md" class="module">edown_lib</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_make.md" class="module">edown_make</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_xmerl.md" class="module">edown_xmerl</a></td></tr></table>
+<tr><td><a href="http://github.com/esl/gproc/blob/master/doc/edown_doclet.md" class="module">edown_doclet</a></td></tr>
+<tr><td><a href="http://github.com/esl/gproc/blob/master/doc/edown_layout.md" class="module">edown_layout</a></td></tr>
+<tr><td><a href="http://github.com/esl/gproc/blob/master/doc/edown_lib.md" class="module">edown_lib</a></td></tr>
+<tr><td><a href="http://github.com/esl/gproc/blob/master/doc/edown_make.md" class="module">edown_make</a></td></tr>
+<tr><td><a href="http://github.com/esl/gproc/blob/master/doc/edown_xmerl.md" class="module">edown_xmerl</a></td></tr></table>
View
2  doc/edown_doclet.md
@@ -12,7 +12,7 @@ EDoc Doclet module for producing Markdown.
Copyright (c) 2010 Erlang Solutions Ltd
-__Authors:__ Ulf Wiger ([`ulf.wiger@erlang-solutions.com`](mailto:ulf.wiger@erlang-solutions.com)).<a name="index"></a>
+__Authors:__ Ulf Wiger ([`ulf@wiger.net`](mailto:ulf@wiger.net)).<a name="index"></a>
##Function Index##
View
2  doc/edown_layout.md
@@ -12,7 +12,7 @@ Markdown layout module for EDoc.
Copyright (c) 2010 Erlang Solutions Ltd
-__Authors:__ Ulf Wiger ([`ulf.wiger@erlang-solutions.com`](mailto:ulf.wiger@erlang-solutions.com)).<a name="description"></a>
+__Authors:__ Ulf Wiger ([`ulf@wiger.net`](mailto:ulf@wiger.net)).<a name="description"></a>
##Description##
Derived from `edoc_layout`, which is part of the Erlang/OTP application EDoc.
View
2  doc/edown_xmerl.md
@@ -11,7 +11,7 @@
Copyright (c) 2010 Erlang Solutions Ltd
-__Authors:__ Ulf Wiger ([`ulf.wiger@erlang-solutions.com`](mailto:ulf.wiger@erlang-solutions.com)).<a name="index"></a>
+__Authors:__ Ulf Wiger ([`ulf@wiger.net`](mailto:ulf@wiger.net)).<a name="index"></a>
##Function Index##
View
2  src/edown_doclet.erl
@@ -13,7 +13,7 @@
%% See the License for the specific language governing permissions and
%% limitations under the License.
%%==============================================================================
-%% @author Ulf Wiger <ulf.wiger@erlang-solutions.com>
+%% @author Ulf Wiger <ulf@wiger.net>
%% @copyright 2010 Erlang Solutions Ltd
%% @end
%% =============================================================================
View
2  src/edown_layout.erl
@@ -13,7 +13,7 @@
%% See the License for the specific language governing permissions and
%% limitations under the License.
%%==============================================================================
-%% @author Ulf Wiger <ulf.wiger@erlang-solutions.com>
+%% @author Ulf Wiger <ulf@wiger.net>
%% @copyright 2010 Erlang Solutions Ltd
%% @end
%% =====================================================================
View
16 src/edown_xmerl.erl
@@ -13,7 +13,7 @@
%% See the License for the specific language governing permissions and
%% limitations under the License.
%%==============================================================================
-%% @author Ulf Wiger <ulf.wiger@erlang-solutions.com>
+%% @author Ulf Wiger <ulf@wiger.net>
%% @copyright 2010 Erlang Solutions Ltd
%% @end
%% =============================================================================
@@ -174,7 +174,18 @@ md_elem(Tag, Data, Attrs, Parents, E) ->
em -> ["_", no_nl(Data), "_"];
i -> ["_", no_nl(Data), "_"];
tt -> ["`", no_nl(Data), "`"];
- code -> ["`", no_nl(Data), "`"];
+ code ->
+ %% edoc_macros.erl hard-codes expansion of the {@type ...} macro
+ %% as a HTML href inside <code>...</code>
+ case re:run(Data, "<a href=", []) of
+ {match,_} ->
+ %% ["<code>", no_nl(Data), "</code>"];
+ ["<code>", no_nl(Data), "</code>"];
+ _ ->
+ %% ["`", no_nl(Data), "`"]
+ %% Don't strip newlines here, as it messes up the specs
+ ["`", Data, "`"]
+ end;
dl -> Data;
dt -> html_elem(dt, Data, Attrs, Parents, E);
dd -> html_elem(dd, Data, Attrs, Parents, E);
@@ -195,6 +206,7 @@ md_elem(Tag, Data, Attrs, Parents, E) ->
within_html(Tags) ->
lists:any(fun({pre,_}) -> true;
({pre_pre,_}) -> true;
+ ({code,_}) -> true;
({T,_}) -> needs_html(T)
end, Tags).
Please sign in to comment.
Something went wrong with that request. Please try again.