aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2010-08-24 15:36:24 +0200
committerLars Thorsen <[email protected]>2010-08-24 15:36:24 +0200
commit1a3e9c8d43a7622f17b3e5799c01f31358a6a0b9 (patch)
tree6c8c30ae4b1d3a01ba15bb693efead9597b88806
parenteebbcdb88ab889ac8422c8eacc1f689dcf5f7266 (diff)
downloadotp-1a3e9c8d43a7622f17b3e5799c01f31358a6a0b9.tar.gz
otp-1a3e9c8d43a7622f17b3e5799c01f31358a6a0b9.tar.bz2
otp-1a3e9c8d43a7622f17b3e5799c01f31358a6a0b9.zip
Fixed problem with a centered table that was transformed into an xml document which then produced mis-formatted html.
-rw-r--r--lib/docbuilder/src/docb_edoc_xml_cb.erl25
1 files changed, 8 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..6700887f82 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,20 +352,13 @@ 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=sup} = E) -> % 7)
Text = get_text(E),