lib/Xml_printer: Handle non-breakable spaces.

1 files changed, 107 insertions, 92 deletions

diff --git a/lib/xml_printer.ml b/lib/xml_printer.ml
index af328acbd..be962669a 100644
--- a/lib/xml_printer.ml
+++ b/lib/xml_printer.ml
@@ -17,60 +17,72 @@ type t = target
 let make x = x
 
 let buffer_pcdata tmp text =
-        let l = String.length text in
-        for p = 0 to l-1 do
-                match text.[p] with
-                | '>' -> Buffer.add_string tmp ">"
-                | '<' -> Buffer.add_string tmp "&lt;"
-                | '&' ->
-                        if p < l-1 && text.[p+1] = '#' then
-                                Buffer.add_char tmp '&'
-                        else
-                                Buffer.add_string tmp "&amp;"
-                | '\'' -> Buffer.add_string tmp "&apos;"
-                | '"' -> Buffer.add_string tmp "&quot;"
-                | c -> Buffer.add_char tmp c
-        done
+  let output = Buffer.add_string tmp in
+  let output' = Buffer.add_char tmp in
+  let l = String.length text in
+  for p = 0 to l-1 do
+    match text.[p] with
+      | ' ' -> output "&nbsp;";
+      | '>' -> output "&gt;"
+      | '<' -> output "&lt;"
+      | '&' ->
+        if p < l - 1 && text.[p + 1] = '#' then
+          output' '&'
+        else
+          output "&amp;"
+      | '\'' -> output "&apos;"
+      | '"' -> output "&quot;"
+      | c -> output' c
+  done
 
 let buffer_attr tmp (n,v) =
-        Buffer.add_char tmp ' ';
-        Buffer.add_string tmp n;
-        Buffer.add_string tmp "=\"";
-        let l = String.length v in
-        for p = 0 to l-1 do
-                match v.[p] with
-                | '\\' -> Buffer.add_string tmp "\\\\"
-                | '"' -> Buffer.add_string tmp "\\\""
-                | c -> Buffer.add_char tmp c
-        done;
-        Buffer.add_char tmp '"'
+  let output = Buffer.add_string tmp in
+  let output' = Buffer.add_char tmp in
+  output' ' ';
+  output n;
+  output "=\"";
+  let l = String.length v in
+  for p = 0 to l - 1 do
+    match v.[p] with
+      | '\\' -> output "\\\\"
+      | '"' -> output "\\\""
+      | c -> output' c
+  done;
+  output' '"'
 
 let to_buffer tmp x =
-        let pcdata = ref false in
-        let rec loop = function
-                | Element (tag,alist,[]) ->
-                        Buffer.add_char tmp '<';
-                        Buffer.add_string tmp tag;
-                        List.iter (buffer_attr tmp) alist;
-                        Buffer.add_string tmp "/>";
-                        pcdata := false;
-                | Element (tag,alist,l) ->
-                        Buffer.add_char tmp '<';
-                        Buffer.add_string tmp tag;
-                        List.iter (buffer_attr tmp) alist;
-                        Buffer.add_char tmp '>';
-                        pcdata := false;
-                        List.iter loop l;
-                        Buffer.add_string tmp "</";
-                        Buffer.add_string tmp tag;
-                        Buffer.add_char tmp '>';
-                        pcdata := false;
-                | PCData text ->
-                        if !pcdata then Buffer.add_char tmp ' ';
-                        buffer_pcdata tmp text;
-                        pcdata := true;
-        in
-        loop x
+  let pcdata = ref false in
+  let output = Buffer.add_string tmp in
+  let output' = Buffer.add_char tmp in
+  let rec loop = function
+    | Element (tag,alist,[]) ->
+      output' '<';
+      output tag;
+      List.iter (buffer_attr tmp) alist;
+      output "/>";
+      pcdata := false;
+    | Element (tag,alist,l) ->
+      output' '<';
+      output tag;
+      List.iter (buffer_attr tmp) alist;
+      output' '>';
+      pcdata := false;
+      List.iter loop l;
+      output "</";
+      output tag;
+      output' '>';
+      pcdata := false;
+    | PCData text ->
+      if !pcdata then output' ' ';
+      buffer_pcdata tmp text;
+      pcdata := true;
+  in
+  loop x
+
+let pcdata_to_string s =
+  let b = Buffer.create 13 in
+  buffer_pcdata b s;
+  Buffer.contents b
 
 let to_string x =
   let b = Buffer.create 200 in
