       "infixr"
       "is"
       "let"
+      "morphism"
       "obligations"
       "of"
+      "op"
+      "options"
+      "project"
+      "prove"
       "qualifying"
       "quotient"
+      "spec"
       "then"
+      "theorem"
       "translate"
       "true"
+      "type"
+      "using"
+      "where"
+      "with"
    ;; accord extension:
       "arcs"
       "compile"
       "cond"
+      "diagram"
       "do"
       "end"
       "end-diagram"

      "end-step"
      "end-while"
      "end-with"
      "final"
      "guard"
      "initial"
      "nodes"
      "prog"
      "progmap"
      "specmap"
      "step"
      "when"
      "while"
      "with"
      ))

(defconst specware-keywords-regexp


(defconst symbol-sep "[^-_?a-z0-9A-Z]")

;; reserved symbols that introduce named entities:
(defconst specware-definition-introducing-words
    (regexp-opt '(
   ;; core specware:
      "axiom"
      "conjecture"
      "def"
      "op"
      "theorem"
      "type"
   ;; accord extension:
      "diagram"
      "espec"
      "espec-refinement"
      "interpretation"
      "ip-scheme"
      "ip-scheme-morphism"
      "mode"
      "module"
      "morphism"
      "spec"
      "stad"
      )))

(defconst specware-definition-regexp
    (concat "\\(^\\|" symbol-sep "\\)\\("
