- addded unicode_of_tex

- added \neq macro

diff --git a/helm/ocaml/utf8_macros/data/extra-entities.xml b/helm/ocaml/utf8_macros/data/extra-entities.xml
index 991c2d84b6fc746cd3d4b544b6b425bf86f0d9e9..e99c548e2bdd6e522e05b5299536839d564f472d 100644 (file)
--- a/helm/ocaml/utf8_macros/data/extra-entities.xml
+++ b/helm/ocaml/utf8_macros/data/extra-entities.xml
@@ -2,4 +2,5 @@
 
 <entities-table>
   <entity name="def" value="&#x0225d;"/>  <!-- ≝ -->
+  <entity name="neq" value="&#x02260;"/>  <!-- ≠ -->
 </entities-table>

diff --git a/helm/ocaml/utf8_macros/utf8Macro.ml b/helm/ocaml/utf8_macros/utf8Macro.ml
index 4e0bc9498992a7d14ef22b53992c6c7f5998eec8..51465046bec635f52dcc9428dfa5e9f6103bb122 100644 (file)
--- a/helm/ocaml/utf8_macros/utf8Macro.ml
+++ b/helm/ocaml/utf8_macros/utf8Macro.ml
@@ -31,3 +31,10 @@ let expand macro =
     Hashtbl.find Utf8MacroTable.macro2utf8 macro
   with Not_found -> raise (Macro_not_found macro)
 
+let unicode_of_tex s =
+  try
+    if s.[0] = '\\' then
+      expand (String.sub s 1 (String.length s - 1))
+    else s
+  with Macro_not_found _ -> s
+

diff --git a/helm/ocaml/utf8_macros/utf8Macro.mli b/helm/ocaml/utf8_macros/utf8Macro.mli
index bf3fc16b44383bcb6c27c083fa67cba6b19e194a..9220365d1aba9fc06887e6a19894fc2381730583 100644 (file)
--- a/helm/ocaml/utf8_macros/utf8Macro.mli
+++ b/helm/ocaml/utf8_macros/utf8Macro.mli
@@ -26,7 +26,12 @@
 exception Macro_not_found of string
 exception Utf8_not_found of string
 
-  (* @param macro name
+  (** @param macro name
      @return utf8 string *)
 val expand: string -> string
 
+  (** @param tex TeX like command (e.g. \forall, \lnot, ...)
+   * @return unicode character corresponding to the command if it exists, or the
+   * unchanged command if not *)
+val unicode_of_tex: string -> string
+

diff --git a/helm/ocaml/utf8_macros/utf8MacroTable.ml b/helm/ocaml/utf8_macros/utf8MacroTable.ml
index d33361f3d51b863c73e58ac8d3d53d1e3f87d658..a97e8faf1103bde84d24d9cdc0b903c0be45b096 100644 (file)
--- a/helm/ocaml/utf8_macros/utf8MacroTable.ml
+++ b/helm/ocaml/utf8_macros/utf8MacroTable.ml
@@ -2012,6 +2012,7 @@ let _ = Hashtbl.add macro2utf8 "rarrpl" "\226\165\133"
 let _ = Hashtbl.add macro2utf8 "auml" "\195\164"
 let _ = Hashtbl.add macro2utf8 "bmod" "mod"
 let _ = Hashtbl.add macro2utf8 "SquareSuperset" "\226\138\144"
+let _ = Hashtbl.add macro2utf8 "neq" "\226\137\160"
 let _ = Hashtbl.add macro2utf8 "circleddash" "\226\138\157"
 let _ = Hashtbl.add macro2utf8 "xrarr" "\239\149\183"
 let _ = Hashtbl.add macro2utf8 "barwed" "\226\138\188"