Merged in wqshen/pygments-main (pull request #611)

Revised version of ncl.py

1 files changed, 84 insertions, 243 deletions

diff --git a/pygments/lexers/ncl.py b/pygments/lexers/ncl.py
index 7bae8e91..1ba7f4a7 100644
--- a/pygments/lexers/ncl.py
+++ b/pygments/lexers/ncl.py
@@ -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),
         ],