Improve the way all languages are registered to reveal.js

Fix code to correctly register languages to reveal.js, when loading from a browser. Add missing keywords to ATL.
highlightjs · Jan 31, 2020 · 1604463 · 1604463 · joshgoebel · Feb 4, 2020
1 parent b5f0fbb
commit 1604463
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "src/mde-languages.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build:bundle": "browserify ./src/mde-languages.js | uglifyjs -mc > ./build/mde-languages.min.js"
+    "build": "browserify ./src/mde-languages.js | uglifyjs -mc >  ./build/mde-languages.min.js"
   },
   "repository": {
     "type": "git",
@@ -32,5 +32,9 @@
     "browserify": "^16.5.0",
     "uglify-js": "^3.7.6",
     "uglifyjs": "^2.4.11"
+  },
+  "dependencies": {
+    "highlight.js": "^9.18.0",
+    "js-beautify": "^1.10.3"
   }
 }
diff --git a/src/atl.js b/src/atl.js
@@ -1,11 +1,11 @@
 module.exports = function(hljs) {
-  var TYPES = 'Boolean Integer UnlimitedNatural Real String OrderedSet Tuple OrderedSet Bag Set Sequence OclInvalid OclVoid TupleType OclState Collection OclMessage ';
+  var TYPES = 'Boolean Integer UnlimitedNatural Real String OrderedSet Tuple OrderedSet Bag Set Sequence OclInvalid OclVoid OclUndefined OclAny TupleType OclState Collection OclMessage ';
   return {
     case_insensitive: false,
     beginKeywords: 'module rule ',
     keywords: {
       keyword: 'module rule to from thisModule abstract query IN OUT extends helper def uses ' +
-        'create refining ' +
+        'create refining context ' +
         'select collect reject forAll exists collectNested closure iterate flatten one first ' +
         'includes excludes excludesAll includesAll including excluding union intersection ' +
         'size avg isEmpty notEmpty count sum average ' +

diff --git a/src/mde-languages.js b/src/mde-languages.js
@@ -1,5 +1,7 @@
-module.exports = function(hljs) {
-    hljs.registerLanguage('atl', require('./atl'));
-    hljs.registerLanguage('ocl', require('./ocl'));
-    hljs.registerLanguage('xcore', require('./xcore'));
-};
+var hljsDefineOCL = require('./ocl')
+var hljsDefineATL = require('./atl')
+var hljsDefineXcore = require('./xcore')
+
+hljs.registerLanguage('ocl', hljsDefineOCL);
+hljs.registerLanguage('atl', hljsDefineATL);
+hljs.registerLanguage('xcore', hljsDefineXcore);
diff --git a/src/ocl.js b/src/ocl.js
@@ -32,4 +32,4 @@ module.exports = function(hljs) {
       hljs.COMMENT('--', '$')
     ]
   }
-};
+};