From 06fd76163b857a056ac44e7437efa17656f06e5b Mon Sep 17 00:00:00 2001 From: Pierre Courtieu Date: Wed, 8 Mar 2017 15:49:39 +0100 Subject: Fixing unicode tokens in generic code and in coq. --- coq/coq-unicode-tokens.el | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'coq/coq-unicode-tokens.el') diff --git a/coq/coq-unicode-tokens.el b/coq/coq-unicode-tokens.el index d02ea70b..faa02458 100644 --- a/coq/coq-unicode-tokens.el +++ b/coq/coq-unicode-tokens.el @@ -36,7 +36,7 @@ (require 'proof-unicode-tokens) -(defconst coq-token-format "%s") ; plain tokens +(defconst coq-token-format "") ; Let generic code do the job (defconst coq-token-match nil) (defconst coq-hexcode-match nil) @@ -253,24 +253,29 @@ meaning to be useful." (defconst coq-control-char-format-regexp ;; FIXME: fix Coq identifier syntax below - "\\(\s*%s\s*\\)\\([a-zA-Z0-9']+\\)") + ;; "\\(\s_*%s\s_*\\)\\([a-zA-Z0-9']+\\)" + "\\(%s\\)\\(\\sw*\\)" + ) -(defconst coq-control-char-format " %s ") +;; (defconst coq-control-char-format " %s ") (defconst coq-control-characters '(("Subscript" "__" sub) ("Superscript" "^^" sup))) -(defconst coq-control-region-format-regexp "\\(\s*%s\{\\)\\([^}]*\\)\\(\}\s*\\)") +;(defconst coq-control-region-format-regexp "\\(\s*%s\{\\)\\([^}]*\\)\\(\}\s*\\)") +(defconst coq-control-region-format-regexp "\\(%s\{\\)\\([^}]*\\)\\(\}\\)") (defconst coq-control-regions '(("Subscript" "," "" sub) + ("Subscript" "_" "" sub) ("Superscript" "^" "" sup) - ("Bold" "BOLD" "" bold) - ("Italic" "ITALIC" "" italic) - ("Script" "SCRIPT" "" script) - ("Frakt" "FRACT" "" frakt) - ("Roman" "ROMAN" "" serif))) +; ("Bold" "BOLD" "" bold) +; ("Italic" "ITALIC" "" italic) +; ("Script" "SCRIPT" "" script) +; ("Frakt" "FRACT" "" frakt) +; ("Roman" "ROMAN" "" serif) +)) -- cgit v1.2.3