pygments.rb 1.1.2 → 1.2.0

data/vendor/pygments-main/pygments/lexers/inferno.py

@@ -5,7 +5,7 @@
 
     Lexers for Inferno os and all the related stuff.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/installers.py

@@ -5,7 +5,7 @@
 
     Lexers for installer/packager DSLs and formats.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/int_fiction.py

@@ -5,7 +5,7 @@
 
     Lexers for interactive fiction languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/iolang.py

@@ -5,7 +5,7 @@
 
     Lexers for the Io language.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/j.py

@@ -5,7 +5,7 @@
 
     Lexer for the J programming language.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/javascript.py

@@ -5,7 +5,7 @@
 
     Lexers for JavaScript and related languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -53,7 +53,7 @@ class JavascriptLexer(RegexLexer):
         'slashstartsregex': [
             include('commentsandwhitespace'),
             (r'/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/'
-             r'([gim]+\b|\B)', String.Regex, '#pop'),
+             r'([gimuy]+\b|\B)', String.Regex, '#pop'),
             (r'(?=/)', Text, ('#pop', 'badregex')),
             default('#pop')
         ],
@@ -64,9 +64,14 @@ class JavascriptLexer(RegexLexer):
             (r'\A#! ?/.*?\n', Comment.Hashbang),  # recognized by node.js
             (r'^(?=\s|/|<!--)', Text, 'slashstartsregex'),
             include('commentsandwhitespace'),
+            (r'(\.\d+|[0-9]+\.[0-9]*)([eE][-+]?[0-9]+)?', Number.Float),
+            (r'0[bB][01]+', Number.Bin),
+            (r'0[oO][0-7]+', Number.Oct),
+            (r'0[xX][0-9a-fA-F]+', Number.Hex),
+            (r'[0-9]+', Number.Integer),
+            (r'\.\.\.|=>', Punctuation),
             (r'\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|'
-             r'(<<|>>>?|=>|==?|!=?|[-<>+*%&|^/])=?', Operator, 'slashstartsregex'),
-            (r'\.\.\.', Punctuation),
+             r'(<<|>>>?|==?|!=?|[-<>+*%&|^/])=?', Operator, 'slashstartsregex'),
             (r'[{(\[;,]', Punctuation, 'slashstartsregex'),
             (r'[})\].]', Punctuation),
             (r'(for|in|while|do|break|return|continue|switch|case|default|if|else|'
@@ -84,11 +89,6 @@ class JavascriptLexer(RegexLexer):
              r'Error|eval|isFinite|isNaN|isSafeInteger|parseFloat|parseInt|'
              r'document|this|window)\b', Name.Builtin),
             (JS_IDENT, Name.Other),
-            (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float),
-            (r'0b[01]+', Number.Bin),
-            (r'0o[0-7]+', Number.Oct),
-            (r'0x[0-9a-fA-F]+', Number.Hex),
-            (r'[0-9]+', Number.Integer),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
             (r"'(\\\\|\\'|[^'])*'", String.Single),
             (r'`', String.Backtick, 'interp'),
@@ -366,9 +366,10 @@ class DartLexer(RegexLexer):
             (r'\b(assert|break|case|catch|continue|default|do|else|finally|for|'
              r'if|in|is|new|return|super|switch|this|throw|try|while)\b',
              Keyword),
-            (r'\b(abstract|const|extends|factory|final|get|implements|'
-             r'native|operator|set|static|typedef|var)\b', Keyword.Declaration),
-            (r'\b(bool|double|Dynamic|int|num|Object|String|void)\b', Keyword.Type),
+            (r'\b(abstract|async|await|const|extends|factory|final|get|'
+             r'implements|native|operator|set|static|sync|typedef|var|with|'
+             r'yield)\b', Keyword.Declaration),
+            (r'\b(bool|double|dynamic|int|num|Object|String|void)\b', Keyword.Type),
             (r'\b(false|null|true)\b', Keyword.Constant),
             (r'[~!%^&*+=|?:<>/-]|as\b', Operator),
             (r'[a-zA-Z_$]\w*:', Name.Label),
@@ -447,7 +448,7 @@ class TypeScriptLexer(RegexLexer):
 
     name = 'TypeScript'
     aliases = ['ts', 'typescript']
-    filenames = ['*.ts']
+    filenames = ['*.ts', '*.tsx']
     mimetypes = ['text/x-typescript']
 
     flags = re.DOTALL | re.MULTILINE
@@ -511,11 +512,34 @@ class TypeScriptLexer(RegexLexer):
             (r'[0-9]+', Number.Integer),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
             (r"'(\\\\|\\'|[^'])*'", String.Single),
+            (r'`', String.Backtick, 'interp'),
             # Match stuff like: Decorators
             (r'@\w+', Keyword.Declaration),
-        ]
+        ],
+
+        # The 'interp*' rules match those in JavascriptLexer. Changes made
+        # there should be reflected here as well.
+        'interp': [
+            (r'`', String.Backtick, '#pop'),
+            (r'\\\\', String.Backtick),
+            (r'\\`', String.Backtick),
+            (r'\$\{', String.Interpol, 'interp-inside'),
+            (r'\$', String.Backtick),
+            (r'[^`\\$]+', String.Backtick),
+        ],
+        'interp-inside': [
+            # TODO: should this include single-line comments and allow nesting strings?
+            (r'\}', String.Interpol, '#pop'),
+            include('root'),
+        ],
     }
 
