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
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