From 7f00144160c8e0202cfe7368830bdd472bc73505 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 3 Dec 2012 12:36:49 +0100
Subject: [erl_docgen] Update due to introduction of Unicode

---
 lib/erl_docgen/src/docgen_edoc_xml_cb.erl  | 18 +++++++++++++++---
 lib/erl_docgen/src/docgen_xmerl_xml_cb.erl |  9 +++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'lib/erl_docgen/src')

diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index cbaa93a15d..ec7c3ef8e5 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -39,12 +39,14 @@
 module(Element, Opts) ->
     SortP = proplists:get_value(sort_functions, Opts, true),
     XML = layout_module(Element, SortP),
-    xmerl:export_simple([XML], docgen_xmerl_xml_cb, []).
+    RootAttributes = root_attributes(Element, Opts),
+    xmerl:export_simple([XML], docgen_xmerl_xml_cb, RootAttributes).
 
 %% CHAPTER
-overview(Element, _Opts) ->
+overview(Element, Opts) ->
     XML = layout_chapter(Element),
-    xmerl:export_simple([XML], docgen_xmerl_xml_cb, []).
+    RootAttributes = root_attributes(Element, Opts),
+    xmerl:export_simple([XML], docgen_xmerl_xml_cb, RootAttributes).
 
 %%--Internal functions--------------------------------------------------
 
@@ -99,6 +101,16 @@ layout_module(#xmlElement{name = module, content = Es}=E, SortP) ->
       ?NL,Authors]
     }.
 
+root_attributes(Element, Opts) ->
+    Encoding = case get_attrval(encoding, Element) of
+                   "" ->
+                       DefaultEncoding = epp:default_encoding(),
+                       proplists:get_value(encoding, Opts, DefaultEncoding);
+                   Enc ->
+                       Enc
+               end,
+    [#xmlAttribute{name=encoding, value=Encoding}].
+
 layout_chapter(#xmlElement{name=overview, content=Es}) ->
     Title = get_text(title, Es),
     Header = {header, [
diff --git a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
index 884932ed12..253019ffd6 100644
--- a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
@@ -35,9 +35,14 @@
 '#xml-inheritance#'() ->
     [xmerl_xml].
 
-'#root#'(Data, _Attrs, [], _E) -> 
+'#root#'(Data, Attrs, [], _E) ->
+    Encoding =
+        case [E || #xmlAttribute{name = encoding, value = E} <- Attrs] of
+            [E] -> E;
+            _ -> atom_to_list(epp:default_encoding())
+        end,
     ["<",DTD,">"] = hd(hd(Data)),
-    ["<?xml version=\"1.0\" encoding=\"latin1\" ?>\n",
+    ["<?xml version=\"1.0\" encoding=\"",Encoding,"\" ?>\n",
      "<!DOCTYPE "++DTD++" SYSTEM \""++DTD++".dtd\">\n",
      Data].
 
-- 
cgit v1.2.3