use PxpHelmConf

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index 537f1950469ecb836f70c0577f20ce36231806eb..932008160ac3e0ab045b91a608322e23782ce34c 100644 (file)
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,8 +1,8 @@
 
 PACKAGE = cic_textual_parser2
 REQUIRES = \
-       helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
-       ulex pxp camlp4.gramlib
+       helm-tactics helm-logger helm-cic_unification helm-cic_transformations helm-pxp \
+       ulex camlp4.gramlib
 NOTATIONS = logic arit tex
 # NOTATIONS = logic arit
 INTERFACE_FILES = \
@@ -55,7 +55,7 @@ test_lexer: test_lexer.ml $(PACKAGE).cma
 test_parser: test_parser.ml $(PACKAGE).cma
        $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 make_table: make_table.ml
-       $(OCAMLFIND) ocamlc -package pxp -linkpkg -o $@ $^
+       $(OCAMLFIND) ocamlc -package helm-pxp -linkpkg -o $@ $^
 
 macro_table.ml: make_table
        ./make_table $@

diff --git a/helm/ocaml/cic_disambiguation/make_table.ml b/helm/ocaml/cic_disambiguation/make_table.ml
index dc4a335355d0f7b50d93c5a6c725d3dd99e9358b..9aaa4a06c8bd28fa10c89de8104a2885d4ab0583 100644 (file)
--- a/helm/ocaml/cic_disambiguation/make_table.ml
+++ b/helm/ocaml/cic_disambiguation/make_table.ml
@@ -91,7 +91,7 @@ let parse_from_xml () =
     List.iter
       (fun (typ, fname) ->
         let entry = `Entry_document [ `Extend_dtd_fully; `Parse_xml_decl ] in
-        let config = { default_config with encoding = `Enc_utf8 } in
+        let config = PxpHelmConf.pxp_config in
         let entity_manager =
           create_entity_manager ~is_document:true config (from_file fname)
         in