(******************************************************************************)
open MathQL
+open MQueryHTML
-(* string linearization of a reference *)
+(* string linearization of a reference **************************************)
let str_btoken = function
| MQBC s -> s
let xp_str_uref (u, i) =
UriManager.string_of_uri u ^ str_frag true string_of_int i
-(* raw HTML representation *)
-
-let key s = "<font color=\"blue\">" ^ s ^ " </font>"
-
-let sub s = "<font color=\"blue\"> " ^ s ^ " </font>"
-
-let sub2 s = "<font color=\"blue\">" ^ s ^ "</font>"
-
-let sym s = s
-
-let sep s = s
-
-let str s = "<font color=\"red\">'" ^ s ^ "'</font>"
-
-let pat s = "<font color=\"red\">\"" ^ s ^ "\"</font>"
-
-let res s = "<font color=\"brown\">\"" ^ s ^ "\"</font>"
-
-let nl () = "<br>"
-
-let par () = "<p>"
-
-(* HTML representation of a query *)
+(* HTML representation of a query ********************************************)
let out_rvar s = sym s
let rec out_sequence f = function
| [] -> sep "."
| [s] -> f s
- | s :: tail -> f s ^ sep "," ^ out_sequence f tail
+ | s :: tail -> f s ^ sep ", " ^ out_sequence f tail
let out_order = function
| MQAsc -> sub2 "asc"
let out_query = function
| MQList l -> out_list l
-(* HTML representation of a query result *)
+(* HTML representation of a query result ************************************)
let rec out_res_list = function
| [] -> ""
match qr with
| MQRefs l -> out_res_list l
-(* Converting functions *)
+(* Converting functions *****************************************************)
let tref_uref u =
let s = str_uref u in