diff options
author | Lars Thorsen <lars@erlang.org> | 2010-08-31 10:57:36 +0200 |
---|---|---|
committer | Lars Thorsen <lars@erlang.org> | 2010-08-31 10:57:36 +0200 |
commit | d6d9b62971fd2ff09e4d7d49e0bf59f2e4e92acd (patch) | |
tree | 9847d5117c0aee276f014ce7c9fbca4dde031323 /lib | |
parent | 6c1e6acc7800189dcc5ae741192de9c1255b133f (diff) | |
parent | 342b8ecce99c2fb88919eb5decec9fe6437177ab (diff) | |
download | otp-d6d9b62971fd2ff09e4d7d49e0bf59f2e4e92acd.tar.gz otp-d6d9b62971fd2ff09e4d7d49e0bf59f2e4e92acd.tar.bz2 otp-d6d9b62971fd2ff09e4d7d49e0bf59f2e4e92acd.zip |
Merge branch 'lars/docbuilder/center-tag-problem-in-edoc-to-xml/OTP-8784' into dev
* lars/docbuilder/center-tag-problem-in-edoc-to-xml/OTP-8784:
Fixed problem with tbody when all tables are handled the same.
Fixed problem with a centered table that was transformed into an xml document which then produced mis-formatted html.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/docbuilder/src/docb_edoc_xml_cb.erl | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/docbuilder/src/docb_edoc_xml_cb.erl b/lib/docbuilder/src/docb_edoc_xml_cb.erl index f5cfc0fe18..90491bc007 100644 --- a/lib/docbuilder/src/docb_edoc_xml_cb.erl +++ b/lib/docbuilder/src/docb_edoc_xml_cb.erl @@ -340,9 +340,7 @@ otp_xmlify_e(#xmlElement{name=code} = E) -> % 4) [E#xmlElement{content=Content}] end; otp_xmlify_e(#xmlElement{name=Tag} = E) % 5a - when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5; - Tag==center; - Tag==font -> + when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5 -> Content = text_only(E#xmlElement.content), [E#xmlElement{name=b, content=Content}]; otp_xmlify_e(#xmlElement{name=Tag} = E) % 5b-c) @@ -354,21 +352,16 @@ otp_xmlify_e(#xmlElement{name=table} = E) -> % 6) module -> otp_xmlify_table(E#xmlElement.content); overview -> - case get_attrval(border, E) of - "" -> % implies border="0" - [{p, otp_xmlify_table(E#xmlElement.content)}]; - "0" -> - [{p, otp_xmlify_table(E#xmlElement.content)}]; - _Val -> - Content0 = otp_xmlify_e(E#xmlElement.content), - Summary = #xmlText{value=get_attrval(summary, E)}, - TCaption = E#xmlElement{name=tcaption, - attributes=[], - content=[Summary]}, - Content = Content0 ++ [TCaption], - [E#xmlElement{attributes=[], content=Content}] - end + Content0 = otp_xmlify_e(E#xmlElement.content), + Summary = #xmlText{value=get_attrval(summary, E)}, + TCaption = E#xmlElement{name=tcaption, + attributes=[], + content=[Summary]}, + Content = Content0 ++ [TCaption], + [E#xmlElement{attributes=[], content=Content}] end; +otp_xmlify_e(#xmlElement{name=tbody} = E) -> + otp_xmlify_e(E#xmlElement.content); otp_xmlify_e(#xmlElement{name=sup} = E) -> % 7) Text = get_text(E), [#xmlText{parents = E#xmlElement.parents, |