- xhtbl: minor improvement

[helm.git] / helm / www / lambdadelta / bin / xhtbl / xmlUnparser.ml

diff --git a/helm/www/lambdadelta/bin/xhtbl/xmlUnparser.ml b/helm/www/lambdadelta/bin/xhtbl/xmlUnparser.ml
index 3583c2f7536e95d045a4dd0776bbf81d4169b8c2..e60a6a46c3e21a792577c35216046de44d41d2d5 100644 (file)
--- a/helm/www/lambdadelta/bin/xhtbl/xmlUnparser.ml
+++ b/helm/www/lambdadelta/bin/xhtbl/xmlUnparser.ml
@@ -14,6 +14,14 @@ let myself = F.basename (Sys.argv.(0))
 
 let msg = P.sprintf "This file was generated by %s, do not edit" myself
 
+let compose uri ext =
+   if uri.[pred (S.length uri)] = '/' then uri else
+   try
+      let i = S.index uri '#' in
+      let uri, fragment = S.sub uri 0 i, S.sub uri i (S.length uri - i) in
+      uri ^ ext ^ fragment
+   with Not_found -> uri ^ ext
+
 let border cell =
    let str = S.make 4 'n' in
    if cell.M.cb.T.n then str.[0] <- 's';   
@@ -22,31 +30,45 @@ let border cell =
    if cell.M.cb.T.w then str.[3] <- 's';
    str :: cell.M.cc
 
+let text baseuri ext = function
+   | T.Plain s              -> s
+   | T.Link (true, uri, s)  -> P.sprintf "<a href=\"%s\">%s</a>" uri s
+   | T.Link (false, uri, s) -> 
+      let uri = !O.baseuri ^ baseuri ^ compose uri ext in
+      P.sprintf "<a href=\"%s\">%s</a>" uri s
+
+let name cell =
+   if cell.M.cn = "" then "" else P.sprintf " id=\"%s\"" cell.M.cn
+
 let key cell =
-   if cell.M.ck = [] then "<br/>" else S.concat " " cell.M.ck
+   if cell.M.ck = [] then "<br/>" else S.concat "" (L.map (text cell.M.cu cell.M.cx) cell.M.ck)
 
 let ind i = S.make (2 * i) ' '
 
 let out_cell och cell =
    let cc = border cell in
-   P.fprintf och "%s<td class=\"%s\">%s</td>\n"
-      (ind (i+4)) (S.concat " " cc) (key cell)
+   P.fprintf och "%s<td class=\"%s\"%s>%s</td>\n"
+      (ind (i+4)) (S.concat " " cc) (name cell) (key cell)
 
 let out_row och row =
    P.fprintf och "%s<tr>\n" (ind (i+3));
    A.iter (out_cell och) row;
    P.fprintf och "%s</tr>\n" (ind (i+3))
 
+let out_space och (name, uri) =
+   let name = if name = "" then name else ":" ^ name in
+   P.fprintf och "                xmlns%s=\"%s\"\n" name uri
+
 (****************************************************************************)
 
-let open_out html name =
+let open_out name spaces =
    let fname = F.concat !O.output_dir (P.sprintf "%s.xsl" name) in
+   let spaces = ("xsl", "http://www.w3.org/1999/XSL/Transform") :: spaces in
    let och = open_out fname in
    P.fprintf och "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n";
    P.fprintf och "<!-- %s -->\n\n" msg;   
    P.fprintf och "<xsl:stylesheet version=\"1.0\"\n";
-   P.fprintf och "                xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n";
-   if html then P.fprintf och "                xmlns=\"http://www.w3.org/1999/xhtml\"\n";
+   L.iter (out_space och) spaces;
    P.fprintf och ">\n\n";
    och
 
@@ -72,7 +94,7 @@ let map_tbls och name =
    P.fprintf och "%s</xsl:when>\n" (ind (i+2))
 
 let write_hook name incs tbls =
-   let och = open_out false name in
+   let och = open_out name [] in
    L.iter (map_incs och) incs;
    P.fprintf och "\n<xsl:template name=\"%s\">\n" name;
    P.fprintf och "%s<xsl:choose>\n" (ind (i+1));