aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc_layout.erl
diff options
context:
space:
mode:
authorRichard Carlsson <[email protected]>2011-08-02 13:11:23 +0200
committerHenrik Nord <[email protected]>2011-08-04 11:27:00 +0200
commit403d462964b773516a99726129ea8dcdcc9a96f5 (patch)
tree2a27d637402666c82236878b7a077a9183578936 /lib/edoc/src/edoc_layout.erl
parent07936436b8a8b18b80451a09e040283ebecbd43b (diff)
downloadotp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.gz
otp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.bz2
otp-403d462964b773516a99726129ea8dcdcc9a96f5.zip
synchronized with edoc development version
Diffstat (limited to 'lib/edoc/src/edoc_layout.erl')
-rw-r--r--lib/edoc/src/edoc_layout.erl18
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 3ec87b7060..f7fbe6555e 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -33,7 +33,7 @@
-import(edoc_report, [report/2]).
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
-define(HTML_EXPORT, xmerl_html).
-define(DEFAULT_XML_EXPORT, ?HTML_EXPORT).
@@ -959,12 +959,16 @@ local_label(R) ->
xhtml(Title, CSS, Body) ->
[{html, [?NL,
- {head, [?NL,
- {title, Title},
- ?NL] ++ CSS},
- ?NL,
- {body, [{bgcolor, "white"}], Body},
- ?NL]
+ {head, [?NL,
+ {meta, [{'http-equiv',"Content-Type"},
+ {content, "text/html; charset=ISO-8859-1"}],
+ []},
+ ?NL,
+ {title, Title},
+ ?NL] ++ CSS},
+ ?NL,
+ {body, [{bgcolor, "white"}], Body},
+ ?NL]
},
?NL].