@@ -78,51 +90,54 @@ let to_string x =
   Buffer.contents b
 
 let to_string_fmt x =
-        let tmp = Buffer.create 200 in
-        let rec loop ?(newl=false) tab = function
-                | Element (tag,alist,[]) ->
-                        Buffer.add_string tmp tab;
-                        Buffer.add_char tmp '<';
-                        Buffer.add_string tmp tag;
-                        List.iter (buffer_attr tmp) alist;
-                        Buffer.add_string tmp "/>";
-                        if newl then Buffer.add_char tmp '\n';
-                | Element (tag,alist,[PCData text]) ->
-                        Buffer.add_string tmp tab;
-                        Buffer.add_char tmp '<';
-                        Buffer.add_string tmp tag;
-                        List.iter (buffer_attr tmp) alist;
-                        Buffer.add_string tmp ">";
-                        buffer_pcdata tmp text;
-                        Buffer.add_string tmp "</";
-                        Buffer.add_string tmp tag;
-                        Buffer.add_char tmp '>';
-                        if newl then Buffer.add_char tmp '\n';
-                | Element (tag,alist,l) ->
-                        Buffer.add_string tmp tab;
-                        Buffer.add_char tmp '<';
-                        Buffer.add_string tmp tag;
-                        List.iter (buffer_attr tmp) alist;
-                        Buffer.add_string tmp ">\n";
-                        List.iter (loop ~newl:true (tab^"  ")) l;
-                        Buffer.add_string tmp tab;
-                        Buffer.add_string tmp "</";
-                        Buffer.add_string tmp tag;
-                        Buffer.add_char tmp '>';
-                        if newl then Buffer.add_char tmp '\n';
-                | PCData text ->
-                        buffer_pcdata tmp text;
-                        if newl then Buffer.add_char tmp '\n';
-        in
-        loop "" x;
-        Buffer.contents tmp
+  let tmp = Buffer.create 200 in
+  let output = Buffer.add_string tmp in
+  let output' = Buffer.add_char tmp in
+  let rec loop ?(newl=false) tab = function
+    | Element (tag, alist, []) ->
+      output tab;
+      output' '<';
+      output tag;
+      List.iter (buffer_attr tmp) alist;
+      output "/>";
+      if newl then output' '\n';
+    | Element (tag, alist, [PCData text]) ->
+      output tab;
+      output' '<';
+      output tag;
+      List.iter (buffer_attr tmp) alist;
+      output ">";
+      buffer_pcdata tmp text;
+      output "</";
+      output tag;
+      output' '>';
+      if newl then output' '\n';
+    | Element (tag, alist, l) ->
+      output tab;
+      output' '<';
+      output tag;
+      List.iter (buffer_attr tmp) alist;
+      output ">\n";
+      List.iter (loop ~newl:true (tab^"  ")) l;
+      output tab;
+      output "</";
+      output tag;
+      output' '>';
+      if newl then output' '\n';
+    | PCData text ->
+      buffer_pcdata tmp text;
+      if newl then output' '\n';
+  in
+  loop "" x;
+  Buffer.contents tmp
 
 let print t xml =
   let tmp, flush = match t with
     | TChannel oc ->
-        let b = Buffer.create 200 in
-        b, (fun () -> Buffer.output_buffer oc b; flush oc)
-    | TBuffer b -> b, (fun () -> ()) in
+      let b = Buffer.create 200 in
+      b, (fun () -> Buffer.output_buffer oc b; flush oc)
+    | TBuffer b ->
+      b, (fun () -> ())
+  in
   to_buffer tmp xml;
   flush ()
-;;