+    def analyse_text(text):
+        if re.search('^(import.+(from\s+)?["\']|'
+                     '(export\s*)?(interface|class|function)\s+)',
+                     text, re.MULTILINE):
+            return 1.0
+
 
 class LassoLexer(RegexLexer):
     """
@@ -545,12 +569,7 @@ class LassoLexer(RegexLexer):
     tokens = {
         'root': [
             (r'^#![ \S]+lasso9\b', Comment.Preproc, 'lasso'),
-            (r'\[no_square_brackets\]', Comment.Preproc, 'nosquarebrackets'),
-            (r'\[noprocess\]', Comment.Preproc, ('delimiters', 'noprocess')),
-            (r'\[', Comment.Preproc, ('delimiters', 'squarebrackets')),
-            (r'<\?(LassoScript|lasso|=)', Comment.Preproc,
-                ('delimiters', 'anglebrackets')),
-            (r'<(!--.*?-->)?', Other, 'delimiters'),
+            (r'(?=\[|<)', Other, 'delimiters'),
             (r'\s+', Other),
             default(('delimiters', 'lassofile')),
         ],
@@ -558,14 +577,14 @@ class LassoLexer(RegexLexer):
             (r'\[no_square_brackets\]', Comment.Preproc, 'nosquarebrackets'),
             (r'\[noprocess\]', Comment.Preproc, 'noprocess'),
             (r'\[', Comment.Preproc, 'squarebrackets'),
-            (r'<\?(LassoScript|lasso|=)', Comment.Preproc, 'anglebrackets'),
+            (r'<\?(lasso(script)?|=)', Comment.Preproc, 'anglebrackets'),
             (r'<(!--.*?-->)?', Other),
             (r'[^[<]+', Other),
         ],
         'nosquarebrackets': [
             (r'\[noprocess\]', Comment.Preproc, 'noprocess'),
             (r'\[', Other),
-            (r'<\?(LassoScript|lasso|=)', Comment.Preproc, 'anglebrackets'),
+            (r'<\?(lasso(script)?|=)', Comment.Preproc, 'anglebrackets'),
             (r'<(!--.*?-->)?', Other),
             (r'[^[<]+', Other),
         ],
@@ -607,7 +626,7 @@ class LassoLexer(RegexLexer):
 
             # names
             (r'\$[a-z_][\w.]*', Name.Variable),
-            (r'#([a-z_][\w.]*|\d+)', Name.Variable.Instance),
+            (r'#([a-z_][\w.]*|\d+\b)', Name.Variable.Instance),
             (r"(\.\s*)('[a-z_][\w.]*')",
                 bygroups(Name.Builtin.Pseudo, Name.Variable.Class)),
             (r"(self)(\s*->\s*)('[a-z_][\w.]*')",
@@ -658,20 +677,20 @@ class LassoLexer(RegexLexer):
              r'Database_TableNames|Define_Tag|Define_Type|Email_Batch|'
              r'Encode_Set|HTML_Comment|Handle|Handle_Error|Header|If|Inline|'
              r'Iterate|LJAX_Target|Link|Link_CurrentAction|Link_CurrentGroup|'
-             r'Link_CurrentRecord|Link_Detail|Link_FirstGroup|'
-             r'Link_FirstRecord|Link_LastGroup|Link_LastRecord|Link_NextGroup|'
-             r'Link_NextRecord|Link_PrevGroup|Link_PrevRecord|Log|Loop|'
-             r'NoProcess|Output_None|Portal|Private|Protect|Records|Referer|'
-             r'Referrer|Repeating|ResultSet|Rows|Search_Args|Search_Arguments|'
-             r'Select|Sort_Args|Sort_Arguments|Thread_Atomic|Value_List|While|'
-             r'Abort|Case|Else|If_Empty|If_False|If_Null|If_True|Loop_Abort|'
-             r'Loop_Continue|Loop_Count|Params|Params_Up|Return|Return_Value|'
-             r'Run_Children|SOAP_DefineTag|SOAP_LastRequest|SOAP_LastResponse|'
-             r'Tag_Name|ascending|average|by|define|descending|do|equals|'
-             r'frozen|group|handle_failure|import|in|into|join|let|match|max|'
-             r'min|on|order|parent|protected|provide|public|require|returnhome|'
-             r'skip|split_thread|sum|take|thread|to|trait|type|where|with|'
-             r'yield|yieldhome)\b',
+             r'Link_CurrentRecord|Link_Detail|Link_FirstGroup|Link_FirstRecord|'
+             r'Link_LastGroup|Link_LastRecord|Link_NextGroup|Link_NextRecord|'
+             r'Link_PrevGroup|Link_PrevRecord|Log|Loop|Output_None|Portal|'
+             r'Private|Protect|Records|Referer|Referrer|Repeating|ResultSet|'
+             r'Rows|Search_Args|Search_Arguments|Select|Sort_Args|'
+             r'Sort_Arguments|Thread_Atomic|Value_List|While|Abort|Case|Else|'
+             r'Fail_If|Fail_IfNot|Fail|If_Empty|If_False|If_Null|If_True|'
+             r'Loop_Abort|Loop_Continue|Loop_Count|Params|Params_Up|Return|'
+             r'Return_Value|Run_Children|SOAP_DefineTag|SOAP_LastRequest|'
+             r'SOAP_LastResponse|Tag_Name|ascending|average|by|define|'
+             r'descending|do|equals|frozen|group|handle_failure|import|in|into|'
+             r'join|let|match|max|min|on|order|parent|protected|provide|public|'
+             r'require|returnhome|skip|split_thread|sum|take|thread|to|trait|'
+             r'type|where|with|yield|yieldhome)\b',
                 bygroups(Punctuation, Keyword)),
 
             # other

data/vendor/pygments-main/pygments/lexers/julia.py

@@ -5,7 +5,7 @@
 
     Lexers for the Julia language.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -231,7 +231,7 @@ class JuliaLexer(RegexLexer):
         'string': [
             (r'"', String, '#pop'),
             # FIXME: This escape pattern is not perfect.
-            (r'\\([\\"\'\$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
+            (r'\\([\\"\'$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
             # Interpolation is defined as "$" followed by the shortest full
             # expression, which is something we can't parse.
             # Include the most common cases here: $word, and $(paren'd expr).
@@ -246,7 +246,7 @@ class JuliaLexer(RegexLexer):
 
         'tqstring': [
             (r'"""', String, '#pop'),
