update in basic_2

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

diff --git a/helm/www/lambdadelta/bin/xhtbl/textUnparser.ml b/helm/www/lambdadelta/bin/xhtbl/textUnparser.ml
index ece6949d920814fb15059a1431b66e182281797a..cf7724cdd64c819f93a3efedef6ebed832c19280 100644 (file)
--- a/helm/www/lambdadelta/bin/xhtbl/textUnparser.ml
+++ b/helm/www/lambdadelta/bin/xhtbl/textUnparser.ml
@@ -44,13 +44,17 @@ let css tc =
 let uri tu tx =
    P.sprintf "@\"%s\" \"%s\"" tu tx
 
+let name tn =
+   P.sprintf "$\"%s\"" tn
+
+
 let text = function
    | T.Plain s              -> P.sprintf "\"%s\"" s
    | T.Link (true, uri, s)  -> P.sprintf "@(\"%s\" \"%s\")" uri s
    | T.Link (false, uri, s) -> P.sprintf "@@(\"%s\" \"%s\")" uri s
 
 let key = function
-   | T.Text sl       -> S.concat " + " (L.map text sl)
+   | T.Text sl       -> S.concat " ^ " (L.map text sl)
    | T.Glue None     -> "*"
    | T.Glue (Some i) -> P.sprintf "%u" i
 
@@ -62,8 +66,8 @@ let entry = function
 
 let open_table st t =
    let str = 
-      P.sprintf "%s[{#%u: %s; %s; %s; %s}\n"    
-         (indent st) t.T.ti (size t.T.ts) (border t.T.tb) (css t.T.tc) (uri t.T.tu t.T.tx)
+      P.sprintf "%s[{#%u: %s; %s; %s; %s; %s}\n"    
+         (indent st) t.T.ti (size t.T.ts) (border t.T.tb) (css t.T.tc) (uri t.T.tu t.T.tx) (name t.T.tn)
    in
    st.out str; add st