Attachment #121303 for bug #181032

View | Details | Raw Unified | Return to bug 181032
Collapse All | Expand All

Lines 15-21 Link Here

(-)galax-0.7.2/base/galax_camomile.ml (-2 / +3 lines)
15	This module is a wrapper over Camomile operations.	15	This module is a wrapper over Camomile operations.
16	*)	16	*)
17		17
18	module TextUTF8 = Camomile.UNF.Make(Camomile.UTF8)	18	module TextUTF8 = CamomileLibrary.Default.Camomile.UNF.Make(
		19	CamomileLibrary.Default.Camomile.UTF8)
19		20
20	let nfc x = TextUTF8.nfc x	21	let nfc x = TextUTF8.nfc x
21	let nfd x = TextUTF8.nfd x	22	let nfd x = TextUTF8.nfd x
Lines 35-39 Link Here
35	Buffer.contents b	36	Buffer.contents b
36		37
37	let utf8_codepoint_compare s1 s2 =	38	let utf8_codepoint_compare s1 s2 =
38	Camomile.UTF8.compare s1 s2	39	CamomileLibrary.Default.Camomile.UTF8.compare s1 s2
39		40

Lines 1058-1067 Link Here

(-)galax-0.7.2/code_selection/code/code_fn.ml (-2 / +2 lines)
1058	begin	1058	begin
1059	try	1059	try
1060	let codept_list = ref [] in	1060	let codept_list = ref [] in
1061	Camomile.UTF8.iter (fun uc -> let ic = Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';	1061	CamomileLibrary.Default.Camomile.UTF8.iter (fun uc -> let ic = CamomileLibrary.Default.Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';
1062	Cursor.cursor_of_list (List.map (fun i -> _integer (Decimal._integer_of_int i)) (!codept_list))	1062	Cursor.cursor_of_list (List.map (fun i -> _integer (Decimal._integer_of_int i)) (!codept_list))
1063	with	1063	with
1064	\| Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))	1064	\| CamomileLibrary.Default.Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
1065	end	1065	end
1066	(* F&O Section 7.5.1 fn:contains *)	1066	(* F&O Section 7.5.1 fn:contains *)
1067		1067

Lines 762-768 Link Here

(-)galax-0.7.2/configure (-2 / +2 lines)
762	printf "%s" "Checking for Camomile..."	762	printf "%s" "Checking for Camomile..."
763	if [ -z "$ocaml_camomile" ]	763	if [ -z "$ocaml_camomile" ]
764	then	764	then
765	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomile.cmi" ]	765	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomileLibrary.cmi" ]
766	then	766	then
767	ocaml_camomile="$ocaml_pkglib/camomile"	767	ocaml_camomile="$ocaml_pkglib/camomile"
768	elif [ -n "$tool_ocamlfind" ]	768	elif [ -n "$tool_ocamlfind" ]
Lines 770-776 Link Here
770	ocaml_camomile=`$tool_ocamlfind query camomile 2>/dev/null`	770	ocaml_camomile=`$tool_ocamlfind query camomile 2>/dev/null`
771	fi	771	fi
772	fi	772	fi
773	if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomile.cmi" ]	773	if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibrary.cmi" ]
774	then	774	then
775	echo "found"	775	echo "found"
776	else	776	else

Return to bug 181032