-            (r'\\([\\"\'\$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
+            (r'\\([\\"\'$nrbtfav]|(x|u|U)[a-fA-F0-9]+|\d+)', String.Escape),
             (r'\$' + allowed_variable, String.Interpol),
             (r'(\$)(\()', bygroups(String.Interpol, Punctuation), 'in-intp'),
             (r'.|\s', String),

data/vendor/pygments-main/pygments/lexers/jvm.py

@@ -5,7 +5,7 @@
 
     Pygments lexers for JVM languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/lisp.py

@@ -5,7 +5,7 @@
 
     Lexers for Lispy languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/make.py

@@ -5,7 +5,7 @@
 
     Lexers for Makefiles and similar.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/markup.py

@@ -5,7 +5,7 @@
 
     Lexers for non-HTML markup languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/math.py

@@ -5,7 +5,7 @@
 
     Just export lexers that were contained in this module.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/matlab.py

@@ -5,7 +5,7 @@
 
     Lexers for Matlab and related languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/ml.py

@@ -5,7 +5,7 @@
 
     Lexers for ML family languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/modeling.py

@@ -5,7 +5,7 @@
 
     Lexers for modeling languages.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/modula2.py

@@ -5,7 +5,7 @@
 
     Multi-Dialect Lexer for Modula-2.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 

data/vendor/pygments-main/pygments/lexers/monte.py

@@ -5,7 +5,7 @@
 
     Lexer for the Monte programming language.
 
-    :copyright: Copyright 2016 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -43,8 +43,8 @@ _operators = [
 _escape_pattern = (
     r'(?:\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}|'
     r'\\["\'\\bftnr])')
-#_char = _escape_chars + [('.', String.Char)]
-_identifier = '[_a-zA-Z][_0-9a-zA-Z]*'
+# _char = _escape_chars + [('.', String.Char)]
+_identifier = r'[_a-zA-Z]\w*'
 
 _constants = [
     # Void constants
@@ -75,6 +75,7 @@ _safeScope = [
     'makeBrandPair', 'makeLazySlot', 'safeScope', 'simple__quasiParser',
 ]
 
+
 class MonteLexer(RegexLexer):
     """
     Lexer for the `Monte <https://monte.readthedocs.io/>`_ programming language.

data/vendor/pygments-main/pygments/lexers/ncl.py

@@ -5,7 +5,7 @@
 
     Lexers for NCAR Command Language.
 
-    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -35,7 +35,7 @@ class NCLLexer(RegexLexer):
             (r';.*\n', Comment),
             include('strings'),
             include('core'),
-            (r'[a-z][\w$]*', Name),
+            (r'[a-zA-Z_]\w*', Name),
             include('nums'),
             (r'[\s]+', Text),
         ],
@@ -43,7 +43,7 @@ class NCLLexer(RegexLexer):
             # Statements
             (words((
                 'begin', 'break', 'continue', 'create', 'defaultapp', 'do',
-                'else', 'end', 'external', 'exit', 'False', 'file', 'function',
+                'else', 'end', 'external', 'exit', 'True', 'False', 'file', 'function',
                 'getvalues', 'graphic', 'group', 'if', 'list', 'load', 'local',
                 'new', '_Missing', 'Missing', 'noparent', 'procedure',
                 'quit', 'QUIT', 'Quit', 'record', 'return', 'setvalues', 'stop',
@@ -59,10 +59,10 @@ class NCLLexer(RegexLexer):
              Keyword.Type),
 
             # Operators
-            (r'[\^*+\-/<>]', Operator),
+            (r'[\%^*+\-/<>]', Operator),
 
             # punctuation:
-            (r'[\[\]():@$.,]', Punctuation),
+            (r'[\[\]():@$!&|.,\\{}]', Punctuation),
             (r'[=:]', Punctuation),
 
             # Intrinsics
@@ -589,149 +589,60 @@ class NCLLexer(RegexLexer):
                 'lgTitleFontQuality', 'lgTitleFontThicknessF', 'lgTitleFuncCode',
                 'lgTitleJust', 'lgTitleOffsetF', 'lgTitleOn', 'lgTitlePosition',
                 'lgTitleString', 'lgTopMarginF', 'mpAreaGroupCount',
-                'mpAreaGroupCount_MapPlot', 'mpAreaMaskingOn',
-                'mpAreaMaskingOn_MapPlot', 'mpAreaNames', 'mpAreaNames_MapPlot',
-                'mpAreaTypes', 'mpAreaTypes_MapPlot', 'mpBottomAngleF',
-                'mpBottomAngleF_MapTransformation', 'mpBottomMapPosF',
-                'mpBottomMapPosF_MapTransformation', 'mpBottomNDCF',
-                'mpBottomNDCF_MapTransformation', 'mpBottomNPCF',
-                'mpBottomNPCF_MapTransformation', 'mpBottomPointLatF',
-                'mpBottomPointLatF_MapTransformation', 'mpBottomPointLonF',
-                'mpBottomPointLonF_MapTransformation', 'mpBottomWindowF',
-                'mpBottomWindowF_MapTransformation', 'mpCenterLatF',
-                'mpCenterLatF_MapTransformation', 'mpCenterLonF',
-                'mpCenterLonF_MapTransformation', 'mpCenterRotF',
-                'mpCenterRotF_MapTransformation', 'mpCountyLineColor',
-                'mpCountyLineColor_MapPlot', 'mpCountyLineDashPattern',
-                'mpCountyLineDashPattern_MapPlot', 'mpCountyLineDashSegLenF',
-                'mpCountyLineDashSegLenF_MapPlot', 'mpCountyLineThicknessF',
-                'mpCountyLineThicknessF_MapPlot', 'mpDataBaseVersion',
-                'mpDataBaseVersion_MapPlot', 'mpDataResolution',
-                'mpDataResolution_MapPlot', 'mpDataSetName', 'mpDataSetName_MapPlot',
-                'mpDefaultFillColor', 'mpDefaultFillColor_MapPlot',
-                'mpDefaultFillPattern', 'mpDefaultFillPattern_MapPlot',
-                'mpDefaultFillScaleF', 'mpDefaultFillScaleF_MapPlot',
-                'mpDynamicAreaGroups', 'mpDynamicAreaGroups_MapPlot',
-                'mpEllipticalBoundary', 'mpEllipticalBoundary_MapTransformation',
-                'mpFillAreaSpecifiers', 'mpFillAreaSpecifiers_MapPlot',
-                'mpFillBoundarySets', 'mpFillBoundarySets_MapPlot', 'mpFillColor',
-                'mpFillColor_MapPlot', 'mpFillColors', 'mpFillColors_MapPlot',
-                'mpFillColors-default', 'mpFillDotSizeF', 'mpFillDotSizeF_MapPlot',
-                'mpFillDrawOrder', 'mpFillDrawOrder_MapPlot', 'mpFillOn',
-                'mpFillOn_MapPlot', 'mpFillPatternBackground',
-                'mpFillPatternBackground_MapPlot', 'mpFillPattern',
-                'mpFillPattern_MapPlot', 'mpFillPatterns', 'mpFillPatterns_MapPlot',
-                'mpFillPatterns-default', 'mpFillScaleF', 'mpFillScaleF_MapPlot',
-                'mpFillScales', 'mpFillScales_MapPlot', 'mpFillScales-default',
-                'mpFixedAreaGroups', 'mpFixedAreaGroups_MapPlot',
-                'mpGeophysicalLineColor', 'mpGeophysicalLineColor_MapPlot',
-                'mpGeophysicalLineDashPattern',
-                'mpGeophysicalLineDashPattern_MapPlot',
-                'mpGeophysicalLineDashSegLenF',
-                'mpGeophysicalLineDashSegLenF_MapPlot', 'mpGeophysicalLineThicknessF',
-                'mpGeophysicalLineThicknessF_MapPlot', 'mpGreatCircleLinesOn',
-                'mpGreatCircleLinesOn_MapTransformation', 'mpGridAndLimbDrawOrder',
-                'mpGridAndLimbDrawOrder_MapPlot', 'mpGridAndLimbOn',
-                'mpGridAndLimbOn_MapPlot', 'mpGridLatSpacingF',
-                'mpGridLatSpacingF_MapPlot', 'mpGridLineColor',
-                'mpGridLineColor_MapPlot', 'mpGridLineDashPattern',
-                'mpGridLineDashPattern_MapPlot', 'mpGridLineDashSegLenF',
-                'mpGridLineDashSegLenF_MapPlot', 'mpGridLineThicknessF',
-                'mpGridLineThicknessF_MapPlot', 'mpGridLonSpacingF',
-                'mpGridLonSpacingF_MapPlot', 'mpGridMaskMode',
-                'mpGridMaskMode_MapPlot', 'mpGridMaxLatF', 'mpGridMaxLatF_MapPlot',
-                'mpGridPolarLonSpacingF', 'mpGridPolarLonSpacingF_MapPlot',
-                'mpGridSpacingF', 'mpGridSpacingF_MapPlot', 'mpInlandWaterFillColor',
-                'mpInlandWaterFillColor_MapPlot', 'mpInlandWaterFillPattern',
-                'mpInlandWaterFillPattern_MapPlot', 'mpInlandWaterFillScaleF',
-                'mpInlandWaterFillScaleF_MapPlot', 'mpLabelDrawOrder',
-                'mpLabelDrawOrder_MapPlot', 'mpLabelFontColor',
-                'mpLabelFontColor_MapPlot', 'mpLabelFontHeightF',
-                'mpLabelFontHeightF_MapPlot', 'mpLabelsOn', 'mpLabelsOn_MapPlot',
-                'mpLambertMeridianF', 'mpLambertMeridianF_MapTransformation',
-                'mpLambertParallel1F', 'mpLambertParallel1F_MapTransformation',
-                'mpLambertParallel2F', 'mpLambertParallel2F_MapTransformation',
-                'mpLandFillColor', 'mpLandFillColor_MapPlot', 'mpLandFillPattern',
-                'mpLandFillPattern_MapPlot', 'mpLandFillScaleF',
-                'mpLandFillScaleF_MapPlot', 'mpLeftAngleF',
-                'mpLeftAngleF_MapTransformation', 'mpLeftCornerLatF',
-                'mpLeftCornerLatF_MapTransformation', 'mpLeftCornerLonF',
-                'mpLeftCornerLonF_MapTransformation', 'mpLeftMapPosF',
-                'mpLeftMapPosF_MapTransformation', 'mpLeftNDCF',
-                'mpLeftNDCF_MapTransformation', 'mpLeftNPCF',
-                'mpLeftNPCF_MapTransformation', 'mpLeftPointLatF',
-                'mpLeftPointLatF_MapTransformation', 'mpLeftPointLonF',
-                'mpLeftPointLonF_MapTransformation', 'mpLeftWindowF',
-                'mpLeftWindowF_MapTransformation', 'mpLimbLineColor',
-                'mpLimbLineColor_MapPlot', 'mpLimbLineDashPattern',
-                'mpLimbLineDashPattern_MapPlot', 'mpLimbLineDashSegLenF',
-                'mpLimbLineDashSegLenF_MapPlot', 'mpLimbLineThicknessF',
-                'mpLimbLineThicknessF_MapPlot', 'mpLimitMode',
-                'mpLimitMode_MapTransformation', 'Angle_projection_limits',
-                'mpMaskAreaSpecifiers', 'mpMaskAreaSpecifiers_MapPlot',
-                'mpMaskOutlineSpecifiers', 'mpMaskOutlineSpecifiers_MapPlot',
-                'mpMaxLatF', 'mpMaxLatF_MapTransformation', 'mpMaxLonF',
-                'mpMaxLonF_MapTransformation', 'mpMinLatF',
-                'mpMinLatF_MapTransformation', 'mpMinLonF',
-                'mpMinLonF_MapTransformation', 'mpMonoFillColor',
-                'mpMonoFillColor_MapPlot', 'mpMonoFillPattern',
-                'mpMonoFillPattern_MapPlot', 'mpMonoFillScale',
-                'mpMonoFillScale_MapPlot', 'mpNationalLineColor',
-                'mpNationalLineColor_MapPlot', 'mpNationalLineDashPattern',
-                'mpNationalLineDashPattern_MapPlot',
-                'mpNationalLineDashSegLenF_MapPlot', 'mpNationalLineThicknessF',
-                'mpNationalLineThicknessF_MapPlot', 'mpOceanFillColor',
-                'mpOceanFillColor_MapPlot', 'mpOceanFillPattern',
-                'mpOceanFillPattern_MapPlot', 'mpOceanFillScaleF',
-                'mpOceanFillScaleF_MapPlot', 'mpOutlineBoundarySets',
-                'mpOutlineBoundarySets_MapPlot', 'mpOutlineDrawOrder',
-                'mpOutlineDrawOrder_MapPlot', 'mpOutlineMaskingOn',
-                'mpOutlineMaskingOn_MapPlot', 'mpOutlineOn', 'mpOutlineOn_MapPlot',
-                'mpOutlineSpecifiers', 'mpOutlineSpecifiers_MapPlot',
-                'mpPerimDrawOrder', 'mpPerimDrawOrder_MapPlot', 'mpPerimLineColor',
-                'mpPerimLineColor_MapPlot', 'mpPerimLineDashPattern',
-                'mpPerimLineDashPattern_MapPlot', 'mpPerimLineDashSegLenF',
-                'mpPerimLineDashSegLenF_MapPlot', 'mpPerimLineThicknessF',
-                'mpPerimLineThicknessF_MapPlot', 'mpPerimOn', 'mpPerimOn_MapPlot',
-                'mpPolyMode', 'mpPolyMode_MapTransformation', 'mpProjection',
-                'mpProjection_MapTransformation', 'mpProvincialLineColor',
-                'mpProvincialLineColor_MapPlot', 'mpProvincialLineDashPattern',
-                'mpProvincialLineDashPattern_MapPlot', 'mpProvincialLineDashSegLenF',
-                'mpProvincialLineDashSegLenF_MapPlot', 'mpProvincialLineThicknessF',
-                'mpProvincialLineThicknessF_MapPlot', 'mpRelativeCenterLat',
-                'mpRelativeCenterLat_MapTransformation', 'mpRelativeCenterLon',
-                'mpRelativeCenterLon_MapTransformation', 'mpRightAngleF',
-                'mpRightAngleF_MapTransformation', 'mpRightCornerLatF',
-                'mpRightCornerLatF_MapTransformation', 'mpRightCornerLonF',
-                'mpRightCornerLonF_MapTransformation', 'mpRightMapPosF',
-                'mpRightMapPosF_MapTransformation', 'mpRightNDCF',
-                'mpRightNDCF_MapTransformation', 'mpRightNPCF',
-                'mpRightNPCF_MapTransformation', 'mpRightPointLatF',
-                'mpRightPointLatF_MapTransformation', 'mpRightPointLonF',
-                'mpRightPointLonF_MapTransformation', 'mpRightWindowF',
-                'mpRightWindowF_MapTransformation', 'mpSatelliteAngle1F',
-                'mpSatelliteAngle1F_MapTransformation', 'mpSatelliteAngle2F',
-                'mpSatelliteAngle2F_MapTransformation', 'mpSatelliteDistF',
-                'mpSatelliteDistF_MapTransformation', 'mpShapeMode',
-                'mpShapeMode_MapPlot', 'mpSpecifiedFillColors',
-                'mpSpecifiedFillColors_MapPlot', 'mpSpecifiedFillDirectIndexing',
-                'mpSpecifiedFillDirectIndexing_MapPlot', 'mpSpecifiedFillPatterns',
-                'mpSpecifiedFillPatterns_MapPlot', 'mpSpecifiedFillPriority',
-                'mpSpecifiedFillPriority_MapPlot', 'mpSpecifiedFillScales',
-                'mpSpecifiedFillScales_MapPlot', 'mpTopAngleF',
-                'mpTopAngleF_MapTransformation', 'mpTopMapPosF',
-                'mpTopMapPosF_MapTransformation', 'mpTopNDCF',
-                'mpTopNDCF_MapTransformation', 'mpTopNPCF',
-                'mpTopNPCF_MapTransformation', 'mpTopPointLatF',
-                'mpTopPointLatF_MapTransformation', 'mpTopPointLonF',
-                'mpTopPointLonF_MapTransformation', 'mpTopWindowF',
-                'mpTopWindowF_MapTransformation', 'mpUSStateLineColor',
-                'mpUSStateLineColor_MapPlot', 'mpUSStateLineDashPattern',
-                'mpUSStateLineDashPattern_MapPlot', 'mpUSStateLineDashSegLenF',
-                'mpUSStateLineDashSegLenF_MapPlot', 'mpUSStateLineThicknessF',
-                'mpUSStateLineThicknessF_MapPlot', 'pmAnnoManagers',
-                'pmAnnoViews', 'pmLabelBarDisplayMode', 'pmLabelBarHeightF',
-                'pmLabelBarKeepAspect', 'pmLabelBarOrthogonalPosF',
+                'mpAreaMaskingOn', 'mpAreaNames', 'mpAreaTypes', 'mpBottomAngleF',
+                'mpBottomMapPosF', 'mpBottomNDCF', 'mpBottomNPCF',
+                'mpBottomPointLatF', 'mpBottomPointLonF', 'mpBottomWindowF',
+                'mpCenterLatF', 'mpCenterLonF', 'mpCenterRotF', 'mpCountyLineColor',
+                'mpCountyLineDashPattern', 'mpCountyLineDashSegLenF',
+                'mpCountyLineThicknessF', 'mpDataBaseVersion', 'mpDataResolution',
+                'mpDataSetName', 'mpDefaultFillColor', 'mpDefaultFillPattern',
+                'mpDefaultFillScaleF', 'mpDynamicAreaGroups', 'mpEllipticalBoundary',
+                'mpFillAreaSpecifiers', 'mpFillBoundarySets', 'mpFillColor',
+                'mpFillColors', 'mpFillColors-default', 'mpFillDotSizeF',
+                'mpFillDrawOrder', 'mpFillOn', 'mpFillPatternBackground',
+                'mpFillPattern', 'mpFillPatterns', 'mpFillPatterns-default',
+                'mpFillScaleF', 'mpFillScales', 'mpFillScales-default',
+                'mpFixedAreaGroups', 'mpGeophysicalLineColor',
+                'mpGeophysicalLineDashPattern', 'mpGeophysicalLineDashSegLenF',
+                'mpGeophysicalLineThicknessF', 'mpGreatCircleLinesOn',
+                'mpGridAndLimbDrawOrder', 'mpGridAndLimbOn', 'mpGridLatSpacingF',
+                'mpGridLineColor', 'mpGridLineDashPattern', 'mpGridLineDashSegLenF',
+                'mpGridLineThicknessF', 'mpGridLonSpacingF', 'mpGridMaskMode',
+                'mpGridMaxLatF', 'mpGridPolarLonSpacingF', 'mpGridSpacingF',
+                'mpInlandWaterFillColor', 'mpInlandWaterFillPattern',
+                'mpInlandWaterFillScaleF', 'mpLabelDrawOrder', 'mpLabelFontColor',
+                'mpLabelFontHeightF', 'mpLabelsOn', 'mpLambertMeridianF',
+                'mpLambertParallel1F', 'mpLambertParallel2F', 'mpLandFillColor',
+                'mpLandFillPattern', 'mpLandFillScaleF', 'mpLeftAngleF',
+                'mpLeftCornerLatF', 'mpLeftCornerLonF', 'mpLeftMapPosF',
+                'mpLeftNDCF', 'mpLeftNPCF', 'mpLeftPointLatF',
+                'mpLeftPointLonF', 'mpLeftWindowF', 'mpLimbLineColor',
+                'mpLimbLineDashPattern', 'mpLimbLineDashSegLenF',
+                'mpLimbLineThicknessF', 'mpLimitMode', 'mpMaskAreaSpecifiers',
+                'mpMaskOutlineSpecifiers', 'mpMaxLatF', 'mpMaxLonF',
+                'mpMinLatF', 'mpMinLonF', 'mpMonoFillColor', 'mpMonoFillPattern',
+                'mpMonoFillScale', 'mpNationalLineColor', 'mpNationalLineDashPattern',
+                'mpNationalLineThicknessF', 'mpOceanFillColor', 'mpOceanFillPattern',
+                'mpOceanFillScaleF', 'mpOutlineBoundarySets', 'mpOutlineDrawOrder',
+                'mpOutlineMaskingOn', 'mpOutlineOn', 'mpOutlineSpecifiers',
+                'mpPerimDrawOrder', 'mpPerimLineColor', 'mpPerimLineDashPattern',
+                'mpPerimLineDashSegLenF', 'mpPerimLineThicknessF', 'mpPerimOn',
+                'mpPolyMode', 'mpProjection', 'mpProvincialLineColor',
+                'mpProvincialLineDashPattern', 'mpProvincialLineDashSegLenF',
+                'mpProvincialLineThicknessF', 'mpRelativeCenterLat',
+                'mpRelativeCenterLon', 'mpRightAngleF', 'mpRightCornerLatF',
+                'mpRightCornerLonF', 'mpRightMapPosF', 'mpRightNDCF',
+                'mpRightNPCF', 'mpRightPointLatF', 'mpRightPointLonF',
+                'mpRightWindowF', 'mpSatelliteAngle1F', 'mpSatelliteAngle2F',
+                'mpSatelliteDistF', 'mpShapeMode', 'mpSpecifiedFillColors',
+                'mpSpecifiedFillDirectIndexing', 'mpSpecifiedFillPatterns',
+                'mpSpecifiedFillPriority', 'mpSpecifiedFillScales',
+                'mpTopAngleF', 'mpTopMapPosF', 'mpTopNDCF', 'mpTopNPCF',
+                'mpTopPointLatF', 'mpTopPointLonF', 'mpTopWindowF',
+                'mpUSStateLineColor', 'mpUSStateLineDashPattern',
+                'mpUSStateLineDashSegLenF', 'mpUSStateLineThicknessF',
+                'pmAnnoManagers', 'pmAnnoViews', 'pmLabelBarDisplayMode',
+                'pmLabelBarHeightF', 'pmLabelBarKeepAspect', 'pmLabelBarOrthogonalPosF',
                 'pmLabelBarParallelPosF', 'pmLabelBarSide', 'pmLabelBarWidthF',
                 'pmLabelBarZone', 'pmLegendDisplayMode', 'pmLegendHeightF',
                 'pmLegendKeepAspect', 'pmLegendOrthogonalPosF',
@@ -739,35 +650,14 @@ class NCLLexer(RegexLexer):
                 'pmLegendZone', 'pmOverlaySequenceIds', 'pmTickMarkDisplayMode',
                 'pmTickMarkZone', 'pmTitleDisplayMode', 'pmTitleZone',
                 'prGraphicStyle', 'prPolyType', 'prXArray', 'prYArray',
-                'sfCopyData_MeshScalarField', 'sfCopyData', 'sfCopyData_ScalarField',
-                'sfDataArray_MeshScalarField', 'sfDataArray',
-                'sfDataArray_ScalarField', 'sfDataMaxV_MeshScalarField', 'sfDataMaxV',
-                'sfDataMaxV_ScalarField', 'sfDataMinV_MeshScalarField', 'sfDataMinV',
-                'sfDataMinV_ScalarField', 'sfElementNodes',
-                'sfElementNodes_MeshScalarField', 'sfExchangeDimensions',
-                'sfExchangeDimensions_ScalarField', 'sfFirstNodeIndex',
-                'sfFirstNodeIndex_MeshScalarField', 'sfMissingValueV_MeshScalarField',
-                'sfMissingValueV', 'sfMissingValueV_ScalarField',
-                'sfXArray_MeshScalarField', 'sfXArray', 'sfXArray_ScalarField',
-                'sfXCActualEndF_MeshScalarField', 'sfXCActualEndF',
-                'sfXCActualEndF_ScalarField', 'sfXCActualStartF_MeshScalarField',
-                'sfXCActualStartF', 'sfXCActualStartF_ScalarField', 'sfXCEndIndex',
-                'sfXCEndIndex_ScalarField', 'sfXCEndSubsetV',
-                'sfXCEndSubsetV_ScalarField', 'sfXCEndV', 'sfXCEndV_ScalarField',
-                'sfXCStartIndex', 'sfXCStartIndex_ScalarField', 'sfXCStartSubsetV',
-                'sfXCStartSubsetV_ScalarField', 'sfXCStartV',
-                'sfXCStartV_ScalarField', 'sfXCStride', 'sfXCStride_ScalarField',
-                'sfXCellBounds', 'sfXCellBounds_MeshScalarField',
-                'sfYArray_MeshScalarField', 'sfYArray', 'sfYArray_ScalarField',
-                'sfYCActualEndF_MeshScalarField', 'sfYCActualEndF',
-                'sfYCActualEndF_ScalarField', 'sfYCActualStartF_MeshScalarField',
-                'sfYCActualStartF', 'sfYCActualStartF_ScalarField', 'sfYCEndIndex',
-                'sfYCEndIndex_ScalarField', 'sfYCEndSubsetV',
-                'sfYCEndSubsetV_ScalarField', 'sfYCEndV', 'sfYCEndV_ScalarField',
-                'sfYCStartIndex', 'sfYCStartIndex_ScalarField', 'sfYCStartSubsetV',
-                'sfYCStartSubsetV_ScalarField', 'sfYCStartV',
-                'sfYCStartV_ScalarField', 'sfYCStride', 'sfYCStride_ScalarField',
-                'sfYCellBounds', 'sfYCellBounds_MeshScalarField', 'stArrowLengthF',
+                'sfCopyData', 'sfDataArray', 'sfDataMaxV', 'sfDataMinV',
+                'sfElementNodes', 'sfExchangeDimensions', 'sfFirstNodeIndex',
+                'sfMissingValueV', 'sfXArray', 'sfXCActualEndF', 'sfXCActualStartF',
+                'sfXCEndIndex', 'sfXCEndSubsetV', 'sfXCEndV', 'sfXCStartIndex',
+                'sfXCStartSubsetV', 'sfXCStartV', 'sfXCStride', 'sfXCellBounds',
+                'sfYArray', 'sfYCActualEndF', 'sfYCActualStartF', 'sfYCEndIndex',
+                'sfYCEndSubsetV', 'sfYCEndV', 'sfYCStartIndex', 'sfYCStartSubsetV',
+                'sfYCStartV', 'sfYCStride', 'sfYCellBounds', 'stArrowLengthF',
                 'stArrowStride', 'stCrossoverCheckCount',
                 'stExplicitLabelBarLabelsOn', 'stLabelBarEndLabelsOn',
                 'stLabelFormat', 'stLengthCheckCount', 'stLevelColors',
@@ -870,25 +760,12 @@ class NCLLexer(RegexLexer):
                 'tmYRMinorPerMajor', 'tmYRMinorThicknessF', 'tmYRMinorValues',
                 'tmYRMode', 'tmYROn', 'tmYRPrecision', 'tmYRStyle', 'tmYRTickEndF',
                 'tmYRTickSpacingF', 'tmYRTickStartF', 'tmYRValues', 'tmYUseLeft',
-                'trGridType', 'trGridType_Transformation', 'trLineInterpolationOn',
-                'trLineInterpolationOn_Transformation', 'trXAxisType',
-                'trXAxisType_IrregularTransformation', 'trXCoordPoints',
-                'trXCoordPoints_IrregularTransformation', 'trXInterPoints',
-                'trXInterPoints_IrregularTransformation', 'trXLog',
-                'trXLog_LogLinTransformation', 'trXMaxF', 'trXMaxF_Transformation',
-                'trXMinF', 'trXMinF_Transformation', 'trXReverse',
-                'trXReverse_Transformation', 'trXSamples',
-                'trXSamples_IrregularTransformation', 'trXTensionF',
-                'trXTensionF_IrregularTransformation', 'trYAxisType',
-                'trYAxisType_IrregularTransformation', 'trYCoordPoints',
-                'trYCoordPoints_IrregularTransformation', 'trYInterPoints',
-                'trYInterPoints_IrregularTransformation', 'trYLog',
-                'trYLog_LogLinTransformation', 'trYMaxF', 'trYMaxF_Transformation',
-                'trYMinF', 'trYMinF_Transformation', 'trYReverse',
-                'trYReverse_Transformation', 'trYSamples',
-                'trYSamples_IrregularTransformation', 'trYTensionF',
-                'trYTensionF_IrregularTransformation', 'txAngleF',
-                'txBackgroundFillColor', 'txConstantSpacingF', 'txDirection',
+                'trGridType', 'trLineInterpolationOn',
+                'trXAxisType', 'trXCoordPoints', 'trXInterPoints', 'trXLog',
+                'trXMaxF', 'trXMinF', 'trXReverse', 'trXSamples', 'trXTensionF',
+                'trYAxisType', 'trYCoordPoints', 'trYInterPoints', 'trYLog',
+                'trYMaxF', 'trYMinF', 'trYReverse', 'trYSamples', 'trYTensionF',
+                'txAngleF', 'txBackgroundFillColor', 'txConstantSpacingF', 'txDirection',
                 'txFont', 'HLU-Fonts', 'txFontAspectF', 'txFontColor',
                 'txFontHeightF', 'txFontOpacityF', 'txFontQuality',
                 'txFontThicknessF', 'txFuncCode', 'txJust', 'txPerimColor',
@@ -969,53 +846,16 @@ class NCLLexer(RegexLexer):
                 'vfYCEndSubsetV', 'vfYCEndV', 'vfYCStartIndex', 'vfYCStartSubsetV',
                 'vfYCStartV', 'vfYCStride', 'vpAnnoManagerId', 'vpClipOn',
                 'vpHeightF', 'vpKeepAspect', 'vpOn', 'vpUseSegments', 'vpWidthF',
-                'vpXF', 'vpYF', 'wkAntiAlias', 'wkAntiAlias_DocumentWorkstation',
-                'wkAntiAlias_ImageWorkstation', 'wkAntiAlias_XWorkstation',
-                'wkBackgroundColor', 'wkBackgroundColor_Workstation',
-                'wkBackgroundOpacityF', 'wkBackgroundOpacityF_DocumentWorkstation',
-                'wkBackgroundOpacityF_ImageWorkstation',
-                'wkBackgroundOpacityF_XWorkstation', 'wkColorMapLen',
-                'wkColorMapLen_Workstation', 'wkColorMap', 'wkColorMap_Workstation',
-                'wkColorModel', 'wkColorModel_PDFWorkstation',
-                'wkColorModel_PSWorkstation', 'wkDashTableLength',
-                'wkDashTableLength_Workstation', 'wkDefGraphicStyleId',
-                'wkDefGraphicStyleId_Workstation', 'wkDeviceLowerX',
-                'wkDeviceLowerX_DocumentWorkstation', 'wkDeviceLowerX_PDFWorkstation',
-                'wkDeviceLowerX_PSWorkstation', 'wkDeviceLowerY',
-                'wkDeviceLowerY_DocumentWorkstation', 'wkDeviceLowerY_PDFWorkstation',
-                'wkDeviceLowerY_PSWorkstation', 'wkDeviceUpperX',
-                'wkDeviceUpperX_DocumentWorkstation', 'wkDeviceUpperX_PDFWorkstation',
-                'wkDeviceUpperX_PSWorkstation', 'wkDeviceUpperY',
-                'wkDeviceUpperY_DocumentWorkstation', 'wkDeviceUpperY_PDFWorkstation',
-                'wkDeviceUpperY_PSWorkstation', 'wkFileName',
-                'wkFileName_DocumentWorkstation', 'wkFileName_ImageWorkstation',
-                'wkFillTableLength', 'wkFillTableLength_Workstation',
-                'wkForegroundColor', 'wkForegroundColor_Workstation', 'wkFormat',
-                'wkFormat_DocumentWorkstation', 'wkFormat_ImageWorkstation',
-                'wkFullBackground', 'wkFullBackground_PDFWorkstation',
-                'wkFullBackground_PSWorkstation', 'wkGksWorkId',
-                'wkGksWorkId_Workstation', 'wkHeight', 'wkHeight_ImageWorkstation',
-                'wkHeight_XWorkstation', 'wkMarkerTableLength',
-                'wkMarkerTableLength_Workstation', 'wkMetaName',
-                'wkMetaName_NcgmWorkstation', 'wkOrientation',
-                'wkOrientation_PDFWorkstation', 'wkOrientation_PSWorkstation',
-                'wkPDFFileName', 'wkPDFFileName_PDFWorkstation', 'wkPDFFormat',
-                'wkPDFFormat_PDFWorkstation', 'wkPDFResolution',
-                'wkPDFResolution_PDFWorkstation', 'wkPSFileName',
-                'wkPSFileName_PSWorkstation', 'wkPSFormat',
-                'wkPSFormat_PSWorkstation', 'wkPSResolution',
-                'wkPSResolution_PSWorkstation', 'wkPaperHeightF',
-                'wkPaperHeightF_DocumentWorkstation', 'wkPaperHeightF_PDFWorkstation',
-                'wkPaperHeightF_PSWorkstation', 'wkPaperSize',
-                'wkPaperSize_DocumentWorkstation', 'wkPaperSize_PDFWorkstation',
-                'wkPaperSize_PSWorkstation', 'wkPaperWidthF',
-                'wkPaperWidthF_DocumentWorkstation', 'wkPaperWidthF_PDFWorkstation',
-                'wkPaperWidthF_PSWorkstation', 'wkPause', 'wkPause_XWorkstation',
-                'wkTopLevelViews', 'wkTopLevelViews_Workstation', 'wkViews',
-                'wkViews_Workstation', 'wkVisualType', 'wkVisualType_PDFWorkstation',
-                'wkVisualType_PSWorkstation', 'wkWidth', 'wkWidth_ImageWorkstation',
-                'wkWidth_XWorkstation', 'wkWindowId', 'wkWindowId_XWorkstation',
-                'wkXColorMode', 'wkXColorMode_XWorkstation', 'wsCurrentSize',
+                'vpXF', 'vpYF', 'wkAntiAlias', 'wkBackgroundColor', 'wkBackgroundOpacityF',
+                'wkColorMapLen', 'wkColorMap', 'wkColorModel', 'wkDashTableLength',
+                'wkDefGraphicStyleId', 'wkDeviceLowerX', 'wkDeviceLowerY',
+                'wkDeviceUpperX', 'wkDeviceUpperY', 'wkFileName', 'wkFillTableLength',
+                'wkForegroundColor', 'wkFormat', 'wkFullBackground', 'wkGksWorkId',
+                'wkHeight', 'wkMarkerTableLength', 'wkMetaName', 'wkOrientation',
+                'wkPDFFileName', 'wkPDFFormat', 'wkPDFResolution', 'wkPSFileName',
+                'wkPSFormat', 'wkPSResolution', 'wkPaperHeightF', 'wkPaperSize',
+                'wkPaperWidthF', 'wkPause', 'wkTopLevelViews', 'wkViews',
+                'wkVisualType', 'wkWidth', 'wkWindowId', 'wkXColorMode', 'wsCurrentSize',
                 'wsMaximumSize', 'wsThresholdSize', 'xyComputeXMax',
                 'xyComputeXMin', 'xyComputeYMax', 'xyComputeYMin', 'xyCoordData',
                 'xyCoordDataSpec', 'xyCurveDrawOrder', 'xyDashPattern',
@@ -1037,7 +877,8 @@ class NCLLexer(RegexLexer):
              Name.Builtin),
 
             # Booleans
-            (r'True|False', Name.Builtin),             # Comparing Operators
+            (r'\.(True|False)\.', Name.Builtin),
+            # Comparing Operators
             (r'\.(eq|ne|lt|le|gt|ge|not|and|or|xor)\.', Operator.Word),
         ],