aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_docgen
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-08-30 15:40:09 +0200
committerLukas Larsson <[email protected]>2012-08-30 15:40:09 +0200
commit24f0d49642ecc0cc566055f1c5b8c49e65c42537 (patch)
treea2389b6e77410aac598884139a93a402ce214554 /lib/erl_docgen
parent07852bfc037ca748ca10049f47330fba80a54ad8 (diff)
parentc0ef28d5eecffc56b72a281a6d73f5ad1504bf0a (diff)
downloadotp-24f0d49642ecc0cc566055f1c5b8c49e65c42537.tar.gz
otp-24f0d49642ecc0cc566055f1c5b8c49e65c42537.tar.bz2
otp-24f0d49642ecc0cc566055f1c5b8c49e65c42537.zip
Merge branch 'lukas/doc-fixes' into maint
* lukas/doc-fixes: Document that CTHs can get fail/skip as Config Ignore calls to dialyzer_timing when checking deprecated Do not verify del_path as it is not always there Fix broken links Generate <a name="name"> tags in edoc xml headings Fix compile warning Fix boken spec
Diffstat (limited to 'lib/erl_docgen')
-rw-r--r--lib/erl_docgen/src/docgen_edoc_xml_cb.erl14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 20daae8215..cbaa93a15d 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -338,7 +338,7 @@ otp_xmlify_e(#xmlElement{name=code} = E) -> % 4)
end;
otp_xmlify_e(#xmlElement{name=Tag} = E) % 5a
when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5 ->
- Content = text_only(E#xmlElement.content),
+ Content = text_and_a_name_only(E#xmlElement.content),
[E#xmlElement{name=b, content=Content}];
otp_xmlify_e(#xmlElement{name=Tag} = E) % 5b-c)
when Tag==center;
@@ -1161,6 +1161,18 @@ get_text(#xmlElement{content=[#xmlText{value=Text}]}) ->
get_text(#xmlElement{content=[E]}) ->
get_text(E).
+%% text_and_name_only(Es) -> Ts
+text_and_a_name_only([#xmlElement{
+ name = a,
+ attributes = [#xmlAttribute{name=name}]} = Name|Es]) ->
+ [Name|text_and_a_name_only(Es)];
+text_and_a_name_only([#xmlElement{content = Content}|Es]) ->
+ text_and_a_name_only(Content) ++ text_and_a_name_only(Es);
+text_and_a_name_only([#xmlText{} = E |Es]) ->
+ [E | text_and_a_name_only(Es)];
+text_and_a_name_only([]) ->
+ [].
+
%% text_only(Es) -> Ts
%% Takes a list of xmlElement and xmlText and return a lists of xmlText.
text_only([#xmlElement{content = Content}|Es]) ->