From cb431af03a56ac195862289da474947c2107cdde Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Mon, 5 Oct 2015 12:35:27 +0200 Subject: [erl_docgen] Update DTD for anno tag --- lib/erl_docgen/priv/dtd/common.dtd | 7 ++++--- lib/erl_docgen/priv/dtd/common.header.dtd | 4 ++-- lib/erl_docgen/priv/dtd/common.refs.dtd | 6 +++--- lib/erl_docgen/vsn.mk | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/erl_docgen') diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index ded16d308f..5297b510ab 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -25,7 +25,7 @@ + url|marker|anno" > @@ -37,8 +37,9 @@ - + + @@ -64,7 +65,7 @@ - + diff --git a/lib/erl_docgen/priv/dtd/common.header.dtd b/lib/erl_docgen/priv/dtd/common.header.dtd index 71a8662572..eb27dc8f97 100644 --- a/lib/erl_docgen/priv/dtd/common.header.dtd +++ b/lib/erl_docgen/priv/dtd/common.header.dtd @@ -18,8 +18,8 @@ $Id$ --> + prepared?,responsible?,docno?,approved?, + checked?,date?,rev?,file?) > diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd index a59462bb3f..a32c34536d 100644 --- a/lib/erl_docgen/priv/dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/dtd/common.refs.dtd @@ -27,11 +27,12 @@ - + -- cgit v1.2.3 From 39f4c81043c00e2e1284855b07f5181b6ac28841 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Fri, 16 Oct 2015 12:57:24 +0200 Subject: [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic). --- lib/erl_docgen/priv/dtd/cites.dtd | 2 +- lib/erl_docgen/priv/dtd/common.dtd | 15 ++++++++------- lib/erl_docgen/priv/dtd/common.refs.dtd | 11 ++++++----- lib/erl_docgen/priv/dtd/erlref.dtd | 3 ++- lib/erl_docgen/priv/dtd/terms.dtd | 2 +- lib/erl_docgen/src/docgen_edoc_xml_cb.erl | 24 ++++++++++-------------- 6 files changed, 28 insertions(+), 29 deletions(-) (limited to 'lib/erl_docgen') diff --git a/lib/erl_docgen/priv/dtd/cites.dtd b/lib/erl_docgen/priv/dtd/cites.dtd index 73931af009..4558947db0 100644 --- a/lib/erl_docgen/priv/dtd/cites.dtd +++ b/lib/erl_docgen/priv/dtd/cites.dtd @@ -30,7 +30,7 @@ - + diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index cfaf3ead3b..0e7467da36 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -24,13 +24,13 @@ - - - - + + + @@ -38,7 +38,8 @@ - + + @@ -66,12 +67,12 @@ - + - + diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd index a32c34536d..6889e990de 100644 --- a/lib/erl_docgen/priv/dtd/common.refs.dtd +++ b/lib/erl_docgen/priv/dtd/common.refs.dtd @@ -27,15 +27,15 @@ - + - + - + @@ -44,5 +44,6 @@ warning|note|dont|do)*) > - - + + diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd index d62e2a5fcb..835407520a 100644 --- a/lib/erl_docgen/priv/dtd/erlref.dtd +++ b/lib/erl_docgen/priv/dtd/erlref.dtd @@ -32,4 +32,5 @@ + clause_i CDATA #IMPLIED + n_vars CDATA #IMPLIED> diff --git a/lib/erl_docgen/priv/dtd/terms.dtd b/lib/erl_docgen/priv/dtd/terms.dtd index fd160b5c02..c2965eb61c 100644 --- a/lib/erl_docgen/priv/dtd/terms.dtd +++ b/lib/erl_docgen/priv/dtd/terms.dtd @@ -30,7 +30,7 @@ - + diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl index 03fc161c5a..0ac7985a48 100644 --- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl +++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2012. All Rights Reserved. +%% Copyright Ericsson AB 2001-2015. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -352,8 +352,8 @@ 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_and_a_name_only(E#xmlElement.content), - [E#xmlElement{name=b, content=Content}]; + {Name, Text} = text_and_a_name_only(E#xmlElement.content), + [Name, E#xmlElement{name=b, content=Text}]; otp_xmlify_e(#xmlElement{name=Tag} = E) % 5b-c) when Tag==center; Tag==font -> @@ -1190,17 +1190,13 @@ 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_and_name_only(Es) -> {N, Ts} +text_and_a_name_only(Es) -> + [Name|_] = [Name || + #xmlElement{ + name = a, + attributes = [#xmlAttribute{name=name}]}=Name <- Es], + {Name#xmlElement{content = []}, text_only(Es)}. %% text_only(Es) -> Ts %% Takes a list of xmlElement and xmlText and return a lists of xmlText. -- cgit v1.2.3 From dd521867851c169fbab15465e9d137eb515a5ed5 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Fri, 16 Oct 2015 13:04:33 +0200 Subject: [erl_docgen] Add conversion of the i tag in the XSL specs --- lib/erl_docgen/priv/xsl/db_html.xsl | 5 ++++- lib/erl_docgen/priv/xsl/db_man.xsl | 6 ++++++ lib/erl_docgen/priv/xsl/db_pdf.xsl | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/erl_docgen') diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl index f5ddd364d3..c2325fbee9 100644 --- a/lib/erl_docgen/priv/xsl/db_html.xsl +++ b/lib/erl_docgen/priv/xsl/db_html.xsl @@ -990,12 +990,15 @@

- + + + +
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl index 120bf9880d..5201465e42 100644 --- a/lib/erl_docgen/priv/xsl/db_man.xsl +++ b/lib/erl_docgen/priv/xsl/db_man.xsl @@ -595,6 +595,12 @@ \fR\& + + \fI + + \fR\& + + diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl index 53e202d52c..37a2d55274 100644 --- a/lib/erl_docgen/priv/xsl/db_pdf.xsl +++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl @@ -1186,6 +1186,12 @@ + + + + + + -- cgit v1.2.3 From 03dfbda168896807c75bd396262a3de060a91b13 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Thu, 19 Nov 2015 09:53:33 +0100 Subject: [erl_docgen] Allow br in the tag of tagged lists --- lib/erl_docgen/priv/dtd/common.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/erl_docgen') diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd index 0e7467da36..a29fc233fa 100644 --- a/lib/erl_docgen/priv/dtd/common.dtd +++ b/lib/erl_docgen/priv/dtd/common.dtd @@ -67,7 +67,7 @@ - + -- cgit v1.2.3